Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons"

This reverts commit 6120d8a054b8c04bf90b8b3d3cb219d691bece2f, reversing
changes made to 95652556fef90f70adbf25bfa9bd3b8af7220d4a.

45 files changed, 113 insertions, 130 deletions

diff --git a/resources/qml/Account/AvatarImage.qml b/resources/qml/Account/AvatarImage.qml
index 58c39e5065..120173366f 100644
--- a/resources/qml/Account/AvatarImage.qml
+++ b/resources/qml/Account/AvatarImage.qml
@@ -52,7 +52,7 @@ Item
         width: parent.width + 2
         height: parent.height + 2
         visible: hasAvatar
-        source: UM.Theme.getIcon("CircleOutline")
+        source: UM.Theme.getIcon("circle_outline")
         sourceSize: Qt.size(parent.width, parent.height)
         color: UM.Theme.getColor("account_widget_outline_active")
     }
diff --git a/resources/qml/Account/SyncState.qml b/resources/qml/Account/SyncState.qml
index d5a9d392e2..f7630b500a 100644
--- a/resources/qml/Account/SyncState.qml
+++ b/resources/qml/Account/SyncState.qml
@@ -18,27 +18,27 @@ Row // Sync state icon + message
         {
             name: "idle"
             when: syncState == Cura.AccountSyncState.IDLE
-            PropertyChanges { target: icon; source: UM.Theme.getIcon("ArrowDoubleCircleRight")}
+            PropertyChanges { target: icon; source: UM.Theme.getIcon("update")}
         },
         State
         {
             name: "syncing"
             when: syncState == Cura.AccountSyncState.SYNCING
-            PropertyChanges { target: icon; source: UM.Theme.getIcon("ArrowDoubleCircleRight") }
+            PropertyChanges { target: icon; source: UM.Theme.getIcon("update") }
             PropertyChanges { target: stateLabel; text: catalog.i18nc("@label", "Checking...")}
         },
         State
         {
             name: "up_to_date"
             when: syncState == Cura.AccountSyncState.SUCCESS
-            PropertyChanges { target: icon; source: UM.Theme.getIcon("CheckCircle") }
+            PropertyChanges { target: icon; source: UM.Theme.getIcon("checked") }
             PropertyChanges { target: stateLabel; text: catalog.i18nc("@label", "Account synced")}
         },
         State
         {
             name: "error"
             when: syncState == Cura.AccountSyncState.ERROR
-            PropertyChanges { target: icon; source: UM.Theme.getIcon("Warning") }
+            PropertyChanges { target: icon; source: UM.Theme.getIcon("warning_light") }
             PropertyChanges { target: stateLabel; text: catalog.i18nc("@label", "Something went wrong...")}
         }
     ]
diff --git a/resources/qml/ActionPanel/OutputDevicesActionButton.qml b/resources/qml/ActionPanel/OutputDevicesActionButton.qml
index 6d1a1d83dd..866b8cc627 100644
--- a/resources/qml/ActionPanel/OutputDevicesActionButton.qml
+++ b/resources/qml/ActionPanel/OutputDevicesActionButton.qml
@@ -60,7 +60,7 @@ Item
 
         leftPadding: UM.Theme.getSize("narrow_margin").width //Need more space than usual here for wide text.
         rightPadding: UM.Theme.getSize("narrow_margin").width
-        iconSource: popup.opened ? UM.Theme.getIcon("ChevronSingleUp") : UM.Theme.getIcon("ChevronSingleDown")
+        iconSource: popup.opened ? UM.Theme.getIcon("arrow_top") : UM.Theme.getIcon("arrow_bottom")
         color: UM.Theme.getColor("action_panel_secondary")
         visible: (devicesModel.deviceCount > 1)
 
@@ -113,4 +113,4 @@ Item
     }
 
     UM.OutputDevicesModel { id: devicesModel }
-}
+}
\ No newline at end of file
diff --git a/resources/qml/ActionPanel/OutputProcessWidget.qml b/resources/qml/ActionPanel/OutputProcessWidget.qml
index 6e412c9a04..be6d68de4f 100644
--- a/resources/qml/ActionPanel/OutputProcessWidget.qml
+++ b/resources/qml/ActionPanel/OutputProcessWidget.qml
@@ -57,7 +57,7 @@ Column
                 width: parent.width
 
                 text: preSlicedData ? catalog.i18nc("@label", "No time estimation available") : PrintInformation.currentPrintTime.getDisplayString(UM.DurationFormat.Long)
-                source: UM.Theme.getIcon("Clock")
+                source: UM.Theme.getIcon("clock")
                 font: UM.Theme.getFont("medium_bold")
             }
 
@@ -99,7 +99,7 @@ Column
                     }
                     return totalWeights + "g · " + totalLengths.toFixed(2) + "m"
                 }
-                source: UM.Theme.getIcon("Spool")
+                source: UM.Theme.getIcon("spool")
                 font: UM.Theme.getFont("default")
             }
         }
@@ -142,4 +142,4 @@ Column
             height: UM.Theme.getSize("action_button").height
         }
     }
-}
+}
\ No newline at end of file
diff --git a/resources/qml/ActionPanel/PrintInformationWidget.qml b/resources/qml/ActionPanel/PrintInformationWidget.qml
index d9923ce4e8..097f281946 100644
--- a/resources/qml/ActionPanel/PrintInformationWidget.qml
+++ b/resources/qml/ActionPanel/PrintInformationWidget.qml
@@ -11,7 +11,7 @@ UM.RecolorImage
 {
     id: widget
 
-    source: UM.Theme.getIcon("Information")
+    source: UM.Theme.getIcon("info")
     width: visible ? UM.Theme.getSize("section_icon").width : 0
     height: UM.Theme.getSize("section_icon").height
 
@@ -58,4 +58,4 @@ UM.RecolorImage
             arrowSize: UM.Theme.getSize("default_arrow").width
         }
     }
-}
+}
\ No newline at end of file
diff --git a/resources/qml/ActionPanel/SliceProcessWidget.qml b/resources/qml/ActionPanel/SliceProcessWidget.qml
index 42df08560a..dbbfe784ef 100644
--- a/resources/qml/ActionPanel/SliceProcessWidget.qml
+++ b/resources/qml/ActionPanel/SliceProcessWidget.qml
@@ -65,7 +65,7 @@ Column
         visible: widget.backendState == UM.Backend.Error
 
         text: catalog.i18nc("@label:PrintjobStatus", "Unable to slice")
-        source: UM.Theme.getIcon("Warning")
+        source: UM.Theme.getIcon("warning")
         iconColor: UM.Theme.getColor("warning")
     }
 
diff --git a/resources/qml/CheckBoxWithTooltip.qml b/resources/qml/CheckBoxWithTooltip.qml
index e17940014a..403efb4d7b 100644
--- a/resources/qml/CheckBoxWithTooltip.qml
+++ b/resources/qml/CheckBoxWithTooltip.qml
@@ -32,7 +32,7 @@ CheckBox
             height: Math.round(parent.height / 2.5)
             sourceSize.height: width
             color: UM.Theme.getColor("checkbox_mark")
-            source: UM.Theme.getIcon("Check")
+            source: UM.Theme.getIcon("check")
             opacity: checkbox.checked
             Behavior on opacity { NumberAnimation { duration: 100; } }
         }
diff --git a/resources/qml/ExpandableComponent.qml b/resources/qml/ExpandableComponent.qml
index 58719eb1fe..f637cccdbb 100644
--- a/resources/qml/ExpandableComponent.qml
+++ b/resources/qml/ExpandableComponent.qml
@@ -165,7 +165,7 @@ Item
                     verticalCenter: parent.verticalCenter
                     margins: background.padding
                 }
-                source: UM.Theme.getIcon("Pen")
+                source: UM.Theme.getIcon("pencil")
                 visible: source != ""
                 width: UM.Theme.getSize("standard_arrow").width
                 height: UM.Theme.getSize("standard_arrow").height
diff --git a/resources/qml/ExpandableComponentHeader.qml b/resources/qml/ExpandableComponentHeader.qml
index 7dd1aa358a..cd6ccfb825 100644
--- a/resources/qml/ExpandableComponentHeader.qml
+++ b/resources/qml/ExpandableComponentHeader.qml
@@ -59,11 +59,11 @@ Cura.RoundedRectangle
             anchors.fill: parent
             sourceSize.width: width
             color: closeButton.hovered ? UM.Theme.getColor("small_button_text_hover") : UM.Theme.getColor("small_button_text")
-            source: UM.Theme.getIcon("Cancel")
+            source: UM.Theme.getIcon("cross1")
         }
 
         background: Item {}
 
         onClicked: toggleContent() // Will hide the popup item
     }
-}
+}
\ No newline at end of file
diff --git a/resources/qml/ExpandablePopup.qml b/resources/qml/ExpandablePopup.qml
index b490ad5bc4..7829093e8d 100644
--- a/resources/qml/ExpandablePopup.qml
+++ b/resources/qml/ExpandablePopup.qml
@@ -178,7 +178,7 @@ Item
                     verticalCenter: parent.verticalCenter
                     margins: background.padding
                 }
-                source: expanded ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft")
+                source: expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left")
                 visible: source != ""
                 width: UM.Theme.getSize("standard_arrow").width
                 height: UM.Theme.getSize("standard_arrow").height
diff --git a/resources/qml/ExtruderIcon.qml b/resources/qml/ExtruderIcon.qml
index 1c93966519..015ebea52e 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", "medium")
+        source: UM.Theme.getIcon("extruder_button")
         color: extruderEnabled ? materialColor: UM.Theme.getColor("disabled")
     }
 
@@ -32,14 +32,15 @@ Item
 
         width: height
         height: Math.round(parent.height / 2)
-        radius: Math.round(width)
+        radius: Math.round(width / 2)
         color: UM.Theme.getColor("toolbar_background")
 
         anchors
         {
             horizontalCenter: parent.horizontalCenter
             top: parent.top
-            topMargin: (parent.height - height) / 2
+            // The circle needs to be slightly off center (so it sits in the middle of the square bit of the icon)
+            topMargin: (parent.height - height) / 2 - 0.1 * parent.height
         }
 
         Label
@@ -63,9 +64,9 @@ Item
             anchors.fill: parent
             anchors.margins: UM.Theme.getSize("thick_lining").width
             sourceSize.height: width
-            source: UM.Theme.getIcon("Cancel")
+            source: UM.Theme.getIcon("cross1")
             visible: !extruderEnabled
             color: UM.Theme.getColor("text")
         }
     }
-}
+}
\ No newline at end of file
diff --git a/resources/qml/JobSpecs.qml b/resources/qml/JobSpecs.qml
index 4aa5fa8bd5..c1989c4c95 100644
--- a/resources/qml/JobSpecs.qml
+++ b/resources/qml/JobSpecs.qml
@@ -66,7 +66,7 @@ Item
                         sourceSize.width: width
                         sourceSize.height: width
                         color: control.hovered ? UM.Theme.getColor("small_button_text_hover") : UM.Theme.getColor("small_button_text")
-                        source: UM.Theme.getIcon("Pen")
+                        source: UM.Theme.getIcon("pencil")
                     }
                 }
             }
diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
index 92b88d3c09..2e2dd0820a 100644
--- a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
+++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
@@ -93,7 +93,7 @@ Button
                     id: icon
                     anchors.verticalCenter: unknownMaterialMessage.verticalCenter
 
-                    source: UM.Theme.getIcon("Warning")
+                    source: UM.Theme.getIcon("warning")
                     color: UM.Theme.getColor("warning")
                     width: UM.Theme.getSize("section_icon").width
                     height: width
diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
index ab1d66f0e1..3350b29580 100644
--- a/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
+++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
@@ -39,7 +39,7 @@ Item
             anchors.left: parent.left
             anchors.verticalCenter: label.verticalCenter
 
-            source: UM.Theme.getIcon("Warning")
+            source: UM.Theme.getIcon("warning")
             color: UM.Theme.getColor("warning")
             width: UM.Theme.getSize("section_icon").width
             height: width
diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
index ad4911404a..d388bd7a7e 100644
--- a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
+++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
@@ -206,7 +206,7 @@ Cura.ExpandablePopup
 
                 anchors.right: parent.right
 
-                iconSource: UM.Theme.getIcon("ChevronSingleRight")
+                iconSource: UM.Theme.getIcon("arrow_right")
                 isIconOnRightSide: true
 
                 onClicked:
@@ -222,7 +222,7 @@ Cura.ExpandablePopup
                 visible: popupItem.configuration_method == ConfigurationMenu.ConfigurationMethod.Custom
                 text: catalog.i18nc("@label", "Configurations")
 
-                iconSource: UM.Theme.getIcon("ChevronSingleLeft")
+                iconSource: UM.Theme.getIcon("arrow_left")
 
                 onClicked:
                 {
diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
index 7d1393151f..30f6d1b68f 100644
--- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
+++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
@@ -314,7 +314,7 @@ Item
                         anchors.centerIn: parent
                         background: UM.RecolorImage
                         {
-                            source: UM.Theme.getIcon("Guide")
+                            source: UM.Theme.getIcon("printing_guideline")
                             color: instructionButton.hovered ? UM.Theme.getColor("primary") : UM.Theme.getColor("icon")
                         }
                         visible: selectors.instructionLink != ""
@@ -388,7 +388,7 @@ Item
                     {
                         id: warningImage
                         anchors.left: parent.left
-                        source: UM.Theme.getIcon("Warning")
+                        source: UM.Theme.getIcon("warning")
                         width: UM.Theme.getSize("section_icon").width
                         height: UM.Theme.getSize("section_icon").height
                         sourceSize.width: width
diff --git a/resources/qml/ObjectItemButton.qml b/resources/qml/ObjectItemButton.qml
index 2b998e0438..5867a1c544 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", "medium")
+            source: UM.Theme.getIcon("extruder_button")
             color: extruderColor
             visible: showExtruderSwatches && extruderColor != ""
         }
@@ -168,12 +168,12 @@ Button
                     {
                         switch (meshType) {
                             case "support_mesh":
-                                return UM.Theme.getIcon("MeshTypeSupport");
+                                return UM.Theme.getIcon("pos_print_as_support");
                             case "cutting_mesh":
                             case "infill_mesh":
-                                return UM.Theme.getIcon("MeshTypeIntersect");
+                                return UM.Theme.getIcon("pos_modify_overlaps");
                             case "anti_overhang_mesh":
-                                return UM.Theme.getIcon("MeshTypeExclude");
+                                return UM.Theme.getIcon("pos_modify_dont_support_overlap");
                         }
                         return "";
                     }
diff --git a/resources/qml/ObjectSelector.qml b/resources/qml/ObjectSelector.qml
index 0cdc2b3f80..15cb476e08 100644
--- a/resources/qml/ObjectSelector.qml
+++ b/resources/qml/ObjectSelector.qml
@@ -48,7 +48,7 @@ Item
                 sourceSize.width: width
                 anchors.left: parent.left
                 color: openCloseButton.hovered ? UM.Theme.getColor("small_button_text_hover") : UM.Theme.getColor("small_button_text")
-                source: objectSelector.opened ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleUp")
+                source: objectSelector.opened ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_top")
             }
 
             Label
diff --git a/resources/qml/Preferences/Materials/MaterialsBrandSection.qml b/resources/qml/Preferences/Materials/MaterialsBrandSection.qml
index dc8be9563b..606acc2950 100644
--- a/resources/qml/Preferences/Materials/MaterialsBrandSection.qml
+++ b/resources/qml/Preferences/Materials/MaterialsBrandSection.qml
@@ -66,7 +66,7 @@ Item
                 width: UM.Theme.getSize("standard_arrow").width
                 height: UM.Theme.getSize("standard_arrow").height
                 color: "black"
-                source: brand_section.expanded ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft")
+                source: brand_section.expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left")
             }
         }
     }
@@ -144,4 +144,4 @@ Item
             expanded = materialList.expandedBrands.indexOf(sectionName) > -1
         }
     }
-}
+}
\ No newline at end of file
diff --git a/resources/qml/Preferences/Materials/MaterialsSlot.qml b/resources/qml/Preferences/Materials/MaterialsSlot.qml
index 840c636196..81bb8759ff 100644
--- a/resources/qml/Preferences/Materials/MaterialsSlot.qml
+++ b/resources/qml/Preferences/Materials/MaterialsSlot.qml
@@ -122,7 +122,7 @@ Rectangle
                     }
                 }
             }
-            source: materialSlot.is_favorite ? UM.Theme.getIcon("StarFilled") : UM.Theme.getIcon("Star")
+            source: materialSlot.is_favorite ? UM.Theme.getIcon("favorites_star_full") : UM.Theme.getIcon("favorites_star_empty")
         }
     }
-}
+}
\ No newline at end of file
diff --git a/resources/qml/Preferences/Materials/MaterialsTypeSection.qml b/resources/qml/Preferences/Materials/MaterialsTypeSection.qml
index 09f9964604..7219cb7b89 100644
--- a/resources/qml/Preferences/Materials/MaterialsTypeSection.qml
+++ b/resources/qml/Preferences/Materials/MaterialsTypeSection.qml
@@ -78,7 +78,7 @@ Item
                 width: UM.Theme.getSize("standard_arrow").width
                 height: UM.Theme.getSize("standard_arrow").height
                 color: "black"
-                source: material_type_section.expanded ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft")
+                source: material_type_section.expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left")
             }
 
         }
@@ -134,4 +134,4 @@ Item
             expanded = materialList.expandedTypes.indexOf(materialBrand + "_" + materialName) > -1
         }
     }
-}
+}
\ No newline at end of file
diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
index 92cbd7dd89..d18febfc5f 100644
--- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
+++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
@@ -158,7 +158,7 @@ Item
                 anchors.rightMargin: UM.Theme.getSize("default_margin").width
 
                 color: hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button");
-                iconSource: UM.Theme.getIcon("StarFilled")
+                iconSource: UM.Theme.getIcon("star")
 
                 onClicked:
                 {
@@ -176,7 +176,7 @@ Item
             {
                 id: downArrow
 
-                source: UM.Theme.getIcon("ChevronSingleDown")
+                source: UM.Theme.getIcon("arrow_bottom")
                 width: UM.Theme.getSize("standard_arrow").width
                 height: UM.Theme.getSize("standard_arrow").height
 
diff --git a/resources/qml/PrintSetupSelector/NoIntentIcon.qml b/resources/qml/PrintSetupSelector/NoIntentIcon.qml
index 6fc883fdef..7943a05ab4 100644
--- a/resources/qml/PrintSetupSelector/NoIntentIcon.qml
+++ b/resources/qml/PrintSetupSelector/NoIntentIcon.qml
@@ -18,7 +18,7 @@ Item
 
     UM.RecolorImage
     {
-        source: UM.Theme.getIcon("Information")
+        source: UM.Theme.getIcon("info")
         color: UM.Theme.getColor("icon")
         anchors.fill: parent
     }
@@ -33,4 +33,4 @@ Item
         }
         onExited: base.hideTooltip()
     }
-}
+}
\ No newline at end of file
diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
index 0a5a466780..81b752eef6 100644
--- a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
+++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
@@ -142,7 +142,7 @@ Item
             leftPadding: UM.Theme.getSize("default_margin").width
             rightPadding: UM.Theme.getSize("default_margin").width
             text: catalog.i18nc("@button", "Recommended")
-            iconSource: UM.Theme.getIcon("ChevronSingleLeft")
+            iconSource: UM.Theme.getIcon("arrow_left")
             visible: currentModeIndex == PrintSetupSelectorContents.Mode.Custom
             onClicked: currentModeIndex = PrintSetupSelectorContents.Mode.Recommended
         }
@@ -156,7 +156,7 @@ Item
             leftPadding: UM.Theme.getSize("default_margin").width
             rightPadding: UM.Theme.getSize("default_margin").width
             text: catalog.i18nc("@button", "Custom")
-            iconSource: UM.Theme.getIcon("ChevronSingleRight")
+            iconSource: UM.Theme.getIcon("arrow_right")
             isIconOnRightSide: true
             visible: currentModeIndex == PrintSetupSelectorContents.Mode.Recommended
             onClicked:
@@ -233,10 +233,10 @@ Item
                     height: UM.Theme.getSize("drag_icon").height
                     anchors.centerIn: parent
 
-                    source: UM.Theme.getIcon("ThreeDots")
+                    source: UM.Theme.getIcon("resize")
                     color: UM.Theme.getColor("small_button_text")
                 }
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
index ff9204655f..1a15980693 100644
--- a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
+++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
@@ -15,7 +15,7 @@ RowLayout
 
     Cura.IconWithText
     {
-        source: UM.Theme.getIcon("PrintQuality")
+        source: UM.Theme.getIcon("category_layer_height")
         text:
         {
             if (Cura.MachineManager.activeStack)
@@ -50,7 +50,7 @@ RowLayout
 
     Cura.IconWithText
     {
-        source: UM.Theme.getIcon("Infill1")
+        source: UM.Theme.getIcon("category_infill")
         text: Cura.MachineManager.activeStack ? parseInt(infillDensity.properties.value) + "%" : "0%"
         font: UM.Theme.getFont("medium")
 
@@ -65,7 +65,7 @@ RowLayout
 
     Cura.IconWithText
     {
-        source: UM.Theme.getIcon("Support")
+        source: UM.Theme.getIcon("category_support")
         text: supportEnabled.properties.value == "True" ? enabledText : disabledText
         font: UM.Theme.getFont("medium")
 
@@ -80,7 +80,7 @@ RowLayout
 
     Cura.IconWithText
     {
-        source: UM.Theme.getIcon("Adhesion")
+        source: UM.Theme.getIcon("category_adhesion")
         text: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none" ? enabledText : disabledText
         font: UM.Theme.getFont("medium")
 
@@ -92,4 +92,4 @@ RowLayout
             watchedProperties: [ "value"]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml
index df2c1bfae6..1ae265ab47 100644
--- a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml
+++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml
@@ -25,7 +25,7 @@ Item
         id: enableAdhesionRowTitle
         anchors.top: parent.top
         anchors.left: parent.left
-        source: UM.Theme.getIcon("Adhesion")
+        source: UM.Theme.getIcon("category_adhesion")
         text: catalog.i18nc("@label", "Adhesion")
         font: UM.Theme.getFont("medium")
         width: labelColumnWidth
@@ -87,4 +87,4 @@ Item
         watchedProperties: [ "value", "resolve", "enabled" ]
         storeIndex: 0
     }
-}
+}
\ No newline at end of file
diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml
index 8da97437cf..19f199fea6 100644
--- a/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml
+++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml
@@ -29,21 +29,21 @@ Item
             var density = parseInt(infillDensity.properties.value)
             if (parseInt(infillSteps.properties.value) != 0)
             {
-                return UM.Theme.getIcon("InfillGradual")
+                return UM.Theme.getIcon("gradual")
             }
             if (density <= 0)
             {
-                return UM.Theme.getIcon("Infill0")
+                return UM.Theme.getIcon("hollow")
             }
             if (density < 40)
             {
-                return UM.Theme.getIcon("Infill3")
+                return UM.Theme.getIcon("sparse")
             }
             if (density < 90)
             {
-                return UM.Theme.getIcon("Infill2")
+                return UM.Theme.getIcon("dense")
             }
-            return UM.Theme.getIcon("Solid")
+            return UM.Theme.getIcon("solid")
         }
     }
 
@@ -61,7 +61,7 @@ Item
         id: infillRowTitle
         anchors.top: parent.top
         anchors.left: parent.left
-        source: UM.Theme.getIcon("Infill1")
+        source: UM.Theme.getIcon("category_infill")
         text: catalog.i18nc("@label", "Infill") + " (%)"
         font: UM.Theme.getFont("medium")
         width: labelColumnWidth
@@ -252,4 +252,4 @@ Item
         watchedProperties: ["value", "enabled"]
         storeIndex: 0
     }
-}
+}
\ No newline at end of file
diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
index a8e19c7357..337aff573f 100644
--- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
+++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
@@ -48,7 +48,7 @@ Item
             Cura.IconWithText
             {
                 id: profileLabel
-                source: UM.Theme.getIcon("PrintQuality")
+                source: UM.Theme.getIcon("category_layer_height")
                 text: catalog.i18nc("@label", "Profiles")
                 font: UM.Theme.getFont("medium")
                 width: labelColumnWidth
@@ -69,7 +69,7 @@ Item
                 }
 
                 color: hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button")
-                iconSource: UM.Theme.getIcon("ArrowReset")
+                iconSource: UM.Theme.getIcon("reset")
 
                 onClicked:
                 {
@@ -198,4 +198,4 @@ Item
 
         }
     }
-}
+}
\ No newline at end of file
diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
index 924dcd5ec4..aadee43c36 100644
--- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
+++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
@@ -26,7 +26,7 @@ Item
         anchors.top: parent.top
         anchors.left: parent.left
         visible: enableSupportCheckBox.visible
-        source: UM.Theme.getIcon("Support")
+        source: UM.Theme.getIcon("category_support")
         text: catalog.i18nc("@label", "Support")
         font: UM.Theme.getFont("medium")
         width: labelColumnWidth
@@ -162,7 +162,7 @@ Item
                 x: supportExtruderCombobox.width - width - supportExtruderCombobox.rightPadding
                 y: supportExtruderCombobox.topPadding + Math.round((supportExtruderCombobox.availableHeight - height) / 2)
 
-                source: UM.Theme.getIcon("ChevronSingleDown")
+                source: UM.Theme.getIcon("arrow_bottom")
                 width: UM.Theme.getSize("standard_arrow").width
                 height: UM.Theme.getSize("standard_arrow").height
                 sourceSize.width: width + 5 * screenScaleFactor
@@ -229,7 +229,7 @@ Item
 
                     sourceSize.width: width
                     sourceSize.height: height
-                    source: UM.Theme.getIcon("Extruder", "medium")
+                    source: UM.Theme.getIcon("extruder_button")
                     color: supportExtruderCombobox.color
                 }
             }
@@ -299,7 +299,7 @@ Item
 
                         sourceSize.width: width
                         sourceSize.height: height
-                        source: UM.Theme.getIcon("Extruder", "medium")
+                        source: UM.Theme.getIcon("extruder_button")
                         color: supportExtruderCombobox.model.getItem(index).color
                     }
                 }
@@ -342,4 +342,4 @@ Item
         watchedProperties: ["value"]
         storeIndex: 0
     }
-}
+}
\ No newline at end of file
diff --git a/resources/qml/PrinterOutput/ManualPrinterControl.qml b/resources/qml/PrinterOutput/ManualPrinterControl.qml
index 3213f1ace8..e8947bfdf4 100644
--- a/resources/qml/PrinterOutput/ManualPrinterControl.qml
+++ b/resources/qml/PrinterOutput/ManualPrinterControl.qml
@@ -102,7 +102,7 @@ Item
                     Layout.column: 1
                     Layout.preferredWidth: width
                     Layout.preferredHeight: height
-                    iconSource: UM.Theme.getIcon("ChevronSingleUp");
+                    iconSource: UM.Theme.getIcon("arrow_top");
                     style: UM.Theme.styles.monitor_button_style
                     width: height
                     height: UM.Theme.getSize("setting_control").height
@@ -119,7 +119,7 @@ Item
                     Layout.column: 0
                     Layout.preferredWidth: width
                     Layout.preferredHeight: height
-                    iconSource: UM.Theme.getIcon("ChevronSingleLeft");
+                    iconSource: UM.Theme.getIcon("arrow_left");
                     style: UM.Theme.styles.monitor_button_style
                     width: height
                     height: UM.Theme.getSize("setting_control").height
@@ -136,7 +136,7 @@ Item
                     Layout.column: 2
                     Layout.preferredWidth: width
                     Layout.preferredHeight: height
-                    iconSource: UM.Theme.getIcon("ChevronSingleRight");
+                    iconSource: UM.Theme.getIcon("arrow_right");
                     style: UM.Theme.styles.monitor_button_style
                     width: height
                     height: UM.Theme.getSize("setting_control").height
@@ -153,7 +153,7 @@ Item
                     Layout.column: 1
                     Layout.preferredWidth: width
                     Layout.preferredHeight: height
-                    iconSource: UM.Theme.getIcon("ChevronSingleDown");
+                    iconSource: UM.Theme.getIcon("arrow_bottom");
                     style: UM.Theme.styles.monitor_button_style
                     width: height
                     height: UM.Theme.getSize("setting_control").height
@@ -170,7 +170,7 @@ Item
                     Layout.column: 1
                     Layout.preferredWidth: width
                     Layout.preferredHeight: height
-                    iconSource: UM.Theme.getIcon("House");
+                    iconSource: UM.Theme.getIcon("home");
                     style: UM.Theme.styles.monitor_button_style
                     width: height
                     height: UM.Theme.getSize("setting_control").height
@@ -200,7 +200,7 @@ Item
 
                 Button
                 {
-                    iconSource: UM.Theme.getIcon("ChevronSingleUp");
+                    iconSource: UM.Theme.getIcon("arrow_top");
                     style: UM.Theme.styles.monitor_button_style
                     width: height
                     height: UM.Theme.getSize("setting_control").height
@@ -213,7 +213,7 @@ Item
 
                 Button
                 {
-                    iconSource: UM.Theme.getIcon("House");
+                    iconSource: UM.Theme.getIcon("home");
                     style: UM.Theme.styles.monitor_button_style
                     width: height
                     height: UM.Theme.getSize("setting_control").height
@@ -226,7 +226,7 @@ Item
 
                 Button
                 {
-                    iconSource: UM.Theme.getIcon("ChevronSingleDown");
+                    iconSource: UM.Theme.getIcon("arrow_bottom");
                     style: UM.Theme.styles.monitor_button_style
                     width: height
                     height: UM.Theme.getSize("setting_control").height
diff --git a/resources/qml/PrinterSelector/MachineSelector.qml b/resources/qml/PrinterSelector/MachineSelector.qml
index 7c74be1605..17bb80906a 100644
--- a/resources/qml/PrinterSelector/MachineSelector.qml
+++ b/resources/qml/PrinterSelector/MachineSelector.qml
@@ -93,11 +93,11 @@ Cura.ExpandablePopup
         {
             if (isGroup)
             {
-                return UM.Theme.getIcon("PrinterTriple")
+                return UM.Theme.getIcon("printer_group")
             }
             else if (isNetworkPrinter || isCloudRegistered)
             {
-                return UM.Theme.getIcon("Printer")
+                return UM.Theme.getIcon("printer_single")
             }
             else
             {
@@ -118,25 +118,7 @@ Cura.ExpandablePopup
                 leftMargin: UM.Theme.getSize("thick_margin").width
             }
 
-            source:
-            {
-                if (connectionStatus == "printer_connected")
-                {
-                    return UM.Theme.getIcon("CheckBlueBG", "low")
-                }
-                else if (connectionStatus == "printer_cloud_connected")
-                {
-                    return UM.Theme.getIcon("CloudBlueBG", "low")
-                }
-                else if (connectionStatus == "printer_cloud_not_available")
-                {
-                    return UM.Theme.getIcon("CloudGreyBG", "low")
-                }
-                else
-                {
-                    return ""
-                }
-            }
+            source: UM.Theme.getIcon(connectionStatus)
 
             width: UM.Theme.getSize("printer_status_icon").width
             height: UM.Theme.getSize("printer_status_icon").height
diff --git a/resources/qml/Settings/SettingCategory.qml b/resources/qml/Settings/SettingCategory.qml
index a42db9cdcb..e3e12d7753 100644
--- a/resources/qml/Settings/SettingCategory.qml
+++ b/resources/qml/Settings/SettingCategory.qml
@@ -93,7 +93,7 @@ Button
             height: UM.Theme.getSize("standard_arrow").height
             sourceSize.height: width
             color: UM.Theme.getColor("setting_control_button")
-            source: definition.expanded ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft")
+            source: definition.expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left")
         }
     }
 
@@ -154,7 +154,7 @@ Button
 
         color: UM.Theme.getColor("setting_control_button")
         hoverColor: UM.Theme.getColor("setting_control_button_hover")
-        iconSource: UM.Theme.getIcon("Sliders")
+        iconSource: UM.Theme.getIcon("settings")
 
         onClicked: Cura.Actions.configureSettingVisibility.trigger(definition)
     }
@@ -195,7 +195,7 @@ Button
 
         color: UM.Theme.getColor("setting_control_button")
         hoverColor: UM.Theme.getColor("setting_control_button_hover")
-        iconSource: UM.Theme.getIcon("Information")
+        iconSource: UM.Theme.getIcon("notice")
 
         onEntered: base.showTooltip(catalog.i18nc("@label","Some hidden settings use values different from their normal calculated value.\n\nClick to make these settings visible."))
 
diff --git a/resources/qml/Settings/SettingCheckBox.qml b/resources/qml/Settings/SettingCheckBox.qml
index 20693b92e3..e3de6e219d 100644
--- a/resources/qml/Settings/SettingCheckBox.qml
+++ b/resources/qml/Settings/SettingCheckBox.qml
@@ -151,7 +151,7 @@ SettingItem
                 height: Math.round(parent.height / 2.5)
                 sourceSize.height: width
                 color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text");
-                source: UM.Theme.getIcon("Check")
+                source: UM.Theme.getIcon("check")
                 opacity: control.checked ? 1 : 0
                 Behavior on opacity { NumberAnimation { duration: 100; } }
             }
diff --git a/resources/qml/Settings/SettingExtruder.qml b/resources/qml/Settings/SettingExtruder.qml
index 995e1103f3..2bf9e24b3d 100644
--- a/resources/qml/Settings/SettingExtruder.qml
+++ b/resources/qml/Settings/SettingExtruder.qml
@@ -104,7 +104,7 @@ SettingItem
             x: control.width - width - control.rightPadding
             y: control.topPadding + Math.round((control.availableHeight - height) / 2)
 
-            source: UM.Theme.getIcon("ChevronSingleDown")
+            source: UM.Theme.getIcon("arrow_bottom")
             width: UM.Theme.getSize("standard_arrow").width
             height: UM.Theme.getSize("standard_arrow").height
             sourceSize.width: width + 5 * screenScaleFactor
@@ -171,7 +171,7 @@ SettingItem
 
                 sourceSize.width: width
                 sourceSize.height: height
-                source: UM.Theme.getIcon("Extruder", "medium")
+                source: UM.Theme.getIcon("extruder_button")
                 color: control.color
             }
         }
@@ -240,7 +240,7 @@ SettingItem
 
                     sourceSize.width: width
                     sourceSize.height: height
-                    source: UM.Theme.getIcon("Extruder", "medium")
+                    source: UM.Theme.getIcon("extruder_button")
                     color: control.model.getItem(index).color
                 }
             }
diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml
index 56f07f51af..f0c748d190 100644
--- a/resources/qml/Settings/SettingItem.qml
+++ b/resources/qml/Settings/SettingItem.qml
@@ -179,7 +179,7 @@ Item
                 color: UM.Theme.getColor("setting_control_button")
                 hoverColor: UM.Theme.getColor("setting_control_button")
 
-                iconSource: UM.Theme.getIcon("Link")
+                iconSource: UM.Theme.getIcon("link")
 
                 onEntered:
                 {
@@ -208,7 +208,7 @@ Item
                 color: UM.Theme.getColor("setting_control_button")
                 hoverColor: UM.Theme.getColor("setting_control_button_hover")
 
-                iconSource: UM.Theme.getIcon("ArrowReset")
+                iconSource: UM.Theme.getIcon("reset")
 
                 onClicked:
                 {
@@ -324,7 +324,7 @@ Item
                 color: UM.Theme.getColor("setting_control_button")
                 hoverColor: UM.Theme.getColor("setting_control_button_hover")
 
-                iconSource: UM.Theme.getIcon("Formula")
+                iconSource: UM.Theme.getIcon("formula")
 
                 onEntered: { hoverTimer.stop(); base.showTooltip(catalog.i18nc("@label", "This setting is normally calculated, but it currently has an absolute value set.\n\nClick to restore the calculated value.")) }
                 onExited: base.showTooltip(base.createTooltipText())
diff --git a/resources/qml/Settings/SettingOptionalExtruder.qml b/resources/qml/Settings/SettingOptionalExtruder.qml
index 5b1da6b785..ce078551d8 100644
--- a/resources/qml/Settings/SettingOptionalExtruder.qml
+++ b/resources/qml/Settings/SettingOptionalExtruder.qml
@@ -105,7 +105,7 @@ SettingItem
             x: control.width - width - control.rightPadding
             y: control.topPadding + Math.round((control.availableHeight - height) / 2)
 
-            source: UM.Theme.getIcon("ChevronSingleDown")
+            source: UM.Theme.getIcon("arrow_bottom")
             width: UM.Theme.getSize("standard_arrow").width
             height: UM.Theme.getSize("standard_arrow").height
             sourceSize.width: width + 5 * screenScaleFactor
@@ -172,7 +172,7 @@ SettingItem
 
                 sourceSize.width: width
                 sourceSize.height: height
-                source: UM.Theme.getIcon("Extruder", "medium")
+                source: UM.Theme.getIcon("extruder_button")
                 color: control.color
             }
         }
@@ -237,7 +237,7 @@ SettingItem
 
                     sourceSize.width: width
                     sourceSize.height: height
-                    source: UM.Theme.getIcon("Extruder", "medium")
+                    source: UM.Theme.getIcon("extruder_button")
                     color: control.model.getItem(index).color
                 }
             }
diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml
index fe73f55c09..b31e7e4508 100644
--- a/resources/qml/Settings/SettingView.qml
+++ b/resources/qml/Settings/SettingView.qml
@@ -65,7 +65,7 @@ Item
             anchors.right: clearFilterButton.left
             anchors.rightMargin: Math.round(UM.Theme.getSize("thick_margin").width)
 
-            placeholderText: "<img align='middle'  src='"+ UM.Theme.getIcon("Magnifier") +"'>" +  "<div vertical-align=bottom>" + catalog.i18nc("@label:textbox", "Search settings")
+            placeholderText: "<img align='middle'  src='"+ UM.Theme.getIcon("search") +"'>" +  "<div vertical-align=bottom>" + catalog.i18nc("@label:textbox", "Search settings")
 
             style: TextFieldStyle
             {
@@ -133,7 +133,7 @@ Item
         UM.SimpleButton
         {
             id: clearFilterButton
-            iconSource: UM.Theme.getIcon("Cancel")
+            iconSource: UM.Theme.getIcon("cross1")
             visible: findingSettings
 
             height: Math.round(parent.height * 0.4)
@@ -193,7 +193,7 @@ Item
                     sourceSize.width: width
                     sourceSize.height: height
                     color: control.hovered ? UM.Theme.getColor("small_button_text_hover") : UM.Theme.getColor("small_button_text")
-                    source: UM.Theme.getIcon("Hamburger")
+                    source: UM.Theme.getIcon("menu")
                 }
             }
             label: Label {}
diff --git a/resources/qml/ViewOrientationControls.qml b/resources/qml/ViewOrientationControls.qml
index fc0f20fa77..97f2bb9400 100644
--- a/resources/qml/ViewOrientationControls.qml
+++ b/resources/qml/ViewOrientationControls.qml
@@ -18,7 +18,7 @@ Row
 
     ViewOrientationButton
     {
-        iconSource: UM.Theme.getIcon("View3D")
+        iconSource: UM.Theme.getIcon("view_3d")
         onClicked: Cura.Actions.view3DCamera.trigger()
 
         UM.TooltipArea
@@ -31,7 +31,7 @@ Row
 
     ViewOrientationButton
     {
-        iconSource: UM.Theme.getIcon("ViewFront")
+        iconSource: UM.Theme.getIcon("view_front")
         onClicked: Cura.Actions.viewFrontCamera.trigger()
 
         UM.TooltipArea
@@ -44,7 +44,7 @@ Row
 
     ViewOrientationButton
     {
-        iconSource: UM.Theme.getIcon("ViewTop")
+        iconSource: UM.Theme.getIcon("view_top")
         onClicked: Cura.Actions.viewTopCamera.trigger()
 
         UM.TooltipArea
@@ -57,7 +57,7 @@ Row
 
     ViewOrientationButton
     {
-        iconSource: UM.Theme.getIcon("ViewLeft")
+        iconSource: UM.Theme.getIcon("view_left")
         onClicked: Cura.Actions.viewLeftSideCamera.trigger()
 
         UM.TooltipArea
@@ -70,7 +70,7 @@ Row
 
     ViewOrientationButton
     {
-        iconSource: UM.Theme.getIcon("ViewRight")
+        iconSource: UM.Theme.getIcon("view_right")
         onClicked: Cura.Actions.viewRightSideCamera.trigger()
 
         UM.TooltipArea
diff --git a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
index fb809426f4..68ee482b5c 100644
--- a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
+++ b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
@@ -143,7 +143,7 @@ Item
                             sourceSize.width: width
                             sourceSize.height: height
                             color: UM.Theme.getColor("text")
-                            source: base.currentSection == section ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight")
+                            source: base.currentSection == section ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_right")
                         }
 
                         Label
diff --git a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
index 5334a15974..9d79c421bd 100644
--- a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
+++ b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
@@ -229,7 +229,7 @@ Item
                 width: height
                 sourceSize.height: width
                 color: UM.Theme.getColor("text_link")
-                source: UM.Theme.getIcon("LinkExternal")
+                source: UM.Theme.getIcon("external_link")
             }
 
             Label
diff --git a/resources/qml/WelcomePages/CloudContent.qml b/resources/qml/WelcomePages/CloudContent.qml
index 26e3a2f87c..692ad12a29 100644
--- a/resources/qml/WelcomePages/CloudContent.qml
+++ b/resources/qml/WelcomePages/CloudContent.qml
@@ -112,7 +112,7 @@ Item
                         anchors.horizontalCenter: parent.horizontalCenter
                         fillMode: Image.PreserveAspectFit
                         width: UM.Theme.getSize("welcome_wizard_cloud_content_image").width
-                        source: UM.Theme.getIcon("Plugin")
+                        source: UM.Theme.getIcon("package")
                         sourceSize.width: width
                         sourceSize.height: height
                     }
@@ -142,7 +142,7 @@ Item
                         anchors.horizontalCenter: parent.horizontalCenter
                         fillMode: Image.PreserveAspectFit
                         width: UM.Theme.getSize("welcome_wizard_cloud_content_image").width
-                        source: UM.Theme.getIcon("Spool")
+                        source: UM.Theme.getIcon("material_spool")
                         sourceSize.width: width
                         sourceSize.height: height
                     }
@@ -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", "medium")
+                        source: UM.Theme.getIcon("group")
                         sourceSize.width: width
                         sourceSize.height: height
                     }
diff --git a/resources/qml/WelcomePages/DropDownHeader.qml b/resources/qml/WelcomePages/DropDownHeader.qml
index cb41ca808b..88da32c879 100644
--- a/resources/qml/WelcomePages/DropDownHeader.qml
+++ b/resources/qml/WelcomePages/DropDownHeader.qml
@@ -27,7 +27,7 @@ Cura.RoundedRectangle
     cornerSide: contentShown ? Cura.RoundedRectangle.Direction.Up : Cura.RoundedRectangle.Direction.All
 
     property string title: ""
-    property url rightIconSource: UM.Theme.getIcon("ChevronSingleDown")
+    property url rightIconSource: UM.Theme.getIcon("arrow_bottom")
 
     // If the tab is under hovering state
     property bool hovered: false
diff --git a/resources/qml/WelcomePages/DropDownWidget.qml b/resources/qml/WelcomePages/DropDownWidget.qml
index b129673905..7ec6860c89 100644
--- a/resources/qml/WelcomePages/DropDownWidget.qml
+++ b/resources/qml/WelcomePages/DropDownWidget.qml
@@ -49,7 +49,7 @@ Item
         anchors.left: parent.left
         anchors.right: parent.right
         height: UM.Theme.getSize("expandable_component_content_header").height
-        rightIconSource: contentShown ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft")
+        rightIconSource: contentShown ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left")
         contentShown: base.contentShown
     }
 
diff --git a/resources/qml/Widgets/CheckBox.qml b/resources/qml/Widgets/CheckBox.qml
index 295283d76e..f79dc1620e 100644
--- a/resources/qml/Widgets/CheckBox.qml
+++ b/resources/qml/Widgets/CheckBox.qml
@@ -58,7 +58,7 @@ CheckBox
             height: Math.round(parent.height / 2.5)
             sourceSize.height: width
             color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text")
-            source: UM.Theme.getIcon("Check")
+            source: UM.Theme.getIcon("check")
             opacity: control.checked ? 1 : 0
             Behavior on opacity { NumberAnimation { duration: 100; } }
         }
diff --git a/resources/qml/Widgets/ComboBox.qml b/resources/qml/Widgets/ComboBox.qml
index f0ee3bdc00..7eb366f0a3 100644
--- a/resources/qml/Widgets/ComboBox.qml
+++ b/resources/qml/Widgets/ComboBox.qml
@@ -62,7 +62,7 @@ ComboBox
         x: control.width - width - control.rightPadding
         y: control.topPadding + Math.round((control.availableHeight - height) / 2)
 
-        source: UM.Theme.getIcon("ChevronSingleDown")
+        source: UM.Theme.getIcon("arrow_bottom")
         width: UM.Theme.getSize("standard_arrow").width
         height: UM.Theme.getSize("standard_arrow").height
         sourceSize.width: width + 5 * screenScaleFactor