diff --git a/resources/profiles/general/High+Quality.cfg b/resources/profiles/general/High+Quality.cfg
index 8437ae5b2a..d3545b04cf 100644
--- a/resources/profiles/general/High+Quality.cfg
+++ b/resources/profiles/general/High+Quality.cfg
@@ -1,6 +1,7 @@
 [general]
 version = 1
 name = High Quality
+weight = -3
 
 [settings]
 layer_height = 0.06
diff --git a/resources/profiles/general/Low+Quality.cfg b/resources/profiles/general/Low+Quality.cfg
index a0ca2e3047..96c1778826 100644
--- a/resources/profiles/general/Low+Quality.cfg
+++ b/resources/profiles/general/Low+Quality.cfg
@@ -1,6 +1,7 @@
 [general]
 version = 1
 name = Low Quality
+weight = -1
 
 [settings]
 infill_sparse_density = 10
diff --git a/resources/profiles/general/Normal+Quality.cfg b/resources/profiles/general/Normal+Quality.cfg
index eff525ef79..695eb77b91 100644
--- a/resources/profiles/general/Normal+Quality.cfg
+++ b/resources/profiles/general/Normal+Quality.cfg
@@ -1,6 +1,7 @@
 [general]
 version = 1
 name = Normal Quality
+weight = -2
 
 [settings]
 speed_wall_0 = 30
diff --git a/resources/profiles/general/Ulti+Quality.cfg b/resources/profiles/general/Ulti+Quality.cfg
index 2cf02f106a..d0c17514c6 100644
--- a/resources/profiles/general/Ulti+Quality.cfg
+++ b/resources/profiles/general/Ulti+Quality.cfg
@@ -1,6 +1,7 @@
 [general]
 version = 1
 name = Ulti Quality
+weight = -4
 
 [settings]
 layer_height = 0.04
diff --git a/resources/profiles/ultimaker2+/abs_0.25_high.curaprofile b/resources/profiles/ultimaker2+/abs_0.25_high.curaprofile
index 474212a553..ea3384c8ba 100644
--- a/resources/profiles/ultimaker2+/abs_0.25_high.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.25_high.curaprofile
@@ -4,6 +4,7 @@ name = High Quality
 machine_type = ultimaker2plus
 machine_variant = 0.25 mm
 material = ABS
+weight = -3
 
 [settings]
 raft_surface_thickness = 0.27
diff --git a/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile
index dad488661a..fb88afba46 100644
--- a/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile
@@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.25 mm
 material = ABS
+weight = -2
 
 [settings]
 layer_height = 0.06
diff --git a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile
index 444c168b86..92385c9a57 100644
--- a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile
@@ -4,6 +4,7 @@ name = Fast Print
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = ABS
+weight = -1
 
 [settings]
 layer_height = 0.15
diff --git a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
index 4fb2b49fe3..a83c61928c 100644
--- a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
@@ -4,6 +4,7 @@ name = High Quality
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = ABS
+weight = -3
 
 [settings]
 layer_height = 0.06
@@ -18,7 +19,7 @@ adhesion_type = brim
 cool_min_speed = 20
 line_width = 0.35
 infill_sparse_density = 22
-machine_nozzle_size = 0.35  
+machine_nozzle_size = 0.35
 speed_wall_0 = 20
 cool_min_layer_time = 3
 cool_lift_head = True
diff --git a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile
index a8d63d07db..e77daeb6da 100644
--- a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile
@@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = ABS
+weight = -2
 
 [settings]
 layer_height_0 = 0.26
diff --git a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile
index a0aa77129b..4bbfb50bf7 100644
--- a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile
@@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.6 mm
 material = ABS
+weight = -2
 
 [settings]
 layer_height = 0.15
diff --git a/resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile b/resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile
index 2824a8c077..27b56ef3a5 100644
--- a/resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile
@@ -4,6 +4,7 @@ name = Fast Prints
 machine_type = ultimaker2plus
 machine_variant = 0.8 mm
 material = ABS
+weight = -1
 
 [settings]
 raft_surface_thickness = 0.27
diff --git a/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile
index 94e08a790c..96d4079462 100644
--- a/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile
@@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.8 mm
 material = ABS
+weight = -2
 
 [settings]
 layer_height = 0.2
diff --git a/resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile b/resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile
index ac95f856bf..b9b24cc479 100644
--- a/resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile
@@ -4,6 +4,7 @@ name = High Quality
 machine_type = ultimaker2plus
 machine_variant = 0.25 mm
 material = CPE
+weight = -3
 
 [settings]
 cool_fan_speed_min = 50
diff --git a/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile
index f5f5e24d61..14c29ae70c 100644
--- a/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile
@@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.25 mm
 material = CPE
+weight = -2
 
 [settings]
 infill_overlap = 17
diff --git a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile
index 7880c2584c..53243a7e4f 100644
--- a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile
@@ -4,6 +4,7 @@ name = Fast Print
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = CPE
+weight = -1
 
 [settings]
 infill_overlap = 17
diff --git a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile
index d4aad942ca..a809c4d81e 100644
--- a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile
@@ -4,6 +4,7 @@ name = High Quality
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = CPE
+weight = -3
 
 [settings]
 layer_height = 0.06
diff --git a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile
index ae721733e5..ed51c2cb38 100644
--- a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile
@@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = CPE
+weight = -2
 
 [settings]
 layer_height_0 = 0.26
diff --git a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile
index 56738c556f..54114888e8 100644
--- a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile
@@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.6 mm
 material = CPE
+weight = -2
 
 [settings]
 infill_overlap = 17
diff --git a/resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile b/resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile
index f5025c049f..0531b5169d 100644
--- a/resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile
@@ -4,6 +4,7 @@ name = Fast Prints
 machine_type = ultimaker2plus
 machine_variant = 0.8 mm
 material = CPE
+weight = -1
 
 [settings]
 cool_fan_speed_min = 50
diff --git a/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile
index 054c5dbe88..d04620e834 100644
--- a/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile
@@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.8 mm
 material = CPE
+weight = -2
 
 [settings]
 infill_overlap = 17
diff --git a/resources/profiles/ultimaker2+/pla_0.25_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_high.curaprofile
index 3951f92ef4..e54b0f2403 100644
--- a/resources/profiles/ultimaker2+/pla_0.25_high.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.25_high.curaprofile
@@ -4,6 +4,7 @@ name = High Quality
 machine_type = ultimaker2plus
 machine_variant = 0.25 mm
 material = PLA
+weight = -3
 
 [settings]
 retraction_combing = All
diff --git a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
index da48907c11..25973e4549 100644
--- a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
@@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.25 mm
 material = PLA
+weight = -2
 
 [settings]
 machine_nozzle_size = 0.22
diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
index 43bc715372..0c47c7cafc 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
@@ -4,6 +4,7 @@ name = Fast Print
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = PLA
+weight = -1
 
 [settings]
 machine_nozzle_size = 0.35
diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
index a338d61637..7e3d7564eb 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
@@ -4,6 +4,7 @@ name = High Quality
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = PLA
+weight = -3
 
 [settings]
 machine_nozzle_size = 0.35
diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
index 6f46ec4c7a..4fb58e0a59 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
@@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = PLA
+weight = -2
 
 [settings]
 machine_nozzle_size = 0.35
diff --git a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
index b342b8cde4..4f7971700f 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
@@ -4,6 +4,7 @@ name = Ulti Quality
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = PLA
+weight = -4
 
 [settings]
 machine_nozzle_size = 0.35
diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
index 0a4d760a61..30f9b16f64 100644
--- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
@@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.6 mm
 material = PLA
+weight = -2
 
 [settings]
 machine_nozzle_size = 0.53
diff --git a/resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile
index af64414465..7ce224ead8 100644
--- a/resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile
@@ -4,6 +4,7 @@ name = Fast Prints
 machine_type = ultimaker2plus
 machine_variant = 0.8 mm
 material = PLA
+weight = -1
 
 [settings]
 retraction_combing = All
diff --git a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
index b8d88fabfc..e19e59f131 100644
--- a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
@@ -4,6 +4,7 @@ name = Normal Quality
 machine_type = ultimaker2plus
 machine_variant = 0.8 mm
 material = PLA
+weight = -2
 
 [settings]
 machine_nozzle_size = 0.7
diff --git a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile
index 11f354a043..3c19b261b7 100644
--- a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile
@@ -3,6 +3,7 @@ version = 1
 name = Normal Quality
 machine_type = ultimaker2_olsson
 machine_variant = 0.25 mm
+weight = -2
 
 [settings]
 machine_nozzle_size = 0.22
diff --git a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile
index 2c4a2b2146..ec614d4d3b 100644
--- a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile
@@ -3,6 +3,7 @@ version = 1
 name = Fast Print
 machine_type = ultimaker2_olsson
 machine_variant = 0.4 mm
+weight = -1
 
 [settings]
 machine_nozzle_size = 0.35
diff --git a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile
index 3c3d8325c9..de9266774c 100644
--- a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile
@@ -3,6 +3,7 @@ version = 1
 name = High Quality
 machine_type = ultimaker2_olsson
 machine_variant = 0.4 mm
+weight = -3
 
 [settings]
 machine_nozzle_size = 0.35
diff --git a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile
index 53a716b0ff..f7420409f8 100644
--- a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile
@@ -3,6 +3,7 @@ version = 1
 name = Normal Quality
 machine_type = ultimaker2_olsson
 machine_variant = 0.4 mm
+weight = -2
 
 [settings]
 machine_nozzle_size = 0.35
diff --git a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile
index c51d49b80d..8ea28cc303 100644
--- a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile
@@ -3,6 +3,7 @@ version = 1
 name = Ulti Quality
 machine_type = ultimaker2_olsson
 machine_variant = 0.4 mm
+weight = -4
 
 [settings]
 machine_nozzle_size = 0.35
diff --git a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile
index 055ebd13fe..b9331438ea 100644
--- a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile
@@ -3,6 +3,7 @@ version = 1
 name = Normal Quality
 machine_type = ultimaker2_olsson
 machine_variant = 0.6 mm
+weight = -2
 
 [settings]
 machine_nozzle_size = 0.53
diff --git a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile
index d346d3105b..0fe5296135 100644
--- a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile
@@ -3,6 +3,7 @@ version = 1
 name = Normal Quality
 machine_type = ultimaker2_olsson
 machine_variant = 0.8 mm
+weight = -2
 
 [settings]
 machine_nozzle_size = 0.7
diff --git a/resources/qml/ProfileSetup.qml b/resources/qml/ProfileSetup.qml
index e8d966ae40..62d37e8ed3 100644
--- a/resources/qml/ProfileSetup.qml
+++ b/resources/qml/ProfileSetup.qml
@@ -32,8 +32,9 @@ Item{
             color: UM.Theme.getColor("text");
         }
 
-
         ToolButton {
+            property int rightMargin: customisedSettings.visible ? customisedSettings.width + UM.Theme.getSize("default_margin").width / 2 : 0
+
             id: globalProfileSelection
             text: UM.MachineManager.activeProfile
             width: parent.width/100*55
@@ -83,5 +84,21 @@ Item{
                 }
             }
         }
+        UM.SimpleButton {
+            id: customisedSettings
+
+            visible: UM.ActiveProfile.hasCustomisedValues
+            height: parent.height * 0.6
+            width: parent.height * 0.6
+
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.right: parent.right
+            anchors.rightMargin: UM.Theme.getSize("setting_preferences_button_margin").width
+
+            color: hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button");
+            iconSource: UM.Theme.getIcon("star");
+
+            onClicked: base.manageProfilesAction.trigger()
+        }
     }
 }
diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml
index c877b67f5b..e1d3241d3d 100644
--- a/resources/qml/SidebarSimple.qml
+++ b/resources/qml/SidebarSimple.qml
@@ -268,4 +268,26 @@ Item
             }
         }
     }
+
+    Rectangle {
+        id: tipsCell
+        anchors.top: helpersCellRight.bottom
+        anchors.topMargin: UM.Theme.getSize("default_margin").height
+        anchors.left: parent.left
+        width: parent.width
+        height: childrenRect.height
+
+        Label{
+            anchors.left: parent.left
+            anchors.leftMargin: UM.Theme.getSize("default_margin").width
+            width: parent.width
+            wrapMode: Text.WordWrap
+            //: Tips label
+            text: catalog.i18nc("@label","Need help improving your prints? Read the <a href='%1'>Ultimaker Troubleshooting Guides</a>").arg("https://ultimaker.com/en/troubleshooting");
+            font: UM.Theme.getFont("default");
+            color: UM.Theme.getColor("text");
+            linkColor: UM.Theme.getColor("text_link")
+            onLinkActivated: Qt.openUrlExternally(link)
+        }
+    }
 }
diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml
index 631445d987..4ef78b18aa 100644
--- a/resources/qml/Toolbar.qml
+++ b/resources/qml/Toolbar.qml
@@ -36,14 +36,19 @@ Item {
                 enabled: model.enabled && UM.Selection.hasSelection && UM.Controller.toolsEnabled;
 
                 style: UM.Theme.styles.tool_button;
-
+                onCheckedChanged:
+                {
+                    if(checked)
+                    {
+                        base.activeY = y
+                    }
+                }
                 //Workaround since using ToolButton"s onClicked would break the binding of the checked property, instead
                 //just catch the click so we do not trigger that behaviour.
                 MouseArea {
                     anchors.fill: parent;
                     onClicked: {
                         parent.checked ? UM.Controller.setActiveTool(null) : UM.Controller.setActiveTool(model.id);
-                        base.activeY = parent.y
                     }
                 }
             }
diff --git a/resources/themes/cura/icons/star.svg b/resources/themes/cura/icons/star.svg
new file mode 100644
index 0000000000..e550b36575
--- /dev/null
+++ b/resources/themes/cura/icons/star.svg
@@ -0,0 +1 @@
+<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path d="M1728 647q0 22-26 48l-363 354 86 500q1 7 1 20 0 21-10.5 35.5t-30.5 14.5q-19 0-40-12l-449-236-449 236q-22 12-40 12-21 0-31.5-14.5t-10.5-35.5q0-6 2-20l86-500-364-354q-25-27-25-48 0-37 56-46l502-73 225-455q19-41 49-41t49 41l225 455 502 73q56 9 56 46z"/></svg>
\ No newline at end of file
diff --git a/resources/themes/cura/icons/translate.svg b/resources/themes/cura/icons/translate.svg
new file mode 100644
index 0000000000..12d3cef20a
--- /dev/null
+++ b/resources/themes/cura/icons/translate.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="30px"
+	 height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<g id="frame_30x30" display="none">
+	<rect display="inline" width="30" height="30"/>
+</g>
+<g id="frame_24x24" display="none">
+	<rect x="3" y="3" display="inline" fill="#BCBEC0" width="24" height="24"/>
+</g>
+<g id="icon">
+	<path fill="#FFFFFF" d="M3,27h24l-6-16.001l0.849-2.262l0.348-0.929l0.001,0L24,2.999H6l3,8l-1.684,4.493H3v1
+		h3.94l-0.005,0.015L3,27z M11.424,16.492v2.492l5.18-2.993L11.424,13v2.492H8.383l1.553-4.142l0.132-0.351l-0.132-0.351
+		L9.122,8.477L8.863,7.788L8.772,7.543h0L7.443,3.999h15.114l-1.328,3.544l-0.221,0.588l-0.13,0.345v0l-0.814,2.171l-0.132,0.351
+		l0.132,0.351l1.7,4.534l0.35,0.931L25.557,26H4.443l3.443-9.183l0.122-0.325H11.424z"/>
+</g>
+</svg>
diff --git a/resources/themes/cura/styles.qml b/resources/themes/cura/styles.qml
index 1d0b385fc2..e89966daa4 100644
--- a/resources/themes/cura/styles.qml
+++ b/resources/themes/cura/styles.qml
@@ -34,6 +34,7 @@ QtObject {
                     anchors.left: parent.left;
                     anchors.leftMargin: Theme.getSize("setting_unit_margin").width
                     anchors.right: downArrow.left;
+                    anchors.rightMargin: control.rightMargin;
                     anchors.verticalCenter: parent.verticalCenter;
                     font: Theme.getFont("default")
                 }
diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json
index 1332aedca0..98ad721ab5 100644
--- a/resources/themes/cura/theme.json
+++ b/resources/themes/cura/theme.json
@@ -63,6 +63,7 @@
         "secondary": [245, 245, 245, 255],
 
         "text": [24, 41, 77, 255],
+        "text_link": [12, 169, 227, 255],
         "text_inactive": [174, 174, 174, 255],
         "text_hover": [70, 84, 113, 255],
         "text_pressed": [12, 169, 227, 255],