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 ac78da7850..0c8015541e 100644
--- a/plugins/PerObjectSettingsTool/PerObjectItem.qml
+++ b/plugins/PerObjectSettingsTool/PerObjectItem.qml
@@ -10,16 +10,25 @@ import Cura 1.0 as Cura
 
 UM.TooltipArea
 {
-    x: model.depth * UM.Theme.getSize("default_margin").width;
-    text: model.description;
+    x: model.depth * UM.Theme.getSize("default_margin").width
+    text: model.description
 
-    width: childrenRect.width;
-    height: childrenRect.height;
+    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
 
+        anchors.left: spacer.right
+
         text: definition.label
         checked: addedSettingsModel.getVisible(model.key)
 
diff --git a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
index 18517d5e96..15540e1964 100644
--- a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
+++ b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
@@ -21,6 +21,8 @@ UM.Dialog
     width: minimumWidth
     height: minimumHeight
 
+    margin: UM.Theme.getSize("thick_margin").width
+
     property var changesModel: Cura.UserChangesModel { id: userChangesModel }
 
     onVisibilityChanged:
diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
index 8a637f3870..f3cef1a819 100644
--- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
+++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
@@ -278,6 +278,7 @@ Item
 
                     width: selectors.controlWidth
                     height: parent.height
+                    anchors.verticalCenter: parent.verticalCenter
 
                     focusPolicy: Qt.ClickFocus
 
@@ -289,6 +290,7 @@ Item
                     }
                     onClicked: materialsMenu.popup()
                 }
+
                 Item
                 {
                     width: instructionButton.width + 2 * UM.Theme.getSize("narrow_margin").width
@@ -331,6 +333,7 @@ Item
                     tooltip: text
                     height: parent.height
                     width: selectors.controlWidth
+                    anchors.verticalCenter: parent.verticalCenter
                     focusPolicy: Qt.ClickFocus
                     enabled: enabledCheckbox.checked