diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml
index be0b12af19..bdffee4ff3 100755
--- a/resources/qml/Sidebar.qml
+++ b/resources/qml/Sidebar.qml
@@ -121,7 +121,7 @@ Rectangle
         anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
         anchors.top: headerSeparator.bottom
         anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
-        width: parent.width * 0.45 - 2 * UM.Theme.getSize("sidebar_margin").width
+        width: parent.width * 0.45
         font: UM.Theme.getFont("large")
         color: UM.Theme.getColor("text")
         visible: !monitoringPrint
@@ -223,7 +223,7 @@ Rectangle
         {
             id: globalProfileLabel
             text: catalog.i18nc("@label","Profile:");
-            width: parent.width * 0.45 - UM.Theme.getSize("sidebar_margin").width
+            width: parent.width * 0.45 - UM.Theme.getSize("sidebar_margin").width - 2
             font: UM.Theme.getFont("default");
             color: UM.Theme.getColor("text");
             verticalAlignment: Text.AlignVCenter
@@ -247,7 +247,7 @@ Rectangle
             }
             enabled: !header.currentExtruderVisible || header.currentExtruderIndex > -1
 
-            width: parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width
+            width: parent.width * 0.55
             height: UM.Theme.getSize("setting_control").height
             anchors.left: globalProfileLabel.right
             anchors.right: parent.right
diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml
index 54605dd860..391b6c131a 100644
--- a/resources/qml/SidebarHeader.qml
+++ b/resources/qml/SidebarHeader.qml
@@ -17,7 +17,7 @@ Column
     property int currentExtruderIndex: ExtruderManager.activeExtruderIndex;
     property bool currentExtruderVisible: extrudersList.visible;
 
-    spacing: UM.Theme.getSize("sidebar_margin").height / 2
+    spacing: UM.Theme.getSize("sidebar_margin").width * 0.9
 
     signal showTooltip(Item item, point location, string text)
     signal hideTooltip()
@@ -58,10 +58,10 @@ Column
         anchors
         {
             left: parent.left
-            leftMargin: UM.Theme.getSize("default_margin").width * 1.4
+            leftMargin: UM.Theme.getSize("sidebar_margin").width * 0.7
             right: parent.right
-            rightMargin: UM.Theme.getSize("default_margin").width * 1.4
-            topMargin: UM.Theme.getSize("default_margin").height
+            rightMargin: UM.Theme.getSize("sidebar_margin").width * 0.7
+            topMargin: UM.Theme.getSize("sidebar_margin").height
         }
 
         ListView
diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml
index 8d83dd1468..c2882f8e0e 100644
--- a/resources/qml/SidebarSimple.qml
+++ b/resources/qml/SidebarSimple.qml
@@ -40,7 +40,7 @@ Item
                 id: infillCellLeft
                 anchors.top: parent.top
                 anchors.left: parent.left
-                anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
+                anchors.topMargin: UM.Theme.getSize("sidebar_margin").height * 0.8
                 width: UM.Theme.getSize("sidebar").width * .45 - UM.Theme.getSize("sidebar_margin").width
                 height: childrenRect.height
 
@@ -275,7 +275,7 @@ Item
                 property alias _hovered: enableSupportMouseArea.containsMouse
 
                 anchors.top: infillCellRight.bottom
-                anchors.topMargin: UM.Theme.getSize("sidebar_margin").height * 2
+                anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
                 anchors.left: infillCellRight.left
 
                 style: UM.Theme.styles.checkbox;