diff --git a/functions/icons.zsh b/functions/icons.zsh
index c2cdcba5..5e719be1 100644
--- a/functions/icons.zsh
+++ b/functions/icons.zsh
@@ -78,6 +78,7 @@ case $POWERLEVEL9K_MODE in
       RUST_ICON                      ''
       PYTHON_ICON                    $'\U1F40D'             # 🐍
       SWIFT_ICON                     ''
+      GO_ICON                        ''
       PUBLIC_IP_ICON                 ''
       LOCK_ICON                      $'\UE138'              # 
       EXECUTION_TIME_ICON            $'\UE89C'              # 
@@ -144,6 +145,7 @@ case $POWERLEVEL9K_MODE in
       RUST_ICON                      $'\uE6A8'              #  
       PYTHON_ICON                    $'\U1F40D'             # 🐍
       SWIFT_ICON                     ''
+      GO_ICON                        ''
       PUBLIC_IP_ICON                 ''
       LOCK_ICON                      $'\UE138'              # 
       EXECUTION_TIME_ICON            $'\uF253'
@@ -210,6 +212,7 @@ case $POWERLEVEL9K_MODE in
       RUST_ICON                      $'\uE7A8 '             # 
       PYTHON_ICON                    $'\UE73C '             # 
       SWIFT_ICON                     $'\uE755'              # 
+      GO_ICON                        $'\uE626'              # 
       PUBLIC_IP_ICON                 $'\UF0AC'              # 
       LOCK_ICON                      $'\UF023'              #  
       EXECUTION_TIME_ICON            $'\uF252'              #  
@@ -276,6 +279,7 @@ case $POWERLEVEL9K_MODE in
       RUST_ICON                      ''
       PYTHON_ICON                    ''
       SWIFT_ICON                     'Swift'
+      GO_ICON                        'Go'
       PUBLIC_IP_ICON                 ''
       LOCK_ICON                      $'\UE0A2'
       EXECUTION_TIME_ICON            'Dur'
diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 7c7e2cfa..26ab9cd5 100755
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -759,7 +759,7 @@ prompt_go_version() {
   go_path=$(go env GOPATH 2>/dev/null)
 
   if [[ -n "$go_version" && "${PWD##$go_path}" != "$PWD" ]]; then
-    "$1_prompt_segment" "$0" "$2" "green" "255" "$go_version"
+    "$1_prompt_segment" "$0" "$2" "green" "255" "$go_version" "GO_ICON"
   fi
 }
 
diff --git a/test/segments/go_version.spec b/test/segments/go_version.spec
index 907dceb3..2aac460b 100755
--- a/test/segments/go_version.spec
+++ b/test/segments/go_version.spec
@@ -35,12 +35,14 @@ function mockGoEmptyGopath() {
 
 function testGo() {
   alias go=mockGo
+  POWERLEVEL9K_GO_ICON=""
   POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(go_version)
 
   PWD="$HOME/go/src/github.com/bhilburn/powerlevel9k"
 
-  assertEquals "%K{green} %F{255}go1.5.3 %k%F{green}%f " "$(build_left_prompt)"
+  assertEquals "%K{green} %F{255%}%f %F{255}go1.5.3 %k%F{green}%f " "$(build_left_prompt)"
 
+  unset POWERLEVEL9K_GO_ICON
   unset PWD
   unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
   unalias go