diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
index ff9204655f..6dd909105d 100644
--- a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
+++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
@@ -15,7 +15,8 @@ RowLayout
 
     Cura.IconWithText
     {
-        source: UM.Theme.getIcon("PrintQuality")
+        source: UM.Theme.getIcon("Sliders", "medium")
+        iconSize: UM.Theme.getSize("button_icon").width
         text:
         {
             if (Cura.MachineManager.activeStack)
@@ -53,6 +54,7 @@ RowLayout
         source: UM.Theme.getIcon("Infill1")
         text: Cura.MachineManager.activeStack ? parseInt(infillDensity.properties.value) + "%" : "0%"
         font: UM.Theme.getFont("medium")
+        iconSize: UM.Theme.getSize("toolbar_button_icon").width
 
         UM.SettingPropertyProvider
         {
@@ -68,6 +70,7 @@ RowLayout
         source: UM.Theme.getIcon("Support")
         text: supportEnabled.properties.value == "True" ? enabledText : disabledText
         font: UM.Theme.getFont("medium")
+        iconSize: UM.Theme.getSize("toolbar_button_icon").width
 
         UM.SettingPropertyProvider
         {
@@ -83,6 +86,7 @@ RowLayout
         source: UM.Theme.getIcon("Adhesion")
         text: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none" ? enabledText : disabledText
         font: UM.Theme.getFont("medium")
+        iconSize: UM.Theme.getSize("toolbar_button_icon").width
 
         UM.SettingPropertyProvider
         {
diff --git a/resources/themes/cura-light/styles.qml b/resources/themes/cura-light/styles.qml
index de15866f1a..62c673c584 100755
--- a/resources/themes/cura-light/styles.qml
+++ b/resources/themes/cura-light/styles.qml
@@ -175,8 +175,8 @@ QtObject
         {
             background: Item
             {
-                implicitWidth: UM.Theme.getSize("button").width
-                implicitHeight: UM.Theme.getSize("button").height
+                implicitWidth: UM.Theme.getSize("toolbar_button").width
+                implicitHeight: UM.Theme.getSize("toolbar_button").height
 
                 UM.PointingRectangle
                 {
@@ -252,11 +252,11 @@ QtObject
                     anchors.centerIn: parent
                     opacity: control.enabled ? 1.0 : 0.2
                     source: control.iconSource
-                    width: UM.Theme.getSize("button_icon").width
-                    height: UM.Theme.getSize("button_icon").height
+                    width: UM.Theme.getSize("toolbar_button_icon").width
+                    height: UM.Theme.getSize("toolbar_button_icon").height
                     color: UM.Theme.getColor("icon")
 
-                    sourceSize: UM.Theme.getSize("button_icon")
+                    sourceSize: UM.Theme.getSize("toolbar_button_icon")
                 }
             }
         }
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index 5245d21455..e190f3fc97 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -482,7 +482,7 @@
 
         "machine_selector_widget": [20.0, 4.0],
         "machine_selector_widget_content": [25.0, 32.0],
-        "machine_selector_icon": [2.66, 2.66],
+        "machine_selector_icon": [2.5, 2.5],
 
         "views_selector": [23.0, 4.0],
 
@@ -527,6 +527,9 @@
         "button_icon": [2.5, 2.5],
         "button_lining": [0, 0],
 
+        "toolbar_button": [4, 4],
+        "toolbar_button_icon": [2, 2],
+
         "action_button": [15.0, 2.5],
         "action_button_icon": [1.0, 1.0],
         "action_button_radius": [0.15, 0.15],