diff --git a/my.zsh b/my.zsh
index 9d0b021..29c1a63 100644
--- a/my.zsh
+++ b/my.zsh
@@ -67,7 +67,7 @@ cdpath=($project_path $cdpath)
 source $current_path/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 
 # Load autosuggestions
-#source $current_path/zsh-autosuggestions/autosuggestions.zsh
+source $current_path/zsh-autosuggestions/autosuggestions.zsh
 
 
 # Enable autosuggestions automatically
diff --git a/themes/lxsameer.zsh-theme b/themes/lxsameer.zsh-theme
index bb9ecbd..73557a2 100644
--- a/themes/lxsameer.zsh-theme
+++ b/themes/lxsameer.zsh-theme
@@ -20,16 +20,16 @@ function spaces() {
     if [ ${#git} != 0 ]; then
 	local clean=$(parse_git_dirty)
 	if [ ${#clean} != 0 ]; then
-	    (( git = ${#git} - 17 - ${#clean} + 1 ))
+	    (( git = ${#git} - 20 - ${#clean} + 1 ))
 	else
-	    (( git = ${#git} - 17 ))
+	    (( git = ${#git} - 20 ))
 	fi
     else
 	git=0
     fi
 
     local termwidth
-    (( termwidth = ${COLUMNS} - 5 - ${#$(get_pwd)} - ${git} ))
+    (( termwidth = ${COLUMNS} - 7 - ${#$(get_pwd)} - ${git} ))
 
     local spacing=" "
     for i in {1..$termwidth}; do
@@ -50,8 +50,8 @@ function path_icon () {
 }
 
 PROMPT='
-$(path_icon) %F{003}%~%F{008}$(spaces) $(my_git_prompt_info)
-$(user_sign) %f'
+$(user_sign) $(path_icon) %F{003}%~%F{008}$(spaces) $(my_git_prompt_info)
+%f'
 
 # git settings
 ZSH_THEME_GIT_PROMPT_PREFIX="%F{002}["