diff --git a/modules/lang/clojure/config.el b/modules/lang/clojure/config.el
index a552ba2f2..832fa659e 100644
--- a/modules/lang/clojure/config.el
+++ b/modules/lang/clojure/config.el
@@ -136,7 +136,7 @@
       "Update repl icon on modeline with cider information."
       (setq cider-modeline-icon (concat
                                  " "
-                                 (+modeline-format-icon 'faicon "terminal" "" face label -0.0575)
+                                 (+modeline-format-icon 'faicon "nf-fa-terminal" "" face label -0.0575)
                                  " "))
       (add-to-list 'global-mode-string
                    '(t (:eval cider-modeline-icon))
diff --git a/modules/tools/lsp/+lsp.el b/modules/tools/lsp/+lsp.el
index cfc8a15df..5ae4a417d 100644
--- a/modules/tools/lsp/+lsp.el
+++ b/modules/tools/lsp/+lsp.el
@@ -134,7 +134,7 @@ server getting expensively restarted when reverting buffers."
                (label (if workspaces "LSP Connected" "LSP Disconnected")))
           (setq lsp-modeline-icon (concat
                                    " "
-                                   (+modeline-format-icon 'faicon "rocket" "" face label -0.0575)
+                                   (+modeline-format-icon 'faicon "nf-fa-rocket" "" face label -0.0575)
                                    " "))
           (add-to-list 'global-mode-string
                        '(t (:eval lsp-modeline-icon))
diff --git a/modules/ui/modeline/+light.el b/modules/ui/modeline/+light.el
index 3d2a1673f..8f96d9bf0 100644
--- a/modules/ui/modeline/+light.el
+++ b/modules/ui/modeline/+light.el
@@ -115,6 +115,7 @@ Using optionals attributes FACE, HELP-ECHO and VOFFSET."
   (let ((icon-set-fn (pcase icon-set
                        ('octicon #'nerd-icons-octicon)
                        ('faicon #'nerd-icons-faicon)
+                       ('codicon #'nerd-icons-codicon)
                        ('material #'nerd-icons-mdicon))))
     (propertize (concat (funcall icon-set-fn
                                  icon
@@ -416,7 +417,7 @@ Requires `anzu', also `evil-anzu' if using `evil-mode' for compatibility with
                    (let ((error (or .error 0))
                          (warning (or .warning 0))
                          (info (or .info 0)))
-                     (+modeline-format-icon 'material "do_not_disturb_alt"
+                     (+modeline-format-icon 'codicon "nf-cod-error"
                                             (number-to-string (+ error warning info))
                                             (cond ((> error 0)   'error)
                                                   ((> warning 0) 'warning)
@@ -425,11 +426,11 @@ Requires `anzu', also `evil-anzu' if using `evil-mode' for compatibility with
                                                     error
                                                     warning
                                                     info))))
-               (+modeline-format-icon 'material "check" "" 'success)))
-            (`running     (+modeline-format-icon 'material "access_time" "*" 'mode-line-inactive "Running..."))
-            (`errored     (+modeline-format-icon 'material "sim_card_alert" "!" 'error "Errored!"))
-            (`interrupted (+modeline-format-icon 'material "pause" "!" 'mode-line-inactive "Interrupted"))
-            (`suspicious  (+modeline-format-icon 'material "priority_high" "!" 'error "Suspicious"))))))
+               (+modeline-format-icon 'material "nf-md-check" "" 'success)))
+            (`running     (+modeline-format-icon 'faicon "nf-fa-hourglass" "*" 'mode-line-inactive "Running..."))
+            (`errored     (+modeline-format-icon 'material "nf-md-sim_alert" "!" 'error "Errored!"))
+            (`interrupted (+modeline-format-icon 'material "nf-md-pause" "!" 'mode-line-inactive "Interrupted"))
+            (`suspicious  (+modeline-format-icon 'material "nf-md-priority_high" "!" 'error "Suspicious"))))))