diff --git a/autoload/SpaceVim/layers/core.vim b/autoload/SpaceVim/layers/core.vim
index 821f46887..cc9d86d58 100644
--- a/autoload/SpaceVim/layers/core.vim
+++ b/autoload/SpaceVim/layers/core.vim
@@ -27,6 +27,8 @@ function! SpaceVim#layers#core#plugins() abort
     call add(plugins, ['Shougo/vimproc.vim', {'build' : [(executable('gmake') ? 'gmake' : 'make')]}])
   elseif g:spacevim_filemanager ==# 'defx'
     call add(plugins, ['Shougo/defx.nvim',{'merged' : 0, 'loadconf' : 1 , 'loadconf_before' : 1}])
+    call add(plugins, ['kristijanhusak/defx-git',{'merged' : 0, 'loadconf' : 1}])
+    call add(plugins, ['kristijanhusak/defx-icons',{'merged' : 0}])
   endif
 
   if !g:spacevim_vimcompatible
diff --git a/config/plugins/defx-git.vim b/config/plugins/defx-git.vim
new file mode 100644
index 000000000..0cccd0abb
--- /dev/null
+++ b/config/plugins/defx-git.vim
@@ -0,0 +1,10 @@
+let g:defx_git#indicators = {
+	\ 'Modified'  : '•',
+	\ 'Staged'    : '✚',
+	\ 'Untracked' : 'ᵁ',
+	\ 'Renamed'   : '≫',
+	\ 'Unmerged'  : '≠',
+	\ 'Ignored'   : 'ⁱ',
+	\ 'Deleted'   : '✖',
+	\ 'Unknown'   : '⁇'
+	\ }
diff --git a/config/plugins/defx.vim b/config/plugins/defx.vim
index 421fbb862..c0ff4b5d2 100644
--- a/config/plugins/defx.vim
+++ b/config/plugins/defx.vim
@@ -14,7 +14,20 @@ else
   let s:direction = 'leftabove'
 endif
 
+function! s:setcolum() abort
+  if g:spacevim_enable_vimfiler_filetypeicon && !g:spacevim_enable_vimfiler_gitstatus
+    return 'indent:icons:filename:type'
+  elseif !g:spacevim_enable_vimfiler_filetypeicon && g:spacevim_enable_vimfiler_gitstatus
+    return 'indent:icons:filename:type'
+  elseif g:spacevim_enable_vimfiler_filetypeicon && g:spacevim_enable_vimfiler_gitstatus
+    return 'indent:git:icons:filename:type'
+  else
+    return 'mark:indent:icon:filename:type'
+  endif
+endfunction
+
 call defx#custom#option('_', {
+      \ 'columns': s:setcolum(),
       \ 'winwidth': g:spacevim_sidebar_width,
       \ 'split': 'vertical',
       \ 'direction': s:direction,