diff --git a/habitica-images b/habitica-images
index 0393ffa0b9..973f84ead2 160000
--- a/habitica-images
+++ b/habitica-images
@@ -1 +1 @@
-Subproject commit 0393ffa0b95ce9ed4fa04646db56bf1882e29bb1
+Subproject commit 973f84ead2613073f301c1e2b5496d08163f7507
diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css
index b65af5b396..bfe01af2bb 100644
--- a/website/client/src/assets/css/sprites/spritesmith-main.css
+++ b/website/client/src/assets/css/sprites/spritesmith-main.css
@@ -53228,6 +53228,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-BearCub-TeaShop {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-BearCub-TeaShop.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-BearCub-Thunderstorm {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-BearCub-Thunderstorm.png');
   width: 81px;
@@ -53668,6 +53673,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-Cactus-TeaShop {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Cactus-TeaShop.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-Cactus-Thunderstorm {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Cactus-Thunderstorm.png');
   width: 81px;
@@ -54213,6 +54223,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-Dragon-TeaShop {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Dragon-TeaShop.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-Dragon-Thunderstorm {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Dragon-Thunderstorm.png');
   width: 81px;
@@ -54653,6 +54668,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-FlyingPig-TeaShop {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-FlyingPig-TeaShop.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-FlyingPig-Thunderstorm {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-FlyingPig-Thunderstorm.png');
   width: 81px;
@@ -54943,6 +54963,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-Fox-TeaShop {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Fox-TeaShop.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-Fox-Thunderstorm {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Fox-Thunderstorm.png');
   width: 81px;
@@ -55628,6 +55653,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-LionCub-TeaShop {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-LionCub-TeaShop.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-LionCub-Thunderstorm {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-LionCub-Thunderstorm.png');
   width: 81px;
@@ -56138,6 +56168,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-PandaCub-TeaShop {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-TeaShop.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-PandaCub-Thunderstorm {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-Thunderstorm.png');
   width: 81px;
@@ -57393,6 +57428,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-TigerCub-TeaShop {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-TigerCub-TeaShop.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-TigerCub-Thunderstorm {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-TigerCub-Thunderstorm.png');
   width: 81px;
@@ -57998,6 +58038,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-Wolf-TeaShop {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Wolf-TeaShop.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-Wolf-Thunderstorm {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Wolf-Thunderstorm.png');
   width: 81px;
diff --git a/website/client/src/assets/scss/animals.scss b/website/client/src/assets/scss/animals.scss
index 22239d1c5d..0d3407b47f 100644
--- a/website/client/src/assets/scss/animals.scss
+++ b/website/client/src/assets/scss/animals.scss
@@ -19,8 +19,12 @@
   top: -16px !important;
 }
 
-.Pet.Pet-FlyingPig-Veggie, .Pet.Pet-FlyingPig-Dessert, .Pet.Pet-FlyingPig-VirtualPet {
-  top: -28px !important;
+$foolPets: Veggie, Dessert, VirtualPet, TeaShop;
+
+@each $foolPet in $foolPets {
+  .Pet.Pet-FlyingPig-#{$foolPet} {
+    top: -28px !important;
+  }
 }
 
 .Pet[class*="Virtual"] {
diff --git a/website/client/src/components/avatar.vue b/website/client/src/components/avatar.vue
index cf070118d2..3317772105 100644
--- a/website/client/src/components/avatar.vue
+++ b/website/client/src/components/avatar.vue
@@ -244,7 +244,7 @@ export default {
     petClass () {
       if (some(
         this.currentEventList,
-        event => moment().isBetween(event.start, event.end) && event.aprilFools && event.aprilFools === 'virtual',
+        event => moment().isBetween(event.start, event.end) && event.aprilFools && event.aprilFools === 'teaShop',
       )) {
         return this.foolPet(this.member.items.currentPet);
       }
diff --git a/website/client/src/components/inventory/stable/petItem.vue b/website/client/src/components/inventory/stable/petItem.vue
index eb57892e63..74a22b7809 100644
--- a/website/client/src/components/inventory/stable/petItem.vue
+++ b/website/client/src/components/inventory/stable/petItem.vue
@@ -171,7 +171,7 @@ export default {
     getPetItemClass () {
       if (this.isOwned() && some(
         this.currentEventList,
-        event => moment().isBetween(event.start, event.end) && event.aprilFools && event.aprilFools === 'virtual',
+        event => moment().isBetween(event.start, event.end) && event.aprilFools && event.aprilFools === 'teaShop',
       )) {
         const petString = `${this.item.eggKey}-${this.item.key}`;
         return `Pet ${this.foolPet(petString)}`;
diff --git a/website/client/src/mixins/foolPet.js b/website/client/src/mixins/foolPet.js
index 371a28bd6f..6c36bb00bd 100644
--- a/website/client/src/mixins/foolPet.js
+++ b/website/client/src/mixins/foolPet.js
@@ -40,15 +40,15 @@ export default {
         'Dragon',
         'Cactus',
       ];
-      if (!pet) return 'Pet-Cactus-Virtual';
+      if (!pet) return 'Pet-TigerCub-TeaShop';
       if (SPECIAL_PETS.indexOf(pet) !== -1) {
-        return 'Pet-Wolf-Virtual';
+        return 'Pet-Dragon-TeaShop';
       }
       const species = pet.slice(0, pet.indexOf('-'));
       if (includes(BASE_PETS, species)) {
-        return `Pet-${species}-Virtual`;
+        return `Pet-${species}-TeaShop`;
       }
-      return 'Pet-Fox-Virtual';
+      return 'Pet-BearCub-TeaShop';
     },
   },
 };