diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
index 6dd909105d..3b6fc37eb4 100644
--- a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
+++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
@@ -54,7 +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
+        iconSize: UM.Theme.getSize("medium_button_icon").width
 
         UM.SettingPropertyProvider
         {
@@ -70,7 +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
+        iconSize: UM.Theme.getSize("medium_button_icon").width
 
         UM.SettingPropertyProvider
         {
@@ -86,7 +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
+        iconSize: UM.Theme.getSize("medium_button_icon").width
 
         UM.SettingPropertyProvider
         {
diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml
index 40d1e890dc..a3a5047ee9 100644
--- a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml
+++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml
@@ -29,7 +29,7 @@ Item
         text: catalog.i18nc("@label", "Adhesion")
         font: UM.Theme.getFont("medium")
         width: labelColumnWidth
-        iconSize: UM.Theme.getSize("toolbar_button_icon").width
+        iconSize: UM.Theme.getSize("medium_button_icon").width
     }
 
     Item
diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml
index d78c63c803..0f2e6bc706 100644
--- a/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml
+++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml
@@ -65,7 +65,7 @@ Item
         text: catalog.i18nc("@label", "Infill") + " (%)"
         font: UM.Theme.getFont("medium")
         width: labelColumnWidth
-        iconSize: UM.Theme.getSize("toolbar_button_icon").width
+        iconSize: UM.Theme.getSize("medium_button_icon").width
     }
 
     Item
diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
index 3c54c37785..fbc958c51c 100644
--- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
+++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
@@ -52,7 +52,7 @@ Item
                 text: catalog.i18nc("@label", "Profiles")
                 font: UM.Theme.getFont("medium")
                 width: labelColumnWidth
-                iconSize: UM.Theme.getSize("toolbar_button_icon").width
+                iconSize: UM.Theme.getSize("medium_button_icon").width
             }
             UM.SimpleButton
             {
diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
index 50327d364b..5fb437b1c2 100644
--- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
+++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
@@ -30,7 +30,7 @@ Item
         text: catalog.i18nc("@label", "Support")
         font: UM.Theme.getFont("medium")
         width: labelColumnWidth
-        iconSize: UM.Theme.getSize("toolbar_button_icon").width
+        iconSize: UM.Theme.getSize("medium_button_icon").width
     }
 
     Item
diff --git a/resources/themes/cura-light/styles.qml b/resources/themes/cura-light/styles.qml
index 62c673c584..1320b54f37 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("toolbar_button").width
-                implicitHeight: UM.Theme.getSize("toolbar_button").height
+                implicitWidth: UM.Theme.getSize("button").width
+                implicitHeight: UM.Theme.getSize("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("toolbar_button_icon").width
-                    height: UM.Theme.getSize("toolbar_button_icon").height
+                    width: UM.Theme.getSize("medium_button_icon").width
+                    height: UM.Theme.getSize("medium_button_icon").height
                     color: UM.Theme.getColor("icon")
 
-                    sourceSize: UM.Theme.getSize("toolbar_button_icon")
+                    sourceSize: UM.Theme.getSize("medium_button_icon")
                 }
             }
         }
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index 984681b8da..c45eb00c9e 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -527,9 +527,6 @@
         "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],