diff --git a/modules/editor/siren-all-the-icons.el b/modules/editor/siren-all-the-icons.el
index 596e0bc..365ff53 100644
--- a/modules/editor/siren-all-the-icons.el
+++ b/modules/editor/siren-all-the-icons.el
@@ -13,7 +13,10 @@
 
 (use-package all-the-icons
   :after memoize
-  :if window-system)
+  :if window-system
+  :custom
+  (all-the-icons-scale-factor 1.0)
+  (all-the-icons-default-adjust -0.2))
 
 (use-package all-the-icons-ibuffer
   :after all-the-icons
@@ -25,7 +28,10 @@
   :after all-the-icons
   :if window-system
   :hook
-  (dired-mode . all-the-icons-dired-mode))
+  (dired-mode . all-the-icons-dired-mode)
+  :custom
+  (all-the-icons-dired-monochrome nil)
+  (all-the-icons-dired-v-adjust -0.05))
 
 (use-package treemacs-all-the-icons
   :after (all-the-icons treemacs)
diff --git a/modules/editor/siren-doom-modeline.el b/modules/editor/siren-doom-modeline.el
index a013144..9d49cac 100644
--- a/modules/editor/siren-doom-modeline.el
+++ b/modules/editor/siren-doom-modeline.el
@@ -6,24 +6,30 @@
 
 ;;; Code:
 
-(use-package doom-modeline
-  :custom
-  (doom-modeline-bar-width 3)
-  (doom-modeline-buffer-encoding nil)
-  (doom-modeline-buffer-file-name-style 'auto)
-  (doom-modeline-buffer-modification-icon t)
-  (doom-modeline-buffer-state-icon t)
-  (doom-modeline-checker-simple-format t)
-  (doom-modeline-enable-word-count t)
-  (doom-modeline-height 25)
-  (doom-modeline-indent-info nil)
-  (doom-modeline-minor-modes t)
-  (doom-modeline-persp-name nil)
-  (doom-modeline-vcs-max-length 24)
-  (doom-modeline-workspace-name nil)
+(let ((straight-current-profile 'pinned))
+  ;; Pin doom-modeline to before they switched to nerd-icons, and I'm having a
+  ;; number of bugs how nerd icons are rendered.
+  (straight-x-pin-package "doom-modeline"
+                          "918730eff72e155cfb31b012493a7f425bc48ff8")
 
-  :config
-  (doom-modeline-mode))
+  (use-package doom-modeline
+    :custom
+    (doom-modeline-bar-width 3)
+    (doom-modeline-buffer-encoding nil)
+    (doom-modeline-buffer-file-name-style 'auto)
+    (doom-modeline-buffer-modification-icon t)
+    (doom-modeline-buffer-state-icon t)
+    (doom-modeline-checker-simple-format t)
+    (doom-modeline-enable-word-count t)
+    (doom-modeline-height 25)
+    (doom-modeline-indent-info nil)
+    (doom-modeline-minor-modes t)
+    (doom-modeline-persp-name nil)
+    (doom-modeline-vcs-max-length 24)
+    (doom-modeline-workspace-name nil)
+
+    :config
+    (doom-modeline-mode)))
 
 (provide 'siren-doom-modeline)
 ;;; siren-doom-modeline.el ends here
diff --git a/modules/editor/siren-nerd-icons.el b/modules/editor/siren-nerd-icons.el
index 9b56092..a177e1b 100644
--- a/modules/editor/siren-nerd-icons.el
+++ b/modules/editor/siren-nerd-icons.el
@@ -7,16 +7,18 @@
 ;;; Code:
 
 (use-package nerd-icons
-  :if (not window-system)
+  :custom
+  (nerd-icons-scale-factor 1.0)
+  (nerd-icons-default-adjust 0.0)
   :config
-  (if (and window-system
-           (member "Menlo Nerd Font" (font-family-list)))
-      (setq nerd-nerd-icons-font-family "Menlo Nerd Font")))
+  (let ((font "Menlo Nerd Font"))
+    (if (member font (font-family-list))
+        (setq nerd-nerd-icons-font-family font))))
 
 (use-package nerd-icons-completion
-  :straight (nerd-icons-completion :type git :host github
-                                   :repo "rainstormstudio/nerd-icons-completion")
-  :after nerd-icons
+  :straight
+  (nerd-icons-completion :type git :host github
+                         :repo "rainstormstudio/nerd-icons-completion")
   :if (not window-system)
   :demand t
   :hook
@@ -28,24 +30,22 @@
 (use-package nerd-icons-dired
   :straight (nerd-icons-dired :type git :host github
                               :repo "rainstormstudio/nerd-icons-dired")
-  :after nerd-icons
   :if (not window-system)
   :hook
   (dired-mode . nerd-icons-dired-mode))
 
 (use-package nerd-icons-ibuffer
-  :after nerd-icons
   :if (not window-system)
   :hook
   (ibuffer-mode . nerd-icons-ibuffer-mode))
 
 (use-package treemacs-nerd-icons
-  :straight (treemacs-nerd-icons
-             :type git :host github :repo "rainstormstudio/treemacs-nerd-icons")
-  :after (nerd-icons treemacs)
+  :straight (treemacs-nerd-icons :type git :host github
+                                 :repo "rainstormstudio/treemacs-nerd-icons")
   :if (not window-system)
   :config
-  (treemacs-load-theme "nerd-icons"))
+  (with-eval-after-load 'treemacs
+    (treemacs-load-theme "nerd-icons")))
 
 (provide 'siren-nerd-icons)
 ;;; siren-nerd-icons.el ends here
diff --git a/modules/themes/siren-doom-themes.el b/modules/themes/siren-doom-themes.el
index 3e505ef..8aabea0 100644
--- a/modules/themes/siren-doom-themes.el
+++ b/modules/themes/siren-doom-themes.el
@@ -7,9 +7,10 @@
 ;;; Code:
 
 (require 'siren-all-the-icons)
-(require 'siren-doom-modeline)
 (require 'siren-nerd-icons)
 
+(require 'siren-doom-modeline)
+
 (use-package doom-themes
   :custom
   ;; Global doom-themes options
diff --git a/straight/versions/default.el b/straight/versions/default.el
index f818a21..8c1e127 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -1,8 +1,9 @@
 (("a.el" . "93e5ed8c495794d1ba3c04b43041b95ce01079b1")
  ("ace-window" . "77115afc1b0b9f633084cf7479c767988106c196")
  ("all-the-icons-completion" . "e09e65bf05b247ea0e2bdc5d36ea5a58fc2ed69b")
- ("all-the-icons-ibuffer" . "12cf4c0852dd299974508451b99fdb0660629cb6")
- ("all-the-icons.el" . "d922aff57ac8308d3ed067f9151cc76d342855f2")
+ ("all-the-icons-dired" . "4564bec6bd3fd02dd870e6d2cfed37fe38bbc93a")
+ ("all-the-icons-ibuffer" . "400860b2990529bd3a915e4d0a55fbc6d128a3ba")
+ ("all-the-icons.el" . "f75c1130b72c718bfaf18b56c445c4b58efc714f")
  ("anzu" . "5abb37455ea44fa401d5f4c1bdc58adb2448db67")
  ("applescript-mode" . "3022d8103d8f8e47239503969348407c00ef1d0b")
  ("avy" . "d9634efe2631b608cb28c420f54d6e6689805cf7")
@@ -43,7 +44,6 @@
  ("dired-plus" . "90fc0d5a110063278e3fe320dd903ec07be5dba7")
  ("dirvish" . "4b63cd2e5ba994f8e674388db7035de1a8f0343f")
  ("docker.el" . "4a308e6b2184a1b7745df5a8b8adafb29b3f7157")
- ("doom-modeline" . "a86ec8effe242cab8aba09ec0a2c7fed555c1fce")
  ("dumb-jump" . "0a783d1db610ff1dc4e1b7869589cff16ff92f7a")
  ("edit-indirect" . "f80f63822ffae78de38dbe72cacaeb1aaa96c732")
  ("editorconfig-emacs" . "ad021949d9a45cd1f00f6c096f41ba15b911b402")
@@ -155,6 +155,10 @@
  ("move-dup" . "5906503e0b9b832b1d5062c9cd27cf72a2ce4817")
  ("multiple-cursors.el" . "6956e8e12ee191d7c80d042ae8ff495286fcbe38")
  ("mwim.el" . "b4f3edb4c0fb8f8b71cecbf8095c2c25a8ffbf85")
+ ("nerd-icons-completion" . "d88fec04a9169a746a306ecd24f0877d1a95080d")
+ ("nerd-icons-dired" . "5abd8f6d9f395f91d3e67afadbea6c638dee7e6e")
+ ("nerd-icons-ibuffer" . "18c00c03a0d7193bab5e3374ec02c5428db057fd")
+ ("nerd-icons.el" . "6fdb423eabb1c14161cb59af8fd74ee8b572e303")
  ("nginx-mode" . "6e9d96f58eddd69f62f7fd443d9b9753e16e0e96")
  ("nix-mode" . "8a5c9d3437a7b21e3a10df635c8ec283eda1ad08")
  ("nongnu-elpa" . "0120f3dfe80cffe0c3016080d9205d12be3b741d")
@@ -222,6 +226,7 @@
  ("transient" . "0ae0de43590b5b6984a83f9e044e7c426455ac6e")
  ("tree-sitter-langs" . "ffe9ab0c8ec9e37e70e31d296df3b85bcfc73c5e")
  ("treemacs" . "127485317a19254ca20ba1910d10edf7dbaa2d97")
+ ("treemacs-nerd-icons" . "c6f4a74ea4f414528fc43a6fe95f7f17687faeb4")
  ("treepy.el" . "7c4a0d21322506a4d4b2301b4274ec955b429b47")
  ("use-package" . "77945e002f11440eae72d8730d3de218163d551e")
  ("uuidgen-el" . "7b728c1d92e196c3acf87a004949335cfc18eab3")
diff --git a/straight/versions/pinned.el b/straight/versions/pinned.el
index dbe70f9..d041b14 100644
--- a/straight/versions/pinned.el
+++ b/straight/versions/pinned.el
@@ -1,2 +1,2 @@
-()
+(("doom-modeline" . "918730eff72e155cfb31b012493a7f425bc48ff8"))
 :gamma