diff --git a/modules/programs/tui/neovim/components/diagnostics.nix b/modules/programs/tui/neovim/components/diagnostics.nix
index 766bb63..131fd61 100644
--- a/modules/programs/tui/neovim/components/diagnostics.nix
+++ b/modules/programs/tui/neovim/components/diagnostics.nix
@@ -11,11 +11,11 @@
       (lib)
       # keep-sorted start
       fromHexString
-      substring
-      toHexString
       optionalString
-      stringLength
       removePrefix
+      stringLength
+      substring
+      toHexString
       # keep-sorted end
       ;
     inherit (lib.generators) mkLuaInline;
@@ -73,24 +73,36 @@
 
       highlight = {
         # keep-sorted start block=yes newline_separated=yes
+        DiagnosticSignWarn.fg = colors.base0A;
+
+        DiagnosticUnderlineWarn = {
+          # keep-sorted start
+          sp = colors.base0A;
+          undercurl = true;
+          # keep-sorted end
+        };
+
         DiagnosticVirtualTextError = {
           # keep-sorted start
           bg = tintBackground colors.base08;
           fg = colors.base08;
           # keep-sorted end
         };
+
         DiagnosticVirtualTextHint = {
           # keep-sorted start
-          bg = tintBackground colors.base0B;
-          fg = colors.base0B;
+          bg = tintBackground colors.base0C;
+          fg = colors.base0C;
           # keep-sorted end
         };
+
         DiagnosticVirtualTextInfo = {
           # keep-sorted start
           bg = tintBackground colors.base0C;
           fg = colors.base0C;
           # keep-sorted end
         };
+
         DiagnosticVirtualTextWarn = {
           # keep-sorted start
           bg = tintBackground colors.base0A;
diff --git a/modules/programs/tui/neovim/components/statusline.nix b/modules/programs/tui/neovim/components/statusline.nix
index b3d974d..cf00fea 100644
--- a/modules/programs/tui/neovim/components/statusline.nix
+++ b/modules/programs/tui/neovim/components/statusline.nix
@@ -163,10 +163,10 @@
 
             symbols = {
               # keep-sorted start
-              error = "󰅙  ";
+              error = "󰅙 ";
               hint = "󰌵 ";
-              info = "  ";
-              warn = "  ";
+              info = " ";
+              warn = " ";
               # keep-sorted end
             };
             # keep-sorted end