diff --git a/modules/home/desktop/niri/programs/waybar/default.nix b/modules/home/desktop/niri/programs/waybar/default.nix
index 61a5ccb..d669650 100644
--- a/modules/home/desktop/niri/programs/waybar/default.nix
+++ b/modules/home/desktop/niri/programs/waybar/default.nix
@@ -14,8 +14,8 @@
   settings.bar-0 = {
     # layer = "top";
     position = "bottom";
-    height = 24;
-    spacing = 6;
+    height = 36;
+    spacing = 0;
     margin-left = 33 + 3;
     margin-right = 33 + 3;
     margin-bottom = 3;
@@ -96,7 +96,7 @@
       };
     };
     "tray" = {
-      icon-size = 20;
+      icon-size = 24;
       spacing = 6;
     };
     "clock" = {
@@ -188,7 +188,7 @@
     };
     "wlr/taskbar" = {
       format = "{icon}";
-      icon-size = 18;
+      icon-size = 24;
       icon-theme = "${config.dconf.settings."org/gnome/desktop/interface".icon-theme}";
       tooltip-format = "{title}";
       on-click = "activate";
@@ -235,9 +235,8 @@
       border-top-right-radius: 0px; */
       background-color: @base00;
       border-radius: 24px;
-      border: 3px solid @base0D;
+      /* border: 3px solid @base0D; */
       color: @base05;
-      padding: 0 3px;
     }
     tooltip {
       background: @base01;
@@ -267,31 +266,66 @@
     #language,
     #power-profiles-daemon,
     #privacy-item,
-    #taskbar button,
     #taskbar,
     #wireplumber,
-    #workspaces button {
-      padding: 0 6px;
-    }
-    #backlight,
-    #custom-notification,
+    #workspaces button,
+    #clock,
+    #language,
+    #taskbar,
+    #tray,
+    #privacy,
     #idle_inhibitor,
-    #tray button {
-      padding: 0 6px 0 0;
-      margin: 0 6px 0 0;
-    }
-    #power-profiles-daemon {
+    #custom-notification,
+    #workspaces {
+      border-radius: 24px;
+      background-color: @base01;
+      margin: 3px 3px 3px 0;
       padding: 0 6px;
-      margin: 0 6px;
+    }
+    #taskbar,
+    #workspaces {
+      padding: 0;
+    }
+    #privacy {
+      padding: 0 2px;
+    }
+    #language,
+    #clock,
+    #wireplumber {
+      margin: 3px;
+    }
+    #tray button,
+    #workspaces button {
+      padding: 0 4px;
+      margin: 3px;
+    }
+    #tray button {
+      padding: 0 6px;
+      margin: 3px;
+    }
+    #taskbar button {
+      padding: 0;
+      margin: 3px;
+    }
+    #wireplumber,
+    #idle_inhibitor,
+    #custom-notification {
+      padding: 0 14px 0 10px;
+    }
+    #backlight {
+      padding: 0 8px;
     }
     #workspaces button.active {
-      color: @base0D;
+      color: @base00;
+      background-color: @base0D;
     }
     #taskbar button:hover {
-      box-shadow: transparent;
+      background-color: @base0D;
     }
     #taskbar.empty,
     window#empty {
+      padding: 0;
+      margin: 0;
       background-color: transparent;
     }
     #battery.critical:not(.charging) {