diff --git a/.gitmodules b/.gitmodules
index 0c7293a..afbffee 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -119,9 +119,6 @@
 [submodule "inheritenv"]
 	path = lib/inheritenv
 	url = https://github.com/purcell/inheritenv
-[submodule "kind-icon"]
-	path = lib/kind-icon
-	url = https://github.com/jdtsmith/kind-icon
 [submodule "llama"]
 	path = lib/llama
 	url = https://git.sr.ht/~tarsius/llama
diff --git a/init.el b/init.el
index ec67237..1d3062c 100644
--- a/init.el
+++ b/init.el
@@ -331,18 +331,9 @@
   (add-to-list 'completion-at-point-functions #'cape-elisp-block)
   (advice-add 'eglot-completion-at-point :around #'cape-wrap-buster))
 
-(use-package kind-icon
+(use-package nerd-icons-corfu
   :after corfu
-  :custom
-  (kind-icon-default-face 'corfu-default)
-  :config
-  (add-to-list 'corfu-margin-formatters #'kind-icon-margin-formatter)
-  (when (eq system-type 'windows-nt)
-    (plist-put kind-icon-default-style :height 0.8))
-  (when (eq system-type 'gnu/linux)
-    (plist-put kind-icon-default-style :height 0.7))
-  (when (fboundp 'reapply-themes)
-    (advice-add 'reapply-themes :after 'kind-icon-reset-cache)))
+  :init (add-to-list 'corfu-margin-formatters #'nerd-icons-corfu-formatter))
 
 (use-package yasnippet
   :diminish yas-minor-mode
diff --git a/lib/kind-icon b/lib/kind-icon
deleted file mode 160000
index b206898..0000000
--- a/lib/kind-icon
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b206898fb004bb0f3e0e3bbb9bd630342770db7d