diff --git a/src/GUI/IntelliPhotoGui.cpp b/src/GUI/IntelliPhotoGui.cpp
index 0d05d42..572de3e 100644
--- a/src/GUI/IntelliPhotoGui.cpp
+++ b/src/GUI/IntelliPhotoGui.cpp
@@ -89,7 +89,6 @@ void IntelliPhotoGui::slotCreateNewShapedLayer(){
 		// Stores button value
 		bool ok1, ok2;
 
-        bool ok1, ok2;
 		// "New Layer" is the title of the window
 		// the next tr is the text to display
 		// Define the standard Value, min, max, step and ok button
diff --git a/src/Layer/PaintingArea.cpp b/src/Layer/PaintingArea.cpp
index d85c84a..5505a3e 100644
--- a/src/Layer/PaintingArea.cpp
+++ b/src/Layer/PaintingArea.cpp
@@ -32,7 +32,7 @@ PaintingArea::~PaintingArea(){
 }
 
 void PaintingArea::setRenderSettings(bool isFastRenderingOn){
-		if(isFastRenderingOn != renderSettings.isFastRenderering()) {
+        if(isFastRenderingOn != renderSettings.isFastRenderering() && !Tool->getIsDrawing()) {
 				renderSettings.setFastRendering(isFastRenderingOn);
 				for(auto& layer : layerBundle) {
 						layer.image->updateRendererSetting(isFastRenderingOn);
@@ -110,6 +110,7 @@ void PaintingArea::setPolygon(int idx){
 						delete this->Tool;
 						this->Tool = new IntelliToolPolygon(this,&colorPicker,&Toolsettings, true);
 						isSettingPolygon = true;
+                        this->DummyGui->setToolWidth(5);
 				}
 		}
 }
diff --git a/src/Tool/IntelliToolPolygon.cpp b/src/Tool/IntelliToolPolygon.cpp
index c784669..1782d14 100644
--- a/src/Tool/IntelliToolPolygon.cpp
+++ b/src/Tool/IntelliToolPolygon.cpp
@@ -10,6 +10,9 @@ IntelliToolPolygon::IntelliToolPolygon(PaintingArea* Area, IntelliColorPicker* c
 		isDrawing = false;
 		isInside = false;
 		this->isSettingPolygon = isSettingPolygon;
+        if(isSettingPolygon){
+            Toolsettings->setLineWidth(5);
+        }
 		this->ActiveType = Tooltype::POLYGON;
 }
 
@@ -121,14 +124,18 @@ void IntelliToolPolygon::onMouseRightReleased(int x, int y){
 }
 
 void IntelliToolPolygon::onWheelScrolled(int value){
-		IntelliTool::onWheelScrolled(value);
-		if(!isDrawing) {
-				Toolsettings->setLineWidth(Toolsettings->getLineWidth() + value);
-		}
+        if(!isSettingPolygon){
+            IntelliTool::onWheelScrolled(value);
+            if(!isDrawing) {
+                    Toolsettings->setLineWidth(Toolsettings->getLineWidth() + value);
+            }
+        }
 }
 
 void IntelliToolPolygon::onMouseMoved(int x, int y){
-		IntelliTool::onMouseMoved(x,y);
+        if(!isSettingPolygon){
+            IntelliTool::onMouseMoved(x,y);
+        }
 }
 
 bool IntelliToolPolygon::isNearStart(int x, int y, QPoint Startpoint){