diff --git a/plugins/languages/treesitter/treesitter.nix b/plugins/languages/treesitter/treesitter.nix
index 4e7faeea..2d6a4814 100644
--- a/plugins/languages/treesitter/treesitter.nix
+++ b/plugins/languages/treesitter/treesitter.nix
@@ -324,11 +324,6 @@ helpers.neovim-plugin.mkNeovimPlugin config {
       description = "Grammar packages to install";
     };
 
-    iconsPackage = helpers.mkPackageOption {
-      name = "nvim-web-devicons";
-      default = pkgs.vimPlugins.nvim-web-devicons;
-    };
-
     # TODO: Implement rawLua support to be passed into extraConfigLua.
     languageRegister = mkOption {
       type = with types; attrsOf (coercedTo str toList (listOf str));
@@ -416,11 +411,10 @@ helpers.neovim-plugin.mkNeovimPlugin config {
 
     extraFiles = mkIf cfg.nixvimInjections { "queries/nix/injections.scm".source = ./injections.scm; };
 
-    extraPlugins =
-      lib.optional (cfg.iconsPackage != null) cfg.iconsPackage
-      ++ lib.optional (cfg.package != null) (
-        if cfg.nixGrammars then cfg.package.withPlugins (_: cfg.grammarPackages) else cfg.package
-      );
+    extraPlugins = mkIf (cfg.package != null) [
+      (mkIf cfg.nixGrammars (cfg.package.withPlugins (_: cfg.grammarPackages)))
+      (mkIf (!cfg.nixGrammars) cfg.package)
+    ];
 
     extraPackages = [
       cfg.gccPackage
diff --git a/tests/test-sources/plugins/languages/treesitter/treesitter.nix b/tests/test-sources/plugins/languages/treesitter/treesitter.nix
index c5b3dc35..37c2edd6 100644
--- a/tests/test-sources/plugins/languages/treesitter/treesitter.nix
+++ b/tests/test-sources/plugins/languages/treesitter/treesitter.nix
@@ -134,11 +134,4 @@
       };
     };
   };
-
-  no-icons = {
-    plugins.treesitter = {
-      enable = true;
-      iconsPackage = null;
-    };
-  };
 }