diff --git a/plugins/SimulationView/SimulationViewMenuComponent.qml b/plugins/SimulationView/SimulationViewMenuComponent.qml
index f86110c2b5..7c8e086909 100644
--- a/plugins/SimulationView/SimulationViewMenuComponent.qml
+++ b/plugins/SimulationView/SimulationViewMenuComponent.qml
@@ -203,7 +203,7 @@ Cura.ExpandableComponent
                     anchors.right: extrudersModelCheckBox.right
                     width: UM.Theme.getSize("layerview_legend_size").width
                     height: UM.Theme.getSize("layerview_legend_size").height
-                    source: UM.Theme.getIcon("Extruder", "large")
+                    source: UM.Theme.getIcon("Extruder", "medium")
                     color: model.color
                 }
 
diff --git a/resources/qml/ExtruderIcon.qml b/resources/qml/ExtruderIcon.qml
index 40d5b2362e..1c93966519 100644
--- a/resources/qml/ExtruderIcon.qml
+++ b/resources/qml/ExtruderIcon.qml
@@ -22,7 +22,7 @@ Item
         id: mainIcon
         anchors.fill: parent
 
-        source: UM.Theme.getIcon("Extruder", "large")
+        source: UM.Theme.getIcon("Extruder", "medium")
         color: extruderEnabled ? materialColor: UM.Theme.getColor("disabled")
     }
 
diff --git a/resources/qml/ObjectItemButton.qml b/resources/qml/ObjectItemButton.qml
index d634927a7e..2b998e0438 100644
--- a/resources/qml/ObjectItemButton.qml
+++ b/resources/qml/ObjectItemButton.qml
@@ -53,7 +53,7 @@ Button
             anchors.left: parent.left
             width: height
             height: parent.height - UM.Theme.getSize("narrow_margin").height
-            source: UM.Theme.getIcon("Extruder", "large")
+            source: UM.Theme.getIcon("Extruder", "medium")
             color: extruderColor
             visible: showExtruderSwatches && extruderColor != ""
         }
diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
index ab1b5bf3e9..924dcd5ec4 100644
--- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
+++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
@@ -229,7 +229,7 @@ Item
 
                     sourceSize.width: width
                     sourceSize.height: height
-                    source: UM.Theme.getIcon("Extruder", "large")
+                    source: UM.Theme.getIcon("Extruder", "medium")
                     color: supportExtruderCombobox.color
                 }
             }
@@ -299,7 +299,7 @@ Item
 
                         sourceSize.width: width
                         sourceSize.height: height
-                        source: UM.Theme.getIcon("Extruder", "large")
+                        source: UM.Theme.getIcon("Extruder", "medium")
                         color: supportExtruderCombobox.model.getItem(index).color
                     }
                 }
diff --git a/resources/qml/PrinterSelector/MachineSelector.qml b/resources/qml/PrinterSelector/MachineSelector.qml
index 556bb893cc..7c74be1605 100644
--- a/resources/qml/PrinterSelector/MachineSelector.qml
+++ b/resources/qml/PrinterSelector/MachineSelector.qml
@@ -122,15 +122,15 @@ Cura.ExpandablePopup
             {
                 if (connectionStatus == "printer_connected")
                 {
-                    return UM.Theme.getIcon("CheckBlueBG", "small")
+                    return UM.Theme.getIcon("CheckBlueBG", "low")
                 }
                 else if (connectionStatus == "printer_cloud_connected")
                 {
-                    return UM.Theme.getIcon("CloudBlueBG", "small")
+                    return UM.Theme.getIcon("CloudBlueBG", "low")
                 }
                 else if (connectionStatus == "printer_cloud_not_available")
                 {
-                    return UM.Theme.getIcon("CloudGreyBG", "small")
+                    return UM.Theme.getIcon("CloudGreyBG", "low")
                 }
                 else
                 {
diff --git a/resources/qml/Settings/SettingExtruder.qml b/resources/qml/Settings/SettingExtruder.qml
index 5f0744fe47..995e1103f3 100644
--- a/resources/qml/Settings/SettingExtruder.qml
+++ b/resources/qml/Settings/SettingExtruder.qml
@@ -171,7 +171,7 @@ SettingItem
 
                 sourceSize.width: width
                 sourceSize.height: height
-                source: UM.Theme.getIcon("Extruder", "large")
+                source: UM.Theme.getIcon("Extruder", "medium")
                 color: control.color
             }
         }
@@ -240,7 +240,7 @@ SettingItem
 
                     sourceSize.width: width
                     sourceSize.height: height
-                    source: UM.Theme.getIcon("Extruder", "large")
+                    source: UM.Theme.getIcon("Extruder", "medium")
                     color: control.model.getItem(index).color
                 }
             }
diff --git a/resources/qml/Settings/SettingOptionalExtruder.qml b/resources/qml/Settings/SettingOptionalExtruder.qml
index deb8f3d478..5b1da6b785 100644
--- a/resources/qml/Settings/SettingOptionalExtruder.qml
+++ b/resources/qml/Settings/SettingOptionalExtruder.qml
@@ -172,7 +172,7 @@ SettingItem
 
                 sourceSize.width: width
                 sourceSize.height: height
-                source: UM.Theme.getIcon("Extruder", "large")
+                source: UM.Theme.getIcon("Extruder", "medium")
                 color: control.color
             }
         }
@@ -237,7 +237,7 @@ SettingItem
 
                     sourceSize.width: width
                     sourceSize.height: height
-                    source: UM.Theme.getIcon("Extruder", "large")
+                    source: UM.Theme.getIcon("Extruder", "medium")
                     color: control.model.getItem(index).color
                 }
             }
diff --git a/resources/qml/WelcomePages/CloudContent.qml b/resources/qml/WelcomePages/CloudContent.qml
index 276d3a1f1d..26e3a2f87c 100644
--- a/resources/qml/WelcomePages/CloudContent.qml
+++ b/resources/qml/WelcomePages/CloudContent.qml
@@ -172,7 +172,7 @@ Item
                         anchors.horizontalCenter: communityColumn.horizontalCenter
                         fillMode: Image.PreserveAspectFit
                         width: UM.Theme.getSize("welcome_wizard_cloud_content_image").width
-                        source: UM.Theme.getIcon("PrinterTriple", "large")
+                        source: UM.Theme.getIcon("PrinterTriple", "medium")
                         sourceSize.width: width
                         sourceSize.height: height
                     }
diff --git a/resources/themes/cura-light/icons/default/Extruder1.svg b/resources/themes/cura-light/icons/default/Extruder1.svg
deleted file mode 100644
index b818bab2bc..0000000000
--- a/resources/themes/cura-light/icons/default/Extruder1.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g id="Layer_1">
-	<g>
-		<path d="M12,2C6.477,2,2,6.477,2,12v9h2v-3.018C5.824,20.417,8.723,22,12,22c5.523,0,10-4.477,10-10C22,6.477,17.523,2,12,2z
-			 M12,20c-4.418,0-8-3.582-8-8s3.582-8,8-8s8,3.582,8,8S16.418,20,12,20z"/>
-		<g>
-			<defs>
-				<path id="SVGID_1_" d="M13.49,16h-1.9c0,0,0-5.67,0-5.84c-0.078,0.092-0.161,0.179-0.25,0.26l-0.28,0.26l-0.9,0.73l-0.94-1.16
-					l2.66-2.1h1.62L13.49,16z"/>
-			</defs>
-			<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
-			<clipPath id="SVGID_2_">
-				<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
-			</clipPath>
-		</g>
-	</g>
-</g>
-<g id="Comments">
-</g>
-</svg>
diff --git a/resources/themes/cura-light/icons/default/Extruder2.svg b/resources/themes/cura-light/icons/default/Extruder2.svg
deleted file mode 100644
index 764170753b..0000000000
--- a/resources/themes/cura-light/icons/default/Extruder2.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g id="Layer_1">
-	<g>
-		<path d="M12,2C6.477,2,2,6.477,2,12v9h2v-3.018C5.824,20.417,8.723,22,12,22c5.523,0,10-4.477,10-10C22,6.477,17.523,2,12,2z
-			 M12,20c-4.418,0-8-3.582-8-8s3.582-8,8-8s8,3.582,8,8S16.418,20,12,20z"/>
-		<path d="M14.79,16H9.21v-1.26l1.94-2c0.4-0.41,0.71-0.75,0.95-1c0.195-0.208,0.363-0.44,0.5-0.69
-			c0.099-0.202,0.15-0.425,0.15-0.65c0.022-0.232-0.072-0.46-0.25-0.61c-0.18-0.13-0.398-0.197-0.62-0.19
-			c-0.286,0.002-0.568,0.074-0.82,0.21c-0.311,0.168-0.603,0.369-0.87,0.6l-1-1.2c0.233-0.203,0.476-0.394,0.73-0.57
-			c0.278-0.194,0.585-0.342,0.91-0.44c0.396-0.133,0.812-0.201,1.23-0.2c0.469-0.014,0.935,0.082,1.36,0.28
-			c0.358,0.166,0.663,0.43,0.88,0.76c0.206,0.326,0.314,0.704,0.31,1.09c0.004,0.414-0.085,0.824-0.26,1.2
-			c-0.187,0.395-0.437,0.756-0.74,1.07c-0.33,0.35-0.74,0.74-1.21,1.18l-0.82,0.75v0.07h3.21V16z"/>
-	</g>
-</g>
-<g id="Comments">
-</g>
-</svg>
diff --git a/resources/themes/cura-light/icons/default/ExtruderColor.svg b/resources/themes/cura-light/icons/default/ExtruderColor.svg
deleted file mode 100644
index 08c93163aa..0000000000
--- a/resources/themes/cura-light/icons/default/ExtruderColor.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<g id="Layer_1">
-	<path style="fill:#231F20;" d="M12,20c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S16.411,20,12,20z M12,6c-3.309,0-6,2.691-6,6
-		s2.691,6,6,6s6-2.691,6-6S15.309,6,12,6z"/>
-</g>
-<g id="Comments">
-</g>
-</svg>
diff --git a/resources/themes/cura-light/icons/small/CheckBlueBG.svg b/resources/themes/cura-light/icons/low/CheckBlueBG.svg
similarity index 100%
rename from resources/themes/cura-light/icons/small/CheckBlueBG.svg
rename to resources/themes/cura-light/icons/low/CheckBlueBG.svg
diff --git a/resources/themes/cura-light/icons/small/CloudBlueBG.svg b/resources/themes/cura-light/icons/low/CloudBlueBG.svg
similarity index 100%
rename from resources/themes/cura-light/icons/small/CloudBlueBG.svg
rename to resources/themes/cura-light/icons/low/CloudBlueBG.svg
diff --git a/resources/themes/cura-light/icons/small/CloudGreyBG.svg b/resources/themes/cura-light/icons/low/CloudGreyBG.svg
similarity index 100%
rename from resources/themes/cura-light/icons/small/CloudGreyBG.svg
rename to resources/themes/cura-light/icons/low/CloudGreyBG.svg
diff --git a/resources/themes/cura-light/icons/small/Dot.svg b/resources/themes/cura-light/icons/low/Dot.svg
similarity index 100%
rename from resources/themes/cura-light/icons/small/Dot.svg
rename to resources/themes/cura-light/icons/low/Dot.svg
diff --git a/resources/themes/cura-light/icons/large/Extruder.svg b/resources/themes/cura-light/icons/medium/Extruder.svg
similarity index 100%
rename from resources/themes/cura-light/icons/large/Extruder.svg
rename to resources/themes/cura-light/icons/medium/Extruder.svg
diff --git a/resources/themes/cura-light/icons/large/PrinterTriple.svg b/resources/themes/cura-light/icons/medium/PrinterTriple.svg
similarity index 100%
rename from resources/themes/cura-light/icons/large/PrinterTriple.svg
rename to resources/themes/cura-light/icons/medium/PrinterTriple.svg
diff --git a/resources/themes/cura-light/styles.qml b/resources/themes/cura-light/styles.qml
index e7cf39a164..b56080a6c6 100755
--- a/resources/themes/cura-light/styles.qml
+++ b/resources/themes/cura-light/styles.qml
@@ -422,7 +422,7 @@ QtObject
                     height: Math.round(parent.height / 2.5)
                     sourceSize.height: width
                     color: Theme.getColor("checkbox_mark")
-                    source: control.exclusiveGroup ? Theme.getIcon("Dot", "small") : Theme.getIcon("Check")
+                    source: control.exclusiveGroup ? Theme.getIcon("Dot", "low") : Theme.getIcon("Check")
                     opacity: control.checked
                     Behavior on opacity { NumberAnimation { duration: 100; } }
                 }
@@ -472,7 +472,7 @@ QtObject
                         }
                         else
                         {
-                            return control.exclusiveGroup ? Theme.getIcon("Dot", "small") : Theme.getIcon("Check");
+                            return control.exclusiveGroup ? Theme.getIcon("Dot", "low") : Theme.getIcon("Check");
                         }
                     }
                     opacity: control.checked