diff --git a/components/mobileshell/qml/actiondrawer/private/BrightnessItem.qml b/components/mobileshell/qml/actiondrawer/private/BrightnessItem.qml
index 243348c0..85fd21bc 100644
--- a/components/mobileshell/qml/actiondrawer/private/BrightnessItem.qml
+++ b/components/mobileshell/qml/actiondrawer/private/BrightnessItem.qml
@@ -60,6 +60,8 @@ Item {
             Layout.preferredWidth: Kirigami.Units.iconSizes.smallMedium
             Layout.preferredHeight: width
             source: "low-brightness"
+            isMask: true
+            color: Kirigami.Theme.textColor
         }
 
         PC3.Slider {
@@ -105,6 +107,8 @@ Item {
             Layout.preferredWidth: Kirigami.Units.iconSizes.smallMedium
             Layout.preferredHeight: width
             source: "high-brightness"
+            isMask: true
+            color: Kirigami.Theme.textColor
         }
     }
 }
diff --git a/components/mobileshell/qml/actiondrawer/private/QuickSettingsFullDelegate.qml b/components/mobileshell/qml/actiondrawer/private/QuickSettingsFullDelegate.qml
index 2b212c3e..b3e66518 100644
--- a/components/mobileshell/qml/actiondrawer/private/QuickSettingsFullDelegate.qml
+++ b/components/mobileshell/qml/actiondrawer/private/QuickSettingsFullDelegate.qml
@@ -90,6 +90,10 @@ QuickSettingsDelegate {
             implicitWidth: Kirigami.Units.iconSizes.small
             implicitHeight: width
             source: root.icon
+            Kirigami.Theme.inherit: false
+            Kirigami.Theme.colorSet: Kirigami.Theme.Window
+            isMask: true
+            color: Kirigami.Theme.textColor
         }
 
         ColumnLayout {
diff --git a/components/mobileshell/qml/actiondrawer/private/QuickSettingsMinimizedDelegate.qml b/components/mobileshell/qml/actiondrawer/private/QuickSettingsMinimizedDelegate.qml
index fbbe8222..86f18342 100644
--- a/components/mobileshell/qml/actiondrawer/private/QuickSettingsMinimizedDelegate.qml
+++ b/components/mobileshell/qml/actiondrawer/private/QuickSettingsMinimizedDelegate.qml
@@ -86,6 +86,10 @@ QuickSettingsDelegate {
             implicitWidth: Kirigami.Units.iconSizes.smallMedium
             implicitHeight: width
             source: root.icon
+            Kirigami.Theme.inherit: false
+            Kirigami.Theme.colorSet: Kirigami.Theme.Window
+            isMask: true
+            color: Kirigami.Theme.textColor
         }
     }
 }
diff --git a/components/mobileshell/qml/actiondrawer/private/QuickSettingsStatusRow.qml b/components/mobileshell/qml/actiondrawer/private/QuickSettingsStatusRow.qml
index 3da4cf3a..1d2f81f0 100644
--- a/components/mobileshell/qml/actiondrawer/private/QuickSettingsStatusRow.qml
+++ b/components/mobileshell/qml/actiondrawer/private/QuickSettingsStatusRow.qml
@@ -142,6 +142,10 @@ Item {
                     implicitWidth: Kirigami.Units.iconSizes.smallMedium
                     implicitHeight: implicitWidth
                     source: root.icon
+                    Kirigami.Theme.inherit: false
+                    Kirigami.Theme.colorSet: Kirigami.Theme.Window
+                    isMask: true
+                    color: Kirigami.Theme.textColor
                 }
 
                 // Indicator bar
@@ -235,6 +239,10 @@ Item {
                     implicitWidth: Kirigami.Units.iconSizes.small
                     implicitHeight: implicitWidth
                     source: "go-next-symbolic"
+                    Kirigami.Theme.inherit: false
+                    Kirigami.Theme.colorSet: Kirigami.Theme.Window
+                    isMask: true
+                    color: Kirigami.Theme.textColor
                     opacity: 0.5
                 }
             }
diff --git a/components/mobileshell/qml/actiondrawer/private/SystemTrayPopup.qml b/components/mobileshell/qml/actiondrawer/private/SystemTrayPopup.qml
index 2b633a94..ebd99664 100644
--- a/components/mobileshell/qml/actiondrawer/private/SystemTrayPopup.qml
+++ b/components/mobileshell/qml/actiondrawer/private/SystemTrayPopup.qml
@@ -64,6 +64,10 @@ QQC2.Popup {
                 implicitWidth: Kirigami.Units.iconSizes.smallMedium
                 implicitHeight: implicitWidth
                 source: "preferences-desktop-notification-symbolic"
+                Kirigami.Theme.inherit: false
+                Kirigami.Theme.colorSet: Kirigami.Theme.Window
+                isMask: true
+                color: Kirigami.Theme.textColor
             }
 
             ColumnLayout {
@@ -167,6 +171,10 @@ QQC2.Popup {
                         implicitWidth: Kirigami.Units.iconSizes.smallMedium
                         implicitHeight: implicitWidth
                         source: model.iconName ? model.iconName : (model.icon ? model.icon : "")
+                        Kirigami.Theme.inherit: false
+                        Kirigami.Theme.colorSet: Kirigami.Theme.Window
+                        isMask: true
+                        color: Kirigami.Theme.textColor
                     }
 
                     ColumnLayout {
@@ -194,6 +202,10 @@ QQC2.Popup {
                         implicitWidth: Kirigami.Units.iconSizes.small
                         implicitHeight: implicitWidth
                         source: "go-next-symbolic"
+                        Kirigami.Theme.inherit: false
+                        Kirigami.Theme.colorSet: Kirigami.Theme.Window
+                        isMask: true
+                        color: Kirigami.Theme.textColor
                         opacity: 0.45
                     }
                 }
diff --git a/components/mobileshell/qml/homescreen/WallpaperSelector.qml b/components/mobileshell/qml/homescreen/WallpaperSelector.qml
index ef2fbf01..032587f5 100644
--- a/components/mobileshell/qml/homescreen/WallpaperSelector.qml
+++ b/components/mobileshell/qml/homescreen/WallpaperSelector.qml
@@ -135,6 +135,8 @@ Controls.Drawer {
                     width: Kirigami.Units.iconSizes.large
                     height: width
                     source: "view-preview"
+                    isMask: true
+                    color: Kirigami.Theme.textColor
                     visible: !walliePreview.visible
                 }
 
diff --git a/components/mobileshell/qml/popups/actionbuttons/ActionButton.qml b/components/mobileshell/qml/popups/actionbuttons/ActionButton.qml
index 2cba61a9..3c6d473e 100644
--- a/components/mobileshell/qml/popups/actionbuttons/ActionButton.qml
+++ b/components/mobileshell/qml/popups/actionbuttons/ActionButton.qml
@@ -146,6 +146,8 @@ Window {
                     transformOrigin: Item.Center
                     rotation: root.angle
                     source: root.iconSource
+                    isMask: true
+                    color: Kirigami.Theme.textColor
                 }
             }
 
diff --git a/components/mobileshell/qml/popups/volumeosd/VolumeOSD.qml b/components/mobileshell/qml/popups/volumeosd/VolumeOSD.qml
index 3e78b46a..d0c5511c 100644
--- a/components/mobileshell/qml/popups/volumeosd/VolumeOSD.qml
+++ b/components/mobileshell/qml/popups/volumeosd/VolumeOSD.qml
@@ -195,6 +195,8 @@ Window {
                                     Layout.preferredWidth: Kirigami.Units.iconSizes.smallMedium
                                     Layout.preferredHeight: Kirigami.Units.iconSizes.smallMedium
                                     source:  "settings-configure"
+                                    isMask: true
+                                    color: Kirigami.Theme.textColor
                                 }
                                 PlasmaComponents.Label {
                                     text: i18n("Open audio settings")
diff --git a/components/mobileshell/qml/statusbar/StatusBar.qml b/components/mobileshell/qml/statusbar/StatusBar.qml
index 8f287bb5..44af6454 100644
--- a/components/mobileshell/qml/statusbar/StatusBar.qml
+++ b/components/mobileshell/qml/statusbar/StatusBar.qml
@@ -227,6 +227,10 @@ Item {
         source: 'arrow-down'
         implicitHeight: Kirigami.Units.iconSizes.small
         implicitWidth: Kirigami.Units.iconSizes.small
+        Kirigami.Theme.inherit: false
+        Kirigami.Theme.colorSet: Kirigami.Theme.Window
+        isMask: true
+        color: Kirigami.Theme.textColor
 
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.bottom: parent.bottom
diff --git a/components/mobileshell/qml/statusbar/TaskWidget.qml b/components/mobileshell/qml/statusbar/TaskWidget.qml
index 8c9056f5..ef97f12c 100644
--- a/components/mobileshell/qml/statusbar/TaskWidget.qml
+++ b/components/mobileshell/qml/statusbar/TaskWidget.qml
@@ -30,6 +30,10 @@ Item {
         width: Math.min(parent.width, parent.height)
         height: width
         anchors.centerIn: parent
+        Kirigami.Theme.inherit: false
+        Kirigami.Theme.colorSet: Kirigami.Theme.Window
+        isMask: true
+        color: Kirigami.Theme.textColor
     }
 
     Controls.ToolTip.text: model.toolTipTitle ? model.toolTipTitle : (model.title ? model.title : "")
diff --git a/components/mobileshell/qml/statusbar/indicators/BatteryIndicator.qml b/components/mobileshell/qml/statusbar/indicators/BatteryIndicator.qml
index 66aff7c6..a017c09b 100644
--- a/components/mobileshell/qml/statusbar/indicators/BatteryIndicator.qml
+++ b/components/mobileshell/qml/statusbar/indicators/BatteryIndicator.qml
@@ -13,7 +13,6 @@ import org.kde.kirigami as Kirigami
 import org.kde.kitemmodels
 
 import org.kde.plasma.components 3.0 as PlasmaComponents
-import org.kde.plasma.workspace.components 2.0 as PW
 import org.kde.plasma.private.mobileshell.shellsettingsplugin as ShellSettings
 import org.kde.plasma.private.mobileshell as MobileShell
 import org.kde.plasma.private.battery // needed for charging state
@@ -21,6 +20,35 @@ import org.kde.plasma.private.battery // needed for charging state
 RowLayout {
     property real textPixelSize: Kirigami.Units.gridUnit * 0.6
 
+    function batteryIconName(percent, charging) {
+        let name;
+        if (percent >= 95) {
+            name = "battery-100";
+        } else if (percent >= 85) {
+            name = "battery-090";
+        } else if (percent >= 75) {
+            name = "battery-080";
+        } else if (percent >= 65) {
+            name = "battery-070";
+        } else if (percent >= 55) {
+            name = "battery-060";
+        } else if (percent >= 45) {
+            name = "battery-050";
+        } else if (percent >= 35) {
+            name = "battery-040";
+        } else if (percent >= 25) {
+            name = "battery-030";
+        } else if (percent >= 15) {
+            name = "battery-020";
+        } else if (percent > 5) {
+            name = "battery-010";
+        } else {
+            name = "battery-000";
+        }
+
+        return charging ? name + "-charging" : name;
+    }
+
     visible: MobileShell.BatteryInfo.isVisible
 
     ListView {
@@ -51,16 +79,17 @@ RowLayout {
 
             height: batteryRepeater.height
 
-            PW.BatteryIcon {
+            Kirigami.Icon {
                 id: battery
 
                 Layout.alignment: Qt.AlignVCenter
                 Layout.fillHeight: true
                 width: batteryLabel.height
-
-                hasBattery: PluggedIn
-                percent: Percent
-                pluggedIn: ChargeState === BatteryControlModel.Charging
+                source: PluggedIn ? batteryIconName(Percent, ChargeState === BatteryControlModel.Charging) : "battery-missing"
+                Kirigami.Theme.inherit: false
+                Kirigami.Theme.colorSet: Kirigami.Theme.Window
+                isMask: true
+                color: Kirigami.Theme.textColor
             }
 
             PlasmaComponents.Label {
diff --git a/components/mobileshell/qml/statusbar/indicators/BluetoothIndicator.qml b/components/mobileshell/qml/statusbar/indicators/BluetoothIndicator.qml
index 279dd96b..9e8db3cc 100644
--- a/components/mobileshell/qml/statusbar/indicators/BluetoothIndicator.qml
+++ b/components/mobileshell/qml/statusbar/indicators/BluetoothIndicator.qml
@@ -16,6 +16,10 @@ Kirigami.Icon {
     id: connectionIcon
 
     source: MobileShell.BluetoothInfo.icon
+    Kirigami.Theme.inherit: false
+    Kirigami.Theme.colorSet: Kirigami.Theme.Window
+    isMask: true
+    color: Kirigami.Theme.textColor
 
     visible: MobileShell.BluetoothInfo.isVisible
 }
diff --git a/components/mobileshell/qml/statusbar/indicators/InternetIndicator.qml b/components/mobileshell/qml/statusbar/indicators/InternetIndicator.qml
index 2ed7adbf..d3c925a0 100644
--- a/components/mobileshell/qml/statusbar/indicators/InternetIndicator.qml
+++ b/components/mobileshell/qml/statusbar/indicators/InternetIndicator.qml
@@ -33,6 +33,10 @@ Item {
         anchors.fill: parent
         visible: !connectingIndicator.visible
         source: connectionIcon.icon
+        Kirigami.Theme.inherit: false
+        Kirigami.Theme.colorSet: Kirigami.Theme.Window
+        isMask: true
+        color: Kirigami.Theme.textColor
     }
 
     // Connecting indicator
diff --git a/components/mobileshell/qml/statusbar/indicators/SignalStrengthIndicator.qml b/components/mobileshell/qml/statusbar/indicators/SignalStrengthIndicator.qml
index 64b10dfd..98e008aa 100644
--- a/components/mobileshell/qml/statusbar/indicators/SignalStrengthIndicator.qml
+++ b/components/mobileshell/qml/statusbar/indicators/SignalStrengthIndicator.qml
@@ -33,6 +33,10 @@ Item {
         height: parent.height
 
         source: MobileShell.SignalStrengthInfo.icon
+        Kirigami.Theme.inherit: false
+        Kirigami.Theme.colorSet: Kirigami.Theme.Window
+        isMask: true
+        color: Kirigami.Theme.textColor
 
         // don't show mobile indicator icon if the networkmanager one is already showing
         visible: (!isInternetIndicatorMobileData || wirelessStatus.hotspotSSID.length !== 0) && MobileShell.SignalStrengthInfo.showIndicator
diff --git a/components/mobileshell/qml/statusbar/indicators/VolumeIndicator.qml b/components/mobileshell/qml/statusbar/indicators/VolumeIndicator.qml
index 7572ab9e..c5c93c13 100644
--- a/components/mobileshell/qml/statusbar/indicators/VolumeIndicator.qml
+++ b/components/mobileshell/qml/statusbar/indicators/VolumeIndicator.qml
@@ -18,6 +18,10 @@ Kirigami.Icon {
     id: paIcon
 
     source: MobileShell.AudioInfo.icon
+    Kirigami.Theme.inherit: false
+    Kirigami.Theme.colorSet: Kirigami.Theme.Window
+    isMask: true
+    color: Kirigami.Theme.textColor
 
     visible: MobileShell.AudioInfo.isVisible
 }
diff --git a/containments/homescreens/folio/qml/AppDrawerHeader.qml b/containments/homescreens/folio/qml/AppDrawerHeader.qml
index 9dfd495c..b96189a7 100644
--- a/containments/homescreens/folio/qml/AppDrawerHeader.qml
+++ b/containments/homescreens/folio/qml/AppDrawerHeader.qml
@@ -50,11 +50,13 @@ Item {
         anchors.rightMargin: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing
         anchors.fill: parent
 
-        Kirigami.SearchField {
+        QQC2.TextField {
             id: searchField
             onTextChanged: folio.ApplicationListSearchModel.setFilterFixedString(text)
             Layout.maximumWidth: Kirigami.Units.gridUnit * 30
             Layout.alignment: Qt.AlignHCenter
+            leftPadding: Kirigami.Units.iconSizes.small + Kirigami.Units.largeSpacing * 2
+            rightPadding: clearSearchArea.visible ? clearSearchArea.width + Kirigami.Units.largeSpacing : Kirigami.Units.largeSpacing
 
             background: Rectangle {
                 radius: Kirigami.Units.cornerRadius
@@ -76,6 +78,42 @@ Item {
 
             font.weight: Font.Bold
 
+            Kirigami.Icon {
+                anchors.left: parent.left
+                anchors.leftMargin: Kirigami.Units.largeSpacing
+                anchors.verticalCenter: parent.verticalCenter
+                width: Kirigami.Units.iconSizes.small
+                height: width
+                source: "search"
+                isMask: true
+                color: Kirigami.Theme.textColor
+                opacity: 0.65
+            }
+
+            MouseArea {
+                id: clearSearchArea
+                anchors.right: parent.right
+                anchors.rightMargin: Kirigami.Units.smallSpacing
+                anchors.verticalCenter: parent.verticalCenter
+                width: Kirigami.Units.iconSizes.smallMedium
+                height: width
+                visible: searchField.text.length > 0
+                hoverEnabled: true
+                cursorShape: Qt.PointingHandCursor
+
+                onClicked: searchField.clear()
+
+                Kirigami.Icon {
+                    anchors.centerIn: parent
+                    width: Kirigami.Units.iconSizes.small
+                    height: width
+                    source: "window-close-symbolic"
+                    isMask: true
+                    color: Kirigami.Theme.textColor
+                    opacity: clearSearchArea.containsMouse ? 0.9 : 0.65
+                }
+            }
+
             Connections {
                 target: folio.HomeScreenState
                 function onViewStateChanged(): void {
diff --git a/containments/homescreens/folio/qml/CategoryPanel.qml b/containments/homescreens/folio/qml/CategoryPanel.qml
index 78546467..c1e171c5 100644
--- a/containments/homescreens/folio/qml/CategoryPanel.qml
+++ b/containments/homescreens/folio/qml/CategoryPanel.qml
@@ -157,6 +157,8 @@ Rectangle {
                             height: width
                             source: tile.catIcon
                             active: tileArea.containsMouse || tile.isActive
+                            isMask: true
+                            color: tile.isActive ? Kirigami.Theme.highlightColor : Kirigami.Theme.textColor
                         }
 
                         PlasmaComponents.Label {
diff --git a/containments/homescreens/folio/qml/FavouritesBar.qml b/containments/homescreens/folio/qml/FavouritesBar.qml
index 50dd7af7..0bb2951f 100644
--- a/containments/homescreens/folio/qml/FavouritesBar.qml
+++ b/containments/homescreens/folio/qml/FavouritesBar.qml
@@ -330,6 +330,8 @@ MouseArea {
             height: width
             source: "start-here-shift"
             active: homeMouseArea.containsMouse
+            isMask: true
+            color: Kirigami.Theme.textColor
         }
 
         MouseArea {
@@ -400,6 +402,8 @@ MouseArea {
             height: width
             source: "user-desktop"
             active: desktopMouseArea.containsMouse || WindowPlugin.WindowUtil.isShowingDesktop
+            isMask: true
+            color: Kirigami.Theme.textColor
         }
 
         PC3.ToolTip {
@@ -508,6 +512,8 @@ MouseArea {
             height: width
             source: "activities"
             active: overviewMouseArea.containsMouse
+            isMask: true
+            color: Kirigami.Theme.textColor
         }
 
         MouseArea {
@@ -574,6 +580,8 @@ MouseArea {
             height: width
             source: "search"
             active: searchMouseArea.containsMouse
+            isMask: true
+            color: Kirigami.Theme.textColor
         }
 
         PC3.ToolTip {
@@ -899,6 +907,8 @@ MouseArea {
             height: width
             source: trashFilesModel.count > 0 ? "user-trash-full" : "user-trash"
             active: trashMouseArea.containsMouse
+            isMask: true
+            color: Kirigami.Theme.textColor
         }
 
         PC3.ToolTip {
@@ -1595,7 +1605,16 @@ MouseArea {
 
                                     Kirigami.Icon {
                                         anchors.fill: parent
-                                        source: "window-close"
+                                        source: "window-close-symbolic"
+                                        isMask: true
+                                        color: "white"
+                                    }
+
+                                    Rectangle {
+                                        anchors.fill: parent
+                                        radius: width / 2
+                                        color: Qt.rgba(0, 0, 0, 0.55)
+                                        z: -1
                                     }
                                 }
                             }
diff --git a/containments/homescreens/folio/qml/FolioHomeScreen.qml b/containments/homescreens/folio/qml/FolioHomeScreen.qml
index 0df04e0b..a2a8b923 100644
--- a/containments/homescreens/folio/qml/FolioHomeScreen.qml
+++ b/containments/homescreens/folio/qml/FolioHomeScreen.qml
@@ -513,6 +513,8 @@ Item {
                         source: 'arrow-up'
                         Kirigami.Theme.inherit: false
                         Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
+                        isMask: true
+                        color: Kirigami.Theme.textColor
 
                         implicitHeight: Kirigami.Units.iconSizes.small
                         implicitWidth: Kirigami.Units.iconSizes.small
diff --git a/containments/homescreens/folio/qml/RunningAppsPanelButton.qml b/containments/homescreens/folio/qml/RunningAppsPanelButton.qml
index 18e9802f..a27eea1b 100644
--- a/containments/homescreens/folio/qml/RunningAppsPanelButton.qml
+++ b/containments/homescreens/folio/qml/RunningAppsPanelButton.qml
@@ -53,6 +53,8 @@ MouseArea {
         height: width
         source: button.iconName
         active: button.containsMouse || button.checked
+        isMask: true
+        color: Kirigami.Theme.textColor
     }
 
     PC3.ToolTip {
diff --git a/containments/homescreens/folio/qml/gaming/GameCenterOverlay.qml b/containments/homescreens/folio/qml/gaming/GameCenterOverlay.qml
index 7579c8c9..e20f56c7 100644
--- a/containments/homescreens/folio/qml/gaming/GameCenterOverlay.qml
+++ b/containments/homescreens/folio/qml/gaming/GameCenterOverlay.qml
@@ -599,6 +599,8 @@ Window {
                     implicitWidth: Kirigami.Units.iconSizes.small
                     implicitHeight: Kirigami.Units.iconSizes.small
                     source: "system-run"
+                    isMask: true
+                    color: Kirigami.Theme.textColor
                 }
 
                 PC3.Label {
@@ -1022,6 +1024,8 @@ Window {
                         source: "starred"
                         implicitWidth: Kirigami.Units.iconSizes.small
                         implicitHeight: Kirigami.Units.iconSizes.small
+                        isMask: true
+                        color: Kirigami.Theme.textColor
                     }
                 }
             }
@@ -1036,6 +1040,8 @@ Window {
                     implicitWidth: Kirigami.Units.iconSizes.small
                     implicitHeight: Kirigami.Units.iconSizes.small
                     source: "input-gaming"
+                    isMask: true
+                    color: Kirigami.Theme.textColor
                 }
 
                 Repeater {
diff --git a/containments/homescreens/folio/qml/gaming/GamingHUD.qml b/containments/homescreens/folio/qml/gaming/GamingHUD.qml
index e67b0342..69b8ee6f 100644
--- a/containments/homescreens/folio/qml/gaming/GamingHUD.qml
+++ b/containments/homescreens/folio/qml/gaming/GamingHUD.qml
@@ -201,6 +201,8 @@ Window {
                 implicitWidth: Kirigami.Units.iconSizes.small
                 implicitHeight: Kirigami.Units.iconSizes.small
                 Layout.alignment: Qt.AlignVCenter
+                isMask: true
+                color: "white"
             }
 
             QQC2.Label {
diff --git a/containments/homescreens/folio/qml/gaming/GamingQuickSettings.qml b/containments/homescreens/folio/qml/gaming/GamingQuickSettings.qml
index a623c310..86b325ae 100644
--- a/containments/homescreens/folio/qml/gaming/GamingQuickSettings.qml
+++ b/containments/homescreens/folio/qml/gaming/GamingQuickSettings.qml
@@ -319,6 +319,8 @@ Item {
                             implicitWidth: Kirigami.Units.iconSizes.smallMedium
                             implicitHeight: Kirigami.Units.iconSizes.smallMedium
                             source: "low-brightness"
+                            isMask: true
+                            color: Kirigami.Theme.textColor
                         }
 
                         PC3.Slider {
@@ -380,6 +382,8 @@ Item {
                             implicitWidth: Kirigami.Units.iconSizes.smallMedium
                             implicitHeight: Kirigami.Units.iconSizes.smallMedium
                             source: "high-brightness"
+                            isMask: true
+                            color: Kirigami.Theme.textColor
                         }
                     }
                 }
@@ -403,6 +407,8 @@ Item {
                             implicitWidth: Kirigami.Units.iconSizes.smallMedium
                             implicitHeight: Kirigami.Units.iconSizes.smallMedium
                             source: "audio-volume-low"
+                            isMask: true
+                            color: Kirigami.Theme.textColor
                         }
 
                         PC3.Slider {
@@ -462,6 +468,8 @@ Item {
                             implicitWidth: Kirigami.Units.iconSizes.smallMedium
                             implicitHeight: Kirigami.Units.iconSizes.smallMedium
                             source: "audio-volume-high"
+                            isMask: true
+                            color: Kirigami.Theme.textColor
                         }
                     }
                 }
@@ -555,6 +563,8 @@ Item {
                             implicitWidth: Kirigami.Units.iconSizes.small
                             implicitHeight: Kirigami.Units.iconSizes.small
                             source: "games-achievements"
+                            isMask: true
+                            color: Kirigami.Theme.textColor
                         }
                         PC3.Label {
                             text: GamingShell.GameModeControl.active
@@ -659,6 +669,8 @@ Item {
                                 implicitWidth: Kirigami.Units.iconSizes.small
                                 implicitHeight: Kirigami.Units.iconSizes.small
                                 source: "input-gaming"
+                                isMask: true
+                                color: Kirigami.Theme.textColor
                             }
 
                             PC3.Label {
diff --git a/containments/homescreens/folio/qml/main.qml b/containments/homescreens/folio/qml/main.qml
index 0dda77b1..fcee3f87 100644
--- a/containments/homescreens/folio/qml/main.qml
+++ b/containments/homescreens/folio/qml/main.qml
@@ -583,6 +583,8 @@ ContainmentItem {
                     height: width
                     source: "window-close-symbolic"
                     active: closeArea.containsMouse
+                    isMask: true
+                    color: Kirigami.Theme.textColor
                 }
                 PlasmaComponents.ToolTip {
                     text: i18n("Close")
@@ -633,6 +635,8 @@ ContainmentItem {
                         height: width
                         source: "system-lock-screen"
                         active: lockArea.containsMouse
+                        isMask: true
+                        color: Kirigami.Theme.textColor
                     }
                     PlasmaComponents.ToolTip {
                         text: i18n("Lock Screen")
@@ -665,6 +669,8 @@ ContainmentItem {
                         height: width
                         source: "system-reboot"
                         active: rebootArea.containsMouse
+                        isMask: true
+                        color: Kirigami.Theme.textColor
                     }
                     PlasmaComponents.ToolTip {
                         text: i18n("Restart")
@@ -697,6 +703,8 @@ ContainmentItem {
                         height: width
                         source: "system-shutdown"
                         active: shutdownArea.containsMouse
+                        isMask: true
+                        color: Kirigami.Theme.textColor
                     }
                     PlasmaComponents.ToolTip {
                         text: i18n("Shut Down")
diff --git a/containments/homescreens/folio/qml/settings/SettingsButton.qml b/containments/homescreens/folio/qml/settings/SettingsButton.qml
index f96d03ac..12405249 100644
--- a/containments/homescreens/folio/qml/settings/SettingsButton.qml
+++ b/containments/homescreens/folio/qml/settings/SettingsButton.qml
@@ -27,6 +27,8 @@ PC3.ToolButton {
             implicitHeight: Kirigami.Units.iconSizes.smallMedium
             Layout.fillHeight: true
             source: iconName
+            isMask: true
+            color: Kirigami.Theme.textColor
         }
 
         QQC2.Label {