diff --git a/Modules/Bar/Widgets/KeyboardLayout.qml b/Modules/Bar/Widgets/KeyboardLayout.qml
index 7de3a6d..de31920 100644
--- a/Modules/Bar/Widgets/KeyboardLayout.qml
+++ b/Modules/Bar/Widgets/KeyboardLayout.qml
@@ -24,7 +24,7 @@ Item {
 
     anchors.verticalCenter: parent.verticalCenter
     rightOpen: BarWidgetRegistry.getNPillDirection(root)
-    icon: "keyboard_alt"
+    icon: FontService.icons["keyboard"]
     iconCircleColor: Color.mPrimary
     collapsedIconColor: Color.mOnSurface
     autoHide: false // Important to be false so we can hover as long as we want
diff --git a/Services/FontService.qml b/Services/FontService.qml
index 7c773e4..5b720f3 100644
--- a/Services/FontService.qml
+++ b/Services/FontService.qml
@@ -14,11 +14,11 @@ Singleton {
   property bool fontsLoaded: false
 
   property var icons: {
-    "sunny": "\ue30d",
+    "sunny": "\uF1D2",
     "partly_cloudy": "\uF2BE",
     "cloud": "\uF2C3",
     "foggy": "\uF2A7",
-    "rainy": "\uf29c",
+    "rainy": "\uF29C",
     "snowy": "\uF2BC",
     "thunderstom": "\uF2AC",
     "battery_empty": "\uF188",
@@ -36,52 +36,57 @@ Singleton {
     "wifi_low": "\uF619",
     "wifi_half": "\uF61A",
     "wifi_full": "\uF61C",
-    "power": "\uf011",
-    "gear": "\uF3E2",
-    "close": "\uF62A",
+    "power": "\uF4FF",
+    "gear": "\uF3E5",
+    "close": "\uF659",
     "check": "\uF272",
-    "panel": "\uF28C",
+    "panel": "\uF2CD",
     "memory": "\uF2D5",
-    "trash": "\uF014",
-    "image": "\uF03E",
-    "refresh": "\uF021",
+    "trash": "\uF78B",
     "video_camera": "\uF21C",
     "ethernet": "\uF2EB",
     "speed": "\uF66B",
     "leaf": "\uF90B",
-    "microphone": "\uED03",
+    "microphone": "\uF490",
+    "microphone_muted": "\uF48F",
     "coffee": "\uF7EA",
-    "thermometer": "\uE350",
-    "contrast": "\uF042",
-    "skull": "\uEE15",
-    "paint_brush": "\uEE26",
-    "paint_bucket": "\uEE3F",
+    "refresh": "\uF130",
+    "image": "\uF429",
+    "contrast": "\uF288",
+      "thermometer": "\uF908",   // FIXME
+      "paint_brush": "\uEE26",
     "paint_drop": "\uF30C",
-    "yin_yang": "\uEEE9",
-    "record": "\uEFFA",
-    "pause": "\uF04C",
-    "play": "\uF04B",
-    "stop": "\uEFFB",
-    "next": "\uF051",
-    "prev": "\uF048",
-    "lightning": "\uF0E7",
+    "yin_yang": "\uF8E7",
+    "record": "\uF518",
+    "pause": "\uF4C1",
+    "play": "\uF4F2",
+    "stop": "\uF590",
+    "prev": "\uF561",
+    "next": "\uF55B",
     "arrow_drop_down": "\uF229",
     "warning": "\uF334",
     "info": "\uF26A",
     "upload": "\uF296",
     "download": "\uF294",
     "album": "\uF2FE",
-    "link": "\uF0C1",
-    "plus": "\uF067",
-    "minus": "\uF068",
+      "link": "\uF0C1",
+    "plus": "\uF64D",
+    "minus": "\uF63B",
     "eyedropper": "\uF342",
     "bell": "\uF189",
     "bell_striked": "\uF631",
-    "drive": "\uF410",
+    "drive": "\uF412",
     "bluetooth": "\uF682",
-    "person": "\uEE15",
+    "person": "\uF4DA",
     "bar": "\uF52B",
-    "launcher": "\uF843"
+    "launcher": "\uF843",
+    "palette": "\uF4B1",
+    "moon": "\uF494",
+    "gauge": "\uF580",
+    "lightning": "\uF46C",
+    "keyboard": "\uF451",
+
+      // another contrast  \uF8F3   \uF8DA
   }
 
   // -------------------------------------------
diff --git a/Widgets/NIcon.qml b/Widgets/NIcon.qml
index 48b19eb..2f5a330 100644
--- a/Widgets/NIcon.qml
+++ b/Widgets/NIcon.qml
@@ -4,7 +4,7 @@ import qs.Commons
 import qs.Widgets
 
 Text {
-  text: "\uEE15" // fallback/default to skull icon
+  text: "\uF706" // fallback/default to balloon icon
   font.family: "bootstrap-icons"
   font.pointSize: Style.fontSizeL * scaling
   color: Color.mOnSurface