diff --git a/plugins/PerObjectSettingsTool/PerObjectCategory.qml b/plugins/PerObjectSettingsTool/PerObjectCategory.qml
index 3d0b1d826e..266e345309 100644
--- a/plugins/PerObjectSettingsTool/PerObjectCategory.qml
+++ b/plugins/PerObjectSettingsTool/PerObjectCategory.qml
@@ -8,58 +8,16 @@ import UM 1.5 as UM
 import Cura 1.0 as Cura
 import ".."
 
-Button {
+UM.CategoryButton {
     id: base;
 
-    background: Rectangle {
-        color: UM.Theme.getColor("category_background")
-    }
-
-    contentItem: Row
-    {
-        spacing: UM.Theme.getSize("default_lining").width
-
-        Item //Wrapper to give space before icon with fixed width. This allows aligning checkbox with category icon.
-        {
-            height: label.height
-            width: height
-            anchors.verticalCenter: parent.verticalCenter
-
-            UM.RecolorImage
-            {
-                anchors.verticalCenter: parent.verticalCenter
-                height: (label.height / 2) | 0
-                width: height
-                source: base.checked ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight")
-                color: base.hovered ? UM.Theme.getColor("primary_button_hover"): UM.Theme.getColor("text")
-            }
-        }
-        UM.RecolorImage
-        {
-            anchors.verticalCenter: parent.verticalCenter
-            height: label.height
-            width: height
-            source: UM.Theme.getIcon(definition.icon)
-            color: base.hovered ? UM.Theme.getColor("primary_button_hover") : UM.Theme.getColor("text")
-        }
-        UM.Label
-        {
-            id: label
-            anchors.verticalCenter: parent.verticalCenter
-            text: base.text
-            color: base.hovered ? UM.Theme.getColor("primary_button_hover") : UM.Theme.getColor("text")
-            font.bold: true
-        }
-    }
+    categoryIcon: definition ? UM.Theme.getIcon(definition.icon) : ""
+    labelText: definition ? definition.label : ""
+    expanded: definition ? definition.expanded : false
 
     signal showTooltip(string text)
     signal hideTooltip()
     signal contextMenuRequested()
 
-    text: definition.label
-
-    checkable: true
-    checked: definition.expanded
-
-    onClicked: definition.expanded ? settingDefinitionsModel.collapseRecursive(definition.key) : settingDefinitionsModel.expandRecursive(definition.key)
+    onClicked: expanded ? settingDefinitionsModel.collapseRecursive(definition.key) : settingDefinitionsModel.expandRecursive(definition.key)
 }
diff --git a/plugins/PerObjectSettingsTool/PerObjectItem.qml b/plugins/PerObjectSettingsTool/PerObjectItem.qml
index 0c8015541e..cb361488b7 100644
--- a/plugins/PerObjectSettingsTool/PerObjectItem.qml
+++ b/plugins/PerObjectSettingsTool/PerObjectItem.qml
@@ -10,19 +10,12 @@ import Cura 1.0 as Cura
 
 UM.TooltipArea
 {
-    x: model.depth * UM.Theme.getSize("default_margin").width
+    x: model.depth * UM.Theme.getSize("narrow_margin").width
     text: model.description
 
     width: childrenRect.width
     height: childrenRect.height
 
-    Item
-    {
-        id: spacer
-        // Align checkbox with PerObjectCategory icon
-        width: UM.Theme.getSize("default_margin").width
-    }
-
     UM.CheckBox
     {
         id: check
diff --git a/plugins/PerObjectSettingsTool/SettingPickDialog.qml b/plugins/PerObjectSettingsTool/SettingPickDialog.qml
index d7d8091121..950c13809e 100644
--- a/plugins/PerObjectSettingsTool/SettingPickDialog.qml
+++ b/plugins/PerObjectSettingsTool/SettingPickDialog.qml
@@ -12,6 +12,8 @@ UM.Dialog
 {
     id: settingPickDialog
 
+    margin: UM.Theme.getSize("default_margin").width
+
     title: catalog.i18nc("@title:window", "Select Settings to Customize for this model")
     width: UM.Theme.getSize("small_popup_dialog").width
     backgroundColor: UM.Theme.getColor("background_1")
diff --git a/resources/qml/Preferences/SettingVisibilityPage.qml b/resources/qml/Preferences/SettingVisibilityPage.qml
index a29818ad4e..b82b95e946 100644
--- a/resources/qml/Preferences/SettingVisibilityPage.qml
+++ b/resources/qml/Preferences/SettingVisibilityPage.qml
@@ -150,7 +150,7 @@ UM.PreferencesPage
             }
 
             clip: true
-            ScrollBar.vertical: UM.ScrollBar {}
+            ScrollBar.vertical: UM.ScrollBar { id: scrollBar }
 
             model: UM.SettingDefinitionsModel
             {
@@ -167,7 +167,7 @@ UM.PreferencesPage
             {
                 id: loader
 
-                width: settingsListView.width
+                width: settingsListView.width - scrollBar.width
                 height: model.type != undefined ? UM.Theme.getSize("section").height : 0
 
                 property var definition: model
diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml
index bf38fe783e..b136b114fd 100644
--- a/resources/qml/Settings/SettingView.qml
+++ b/resources/qml/Settings/SettingView.qml
@@ -191,7 +191,7 @@ Item
         }
         clip: true
         cacheBuffer: 1000000   // Set a large cache to effectively just cache every list item.
-        ScrollBar.vertical: UM.ScrollBar {}
+        ScrollBar.vertical: UM.ScrollBar { id: scrollBar }
 
         model: UM.SettingDefinitionsModel
         {
@@ -218,7 +218,7 @@ Item
         {
             id: delegate
 
-            width: contents.width
+            width: contents.width - scrollBar.width
             Behavior on height { NumberAnimation { duration: 100 } }
             opacity: enabled ? 1 : 0
             Behavior on opacity { NumberAnimation { duration: 100 } }