diff --git a/modules/both/i3/default.nix b/modules/both/i3/default.nix
index d4db486..fd50631 100644
--- a/modules/both/i3/default.nix
+++ b/modules/both/i3/default.nix
@@ -205,8 +205,9 @@
         bars = [
           {
             fonts = {
-              names = ["Fira Code"];
-              size = 8.0;
+              names = ["FiraCode Nerd Font"];
+              style = "Mono";
+              size = 10.0;
             };
             position = "bottom";
             statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ~/.config/i3status-rust/config-default.toml";
diff --git a/modules/both/i3/i3status-rust.nix b/modules/both/i3/i3status-rust.nix
index 49e1bdb..104b50d 100644
--- a/modules/both/i3/i3status-rust.nix
+++ b/modules/both/i3/i3status-rust.nix
@@ -17,12 +17,12 @@
           blocks = [
             {
               block = "music";
-              format = " $icon {$combo.str(max_w:25,rot_interval:0.5) $play $next $prev $player.str(max_w:5,rot_interval:0.5) [$cur/$avail] |} ";
+              format = "{$icon $combo.str(max_w:25,rot_interval:0.5) $play $prev $next $player.str(max_w:5,rot_interval:0.5) [$cur/$avail] |}";
             }
             {
               block = "memory";
-              format = " $icon $mem_used_percents ";
-              format_alt = " $icon $swap_used_percents (swap)";
+              format = "$icon $mem_used_percents";
+              format_alt = "$icon $swap_used_percents (swap)";
             }
             {
               block = "cpu";
@@ -30,7 +30,7 @@
             }
             {
               block = "load";
-              format = " $icon $1m ";
+              format = "$icon $1m";
               interval = 1;
             }
             (
@@ -49,7 +49,7 @@
             {
               block = "net";
               format = "$icon {$signal_strength $ssid.str(max_w:5,rot_interval:0.5)|}";
-              format_alt = " $icon {$signal_strength $ssid.str(max_w:5,rot_interval:0.5) $frequency|} $ip | $ipv6 via $device";
+              format_alt = "$icon {$signal_strength $ssid.str(max_w:5,rot_interval:0.5) $frequency|} ipv4-$ip ipv6-$ipv6 via $device";
             }
             {
               block = "sound";
@@ -64,7 +64,7 @@
             }
             {
               block = "time";
-              format = " $timestamp.datetime(f:'%F %R') ";
+              format = "$timestamp.datetime(f:'%F %R')";
               interval = 60;
             }
           ];
diff --git a/modules/home-manager/kitty.nix b/modules/home-manager/kitty.nix
index adba147..e23b673 100644
--- a/modules/home-manager/kitty.nix
+++ b/modules/home-manager/kitty.nix
@@ -8,7 +8,7 @@
     enable = true;
     font = {
       package = pkgs.fira-code-nerdfont;
-      name = "Fira Code";
+      name = "FiraCode Nerd Font";
     };
     theme = "Gruvbox Dark";
     settings={