diff --git a/system/home/waybar.nix b/system/home/waybar.nix
index 2d61ed6d..2f206852 100644
--- a/system/home/waybar.nix
+++ b/system/home/waybar.nix
@@ -234,7 +234,7 @@
         hide-on-ok = true;
         format = "󰀦";
         tooltip = true;
-        tooltip-format = "System failed:{nr_failed_system} User failed:{nr_failed_user}";
+        tooltip-format = "System failed:{nr_failed_system}\nUser failed:{nr_failed_user}";
         system = true;
         user = true;
       };
@@ -365,7 +365,7 @@
         }
         #clock.calendar {
             color: ${scheme.base0C};
-            padding: 2px 4px 2px 2px;
+            padding: 2px 3px 2px 3px;
         }
         #clock {
             color: ${scheme.base0D};
@@ -373,7 +373,10 @@
         }
 
         #backlight {
-            padding: 2px 6px 2px 0px;
+            padding: 2px 3px 2px 3px;
+        }
+        #battery {
+            padding: 2px 2px 2px 4px;
         }
         #battery.warning {
             color: ${scheme.base09};
@@ -387,7 +390,7 @@
         }
 
         #systemd-failed-units {
-            padding: 2px 5px 2px 0px;
+            padding: 2px 4px 2px 1px;
         }
         #systemd-failed-units.ok {
             color: ${scheme.base0B}