diff --git a/plugin/tagbar.vim b/plugin/tagbar.vim
index 3e8f02d..4bb1ac3 100644
--- a/plugin/tagbar.vim
+++ b/plugin/tagbar.vim
@@ -86,15 +86,13 @@ if !exists('g:tagbar_usearrows')
 endif
 
 
-if has('multi_byte')
-    if has('unix') && &encoding == 'utf-8' &&
-     \ (empty(&termencoding) || &termencoding == 'utf-8')
-        let s:icon_closed = '▶'
-        let s:icon_open   = '▼'
-    elseif (has('win32') || has('win64')) && g:tagbar_usearrows
-        let s:icon_closed = '▷'
-        let s:icon_open   = '◢'
-    endif
+if has('multi_byte') && has('unix') && &encoding == 'utf-8' &&
+ \ (empty(&termencoding) || &termencoding == 'utf-8')
+    let s:icon_closed = '▶'
+    let s:icon_open   = '▼'
+elseif has('multi_byte') && (has('win32') || has('win64')) && g:tagbar_usearrows
+    let s:icon_closed = '▷'
+    let s:icon_open   = '◢'
 else
     let s:icon_closed = '+'
     let s:icon_open   = '-'
diff --git a/syntax/tagbar.vim b/syntax/tagbar.vim
index a85d561..f5b3447 100644
--- a/syntax/tagbar.vim
+++ b/syntax/tagbar.vim
@@ -9,27 +9,25 @@ if exists("b:current_syntax")
   finish
 endif
 
-if has('multi_byte')
-    if has('unix') && &encoding == 'utf-8' &&
-     \ (empty(&termencoding) || &termencoding == 'utf-8')
-        syntax match TagbarKind      '\([▶▼][-+ ]\)\@<=[^-+: ]\+[^:]\+$'
-        syntax match TagbarScope     '[^-+#▶▼(* ]\+\(\*\? :\)\@='
+if has('multi_byte') && has('unix') && &encoding == 'utf-8' &&
+ \ (empty(&termencoding) || &termencoding == 'utf-8')
+    syntax match TagbarKind      '\([▶▼][-+ ]\)\@<=[^-+: ]\+[^:]\+$'
+    syntax match TagbarScope     '[^-+#▶▼(* ]\+\(\*\? :\)\@='
 
-        syntax match TagbarFoldIcon  '[▶▼]\([-+# ]\)\@='
+    syntax match TagbarFoldIcon  '[▶▼]\([-+# ]\)\@='
 
-        syntax match TagbarAccessPublic    '\([▶▼ ]\)\@<=+\([^-+# ]\)\@='
-        syntax match TagbarAccessProtected '\([▶▼ ]\)\@<=#\([^-+# ]\)\@='
-        syntax match TagbarAccessPrivate   '\([▶▼ ]\)\@<=-\([^-+# ]\)\@='
-    elseif (has('win32') || has('win64')) && g:tagbar_usearrows
-        syntax match TagbarKind      '\([▷◢][-+ ]\)\@<=[^-+: ]\+[^:]\+$'
-        syntax match TagbarScope     '[^-+#▷◢(* ]\+\(\*\? :\)\@='
+    syntax match TagbarAccessPublic    '\([▶▼ ]\)\@<=+\([^-+# ]\)\@='
+    syntax match TagbarAccessProtected '\([▶▼ ]\)\@<=#\([^-+# ]\)\@='
+    syntax match TagbarAccessPrivate   '\([▶▼ ]\)\@<=-\([^-+# ]\)\@='
+elseif has('multi_byte') && (has('win32') || has('win64')) && g:tagbar_usearrows
+    syntax match TagbarKind      '\([▷◢][-+ ]\)\@<=[^-+: ]\+[^:]\+$'
+    syntax match TagbarScope     '[^-+#▷◢(* ]\+\(\*\? :\)\@='
 
-        syntax match TagbarFoldIcon  '[▷◢]\([-+# ]\)\@='
+    syntax match TagbarFoldIcon  '[▷◢]\([-+# ]\)\@='
 
-        syntax match TagbarAccessPublic    '\([▷◢ ]\)\@<=+\([^-+# ]\)\@='
-        syntax match TagbarAccessProtected '\([▷◢ ]\)\@<=#\([^-+# ]\)\@='
-        syntax match TagbarAccessPrivate   '\([▷◢ ]\)\@<=-\([^-+# ]\)\@='
-    endif
+    syntax match TagbarAccessPublic    '\([▷◢ ]\)\@<=+\([^-+# ]\)\@='
+    syntax match TagbarAccessProtected '\([▷◢ ]\)\@<=#\([^-+# ]\)\@='
+    syntax match TagbarAccessPrivate   '\([▷◢ ]\)\@<=-\([^-+# ]\)\@='
 else
     syntax match TagbarKind      '\([-+][-+ ]\)\@<=[^-+: ]\+[^:]\+$'
     syntax match TagbarScope     '[^-+#(* ]\+\(\*\? :\)\@='