diff --git a/functions/_tide_item_git.fish b/functions/_tide_item_git.fish
index 56e1e31..a1ae3fc 100644
--- a/functions/_tide_item_git.fish
+++ b/functions/_tide_item_git.fish
@@ -61,12 +61,23 @@ function _tide_item_git
         set -g tide_git_bg_color $tide_git_bg_color_unstable
     end
 
-    _tide_print_item git $_tide_location_color$tide_git_icon' ' (set_color white; echo -ns $location
-        set_color $tide_git_color_operation; echo -ns ' '$operation ' '$step/$total_steps
-        set_color $tide_git_color_upstream; echo -ns ' ⇣'$behind ' ⇡'$ahead
-        set_color $tide_git_color_stash; echo -ns ' *'$stash
-        set_color $tide_git_color_conflicted; echo -ns ' ~'$conflicted
-        set_color $tide_git_color_staged; echo -ns ' +'$staged
-        set_color $tide_git_color_dirty; echo -ns ' !'$dirty
-        set_color $tide_git_color_untracked; echo -ns ' ?'$untracked)
+    if set -q tide_git_icon_true
+        _tide_print_item git $_tide_location_color$tide_git_icon' ' (set_color white; echo -ns $location $tide_git_icon_spacer
+            set_color $tide_git_color_operation; echo -ns ' '$operation ' '$step/$total_steps
+            set_color $tide_git_color_upstream; echo -ns $tide_git_icon_upstream_behind$behind tide_git_icon_upstream_ahead$ahead
+            set_color $tide_git_color_stash; echo -ns $tide_git_icon_stash$stash
+            set_color $tide_git_color_conflicted; echo -ns $tide_git_icon_conflicted$conflicted
+            set_color $tide_git_color_staged; echo -ns $tide_git_icon_staged$staged
+            set_color $tide_git_color_dirty; echo -ns $tide_git_icon_dirty$dirty
+            set_color $tide_git_color_untracked; echo -ns $tide_git_icon_untracked$untracked)
+    else
+        _tide_print_item git $_tide_location_color$tide_git_icon' ' (set_color white; echo -ns $location
+            set_color $tide_git_color_operation; echo -ns ' '$operation ' '$step/$total_steps
+            set_color $tide_git_color_upstream; echo -ns ' ⇣'$behind ' ⇡'$ahead
+            set_color $tide_git_color_stash; echo -ns ' *'$stash
+            set_color $tide_git_color_conflicted; echo -ns ' ~'$conflicted
+            set_color $tide_git_color_staged; echo -ns ' +'$staged
+            set_color $tide_git_color_dirty; echo -ns ' !'$dirty
+            set_color $tide_git_color_untracked; echo -ns ' ?'$untracked)
+    end
 end
diff --git a/functions/tide/configure/choices/all/icons.fish b/functions/tide/configure/choices/all/icons.fish
index be167bb..0feb7d6 100644
--- a/functions/tide/configure/choices/all/icons.fish
+++ b/functions/tide/configure/choices/all/icons.fish
@@ -22,12 +22,30 @@ function _enable_icons
     set -g fake_tide_pwd_icon_home 
     set -g fake_tide_cmd_duration_icon 
     set -g fake_tide_git_icon 
+    set -g fake_tide_git_icon_true true
+    set -g fake_tide_git_icon_spacer ''
+    set -g fake_tide_git_icon_upstream_behind ⇣
+    set -g fake_tide_git_icon_upstream_ahead ⇡
+    set -g fake_tide_git_icon_stash ' 󱉰 '
+    set -g fake_tide_git_icon_conflicted '  '
+    set -g fake_tide_git_icon_staged '  '
+    set -g fake_tide_git_icon_dirty '  '
+    set -g fake_tide_git_icon_untracked ' 󰩌 '
 end
 
 function _disable_icons
     _tide_find_and_remove os fake_tide_left_prompt_items
-    set fake_tide_pwd_icon
-    set fake_tide_pwd_icon_home
-    set fake_tide_cmd_duration_icon
-    set fake_tide_git_icon
+    set -g fake_tide_pwd_icon
+    set -g fake_tide_pwd_icon_home
+    set -g fake_tide_cmd_duration_icon
+    set -g fake_tide_git_icon
+    set -e fake_tide_git_icon_true
+    set -g fake_tide_git_icon_spacer ' '
+    set -g fake_tide_git_icon_upstream_behind ⇣
+    set -g fake_tide_git_icon_upstream_ahead ⇡
+    set -g fake_tide_git_icon_stash ' *'
+    set -g fake_tide_git_icon_conflicted ' ~'
+    set -g fake_tide_git_icon_staged ' +'
+    set -g fake_tide_git_icon_dirty ' !'
+    set -g fake_tide_git_icon_untracked ' ?'
 end
diff --git a/functions/tide/configure/icons.fish b/functions/tide/configure/icons.fish
index a687bed..8cdb0b6 100644
--- a/functions/tide/configure/icons.fish
+++ b/functions/tide/configure/icons.fish
@@ -12,6 +12,13 @@ tide_docker_icon 
 tide_elixir_icon 
 tide_gcloud_icon 󰊭 # Actual google cloud glyph is harder to see
 tide_git_icon
+tide_git_icon_upstream_behind ⇣
+tide_git_icon_upstream_ahead ⇡
+tide_git_icon_stash 󱉰
+tide_git_icon_conflicted 
+tide_git_icon_staged 
+tide_git_icon_dirty 
+tide_git_icon_untracked 󰩌
 tide_go_icon 
 tide_java_icon 
 tide_jobs_icon 