diff --git a/home/waybar/default.nix b/home/waybar/default.nix
index 91829eea..1b5449ce 100644
--- a/home/waybar/default.nix
+++ b/home/waybar/default.nix
@@ -94,18 +94,18 @@
       };
       pulseaudio = {
         scroll-step = 5;
-        format = "{format_source} {icon} {volume}%";
+        format = "{format_source}{icon}{volume}%";
         format-muted = "{format_source} 󰝟 ";
-        format-source = "󰍬";
-        format-source-muted = "󰍭";
+        format-source = "󰍬 ";
+        format-source-muted = "󰍭 ";
         format-icons = {
-          car = "󰄍";
-          default = ["󰕿" "󰖀" "󰕾"];
-          hands-free = "󰥰";
-          headset = "󰋎";
-          phone = "󰏲";
-          portable = "󰏳";
-          headphone = "󰋋";
+          car = "󰄍 ";
+          default = ["󰕿 " "󰖀 " "󰕾 "];
+          hands-free = "󰥰 ";
+          headset = "󰋎 ";
+          phone = "󰏲 ";
+          portable = "󰏳 ";
+          headphone = "󰋋 ";
         };
         on-click = "${pkgs.pavucontrol}/bin/pavucontrol";
         on-click-right = "${pkgs.pamixer}/bin/pamixer -t";
@@ -135,11 +135,11 @@
         format-disconnected = "󰈂 ";
       };
       bluetooth = {
-        format = "󰂯 ";
-        format-disabled = "󰂲 ";
-        format-off = "󰂲 ";
-        format-on = "󰂯 ";
-        format-connected = "󰂱 ";
+        format = "󰂯";
+        format-disabled = "󰂲";
+        format-off = "󰂲";
+        format-on = "󰂯";
+        format-connected = "󰂱";
         tooltip-format = "{status} | {device_alias}";
         on-click = "${pkgs.bluez}/bin/bluetoothctl power on";
         on-click-right = "${pkgs.bluez}/bin/bluetoothctl power off";