diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 8419f8b91e..f0ab0e8a81 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -326,9 +326,8 @@ UM.MainWindow
                 anchors
                 {
                     horizontalCenter: parent.horizontalCenter
-                    horizontalCenterOffset: -(UM.Theme.sizes.logo.width/ 2)
-                    top: parent.verticalCenter;
-                    bottom: parent.bottom;
+                    horizontalCenterOffset: -(UM.Theme.sizes.sidebar.width/ 2)
+                    verticalCenter: parent.verticalCenter;
                 }
             }
 
@@ -432,9 +431,9 @@ UM.MainWindow
                 id: toolbar;
 
                 anchors {
-                    left: parent.left
+                    left: openFileButton.right
+                    leftMargin: UM.Theme.sizes.window_margin.width
                     top: parent.top
-                    topMargin: UM.Theme.sizes.window_margin.height + UM.Theme.sizes.button.height
                     //horizontalCenter: parent.horizontalCenter
                     //horizontalCenterOffset: -(UM.Theme.sizes.sidebar.width / 2)
                     //top: parent.top;
diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml
index cdceec6f59..3d4c59a189 100644
--- a/resources/qml/Toolbar.qml
+++ b/resources/qml/Toolbar.qml
@@ -15,7 +15,7 @@ Item {
     height: buttons.height
     property int activeY
 
-    ColumnLayout {
+    RowLayout {
         id: buttons;
 
         anchors.bottom: parent.bottom;
@@ -35,12 +35,14 @@ Item {
                 checked: model.active;
                 enabled: UM.Selection.hasSelection;
 
+                property bool verticalTooltip: true;
                 style: UM.Theme.styles.tool_button;
 
                 //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;
+                    cursorShape: Qt.PointingHandCursor
                     onClicked: {
                         parent.checked ? UM.Controller.setActiveTool(null) : UM.Controller.setActiveTool(model.id);
                         base.activeY = parent.y
@@ -62,7 +64,9 @@ Item {
     Rectangle {
         id: panelBackground;
 
-        anchors.left: parent.right;
+        anchors.left: parent.left;
+        anchors.top: parent.bottom;
+        anchors.topMargin: UM.Theme.sizes.default_margin.width;
         y: base.activeY
 
         width: {