diff --git a/views/options/profile.jade b/views/options/profile.jade
index 27c5baa885..18575f46b7 100644
--- a/views/options/profile.jade
+++ b/views/options/profile.jade
@@ -11,6 +11,15 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template')
           label.checkbox
             input(type='checkbox', ng-model='user.preferences.showHelm', ng-change='toggleHelm(user.preferences.showHelm)')
             | Show Helm
+          label.checkbox
+            input(type='checkbox', ng-model='user.preferences.showWeapon', ng-change='toggleHelm(user.preferences.showWeapon)')
+            | Show Weapon
+          label.checkbox
+            input(type='checkbox', ng-model='user.preferences.showShield', ng-change='toggleHelm(user.preferences.showShield)')
+            | Show Shield
+          label.checkbox
+            input(type='checkbox', ng-model='user.preferences.showArmor', ng-change='toggleHelm(user.preferences.showArmor)')
+            | Show Armor
 
         menu(ng-show='user.preferences.gender=="f"', type='list')
           li.customize-menu
diff --git a/views/shared/header/avatar.jade b/views/shared/header/avatar.jade
index 3154f5f92d..4ea0f2b05c 100644
--- a/views/shared/header/avatar.jade
+++ b/views/shared/header/avatar.jade
@@ -11,11 +11,12 @@ figure.herobox(ng-click='clickMember(profile._id)', data-name='{{profile.profile
     // Avatar
     span(class='{{profile.preferences.gender}}_skin_{{profile.preferences.skin}}')
     span(class='{{profile.preferences.gender}}_hair_{{profile.preferences.hair}}')
-    span(class='{{equipped("armor", profile.items.armor, profile.preferences, profile.backer, profile.contributor)}}')
+    span(class='{{equipped("armor", 0, profile.preferences, profile.backer, profile.contributor)}}')
+    span(class='{{equipped("armor", profile.items.armor, profile.preferences, profile.backer, profile.contributor)}}', ng-show='profile.preferences.showArmor')
     span(class='{{profile.preferences.gender}}_head_0', ng-hide='profile.preferences.showHelm')
     span(class='{{equipped("head", profile.items.head, profile.preferences, profile.backer, profile.contributor)}}', ng-show='profile.preferences.showHelm')
-    span(class='{{equipped("shield",profile.items.shield,profile.preferences, profile.backer, profile.contributor)}}')
-    span(class='{{equipped("weapon",profile.items.weapon,profile.preferences, profile.backer, profile.contributor)}}')
+    span(class='{{equipped("shield",profile.items.shield,profile.preferences, profile.backer, profile.contributor)}}', ng-show='profile.preferences.showShield')
+    span(class='{{equipped("weapon",profile.items.weapon,profile.preferences, profile.backer, profile.contributor)}}', ng-show='profile.preferences.showWeapon')
 
     // Mount Head
     span(ng-if='profile.items.currentMount', class='Mount_Head_{{profile.items.currentMount}}')