diff --git a/src/nvim/highlight_group.c b/src/nvim/highlight_group.c
index 2f219ecc11..d8c50bf7d5 100644
--- a/src/nvim/highlight_group.c
+++ b/src/nvim/highlight_group.c
@@ -395,8 +395,8 @@ static const char *highlight_init_light[] = {
   "SpellCap             guisp=NvimDarkYellow gui=undercurl                   cterm=undercurl",
   "SpellLocal           guisp=NvimDarkGreen  gui=undercurl                   cterm=undercurl",
   "SpellRare            guisp=NvimDarkCyan   gui=undercurl                   cterm=undercurl",
-  "StatusLine           guifg=NvimLightGrey3 guibg=NvimDarkGrey3             cterm=reverse",
-  "StatusLineNC         guifg=NvimDarkGrey2  guibg=NvimLightGrey4            cterm=bold,underline",
+  "StatusLine           guifg=NvimDarkGrey2  guibg=NvimLightGrey4            cterm=reverse",
+  "StatusLineNC         guifg=NvimDarkGrey3  guibg=NvimLightGrey3            cterm=bold,underline",
   "Title                guifg=NvimDarkGrey2                        gui=bold  cterm=bold",
   "Visual                                    guibg=NvimLightGrey4            ctermfg=15 ctermbg=0",
   "WarningMsg           guifg=NvimDarkYellow                                 ctermfg=3",
@@ -481,8 +481,8 @@ static const char *highlight_init_dark[] = {
   "SpellCap             guisp=NvimLightYellow gui=undercurl                 cterm=undercurl",
   "SpellLocal           guisp=NvimLightGreen  gui=undercurl                 cterm=undercurl",
   "SpellRare            guisp=NvimLightCyan   gui=undercurl                 cterm=undercurl",
-  "StatusLine           guifg=NvimDarkGrey3   guibg=NvimLightGrey3          cterm=reverse",
-  "StatusLineNC         guifg=NvimLightGrey2  guibg=NvimDarkGrey4           cterm=bold,underline",
+  "StatusLine           guifg=NvimLightGrey2  guibg=NvimDarkGrey4           cterm=reverse",
+  "StatusLineNC         guifg=NvimLightGrey3  guibg=NvimDarkGrey3           cterm=bold,underline",
   "Title                guifg=NvimLightGrey2                       gui=bold cterm=bold",
   "Visual                                     guibg=NvimDarkGrey4           ctermfg=0 ctermbg=15",
   "WarningMsg           guifg=NvimLightYellow                               ctermfg=11",
diff --git a/test/functional/editor/defaults_spec.lua b/test/functional/editor/defaults_spec.lua
index ca0951bb88..2a33a4fdaa 100644
--- a/test/functional/editor/defaults_spec.lua
+++ b/test/functional/editor/defaults_spec.lua
@@ -100,8 +100,8 @@ describe('default', function()
         screen:set_default_attr_ids({
           [1] = { foreground = Screen.colors.NvimDarkGray4 },
           [2] = {
-            foreground = Screen.colors.NvimDarkGray3,
-            background = Screen.colors.NvimLightGray3,
+            foreground = Screen.colors.NvimLightGray2,
+            background = Screen.colors.NvimDarkGray4,
           },
           [3] = {
             foreground = Screen.colors.NvimLightGrey1,
@@ -179,8 +179,8 @@ describe('default', function()
         screen:set_default_attr_ids({
           [1] = { foreground = Screen.colors.NvimDarkGrey4 },
           [2] = {
-            background = Screen.colors.NvimLightGray3,
-            foreground = Screen.colors.NvimDarkGrey3,
+            background = Screen.colors.NvimDarkGrey4,
+            foreground = Screen.colors.NvimLightGray2,
           },
         })
         screen:expect({
@@ -199,8 +199,8 @@ describe('default', function()
         screen:set_default_attr_ids({
           [1] = { foreground = Screen.colors.NvimDarkGray4 },
           [2] = {
-            background = Screen.colors.NvimLightGrey3,
-            foreground = Screen.colors.NvimDarkGray3,
+            background = Screen.colors.NvimDarkGray4,
+            foreground = Screen.colors.NvimLightGrey2,
           },
           [3] = { foreground = Screen.colors.NvimLightRed },
           [4] = { foreground = Screen.colors.NvimLightCyan },
diff --git a/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua b/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua
index 03bc750402..1a3f943057 100644
--- a/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua
+++ b/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua
@@ -220,8 +220,8 @@ pcall(vim.cmd.edit, 'Xtest_swapredraw.lua')
       [104] = { foreground = Screen.colors.NvimLightCyan },
       [105] = { foreground = Screen.colors.NvimDarkGrey4 },
       [106] = {
-        foreground = Screen.colors.NvimDarkGrey3,
-        background = Screen.colors.NvimLightGrey3,
+        foreground = Screen.colors.NvimLightGrey2,
+        background = Screen.colors.NvimDarkGrey4,
       },
       [107] = { foreground = Screen.colors.NvimLightGrey2, bold = true },
       [108] = { foreground = Screen.colors.NvimLightBlue },
diff --git a/test/functional/ui/embed_spec.lua b/test/functional/ui/embed_spec.lua
index cf964f2e50..3dd7967b9f 100644
--- a/test/functional/ui/embed_spec.lua
+++ b/test/functional/ui/embed_spec.lua
@@ -30,8 +30,8 @@ local function test_embed(ext_linegrid)
       [100] = { foreground = Screen.colors.NvimDarkCyan },
       [101] = { foreground = Screen.colors.NvimDarkRed },
       [102] = {
-        background = Screen.colors.NvimDarkGrey3,
-        foreground = Screen.colors.NvimLightGrey3,
+        background = Screen.colors.NvimLightGrey4,
+        foreground = Screen.colors.NvimDarkGrey2,
       },
     }
   end