diff --git a/hosts/mac-nixos/hyprland-settings.nix b/hosts/mac-nixos/hyprland-settings.nix
index 1568358..896689c 100644
--- a/hosts/mac-nixos/hyprland-settings.nix
+++ b/hosts/mac-nixos/hyprland-settings.nix
@@ -61,7 +61,7 @@ in
 
     moduleStyle = {
       window = {
-        margin-right = "100rem";
+        margin-right = "75rem";
       };
       temperature = {
         location = "${theme.waybar.borderLeft}";
diff --git a/modules/desktop-environments/hyprland/config/waybar/default.nix b/modules/desktop-environments/hyprland/config/waybar/default.nix
index 981008f..736eceb 100755
--- a/modules/desktop-environments/hyprland/config/waybar/default.nix
+++ b/modules/desktop-environments/hyprland/config/waybar/default.nix
@@ -200,14 +200,42 @@ in
         };
 
         battery = {
-          # bat = "macsmc-ac";
+          # bat = "macsmc-battery";
           interval = 60;
+          # statuses: 'Charging', 'Discharging'
           states = {
               warning = 30;
               critical = 15;
           };
           format = "{capacity}% {icon}";
-          format-icons = ["" "" "" "" ""];
+          format-icons = {
+            default = [
+              "󰂃" # critical
+              "󰁺" # 10%
+              "󰁻" # 20%
+              "󰁼" # 30%
+              "󰁽" # 40%
+              "󰁾" # 50%
+              "󰁿" # 60%
+              "󰂀" # 70%
+              "󰂁" # 80%
+              "󰂂" # 90%
+              "󰁹" # 100%
+            ];
+            charging = [
+              "󰢟" # critical
+              "󰢜" # 10%
+              "󰂆" # 20%
+              "󰂇" # 30%
+              "󰂈" # 40%
+              "󰢝" # 50%
+              "󰂉" # 60%
+              "󰢞" # 70%
+              "󰂊" # 80%
+              "󰂋" # 90%
+              "󰂅" # 100%
+            ];
+          };
           max-length = 25;
         };
 
@@ -306,6 +334,7 @@ in
         ${defaultOpacity}
         ${defaultCenterOptions}
         border-radius: 0;
+        min-width: 3rem;
       }
 
       #clock {