diff --git a/website/client/src/assets/css/sprites.css b/website/client/src/assets/css/sprites.css
index 6baa43e882..1003d60563 100755
--- a/website/client/src/assets/css/sprites.css
+++ b/website/client/src/assets/css/sprites.css
@@ -22,7 +22,7 @@
   height: 219px;
 }
 
-.Pet_HatchingPotion_Dessert, .Pet_HatchingPotion_Veggie, .Pet_HatchingPotion_Windup, .Pet_HatchingPotion_VirtualPet {
+.Pet_HatchingPotion_Dessert, .Pet_HatchingPotion_Veggie, .Pet_HatchingPotion_Windup, .Pet_HatchingPotion_VirtualPet, .Pet_HatchingPotion_Fungi {
   width: 68px;
   height: 68px;
 }
@@ -43,6 +43,10 @@
   background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_VirtualPet.gif") no-repeat;
 }
 
+.Pet_HatchingPotion_Fungi {
+  background: url("https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Fungi.gif") no-repeat;
+}
+
 .Gems {
   display:inline-block;
   margin-right:5px;
diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css
index 9cc9317aa6..7d4af98323 100644
--- a/website/client/src/assets/css/sprites/spritesmith-main.css
+++ b/website/client/src/assets/css/sprites/spritesmith-main.css
@@ -38392,11 +38392,6 @@
   width: 68px;
   height: 68px;
 }
-.inventory_quest_scroll_fungus {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/inventory_quest_scroll_fungus.png');
-  width: 68px;
-  height: 68px;
-}
 .inventory_quest_scroll_ghost_stag {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/inventory_quest_scroll_ghost_stag.png');
   width: 68px;
@@ -55557,8 +55552,8 @@
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-Fungus {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-BearCub-Fungus.png');
+.Pet-BearCub-Fungi {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-BearCub-Fungi.png');
   width: 81px;
   height: 99px;
 }
@@ -56017,8 +56012,8 @@
   width: 81px;
   height: 99px;
 }
-.Pet-Cactus-Fungus {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Cactus-Fungus.png');
+.Pet-Cactus-Fungi {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Cactus-Fungi.png');
   width: 81px;
   height: 99px;
 }
@@ -56572,8 +56567,8 @@
   width: 81px;
   height: 99px;
 }
-.Pet-Dragon-Fungus {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Dragon-Fungus.png');
+.Pet-Dragon-Fungi {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Dragon-Fungi.png');
   width: 81px;
   height: 99px;
 }
@@ -57037,8 +57032,8 @@
   width: 81px;
   height: 99px;
 }
-.Pet-FlyingPig-Fungus {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-FlyingPig-Fungus.png');
+.Pet-FlyingPig-Fungi {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-FlyingPig-Fungi.png');
   width: 81px;
   height: 99px;
 }
@@ -57342,8 +57337,8 @@
   width: 81px;
   height: 99px;
 }
-.Pet-Fox-Fungus {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Fox-Fungus.png');
+.Pet-Fox-Fungi {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Fox-Fungi.png');
   width: 81px;
   height: 99px;
 }
@@ -58042,8 +58037,8 @@
   width: 81px;
   height: 99px;
 }
-.Pet-LionCub-Fungus {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-LionCub-Fungus.png');
+.Pet-LionCub-Fungi {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-LionCub-Fungi.png');
   width: 81px;
   height: 99px;
 }
@@ -58567,8 +58562,8 @@
   width: 81px;
   height: 99px;
 }
-.Pet-PandaCub-Fungus {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-Fungus.png');
+.Pet-PandaCub-Fungi {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-Fungi.png');
   width: 81px;
   height: 99px;
 }
@@ -59832,8 +59827,8 @@
   width: 81px;
   height: 99px;
 }
-.Pet-TigerCub-Fungus {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-TigerCub-Fungus.png');
+.Pet-TigerCub-Fungi {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-TigerCub-Fungi.png');
   width: 81px;
   height: 99px;
 }
@@ -60452,8 +60447,8 @@
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Fungus {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Wolf-Fungus.png');
+.Pet-Wolf-Fungi {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Wolf-Fungi.png');
   width: 81px;
   height: 99px;
 }
@@ -60812,11 +60807,6 @@
   width: 68px;
   height: 68px;
 }
-.Pet_HatchingPotion_Fungus {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Fungus.png');
-  width: 68px;
-  height: 68px;
-}
 .Pet_HatchingPotion_Ghost {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Ghost.png');
   width: 68px;
diff --git a/website/client/src/assets/scss/animals.scss b/website/client/src/assets/scss/animals.scss
index 0d3407b47f..d2b27e33d8 100644
--- a/website/client/src/assets/scss/animals.scss
+++ b/website/client/src/assets/scss/animals.scss
@@ -19,7 +19,7 @@
   top: -16px !important;
 }
 
-$foolPets: Veggie, Dessert, VirtualPet, TeaShop;
+$foolPets: Veggie, Dessert, VirtualPet, TeaShop, Fungi;
 
 @each $foolPet in $foolPets {
   .Pet.Pet-FlyingPig-#{$foolPet} {
diff --git a/website/client/src/components/avatar.vue b/website/client/src/components/avatar.vue
index 2e1798d671..ec4f892464 100644
--- a/website/client/src/components/avatar.vue
+++ b/website/client/src/components/avatar.vue
@@ -250,7 +250,7 @@ export default {
     petClass () {
       if (some(
         this.currentEventList,
-        event => moment().isBetween(event.start, event.end) && event.aprilFools && event.aprilFools === 'teaShop',
+        event => moment().isBetween(event.start, event.end) && event.aprilFools && event.aprilFools === 'Fungi',
       )) {
         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 2dbcaa9f2b..321e9562aa 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 === 'teaShop',
+        event => moment().isBetween(event.start, event.end) && event.aprilFools && event.aprilFools === 'Fungi',
       )) {
         if (this.isSpecial()) return `Pet ${this.foolPet(this.item.key)}`;
         const petString = `${this.item.eggKey}-${this.item.key}`;
diff --git a/website/client/src/mixins/foolPet.js b/website/client/src/mixins/foolPet.js
index 6c36bb00bd..bbedbe88ca 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-TigerCub-TeaShop';
+      if (!pet) return 'Pet-TigerCub-Fungi';
       if (SPECIAL_PETS.indexOf(pet) !== -1) {
-        return 'Pet-Dragon-TeaShop';
+        return 'Pet-Dragon-Fungi';
       }
       const species = pet.slice(0, pet.indexOf('-'));
       if (includes(BASE_PETS, species)) {
-        return `Pet-${species}-TeaShop`;
+        return `Pet-${species}-Fungi`;
       }
-      return 'Pet-BearCub-TeaShop';
+      return 'Pet-BearCub-Fungi';
     },
   },
 };
diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js
index 73fa138e21..a328cc5ae9 100644
--- a/website/common/script/content/constants/events.js
+++ b/website/common/script/content/constants/events.js
@@ -10,11 +10,16 @@ const gemsPromo = {
 
 export const EVENTS = {
   noEvent: {
-    start: '2024-05-01T00:00-05:00',
-    end: '2024-06-20T08:00-05:00',
+    start: '2024-05-01T00:00-04:00',
+    end: '2024-06-20T23:59-04:00',
     season: 'normal',
     npcImageSuffix: '',
   },
+  aprilFools2024: {
+    start: '2024-04-01T00:00-04:00',
+    end: '2024-04-02T20:00-04:00',
+    aprilFools: 'Fungi',
+  },
   spring2024: {
     start: '2024-03-21T00:00-04:00',
     end: '2024-04-30T23:59-04:00',