diff --git a/plugins/bufferlines/barbar.nix b/plugins/bufferlines/barbar.nix
index 2b1475b2..0d85cc3e 100644
--- a/plugins/bufferlines/barbar.nix
+++ b/plugins/bufferlines/barbar.nix
@@ -195,10 +195,10 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
     );
 
   extraOptions = {
-    iconsPackage = lib.nixvim.mkPackageOption {
-      name = "nvim-web-devicons";
-      default = pkgs.vimPlugins.nvim-web-devicons;
-    };
+    iconsPackage = lib.mkPackageOption pkgs [
+      "vimPlugins"
+      "nvim-web-devicons"
+    ] { nullable = true; };
 
     keymaps = mapAttrs (
       optionName: funcName:
diff --git a/plugins/bufferlines/bufferline.nix b/plugins/bufferlines/bufferline.nix
index b3ba88c4..f66d5365 100644
--- a/plugins/bufferlines/bufferline.nix
+++ b/plugins/bufferlines/bufferline.nix
@@ -654,10 +654,10 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
   };
 
   extraOptions = {
-    iconsPackage = lib.nixvim.mkPackageOption {
-      name = "nvim-web-devicons";
-      default = pkgs.vimPlugins.nvim-web-devicons;
-    };
+    iconsPackage = lib.mkPackageOption pkgs [
+      "vimPlugins"
+      "nvim-web-devicons"
+    ] { nullable = true; };
   };
 
   extraConfig = cfg: {
diff --git a/plugins/filetrees/chadtree.nix b/plugins/filetrees/chadtree.nix
index 7039adb7..21dcebf8 100644
--- a/plugins/filetrees/chadtree.nix
+++ b/plugins/filetrees/chadtree.nix
@@ -16,10 +16,10 @@ in
 
     package = helpers.mkPluginPackageOption "chadtree" pkgs.vimPlugins.chadtree;
 
-    iconsPackage = helpers.mkPackageOption {
-      name = "nvim-web-devicons";
-      default = pkgs.vimPlugins.nvim-web-devicons;
-    };
+    iconsPackage = lib.mkPackageOption pkgs [
+      "vimPlugins"
+      "nvim-web-devicons"
+    ] { nullable = true; };
 
     options = {
       follow = helpers.defaultNullOpts.mkBool true ''
diff --git a/plugins/filetrees/neo-tree.nix b/plugins/filetrees/neo-tree.nix
index f9c6f296..5a410c59 100644
--- a/plugins/filetrees/neo-tree.nix
+++ b/plugins/filetrees/neo-tree.nix
@@ -57,10 +57,10 @@ in
 
       package = helpers.mkPluginPackageOption "neo-tree" pkgs.vimPlugins.neo-tree-nvim;
 
-      iconsPackage = helpers.mkPackageOption {
-        name = "nvim-web-devicons";
-        default = pkgs.vimPlugins.nvim-web-devicons;
-      };
+      iconsPackage = lib.mkPackageOption pkgs [
+        "vimPlugins"
+        "nvim-web-devicons"
+      ] { nullable = true; };
 
       gitPackage = helpers.mkPackageOption {
         name = "git";
diff --git a/plugins/filetrees/nvim-tree.nix b/plugins/filetrees/nvim-tree.nix
index 59ee4269..32272616 100644
--- a/plugins/filetrees/nvim-tree.nix
+++ b/plugins/filetrees/nvim-tree.nix
@@ -41,10 +41,10 @@ in
 
     package = helpers.mkPluginPackageOption "nvim-tree" pkgs.vimPlugins.nvim-tree-lua;
 
-    iconsPackage = helpers.mkPackageOption {
-      name = "nvim-web-devicons";
-      default = pkgs.vimPlugins.nvim-web-devicons;
-    };
+    iconsPackage = lib.mkPackageOption pkgs [
+      "vimPlugins"
+      "nvim-web-devicons"
+    ] { nullable = true; };
 
     gitPackage = helpers.mkPackageOption {
       name = "git";
diff --git a/plugins/git/diffview.nix b/plugins/git/diffview.nix
index 9af78dac..127e14a4 100644
--- a/plugins/git/diffview.nix
+++ b/plugins/git/diffview.nix
@@ -88,10 +88,10 @@ in
 
       package = helpers.mkPluginPackageOption "diffview" pkgs.vimPlugins.diffview-nvim;
 
-      iconsPackage = helpers.mkPackageOption {
-        name = "nvim-web-devicons";
-        default = pkgs.vimPlugins.nvim-web-devicons;
-      };
+      iconsPackage = lib.mkPackageOption pkgs [
+        "vimPlugins"
+        "nvim-web-devicons"
+      ] { nullable = true; };
 
       diffBinaries = mkBool false ''
         Show diffs for binaries
diff --git a/plugins/lsp/lspsaga.nix b/plugins/lsp/lspsaga.nix
index 40fe6352..67531d72 100644
--- a/plugins/lsp/lspsaga.nix
+++ b/plugins/lsp/lspsaga.nix
@@ -51,10 +51,10 @@ in
 
       package = helpers.mkPluginPackageOption "lspsaga" pkgs.vimPlugins.lspsaga-nvim;
 
-      iconsPackage = helpers.mkPackageOption {
-        name = "nvim-web-devicons";
-        default = pkgs.vimPlugins.nvim-web-devicons;
-      };
+      iconsPackage = lib.mkPackageOption pkgs [
+        "vimPlugins"
+        "nvim-web-devicons"
+      ] { nullable = true; };
 
       ui = {
         border = helpers.defaultNullOpts.mkBorder "single" "lspsaga" "";
diff --git a/plugins/lsp/trouble.nix b/plugins/lsp/trouble.nix
index 8b808b55..f582d080 100644
--- a/plugins/lsp/trouble.nix
+++ b/plugins/lsp/trouble.nix
@@ -301,10 +301,10 @@ helpers.neovim-plugin.mkNeovimPlugin {
   };
 
   extraOptions = {
-    iconsPackage = helpers.mkPackageOption {
-      name = "nvim-web-devicons";
-      default = pkgs.vimPlugins.nvim-web-devicons;
-    };
+    iconsPackage = lib.mkPackageOption pkgs [
+      "vimPlugins"
+      "nvim-web-devicons"
+    ] { nullable = true; };
   };
 
   extraConfig = cfg: {
diff --git a/plugins/telescope/default.nix b/plugins/telescope/default.nix
index 775cdf04..b7527d43 100644
--- a/plugins/telescope/default.nix
+++ b/plugins/telescope/default.nix
@@ -91,10 +91,10 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
       '';
     };
 
-    iconsPackage = mkPackageOption {
-      name = "nvim-web-devicons";
-      default = pkgs.vimPlugins.nvim-web-devicons;
-    };
+    iconsPackage = lib.mkPackageOption pkgs [
+      "vimPlugins"
+      "nvim-web-devicons"
+    ] { nullable = true; };
   };
 
   callSetup = false;
diff --git a/plugins/utils/alpha.nix b/plugins/utils/alpha.nix
index ecd4a4c9..6f69ec1b 100644
--- a/plugins/utils/alpha.nix
+++ b/plugins/utils/alpha.nix
@@ -63,10 +63,10 @@ in
         visible = false;
       };
 
-      iconsPackage = helpers.mkPackageOption {
-        name = "nvim-web-devicons";
-        default = pkgs.vimPlugins.nvim-web-devicons;
-      };
+      iconsPackage = lib.mkPackageOption pkgs [
+        "vimPlugins"
+        "nvim-web-devicons"
+      ] { nullable = true; };
 
       theme = mkOption {
         type = with helpers.nixvimTypes; nullOr (maybeRaw str);
diff --git a/plugins/utils/fzf-lua.nix b/plugins/utils/fzf-lua.nix
index fac9ef3d..aa96f65e 100644
--- a/plugins/utils/fzf-lua.nix
+++ b/plugins/utils/fzf-lua.nix
@@ -53,10 +53,10 @@ helpers.neovim-plugin.mkNeovimPlugin {
       visible = false;
     };
 
-    iconsPackage = helpers.mkPackageOption {
-      name = "nvim-web-devicons";
-      default = pkgs.vimPlugins.nvim-web-devicons;
-    };
+    iconsPackage = lib.mkPackageOption pkgs [
+      "vimPlugins"
+      "nvim-web-devicons"
+    ] { nullable = true; };
 
     profile = helpers.defaultNullOpts.mkEnumFirstDefault [
       "default"