diff --git a/Modules/Bar/Widgets/NightLight.qml b/Modules/Bar/Widgets/NightLight.qml
index c9f302e..d3896a1 100644
--- a/Modules/Bar/Widgets/NightLight.qml
+++ b/Modules/Bar/Widgets/NightLight.qml
@@ -16,11 +16,11 @@ NIconButton {
 
   sizeRatio: 0.8
   colorBg: Color.mSurfaceVariant
-  colorFg: Color.mOnSurface
+  colorFg: Settings.data.nightLight.enabled ? Color.mOnSurface : Color.mError
   colorBorder: Color.transparent
   colorBorderHover: Color.transparent
 
-  icon: Settings.data.nightLight.enabled ? "bedtime" : "bedtime_off"
+  icon: FontService.icons["moon"]
   tooltipText: `Night light: ${Settings.data.nightLight.enabled ? "enabled." : "disabled."}\nLeft click to toggle.\nRight click to access settings.`
   onClicked: Settings.data.nightLight.enabled = !Settings.data.nightLight.enabled
 
diff --git a/Modules/SettingsPanel/SettingsPanel.qml b/Modules/SettingsPanel/SettingsPanel.qml
index 66a2315..d68db3c 100644
--- a/Modules/SettingsPanel/SettingsPanel.qml
+++ b/Modules/SettingsPanel/SettingsPanel.qml
@@ -123,7 +123,7 @@ NPanel {
     let newTabs = [{
                      "id": SettingsPanel.Tab.General,
                      "label": "General",
-                     "icon": "general",
+                     "icon": "box",
                      "source": generalTab
                    }, {
                      "id": SettingsPanel.Tab.Bar,
@@ -153,7 +153,7 @@ NPanel {
                    }, {
                      "id": SettingsPanel.Tab.Brightness,
                      "label": "Brightness",
-                     "icon": "brightness",
+                     "icon": "brightness_high",
                      "source": brightnessTab
                    }, {
                      "id": SettingsPanel.Tab.Weather,
@@ -195,7 +195,7 @@ NPanel {
                  }, {
                    "id": SettingsPanel.Tab.About,
                    "label": "About",
-                   "icon": "info",
+                   "icon": "macaron",
                    "source": aboutTab
                  })
 
diff --git a/Services/BatteryService.qml b/Services/BatteryService.qml
index 2a9dfbb..688d3eb 100644
--- a/Services/BatteryService.qml
+++ b/Services/BatteryService.qml
@@ -18,6 +18,8 @@ Singleton {
     } else {
       if (percent >= 85)
         return FontService.icons["battery_full"]
+      if (percent >= 45)
+        return FontService.icons["battery_half"]
       if (percent >= 25)
         return FontService.icons["battery_low"]
       if (percent >= 0)
diff --git a/Services/FontService.qml b/Services/FontService.qml
index 5b720f3..f407732 100644
--- a/Services/FontService.qml
+++ b/Services/FontService.qml
@@ -30,8 +30,8 @@ Singleton {
     "volume_off": "\uF60F",
     "volume_half": "\uF60B",
     "volume_full": "\uF611",
-    "brightness_low": "\uF1CF",
-    "brightness_high": "\uF1CD",
+    "brightness_low": "\uF1D4",
+    "brightness_high": "\uF1D2",
     "wifi_disable": "\uF61B",
     "wifi_low": "\uF619",
     "wifi_half": "\uF61A",
@@ -41,20 +41,19 @@ Singleton {
     "close": "\uF659",
     "check": "\uF272",
     "panel": "\uF2CD",
-    "memory": "\uF2D5",
+    "memory": "\uF2D6",
     "trash": "\uF78B",
-    "video_camera": "\uF21C",
+    "video_camera": "\uF21F",
     "ethernet": "\uF2EB",
     "speed": "\uF66B",
-    "leaf": "\uF90B",
+    "leaf": "\uF90C",
     "microphone": "\uF490",
     "microphone_muted": "\uF48F",
-    "coffee": "\uF7EA",
+    "coffee": "\uF2E0",
     "refresh": "\uF130",
-    "image": "\uF429",
+    "image": "\uF226",
     "contrast": "\uF288",
-      "thermometer": "\uF908",   // FIXME
-      "paint_brush": "\uEE26",
+    "thermometer": "\uF5CD",
     "paint_drop": "\uF30C",
     "yin_yang": "\uF8E7",
     "record": "\uF518",
@@ -63,17 +62,16 @@ Singleton {
     "stop": "\uF590",
     "prev": "\uF561",
     "next": "\uF55B",
-    "arrow_drop_down": "\uF229",
+    "arrow_drop_down": "\uF282",
     "warning": "\uF334",
     "info": "\uF26A",
     "upload": "\uF296",
     "download": "\uF294",
-    "album": "\uF2FE",
-      "link": "\uF0C1",
+    "album": "\uF2FF",
     "plus": "\uF64D",
     "minus": "\uF63B",
     "eyedropper": "\uF342",
-    "bell": "\uF189",
+    "bell": "\uF18A",
     "bell_striked": "\uF631",
     "drive": "\uF412",
     "bluetooth": "\uF682",
@@ -81,11 +79,15 @@ Singleton {
     "bar": "\uF52B",
     "launcher": "\uF843",
     "palette": "\uF4B1",
-    "moon": "\uF494",
+    "moon": "\uF497",
     "gauge": "\uF580",
     "lightning": "\uF46C",
     "keyboard": "\uF451",
-
+    "paint_brush": "\uEE26",
+    "link": "\uF470",
+    "macaron": "\uF154",
+    "box": "\uF1C8",
+    "monitor": "\uF302",
       // another contrast  \uF8F3   \uF8DA
   }
 
diff --git a/Widgets/NComboBox.qml b/Widgets/NComboBox.qml
index 842479c..769602d 100644
--- a/Widgets/NComboBox.qml
+++ b/Widgets/NComboBox.qml
@@ -86,7 +86,7 @@ RowLayout {
       x: combo.width - width - Style.marginM * scaling
       y: combo.topPadding + (combo.availableHeight - height) / 2
       text: FontService.icons["arrow_drop_down"]
-      font.pointSize: Style.fontSizeXXL * scaling
+      font.pointSize: Style.fontSizeL * scaling
     }
 
     popup: Popup {