diff --git a/Modules/ArchUpdaterPanel/ArchUpdaterPanel.qml b/Modules/ArchUpdaterPanel/ArchUpdaterPanel.qml
index c282e11..9e4ec6a 100644
--- a/Modules/ArchUpdaterPanel/ArchUpdaterPanel.qml
+++ b/Modules/ArchUpdaterPanel/ArchUpdaterPanel.qml
@@ -55,7 +55,7 @@ NPanel {
         }
 
         NIconButton {
-          icon: "close"
+          icon: FontService.icons["close"]
           tooltipText: "Close"
           sizeRatio: 0.8
           onClicked: root.close()
diff --git a/Modules/Bar/Widgets/Volume.qml b/Modules/Bar/Widgets/Volume.qml
index 3f2a76c..cde2693 100644
--- a/Modules/Bar/Widgets/Volume.qml
+++ b/Modules/Bar/Widgets/Volume.qml
@@ -43,7 +43,7 @@ Item {
 
   function getIcon() {
     if (AudioService.muted) {
-      return FontService.icons["volume_off"] // TODO disabled icon ?
+      return FontService.icons["volume_muted"]
     }
     return AudioService.volume
         <= Number.EPSILON ? FontService.icons["volume_off"] : (AudioService.volume
diff --git a/Modules/BluetoothPanel/BluetoothPanel.qml b/Modules/BluetoothPanel/BluetoothPanel.qml
index 751a0c4..312ddc3 100644
--- a/Modules/BluetoothPanel/BluetoothPanel.qml
+++ b/Modules/BluetoothPanel/BluetoothPanel.qml
@@ -53,7 +53,7 @@ NPanel {
         }
 
         NIconButton {
-          icon: "close"
+          icon: FontService.icons["close"]
           tooltipText: "Close"
           sizeRatio: 0.8
           onClicked: {
diff --git a/Modules/Notification/Notification.qml b/Modules/Notification/Notification.qml
index fdbe0d2..f6b1510 100644
--- a/Modules/Notification/Notification.qml
+++ b/Modules/Notification/Notification.qml
@@ -294,7 +294,7 @@ Variants {
 
             // Close button positioned absolutely
             NIconButton {
-              icon: "close"
+              icon: FontService.icons["close"]
               tooltipText: "Close"
               sizeRatio: 0.6
               anchors.top: parent.top
diff --git a/Modules/Notification/NotificationHistoryPanel.qml b/Modules/Notification/NotificationHistoryPanel.qml
index 39686df..0278ab9 100644
--- a/Modules/Notification/NotificationHistoryPanel.qml
+++ b/Modules/Notification/NotificationHistoryPanel.qml
@@ -59,7 +59,7 @@ NPanel {
         }
 
         NIconButton {
-          icon: "close"
+          icon: FontService.icons["close"]
           tooltipText: "Close"
           sizeRatio: 0.8
           onClicked: {
diff --git a/Modules/SettingsPanel/Bar/BarSectionEditor.qml b/Modules/SettingsPanel/Bar/BarSectionEditor.qml
index 7a1684a..3d32950 100644
--- a/Modules/SettingsPanel/Bar/BarSectionEditor.qml
+++ b/Modules/SettingsPanel/Bar/BarSectionEditor.qml
@@ -210,7 +210,7 @@ NBox {
                 }
 
                 NIconButton {
-                  icon: "close"
+                  icon: FontService.icons["close"]
                   sizeRatio: 0.6
                   colorBorder: Qt.alpha(Color.mOutline, Style.opacityLight)
                   colorBg: Color.mOnSurface
diff --git a/Modules/SettingsPanel/Bar/BarWidgetSettingsDialog.qml b/Modules/SettingsPanel/Bar/BarWidgetSettingsDialog.qml
index 9ba0045..c354b7b 100644
--- a/Modules/SettingsPanel/Bar/BarWidgetSettingsDialog.qml
+++ b/Modules/SettingsPanel/Bar/BarWidgetSettingsDialog.qml
@@ -84,7 +84,7 @@ Popup {
       }
 
       NIconButton {
-        icon: "close"
+        icon: FontService.icons["close"]
         onClicked: settingsPopup.close()
       }
     }
diff --git a/Modules/SettingsPanel/SettingsPanel.qml b/Modules/SettingsPanel/SettingsPanel.qml
index 7b545a5..622b2c7 100644
--- a/Modules/SettingsPanel/SettingsPanel.qml
+++ b/Modules/SettingsPanel/SettingsPanel.qml
@@ -163,7 +163,7 @@ NPanel {
                    }, {
                      "id": SettingsPanel.Tab.ColorScheme,
                      "label": "Color Scheme",
-                     "icon": FontService.icons["palette"],
+                     "icon": FontService.icons["paint_bucket"],
                      "source": colorSchemeTab
                    }, {
                      "id": SettingsPanel.Tab.Wallpaper,
@@ -177,7 +177,7 @@ NPanel {
       newTabs.push({
                      "id": SettingsPanel.Tab.WallpaperSelector,
                      "label": "Wallpaper Selector",
-                     "icon": FontService.icons["image"],
+                     "icon": FontService.icons["paint_brush"],
                      "source": wallpaperSelectorTab
                    })
     }
@@ -473,7 +473,7 @@ NPanel {
 
               // Close button
               NIconButton {
-                icon: "close"
+                icon: FontService.icons["close"]
                 tooltipText: "Close"
                 Layout.alignment: Qt.AlignVCenter
                 onClicked: root.close()
diff --git a/Modules/SettingsPanel/Tabs/AudioTab.qml b/Modules/SettingsPanel/Tabs/AudioTab.qml
index d60ae38..b72047a 100644
--- a/Modules/SettingsPanel/Tabs/AudioTab.qml
+++ b/Modules/SettingsPanel/Tabs/AudioTab.qml
@@ -322,7 +322,7 @@ ColumnLayout {
               }
 
               NIconButton {
-                icon: "close"
+                icon: FontService.icons["close"]
                 sizeRatio: 0.8
                 Layout.alignment: Qt.AlignVCenter
                 Layout.rightMargin: Style.marginXS * scaling
diff --git a/Modules/SidePanel/Cards/PowerProfilesCard.qml b/Modules/SidePanel/Cards/PowerProfilesCard.qml
index 1487bfd..9af102b 100644
--- a/Modules/SidePanel/Cards/PowerProfilesCard.qml
+++ b/Modules/SidePanel/Cards/PowerProfilesCard.qml
@@ -42,7 +42,7 @@ NBox {
     }
     // Balanced
     NIconButton {
-      icon: FontService.icons["scale"]
+      icon: FontService.icons["yin_yang"]
       tooltipText: "Set balanced power profile."
       enabled: hasPP
       opacity: enabled ? Style.opacityFull : Style.opacityMedium
diff --git a/Modules/WiFiPanel/WiFiPanel.qml b/Modules/WiFiPanel/WiFiPanel.qml
index 627be65..db4e21a 100644
--- a/Modules/WiFiPanel/WiFiPanel.qml
+++ b/Modules/WiFiPanel/WiFiPanel.qml
@@ -63,7 +63,7 @@ NPanel {
         }
 
         NIconButton {
-          icon: "close"
+          icon: FontService.icons["close"]
           tooltipText: "Close"
           sizeRatio: 0.8
           onClicked: root.close()
@@ -105,7 +105,7 @@ NPanel {
           }
 
           NIconButton {
-            icon: "close"
+            icon: FontService.icons["close"]
             sizeRatio: 0.6
             onClicked: NetworkService.lastError = ""
           }
@@ -492,7 +492,7 @@ NPanel {
                       }
 
                       NIconButton {
-                        icon: "close"
+                        icon: FontService.icons["close"]
                         sizeRatio: 0.8
                         onClicked: {
                           passwordSsid = ""
@@ -547,7 +547,7 @@ NPanel {
                       }
 
                       NIconButton {
-                        icon: "close"
+                        icon: FontService.icons["close"]
                         sizeRatio: 0.8
                         onClicked: expandedSsid = ""
                       }
diff --git a/Services/FontService.qml b/Services/FontService.qml
index 8bee60d..d1a5cf3 100644
--- a/Services/FontService.qml
+++ b/Services/FontService.qml
@@ -25,6 +25,7 @@ Singleton {
     "battery_low": "\uF187",
     "battery_full": "\uF186",
     "battery_charging": "\uF185",
+    "volume_muted": "\uEEE8",
     "volume_off": "\uF026",
     "volume_half": "\uF027",
     "volume_full": "\uF028",
@@ -46,7 +47,10 @@ Singleton {
     "coffee": "\uef59",
     "thermometer": "\uE350",
     "contrast": "\uF042",
-    "skull": "\uEE15"
+    "skull": "\uEE15",
+    "paint_brush": "\uEE26",
+    "paint_bucket": "\uEE3F",
+    "yin_yang": "\uEEE9"
   }
 
   // -------------------------------------------
diff --git a/Widgets/NColorPickerDialog.qml b/Widgets/NColorPickerDialog.qml
index 324e5b6..07b9647 100644
--- a/Widgets/NColorPickerDialog.qml
+++ b/Widgets/NColorPickerDialog.qml
@@ -147,7 +147,7 @@ Popup {
         }
 
         NIconButton {
-          icon: "close"
+          icon: FontService.icons["close"]
           onClicked: root.close()
         }
       }
@@ -491,7 +491,7 @@ Popup {
         NButton {
           id: cancelButton
           text: "Cancel"
-          icon: "close"
+          icon: FontService.icons["close"]
           outlined: cancelButton.hovered ? false : true
           customHeight: 36 * scaling
           customWidth: 100 * scaling
diff --git a/Widgets/NToast.qml b/Widgets/NToast.qml
index 7a60c6c..8e279b3 100644
--- a/Widgets/NToast.qml
+++ b/Widgets/NToast.qml
@@ -172,7 +172,7 @@ Item {
 
       // Close button (only if persistent or manual dismiss needed)
       NIconButton {
-        icon: "close"
+        icon: FontService.icons["close"]
         visible: root.persistent || root.duration === 0
 
         colorBg: Color.mSurfaceVariant