diff --git a/modules/home-manager/sway.nix b/modules/home-manager/sway.nix
index 7e6518c..de2216e 100644
--- a/modules/home-manager/sway.nix
+++ b/modules/home-manager/sway.nix
@@ -173,6 +173,7 @@
         padding: 0;
         margin: 0;
         font-size: 11px;
+        text-align: center;
       }
 
       window#waybar {
@@ -181,7 +182,9 @@
       }
 
       #workspaces button {
-        margin-right: 10px;
+        margin-right: 2px;
+        padding-left: 2px;
+        padding-right: 2px;
         color: #ffffff;
       }
       #workspaces button:hover, #workspaces button:active {
@@ -190,20 +193,38 @@
       }
       #workspaces button.focused {
         background-color: #383737;
+        color: #00ffee;
+      }
+
+      #mpd {
+        margin-right: 2px;
+      }
+
+      #tray {
+        margin-right: 2px;
       }
 
       #language {
-        margin-right: 7px;
+        margin-right: 2px;
+      }
+
+      #clock {
+        margin-right: 2px;
+      }
+
+      #backlight {
+        padding-right: 7px;
+        margin-right: 2px;
       }
 
       #battery {
-        margin-left: 7px;
-        margin-right: 3px;
+        padding-right: 7px;
+        margin-right: 2px;
       }
 
       #network {
-        margin-left: 7px;
-        margin-right: 7px;
+        padding-right: 7px;
+        margin-right: 2px;
       }
     '';
   };