diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml
index e8739dcf64..e69cced221 100644
--- a/plugins/3MFReader/WorkspaceDialog.qml
+++ b/plugins/3MFReader/WorkspaceDialog.qml
@@ -426,7 +426,7 @@ UM.Dialog
                 width: parent.width
                 height: childrenRect.height
                 visible: manager.hasObjectsOnPlate
-                UM.RecolorImage
+                UM.ColorImage
                 {
                     width: warningLabel.height
                     height: width
diff --git a/plugins/CuraDrive/src/qml/components/BackupListItemDetailsRow.qml b/plugins/CuraDrive/src/qml/components/BackupListItemDetailsRow.qml
index 8ddf8e9d42..b5efc8c41b 100644
--- a/plugins/CuraDrive/src/qml/components/BackupListItemDetailsRow.qml
+++ b/plugins/CuraDrive/src/qml/components/BackupListItemDetailsRow.qml
@@ -17,7 +17,7 @@ RowLayout
     property alias label: detailName.text
     property alias value: detailValue.text
 
-    UM.RecolorImage
+    UM.ColorImage
     {
         id: icon
         width: 18 * screenScaleFactor
diff --git a/plugins/DigitalLibrary/resources/qml/LoadMoreProjectsCard.qml b/plugins/DigitalLibrary/resources/qml/LoadMoreProjectsCard.qml
index 45a0c6886d..6a0706bd00 100644
--- a/plugins/DigitalLibrary/resources/qml/LoadMoreProjectsCard.qml
+++ b/plugins/DigitalLibrary/resources/qml/LoadMoreProjectsCard.qml
@@ -30,7 +30,7 @@ Cura.RoundedRectangle
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.verticalCenter: parent.verticalCenter
 
-        UM.RecolorImage
+        UM.ColorImage
         {
             id: projectImage
             anchors.verticalCenter: parent.verticalCenter
diff --git a/plugins/Marketplace/resources/qml/LicenseDialog.qml b/plugins/Marketplace/resources/qml/LicenseDialog.qml
index f3734ca89f..2f3f4ffc12 100644
--- a/plugins/Marketplace/resources/qml/LicenseDialog.qml
+++ b/plugins/Marketplace/resources/qml/LicenseDialog.qml
@@ -33,7 +33,7 @@ UM.Dialog
             spacing: UM.Theme.getSize("default_margin").width
             leftPadding: UM.Theme.getSize("narrow_margin").width
 
-            UM.RecolorImage
+            UM.ColorImage
             {
                 id: icon
                 width: UM.Theme.getSize("marketplace_large_icon").width
diff --git a/plugins/Marketplace/resources/qml/ManageButton.qml b/plugins/Marketplace/resources/qml/ManageButton.qml
index 36022ffd54..5f4b3dcadd 100644
--- a/plugins/Marketplace/resources/qml/ManageButton.qml
+++ b/plugins/Marketplace/resources/qml/ManageButton.qml
@@ -46,7 +46,7 @@ Item
             height: UM.Theme.getSize("action_button").height
             width: childrenRect.width
 
-            UM.RecolorImage
+            UM.ColorImage
             {
                 id: busyIndicator
                 visible: parent.visible
diff --git a/plugins/Marketplace/resources/qml/ManagePackagesButton.qml b/plugins/Marketplace/resources/qml/ManagePackagesButton.qml
index fc9e7d757f..a32de2b809 100644
--- a/plugins/Marketplace/resources/qml/ManagePackagesButton.qml
+++ b/plugins/Marketplace/resources/qml/ManagePackagesButton.qml
@@ -33,7 +33,7 @@ TabButton
         visible: root.hovered
     }
 
-    UM.RecolorImage
+    UM.ColorImage
     {
         id: icon
 
diff --git a/plugins/Marketplace/resources/qml/Marketplace.qml b/plugins/Marketplace/resources/qml/Marketplace.qml
index 8fcba852bd..887886fd22 100644
--- a/plugins/Marketplace/resources/qml/Marketplace.qml
+++ b/plugins/Marketplace/resources/qml/Marketplace.qml
@@ -251,7 +251,7 @@ Window
                 margins: UM.Theme.getSize("default_margin").width
             }
             spacing: UM.Theme.getSize("default_margin").width
-            UM.RecolorImage
+            UM.ColorImage
             {
                 id: bannerIcon
                 source: UM.Theme.getIcon("Plugin")
diff --git a/plugins/Marketplace/resources/qml/OnboardBanner.qml b/plugins/Marketplace/resources/qml/OnboardBanner.qml
index a9d0834b6d..278c50ab57 100644
--- a/plugins/Marketplace/resources/qml/OnboardBanner.qml
+++ b/plugins/Marketplace/resources/qml/OnboardBanner.qml
@@ -20,7 +20,7 @@ Rectangle
     color: UM.Theme.getColor("action_panel_secondary")
 
     // Icon
-    UM.RecolorImage
+    UM.ColorImage
     {
         id: onboardingIcon
         anchors
diff --git a/plugins/Marketplace/resources/qml/PackageCardHeader.qml b/plugins/Marketplace/resources/qml/PackageCardHeader.qml
index f86a336d2d..8e25e5c64c 100644
--- a/plugins/Marketplace/resources/qml/PackageCardHeader.qml
+++ b/plugins/Marketplace/resources/qml/PackageCardHeader.qml
@@ -47,12 +47,10 @@ Item
             sourceSize.width: width
         }
 
-        UM.RecolorImage
+        UM.ColorImage
         {
             visible: !parent.packageHasIcon
             anchors.fill: parent
-            sourceSize.height: height
-            sourceSize.width: width
             color: UM.Theme.getColor("text")
             source:
             {
@@ -123,7 +121,7 @@ Item
 
                 Layout.preferredWidth: UM.Theme.getSize("card_tiny_icon").width + 2 * padding
                 Layout.preferredHeight: UM.Theme.getSize("card_tiny_icon").width + 2 * padding
-                contentItem: UM.RecolorImage
+                contentItem: UM.ColorImage
                 {
                     source: UM.Theme.getIcon("LinkExternal")
                     color: UM.Theme.getColor("icon")
diff --git a/plugins/Marketplace/resources/qml/PackagePage.qml b/plugins/Marketplace/resources/qml/PackagePage.qml
index e590ee6091..455b2b8d5d 100644
--- a/plugins/Marketplace/resources/qml/PackagePage.qml
+++ b/plugins/Marketplace/resources/qml/PackagePage.qml
@@ -46,7 +46,7 @@ Rectangle
                     // But we re-use the package page for the manage plugins as well. The one user that doesn't see
                     // the num downloads is an acceptable "sacrifice" to make this easy to fix. 
                     visible: packageData.downloadCount != "0"
-                    UM.RecolorImage
+                    UM.ColorImage
                     {
                         id: downloadsIcon
                         width: UM.Theme.getSize("card_tiny_icon").width
diff --git a/plugins/Marketplace/resources/qml/Packages.qml b/plugins/Marketplace/resources/qml/Packages.qml
index 56fffe036e..d86536639c 100644
--- a/plugins/Marketplace/resources/qml/Packages.qml
+++ b/plugins/Marketplace/resources/qml/Packages.qml
@@ -213,7 +213,7 @@ ListView
                         status: UM.StatusIcon.Status.ERROR
                         visible: false
                     }
-                    UM.RecolorImage
+                    UM.ColorImage
                     {
                         id: loadMoreIcon
                         anchors.fill: parent
diff --git a/plugins/Marketplace/resources/qml/VerifiedIcon.qml b/plugins/Marketplace/resources/qml/VerifiedIcon.qml
index 6b9d7b6017..e701c5a91b 100644
--- a/plugins/Marketplace/resources/qml/VerifiedIcon.qml
+++ b/plugins/Marketplace/resources/qml/VerifiedIcon.qml
@@ -32,7 +32,7 @@ Control
         anchors.fill: parent
         color: UM.Theme.getColor("action_button_hovered")
         radius: width
-        UM.RecolorImage
+        UM.ColorImage
         {
             anchors.fill: parent
             color: UM.Theme.getColor("primary")
diff --git a/plugins/MonitorStage/MonitorMain.qml b/plugins/MonitorStage/MonitorMain.qml
index aa717ce95c..8992606d90 100644
--- a/plugins/MonitorStage/MonitorMain.qml
+++ b/plugins/MonitorStage/MonitorMain.qml
@@ -123,7 +123,7 @@ Rectangle
             visible: !isNetworkConfigured && isNetworkConfigurable
             width: childrenRect.width
 
-            UM.RecolorImage
+            UM.ColorImage
             {
                 id: externalLinkIcon
                 anchors.verticalCenter: parent.verticalCenter
diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
index a53f051db8..c6a3817c07 100644
--- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
+++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
@@ -79,7 +79,7 @@ Item
             {
                 id: normalButton
                 text: catalog.i18nc("@label", "Normal model")
-                toolItem: UM.RecolorImage
+                toolItem: UM.ColorImage
                 {
                     source: UM.Theme.getIcon("Infill0")
                     color: UM.Theme.getColor("icon")
@@ -94,7 +94,7 @@ Item
             {
                 id: supportMeshButton
                 text: catalog.i18nc("@label", "Print as support")
-                toolItem: UM.RecolorImage
+                toolItem: UM.ColorImage
                 {
                     source: UM.Theme.getIcon("MeshTypeSupport")
                     color: UM.Theme.getColor("icon")
@@ -109,7 +109,7 @@ Item
             {
                 id: overlapMeshButton
                 text: catalog.i18nc("@label", "Modify settings for overlaps")
-                toolItem: UM.RecolorImage
+                toolItem: UM.ColorImage
                 {
                     source: UM.Theme.getIcon("MeshTypeIntersect")
                     color: UM.Theme.getColor("icon")
@@ -124,7 +124,7 @@ Item
             {
                 id: antiOverhangMeshButton
                 text:  catalog.i18nc("@label", "Don't support overlaps")
-                toolItem: UM.RecolorImage
+                toolItem: UM.ColorImage
                 {
                     source: UM.Theme.getIcon("BlockSupportOverlaps")
                     color: UM.Theme.getColor("icon")
@@ -304,12 +304,11 @@ Item
 
                         background: Item
                         {
-                            UM.RecolorImage
+                            UM.ColorImage
                             {
                                 anchors.verticalCenter: parent.verticalCenter
                                 width: parent.width
                                 height: width
-                                sourceSize.height: width
                                 color: parent.hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button")
                                 source: UM.Theme.getIcon("Minus")
                             }
diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml
index 5b9ca1c71b..d4cba61496 100644
--- a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml
+++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml
@@ -143,14 +143,12 @@ UM.Dialog
                                 }
                             }
 
-                            UM.RecolorImage
+                            UM.ColorImage
                             {
                                 anchors.verticalCenter: parent.verticalCenter
                                 anchors.horizontalCenter: parent.horizontalCenter
                                 width: UM.Theme.getSize("standard_arrow").width
                                 height: UM.Theme.getSize("standard_arrow").height
-                                sourceSize.width: width
-                                sourceSize.height: height
                                 color: parent.enabled ? UM.Theme.getColor("text") : UM.Theme.getColor("text_disabled")
                                 source: UM.Theme.getIcon("ChevronSingleDown")
                             }
@@ -175,14 +173,12 @@ UM.Dialog
                                 }
                             }
 
-                            UM.RecolorImage
+                            UM.ColorImage
                             {
                                 anchors.verticalCenter: parent.verticalCenter
                                 anchors.horizontalCenter: parent.horizontalCenter
                                 width: UM.Theme.getSize("standard_arrow").width
                                 height: UM.Theme.getSize("standard_arrow").height
-                                sourceSize.width: width
-                                sourceSize.height: height
                                 color: upButton.enabled ? UM.Theme.getColor("text") : UM.Theme.getColor("text_disabled")
                                 source: UM.Theme.getIcon("ChevronSingleUp")
                             }
@@ -200,14 +196,12 @@ UM.Dialog
                                 onClicked: manager.removeScriptByIndex(index)
                             }
 
-                            UM.RecolorImage
+                            UM.ColorImage
                             {
                                 anchors.verticalCenter: parent.verticalCenter
                                 anchors.horizontalCenter: parent.horizontalCenter
                                 width: UM.Theme.getSize("standard_arrow").width
                                 height: UM.Theme.getSize("standard_arrow").height
-                                sourceSize.width: width
-                                sourceSize.height: height
                                 color: UM.Theme.getColor("text")
                                 source: UM.Theme.getIcon("Cancel")
                             }
diff --git a/plugins/PrepareStage/PrepareMenu.qml b/plugins/PrepareStage/PrepareMenu.qml
index 6d095bad01..d6bff1792e 100644
--- a/plugins/PrepareStage/PrepareMenu.qml
+++ b/plugins/PrepareStage/PrepareMenu.qml
@@ -91,13 +91,11 @@ Item
             height: parent.height
             width: visible ? (headerPadding * 3 + UM.Theme.getSize("button_icon").height + iconSize) : 0
 
-            headerItem: UM.RecolorImage
+            headerItem: UM.ColorImage
             {
                 id: menuIcon
                 source: UM.Theme.getIcon("Folder", "medium")
                 color: UM.Theme.getColor("icon")
-
-                sourceSize.height: height
             }
 
             contentItem: Item
@@ -177,7 +175,7 @@ Item
 
             contentItem: Item
             {
-                UM.RecolorImage
+                UM.ColorImage
                 {
                     id: buttonIcon
                     source: UM.Theme.getIcon("Folder", "medium")
@@ -185,8 +183,6 @@ Item
                     width: UM.Theme.getSize("button_icon").width
                     height: UM.Theme.getSize("button_icon").height
                     color: UM.Theme.getColor("icon")
-
-                    sourceSize.height: height
                 }
             }
 
diff --git a/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml b/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml
index 4458b48996..e95b9d7e0e 100644
--- a/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml
@@ -21,7 +21,7 @@ Button
         color: parent.enabled ? (parent.hovered ? UM.Theme.getColor("monitor_card_hover") : "transparent") : UM.Theme.getColor("monitor_icon_disabled")
     }
 
-    UM.RecolorImage
+    UM.ColorImage
     {
         id: icon
         anchors
diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml
index 60e3726a32..0bd57e76d8 100644
--- a/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml
@@ -45,7 +45,7 @@ Item
                 radius: Math.floor(height / 2)
             }
 
-            UM.RecolorImage
+            UM.ColorImage
             {
                 id: buildplateIcon
                 anchors.centerIn: parent
diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml
index df6748cc36..89c2edd9b5 100644
--- a/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml
@@ -75,13 +75,11 @@ Item
         contentItem: Item
         {
             anchors.fill: parent
-            UM.RecolorImage
+            UM.ColorImage
             {
                 anchors.centerIn: parent
                 width: 18 // TODO: Theme!
                 height: width // TODO: Theme!
-                sourceSize.width: width // TODO: Theme!
-                sourceSize.height: width // TODO: Theme!
                 color: UM.Theme.getColor("text")
                 source: UM.Theme.getIcon("ChevronSingleLeft")
             }
@@ -154,13 +152,11 @@ Item
         contentItem: Item
         {
             anchors.fill: parent
-            UM.RecolorImage
+            UM.ColorImage
             {
                 anchors.centerIn: parent
                 width: 18 // TODO: Theme!
                 height: width // TODO: Theme!
-                sourceSize.width: width // TODO: Theme!
-                sourceSize.height: width // TODO: Theme!
                 color: UM.Theme.getColor("text")
                 source: UM.Theme.getIcon("ChevronSingleRight")
             }
diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml
index f22ac53298..4b1a7df607 100644
--- a/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml
@@ -27,7 +27,7 @@ Item
     height: size
     width: size
 
-    UM.RecolorImage
+    UM.ColorImage
     {
         id: icon
         anchors.fill: parent
diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml
index cf2239201f..4b4b7a2a3a 100644
--- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml
@@ -38,7 +38,7 @@ Item
     }
 
 
-    UM.RecolorImage
+    UM.ColorImage
     {
         id: ultiBotImage
 
@@ -46,18 +46,13 @@ Item
         color: UM.Theme.getColor("monitor_placeholder_image")
         height: printJobPreview.height
         source: "../svg/ultibot.svg"
-        sourceSize
-        {
-            height: height
-            width: width
-        }
         /* Since print jobs ALWAYS have an image url, we have to check if that image URL errors or
             not in order to determine if we show the placeholder (ultibot) image instead. */
         visible: printJob && previewImage.status == Image.Error
         width: printJobPreview.width
     }
 
-    UM.RecolorImage
+    UM.ColorImage
     {
         id: overlayIcon
         anchors.centerIn: printJobPreview
@@ -90,11 +85,6 @@ Item
             }
             return ""
         }
-        sourceSize
-        {
-            height: height
-            width: width
-        }
         visible: source != ""
         width: 0.5 * printJobPreview.width
     }
diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
index df701b1d1f..2bc20ae462 100644
--- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
@@ -147,7 +147,7 @@ Item
                         color: UM.Theme.getColor("text_link")
                         text: catalog.i18nc("@label link to Connect and Cloud interfaces", "Manage printer")
                     }
-                    UM.RecolorImage
+                    UM.ColorImage
                     {
                         id: externalLinkIcon
                         anchors
diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml
index 87b7cab83e..3fd500cfca 100644
--- a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml
@@ -40,7 +40,7 @@ Item
         height: 18 * screenScaleFactor // TODO: Theme!
         width: childrenRect.width
 
-        UM.RecolorImage
+        UM.ColorImage
         {
             id: externalLinkIcon
             anchors.verticalCenter: manageQueueLabel.verticalCenter
diff --git a/resources/qml/Account/AvatarImage.qml b/resources/qml/Account/AvatarImage.qml
index 6df592ba33..7afd1b8180 100644
--- a/resources/qml/Account/AvatarImage.qml
+++ b/resources/qml/Account/AvatarImage.qml
@@ -45,7 +45,7 @@ Item
         cached: true
     }*/
 
-    UM.RecolorImage
+    UM.ColorImage
     {
         id: profileImageOutline
         anchors.centerIn: parent
@@ -54,7 +54,6 @@ Item
         height: parent.height + 2
         visible: hasAvatar
         source: UM.Theme.getIcon("CircleOutline")
-        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 e5731ff9d7..9c978b4607 100644
--- a/resources/qml/Account/SyncState.qml
+++ b/resources/qml/Account/SyncState.qml
@@ -43,7 +43,7 @@ Row // Sync state icon + message
         }
     ]
 
-    UM.RecolorImage
+    UM.ColorImage
     {
         id: icon
         width: 20 * screenScaleFactor
diff --git a/resources/qml/ActionButton.qml b/resources/qml/ActionButton.qml
index 60a0e4d1f5..187da07cb6 100644
--- a/resources/qml/ActionButton.qml
+++ b/resources/qml/ActionButton.qml
@@ -62,14 +62,12 @@ Button
         spacing: UM.Theme.getSize("narrow_margin").width
         height: button.height
         //Left side icon. Only displayed if !isIconOnRightSide.
-        UM.RecolorImage
+        UM.ColorImage
         {
             id: buttonIconLeft
             source: ""
             height: visible ? button.iconSize : 0
             width: visible ? height : 0
-            sourceSize.width: width
-            sourceSize.height: height
             color: button.enabled ? (button.hovered ? button.textHoverColor : button.textColor) : button.textDisabledColor
             visible: source != "" && !button.isIconOnRightSide
             anchors.verticalCenter: parent.verticalCenter
@@ -109,14 +107,12 @@ Button
         }
 
         //Right side icon. Only displayed if isIconOnRightSide.
-        UM.RecolorImage
+        UM.ColorImage
         {
             id: buttonIconRight
             source: buttonIconLeft.source
             height: visible ? button.iconSize : 0
             width: visible ? height : 0
-            sourceSize.width: width
-            sourceSize.height: height
             color: buttonIconLeft.color
             visible: source != "" && button.isIconOnRightSide
             anchors.verticalCenter: buttonIconLeft.verticalCenter
diff --git a/resources/qml/ActionPanel/PrintInformationWidget.qml b/resources/qml/ActionPanel/PrintInformationWidget.qml
index 813215de4c..377bc3e979 100644
--- a/resources/qml/ActionPanel/PrintInformationWidget.qml
+++ b/resources/qml/ActionPanel/PrintInformationWidget.qml
@@ -7,7 +7,7 @@ import QtQuick.Controls 2.1
 import UM 1.1 as UM
 import Cura 1.0 as Cura
 
-UM.RecolorImage
+UM.ColorImage
 {
     id: widget
 
diff --git a/resources/qml/ApplicationSwitcher/ApplicationButton.qml b/resources/qml/ApplicationSwitcher/ApplicationButton.qml
index 182b80811b..3d67889220 100644
--- a/resources/qml/ApplicationSwitcher/ApplicationButton.qml
+++ b/resources/qml/ApplicationSwitcher/ApplicationButton.qml
@@ -45,7 +45,7 @@ Button
         anchors.right: parent.right
         anchors.verticalCenter: parent.verticalCenter
 
-        UM.RecolorImage
+        UM.ColorImage
         {
             id: applicationIcon
             anchors.horizontalCenter: parent.horizontalCenter
@@ -54,7 +54,7 @@ Button
             width: UM.Theme.getSize("application_switcher_icon").width
             height: width
 
-            UM.RecolorImage
+            UM.ColorImage
             {
                 id: externalLinkIndicatorIcon
                 visible: base.isExternalLink
diff --git a/resources/qml/ApplicationSwitcher/ApplicationSwitcher.qml b/resources/qml/ApplicationSwitcher/ApplicationSwitcher.qml
index a8ea2312a5..69852270c1 100644
--- a/resources/qml/ApplicationSwitcher/ApplicationSwitcher.qml
+++ b/resources/qml/ApplicationSwitcher/ApplicationSwitcher.qml
@@ -31,7 +31,7 @@ Item
                 Behavior on opacity { NumberAnimation { duration: 100; } }
             }
 
-            UM.RecolorImage
+            UM.ColorImage
             {
                 anchors.fill: parent
                 color: UM.Theme.getColor("primary_text")
diff --git a/resources/qml/CategoryButton.qml b/resources/qml/CategoryButton.qml
index b5d8bb2b2d..049ca032f0 100644
--- a/resources/qml/CategoryButton.qml
+++ b/resources/qml/CategoryButton.qml
@@ -78,7 +78,7 @@ Button
         id: content
         //spacing: UM.Theme.getSize("narrow_margin").width
 
-        UM.RecolorImage
+        UM.ColorImage
         {
             id: icon
             source: ""
@@ -88,8 +88,6 @@ Button
             width: visible ? UM.Theme.getSize("section_icon").width: 0
             height: UM.Theme.getSize("section_icon").height
             anchors.leftMargin: base.indented ? UM.Theme.getSize("default_margin").width: 0
-            sourceSize.width: width
-            sourceSize.height: width
         }
 
         UM.Label
@@ -106,15 +104,13 @@ Button
             color: UM.Theme.getColor("setting_category_text")
         }
 
-        UM.RecolorImage
+        UM.ColorImage
         {
             id: categoryArrow
             anchors.right: parent.right
             width: UM.Theme.getSize("standard_arrow").width
             height: UM.Theme.getSize("standard_arrow").height
             anchors.verticalCenter: parent.verticalCenter
-            sourceSize.width: width
-            sourceSize.height: height
             color: UM.Theme.getColor("setting_control_button")
             source: expanded ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft")
         }
diff --git a/resources/qml/ColorDialog.qml b/resources/qml/ColorDialog.qml
index ed6a6c7c25..49adcf0cca 100644
--- a/resources/qml/ColorDialog.qml
+++ b/resources/qml/ColorDialog.qml
@@ -80,7 +80,7 @@ UM.Dialog
                     implicitHeight: UM.Theme.getSize("medium_button_icon").height
                     radius: width / 2
 
-                    UM.RecolorImage
+                    UM.ColorImage
                     {
                         anchors.fill: parent
                         visible: swatchColor == base.color
diff --git a/resources/qml/ExpandableComponent.qml b/resources/qml/ExpandableComponent.qml
index 1fef90d367..471fed5850 100644
--- a/resources/qml/ExpandableComponent.qml
+++ b/resources/qml/ExpandableComponent.qml
@@ -155,7 +155,7 @@ Item
                 }
             }
 
-            UM.RecolorImage
+            UM.ColorImage
             {
                 id: collapseButton
                 anchors
diff --git a/resources/qml/ExpandableComponentHeader.qml b/resources/qml/ExpandableComponentHeader.qml
index 7176f0978b..de60faba2f 100644
--- a/resources/qml/ExpandableComponentHeader.qml
+++ b/resources/qml/ExpandableComponentHeader.qml
@@ -51,10 +51,9 @@ Cura.RoundedRectangle
             verticalCenter: parent.verticalCenter
         }
 
-        contentItem: UM.RecolorImage
+        contentItem: UM.ColorImage
         {
             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")
         }
diff --git a/resources/qml/ExpandablePopup.qml b/resources/qml/ExpandablePopup.qml
index c5fd2f4faf..967ef09767 100644
--- a/resources/qml/ExpandablePopup.qml
+++ b/resources/qml/ExpandablePopup.qml
@@ -174,7 +174,7 @@ Item
                 anchors.bottom: parent.bottom
             }
 
-            UM.RecolorImage
+            UM.ColorImage
             {
                 id: collapseButton
                 anchors
diff --git a/resources/qml/ExtruderIcon.qml b/resources/qml/ExtruderIcon.qml
index b9141a449a..ad16bc4455 100644
--- a/resources/qml/ExtruderIcon.qml
+++ b/resources/qml/ExtruderIcon.qml
@@ -15,7 +15,7 @@ Item
     property color materialColor
     property alias textColor: extruderNumberText.color
     property bool extruderEnabled: true
-    property alias iconSize: mainIcon.sourceSize
+    property var iconSize
     property string iconVariant: "medium"
 
     Item
@@ -24,19 +24,21 @@ Item
         anchors.fill: parent
         layer.enabled: true // Prevent weird opacity effects.
 
-        UM.RecolorImage
+        UM.ColorImage
         {
             anchors.fill: parent
-            sourceSize: mainIcon.sourceSize
+            width: mainIcon.sourceSize.width
+            height: mainIcon.sourceSize.height
 
             source: UM.Theme.getIcon("ExtruderColor", iconVariant)
             color: materialColor
         }
-        UM.RecolorImage
+        UM.ColorImage
         {
             id: mainIcon
             anchors.fill: parent
-            sourceSize: UM.Theme.getSize("extruder_icon")
+            width: UM.Theme.getSize("extruder_icon").width
+            height: UM.Theme.getSize("extruder_icon").height
 
             source: UM.Theme.getIcon("Extruder", iconVariant)
             color: extruderNumberText.color
diff --git a/resources/qml/IconWithText.qml b/resources/qml/IconWithText.qml
index d7b4adfa8c..cc0834d7ea 100644
--- a/resources/qml/IconWithText.qml
+++ b/resources/qml/IconWithText.qml
@@ -35,7 +35,7 @@ Item
     implicitWidth: icon.width + 100
     implicitHeight: icon.height
 
-    UM.RecolorImage
+    UM.ColorImage
     {
         id: icon
         width: UM.Theme.getSize("section_icon").width
diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
index 49d6710606..e8917517dd 100644
--- a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
+++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
@@ -88,7 +88,7 @@ Button
 
                 visible: !configurationItem.isValidMaterial
 
-                UM.RecolorImage
+                UM.ColorImage
                 {
                     id: icon
                     anchors.verticalCenter: unknownMaterialMessage.verticalCenter
diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
index 7feb825881..8d4fc9c2b5 100644
--- a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
+++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
@@ -109,7 +109,7 @@ Cura.ExpandablePopup
                     }
 
                     // Warning icon that indicates if no qualities are available for the variant/material combination for this extruder
-                    UM.RecolorImage
+                    UM.ColorImage
                     {
                         id: badge
                         anchors
diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
index 55ee56be8e..7223706e63 100644
--- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
+++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
@@ -304,7 +304,7 @@ Item
                         height: UM.Theme.getSize("small_button").height
                         width: UM.Theme.getSize("small_button").width
                         anchors.centerIn: parent
-                        background: UM.RecolorImage
+                        background: UM.ColorImage
                         {
                             source: UM.Theme.getIcon("Guide")
                             color: instructionButton.hovered ? UM.Theme.getColor("primary") : UM.Theme.getColor("icon")
@@ -369,15 +369,13 @@ Item
                     width: selectors.controlWidth
                     height: childrenRect.height
 
-                    UM.RecolorImage
+                    UM.ColorImage
                     {
                         id: warningImage
                         anchors.left: parent.left
                         source: UM.Theme.getIcon("Warning")
                         width: UM.Theme.getSize("section_icon").width
                         height: UM.Theme.getSize("section_icon").height
-                        sourceSize.width: width
-                        sourceSize.height: height
                         color: UM.Theme.getColor("material_compatibility_warning")
                         visible: !Cura.MachineManager.isCurrentSetupSupported || warnings.buildplateCompatibilityError || warnings.buildplateCompatibilityWarning
                     }
diff --git a/resources/qml/ObjectItemButton.qml b/resources/qml/ObjectItemButton.qml
index c3066b800d..407a0298f4 100644
--- a/resources/qml/ObjectItemButton.qml
+++ b/resources/qml/ObjectItemButton.qml
@@ -146,7 +146,7 @@ Button
                     labelText: perObjectSettingsCount.toString()
                 }
 
-                UM.RecolorImage
+                UM.ColorImage
                 {
                     id: meshTypeIcon
                     anchors
diff --git a/resources/qml/ObjectSelector.qml b/resources/qml/ObjectSelector.qml
index 1bf2ac0fd9..fdb4697a7e 100644
--- a/resources/qml/ObjectSelector.qml
+++ b/resources/qml/ObjectSelector.qml
@@ -41,12 +41,11 @@ Item
             width: parent.width
             height: label.height
 
-            UM.RecolorImage
+            UM.ColorImage
             {
                 id: openCloseIcon
                 width: UM.Theme.getSize("standard_arrow").width
                 height: UM.Theme.getSize("standard_arrow").height
-                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")
diff --git a/resources/qml/Preferences/Materials/MaterialsSlot.qml b/resources/qml/Preferences/Materials/MaterialsSlot.qml
index f124736fd0..8292fbe6da 100644
--- a/resources/qml/Preferences/Materials/MaterialsSlot.qml
+++ b/resources/qml/Preferences/Materials/MaterialsSlot.qml
@@ -106,7 +106,7 @@ Rectangle
         anchors.right: materialSlot.right
         visible: false
 
-        UM.RecolorImage
+        UM.ColorImage
         {
             id: favoriteIndicator
             anchors.centerIn: parent
diff --git a/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml b/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
index 9e2a5d965c..361f3efbd2 100644
--- a/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
+++ b/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
@@ -298,7 +298,7 @@ Window
                             iconSize: UM.Theme.getSize("machine_selector_icon").width
 
                             //Printer status badge (always cloud, but whether it's online or offline).
-                            UM.RecolorImage
+                            UM.ColorImage
                             {
                                 width: UM.Theme.getSize("printer_status_icon").width
                                 height: UM.Theme.getSize("printer_status_icon").height
@@ -326,7 +326,7 @@ Window
                             }
                         }
 
-                        UM.RecolorImage
+                        UM.ColorImage
                         {
                             id: printerSpinner
                             width: UM.Theme.getSize("section_icon").width
@@ -491,7 +491,7 @@ Window
 
                         visible: !syncButton.visible
 
-                        UM.RecolorImage
+                        UM.ColorImage
                         {
                             id: syncingIcon
                             height: UM.Theme.getSize("action_button_icon").height
diff --git a/resources/qml/Preferences/SettingVisibilityItem.qml b/resources/qml/Preferences/SettingVisibilityItem.qml
index b7edd54c35..8905c15124 100644
--- a/resources/qml/Preferences/SettingVisibilityItem.qml
+++ b/resources/qml/Preferences/SettingVisibilityItem.qml
@@ -74,7 +74,7 @@ Item
             }
         }
 
-        UM.RecolorImage
+        UM.ColorImage
         {
             anchors.centerIn: parent
             width: Math.round(check.height * 0.75) | 0
diff --git a/resources/qml/PrintSetupHeaderButton.qml b/resources/qml/PrintSetupHeaderButton.qml
index a4f95148da..0a6c5c363a 100644
--- a/resources/qml/PrintSetupHeaderButton.qml
+++ b/resources/qml/PrintSetupHeaderButton.qml
@@ -89,7 +89,7 @@ ToolButton
     {
         id: background
 
-        UM.RecolorImage
+        UM.ColorImage
         {
             id: downArrow
             anchors.verticalCenter: parent.verticalCenter
@@ -97,7 +97,6 @@ ToolButton
             anchors.rightMargin: UM.Theme.getSize("default_margin").width
             width: UM.Theme.getSize("standard_arrow").width
             height: UM.Theme.getSize("standard_arrow").height
-            sourceSize.height: width
             color: base.enabled ? UM.Theme.getColor("setting_control_button") : UM.Theme.getColor("setting_category_disabled_text")
             source: UM.Theme.getIcon("ChevronSingleDown")
         }
diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
index 2ca4a9f9bf..41bf28be15 100644
--- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
+++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
@@ -159,7 +159,7 @@ Item
                 }
                 onExited: base.hideTooltip()
             }
-            UM.RecolorImage
+            UM.ColorImage
             {
                 id: downArrow
 
diff --git a/resources/qml/PrintSetupSelector/Custom/MenuButton.qml b/resources/qml/PrintSetupSelector/Custom/MenuButton.qml
index 112edbbf77..6663ff9991 100644
--- a/resources/qml/PrintSetupSelector/Custom/MenuButton.qml
+++ b/resources/qml/PrintSetupSelector/Custom/MenuButton.qml
@@ -44,7 +44,7 @@ Button
     {
         height: button.height
         width: button.width
-        UM.RecolorImage
+        UM.ColorImage
         {
             id: check
             height: UM.Theme.getSize("default_arrow").height
diff --git a/resources/qml/PrintSetupSelector/NoIntentIcon.qml b/resources/qml/PrintSetupSelector/NoIntentIcon.qml
index 6fc883fdef..2dc422f6d6 100644
--- a/resources/qml/PrintSetupSelector/NoIntentIcon.qml
+++ b/resources/qml/PrintSetupSelector/NoIntentIcon.qml
@@ -16,7 +16,7 @@ Item
     implicitWidth: UM.Theme.getSize("section_icon").width
     implicitHeight: UM.Theme.getSize("section_icon").height
 
-    UM.RecolorImage
+    UM.ColorImage
     {
         source: UM.Theme.getIcon("Information")
         color: UM.Theme.getColor("icon")
diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
index 69261033eb..5a3cc63c62 100644
--- a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
+++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
@@ -226,7 +226,7 @@ Item
                     color: UM.Theme.getColor("lining")
                 }
 
-                UM.RecolorImage
+                UM.ColorImage
                 {
                     width: UM.Theme.getSize("drag_icon").width
                     height: UM.Theme.getSize("drag_icon").height
diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
index 49be0fae1c..0b683f0ddf 100644
--- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
+++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
@@ -154,7 +154,7 @@ Item
                 when: supportExtruderCombobox.model.count > 0
             }
 
-            indicator: UM.RecolorImage
+            indicator: UM.ColorImage
             {
                 id: downArrow
                 x: supportExtruderCombobox.width - width - supportExtruderCombobox.rightPadding
@@ -163,8 +163,6 @@ Item
                 source: UM.Theme.getIcon("ChevronSingleDown")
                 width: UM.Theme.getSize("standard_arrow").width
                 height: UM.Theme.getSize("standard_arrow").height
-                sourceSize.width: width + 5 * screenScaleFactor
-                sourceSize.height: width + 5 * screenScaleFactor
 
                 color: UM.Theme.getColor("setting_control_button")
             }
diff --git a/resources/qml/PrinterSelector/MachineSelector.qml b/resources/qml/PrinterSelector/MachineSelector.qml
index e41bf51fac..77cd2be409 100644
--- a/resources/qml/PrinterSelector/MachineSelector.qml
+++ b/resources/qml/PrinterSelector/MachineSelector.qml
@@ -108,7 +108,7 @@ Cura.ExpandablePopup
         iconColor: UM.Theme.getColor("machine_selector_printer_icon")
         iconSize: source != "" ? UM.Theme.getSize("machine_selector_icon").width: 0
 
-        UM.RecolorImage
+        UM.ColorImage
         {
             id: connectionStatusImage
             anchors
diff --git a/resources/qml/SearchBar.qml b/resources/qml/SearchBar.qml
index 4d9c003653..af5ad7cc35 100644
--- a/resources/qml/SearchBar.qml
+++ b/resources/qml/SearchBar.qml
@@ -17,7 +17,7 @@ Cura.TextField
     placeholderText: catalog.i18nc("@placeholder", "Search")
     font.italic: true
 
-    UM.RecolorImage
+    UM.ColorImage
     {
         id: searchIcon
 
diff --git a/resources/qml/Settings/SettingCheckBox.qml b/resources/qml/Settings/SettingCheckBox.qml
index 4987eedb83..215d2be1be 100644
--- a/resources/qml/Settings/SettingCheckBox.qml
+++ b/resources/qml/Settings/SettingCheckBox.qml
@@ -143,13 +143,12 @@ SettingItem
                 return UM.Theme.getColor("checkbox")
             }
 
-            UM.RecolorImage
+            UM.ColorImage
             {
                 anchors.verticalCenter: parent.verticalCenter
                 anchors.horizontalCenter: parent.horizontalCenter
                 height: UM.Theme.getSize("checkbox_mark").height
                 width: UM.Theme.getSize("checkbox_mark").width
-                sourceSize.height: width
                 color: !enabled ? UM.Theme.getColor("checkbox_mark_disabled") : UM.Theme.getColor("checkbox_mark");
                 source: UM.Theme.getIcon("Check", "low")
                 opacity: control.checked ? 1 : 0
diff --git a/resources/qml/Settings/SettingExtruder.qml b/resources/qml/Settings/SettingExtruder.qml
index c3bc472fbe..3072161c59 100644
--- a/resources/qml/Settings/SettingExtruder.qml
+++ b/resources/qml/Settings/SettingExtruder.qml
@@ -98,7 +98,7 @@ SettingItem
             when: control.model.items.length > 0
         }
 
-        indicator: UM.RecolorImage
+        indicator: UM.ColorImage
         {
             id: downArrow
             x: control.width - width - control.rightPadding
@@ -107,8 +107,6 @@ SettingItem
             source: UM.Theme.getIcon("ChevronSingleDown")
             width: UM.Theme.getSize("standard_arrow").width
             height: UM.Theme.getSize("standard_arrow").height
-            sourceSize.width: width + 5 * screenScaleFactor
-            sourceSize.height: width + 5 * screenScaleFactor
 
             color: UM.Theme.getColor("setting_control_button");
         }
diff --git a/resources/qml/Settings/SettingOptionalExtruder.qml b/resources/qml/Settings/SettingOptionalExtruder.qml
index 7c5ea9d90f..e02fe88e34 100644
--- a/resources/qml/Settings/SettingOptionalExtruder.qml
+++ b/resources/qml/Settings/SettingOptionalExtruder.qml
@@ -99,7 +99,7 @@ SettingItem
             value: control.currentText != "" ? control.model.getItem(control.currentIndex).color : "transparent"
         }
 
-        indicator: UM.RecolorImage
+        indicator: UM.ColorImage
         {
             id: downArrow
             x: control.width - width - control.rightPadding
@@ -108,8 +108,6 @@ SettingItem
             source: UM.Theme.getIcon("ChevronSingleDown")
             width: UM.Theme.getSize("standard_arrow").width
             height: UM.Theme.getSize("standard_arrow").height
-            sourceSize.width: width + 5 * screenScaleFactor
-            sourceSize.height: width + 5 * screenScaleFactor
 
             color: UM.Theme.getColor("setting_control_button")
         }
diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml
index b8cd95c889..28787acb27 100644
--- a/resources/qml/Settings/SettingView.qml
+++ b/resources/qml/Settings/SettingView.qml
@@ -51,7 +51,7 @@ Item
             property var expandedCategories
             property bool lastFindingSettings: false
 
-            UM.RecolorImage
+            UM.ColorImage
             {
                 id: searchIcon
 
diff --git a/resources/qml/SpinBox.qml b/resources/qml/SpinBox.qml
index 0b3581cfed..038125111c 100644
--- a/resources/qml/SpinBox.qml
+++ b/resources/qml/SpinBox.qml
@@ -109,7 +109,7 @@ Item
                 color: spinBox.down.pressed ? spinBox.palette.mid : UM.Theme.getColor("detail_background")
             }
 
-            UM.RecolorImage
+            UM.ColorImage
             {
                 anchors.centerIn: parent
                 height: parent.height / 2.5
@@ -129,7 +129,7 @@ Item
                 color: spinBox.up.pressed ? spinBox.palette.mid : UM.Theme.getColor("detail_background")
             }
 
-            UM.RecolorImage
+            UM.ColorImage
             {
                 anchors.centerIn: parent
                 height: parent.height / 2.5
diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml
index 32de5b76ca..c931a9f882 100644
--- a/resources/qml/Toolbar.qml
+++ b/resources/qml/Toolbar.qml
@@ -63,13 +63,10 @@ Item
                     isTopElement: toolsModel.getItem(0).id == model.id
                     isBottomElement: toolsModel.getItem(toolsModel.count - 1).id == model.id
 
-                    toolItem: UM.RecolorImage
+                    toolItem: UM.ColorImage
                     {
                         source: UM.Theme.getIcon(model.icon) != "" ? UM.Theme.getIcon(model.icon) : "file:///" + model.location + "/" + model.icon
                         color: UM.Theme.getColor("icon")
-
-                        sourceSize.height: Math.round(UM.Theme.getSize("button").height / 2)
-                        sourceSize.width: Math.round(UM.Theme.getSize("button").width / 2)
                     }
 
                     onCheckedChanged:
diff --git a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
index 1f779ef432..127fca5fa6 100644
--- a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
+++ b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
@@ -115,14 +115,12 @@ Item
                     width: childrenRect.width
                     height: UM.Theme.getSize("action_button").height
 
-                    UM.RecolorImage
+                    UM.ColorImage
                     {
                         id: arrow
                         anchors.left: parent.left
                         width: UM.Theme.getSize("standard_arrow").width
                         height: UM.Theme.getSize("standard_arrow").height
-                        sourceSize.width: width
-                        sourceSize.height: height
                         color: UM.Theme.getColor("text")
                         source: base.currentSection == section ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight")
                     }
diff --git a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
index 64f194dd56..5ca48bafc7 100644
--- a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
+++ b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
@@ -200,7 +200,7 @@ Item
             height: troubleshootingLinkIcon.height
             width: troubleshootingLinkIcon.width + troubleshootingLabel.width + UM.Theme.getSize("thin_margin").width
 
-            UM.RecolorImage
+            UM.ColorImage
             {
                 id: troubleshootingLinkIcon
                 anchors.right: troubleshootingLabel.left
diff --git a/resources/qml/WelcomePages/DropDownHeader.qml b/resources/qml/WelcomePages/DropDownHeader.qml
index a4b416b093..b91f3383be 100644
--- a/resources/qml/WelcomePages/DropDownHeader.qml
+++ b/resources/qml/WelcomePages/DropDownHeader.qml
@@ -57,7 +57,7 @@ Cura.RoundedRectangle
         color: base.hovered ? UM.Theme.getColor("small_button_text_hover") : UM.Theme.getColor("small_button_text")
     }
 
-    UM.RecolorImage
+    UM.ColorImage
     {
         id: rightIcon
         anchors.right: parent.right
diff --git a/resources/qml/Widgets/ComboBox.qml b/resources/qml/Widgets/ComboBox.qml
index 698eb4ec10..2a3716c3af 100644
--- a/resources/qml/Widgets/ComboBox.qml
+++ b/resources/qml/Widgets/ComboBox.qml
@@ -39,7 +39,7 @@ ComboBox
 
     background: UM.UnderlineBackground{}
 
-    indicator: UM.RecolorImage
+    indicator: UM.ColorImage
     {
         id: downArrow
         x: control.width - width - control.rightPadding
@@ -48,8 +48,6 @@ ComboBox
         source: UM.Theme.getIcon("ChevronSingleDown")
         width: UM.Theme.getSize("standard_arrow").width
         height: UM.Theme.getSize("standard_arrow").height
-        sourceSize.width: width + 5 * screenScaleFactor
-        sourceSize.height: width + 5 * screenScaleFactor
 
         color: UM.Theme.getColor("setting_control_button")
     }
diff --git a/resources/qml/Widgets/MenuItem.qml b/resources/qml/Widgets/MenuItem.qml
index 30df317d82..c2929e512e 100644
--- a/resources/qml/Widgets/MenuItem.qml
+++ b/resources/qml/Widgets/MenuItem.qml
@@ -18,7 +18,7 @@ UM.MenuItem
 
     property bool overrideShowArrow: false
 
-    arrow: UM.RecolorImage
+    arrow: UM.ColorImage
     {
         visible: menuItem.subMenu || overrideShowArrow
         height: UM.Theme.getSize("default_arrow").height
@@ -30,7 +30,7 @@ UM.MenuItem
         color: UM.Theme.getColor("setting_control_text")
     }
 
-    indicator: UM.RecolorImage
+    indicator: UM.ColorImage
     {
         id: check
         visible: menuItem.checkable && menuItem.checked
diff --git a/resources/qml/Widgets/TextField.qml b/resources/qml/Widgets/TextField.qml
index b708446d65..5e19f65149 100644
--- a/resources/qml/Widgets/TextField.qml
+++ b/resources/qml/Widgets/TextField.qml
@@ -53,7 +53,7 @@ TextField
     {
         id: backgroundRectangle
         //Optional icon added on the left hand side.
-        UM.RecolorImage
+        UM.ColorImage
         {
             id: iconLeft