diff --git a/plugins/PerObjectSettingsTool/PerObjectCategory.qml b/plugins/PerObjectSettingsTool/PerObjectCategory.qml
index 3f95d4e021..1800555b9d 100644
--- a/plugins/PerObjectSettingsTool/PerObjectCategory.qml
+++ b/plugins/PerObjectSettingsTool/PerObjectCategory.qml
@@ -11,19 +11,26 @@ import ".."
 Button {
     id: base;
 
-    background: Item { }
+    background: Item {}
 
     contentItem: Row
     {
         spacing: UM.Theme.getSize("default_lining").width
 
-        UM.RecolorImage
+        Item //Wrapper to give space before icon with fixed width. This allows aligning checkbox with category icon.
         {
-            anchors.verticalCenter: parent.verticalCenter
-            height: (label.height / 2) | 0
+            height: label.height
             width: height
-            source: base.checked ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight");
-            color: base.hovered ? palette.highlight : palette.buttonText
+            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 ? palette.highlight : palette.buttonText
+            }
         }
         UM.RecolorImage
         {
diff --git a/plugins/PerObjectSettingsTool/PerObjectItem.qml b/plugins/PerObjectSettingsTool/PerObjectItem.qml
index d5582b9643..0c8015541e 100644
--- a/plugins/PerObjectSettingsTool/PerObjectItem.qml
+++ b/plugins/PerObjectSettingsTool/PerObjectItem.qml
@@ -19,7 +19,8 @@ UM.TooltipArea
     Item
     {
         id: spacer
-        width: 5
+        // Align checkbox with PerObjectCategory icon
+        width: UM.Theme.getSize("default_margin").width
     }
 
     UM.CheckBox