diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index 9d2850f7..89987725 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -29,8 +29,6 @@ in {
       emacsPackages.mu4e
       emacsPackages.vterm
       emacsPackages.pdf-tools
-      emacsPackages.all-the-icons
-      emacsPackages.nerd-icons
 
       # Emacs dependencies
       coreutils
diff --git a/home/emacs/doom/config.el b/home/emacs/doom/config.el
index 13b0d07c..5011b8aa 100644
--- a/home/emacs/doom/config.el
+++ b/home/emacs/doom/config.el
@@ -14,6 +14,15 @@
       user-mail-address "e.litherlandsmith@proton.me"
       doom-font (font-spec :family "FiraCode Nerd Font" :size 16 :weight 'regular)
       doom-theme 'catppuccin
+      doom-emoji-fallback-font-families '("Noto Color Emoji")
+      doom-symbol-fallback-font-families '("FiraCode Nerd Font"
+                                           "FontAwesome"
+                                           "Weather Icons"
+                                           "Material Icons"
+                                           "Material Design Icons"
+                                           "Material Symbols Rounded"
+                                           "Material Symbols Sharp"
+                                           "Material Symbols Outlined")
       catppuccin-flavor 'macchiato
       display-line-numbers-type 'relative
       org-directory "~/Notes/"
diff --git a/home/emacs/doom/packages.el b/home/emacs/doom/packages.el
index 70d83a3c..68d985d7 100644
--- a/home/emacs/doom/packages.el
+++ b/home/emacs/doom/packages.el
@@ -2,8 +2,6 @@
 ;;; $DOOMDIR/packages.el
 
 (package! pdf-tools :built-in 'prefer)
-(package! all-the-icons :built-in 'prefer)
-(package! nerd-icons :built-in 'prefer)
 (package! catppuccin-theme)
 (package! pocket-reader)
 (package! magit-delta)
diff --git a/system/desktop.nix b/system/desktop.nix
index b46a51d4..2aa35731 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -66,18 +66,25 @@
       noto-fonts-emoji
       font-awesome
       material-symbols
-      emacs-all-the-icons-fonts
       material-design-icons
       weather-icons
       vscode-extensions.file-icons.file-icons
+      emacs-all-the-icons-fonts
     ];
     fontconfig = {
       enable = true;
-      defaultFonts = {
-        serif = [ "Fira Sans" "DejaVu Sans" ];
-        sansSerif = [ "Fira Sans" "DejaVu Sans" ];
-        monospace = [ "Fira Mono" "DejaVu Sans Mono" ];
-        emoji = [ "Noto Color Emoji" ];
+      defaultFonts = let
+        icons = [
+          "FontAwesome"
+          "Material Icons"
+          "Material Design Icons"
+          "Weather Icons"
+        ];
+      in rec {
+        sansSerif = [ "Fira Sans" "DejaVu Sans" ] ++ icons;
+        serif = sansSerif;
+        monospace = [ "Fira Mono" "DejaVu Sans Mono" ] ++ icons;
+        emoji = [ "Noto Color Emoji" ] ++ icons;
       };
     };
   };