diff --git a/README.md b/README.md
index 0699d163..49c08127 100644
--- a/README.md
+++ b/README.md
@@ -233,6 +233,7 @@ currently available are:
 * **dir** - Your current working directory.
 * **history** - The command number for the current line.
 * **node_version** - Show the version number of the installed Node.js.
+* **os_icon** - Display a nice little icon, depending on your operating system.
 * **rbenv** - Ruby environment information (if one is active).
 * **rspec_stats** - Show a ratio of test classes vs code classes for RSpec.
 * **status** - The return code of the previous command, and status of background jobs.
diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 1b52d038..9a71278a 100644
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -44,6 +44,11 @@
 #zstyle ':vcs_info:*+*:*' debug true
 #set -o xtrace
 
+# The `CURRENT_BG` variable is used to remember what the last BG color used was
+# when building the left-hand prompt. Because the RPROMPT is created from
+# right-left but reads the opposite, this isn't necessary for the other side.
+CURRENT_BG='NONE'
+
 # These characters require the Powerline fonts to work properly. If see boxes or
 # bizarre characters below, your fonts are not correctly installed. If you
 # do not want to install a special font, you can set `POWERLEVEL9K_MODE` to
@@ -54,117 +59,144 @@ case $POWERLEVEL9K_MODE in
     # See https://github.com/gabrielelana/awesome-terminal-fonts/tree/patching-strategy/patched
     LEFT_SEGMENT_SEPARATOR=''
     RIGHT_SEGMENT_SEPARATOR=''
-    ROOT_ICON="\uE801" # 
-    RUBY_ICON="\uE847" # 
-    AWS_ICON="\uE895" # 
-    BACKGROUND_JOBS_ICON="\uE82F " # 
-    TEST_ICON="\uE891" # 
-    OK_ICON="\u2713" # ✓
-    FAIL_ICON="\u2718" # ✘
+    ROOT_ICON="\UE801" # 
+    RUBY_ICON="\UE847" # 
+    AWS_ICON="\UE895" # 
+    BACKGROUND_JOBS_ICON="\UE82F " # 
+    TEST_ICON="\UE891" # 
+    OK_ICON="\U2713" # ✓
+    FAIL_ICON="\U2718" # ✘
     SYMFONY_ICON="SF"
-    VCS_UNTRACKED_ICON="\uE16C" # 
-    VCS_UNSTAGED_ICON="\uE17C" # 
-    VCS_STAGED_ICON="\uE168" # 
-    VCS_STASH_ICON="\uE133 " # 
-    #VCS_INCOMING_CHANGES="\uE1EB " # 
-    #VCS_INCOMING_CHANGES="\uE80D " # 
-    VCS_INCOMING_CHANGES="\uE131 " # 
-    #VCS_OUTGOING_CHANGES="\uE1EC " # 
-    #VCS_OUTGOING_CHANGES="\uE80E " # 
-    VCS_OUTGOING_CHANGES="\uE132 " # 
-    VCS_TAG_ICON="\uE817 " # 
-    VCS_BOOKMARK_ICON="\uE87B" # 
-    VCS_COMMIT_ICON="\uE821 " # 
-    VCS_BRANCH_ICON="\uE220" # 
-    VCS_REMOTE_BRANCH_ICON=" \uE804 " # 
-    VCS_GIT_ICON="\uE20E  " # 
-    VCS_HG_ICON="\uE1C3  " # 
+    APPLE_ICON=$'\UF8FF' # 
+    FREEBSD_ICON=$'\U1F608 ' # 😈
+    LINUX_ICON=$'\U1F427 ' # 🐧
+    SUNOS_ICON=$'\U1F31E ' # 🌞
+    VCS_UNTRACKED_ICON="\UE16C" # 
+    VCS_UNSTAGED_ICON="\UE17C" # 
+    VCS_STAGED_ICON="\UE168" # 
+    VCS_STASH_ICON="\UE133 " # 
+    #VCS_INCOMING_CHANGES="\UE1EB " # 
+    #VCS_INCOMING_CHANGES="\UE80D " # 
+    VCS_INCOMING_CHANGES="\UE131 " # 
+    #VCS_OUTGOING_CHANGES="\UE1EC " # 
+    #VCS_OUTGOING_CHANGES="\UE80E " # 
+    VCS_OUTGOING_CHANGES="\UE132 " # 
+    VCS_TAG_ICON="\UE817 " # 
+    VCS_BOOKMARK_ICON="\UE87B" # 
+    VCS_COMMIT_ICON="\UE821 " # 
+    VCS_BRANCH_ICON=$'\UE220' # 
+    VCS_REMOTE_BRANCH_ICON=" \UE804 " # 
+    VCS_GIT_ICON="\UE20E  " # 
+    VCS_HG_ICON="\UE1C3  " # 
   ;;
   'compatible')
-    LEFT_SEGMENT_SEPARATOR="\u2B80" # ⮀
-    RIGHT_SEGMENT_SEPARATOR="\u2B82" # ⮂
-    ROOT_ICON="\u26A1" # ⚡
+    LEFT_SEGMENT_SEPARATOR="\U2B80" # ⮀
+    RIGHT_SEGMENT_SEPARATOR="\U2B82" # ⮂
+    ROOT_ICON="\U26A1" # ⚡
     RUBY_ICON=''
     AWS_ICON="AWS:"
-    BACKGROUND_JOBS_ICON="\u2699" # ⚙
+    BACKGROUND_JOBS_ICON="\U2699" # ⚙
     TEST_ICON=''
-    OK_ICON="\u2713" # ✓
-    FAIL_ICON="\u2718" # ✘
+    OK_ICON="\U2713" # ✓
+    FAIL_ICON="\U2718" # ✘
     SYMFONY_ICON="SF"
+    APPLE_ICON='OSX'
+    FREEBSD_ICON='BSD'
+    LINUX_ICON='Lx'
+    SUNOS_ICON='Sun'
     VCS_UNTRACKED_ICON='?'
-    VCS_UNSTAGED_ICON="\u25CF" # ●
-    VCS_STAGED_ICON="\u271A" # ✚
-    VCS_STASH_ICON="\u235F" # ⍟
-    VCS_INCOMING_CHANGES="\u2193" # ↓
-    VCS_OUTGOING_CHANGES="\u2191" # ↑
+    VCS_UNSTAGED_ICON="\U25CF" # ●
+    VCS_STAGED_ICON="\U271A" # ✚
+    VCS_STASH_ICON="\U235F" # ⍟
+    VCS_INCOMING_CHANGES="\U2193" # ↓
+    VCS_OUTGOING_CHANGES="\U2191" # ↑
     VCS_TAG_ICON=''
-    VCS_BOOKMARK_ICON="\u263F" # ☿
+    VCS_BOOKMARK_ICON="\U263F" # ☿
     VCS_COMMIT_ICON=''
     VCS_BRANCH_ICON='@'
-    VCS_REMOTE_BRANCH_ICON="\u2192" # →
+    VCS_REMOTE_BRANCH_ICON="\U2192" # →
     VCS_GIT_ICON='Git'
     VCS_HG_ICON='HG'
   ;;
   'awesome-patched')
     # Awesome-Patched Font required!
     # See https://github.com/gabrielelana/awesome-terminal-fonts/tree/patching-strategy/patched
-    LEFT_SEGMENT_SEPARATOR="\uE0B0" # 
-    RIGHT_SEGMENT_SEPARATOR="\uE0B2" # 
-    ROOT_ICON="\u26A1" # ⚡
-    RUBY_ICON="\uE847" # 
-    AWS_ICON="\uE895" # 
-    BACKGROUND_JOBS_ICON="\uE82F " # 
-    TEST_ICON="\uE891" # 
-    OK_ICON="\u2713" # ✓
-    FAIL_ICON="\u2718" # ✘
+    LEFT_SEGMENT_SEPARATOR="\UE0B0" # 
+    RIGHT_SEGMENT_SEPARATOR="\UE0B2" # 
+    ROOT_ICON="\U26A1" # ⚡
+    RUBY_ICON="\UE847" # 
+    AWS_ICON="\UE895" # 
+    BACKGROUND_JOBS_ICON="\UE82F " # 
+    TEST_ICON="\UE891" # 
+    OK_ICON="\U2713" # ✓
+    FAIL_ICON="\U2718" # ✘
     SYMFONY_ICON="SF"
-    VCS_UNTRACKED_ICON="\uE16C" # 
-    VCS_UNSTAGED_ICON="\uE17C" # 
-    VCS_STAGED_ICON="\uE168" # 
-    VCS_STASH_ICON="\uE133 " # 
-    #VCS_INCOMING_CHANGES="\uE1EB " # 
-    #VCS_INCOMING_CHANGES="\uE80D " # 
-    VCS_INCOMING_CHANGES="\uE131 " # 
-    #VCS_OUTGOING_CHANGES="\uE1EC " # 
-    #VCS_OUTGOING_CHANGES="\uE80E " # 
-    VCS_OUTGOING_CHANGES="\uE132 " # 
-    VCS_TAG_ICON="\uE817 " # 
-    VCS_BOOKMARK_ICON="\uE87B" # 
-    VCS_COMMIT_ICON="\uE821 " # 
-    VCS_BRANCH_ICON="\uE220" # 
-    VCS_REMOTE_BRANCH_ICON=" \uE804 " # 
-    VCS_GIT_ICON="\uE20E  " # 
-    VCS_HG_ICON="\uE1C3  " # 
+    APPLE_ICON=$'\UF8FF' # 
+    FREEBSD_ICON=$'\U1F608 ' # 😈
+    LINUX_ICON=$'\U1F427 ' # 🐧
+    SUNOS_ICON=$'\U1F31E ' # 🌞
+    VCS_UNTRACKED_ICON="\UE16C" # 
+    VCS_UNSTAGED_ICON="\UE17C" # 
+    VCS_STAGED_ICON="\UE168" # 
+    VCS_STASH_ICON="\UE133 " # 
+    #VCS_INCOMING_CHANGES="\UE1EB " # 
+    #VCS_INCOMING_CHANGES="\UE80D " # 
+    VCS_INCOMING_CHANGES="\UE131 " # 
+    #VCS_OUTGOING_CHANGES="\UE1EC " # 
+    #VCS_OUTGOING_CHANGES="\UE80E " # 
+    VCS_OUTGOING_CHANGES="\UE132 " # 
+    VCS_TAG_ICON="\UE817 " # 
+    VCS_BOOKMARK_ICON="\UE87B" # 
+    VCS_COMMIT_ICON="\UE821 " # 
+    VCS_BRANCH_ICON=$'\UE220' # 
+    VCS_REMOTE_BRANCH_ICON=" \UE804 " # 
+    VCS_GIT_ICON="\UE20E  " # 
+    VCS_HG_ICON="\UE1C3  " # 
   ;;
   *)
     # Powerline-Patched Font required!
     # See https://github.com/Lokaltog/powerline-fonts
-    LEFT_SEGMENT_SEPARATOR="\uE0B0" # 
-    RIGHT_SEGMENT_SEPARATOR="\uE0B2" # 
-    ROOT_ICON="\u26A1" # ⚡
+    LEFT_SEGMENT_SEPARATOR="\UE0B0" # 
+    RIGHT_SEGMENT_SEPARATOR="\UE0B2" # 
+    ROOT_ICON="\U26A1" # ⚡
     RUBY_ICON=''
     AWS_ICON="AWS:"
-    BACKGROUND_JOBS_ICON="\u2699" # ⚙
+    BACKGROUND_JOBS_ICON="\U2699" # ⚙
     TEST_ICON=''
-    OK_ICON="\u2713" # ✓
-    FAIL_ICON="\u2718" # ✘
+    OK_ICON="\U2713" # ✓
+    FAIL_ICON="\U2718" # ✘
     SYMFONY_ICON="SF"
+    APPLE_ICON='OSX'
+    FREEBSD_ICON='BSD'
+    LINUX_ICON='Lx'
+    SUNOS_ICON='Sun'
     VCS_UNTRACKED_ICON='?'
-    VCS_UNSTAGED_ICON="\u25CF" # ●
-    VCS_STAGED_ICON="\u271A" # ✚
-    VCS_STASH_ICON="\u235F" # ⍟
-    VCS_INCOMING_CHANGES="\u2193" # ↓
-    VCS_OUTGOING_CHANGES="\u2191" # ↑
+    VCS_UNSTAGED_ICON="\U25CF" # ●
+    VCS_STAGED_ICON="\U271A" # ✚
+    VCS_STASH_ICON="\U235F" # ⍟
+    VCS_INCOMING_CHANGES="\U2193" # ↓
+    VCS_OUTGOING_CHANGES="\U2191" # ↑
     VCS_TAG_ICON=''
-    VCS_BOOKMARK_ICON="\u263F" # ☿
+    VCS_BOOKMARK_ICON="\U263F" # ☿
     VCS_COMMIT_ICON=''
-    VCS_BRANCH_ICON="\uE0A0 " # 
-    VCS_REMOTE_BRANCH_ICON="\u2192" # →
+    VCS_BRANCH_ICON="\UE0A0 " # 
+    VCS_REMOTE_BRANCH_ICON="\U2192" # →
     VCS_GIT_ICON=""
     VCS_HG_ICON=""
   ;;
 esac
 
+# OS detection for the `os_icon` segment
+case $(uname) in
+    Darwin)     OS_ICON=$APPLE_ICON   ;;
+    FreeBSD)    OS_ICON=$FREEBSD_ICON ;;
+    OpenBSD)    OS_ICON=$FREEBSD_ICON ;;
+    DragonFly)  OS_ICON=$FREEBSD_ICON ;;
+    Linux)      OS_ICON=$LINUX_ICON   ;;
+    SunOS)      OS_ICON=$SUNOS_ICON   ;;
+    *)          OS_ICON=''            ;;
+esac
+
 if [[ "$POWERLEVEL9K_HIDE_BRANCH_ICON" == true ]]; then
     VCS_BRANCH_ICON=''
 fi
@@ -487,11 +519,16 @@ prompt_longstatus() {
 prompt_node_version() {
   local nvm_prompt=$(node -v 2>/dev/null)
   [[ -z "${nvm_prompt}" ]] && return
-  NODE_ICON=$'\u2B22' # ⬢
+  NODE_ICON=$'\U2B22' # ⬢
 
   $1_prompt_segment "$0" "green" "white" "${nvm_prompt:1} $NODE_ICON"
 }
 
+# print a little OS icon
+prompt_os_icon() {
+  $1_prompt_segment "$0" "008" "255" "$OS_ICON"
+}
+
 # rbenv information
 prompt_rbenv() {
   if [[ -n "$RBENV_VERSION" ]]; then