diff --git a/lua/lvim/config/settings.lua b/lua/lvim/config/settings.lua
index c31a90c0..a041a4d6 100644
--- a/lua/lvim/config/settings.lua
+++ b/lua/lvim/config/settings.lua
@@ -77,12 +77,11 @@ M.load_default_options = function()
 
   local default_diagnostic_config = {
     signs = {
-      active = true,
-      values = {
-        { name = "DiagnosticSignError", text = lvim.icons.diagnostics.Error },
-        { name = "DiagnosticSignWarn", text = lvim.icons.diagnostics.Warning },
-        { name = "DiagnosticSignHint", text = lvim.icons.diagnostics.Hint },
-        { name = "DiagnosticSignInfo", text = lvim.icons.diagnostics.Information },
+      text = {
+        [vim.diagnostic.severity.ERROR] = lvim.icons.diagnostics.Error,
+        [vim.diagnostic.severity.WARN] = lvim.icons.diagnostics.Warning,
+        [vim.diagnostic.severity.HINT] = lvim.icons.diagnostics.Hint,
+        [vim.diagnostic.severity.INFO] = lvim.icons.diagnostics.Information,
       },
     },
     virtual_text = true,
diff --git a/lua/lvim/lsp/init.lua b/lua/lvim/lsp/init.lua
index a6dce4fb..16d55cda 100644
--- a/lua/lvim/lsp/init.lua
+++ b/lua/lvim/lsp/init.lua
@@ -94,10 +94,10 @@ function M.setup()
     return
   end
 
-  if lvim.use_icons then
-    for _, sign in ipairs(vim.tbl_get(vim.diagnostic.config(), "signs", "values") or {}) do
-      vim.fn.sign_define(sign.name, { texthl = sign.name, text = sign.text, numhl = sign.name })
-    end
+  if not lvim.use_icons then
+    vim.diagnostic.config {
+      signs = {},
+    }
   end
 
   if not utils.is_directory(lvim.lsp.templates_dir) then