diff --git a/Modules/Bar/Widgets/DarkModeToggle.qml b/Modules/Bar/Widgets/DarkModeToggle.qml
index ae7d933..3ba55f3 100644
--- a/Modules/Bar/Widgets/DarkModeToggle.qml
+++ b/Modules/Bar/Widgets/DarkModeToggle.qml
@@ -9,7 +9,7 @@ NIconButton {
   property ShellScreen screen
   property real scaling: 1.0
 
-  icon: "contrast"
+  icon: FontService.icons["contrast"]
   tooltipText: "Toggle light/dark mode"
   sizeRatio: 0.8
 
diff --git a/Modules/Bar/Widgets/KeepAwake.qml b/Modules/Bar/Widgets/KeepAwake.qml
index 31c6525..d13612a 100644
--- a/Modules/Bar/Widgets/KeepAwake.qml
+++ b/Modules/Bar/Widgets/KeepAwake.qml
@@ -13,7 +13,7 @@ NIconButton {
 
   sizeRatio: 0.8
 
-  icon: "coffee"
+  icon: FontService.icons["coffee"]
   tooltipText: IdleInhibitorService.isInhibited ? "Disable keep awake" : "Enable keep awake"
   colorBg: Color.mSurfaceVariant
   colorFg: IdleInhibitorService.isInhibited ? Color.mPrimary : Color.mOnSurface
diff --git a/Modules/Bar/Widgets/SystemMonitor.qml b/Modules/Bar/Widgets/SystemMonitor.qml
index 91f3fd8..d8fe84a 100644
--- a/Modules/Bar/Widgets/SystemMonitor.qml
+++ b/Modules/Bar/Widgets/SystemMonitor.qml
@@ -66,7 +66,7 @@ RowLayout {
 
         NIcon {
           id: cpuUsageIcon
-          text: "speed"
+          text: FontService.icons["speed"]
           Layout.alignment: Qt.AlignVCenter
         }
 
@@ -91,7 +91,7 @@ RowLayout {
         visible: showCpuTemp
 
         NIcon {
-          text: "thermometer"
+          text: FontService.icons["thermometer"]
           Layout.alignment: Qt.AlignVCenter
         }
 
@@ -114,7 +114,7 @@ RowLayout {
         visible: showMemoryUsage
 
         NIcon {
-          text: "memory"
+          text: FontService.icons["memory"]
           Layout.alignment: Qt.AlignVCenter
         }
 
@@ -137,7 +137,7 @@ RowLayout {
         visible: showNetworkStats
 
         NIcon {
-          text: "download"
+          text: FontService.icons["download"]
           Layout.alignment: Qt.AlignVCenter
         }
 
@@ -160,7 +160,7 @@ RowLayout {
         visible: showNetworkStats
 
         NIcon {
-          text: "upload"
+          text: FontService.icons["upload"]
           Layout.alignment: Qt.AlignVCenter
         }
 
diff --git a/Modules/Bar/Widgets/Volume.qml b/Modules/Bar/Widgets/Volume.qml
index 2458ce3..3f2a76c 100644
--- a/Modules/Bar/Widgets/Volume.qml
+++ b/Modules/Bar/Widgets/Volume.qml
@@ -43,9 +43,11 @@ Item {
 
   function getIcon() {
     if (AudioService.muted) {
-      return FontService.icons["volume_off"]  // TODO disabled icon ?
+      return FontService.icons["volume_off"] // TODO disabled icon ?
     }
-    return AudioService.volume <= Number.EPSILON ? FontService.icons["volume_off"] : (AudioService.volume < 0.5 ? FontService.icons["volume_half"]: FontService.icons["volume_full"])
+    return AudioService.volume
+        <= Number.EPSILON ? FontService.icons["volume_off"] : (AudioService.volume
+                                                               < 0.5 ? FontService.icons["volume_half"] : FontService.icons["volume_full"])
   }
 
   // Connection used to open the pill when volume changes
diff --git a/Modules/Bar/Widgets/WiFi.qml b/Modules/Bar/Widgets/WiFi.qml
index fe8ff75..80120a4 100644
--- a/Modules/Bar/Widgets/WiFi.qml
+++ b/Modules/Bar/Widgets/WiFi.qml
@@ -23,7 +23,7 @@ NIconButton {
   icon: {
     try {
       if (NetworkService.ethernetConnected) {
-        return "lan"
+        return FontService.icons["ethernet"]
       }
       let connected = false
       let signalStrength = 0
diff --git a/Modules/SettingsPanel/SettingsPanel.qml b/Modules/SettingsPanel/SettingsPanel.qml
index ea8c701..7b545a5 100644
--- a/Modules/SettingsPanel/SettingsPanel.qml
+++ b/Modules/SettingsPanel/SettingsPanel.qml
@@ -123,52 +123,52 @@ NPanel {
     let newTabs = [{
                      "id": SettingsPanel.Tab.General,
                      "label": "General",
-                     "icon": "tune",
+                     "icon": FontService.icons["general"],
                      "source": generalTab
                    }, {
                      "id": SettingsPanel.Tab.Bar,
                      "label": "Bar",
-                     "icon": "web_asset",
+                     "icon": FontService.icons["bar"],
                      "source": barTab
                    }, {
                      "id": SettingsPanel.Tab.Launcher,
                      "label": "Launcher",
-                     "icon": "apps",
+                     "icon": FontService.icons["apps"],
                      "source": launcherTab
                    }, {
                      "id": SettingsPanel.Tab.Audio,
                      "label": "Audio",
-                     "icon": "volume_up",
+                     "icon": FontService.icons["volume_full"],
                      "source": audioTab
                    }, {
                      "id": SettingsPanel.Tab.Display,
                      "label": "Display",
-                     "icon": "monitor",
+                     "icon": FontService.icons["monitor"],
                      "source": displayTab
                    }, {
                      "id": SettingsPanel.Tab.Network,
                      "label": "Network",
-                     "icon": "lan",
+                     "icon": FontService.icons["ethernet"],
                      "source": networkTab
                    }, {
                      "id": SettingsPanel.Tab.Brightness,
                      "label": "Brightness",
-                     "icon": "brightness_6",
+                     "icon": FontService.icons["brightness"],
                      "source": brightnessTab
                    }, {
                      "id": SettingsPanel.Tab.Weather,
                      "label": "Weather",
-                     "icon": "partly_cloudy_day",
+                     "icon": FontService.icons["partly_cloudy"],
                      "source": weatherTab
                    }, {
                      "id": SettingsPanel.Tab.ColorScheme,
                      "label": "Color Scheme",
-                     "icon": "palette",
+                     "icon": FontService.icons["palette"],
                      "source": colorSchemeTab
                    }, {
                      "id": SettingsPanel.Tab.Wallpaper,
                      "label": "Wallpaper",
-                     "icon": "image",
+                     "icon": FontService.icons["image"],
                      "source": wallpaperTab
                    }]
 
@@ -177,7 +177,7 @@ NPanel {
       newTabs.push({
                      "id": SettingsPanel.Tab.WallpaperSelector,
                      "label": "Wallpaper Selector",
-                     "icon": "wallpaper_slideshow",
+                     "icon": FontService.icons["image"],
                      "source": wallpaperSelectorTab
                    })
     }
@@ -185,17 +185,17 @@ NPanel {
     newTabs.push({
                    "id": SettingsPanel.Tab.ScreenRecorder,
                    "label": "Screen Recorder",
-                   "icon": "videocam",
+                   "icon": FontService.icons["video_camera"],
                    "source": screenRecorderTab
                  }, {
                    "id": SettingsPanel.Tab.Hooks,
                    "label": "Hooks",
-                   "icon": "cable",
+                   "icon": FontService.icons["cable"],
                    "source": hooksTab
                  }, {
                    "id": SettingsPanel.Tab.About,
                    "label": "About",
-                   "icon": "info",
+                   "icon": FontService.icons["info"],
                    "source": aboutTab
                  })
 
diff --git a/Modules/SidePanel/Cards/SystemMonitorCard.qml b/Modules/SidePanel/Cards/SystemMonitorCard.qml
index 9d3154d..199960c 100644
--- a/Modules/SidePanel/Cards/SystemMonitorCard.qml
+++ b/Modules/SidePanel/Cards/SystemMonitorCard.qml
@@ -24,7 +24,7 @@ NBox {
 
     NCircleStat {
       value: SystemStatService.cpuUsage
-      icon: "speed"
+      icon: FontService.icons["speed"]
       flat: true
       contentScale: 0.8
       width: 72 * scaling
@@ -33,7 +33,7 @@ NBox {
     NCircleStat {
       value: SystemStatService.cpuTemp
       suffix: "°C"
-      icon: "device_thermostat"
+      icon: FontService.icons["thermometer"]
       flat: true
       contentScale: 0.8
       width: 72 * scaling
@@ -41,7 +41,7 @@ NBox {
     }
     NCircleStat {
       value: SystemStatService.memPercent
-      icon: "memory"
+      icon: FontService.icons["memory"]
       flat: true
       contentScale: 0.8
       width: 72 * scaling
@@ -49,7 +49,7 @@ NBox {
     }
     NCircleStat {
       value: SystemStatService.diskPercent
-      icon: "hard_drive"
+      icon: FontService.icons["drive"]
       flat: true
       contentScale: 0.8
       width: 72 * scaling
diff --git a/Services/FontService.qml b/Services/FontService.qml
index 7bf4839..8bee60d 100644
--- a/Services/FontService.qml
+++ b/Services/FontService.qml
@@ -29,7 +29,7 @@ Singleton {
     "volume_half": "\uF027",
     "volume_full": "\uF028",
     "power": "\uf011",
-    "gear": "\uf013",
+    "gear": "\ue615",
     "close": "\uf00D",
     "check": "\uf00C",
     "panel": "\uF28C",
@@ -39,6 +39,14 @@ Singleton {
     "image": "\uF03E",
     "refresh": "\uF021",
     "video_camera": "\uF03D",
+    "ethernet": "\uEF09",
+    "speed": "\uEEB2",
+    "leaf": "\uEE34",
+    "microphone": "\uED03",
+    "coffee": "\uef59",
+    "thermometer": "\uE350",
+    "contrast": "\uF042",
+    "skull": "\uEE15"
   }
 
   // -------------------------------------------
diff --git a/Widgets/NIcon.qml b/Widgets/NIcon.qml
index 9ee76ad..adfb22f 100644
--- a/Widgets/NIcon.qml
+++ b/Widgets/NIcon.qml
@@ -1,12 +1,13 @@
 import QtQuick
+import QtQuick.Layouts
 import qs.Commons
 import qs.Widgets
-import QtQuick.Layouts
+
 
 Text {
   // Optional layout nudge for optical alignment when used inside Layouts
   property real layoutTopMargin: 0
-  text: "question_mark"
+  text: "\uEE15" // default skull icon
   font.family: "bootstrap-icons"
   font.pointSize: Style.fontSizeL * scaling
   font.variableAxes: {