diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml
index 861e403df1..559975a344 100644
--- a/resources/qml/Settings/SettingItem.qml
+++ b/resources/qml/Settings/SettingItem.qml
@@ -13,11 +13,12 @@ import "."
 Item
 {
     id: base
-    height: enabled ? UM.Theme.getSize("section").height +  UM.Theme.getSize("narrow_margin").height: 0
+    height: enabled ? UM.Theme.getSize("section").height : 0
     anchors.left: parent.left
     anchors.right: parent.right
+
     // To avoid overlapping with the scrollBars
-    anchors.rightMargin: 2 * UM.Theme.getSize("thin_margin").width
+    //anchors.rightMargin:  UM.Theme.getSize("thin_margin").width
 
     property alias contents: controlContainer.children
     property alias hovered: mouse.containsMouse
diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml
index b136b114fd..12c9eee8a7 100644
--- a/resources/qml/Settings/SettingView.qml
+++ b/resources/qml/Settings/SettingView.qml
@@ -180,7 +180,6 @@ Item
     ListView
     {
         id: contents
-
         anchors
         {
             top: filterContainer.bottom
@@ -218,7 +217,7 @@ Item
         {
             id: delegate
 
-            width: contents.width - scrollBar.width
+            width: contents.width - (scrollBar.width +UM.Theme.getSize("narrow_margin").width)
             Behavior on height { NumberAnimation { duration: 100 } }
             opacity: enabled ? 1 : 0
             Behavior on opacity { NumberAnimation { duration: 100 } }
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index fd915a53da..56b706517e 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -524,9 +524,11 @@
 
         "extruder_icon": [2.5, 2.5],
 
-        "section": [0.0, 2],
+        "section": [0.0, 2.5],
+        "section_header": [0.0, 2.5],
+
         "section_control": [0, 1],
-        "section_icon": [2, 2],
+        "section_icon": [1.5, 1.5],
         "section_icon_column": [2.5, 2.5],
 
         "setting": [25.0, 1.8],