diff --git a/modules/desktop/polybar.nix b/modules/desktop/polybar.nix
index a989ac9..1c65abd 100644
--- a/modules/desktop/polybar.nix
+++ b/modules/desktop/polybar.nix
@@ -79,7 +79,7 @@
           "module/cpu" = {
             type = "internal/cpu";
             interval = "2";
-            format-prefix = " ";
+            format-prefix = "󰻠 ";
             format-prefix-foreground = "\${colors.primary}";
             label = "%percentage:2%%";
           };
@@ -91,10 +91,13 @@
             format-disconnected = "<label-disconnected>";
             label-disconnected = "󰣼";
             label-disconnected-foreground = "#d65d0e";
-            ramp.signal = [ "󰣾" "󰣴" "󰣶" "󰣸" "󰣺" ];
-            ramp-signal-foreground = "#d65d0e";
-            ramp-signal-foreground-0 = "#cc241d";
-            ramp-signal-foreground-4 = "#bdae93";
+            ramp.signal = [
+              "%{F#cc241d}󰣾"
+              "%{F#d65d0e}󰣴"
+              "%{F#d65d0e}󰣶"
+              "%{F#d65d0e}󰣸"
+              "%{F#bdae93}󰣺"
+            ];
           };
 
           "module/wlan" = {
@@ -111,22 +114,24 @@
             time-format = "%H%{F#7c6f64}:%{F#d5c4a1}%M";
             label-charging = "%{F#98971a}󰚥 %{F#ebdbb2}%percentage%%%{F#d5c4a1} %time%";
             format-charging = "<ramp-capacity> <label-charging>";
-            label-discharging = "%percentage%%%{F#bdae93} %time%";
+            label-discharging = "%{F#ebdbb2}%percentage%%%{F#bdae93} %time%";
             format-discharging = "<ramp-capacity> <label-discharging>";
             label-full = "%{F#d65d0e}󰁹%{F#ebdbb2} %percentage%%";
             format-full = "<label-full>";
             label-low = "%{F#d65d0e}󰂎%{F#ebdbb2} %percentage%%";
             format-low = "<label-low>";
-            ramp.capacity = [ "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ];
-            ramp-capacity-foreground = "#d65d0e";
-
-            ramp-capacity-foreground-0 = "#cc241d";
-            ramp-capacity-foreground-1 = "#cc241d";
-            ramp-capacity-foreground-2 = "#cc241d";
-
-            ramp-capacity-foreground-7 = "#bdae93";
-            ramp-capacity-foreground-8 = "#bdae93";
-            ramp-capacity-foreground-9 = "#bdae93";
+            ramp.capacity = [
+              "%{F#cc241d}󰁺"
+              "%{F#cc241d}󰁻"
+              "%{F#d65d0e}󰁼"
+              "%{F#d65d0e}󰁽"
+              "%{F#d65d0e}󰁾"
+              "%{F#d65d0e}󰁿"
+              "%{F#d65d0e}󰂀"
+              "%{F#d65d0e}󰂁"
+              "%{F#bdae93}󰂂"
+              "%{F#bdae93}󰁹"
+            ];
           };
 
           "module/date" = {