diff --git a/apps/hyprland/hypridle.sh b/apps/hyprland/hypridle.sh
index 8f10542..309aa36 100755
--- a/apps/hyprland/hypridle.sh
+++ b/apps/hyprland/hypridle.sh
@@ -6,10 +6,10 @@ function toggle () {
   if pgrep "hypridle" > /dev/null
 	then
 		pkill hypridle
-		notify-send -u normal -t 4500 "󰐩    Hypridle Inactive"
+		notify-send -u normal -t 4500 "󰐩  Hypridle Inactive"
 	else
 		hypridle &
-		notify-send -u normal -t 4500 "󰐨    Hypridle Active"
+		notify-send -u normal -t 4500 "󰐨  Hypridle Active"
 	fi
 }
 
diff --git a/apps/waybar/style.css b/apps/waybar/style.css
index 62baeb4..e7bea05 100644
--- a/apps/waybar/style.css
+++ b/apps/waybar/style.css
@@ -33,9 +33,6 @@ tooltip {
   border-color: #4771c9;
 }
 
-#battery,
-#backlight,
-
 #battery,
 #backlight,
 #clock,
@@ -85,27 +82,27 @@ tooltip {
 
 
 /* right segment */
-#tray {
-  border-radius: 10px 0px 0px 10px;
-  margin-left: 10px;
-  margin-right: 0px;
-  font-size: 20px;
-}
-
 #backlight,
-#pulseaudio,
-#custom-hypridle,
+#battery,
 #custom-wireguard,
-#network {
+#network,
+#pulseaudio {
   border-radius: 0px 0px 0px 0px;
   font-size: 20px;
   margin-right: -3px;
   margin-left: 0px;
 }
 
-#battery {
+#custom-wireguard {
+  border-radius: 10px 0px 0px 10px;
+  font-size: 20px;
+  margin-left: 10px;
+  margin-right: 0px;
+}
+
+#custom-hypridle {
   border-radius: 0px 10px 10px 0px;
   font-size: 20px;
   margin-left: 0px;
-  margin-right: 10px;
+  margin-right: 15px;
 }
diff --git a/apps/waybar/waybar.conf b/apps/waybar/waybar.conf
index 1254ac4..cfa5d26 100644
--- a/apps/waybar/waybar.conf
+++ b/apps/waybar/waybar.conf
@@ -21,12 +21,12 @@
 
   "modules-right": [
     "tray",
-    "custom/hypridle",
     "custom/wireguard",
     "network",
     "pulseaudio",
     "backlight",
     "battery",
+    "custom/hypridle",
   ],
 
   // modules
diff --git a/nix/home/mako/mako.nix b/nix/home/mako/mako.nix
index c1983ca..2fdc11c 100644
--- a/nix/home/mako/mako.nix
+++ b/nix/home/mako/mako.nix
@@ -16,7 +16,7 @@
       margin  = "10,10,10";
 
       # theme
-      font = "CommitMono Nerd Font 12";
+      font = "FiraCode Nerd Font 12";
 
       # size
       width  = 350;