diff --git a/waybar/config.template b/waybar/config.template
index 7f7bbe2d0..d8be65aa8 100644
--- a/waybar/config.template
+++ b/waybar/config.template
@@ -74,8 +74,8 @@
         "interval": 10,
         "tooltip-format": "{essid} {ipaddr}",
         "format-ethernet": "",
-        "format-wifi": "",
-        "format-disconnected": "⛖",
+        "format-wifi": " ",
+        "format-disconnected": "⛖ ",
         "on-click": "${HOME}/scripts/wofi/wofi-wifi-menu.sh"
     },
     "network#wireguard": {
@@ -88,26 +88,26 @@
         "on-click": "if [ $(sudo pgrep -xc rofi) -gt 0 ]; then pkill rofi; else ${HOME}/scripts/rofi/rofi-openvpn.sh; fi"
     },
     "cpu": {
-        "format": "\u200a{usage}%",
+        "format": " {usage}%",
         "tooltip": true,
         "on-click": "${HOME}/scripts/waybar/waybar-cpu.sh"
     },
     "memory": {
-        "format": "\u200a{}%",
+        "format": " {}%",
         "on-click": "${HOME}/scripts/waybar/waybar-mem.sh"
     },
     "custom/disk": {
-        "format": "\uf0a0\u200a{}",
+        "format": "\uf0a0 {}",
         "exec": "df / | tail -n 1 | awk {'print $5'}",
         "on-click": "${HOME}/scripts/waybar/waybar-disk.sh"
     },
     "temperature": {
         "critical-threshold": 80,
-        "format": "\u200a{temperatureC}°C"
+        "format": "{temperatureC}°C"
     },
     //"backlight": {
         // "device": "acpi_video1",
-        //"format": "{icon}\u200a{percent}%",
+        //"format": "{icon} {percent}%",
         //"format-icons": [ "•", "☼", "o", "", ""],
         //"on-click": "${HOME}/scripts/thinkpad/blc.pl --notify %",
         //"on-scroll-up": "${HOME}/scripts/thinkpad/blc.pl --notify ++",
@@ -122,7 +122,7 @@
     },
     "pulseaudio": {
         //"scroll-step": 1,
-        "format": "{icon}\u200a{volume}%",
+        "format": "{icon} {volume}%",
         "format-bluetooth": "{icon}{volume}%",
         "format-muted": "",
         "format-icons": {
@@ -170,8 +170,8 @@
     "idle_inhibitor": {
         "format": "{icon}",
         "format-icons": {
-            "activated": "",
-            "deactivated": ""
+            "activated": " ",
+            "deactivated": " "
         },
         "on-click": "echo {status} > .config/idle_inhibitor"
     },
diff --git a/waybar/style.css b/waybar/style.css
index b81491f94..2210aed88 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -40,7 +40,7 @@
 /* Global/Multi */
 
 * {
-    font-family: "Anonymous Pro", "Font Awesome 5 Brands", "Font Awesome 5 Free", Monospace;
+    font-family: "Anonymice Nerd Font", "Font Awesome 5 Brands", "Font Awesome 5 Free", Monospace;
     font-size: 14px;
     min-height: 0;
 }
@@ -69,13 +69,6 @@ window#waybar {
     color: @bluehi;
 }
 
-/* Wallpaper rotation */
-
-#custom-wallpaper {
-    margin: -10px -4px -5px -4px;
-    font-size: 20px;
-}
-
 /* Workspaces */
 
 #workspaces {
@@ -107,7 +100,6 @@ window#waybar {
 
 #window {
     color: @fg;
-    font-size: 16px;
 }
 
 /* MPD */
@@ -116,23 +108,23 @@ window#waybar {
     color: @bg;
 }
 
+/* Weather */
+
 #custom-weather {
-    margin-top: -7px;
+    margin-top: -8px;
+    margin-bottom: -2px;
 }
 
 /* Networks */
 
 #network {
     color: @blue;
-    font-size: 16px;
     margin-right: -2px;
+    margin-top: -2px;
 }
 
 #network.wireguard {
-    padding: 0px;
-    font-size: 18px;
-    margin-top: -2px;
-    margin-right: 2px;
+    padding-left: 0px;
 }
 
 #network.disconnected {
@@ -224,6 +216,13 @@ window#waybar {
     margin-right: -2px;
 }
 
+/* Wallpaper rotation */
+
+#custom-wallpaper {
+    margin: -10px -4px -5px -4px;
+    font-size: 20px;
+}
+
 /* Todo-txt */
 
 #custom-todo {
@@ -244,7 +243,6 @@ window#waybar {
 }
 
 #custom-osk.activated {
-    /* background-color: @fg; */
     color: @white;
 }
 
@@ -261,8 +259,7 @@ window#waybar {
 /* Bar locker */
 
 #custom-bar {
-    padding: 3px;
-    margin-top: -10px;
+    margin-right: 6px;
 }
 
 /* Gammastep */
@@ -278,7 +275,6 @@ window#waybar {
 /* Idle Inhibitor */
 
 #idle_inhibitor.activated {
-    /* background-color: @fg; */
     color: @white;
 }
 
@@ -292,7 +288,7 @@ window#waybar {
 
 #custom-power {
     margin-right: 0px;
-    margin-top: 5px;
+    margin-top: 1px;
     color: @red;
 }