diff --git a/lua/lazyvim/plugins/extras/ai/codeium.lua b/lua/lazyvim/plugins/extras/ai/codeium.lua
index 6d2646a1..70adaaf8 100644
--- a/lua/lazyvim/plugins/extras/ai/codeium.lua
+++ b/lua/lazyvim/plugins/extras/ai/codeium.lua
@@ -55,17 +55,15 @@ return {
     end,
   },
 
-  {
+  vim.g.ai_cmp and {
     "saghen/blink.cmp",
     optional = true,
+    dependencies = { "codeium.nvim", "saghen/blink.compat" },
     opts = {
       sources = {
-        compat = vim.g.ai_cmp and { "codeium" } or nil,
+        compat = { "codeium" },
+        providers = { codeium = { kind = "Codeium" } },
       },
     },
-    dependencies = {
-      "codeium.nvim",
-      vim.g.ai_cmp and "saghen/blink.compat" or nil,
-    },
-  },
+  } or nil,
 }
diff --git a/lua/lazyvim/plugins/extras/ai/copilot.lua b/lua/lazyvim/plugins/extras/ai/copilot.lua
index 4fd3119c..cfe54aa5 100644
--- a/lua/lazyvim/plugins/extras/ai/copilot.lua
+++ b/lua/lazyvim/plugins/extras/ai/copilot.lua
@@ -94,31 +94,23 @@ return {
     },
   },
 
-  -- blink.cmp
-  {
+  vim.g.ai_cmp and {
     "saghen/blink.cmp",
     optional = true,
-    dependencies = {
-      {
-        "giuxtaposition/blink-cmp-copilot",
-        enabled = vim.g.ai_cmp, -- only enable if needed
-        specs = {
-          {
-            "blink.cmp",
-            optional = true,
-            opts = {
-              sources = {
-                providers = {
-                  copilot = { name = "copilot", module = "blink-cmp-copilot" },
-                },
-                completion = {
-                  enabled_providers = { "copilot" },
-                },
-              },
-            },
+    dependencies = { "giuxtaposition/blink-cmp-copilot" },
+    opts = {
+      sources = {
+        completion = {
+          enabled_providers = { "copilot" },
+        },
+        providers = {
+          copilot = {
+            name = "copilot",
+            module = "blink-cmp-copilot",
+            kind = "Copilot",
           },
         },
       },
     },
-  },
+  } or nil,
 }
diff --git a/lua/lazyvim/plugins/extras/ai/supermaven.lua b/lua/lazyvim/plugins/extras/ai/supermaven.lua
index eaabdd66..35a955ca 100644
--- a/lua/lazyvim/plugins/extras/ai/supermaven.lua
+++ b/lua/lazyvim/plugins/extras/ai/supermaven.lua
@@ -43,22 +43,17 @@ return {
     end,
   },
 
-  -- blink.cmp integration
-  {
+  vim.g.ai_cmp and {
     "saghen/blink.cmp",
     optional = true,
-    ---@module 'blink.cmp'
-    ---@type blink.cmp.Config
+    dependencies = { "supermaven-nvim", "saghen/blink.compat" },
     opts = {
       sources = {
-        compat = vim.g.ai_cmp and { "supermaven" } or nil,
+        compat = { "supermaven" },
+        providers = { supermaven = { kind = "Supermaven" } },
       },
     },
-    dependencies = {
-      "supermaven-nvim",
-      vim.g.ai_cmp and "saghen/blink.compat" or nil,
-    },
-  },
+  } or nil,
 
   {
     "nvim-lualine/lualine.nvim",
diff --git a/lua/lazyvim/plugins/extras/ai/tabnine.lua b/lua/lazyvim/plugins/extras/ai/tabnine.lua
index b75db9ec..f1df9f7d 100644
--- a/lua/lazyvim/plugins/extras/ai/tabnine.lua
+++ b/lua/lazyvim/plugins/extras/ai/tabnine.lua
@@ -1,25 +1,22 @@
 return {
   -- Tabnine cmp source
+  {
+    "tzachar/cmp-tabnine",
+    build = LazyVim.is_win() and "pwsh -noni .\\install.ps1" or "./install.sh",
+    opts = {
+      max_lines = 1000,
+      max_num_results = 3,
+      sort = true,
+    },
+    config = function(_, opts)
+      require("cmp_tabnine.config"):setup(opts)
+    end,
+  },
+
   {
     "nvim-cmp",
     optional = true,
-    dependencies = {
-      {
-        "tzachar/cmp-tabnine",
-        build = {
-          LazyVim.is_win() and "pwsh -noni .\\install.ps1" or "./install.sh",
-        },
-        dependencies = "hrsh7th/nvim-cmp",
-        opts = {
-          max_lines = 1000,
-          max_num_results = 3,
-          sort = true,
-        },
-        config = function(_, opts)
-          require("cmp_tabnine.config"):setup(opts)
-        end,
-      },
-    },
+    dependencies = { "tzachar/cmp-tabnine" },
     ---@param opts cmp.ConfigSchema
     opts = function(_, opts)
       table.insert(opts.sources, 1, {
@@ -36,6 +33,19 @@ return {
       end)
     end,
   },
+
+  {
+    "saghen/blink.cmp",
+    optional = true,
+    dependencies = { "tzachar/cmp-tabnine", "saghen/blink.compat" },
+    opts = {
+      sources = {
+        compat = { "cmp_tabnine" },
+        providers = { cmp_tabnine = { kind = "TabNine" } },
+      },
+    },
+  },
+
   -- Show TabNine status in lualine
   {
     "nvim-lualine/lualine.nvim",
diff --git a/lua/lazyvim/plugins/extras/coding/blink.lua b/lua/lazyvim/plugins/extras/coding/blink.lua
index a4554f30..67344187 100644
--- a/lua/lazyvim/plugins/extras/coding/blink.lua
+++ b/lua/lazyvim/plugins/extras/coding/blink.lua
@@ -44,8 +44,9 @@ return {
       nerd_font_variant = "mono",
       completion = {
         menu = {
-          winblend = vim.o.pumblend,
-          draw = { treesitter = true },
+          draw = {
+            treesitter = true,
+          },
         },
         documentation = {
           auto_show = true,
@@ -93,6 +94,26 @@ return {
           table.insert(enabled, source)
         end
       end
+
+      -- check if we need to override symbol kinds
+      for _, provider in pairs(opts.sources.providers or {}) do
+        ---@cast provider blink.cmp.SourceProviderConfig|{kind?:string}
+        if provider.kind then
+          require("blink.cmp.types").CompletionItemKind[provider.kind] = provider.kind
+          ---@type fun(ctx: blink.cmp.Context, items: blink.cmp.CompletionItem[]): blink.cmp.CompletionItem[]
+          local transform_items = provider.transform_items
+          ---@param ctx blink.cmp.Context
+          ---@param items blink.cmp.CompletionItem[]
+          provider.transform_items = function(ctx, items)
+            items = transform_items and transform_items(ctx, items) or items
+            for _, item in ipairs(items) do
+              item.kind = provider.kind or item.kind
+            end
+            return items
+          end
+        end
+      end
+
       require("blink.cmp").setup(opts)
     end,
   },