diff --git a/functions/vcs.zsh b/functions/vcs.zsh
index d89525fd..c217eafd 100755
--- a/functions/vcs.zsh
+++ b/functions/vcs.zsh
@@ -141,6 +141,8 @@ function +vi-vcs-detect-changes() {
     vcs_visual_identifier='VCS_SVN_ICON'
   fi
 
+  [[ -n "$vcs_visual_identifier" ]] && vcs_visual_identifier="$vcs_visual_identifier "
+
   if [[ -n "${hook_com[staged]}" ]] || [[ -n "${hook_com[unstaged]}" ]]; then
     VCS_WORKDIR_DIRTY=true
   else
diff --git a/internal/p10k.zsh b/internal/p10k.zsh
index 10bc612c..877be24c 100755
--- a/internal/p10k.zsh
+++ b/internal/p10k.zsh
@@ -1791,22 +1791,19 @@ function _p9k_vcs_render() {
       # of the GIT icon. That's what vcs_info does, so we do the same in the name of compatiblity.
       if [[ "$VCS_STATUS_REMOTE_URL" == *github* ]] then
         _p9k_get_icon VCS_GIT_GITHUB_ICON
-        _$0_fmt REMOTE_URL $_P9K_RETVAL
       elif [[ "$VCS_STATUS_REMOTE_URL" == *bitbucket* ]] then
         _p9k_get_icon VCS_GIT_BITBUCKET_ICON
-        _$0_fmt REMOTE_URL $_P9K_RETVAL
       elif [[ "$VCS_STATUS_REMOTE_URL" == *stash* ]] then
         _p9k_get_icon VCS_GIT_GITHUB_ICON
-        _$0_fmt REMOTE_URL $_P9K_RETVAL
       elif [[ "$VCS_STATUS_REMOTE_URL" == *gitlab* ]] then
         _p9k_get_icon VCS_GIT_GITLAB_ICON
-        _$0_fmt REMOTE_URL $_P9K_RETVAL
       else
         _p9k_get_icon VCS_GIT_ICON
-        _$0_fmt REMOTE_URL $_P9K_RETVAL
       fi
     fi
 
+    _$0_fmt REMOTE_URL "$_P9K_RETVAL "
+
     local ws
     if [[ $POWERLEVEL9K_SHOW_CHANGESET == true || -z $VCS_STATUS_LOCAL_BRANCH ]]; then
       _p9k_get_icon VCS_COMMIT_ICON