diff --git a/README.md b/README.md
index ee2a24f..0bef196 100644
--- a/README.md
+++ b/README.md
@@ -4,3 +4,9 @@ A free-hand draw application for [Sailfish OS](https://sailfishos.org).
 
 ![Papocchio for Sailfish OS](https://raw.githubusercontent.com/ilpianista/Papocchio/master/screenshots/papocchio.jpg)
 
+## License
+GPL 3
+
+## Icon
+
+The icon has been taken from [ICONSDB](http://www.iconsdb.com/royal-blue-icons/edit-5-icon.html).
diff --git a/harbour-papocchio.png b/harbour-papocchio.png
index 5eeae3e..81ad3d1 100644
Binary files a/harbour-papocchio.png and b/harbour-papocchio.png differ
diff --git a/qml/pages/MainPage.qml b/qml/pages/MainPage.qml
index dd3537a..619a11a 100644
--- a/qml/pages/MainPage.qml
+++ b/qml/pages/MainPage.qml
@@ -21,12 +21,8 @@ import Sailfish.Silica 1.0
 
 Page {
 
-    property int startX
-    property int startY
-    property int finishX
-    property int finishY
-
     readonly property real defaultStrokeSize: 5
+    readonly property real defaultRubberSize: 20
     readonly property string defaultStrokeColor: "#000000"
     readonly property string defaultFillColor: "#ffffff"
 
@@ -35,22 +31,29 @@ Page {
 
         Row {
             id: menu
-            anchors.horizontalCenter: parent.horizontalCenter
-            spacing: 3
-            // Workaround: we don't want the Slider animation!
-            height: 95
+            spacing: 10
+            width: parent.width
+            // Workaround: we don't want the Slider animation to resize this!
+            height: Theme.itemSizeMedium
 
-            IconButton {
-                icon.source: "image://theme/icon-camera-focus"
+            IconTextSwitch {
+                checked: true
+                icon.source: "image://theme/icon-s-edit"
                 anchors.verticalCenter: parent.verticalCenter
+                width: 120
+
+                // Don't waste space
+                rightMargin: 0
 
                 // default value for the rubber
-                property real prevLineWidth: 20;
+                property real prevLineWidth: defaultRubberSize;
 
-                onClicked: {
+                onCheckedChanged: {
                     if (canvas.strokeStyle === defaultStrokeColor) {
+                        icon.source = "image://theme/icon-camera-focus"
                         canvas.strokeStyle = defaultFillColor;
                     } else {
+                        icon.source = "image://theme/icon-s-edit"
                         canvas.strokeStyle = defaultStrokeColor;
                     }
 
@@ -68,9 +71,13 @@ Page {
                 stepSize: 1
                 value: defaultStrokeSize
                 valueText: value
-                width: 400
-                // Workaround: we don't want the Slider animation!
-                height: 120
+                width: 300
+
+                anchors.verticalCenter: parent.verticalCenter
+
+                // Don't waste space
+                leftMargin: 0
+                rightMargin: 0
 
                 onValueChanged: {
                     valueText = canvas.lineWidth = value;
@@ -100,6 +107,11 @@ Page {
                 anchors.fill: parent
                 antialiasing: true
 
+                property int startX
+                property int startY
+                property int finishX
+                property int finishY
+
                 property real lineWidth: defaultStrokeSize
                 property string strokeStyle: defaultStrokeColor
 
@@ -135,17 +147,17 @@ Page {
                     anchors.fill: parent
 
                     onPressed: {
-                        startX = finishX = mouseX;
-                        startY = finishY = mouseY;
+                        parent.startX = parent.finishX = mouseX;
+                        parent.startY = parent.finishY = mouseY;
                     }
 
                     onMouseXChanged: {
-                        finishX = mouseX;
+                        parent.finishX = mouseX;
                         parent.requestPaint();
                     }
 
                     onMouseYChanged: {
-                        finishY = mouseY;
+                        parent.finishY = mouseY;
                         parent.requestPaint();
                     }
                 }
diff --git a/translations/harbour-papocchio.ts b/translations/harbour-papocchio.ts
index d8c0c15..a9478ea 100644
--- a/translations/harbour-papocchio.ts
+++ b/translations/harbour-papocchio.ts
@@ -12,7 +12,7 @@
 <context>
     <name>MainPage</name>
     <message>
-        <location filename="../qml/pages/MainPage.qml" line="84"/>
+        <location filename="../qml/pages/MainPage.qml" line="92"/>
         <source>Clearing the canvas...</source>
         <translation type="unfinished"></translation>
     </message>