diff --git a/config/doom/config.el b/config/doom/config.el
index 2cd3ace..c698dac 100644
--- a/config/doom/config.el
+++ b/config/doom/config.el
@@ -14,7 +14,7 @@
 (setq display-line-numbers-type t)
 
 ;; Fonts
-(setq doom-font (font-spec :family "Iosevka Nerd Font" :size 15))
+(setq doom-font (font-spec :family "Iosevka" :size 15))
 (setq doom-unicode-font (font-spec :family "Iosevka Nerd Font" :size 15))
 
 ;; Themeing
diff --git a/config/polybar/bars/bars.ini b/config/polybar/bars/bars.ini
index bbe4ef9..6ba179d 100644
--- a/config/polybar/bars/bars.ini
+++ b/config/polybar/bars/bars.ini
@@ -8,17 +8,17 @@ height   = 32
 offset-x = 0
 offset-y = 0
 
-font-0 = "Iosevka:size=10;2"
-font-1 = "Iosevka:size=16;2"
-font-2 = "Iosevka:size=22;4"
+font-0 = "Iosevka Nerd Font:size=10;2"
+font-1 = "Iosevka Nerd Font:size=16;2"
+font-2 = "Iosevka Nerd Font:size=20;4"
 
 background = ${colours/bar.bg}
 foreground = ${colours/bar.fg}
 
 border-bottom-size  = 5
 border-top-size     = 5
-border-left-size  = 10
-border-right-size = 10
+border-left-size    = 10
+border-right-size   = 10
 
 border-bottom-color = ${colours/bar.bg}
 border-top-color    = ${colours/bar.bg}
diff --git a/config/polybar/bars/modules/volume.ini b/config/polybar/bars/modules/volume.ini
index 847ffbf..98cadef 100644
--- a/config/polybar/bars/modules/volume.ini
+++ b/config/polybar/bars/modules/volume.ini
@@ -3,13 +3,13 @@ type = internal/pulseaudio
 interval = 5
 
 format-volume = <label-volume>
-label-volume = %{T2}󰕾%{T-} %percentage%%
+label-volume = %{T2}󰕾 %{T-} %percentage%%
 label-volume-padding = 1
 label-volume-foreground = ${colours/volume.volume-fg}
 label-volume-background = ${colours/volume.volume-bg}
 
 format-muted = <label-muted>
-label-muted = %{T2}󰝟%{T-} muted
+label-muted = %{T2}󰝟 %{T-} muted
 label-muted-padding = 1
 label-muted-foreground = ${colours/volume.muted-fg}
 label-muted-background = ${colours/volume.muted-bg}
diff --git a/config/polybar/bars/modules/wireless.ini b/config/polybar/bars/modules/wireless.ini
index 46c8648..3a95eee 100644
--- a/config/polybar/bars/modules/wireless.ini
+++ b/config/polybar/bars/modules/wireless.ini
@@ -11,7 +11,7 @@ accumulate-stats = true
 speed-unit = ''
 
 format-connected = <label-connected>
-label-connected = %{T2}󰖩%{T-} %essid% (%local_ip%)
+label-connected = %{T2}󰖩 %{T-} %essid% (%local_ip%)
 label-connected-background = ${colours/wireless.connected-bg}
 label-connected-foreground = ${colours/wireless.connected-fg}
 label-connected-padding = 1
diff --git a/modules/app/alacritty.nix b/modules/app/alacritty.nix
index b910b12..2ea6aad 100644
--- a/modules/app/alacritty.nix
+++ b/modules/app/alacritty.nix
@@ -9,10 +9,14 @@ in
     enable = lib.mkEnableOption "alacritty";
   };
   config = lib.mkIf cfg.enable {
-    fonts.fontconfig.enable = true;
-
     hm.home.packages = with pkgs; [
       alacritty
+    ];
+
+    fonts.fontconfig.enable = true;
+
+    fonts.fonts = with pkgs; [
+      iosevka
       (nerdfonts.override { fonts = [ "Iosevka" ]; })
     ];
 
diff --git a/modules/desktop/i3.nix b/modules/desktop/i3.nix
index 8be3892..8e776bb 100644
--- a/modules/desktop/i3.nix
+++ b/modules/desktop/i3.nix
@@ -22,10 +22,14 @@ in {
     # - Dependencies -----------------------------
 
     environment.systemPackages = with pkgs; [
-      (nerdfonts.override { fonts = [ "Iosevka" ]; })
       playerctl
     ];
 
+    fonts.fonts = with pkgs; [
+      iosevka
+      (nerdfonts.override { fonts = [ "Iosevka" ]; })
+    ];
+
     services.xserver = {
       enable = true;
 
diff --git a/modules/editors/emacs.nix b/modules/editors/emacs.nix
index 18ad43c..cc852b6 100644
--- a/modules/editors/emacs.nix
+++ b/modules/editors/emacs.nix
@@ -49,7 +49,10 @@ in {
       graphviz
     ];
 
-    fonts.fonts = [ pkgs.emacs-all-the-icons-fonts ];
+    fonts.fonts = with pkgs; [
+      iosevka
+      emacs-all-the-icons-fonts
+    ];
 
     env.PATH = [ "$HOME/.config/emacs/bin" ];
 
diff --git a/modules/shell/zsh.nix b/modules/shell/zsh.nix
index 24ae8da..166d21f 100644
--- a/modules/shell/zsh.nix
+++ b/modules/shell/zsh.nix
@@ -12,6 +12,10 @@ in
     environment.systemPackages = with pkgs; [
       zsh
       zsh-powerlevel10k
+    ];
+
+    fonts.fonts = with pkgs; [
+      iosevka
       (nerdfonts.override { fonts = [ "Iosevka" ]; })
     ];