diff --git a/README.md b/README.md
index c543b3a5..e92791cc 100644
--- a/README.md
+++ b/README.md
@@ -73,13 +73,13 @@ let g:lua_tree_icons = {
     \ 'git': {
     \   'unstaged': "✗",
     \   'staged': "✓",
-    \   'unmerged': "═",
+    \   'unmerged': "",
     \   'renamed': "➜",
     \   'untracked': "★"
     \   },
     \ 'folder': {
-    \   'default': "",
-    \   'open': ""
+    \   'default': "",
+    \   'open': ""
     \   }
     \ }
 
diff --git a/doc/nvim-tree-lua.txt b/doc/nvim-tree-lua.txt
index a6f47ee4..f0f4416e 100644
--- a/doc/nvim-tree-lua.txt
+++ b/doc/nvim-tree-lua.txt
@@ -95,10 +95,14 @@ when no icon is found for a file.
       \ 'git': {
       \   'unstaged': "✗",
       \   'staged': "✓",
-      \   'unmerged': "═",
+      \   'unmerged': "",
       \   'renamed': "➜",
       \   'untracked': "★"
-      \   }
+      \   },
+      \ 'folder': {
+      \   'default': "",
+      \   'open': ""
+      \  }
       \ }
 
 |g:lua_tree_git_hl|                                *g:lua_tree_git_hl*
@@ -237,7 +241,6 @@ LuaTreeImageFile
 LuaTreeMarkdownFile
 LuaTreeIndentMarker
 
-<<<<<<< HEAD
 LuaTreeLicenseIcon
 LuaTreeYamlIcon
 LuaTreeTomlIcon
diff --git a/lua/lib/colors.lua b/lua/lib/colors.lua
index 597114d5..4295a541 100644
--- a/lua/lib/colors.lua
+++ b/lua/lib/colors.lua
@@ -29,9 +29,9 @@ local function get_hl_groups()
   local colors = get_colors()
 
   return {
-    IndentMarker = { fg = '#90a4ae' },
+    IndentMarker = { fg = '#8094b4' },
     Symlink = { gui = 'bold', fg = colors.cyan },
-    FolderIcon = { fg = '#90a4ae' },
+    FolderIcon = { fg = '#8094b4' },
 
     ExecFile = { gui = 'bold', fg = colors.green },
     SpecialFile = { gui = 'bold,underline', fg = colors.yellow },
diff --git a/lua/lib/config.lua b/lua/lib/config.lua
index 1a48ab41..6284f95a 100644
--- a/lua/lib/config.lua
+++ b/lua/lib/config.lua
@@ -7,13 +7,13 @@ function M.get_icon_state()
     git_icons = {
       unstaged = "✗",
       staged = "✓",
-      unmerged = "═",
+      unmerged = "",
       renamed = "➜",
       untracked = "★"
     },
     folder_icons = {
-      default = "",
-      open = ""
+      default = "",
+      open = ""
     }
   }