diff --git a/home-manager/modules/polybar/default.nix b/home-manager/modules/polybar/default.nix
index bfa8906..7659af9 100644
--- a/home-manager/modules/polybar/default.nix
+++ b/home-manager/modules/polybar/default.nix
@@ -46,8 +46,8 @@ with lib; let
   headset-battery = pkgs.writeShellScript "headset-battery" ''
     battery_level=$(${pkgs.headsetcontrol}/bin/headsetcontrol -c -b)
 
-    battery_icons=(         )
-    battery_charging=""
+    battery_icons=(󰁺 󰁻 󰁼 󰁽 󰁾 󰁿 󰂀 󰂁 󰂂 󰁹 )
+    battery_charging="󰂄"
 
     if [ "''${battery_level}" -eq -1 ]; then
       printf "%s " "''${battery_charging}"
@@ -115,9 +115,9 @@ in
           line.size = 2;
 
           font = [
-            "Monofur Nerd Font:style=Bold:size=16;2"
-            "Monofur Nerd Font:size=18;3"
-            "Monofur Nerd Font:size=20;4"
+            "Iosevka Nerd Font:style=Bold:size=16;2"
+            "Iosevka Nerd Font:size=18;3"
+            "Iosevka Nerd Font:size=20;4"
           ];
 
           modules = {
@@ -171,21 +171,21 @@ in
 
           format = "<label-state> <label-mode>";
 
-          label.mode.text = "%mode%";
+          label.mode.text = "󰁌 %mode%"; # Icon: arrow_expand_all
           label.mode.padding = 1;
 
-          label.focused.text = "%index%";
+          label.focused.text = " %index%"; # Icon: fa-circle
           label.focused.padding = 1;
           label.focused.background = "#333333";
           label.focused.underline = "#ffffff";
 
-          label.unfocused.text = "%index%";
+          label.unfocused.text = " %index%"; # Icon: fa-circle_o
           label.unfocused.padding = 1;
 
-          label.visible.text = "%index%";
+          label.visible.text = " %index%"; # Icon: fa-dot_circle_o
           label.visible.padding = 1;
 
-          label.urgent.text = "%index%";
+          label.urgent.text = " %index%"; # Icon: fa-exclamation_circle
           label.urgent.background = "${colors.urgent}";
           label.urgent.padding = 1;
         };
@@ -233,7 +233,7 @@ in
           interval = 1;
 
           format.text = "<label>";
-          format.prefix = " ";
+          format.prefix = "󰍛 "; # Icon: memory
           format.padding = 2;
 
           label.text = "%mb_used% (%percentage_used%%)";
@@ -244,7 +244,7 @@ in
           interval = 1;
 
           format.text = "<label>";
-          format.prefix = "﬙";
+          format.prefix = "󰻠 "; # Icon: cpu_64_bit
           format.padding = 2;
 
           label = "%percentage:3%%";
@@ -260,7 +260,7 @@ in
           format.volume.padding = 2;
 
           format.muted.text = "<label-muted>";
-          format.muted.prefix = "婢";
+          format.muted.prefix = "󰖁"; # Icon: volume_off
           format.muted.background = "${colors.urgent}";
           format.muted.padding = 2;
 
@@ -268,7 +268,7 @@ in
 
           label.muted.text = " Muted";
 
-          ramp.volume = [ "奄" "奔" "墳" ];
+          ramp.volume = [ "󰕿" "󰖀" "󰕾" ]; # Icons: volume_low volume_medium volume_high
 
           click.right = "${pkgs.pavucontrol}/bin/pavucontrol";
         };
@@ -292,8 +292,8 @@ in
 
           format.packetloss.text = "<animation-packetloss> <label-connected>";
 
-          label.connected.text = " %local_ip%  %upspeed:9%  %downspeed:9%";
-          label.disconnected.text = "%{A1:networkmanager_dmenu &:} Offline%{A}";
+          label.connected.text = "󰈀 %local_ip%  %upspeed:9%  %downspeed:9%"; # Icon: ethernet
+          label.disconnected.text = "󰲜 %{A1:networkmanager_dmenu &:} Offline%{A}"; # Icon: network_off_outline
 
           animation.packetloss.text = [
             {
diff --git a/home-manager/modules/waybar/default.nix b/home-manager/modules/waybar/default.nix
index fa6fe7f..a4e03ee 100644
--- a/home-manager/modules/waybar/default.nix
+++ b/home-manager/modules/waybar/default.nix
@@ -133,9 +133,9 @@ in
             format = "{icon} {name}";
             sort-by-number = true;
             format-icons = {
-              "urgent" = "";
-              "focused" = "";
-              "default" = "";
+              "urgent" = ""; # Icon: fa-exclamation_circle
+              "focused" = ""; # Icon: fa-dot_circle_o
+              "default" = ""; # Icon: fa-circle
             };
           };