diff --git a/config/plugins/editor/neo-tree.nix b/config/plugins/editor/neo-tree.nix
index 18b2ca8..cbc89bd 100644
--- a/config/plugins/editor/neo-tree.nix
+++ b/config/plugins/editor/neo-tree.nix
@@ -14,8 +14,8 @@
     defaultComponentConfigs = {
       indent = {
         withExpanders = true;
-        expanderCollapsed = "";
-        expanderExpanded = " ";
+        expanderCollapsed = "󰅂";
+        expanderExpanded = "󰅀";
         expanderHighlight = "NeoTreeExpander";
       };
 
@@ -29,7 +29,7 @@
           renamed = "󰑕";
           staged = "󰩍";
           unstaged = "";
-          untracked = "";
+          untracked = " ";
         };
       };
     };
diff --git a/config/plugins/ui/lualine.nix b/config/plugins/ui/lualine.nix
index bb74a6e..b59b520 100644
--- a/config/plugins/ui/lualine.nix
+++ b/config/plugins/ui/lualine.nix
@@ -12,90 +12,82 @@ _: {
           statusline = ["startup" "alpha"];
         };
         theme = "catppuccin";
-        sections = {
-          lualine_a = [
-            {
-              name = "mode";
-              icon = " ";
-            }
-          ];
-          lualine_b = [
-            {
-              name = "branch";
-              icon = "";
-            }
-            {
-              name = "diff";
-              extraConfig = {
-                symbols = {
-                  added = " ";
-                  modified = " ";
-                  removed = " ";
-                };
-              };
-            }
-          ];
-          lualine_c = [
-            {
-              name = "diagnostics";
-              extraConfig = {
-                sources = ["nvim_lsp"];
-                symbols = {
-                  error = " ";
-                  warn = " ";
-                  info = " ";
-                  hint = "󰝶 ";
-                };
-              };
-            }
-            {
-              name = "navic";
-            }
-          ];
-          lualine_x = [
-            {
-              name = "filetype";
-              extraConfig = {
-                icon_only = true;
-                separator = "";
-                padding = {
-                  left = 1;
-                  right = 0;
-                };
-              };
-            }
-            {
-              name = "filename";
-              extraConfig = {
-                path = 1;
-              };
-            }
-            {
-              name.__raw = ''
-                function()
-                  local icon = " "
-                  local status = require("copilot.api").status.data
-                  return icon .. (status.message or " ")
-                end,
+      };
+      sections = {
+        lualine_a = [
+          {
+            __unkeyed-1 = "mode";
+            icon = "";
+          }
+        ];
+        lualine_b = [
+          {
+            __unkeyed-1 = "branch";
+            icon = "";
+          }
+          {
+            __unkeyed-1 = "diff";
+            symbols = {
+              added = " ";
+              modified = " ";
+              removed = " ";
+            };
+          }
+        ];
+        lualine_c = [
+          {
+            __unkeyed-1 = "diagnostics";
+            sources = ["nvim_lsp"];
+            symbols = {
+              error = " ";
+              warn = " ";
+              info = " ";
+              hint = "󰝶 ";
+            };
+          }
+          {
+            __unkeyed-1 = "navic";
+          }
+        ];
+        lualine_x = [
+          {
+            __unkeyed-1 = "filetype";
+            icon_only = true;
+            separator = "";
+            padding = {
+              left = 1;
+              right = 0;
+            };
+          }
+          {
+            __unkeyed-1 = "filename";
+            path = 1;
+          }
+          {
+            __unkeyed-1.__raw = ''
+              function()
+                local icon = " "
+                local status = require("copilot.api").status.data
+                return icon .. (status.message or " ")
+              end,
 
-                cond = function()
-                 local ok, clients = pcall(vim.lsp.get_clients, { name = "copilot", bufnr = 0 })
-                 return ok and #clients > 0
-                end,
-              '';
-            }
-          ];
-          lualine_y = [
-            {
-              name = "progress";
-            }
-          ];
-          lualine_z = [
-            {
-              name = "location";
-            }
-          ];
-        };
+              cond = function()
+               local ok, clients = pcall(vim.lsp.get_clients, { name = "copilot", bufnr = 0 })
+               return ok and #clients > 0
+              end,
+            '';
+          }
+        ];
+        lualine_y = [
+          {
+            __unkeyed-1 = "progress";
+          }
+        ];
+        lualine_z = [
+          {
+            __unkeyed-1 = "location";
+          }
+        ];
       };
     };
   };
diff --git a/config/settings.nix b/config/settings.nix
index 96fd9be..a8155a8 100644
--- a/config/settings.nix
+++ b/config/settings.nix
@@ -86,6 +86,11 @@
 
       # Hide command line unless needed
       cmdheight = 0;
+
+      # Remove EOB
+      fillchars = {
+        eob = " ";
+      };
     };
   };
 }