diff --git a/resources/qml/Settings/SettingCategory.qml b/resources/qml/Settings/SettingCategory.qml
index aafe36c546..4ec6294d61 100644
--- a/resources/qml/Settings/SettingCategory.qml
+++ b/resources/qml/Settings/SettingCategory.qml
@@ -12,8 +12,8 @@ Button
     id: base
     anchors.left: parent.left
     anchors.right: parent.right
-    anchors.leftMargin: UM.Theme.getSize("thick_margin").width
-    anchors.rightMargin: UM.Theme.getSize("thick_margin").width
+    anchors.leftMargin: UM.Theme.getSize("default_margin").width
+    anchors.rightMargin: UM.Theme.getSize("default_margin").width * 3
     hoverEnabled: true
 
     background: Rectangle
diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml
index cad6a28bd6..036dcfeba4 100644
--- a/resources/qml/Settings/SettingItem.qml
+++ b/resources/qml/Settings/SettingItem.qml
@@ -108,7 +108,7 @@ Item {
             id: label;
 
             anchors.left: parent.left;
-            anchors.leftMargin: doDepthIndentation ? Math.round((UM.Theme.getSize("section_icon_column").width + 5) + ((definition.depth - 1) * UM.Theme.getSize("setting_control_depth_margin").width)) : 0
+            anchors.leftMargin: doDepthIndentation ? Math.round((UM.Theme.getSize("section_icon_column").width / 1.2) + ((definition.depth - 1) * UM.Theme.getSize("setting_control_depth_margin").width)) : 0
             anchors.right: settingControls.left;
             anchors.verticalCenter: parent.verticalCenter
 
@@ -290,7 +290,7 @@ Item {
             enabled: propertyProvider.isValueUsed
 
             anchors.right: parent.right;
-            anchors.rightMargin: UM.Theme.getSize("thick_margin").width
+            anchors.rightMargin: UM.Theme.getSize("default_margin").width * 3
             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 3960f99aaa..8a336a7ed1 100644
--- a/resources/qml/Settings/SettingView.qml
+++ b/resources/qml/Settings/SettingView.qml
@@ -81,10 +81,9 @@ Item
 
         anchors
         {
-            //top: globalProfileRow.bottom
             topMargin: UM.Theme.getSize("thick_margin").height
             left: parent.left
-            leftMargin: UM.Theme.getSize("thick_margin").width
+            leftMargin: UM.Theme.getSize("default_margin").width
             right: settingVisibilityMenu.left
             rightMargin: Math.floor(UM.Theme.getSize("default_margin").width / 2)
         }
@@ -202,6 +201,7 @@ Item
         anchors.right: parent.right;
         anchors.left: parent.left;
         anchors.topMargin: UM.Theme.getSize("thick_margin").height
+        anchors.rightMargin: UM.Theme.getSize("narrow_margin").height / 3
 
         style: UM.Theme.styles.scrollview;
         flickableItem.flickableDirection: Flickable.VerticalFlick;