diff --git a/common/img/sprites/spritesmith/misc/avatar_flower_healer.png b/common/img/sprites/spritesmith/misc/avatar_flower_healer.png
new file mode 100644
index 0000000000..285cc50a94
Binary files /dev/null and b/common/img/sprites/spritesmith/misc/avatar_flower_healer.png differ
diff --git a/common/img/sprites/spritesmith/misc/avatar_flower_mage.png b/common/img/sprites/spritesmith/misc/avatar_flower_mage.png
new file mode 100644
index 0000000000..c242c3a658
Binary files /dev/null and b/common/img/sprites/spritesmith/misc/avatar_flower_mage.png differ
diff --git a/common/img/sprites/spritesmith/misc/avatar_flower_rogue.png b/common/img/sprites/spritesmith/misc/avatar_flower_rogue.png
new file mode 100644
index 0000000000..aab631b271
Binary files /dev/null and b/common/img/sprites/spritesmith/misc/avatar_flower_rogue.png differ
diff --git a/common/img/sprites/spritesmith/misc/avatar_flower_warrior.png b/common/img/sprites/spritesmith/misc/avatar_flower_warrior.png
new file mode 100644
index 0000000000..2a756e66ae
Binary files /dev/null and b/common/img/sprites/spritesmith/misc/avatar_flower_warrior.png differ
diff --git a/common/img/sprites/spritesmith/npcs/npc_alex.png b/common/img/sprites/spritesmith/npcs/npc_alex.png
index 8982854041..d4df9ff25d 100644
Binary files a/common/img/sprites/spritesmith/npcs/npc_alex.png and b/common/img/sprites/spritesmith/npcs/npc_alex.png differ
diff --git a/common/img/sprites/spritesmith/npcs/npc_bailey.png b/common/img/sprites/spritesmith/npcs/npc_bailey.png
index 419496bdd0..b44a4bab17 100644
Binary files a/common/img/sprites/spritesmith/npcs/npc_bailey.png and b/common/img/sprites/spritesmith/npcs/npc_bailey.png differ
diff --git a/common/img/sprites/spritesmith/npcs/npc_daniel.png b/common/img/sprites/spritesmith/npcs/npc_daniel.png
index 471f751e72..a596899089 100644
Binary files a/common/img/sprites/spritesmith/npcs/npc_daniel.png and b/common/img/sprites/spritesmith/npcs/npc_daniel.png differ
diff --git a/common/img/sprites/spritesmith/npcs/npc_ian.png b/common/img/sprites/spritesmith/npcs/npc_ian.png
index 86860dfa1b..0f4c6cc682 100644
Binary files a/common/img/sprites/spritesmith/npcs/npc_ian.png and b/common/img/sprites/spritesmith/npcs/npc_ian.png differ
diff --git a/common/img/sprites/spritesmith/npcs/npc_justin.png b/common/img/sprites/spritesmith/npcs/npc_justin.png
index 9365bc12c9..2dff875c79 100644
Binary files a/common/img/sprites/spritesmith/npcs/npc_justin.png and b/common/img/sprites/spritesmith/npcs/npc_justin.png differ
diff --git a/common/img/sprites/spritesmith/npcs/npc_matt.png b/common/img/sprites/spritesmith/npcs/npc_matt.png
index e129d6e43e..c000ef52aa 100644
Binary files a/common/img/sprites/spritesmith/npcs/npc_matt.png and b/common/img/sprites/spritesmith/npcs/npc_matt.png differ
diff --git a/common/img/sprites/spritesmith/npcs/npc_timetravelers.png b/common/img/sprites/spritesmith/npcs/npc_timetravelers.png
index badc7286a5..b7593f2650 100644
Binary files a/common/img/sprites/spritesmith/npcs/npc_timetravelers.png and b/common/img/sprites/spritesmith/npcs/npc_timetravelers.png differ
diff --git a/common/img/sprites/spritesmith/npcs/npc_timetravelers_active.png b/common/img/sprites/spritesmith/npcs/npc_timetravelers_active.png
index 727d3ce409..81d6968b3d 100644
Binary files a/common/img/sprites/spritesmith/npcs/npc_timetravelers_active.png and b/common/img/sprites/spritesmith/npcs/npc_timetravelers_active.png differ
diff --git a/common/img/sprites/spritesmith/npcs/seasonalshop_spring2015.png b/common/img/sprites/spritesmith/npcs/seasonalshop_spring2015.png
index e1f811893e..af538d7adb 100644
Binary files a/common/img/sprites/spritesmith/npcs/seasonalshop_spring2015.png and b/common/img/sprites/spritesmith/npcs/seasonalshop_spring2015.png differ
diff --git a/website/views/shared/header/avatar.jade b/website/views/shared/header/avatar.jade
index 75692866ff..075854b4e1 100644
--- a/website/views/shared/header/avatar.jade
+++ b/website/views/shared/header/avatar.jade
@@ -18,58 +18,59 @@ mixin avatar(opts)
     span(ng-if='profile.stats.buffs.spookDust')
       span.spookman
     span(ng-if='!profile.stats.buffs.snowball && !profile.stats.buffs.spookDust')
+      span(class='avatar_flower_{{profile.stats.class}}')
       // Back Accessory
-      span(class='{{profile.items.gear.equipped.back}}', ng-if='!profile.preferences.costume')
-      span(class='{{profile.items.gear.costume.back}}', ng-if='profile.preferences.costume')
+        span(class='{{profile.items.gear.equipped.back}}', ng-if='!profile.preferences.costume')
+        span(class='{{profile.items.gear.costume.back}}', ng-if='profile.preferences.costume')
 
       // Avatar
-      span(class='skin_{{profile.preferences.skin}}', ng-if='!profile.preferences.sleep')
-      span(class='skin_{{profile.preferences.skin}}_sleep', ng-if='profile.preferences.sleep')
+        span(class='skin_{{profile.preferences.skin}}', ng-if='!profile.preferences.sleep')
+        span(class='skin_{{profile.preferences.skin}}_sleep', ng-if='profile.preferences.sleep')
 
       // Shirt
-      span(class='{{profile.preferences.size}}_shirt_{{profile.preferences.shirt}}')
+        span(class='{{profile.preferences.size}}_shirt_{{profile.preferences.shirt}}')
 
       // Armor
-      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='{{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')
 
       //- Cape collar
         span(class='{{profile.items.gear.equipped.back}}_collar', ng-if='!profile.preferences.costume')
         span(class='{{profile.items.gear.costume.back}}_collar', ng-if='profile.preferences.costume')
 
       // Body
-      span(class='{{profile.items.gear.equipped.body}}', ng-if='!profile.preferences.costume')
-      span(class='{{profile.items.gear.costume.body}}', ng-if='profile.preferences.costume')
+        span(class='{{profile.items.gear.equipped.body}}', ng-if='!profile.preferences.costume')
+        span(class='{{profile.items.gear.costume.body}}', ng-if='profile.preferences.costume')
 
       // Hair
-      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}}')
-      span(class='hair_mustache_{{profile.preferences.hair.mustache}}_{{profile.preferences.hair.color}}')
-      span(class='hair_beard_{{profile.preferences.hair.beard}}_{{profile.preferences.hair.color}}')
+        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}}')
+        span(class='hair_mustache_{{profile.preferences.hair.mustache}}_{{profile.preferences.hair.color}}')
+        span(class='hair_beard_{{profile.preferences.hair.beard}}_{{profile.preferences.hair.color}}')
 
       // Eyewear
-      span(class='{{profile.items.gear.equipped.eyewear}}', ng-if='!profile.preferences.costume')
-      span(class='{{profile.items.gear.costume.eyewear}}', ng-if='profile.preferences.costume')
+        span(class='{{profile.items.gear.equipped.eyewear}}', ng-if='!profile.preferences.costume')
+        span(class='{{profile.items.gear.costume.eyewear}}', ng-if='profile.preferences.costume')
 
       // Helm
-      span(class='{{profile.items.gear.equipped.head}}', ng-if='!profile.preferences.costume')
-      span(class='{{profile.items.gear.costume.head}}', ng-if='profile.preferences.costume')
+        span(class='{{profile.items.gear.equipped.head}}', ng-if='!profile.preferences.costume')
+        span(class='{{profile.items.gear.costume.head}}', ng-if='profile.preferences.costume')
 
       // Head Accessory
-      span(class='{{profile.items.gear.equipped.headAccessory}}', ng-if='!profile.preferences.costume')
-      span(class='{{profile.items.gear.costume.headAccessory}}', ng-if='profile.preferences.costume')
+        span(class='{{profile.items.gear.equipped.headAccessory}}', ng-if='!profile.preferences.costume')
+        span(class='{{profile.items.gear.costume.headAccessory}}', ng-if='profile.preferences.costume')
 
       // Flower
       span(class='hair_flower_{{profile.preferences.hair.flower}}')
 
       // Shield
-      span(class='{{profile.items.gear.equipped.shield}}', ng-if='!profile.preferences.costume')
-      span(class='{{profile.items.gear.costume.shield}}', ng-if='profile.preferences.costume')
+        span(class='{{profile.items.gear.equipped.shield}}', ng-if='!profile.preferences.costume')
+        span(class='{{profile.items.gear.costume.shield}}', ng-if='profile.preferences.costume')
 
       // Weapon
-      span(class='{{profile.items.gear.equipped.weapon}}', ng-if='!profile.preferences.costume')
-      span(class='{{profile.items.gear.costume.weapon}}', ng-if='profile.preferences.costume')
+        span(class='{{profile.items.gear.equipped.weapon}}', ng-if='!profile.preferences.costume')
+        span(class='{{profile.items.gear.costume.weapon}}', ng-if='profile.preferences.costume')
 
 
     // Mount Head