diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml
index 4e2a05a6aa..ec25eb8abb 100644
--- a/resources/qml/Actions.qml
+++ b/resources/qml/Actions.qml
@@ -222,7 +222,7 @@ Item
         id: updateProfileAction
         enabled: !Cura.MachineManager.stacksHaveErrors && Cura.MachineManager.hasUserSettings && Cura.MachineManager.activeQualityChangesGroup != null
         text: catalog.i18nc("@action:inmenu menubar:profile", "&Update profile with current settings/overrides");
-        onTriggered: Cura.ContainerManager.updateQualityChanges();
+        onTriggered: Cura.ContainerManager.updateQualityChanges()
     }
 
     Action
diff --git a/resources/qml/PrintSetupSelector/Custom/MenuButton.qml b/resources/qml/PrintSetupSelector/Custom/MenuButton.qml
index cfb08b82c0..b7b9b14d5d 100644
--- a/resources/qml/PrintSetupSelector/Custom/MenuButton.qml
+++ b/resources/qml/PrintSetupSelector/Custom/MenuButton.qml
@@ -19,10 +19,14 @@ Button
     id: button
     hoverEnabled: true
     leftPadding: UM.Theme.getSize("default_margin").width
+    implicitWidth: UM.Theme.getSize("menu").width
+    implicitHeight: UM.Theme.getSize("menu").height + UM.Theme.getSize("narrow_margin").height
 
     background: Rectangle
     {
         id: backgroundRectanglewide_margin
+        height: button.height
+        width: button.width
         color: button.hovered ? UM.Theme.getColor("background_2"): UM.Theme.getColor("background_1")
     }
 
@@ -37,11 +41,29 @@ Button
         return txt
     }
 
-    contentItem: UM.Label
+    contentItem: Item
     {
-        id: textLabel
-        text: button.text != "" ? replaceText(button.text) : replaceText(button.labelText)
-        height: contentHeight
-        color: button.enabled ? UM.Theme.getColor("text") :UM.Theme.getColor("text_inactive")
+        height: button.height
+        width: button.width
+        UM.RecolorImage
+        {
+            id: check
+            height: UM.Theme.getSize("default_arrow").height
+            width: height
+            source: UM.Theme.getIcon("Check", "low")
+            color: UM.Theme.getColor("setting_control_text")
+            anchors.verticalCenter: parent.verticalCenter
+            visible: button.checked
+        }
+        UM.Label
+        {
+            id: textLabel
+            text: button.text != "" ? replaceText(button.text) : replaceText(button.labelText)
+            height: contentHeight
+            color: button.enabled ? UM.Theme.getColor("text") :UM.Theme.getColor("text_inactive")
+            anchors.left: check.right
+            anchors.leftMargin: UM.Theme.getSize("narrow_margin").width
+            anchors.verticalCenter: parent.verticalCenter
+        }
     }
 }
\ No newline at end of file
diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml
index d7562ef2db..a2624dbf14 100644
--- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml
+++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml
@@ -130,7 +130,7 @@ Popup
                                     checkable: true
                                     visible: model.available
                                     text: model.name + " - " + model.layer_height + " mm"
-                                    leftPadding: UM.Theme.getSize("wide_margin").width
+                                    leftPadding: UM.Theme.getSize("default_margin").width + UM.Theme.getSize("narrow_margin").width
                                     checked:
                                     {
                                         if (Cura.MachineManager.hasCustomQuality)
@@ -196,7 +196,7 @@ Popup
                                 checkable: true
                                 visible: model.available
                                 text: model.name
-                                leftPadding: UM.Theme.getSize("wide_margin").width
+                                leftPadding: UM.Theme.getSize("default_margin").width + UM.Theme.getSize("narrow_margin").width
                                 checked:
                                 {
                                     var active_quality_group = Cura.MachineManager.activeQualityChangesGroup