diff --git a/views/options/profile.jade b/views/options/profile.jade
index 69812fcb77..6a5ad5b896 100644
--- a/views/options/profile.jade
+++ b/views/options/profile.jade
@@ -24,7 +24,7 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template')
           // Bangs
           li.customize-menu
             menu(label='Bangs')
-              button(class='head_warrior_0 customize-option', type='button', ng-click='set("preferences.hair.bangs",0)')
+              button(class='head_0 customize-option', type='button', ng-click='set("preferences.hair.bangs",0)')
               button(class='hair_bangs_1_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set("preferences.hair.bangs",1)')
               button(class='hair_bangs_2_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set("preferences.hair.bangs",2)')
               button(class='hair_bangs_3_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set("preferences.hair.bangs",3)')
@@ -32,7 +32,7 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template')
           // Beard
           li.customize-menu
             menu(label='Beard')
-              button(class='head_warrior_0 customize-option', type='button', ng-click='set("preferences.hair.beard",0)')
+              button(class='head_0 customize-option', type='button', ng-click='set("preferences.hair.beard",0)')
               button(class='hair_beard_1_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set("preferences.hair.beard",1)')
               button(class='hair_beard_2_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set("preferences.hair.beard",2)')
               button(class='hair_beard_3_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set("preferences.hair.beard",3)')
@@ -40,14 +40,14 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template')
           // Mustache
           li.customize-menu
             menu(label='Mustache')
-              button(class='head_warrior_0 customize-option', type='button', ng-click='set("preferences.hair.mustache",0)')
+              button(class='head_0 customize-option', type='button', ng-click='set("preferences.hair.mustache",0)')
               button(class='hair_mustache_1_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set("preferences.hair.mustache",1)')
               button(class='hair_mustache_2_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set("preferences.hair.mustache",2)')
 
           // Base
          li.customize-menu
            menu(label='Base')
-             button(class='head_warrior_0 customize-option', type='button', ng-click='set("preferences.hair.base",0)')
+             button(class='head_0 customize-option', type='button', ng-click='set("preferences.hair.base",0)')
              button(class='hair_base_1_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set("preferences.hair.base",1)')
              button(class='hair_base_2_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set("preferences.hair.base",2)')
              button(class='hair_base_3_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set("preferences.hair.base",3)')
diff --git a/views/shared/header/avatar.jade b/views/shared/header/avatar.jade
index 51d26eb294..6b26a5b5b6 100644
--- a/views/shared/header/avatar.jade
+++ b/views/shared/header/avatar.jade
@@ -14,7 +14,7 @@ figure.herobox(ng-click='spell ? castEnd(profile, "user", $event) : clickMember(
     span(class='{{profile.preferences.size}}_{{profile.items.gear.equipped.armor}}', ng-if='!profile.preferences.costume')
     span(class='{{profile.preferences.size}}_{{profile.items.gear.costume.armor}}', ng-if='profile.preferences.costume')
 
-    span(class='head_warrior_0')
+    span(class='head_0')
     span(class='hair_base_{{profile.preferences.hair.base}}_{{profile.preferences.hair.color}}')
     span(class='hair_bangs_{{profile.preferences.hair.bangs}}_{{profile.preferences.hair.color}}')
 
diff --git a/views/shared/modals/classes.jade b/views/shared/modals/classes.jade
index 9073172be8..6c789ce576 100644
--- a/views/shared/modals/classes.jade
+++ b/views/shared/modals/classes.jade
@@ -14,9 +14,11 @@
           .character-sprites
             span(class='skin_{{user.preferences.skin}}')
             span(class='{{user.preferences.size}}_armor_warrior_5')
-            span(class='head_warrior_0')
+            span(class='head_0')
             span(class='hair_base_{{user.preferences.hair.base}}_{{user.preferences.hair.color}}')
             span(class='hair_bangs_{{user.preferences.hair.bangs}}_{{user.preferences.hair.color}}')
+            span(class='hair_beard_{{user.preferences.hair.beard}}_{{user.preferences.hair.color}}')
+            span(class='hair_mustache_{{user.preferences.hair.mustache}}_{{user.preferences.hair.color}}')
             span(class='head_warrior_5')
             span(class='shield_warrior_5')
             span(class='weapon_warrior_6')
@@ -26,9 +28,11 @@
           .character-sprites
             span(class='skin_{{user.preferences.skin}}')
             span(class='{{user.preferences.size}}_armor_wizard_5')
-            span(class='head_warrior_0')
+            span(class='head_0')
             span(class='hair_base_{{user.preferences.hair.base}}_{{user.preferences.hair.color}}')
             span(class='hair_bangs_{{user.preferences.hair.bangs}}_{{user.preferences.hair.color}}')
+            span(class='hair_beard_{{user.preferences.hair.beard}}_{{user.preferences.hair.color}}')
+            span(class='hair_mustache_{{user.preferences.hair.mustache}}_{{user.preferences.hair.color}}')
             span(class='head_wizard_5')
             span(class='shield_wizard_5')
             span(class='weapon_wizard_6')
@@ -38,9 +42,11 @@
           .character-sprites
             span(class='skin_{{user.preferences.skin}}')
             span(class='{{user.preferences.size}}_armor_rogue_5')
-            span(class='head_warrior_0')
+            span(class='head_0')
             span(class='hair_base_{{user.preferences.hair.base}}_{{user.preferences.hair.color}}')
             span(class='hair_bangs_{{user.preferences.hair.bangs}}_{{user.preferences.hair.color}}')
+            span(class='hair_beard_{{user.preferences.hair.beard}}_{{user.preferences.hair.color}}')
+            span(class='hair_mustache_{{user.preferences.hair.mustache}}_{{user.preferences.hair.color}}')
             span(class='head_rogue_5')
             span(class='shield_rogue_5')
             span(class='weapon_rogue_6')
@@ -50,9 +56,11 @@
           .character-sprites
             span(class='skin_{{user.preferences.skin}}')
             span(class='{{user.preferences.size}}_armor_healer_5')
-            span(class='head_warrior_0')
+            span(class='head_0')
             span(class='hair_base_{{user.preferences.hair.base}}_{{user.preferences.hair.color}}')
             span(class='hair_bangs_{{user.preferences.hair.bangs}}_{{user.preferences.hair.color}}')
+            span(class='hair_beard_{{user.preferences.hair.beard}}_{{user.preferences.hair.color}}')
+            span(class='hair_mustache_{{user.preferences.hair.mustache}}_{{user.preferences.hair.color}}')
             span(class='head_healer_5')
             span(class='shield_healer_5')
             span(class='weapon_healer_6')