diff --git a/subzsh/prompt b/subzsh/prompt
index 552d7f7..f888ec3 100644
--- a/subzsh/prompt
+++ b/subzsh/prompt
@@ -30,8 +30,8 @@ setopt prompt_subst
 autoload -Uz vcs_info
 zstyle ':vcs_info:*' enable git cvs svn
 zstyle ':vcs_info:*' check-for-changes true
-zstyle ':vcs_info:*' unstagedstr '!'
-zstyle ':vcs_info:*' stagedstr '+'
+zstyle ':vcs_info:*' unstagedstr 'M'
+zstyle ':vcs_info:*' stagedstr 'A'
 zstyle ':vcs_info:git*+set-message:*' hooks git-untracked
 
 +vi-git-untracked(){
@@ -45,9 +45,9 @@ zstyle ':vcs_info:git*+set-message:*' hooks git-untracked
 precmd() { vcs_info }
 
 zstyle ':vcs_info:*' actionformats \
-    '%F{5}(%f%s%F{5})%F{3}%u%c%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f '
+    '-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]-%F{5}(%F{3}%u%c%F{5})%F{3}%f '
 zstyle ':vcs_info:*' formats       \
-    '%F{5}(%f%s%F{5})%F{3}%u%c%F{5}[%F{2}%b%F{5}]%f '
+    '%F{5}[%F{2}%b%F{5}]-%F{5}(%F{3}%u%c%F{5})%F{3}%f '
 zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'