diff --git a/public/img/BrowserQuest/habitrpg_mods/girl.png b/public/img/BrowserQuest/habitrpg_mods/armor0_f.png
similarity index 100%
rename from public/img/BrowserQuest/habitrpg_mods/girl.png
rename to public/img/BrowserQuest/habitrpg_mods/armor0_f.png
diff --git a/public/img/BrowserQuest/habitrpg_mods/armor0.png b/public/img/BrowserQuest/habitrpg_mods/armor0_m.png
similarity index 100%
rename from public/img/BrowserQuest/habitrpg_mods/armor0.png
rename to public/img/BrowserQuest/habitrpg_mods/armor0_m.png
diff --git a/public/img/BrowserQuest/habitrpg_mods/girl_armor0.png b/public/img/BrowserQuest/habitrpg_mods/armor1_f.png
similarity index 100%
rename from public/img/BrowserQuest/habitrpg_mods/girl_armor0.png
rename to public/img/BrowserQuest/habitrpg_mods/armor1_f.png
diff --git a/public/img/BrowserQuest/habitrpg_mods/armor1.png b/public/img/BrowserQuest/habitrpg_mods/armor1_m.png
similarity index 100%
rename from public/img/BrowserQuest/habitrpg_mods/armor1.png
rename to public/img/BrowserQuest/habitrpg_mods/armor1_m.png
diff --git a/public/img/BrowserQuest/habitrpg_mods/girl_armor1_v1.png b/public/img/BrowserQuest/habitrpg_mods/armor2_f_v1.png
similarity index 100%
rename from public/img/BrowserQuest/habitrpg_mods/girl_armor1_v1.png
rename to public/img/BrowserQuest/habitrpg_mods/armor2_f_v1.png
diff --git a/public/img/BrowserQuest/habitrpg_mods/girl_armor1_v2.png b/public/img/BrowserQuest/habitrpg_mods/armor2_f_v2.png
similarity index 100%
rename from public/img/BrowserQuest/habitrpg_mods/girl_armor1_v2.png
rename to public/img/BrowserQuest/habitrpg_mods/armor2_f_v2.png
diff --git a/public/img/BrowserQuest/habitrpg_mods/armor2.png b/public/img/BrowserQuest/habitrpg_mods/armor2_m.png
similarity index 100%
rename from public/img/BrowserQuest/habitrpg_mods/armor2.png
rename to public/img/BrowserQuest/habitrpg_mods/armor2_m.png
diff --git a/public/img/BrowserQuest/habitrpg_mods/girl_armor2_v1.png b/public/img/BrowserQuest/habitrpg_mods/armor3_f_v1.png
similarity index 100%
rename from public/img/BrowserQuest/habitrpg_mods/girl_armor2_v1.png
rename to public/img/BrowserQuest/habitrpg_mods/armor3_f_v1.png
diff --git a/public/img/BrowserQuest/habitrpg_mods/girl_armor2_v2.png b/public/img/BrowserQuest/habitrpg_mods/armor3_f_v2.png
similarity index 100%
rename from public/img/BrowserQuest/habitrpg_mods/girl_armor2_v2.png
rename to public/img/BrowserQuest/habitrpg_mods/armor3_f_v2.png
diff --git a/public/img/BrowserQuest/habitrpg_mods/armor3.png b/public/img/BrowserQuest/habitrpg_mods/armor3_m.png
similarity index 100%
rename from public/img/BrowserQuest/habitrpg_mods/armor3.png
rename to public/img/BrowserQuest/habitrpg_mods/armor3_m.png
diff --git a/public/img/BrowserQuest/habitrpg_mods/girl_armor3_v1.png b/public/img/BrowserQuest/habitrpg_mods/armor4_f_v1.png
similarity index 100%
rename from public/img/BrowserQuest/habitrpg_mods/girl_armor3_v1.png
rename to public/img/BrowserQuest/habitrpg_mods/armor4_f_v1.png
diff --git a/public/img/BrowserQuest/habitrpg_mods/girl_armor3_v2.png b/public/img/BrowserQuest/habitrpg_mods/armor4_f_v2.png
similarity index 100%
rename from public/img/BrowserQuest/habitrpg_mods/girl_armor3_v2.png
rename to public/img/BrowserQuest/habitrpg_mods/armor4_f_v2.png
diff --git a/public/img/BrowserQuest/habitrpg_mods/armor4.png b/public/img/BrowserQuest/habitrpg_mods/armor4_m.png
similarity index 100%
rename from public/img/BrowserQuest/habitrpg_mods/armor4.png
rename to public/img/BrowserQuest/habitrpg_mods/armor4_m.png
diff --git a/public/img/BrowserQuest/habitrpg_mods/girl_armor4_v1.png b/public/img/BrowserQuest/habitrpg_mods/armor5_f_v1.png
similarity index 100%
rename from public/img/BrowserQuest/habitrpg_mods/girl_armor4_v1.png
rename to public/img/BrowserQuest/habitrpg_mods/armor5_f_v1.png
diff --git a/public/img/BrowserQuest/habitrpg_mods/girl_armor4_v2.png b/public/img/BrowserQuest/habitrpg_mods/armor5_f_v2.png
similarity index 100%
rename from public/img/BrowserQuest/habitrpg_mods/girl_armor4_v2.png
rename to public/img/BrowserQuest/habitrpg_mods/armor5_f_v2.png
diff --git a/public/img/BrowserQuest/habitrpg_mods/armor5.png b/public/img/BrowserQuest/habitrpg_mods/armor5_m.png
similarity index 100%
rename from public/img/BrowserQuest/habitrpg_mods/armor5.png
rename to public/img/BrowserQuest/habitrpg_mods/armor5_m.png
diff --git a/src/app/helpers.coffee b/src/app/helpers.coffee
index 29b0bc270f..da74ee35dc 100644
--- a/src/app/helpers.coffee
+++ b/src/app/helpers.coffee
@@ -54,4 +54,4 @@ module.exports.viewHelpers = (view) ->
     a < b
   
   view.fn "tokens", (money) ->
-    return money/0.25
+    return money/0.25
\ No newline at end of file
diff --git a/src/app/index.coffee b/src/app/index.coffee
index f370dd6f90..b3fe749e19 100644
--- a/src/app/index.coffee
+++ b/src/app/index.coffee
@@ -15,10 +15,21 @@ browser = require './browser'
 _ = require('underscore')
 
 setupListReferences = (model) ->
-  # Setup Task Lists
   taskTypes = ['habit', 'daily', 'todo', 'reward']
   _.each taskTypes, (type) ->  model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids"
 
+setupModelFns = (model) ->
+  model.fn '_user._tnl', '_user.stats.lvl', (lvl) ->
+    # see https://github.com/lefnire/habitrpg/issues/4
+    # also update in scoring.coffee. TODO create a function accessible in both locations
+    (lvl*100)/5
+
+  model.fn '_user._armor', '_user.items.armor', '_user.preferences.gender', (armor, gender) ->
+    if gender == 'f'
+      "armor#{armor}_f.png"
+    else
+      "armor#{armor}_m.png"
+
 # ========== ROUTES ==========
 
 get '/', (page, model, next) ->
@@ -79,12 +90,7 @@ get '/', (page, model, next) ->
       user.set('notifications.kickstarter', 'show')
 
     setupListReferences(model)
-
-    # Setup Model Functions
-    model.fn '_user._tnl', '_user.stats.lvl', (lvl) ->
-      # see https://github.com/lefnire/habitrpg/issues/4
-      # also update in scoring.coffee. TODO create a function accessible in both locations
-      (lvl*100)/5
+    setupModelFns(model)
 
     page.render()
 
@@ -93,7 +99,7 @@ get '/', (page, model, next) ->
 resetDom = (model) ->
   window.DERBY.app.dom.clear()
   view.render(model)
-
+  setupModelFns(model)
 
 ready (model) ->
   user = model.at('_user')
@@ -250,10 +256,10 @@ ready (model) ->
     user.set 'stats.money', money - value
     if type == 'armor'
       user.set 'items.armor', index
-      model.set '_items.armor', content.items.armor[parseInt(index) + 1]
+      model.set '_view.items.armor', content.items.armor[parseInt(index) + 1]
     else if type == 'weapon'
       user.set 'items.weapon', index
-      model.set '_items.weapon', content.items.weapon[parseInt(index) + 1]
+      model.set '_view.items.weapon', content.items.weapon[parseInt(index) + 1]
     else if type == 'potion'
       hp = user.get 'stats.hp'
       hp += 15
diff --git a/views/app/index.html b/views/app/index.html
index a5e34be88c..3ac4d6daa6 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -124,7 +124,7 @@
               <td id="avatar">
                 <div class='avatar-sprites'>
                   <img class='weapon weapon-{_user.items.weapon}' src="/img/BrowserQuest/habitrpg_mods/weapon{_user.items.weapon}.png" />
-                  <img class='armor armor-{_user.items.armor}' src="/img/BrowserQuest/habitrpg_mods/armor{_user.items.armor}.png" />
+                  <img class='armor armor-{_user.items.armor}' src="/img/BrowserQuest/habitrpg_mods/{_user._armor}" />
                 </div>
                 <div id="lvl"><span class="badge badge-info">Lvl {_user.stats.lvl}</span></div>
               </td>