diff --git a/lua/nvim-tree/colors.lua b/lua/nvim-tree/colors.lua
index a68aa153..1ffadb85 100644
--- a/lua/nvim-tree/colors.lua
+++ b/lua/nvim-tree/colors.lua
@@ -7,7 +7,7 @@ local function get_color_from_hl(hl_name, fallback)
   local id = vim.api.nvim_get_hl_id_by_name(hl_name)
   if not id then return fallback end
 
-  local foreground = vim.fn.synIDattr(id, "fg")
+  local foreground = vim.fn.synIDattr(vim.fn.synIDtrans(id), "fg")
   if not foreground or foreground == "" then return fallback end
 
   return foreground
diff --git a/lua/nvim-tree/renderer/init.lua b/lua/nvim-tree/renderer/init.lua
index 55dd389a..1736942b 100644
--- a/lua/nvim-tree/renderer/init.lua
+++ b/lua/nvim-tree/renderer/init.lua
@@ -296,7 +296,7 @@ local function update_draw_data(tree, depth, markers)
     if node.entries then
       local has_children = #node.entries ~= 0 or node.has_children
       local icon = get_folder_icon(node.open, node.link_to ~= nil, has_children)
-      local git_icon = get_git_icons(node, index, offset, #icon+1) or ""
+      local git_icon = get_git_icons(node, index, offset, #icon) or ""
       -- INFO: this is mandatory in order to keep gui attributes (bold/italics)
       local folder_hl = "NvimTreeFolderName"
       local name = node.name
@@ -310,9 +310,9 @@ local function update_draw_data(tree, depth, markers)
       if special[node.absolute_path] then
         folder_hl = "NvimTreeSpecialFolderName"
       end
-      set_folder_hl(index, offset, #icon, #name+#git_icon, folder_hl)
+      set_folder_hl(index, offset, #icon+#git_icon, #name, folder_hl)
       if git_hl then
-        set_folder_hl(index, offset, #icon, #name+#git_icon, git_hl)
+        set_folder_hl(index, offset, #icon+#git_icon, #name, git_hl)
       end
       index = index + 1
       if node.open then