diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml
index 112edb5049..ac36320276 100644
--- a/resources/qml/Settings/SettingItem.qml
+++ b/resources/qml/Settings/SettingItem.qml
@@ -130,11 +130,11 @@ Item {
             id: settingControls
 
             height: parent.height / 2
-            spacing: UM.Theme.getSize("default_margin").width / 2
+            spacing: UM.Theme.getSize("sidebar_margin").width / 2
 
             anchors {
                 right: controlContainer.left
-                rightMargin: UM.Theme.getSize("default_margin").width / 2
+                rightMargin: UM.Theme.getSize("sidebar_margin").width / 2
                 verticalCenter: parent.verticalCenter
             }
 
@@ -293,7 +293,7 @@ Item {
             enabled: propertyProvider.isValueUsed
 
             anchors.right: parent.right;
-            anchors.rightMargin: UM.Theme.getSize("default_margin").width
+            anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
             anchors.verticalCenter: parent.verticalCenter;
             width: UM.Theme.getSize("setting_control").width;
             height: UM.Theme.getSize("setting_control").height
diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml
index e16c8ef019..183ea5e7c3 100644
--- a/resources/qml/Settings/SettingView.qml
+++ b/resources/qml/Settings/SettingView.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Ultimaker B.V.
+// Copyright (c) 2017 Ultimaker B.V.
 // Uranium is released under the terms of the AGPLv3 or higher.
 
 import QtQuick 2.2
@@ -42,9 +42,9 @@ Item
         {
             top: parent.top
             left: parent.left
-            leftMargin: UM.Theme.getSize("default_margin").width
+            leftMargin: UM.Theme.getSize("sidebar_margin").width
             right: parent.right
-            rightMargin: UM.Theme.getSize("default_margin").width
+            rightMargin: UM.Theme.getSize("sidebar_margin").width
         }
         height: visible ? UM.Theme.getSize("setting_control").height : 0
         Behavior on height { NumberAnimation { duration: 100 } }
@@ -55,7 +55,7 @@ Item
 
             anchors.left: parent.left
             anchors.right: clearFilterButton.left
-            anchors.rightMargin: UM.Theme.getSize("default_margin").width
+            anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
 
             placeholderText: catalog.i18nc("@label:textbox", "Search...")
 
@@ -119,7 +119,7 @@ Item
 
             anchors.verticalCenter: parent.verticalCenter
             anchors.right: parent.right
-            anchors.rightMargin: UM.Theme.getSize("default_margin").width
+            anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
 
             color: UM.Theme.getColor("setting_control_button")
             hoverColor: UM.Theme.getColor("setting_control_button_hover")
@@ -138,7 +138,7 @@ Item
         anchors.bottom: parent.bottom;
         anchors.right: parent.right;
         anchors.left: parent.left;
-        anchors.topMargin: filterContainer.visible ? UM.Theme.getSize("default_margin").width : 0
+        anchors.topMargin: filterContainer.visible ? UM.Theme.getSize("sidebar_margin").height : 0
         Behavior on anchors.topMargin { NumberAnimation { duration: 100 } }
 
         style: UM.Theme.styles.scrollview;
diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml
index c527e961df..d1917f23ce 100755
--- a/resources/qml/Sidebar.qml
+++ b/resources/qml/Sidebar.qml
@@ -101,7 +101,7 @@ Rectangle
         height: visible ? UM.Theme.getSize("sidebar_lining").height : 0
         color: UM.Theme.getColor("sidebar_lining")
         anchors.top: header.bottom
-        anchors.topMargin: visible ? UM.Theme.getSize("default_margin").height : 0
+        anchors.topMargin: visible ? UM.Theme.getSize("sidebar_margin").height : 0
     }
 
     onCurrentModeIndexChanged:
@@ -117,10 +117,10 @@ Rectangle
         id: settingsModeLabel
         text: !hideSettings ? catalog.i18nc("@label:listbox", "Print Setup") : catalog.i18nc("@label:listbox","Print Setup disabled\nG-code files cannot be modified");
         anchors.left: parent.left
-        anchors.leftMargin: UM.Theme.getSize("default_margin").width;
+        anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
         anchors.top: headerSeparator.bottom
-        anchors.topMargin: UM.Theme.getSize("default_margin").height
-        width: parent.width * 0.45 - 2 * UM.Theme.getSize("default_margin").width
+        anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
+        width: parent.width * 0.45 - 2 * UM.Theme.getSize("sidebar_margin").width
         font: UM.Theme.getFont("large")
         color: UM.Theme.getColor("text")
         visible: !monitoringPrint
@@ -133,9 +133,9 @@ Rectangle
         width: parent.width * 0.55
         height: UM.Theme.getSize("sidebar_header_mode_toggle").height
         anchors.right: parent.right
-        anchors.rightMargin: UM.Theme.getSize("default_margin").width
+        anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
         anchors.top: headerSeparator.bottom
-        anchors.topMargin: UM.Theme.getSize("default_margin").height
+        anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
         visible: !monitoringPrint && !hideSettings
         Component{
             id: wizardDelegate
@@ -211,18 +211,18 @@ Rectangle
         anchors
         {
             top: settingsModeSelection.bottom
-            topMargin: UM.Theme.getSize("default_margin").width
+            topMargin: UM.Theme.getSize("sidebar_margin").height
             left: parent.left
-            leftMargin: UM.Theme.getSize("default_margin").width
+            leftMargin: UM.Theme.getSize("sidebar_margin").width
             right: parent.right
-            rightMargin: UM.Theme.getSize("default_margin").width
+            rightMargin: UM.Theme.getSize("sidebar_margin").width
         }
 
         Text
         {
             id: globalProfileLabel
             text: catalog.i18nc("@label","Profile:");
-            width: parent.width * 0.45 - UM.Theme.getSize("default_margin").width
+            width: parent.width * 0.45 - UM.Theme.getSize("sidebar_margin").width
             font: UM.Theme.getFont("default");
             color: UM.Theme.getColor("text");
             verticalAlignment: Text.AlignVCenter
@@ -246,7 +246,7 @@ Rectangle
             }
             enabled: !header.currentExtruderVisible || header.currentExtruderIndex > -1
 
-            width: parent.width * 0.7 + UM.Theme.getSize("default_margin").width
+            width: parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width
             height: UM.Theme.getSize("setting_control").height
             anchors.right: parent.right
             tooltip: Cura.MachineManager.activeQualityName
@@ -265,7 +265,7 @@ Rectangle
 
                 anchors.verticalCenter: parent.verticalCenter
                 anchors.right: parent.right
-                anchors.rightMargin: UM.Theme.getSize("setting_preferences_button_margin").width - UM.Theme.getSize("default_margin").width
+                anchors.rightMargin: UM.Theme.getSize("setting_preferences_button_margin").width - UM.Theme.getSize("sidebar_margin").width
 
                 color: hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button");
                 iconSource: UM.Theme.getIcon("star");
@@ -278,7 +278,7 @@ Rectangle
                 onEntered:
                 {
                     var content = catalog.i18nc("@tooltip","Some setting/override values are different from the values stored in the profile.\n\nClick to open the profile manager.")
-                    base.showTooltip(globalProfileRow, Qt.point(-UM.Theme.getSize("default_margin").width, 0),  content)
+                    base.showTooltip(globalProfileRow, Qt.point(-UM.Theme.getSize("sidebar_margin").width, 0),  content)
                 }
                 onExited: base.hideTooltip()
             }
@@ -291,7 +291,7 @@ Rectangle
 
         anchors.bottom: footerSeparator.top
         anchors.top: globalProfileRow.bottom
-        anchors.topMargin: UM.Theme.getSize("default_margin").height
+        anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
         anchors.left: base.left
         anchors.right: base.right
         visible: !monitoringPrint && !hideSettings
@@ -377,7 +377,7 @@ Rectangle
         height: UM.Theme.getSize("sidebar_lining").height
         color: UM.Theme.getColor("sidebar_lining")
         anchors.bottom: printSpecs.top
-        anchors.bottomMargin: UM.Theme.getSize("default_margin").height * 2 + UM.Theme.getSize("progressbar").height + UM.Theme.getFont("default_bold").pixelSize
+        anchors.bottomMargin: UM.Theme.getSize("sidebar_margin").height * 2 + UM.Theme.getSize("progressbar").height + UM.Theme.getFont("default_bold").pixelSize
     }
 
     Rectangle
@@ -385,8 +385,8 @@ Rectangle
         id: printSpecs
         anchors.left: parent.left
         anchors.bottom: parent.bottom
-        anchors.leftMargin: UM.Theme.getSize("default_margin").width
-        anchors.bottomMargin: UM.Theme.getSize("default_margin").height
+        anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
+        anchors.bottomMargin: UM.Theme.getSize("sidebar_margin").height
         height: childrenRect.height
 
         UM.TooltipArea
@@ -498,7 +498,7 @@ Rectangle
         id: saveButton
         implicitWidth: base.width
         anchors.top: footerSeparator.bottom
-        anchors.topMargin: UM.Theme.getSize("default_margin").height
+        anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
         anchors.bottom: parent.bottom
         visible: !monitoringPrint
     }
@@ -508,7 +508,7 @@ Rectangle
         id: monitorButton
         implicitWidth: base.width
         anchors.top: footerSeparator.bottom
-        anchors.topMargin: UM.Theme.getSize("default_margin").height
+        anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
         anchors.bottom: parent.bottom
         visible: monitoringPrint
     }
diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml
index 419cb5f2dd..85d350d435 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("default_margin").height
+    spacing: UM.Theme.getSize("sidebar_margin").height
 
     signal showTooltip(Item item, point location, string text)
     signal hideTooltip()
@@ -133,9 +133,9 @@ Column
                         {
                             anchors.verticalCenter: parent.verticalCenter
                             anchors.left: swatch.visible ? swatch.right : parent.left
-                            anchors.leftMargin: swatch.visible ? UM.Theme.getSize("default_margin").width / 2 : UM.Theme.getSize("default_margin").width
+                            anchors.leftMargin: swatch.visible ? UM.Theme.getSize("sidebar_margin").width / 2 : UM.Theme.getSize("sidebar_margin").width
                             anchors.right: parent.right
-                            anchors.rightMargin: UM.Theme.getSize("default_margin").width / 2
+                            anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width / 2
 
                             color: control.checked ? UM.Theme.getColor("tab_checked_text") :
                                    control.pressed ? UM.Theme.getColor("tab_active_text") :
@@ -155,7 +155,7 @@ Column
     Item
     {
         id: variantRowSpacer
-        height: UM.Theme.getSize("default_margin").height / 4
+        height: UM.Theme.getSize("sidebar_margin").height / 4
         width: height
         visible: !extruderSelectionRow.visible
     }
@@ -170,16 +170,16 @@ Column
         anchors
         {
             left: parent.left
-            leftMargin: UM.Theme.getSize("default_margin").width
+            leftMargin: UM.Theme.getSize("sidebar_margin").width
             right: parent.right
-            rightMargin: UM.Theme.getSize("default_margin").width
+            rightMargin: UM.Theme.getSize("sidebar_margin").width
         }
 
         Text
         {
             id: printCoreLabel
             text: Cura.MachineManager.activeDefinitionVariantsName;
-            width: parent.width * 0.45 - UM.Theme.getSize("default_margin").width
+            width: parent.width * 0.45 - UM.Theme.getSize("sidebar_margin").width
             font: UM.Theme.getFont("default");
             color: UM.Theme.getColor("text");
         }
@@ -191,7 +191,7 @@ Column
             visible: Cura.MachineManager.hasVariants
 
             height: UM.Theme.getSize("setting_control").height
-            width: parent.width * 0.7 + UM.Theme.getSize("default_margin").width
+            width: parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width
             anchors.right: parent.right
             style: UM.Theme.styles.sidebar_header_button
             activeFocusOnPress: true;
@@ -210,16 +210,16 @@ Column
         anchors
         {
             left: parent.left
-            leftMargin: UM.Theme.getSize("default_margin").width
+            leftMargin: UM.Theme.getSize("sidebar_margin").width
             right: parent.right
-            rightMargin: UM.Theme.getSize("default_margin").width
+            rightMargin: UM.Theme.getSize("sidebar_margin").width
         }
 
         Text
         {
             id: materialLabel
             text: catalog.i18nc("@label","Material");
-            width: parent.width * 0.45 - UM.Theme.getSize("default_margin").width
+            width: parent.width * 0.45 - UM.Theme.getSize("sidebar_margin").width
             font: UM.Theme.getFont("default");
             color: UM.Theme.getColor("text");
         }
@@ -247,7 +247,7 @@ Column
             enabled: !extrudersList.visible || base.currentExtruderIndex  > -1
 
             height: UM.Theme.getSize("setting_control").height
-            width: parent.width * 0.7 + UM.Theme.getSize("default_margin").width
+            width: parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width
             anchors.right: parent.right
             style: UM.Theme.styles.sidebar_header_button
             activeFocusOnPress: true;
@@ -266,16 +266,16 @@ Column
         anchors
         {
             left: parent.left
-            leftMargin: UM.Theme.getSize("default_margin").width
+            leftMargin: UM.Theme.getSize("sidebar_margin").width
             right: parent.right
-            rightMargin: UM.Theme.getSize("default_margin").width
+            rightMargin: UM.Theme.getSize("sidebar_margin").width
         }
 
         Item
         {
             height: UM.Theme.getSize("sidebar_setup").height
             anchors.right: parent.right
-            width: parent.width * 0.7 + UM.Theme.getSize("default_margin").width
+            width: parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width
 
             Text
             {
@@ -307,7 +307,7 @@ Column
                         var content = catalog.i18nc("@tooltip", "Click to check the material compatibility on Ultimaker.com.");
                         base.showTooltip(
                             materialInfoRow,
-                            Qt.point(-UM.Theme.getSize("default_margin").width, 0),
+                            Qt.point(-UM.Theme.getSize("sidebar_margin").width, 0),
                             catalog.i18nc("@tooltip", content)
                         );
                     }
diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml
index 7fb44e9a7c..2f9adfc510 100644
--- a/resources/qml/SidebarSimple.qml
+++ b/resources/qml/SidebarSimple.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2016 Ultimaker B.V.
+// Copyright (c) 2017 Ultimaker B.V.
 // Cura is released under the terms of the AGPLv3 or higher.
 
 import QtQuick 2.2
@@ -30,8 +30,8 @@ Item
         id: infillCellLeft
         anchors.top: parent.top
         anchors.left: parent.left
-        anchors.topMargin: UM.Theme.getSize("default_margin").height
-        width: base.width * .45 - UM.Theme.getSize("default_margin").width
+        anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
+        width: base.width * .45 - UM.Theme.getSize("sidebar_margin").width
         height: childrenRect.height
 
         Text
@@ -42,9 +42,9 @@ Item
             font: UM.Theme.getFont("default");
             color: UM.Theme.getColor("text");
             anchors.top: parent.top
-            anchors.topMargin: UM.Theme.getSize("default_margin").height
+            anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
             anchors.left: parent.left
-            anchors.leftMargin: UM.Theme.getSize("default_margin").width
+            anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
         }
     }
 
@@ -55,7 +55,7 @@ Item
         height: childrenRect.height;
         width: base.width * .55
 
-        spacing: UM.Theme.getSize("default_margin").width
+        spacing: UM.Theme.getSize("sidebar_margin").width
 
         anchors.left: infillCellLeft.right
         anchors.top: infillCellLeft.top
@@ -88,7 +88,7 @@ Item
                 {
                     id: infillIconLining
 
-                    width: (infillCellRight.width - ((infillModel.count - 1)  * UM.Theme.getSize("default_margin").width)) / (infillModel.count);
+                    width: (infillCellRight.width - ((infillModel.count - 1)  * UM.Theme.getSize("sidebar_margin").width)) / (infillModel.count);
                     height: width
 
                     border.color:
@@ -169,7 +169,7 @@ Item
                 Text
                 {
                     id: infillLabel
-                    width: (infillCellRight.width - ((infillModel.count - 1)  * UM.Theme.getSize("default_margin").width)) / (infillModel.count);
+                    width: (infillCellRight.width - ((infillModel.count - 1)  * UM.Theme.getSize("sidebar_margin").width)) / (infillModel.count);
                     horizontalAlignment: Text.AlignHCenter
                     verticalAlignment: Text.AlignVCenter
                     wrapMode: Text.WordWrap
@@ -252,7 +252,7 @@ Item
     {
         id: helpersCell
         anchors.top: infillCellRight.bottom
-        anchors.topMargin: UM.Theme.getSize("default_margin").height * 2
+        anchors.topMargin: UM.Theme.getSize("sidebar_margin").height * 2
         anchors.left: parent.left
         anchors.right: parent.right
         height: childrenRect.height
@@ -261,9 +261,9 @@ Item
         {
             id: enableSupportLabel
             anchors.left: parent.left
-            anchors.leftMargin: UM.Theme.getSize("default_margin").width
+            anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
             anchors.verticalCenter: enableSupportCheckBox.verticalCenter
-            width: parent.width * .45 - 3 * UM.Theme.getSize("default_margin").width
+            width: parent.width * .45 - 3 * UM.Theme.getSize("sidebar_margin").width
             text: catalog.i18nc("@label", "Generate Support");
             font: UM.Theme.getFont("default");
             color: UM.Theme.getColor("text");
@@ -276,7 +276,7 @@ Item
 
             anchors.top: parent.top
             anchors.left: enableSupportLabel.right
-            anchors.leftMargin: UM.Theme.getSize("default_margin").width
+            anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
 
             style: UM.Theme.styles.checkbox;
             enabled: base.settingsEnabled
@@ -311,9 +311,9 @@ Item
             id: supportExtruderLabel
             visible: (supportEnabled.properties.value == "True") && (machineExtruderCount.properties.value > 1)
             anchors.left: parent.left
-            anchors.leftMargin: UM.Theme.getSize("default_margin").width
+            anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
             anchors.verticalCenter: supportExtruderCombobox.verticalCenter
-            width: parent.width * .45 - 3 * UM.Theme.getSize("default_margin").width
+            width: parent.width * .45 - 3 * UM.Theme.getSize("sidebar_margin").width
             text: catalog.i18nc("@label", "Support Extruder");
             font: UM.Theme.getFont("default");
             color: UM.Theme.getColor("text");
@@ -344,7 +344,7 @@ Item
             {
                 if ((supportEnabled.properties.value == "True") && (machineExtruderCount.properties.value > 1))
                 {
-                    return UM.Theme.getSize("default_margin").height;
+                    return UM.Theme.getSize("sidebar_margin").height;
                 }
                 else
                 {
@@ -352,7 +352,7 @@ Item
                 }
             }
             anchors.left: supportExtruderLabel.right
-            anchors.leftMargin: UM.Theme.getSize("default_margin").width
+            anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
             width: parent.width * .55
             height:
             {
@@ -410,9 +410,9 @@ Item
         {
             id: adhesionHelperLabel
             anchors.left: parent.left
-            anchors.leftMargin: UM.Theme.getSize("default_margin").width
+            anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
             anchors.verticalCenter: adhesionCheckBox.verticalCenter
-            width: parent.width * .45 - 3 * UM.Theme.getSize("default_margin").width
+            width: parent.width * .45 - 3 * UM.Theme.getSize("sidebar_margin").width
             text: catalog.i18nc("@label", "Build Plate Adhesion");
             font: UM.Theme.getFont("default");
             color: UM.Theme.getColor("text");
@@ -425,9 +425,9 @@ Item
             property alias _hovered: adhesionMouseArea.containsMouse
 
             anchors.top: supportExtruderCombobox.bottom
-            anchors.topMargin: UM.Theme.getSize("default_margin").height * 2
+            anchors.topMargin: UM.Theme.getSize("sidebar_margin").height * 2
             anchors.left: adhesionHelperLabel.right
-            anchors.leftMargin: UM.Theme.getSize("default_margin").width
+            anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
 
             //: Setting enable printing build-plate adhesion helper checkbox
             style: UM.Theme.styles.checkbox;
@@ -500,7 +500,7 @@ Item
     {
         id: tipsCell
         anchors.top: helpersCell.bottom
-        anchors.topMargin: UM.Theme.getSize("default_margin").height * 2
+        anchors.topMargin: UM.Theme.getSize("sidebar_margin").height * 2
         anchors.left: parent.left
         width: parent.width
         height: childrenRect.height
@@ -508,9 +508,9 @@ Item
         Text
         {
             anchors.left: parent.left
-            anchors.leftMargin: UM.Theme.getSize("default_margin").width
+            anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
             anchors.right: parent.right
-            anchors.rightMargin: UM.Theme.getSize("default_margin").width
+            anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
             wrapMode: Text.WordWrap
             //: Tips label
             text: catalog.i18nc("@label", "Need help improving your prints?<br>Read the <a href='%1'>Ultimaker Troubleshooting Guides</a>").arg("https://ultimaker.com/en/troubleshooting") + "<img src='%1'></img>".arg(UM.Theme.getIcon("play"))
diff --git a/resources/themes/cura/styles.qml b/resources/themes/cura/styles.qml
index e9e3f8ce75..b98a90a136 100755
--- a/resources/themes/cura/styles.qml
+++ b/resources/themes/cura/styles.qml
@@ -363,9 +363,9 @@ QtObject {
             background: Rectangle {
                 anchors.fill: parent;
                 anchors.left: parent.left
-                anchors.leftMargin: Theme.getSize("default_margin").width
+                anchors.leftMargin: Theme.getSize("sidebar_margin").width
                 anchors.right: parent.right
-                anchors.rightMargin: Theme.getSize("default_margin").width
+                anchors.rightMargin: Theme.getSize("sidebar_margin").width
                 implicitHeight: Theme.getSize("section").height;
                 color: {
                     if(control.color) {
@@ -413,7 +413,7 @@ QtObject {
                     UM.RecolorImage {
                         anchors.verticalCenter: parent.verticalCenter
                         anchors.left: parent.left
-                        anchors.leftMargin: Theme.getSize("default_margin").width
+                        anchors.leftMargin: Theme.getSize("sidebar_margin").width
                         color:
                         {
                             if(!control.enabled)
@@ -448,7 +448,7 @@ QtObject {
                 Label {
                     anchors {
                         left: icon.right;
-                        leftMargin: Theme.getSize("default_lining").width;
+                        leftMargin: Theme.getSize("default_margin").width;
                         right: parent.right;
                         verticalCenter: parent.verticalCenter;
                     }
@@ -792,7 +792,7 @@ QtObject {
                 }
                 Behavior on color { ColorAnimation { duration: 50; } }
 
-                implicitWidth: actualLabel.contentWidth + (UM.Theme.getSize("default_margin").width * 2)
+                implicitWidth: actualLabel.contentWidth + (UM.Theme.getSize("sidebar_margin").width * 2)
 
                 Label
                 {
diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json
index 363f3f0c0c..2682d5adf2 100644
--- a/resources/themes/cura/theme.json
+++ b/resources/themes/cura/theme.json
@@ -251,6 +251,7 @@
         "logo": [9.5, 2.0],
 
         "sidebar": [35.0, 10.0],
+        "sidebar_margin": [1.71, 1.43],
         "sidebar_header": [0.0, 4.0],
         "sidebar_header_highlight": [0.25, 0.25],
         "sidebar_header_mode_toggle": [0.0, 2.0],