diff --git a/website/client/src/assets/scss/animals.scss b/website/client/src/assets/scss/animals.scss
index 2ef5d5a24a..91d3e7acdf 100644
--- a/website/client/src/assets/scss/animals.scss
+++ b/website/client/src/assets/scss/animals.scss
@@ -5,7 +5,14 @@
   right: 0;
   bottom: 0;
   left: 0;
-  top: -28px !important;
+
+  &:not([class*="FlyingPig"]) {
+    top: -28px !important;
+  }
+}
+
+.Pet[class*="FlyingPig"] {
+  top: 7px !important;
 }
 
 .Pet.Pet-Dragon-Hydra {
diff --git a/website/client/src/assets/scss/variables.scss b/website/client/src/assets/scss/variables.scss
index 9d6f95f2e0..65f9ebf339 100644
--- a/website/client/src/assets/scss/variables.scss
+++ b/website/client/src/assets/scss/variables.scss
@@ -2,11 +2,11 @@
 // possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, spring, summer
 // more to be added on future seasons
 
-$npc_market_flavor: 'aprilfools';
-$npc_quests_flavor: 'aprilfools';
-$npc_seasonal_flavor: 'aprilfools';
-$npc_timetravelers_flavor: 'aprilfools';
-$npc_tavern_flavor: 'aprilfools';
+$npc_market_flavor: 'spring';
+$npc_quests_flavor: 'spring';
+$npc_seasonal_flavor: 'spring';
+$npc_timetravelers_flavor: 'spring';
+$npc_tavern_flavor: 'spring';
 
 $restingToolbarHeight: 40px;
 $menuToolbarHeight: 56px;
diff --git a/website/client/src/components/avatar.vue b/website/client/src/components/avatar.vue
index a5b7328f51..93609b7dd8 100644
--- a/website/client/src/components/avatar.vue
+++ b/website/client/src/components/avatar.vue
@@ -79,8 +79,9 @@
         ></span>
         <!-- Pet-->
         <span
+          v-if="member.items.currentPet"
           class="current-pet"
-          :class="foolPet(member.items.currentPet)"
+          :class="'Pet-' + member.items.currentPet"
         ></span>
       </template>
     </div>
@@ -123,7 +124,6 @@
 </style>
 
 <script>
-import includes from 'lodash/includes';
 import { mapState } from '@/libs/store';
 
 import ClassBadge from '@/components/members/classBadge';
@@ -186,7 +186,7 @@ export default {
         return this.overrideTopPadding;
       }
 
-      let val = '24px';
+      let val = '27px';
 
       if (!this.avatarOnly) {
         if (this.member.items.currentPet) val = '24px';
@@ -276,52 +276,6 @@ export default {
 
       return !buffs.snowball && !buffs.spookySparkles && !buffs.shinySeed && !buffs.seafoam;
     },
-    foolPet (pet) {
-      const SPECIAL_PETS = [
-        'Wolf-Veteran',
-        'Wolf-Cerberus',
-        'Dragon-Hydra',
-        'Turkey-Base',
-        'BearCub-Polar',
-        'MantisShrimp-Base',
-        'JackOLantern-Base',
-        'Mammoth-Base',
-        'Tiger-Veteran',
-        'Phoenix-Base',
-        'Turkey-Gilded',
-        'MagicalBee-Base',
-        'Lion-Veteran',
-        'Gryphon-RoyalPurple',
-        'JackOLantern-Ghost',
-        'Jackalope-RoyalPurple',
-        'Orca-Base',
-        'Bear-Veteran',
-        'Hippogriff-Hopeful',
-        'Fox-Veteran',
-        'JackOLantern-Glow',
-        'Gryphon-Gryphatrice',
-      ];
-      const BASE_PETS = [
-        'Wolf',
-        'TigerCub',
-        'PandaCub',
-        'LionCub',
-        'Fox',
-        'FlyingPig',
-        'BearCub',
-        'Dragon',
-        'Cactus',
-      ];
-      if (!pet) return 'Pet-Cactus-Dessert';
-      if (SPECIAL_PETS.indexOf(pet) !== -1) {
-        return 'Pet-LionCub-Dessert';
-      }
-      const species = pet.slice(0, pet.indexOf('-'));
-      if (includes(BASE_PETS, species)) {
-        return `Pet-${species}-Dessert`;
-      }
-      return 'Pet-FlyingPig-Dessert';
-    },
   },
 };
 </script>
diff --git a/website/client/src/components/inventory/stable/petItem.vue b/website/client/src/components/inventory/stable/petItem.vue
index de4e44170a..8d6b158471 100644
--- a/website/client/src/components/inventory/stable/petItem.vue
+++ b/website/client/src/components/inventory/stable/petItem.vue
@@ -161,10 +161,7 @@ export default {
     },
     getPetItemClass () {
       if (this.isOwned() || (this.mountOwned() && this.isHatchable())) {
-        if (this.isSpecial()) {
-          return 'Pet Pet-LionCub-Dessert';
-        }
-        return `${this.item.class} ${this.item.eggKey}`;
+        return `Pet Pet-${this.item.key} ${this.item.eggKey}`;
       }
 
       if (!this.isOwned() && this.isSpecial()) {
@@ -176,7 +173,7 @@ export default {
       }
 
       if (this.mountOwned()) {
-        return `GreyedOut ${this.item.class} ${this.item.eggKey}`;
+        return `GreyedOut Pet Pet-${this.item.key} ${this.item.eggKey}`;
       }
 
       // Can't hatch
diff --git a/website/client/src/libs/createAnimal.js b/website/client/src/libs/createAnimal.js
index 06b80a389e..8eebf2eb58 100644
--- a/website/client/src/libs/createAnimal.js
+++ b/website/client/src/libs/createAnimal.js
@@ -2,9 +2,6 @@ import content from '@/../../common/script/content';
 
 const specialPets = Object.keys(content.specialPets);
 const wackyPets = Object.keys(content.wackyPets);
-const questPets = Object.keys(content.questPets);
-const premiumPets = Object.keys(content.premiumPets);
-const dropPets = Object.keys(content.pets);
 
 function getText (textOrFunction) {
   if (textOrFunction instanceof Function) {
@@ -36,20 +33,10 @@ export function isSpecial (animal) {
 
 export function createAnimal (egg, potion, type, _content, userItems) {
   const animalKey = `${egg.key}-${potion.key}`;
-  let fooledKey = '';
-  if (questPets.includes(animalKey)) {
-    fooledKey = 'FlyingPig-Dessert';
-  } else if (dropPets.includes(animalKey)
-    || premiumPets.includes(animalKey)
-    || wackyPets.includes(animalKey)) {
-    fooledKey = `${egg.key}-Dessert`;
-  } else {
-    fooledKey = animalKey;
-  }
 
   return {
     key: animalKey,
-    class: type === 'pet' ? `Pet Pet-${fooledKey}` : `Mount_Icon_${animalKey}`,
+    class: type === 'pet' ? `Pet Pet-${animalKey}` : `Mount_Icon_${animalKey}`,
     eggKey: egg.key,
     eggName: getText(egg.text),
     potionKey: potion.key,
diff --git a/website/client/tests/unit/components/avatar.spec.js b/website/client/tests/unit/components/avatar.spec.js
index c1f49322df..49e6f8398d 100644
--- a/website/client/tests/unit/components/avatar.spec.js
+++ b/website/client/tests/unit/components/avatar.spec.js
@@ -78,7 +78,7 @@ context('avatar.vue', () => {
       };
     });
 
-    xit('defaults to 27px', () => {
+    it('defaults to 27px', () => {
       vm.avatarOnly = true;
       expect(vm.paddingTop).to.equal('27px');
     });
diff --git a/website/raw_sprites/spritesmith/npcs/npc_matt.png b/website/raw_sprites/spritesmith/npcs/npc_matt.png
index 2a6aabb0a1..e129d6e43e 100644
Binary files a/website/raw_sprites/spritesmith/npcs/npc_matt.png and b/website/raw_sprites/spritesmith/npcs/npc_matt.png differ