diff --git a/config/fish/functions/fish_prompt.fish b/config/fish/functions/fish_prompt.fish
index f14df1a..1b1c187 100644
--- a/config/fish/functions/fish_prompt.fish
+++ b/config/fish/functions/fish_prompt.fish
@@ -18,24 +18,28 @@ set __fish_git_prompt_color_upstream_behind red
 
 # Status Chars
 #set __fish_git_prompt_char_dirtystate '⚡'
-set __fish_git_prompt_char_dirtystate 'D'
+set __fish_git_prompt_char_dirtystate '+'
 
 set __fish_git_prompt_char_stagedstate '→'
 set __fish_git_prompt_char_untrackedfiles '☡'
 set __fish_git_prompt_char_stashstate '↩'
-set __fish_git_prompt_char_upstream_ahead '+'
-set __fish_git_prompt_char_upstream_behind '-'
+set __fish_git_prompt_char_upstream_ahead '⇡ '
+set __fish_git_prompt_char_upstream_behind '⇣ '
 
 
 function fish_prompt
+	echo
+
 	set last_status $status
 
 	set_color -o $fish_color_cwd
-	printf '%s' (prompt_pwd)
+	echo -n $PWD | sed -e "s,^$HOME,~,"
 	set_color normal
 
 	printf '%s' (__fish_git_prompt)
 	set_color normal
 
-	echo -en "  "
+	echo
+
+	echo -n "❯  "
 end