diff --git a/assets/anim.scss b/assets/anim.scss
index 33c2b406..86a2ec4d 100644
--- a/assets/anim.scss
+++ b/assets/anim.scss
@@ -1153,6 +1153,16 @@ $spritesDir : '/assets/emotes/emoticons-animated/';
     $iteration-count: 1
 );
 
+@include sprite-animation(
+    $file-name: ComfyMoobers,
+    $frame-count: 34,
+    $sprite-width: 1122px,
+    $sprite-height: 32px,
+    $animation-duration: 2550ms,
+    $iteration-count: 2,
+    $can-animate-forever: true
+);
+
 @include sprite-animation(
     $file-name: HocusPocus,
     $frame-count: 53,
@@ -1209,6 +1219,16 @@ $spritesDir : '/assets/emotes/emoticons-animated/';
     $can-animate-forever: true
 );
 
+@include sprite-animation(
+    $file-name: PepoFight,
+    $frame-count: 35,
+    $sprite-width: 1855px,
+    $sprite-height: 32px,
+    $animation-duration: 2450ms,
+    $iteration-count: 2,
+    $can-animate-forever: true
+);
+
 @include sprite-animation(
     $file-name: PeepoWeird,
     $frame-count: 35,
@@ -1264,6 +1284,17 @@ $spritesDir : '/assets/emotes/emoticons-animated/';
     $end-on-last-frame: true
 );
 
+@include sprite-animation(
+    $file-name: DOGGO,
+    $frame-count: 181,
+    $sprite-width: 6154px,
+    $sprite-height: 32px,
+    $animation-duration: 3s,
+    $iteration-count: 2,
+    $can-animate-forever: true,
+    $end-on-last-frame: true
+);
+
 @include sprite-animation(
     $file-name: SMUG,
     $frame-count: 7,
@@ -1349,89 +1380,3 @@ $spritesDir : '/assets/emotes/emoticons-animated/';
 
     100% {transform: translate(0px,0px);}
 }
-
-@include sprite-animation(
-    $file-name: DOGGO,
-    $frame-count: 76,
-    $sprite-width: 2432px,
-    $sprite-height: 32px,
-    $animation-duration: 2s,
-    $iteration-count: 2,
-    $can-animate-forever: true,
-    $end-on-last-frame: true
-);
-
-@include sprite-animation(
-    $file-name: ComfyMoobers,
-    $frame-count: 34,
-    $sprite-width: 1122px,
-    $sprite-height: 32px,
-    $animation-duration: 2550ms,
-    $iteration-count: 2,
-    $can-animate-forever: true
-);
-
-@include sprite-animation(
-    $file-name: CampFire,
-    $frame-count: 90,
-    $sprite-width: 3780px,
-    $sprite-height: 32px,
-    $animation-duration: 3s,
-    $iteration-count: 1,
-    $can-animate-forever: true,
-    $end-on-last-frame: true
-);
-
-@include sprite-animation(
-    $file-name: ZOOMER,
-    $frame-count: 30,
-    $sprite-width: 1500px,
-    $sprite-height: 32px,
-    $animation-duration: 1s,
-    $iteration-count: 7,
-    $can-animate-forever: true
-);
-
-@include sprite-animation(
-    $file-name: GROND,
-    $frame-count: 149,
-    $sprite-width: 7450px,
-    $sprite-height: 32px,
-    $animation-duration: 6.208s,
-    $iteration-count: 1,
-    $can-animate-forever: true,
-    $end-on-last-frame: true
-);
-
-@include sprite-animation(
-    $file-name: BOOMER,
-    $frame-count: 90,
-    $sprite-width: 4050px,
-    $sprite-height: 32px,
-    $animation-duration: 3s,
-    $iteration-count: 2,
-    $can-animate-forever: true,
-    $end-on-last-frame: true
-);
-
-@include sprite-animation(
-    $file-name: SPYRON,
-    $frame-count: 90,
-    $sprite-width: 3960px,
-    $sprite-height: 32px,
-    $animation-duration: 3s,
-    $iteration-count: 2,
-    $can-animate-forever: true,
-);
-
-@include sprite-animation(
-    $file-name: PepoWant,
-    $frame-count: 150,
-    $sprite-width: 7050px,
-    $sprite-height: 32px,
-    $animation-duration: 2.5s,
-    $animation-direction: alternate,
-    $iteration-count: 2,
-    $end-on-frame: 1,
-    $can-animate-forever: true
-);
diff --git a/assets/chat/css/generify.scss b/assets/chat/css/generify.scss
index 97d570db..fa3480c6 100644
--- a/assets/chat/css/generify.scss
+++ b/assets/chat/css/generify.scss
@@ -860,68 +860,4 @@
 
 .golden-modifier-Gigachad {
     -webkit-mask-position-x: -3068px !important;
-}
-
-@mixin lotr-flag($name, $width, $duration, $frame-count) {
-    $frame-width: $width / $frame-count;
-
-    .generify-#{$name} {
-        margin-left: $frame-width;
-
-        &::before {
-            position: absolute;
-            background-image: image-set(url("/assets/emotes/lotr/modifiers/4x/#{$name}.png") 4x, url("/assets/emotes/lotr/modifiers/2x/#{$name}.png") 2x, url("/assets/emotes/lotr/modifiers/#{$name}.png") 1x);
-            overflow: hidden;
-            width: $frame-width;
-            height: 32px;
-            bottom: 0;
-            right: 93%;
-            z-index: 0;
-            content: "";
-            transform: rotate(-10deg);
-            transform-origin: 100% 100%;
-            animation: anim-flag-#{$name} $duration steps($frame-count) 5;
-        }
-
-        @at-root .pref-animateforever &::before, &:hover::before {
-            animation-iteration-count: infinite;
-        }
-    }
-
-    @keyframes anim-flag-#{$name} {
-        0% {
-            background-position-x: 0px;
-        }
-        100% {
-            background-position-x: calc(100% - #{$frame-width});
-        }
-    }
-  }
-
-  @include lotr-flag(
-    $name: rohan,
-    $width: 2040px,
-    $duration: 1333ms,
-    $frame-count: 40
-  );
-
-  @include lotr-flag(
-    $name: gondor,
-    $width: 2300px,
-    $duration: 1533ms,
-    $frame-count: 46
-  );
-
-  @include lotr-flag(
-    $name: mordor,
-    $width: 480px,
-    $duration: 1333ms,
-    $frame-count: 30
-  );
-
-  @include lotr-flag(
-    $name: saruman,
-    $width: 480px,
-    $duration: 1333ms,
-    $frame-count: 30
-  );
+}
\ No newline at end of file
diff --git a/assets/chat/js/const.js b/assets/chat/js/const.js
index f7516f63..d2cb1573 100644
--- a/assets/chat/js/const.js
+++ b/assets/chat/js/const.js
@@ -78,10 +78,10 @@ const GENERIFY_OPTIONS = {
     peek: "generify-peek",
     gray: "generify-gray",
     noir: "generify-noir weather rain anim-fix",
-    rohan: "generify-rohan",
-    gondor: "generify-gondor",
-    mordor: "generify-mordor",
-    saruman: "generify-saruman",
+    // rohan: "generify-rohan",
+    // gondor: "generify-gondor",
+    // mordor: "generify-mordor",
+    // saruman: "generify-saruman",
 };
 
 const CUSTOM_AUTOCOMPLETE_ORDER = [
@@ -139,7 +139,7 @@ const DANK_WHITELIST = [
     "Kreygasm",
     "4Head",
     "PepoDance",
-    "PeepoHappy",
+    "PeepoHappy"
 ];
 
 //emotes that get placed multiple times when combo'd
diff --git a/assets/emotes.json b/assets/emotes.json
index a3b76a52..08d35f5d 100644
--- a/assets/emotes.json
+++ b/assets/emotes.json
@@ -224,11 +224,6 @@
         "CAUGHT",
         "PepoTurkey",
         "SNOWBALL",
-        "SNOWBALLFIGHT",
-        "DEEEATH",
-        "GimliFlushed",
-        "GROND",
-        "GRUG",
-        "SPYRON"
+        "SNOWBALLFIGHT"
     ]
 }
diff --git a/assets/emotes/emoticons-animated/2x/BOOMER.png b/assets/emotes/emoticons-animated/2x/BOOMER.png
deleted file mode 100644
index 6b148040..00000000
Binary files a/assets/emotes/emoticons-animated/2x/BOOMER.png and /dev/null differ
diff --git a/assets/emotes/emoticons-animated/2x/CampFire.png b/assets/emotes/emoticons-animated/2x/CampFire.png
deleted file mode 100644
index 053cc712..00000000
Binary files a/assets/emotes/emoticons-animated/2x/CampFire.png and /dev/null differ
diff --git a/assets/emotes/emoticons-animated/2x/DOGGO.png b/assets/emotes/emoticons-animated/2x/DOGGO.png
index 0c3ffa1f..c7232748 100644
Binary files a/assets/emotes/emoticons-animated/2x/DOGGO.png and b/assets/emotes/emoticons-animated/2x/DOGGO.png differ
diff --git a/assets/emotes/emoticons-animated/2x/GROND.png b/assets/emotes/emoticons-animated/2x/GROND.png
deleted file mode 100644
index a368056a..00000000
Binary files a/assets/emotes/emoticons-animated/2x/GROND.png and /dev/null differ
diff --git a/assets/emotes/emoticons-animated/2x/PepoFight.png b/assets/emotes/emoticons-animated/2x/PepoFight.png
new file mode 100644
index 00000000..856b0066
Binary files /dev/null and b/assets/emotes/emoticons-animated/2x/PepoFight.png differ
diff --git a/assets/emotes/emoticons-animated/2x/PepoWant.png b/assets/emotes/emoticons-animated/2x/PepoWant.png
deleted file mode 100644
index 298ee18f..00000000
Binary files a/assets/emotes/emoticons-animated/2x/PepoWant.png and /dev/null differ
diff --git a/assets/emotes/emoticons-animated/2x/SPYRON.png b/assets/emotes/emoticons-animated/2x/SPYRON.png
deleted file mode 100644
index 72011d86..00000000
Binary files a/assets/emotes/emoticons-animated/2x/SPYRON.png and /dev/null differ
diff --git a/assets/emotes/emoticons-animated/2x/ZOOMER.png b/assets/emotes/emoticons-animated/2x/ZOOMER.png
deleted file mode 100644
index 42f8edde..00000000
Binary files a/assets/emotes/emoticons-animated/2x/ZOOMER.png and /dev/null differ
diff --git a/assets/emotes/emoticons-animated/4x/BOOMER.png b/assets/emotes/emoticons-animated/4x/BOOMER.png
deleted file mode 100644
index 74e3834c..00000000
Binary files a/assets/emotes/emoticons-animated/4x/BOOMER.png and /dev/null differ
diff --git a/assets/emotes/emoticons-animated/4x/CampFire.png b/assets/emotes/emoticons-animated/4x/CampFire.png
deleted file mode 100644
index 779dd909..00000000
Binary files a/assets/emotes/emoticons-animated/4x/CampFire.png and /dev/null differ
diff --git a/assets/emotes/emoticons-animated/4x/DOGGO.png b/assets/emotes/emoticons-animated/4x/DOGGO.png
index 6bb253e2..ffe15c79 100644
Binary files a/assets/emotes/emoticons-animated/4x/DOGGO.png and b/assets/emotes/emoticons-animated/4x/DOGGO.png differ
diff --git a/assets/emotes/emoticons-animated/4x/GROND.png b/assets/emotes/emoticons-animated/4x/GROND.png
deleted file mode 100644
index 99435cd8..00000000
Binary files a/assets/emotes/emoticons-animated/4x/GROND.png and /dev/null differ
diff --git a/assets/emotes/emoticons-animated/4x/PepoFight.png b/assets/emotes/emoticons-animated/4x/PepoFight.png
new file mode 100644
index 00000000..cdbaa1ae
Binary files /dev/null and b/assets/emotes/emoticons-animated/4x/PepoFight.png differ
diff --git a/assets/emotes/emoticons-animated/4x/PepoWant.png b/assets/emotes/emoticons-animated/4x/PepoWant.png
deleted file mode 100644
index 0c0c043f..00000000
Binary files a/assets/emotes/emoticons-animated/4x/PepoWant.png and /dev/null differ
diff --git a/assets/emotes/emoticons-animated/4x/SPYRON.png b/assets/emotes/emoticons-animated/4x/SPYRON.png
deleted file mode 100644
index ea101b74..00000000
Binary files a/assets/emotes/emoticons-animated/4x/SPYRON.png and /dev/null differ
diff --git a/assets/emotes/emoticons-animated/4x/ZOOMER.png b/assets/emotes/emoticons-animated/4x/ZOOMER.png
deleted file mode 100644
index 66fb3c3b..00000000
Binary files a/assets/emotes/emoticons-animated/4x/ZOOMER.png and /dev/null differ
diff --git a/assets/emotes/emoticons-animated/BOOMER.png b/assets/emotes/emoticons-animated/BOOMER.png
deleted file mode 100644
index bd88a611..00000000
Binary files a/assets/emotes/emoticons-animated/BOOMER.png and /dev/null differ
diff --git a/assets/emotes/emoticons-animated/CampFire.png b/assets/emotes/emoticons-animated/CampFire.png
deleted file mode 100644
index bd772441..00000000
Binary files a/assets/emotes/emoticons-animated/CampFire.png and /dev/null differ
diff --git a/assets/emotes/emoticons-animated/DOGGO.png b/assets/emotes/emoticons-animated/DOGGO.png
index 94d33130..97c460ee 100644
Binary files a/assets/emotes/emoticons-animated/DOGGO.png and b/assets/emotes/emoticons-animated/DOGGO.png differ
diff --git a/assets/emotes/emoticons-animated/GROND.png b/assets/emotes/emoticons-animated/GROND.png
deleted file mode 100644
index eb8b59ff..00000000
Binary files a/assets/emotes/emoticons-animated/GROND.png and /dev/null differ
diff --git a/assets/emotes/emoticons-animated/PepoFight.png b/assets/emotes/emoticons-animated/PepoFight.png
new file mode 100644
index 00000000..f1a689c4
Binary files /dev/null and b/assets/emotes/emoticons-animated/PepoFight.png differ
diff --git a/assets/emotes/emoticons-animated/PepoWant.png b/assets/emotes/emoticons-animated/PepoWant.png
deleted file mode 100644
index 54e4ff6b..00000000
Binary files a/assets/emotes/emoticons-animated/PepoWant.png and /dev/null differ
diff --git a/assets/emotes/emoticons-animated/SPYRON.png b/assets/emotes/emoticons-animated/SPYRON.png
deleted file mode 100644
index 3d2621f9..00000000
Binary files a/assets/emotes/emoticons-animated/SPYRON.png and /dev/null differ
diff --git a/assets/emotes/emoticons-animated/ZOOMER.png b/assets/emotes/emoticons-animated/ZOOMER.png
deleted file mode 100644
index cb64664c..00000000
Binary files a/assets/emotes/emoticons-animated/ZOOMER.png and /dev/null differ
diff --git a/assets/emotes/emoticons/2x/BOOMER.png b/assets/emotes/emoticons/2x/BOOMER.png
new file mode 100644
index 00000000..05d9be95
Binary files /dev/null and b/assets/emotes/emoticons/2x/BOOMER.png differ
diff --git a/assets/emotes/emoticons/2x/ComfyFeels.png b/assets/emotes/emoticons/2x/ComfyFeels.png
index dab72069..37746d19 100644
Binary files a/assets/emotes/emoticons/2x/ComfyFeels.png and b/assets/emotes/emoticons/2x/ComfyFeels.png differ
diff --git a/assets/emotes/emoticons/2x/DEEEATH.png b/assets/emotes/emoticons/2x/DEEEATH.png
deleted file mode 100644
index 9043f2c7..00000000
Binary files a/assets/emotes/emoticons/2x/DEEEATH.png and /dev/null differ
diff --git a/assets/emotes/emoticons/2x/DELUSIONAL.png b/assets/emotes/emoticons/2x/DELUSIONAL.png
index 6bc9b3c0..f4bb24e4 100644
Binary files a/assets/emotes/emoticons/2x/DELUSIONAL.png and b/assets/emotes/emoticons/2x/DELUSIONAL.png differ
diff --git a/assets/emotes/emoticons/2x/DuckerZ.png b/assets/emotes/emoticons/2x/DuckerZ.png
index 9b25a09a..619c3b13 100644
Binary files a/assets/emotes/emoticons/2x/DuckerZ.png and b/assets/emotes/emoticons/2x/DuckerZ.png differ
diff --git a/assets/emotes/emoticons/2x/GRUG.png b/assets/emotes/emoticons/2x/GRUG.png
index e5952d44..3708d369 100644
Binary files a/assets/emotes/emoticons/2x/GRUG.png and b/assets/emotes/emoticons/2x/GRUG.png differ
diff --git a/assets/emotes/emoticons/2x/GimliFlushed.png b/assets/emotes/emoticons/2x/GimliFlushed.png
deleted file mode 100644
index caabe6e0..00000000
Binary files a/assets/emotes/emoticons/2x/GimliFlushed.png and /dev/null differ
diff --git a/assets/emotes/emoticons/2x/KING.png b/assets/emotes/emoticons/2x/KING.png
index 3b06c1c3..4918d006 100644
Binary files a/assets/emotes/emoticons/2x/KING.png and b/assets/emotes/emoticons/2x/KING.png differ
diff --git a/assets/emotes/emoticons/2x/LeRuse.png b/assets/emotes/emoticons/2x/LeRuse.png
deleted file mode 100644
index 487dca8d..00000000
Binary files a/assets/emotes/emoticons/2x/LeRuse.png and /dev/null differ
diff --git a/assets/emotes/emoticons/2x/PEPE.png b/assets/emotes/emoticons/2x/PEPE.png
index 84cec06f..e4dc9ad7 100644
Binary files a/assets/emotes/emoticons/2x/PEPE.png and b/assets/emotes/emoticons/2x/PEPE.png differ
diff --git a/assets/emotes/emoticons/2x/POKE.png b/assets/emotes/emoticons/2x/POKE.png
index 25e69191..ae66e2b2 100644
Binary files a/assets/emotes/emoticons/2x/POKE.png and b/assets/emotes/emoticons/2x/POKE.png differ
diff --git a/assets/emotes/emoticons/2x/PepoComfy.png b/assets/emotes/emoticons/2x/PepoComfy.png
index 36466878..c93fb4d7 100644
Binary files a/assets/emotes/emoticons/2x/PepoComfy.png and b/assets/emotes/emoticons/2x/PepoComfy.png differ
diff --git a/assets/emotes/emoticons/2x/PepoFight.png b/assets/emotes/emoticons/2x/PepoFight.png
deleted file mode 100644
index 589e523b..00000000
Binary files a/assets/emotes/emoticons/2x/PepoFight.png and /dev/null differ
diff --git a/assets/emotes/emoticons/2x/PepoWant.png b/assets/emotes/emoticons/2x/PepoWant.png
new file mode 100644
index 00000000..06e6b6f7
Binary files /dev/null and b/assets/emotes/emoticons/2x/PepoWant.png differ
diff --git a/assets/emotes/emoticons/2x/QUEEN.png b/assets/emotes/emoticons/2x/QUEEN.png
index c07e4816..9a6e72f6 100644
Binary files a/assets/emotes/emoticons/2x/QUEEN.png and b/assets/emotes/emoticons/2x/QUEEN.png differ
diff --git a/assets/emotes/emoticons/2x/Riperino.png b/assets/emotes/emoticons/2x/Riperino.png
index 0ea7df27..0e94aec4 100644
Binary files a/assets/emotes/emoticons/2x/Riperino.png and b/assets/emotes/emoticons/2x/Riperino.png differ
diff --git a/assets/emotes/emoticons/2x/SMOrc.png b/assets/emotes/emoticons/2x/SMOrc.png
index 7effd00c..56a8a8f2 100644
Binary files a/assets/emotes/emoticons/2x/SMOrc.png and b/assets/emotes/emoticons/2x/SMOrc.png differ
diff --git a/assets/emotes/emoticons/2x/SpookerZ.png b/assets/emotes/emoticons/2x/SpookerZ.png
index 1691344b..8a97ee30 100644
Binary files a/assets/emotes/emoticons/2x/SpookerZ.png and b/assets/emotes/emoticons/2x/SpookerZ.png differ
diff --git a/assets/emotes/emoticons/2x/ZOOMER.png b/assets/emotes/emoticons/2x/ZOOMER.png
new file mode 100644
index 00000000..c2da372e
Binary files /dev/null and b/assets/emotes/emoticons/2x/ZOOMER.png differ
diff --git a/assets/emotes/emoticons/2x/monkaHmm.png b/assets/emotes/emoticons/2x/monkaHmm.png
index a6b545a5..b2e2e6d4 100644
Binary files a/assets/emotes/emoticons/2x/monkaHmm.png and b/assets/emotes/emoticons/2x/monkaHmm.png differ
diff --git a/assets/emotes/emoticons/2x/peepoStab.png b/assets/emotes/emoticons/2x/peepoStab.png
index 6f691c1b..49ed90fc 100644
Binary files a/assets/emotes/emoticons/2x/peepoStab.png and b/assets/emotes/emoticons/2x/peepoStab.png differ
diff --git a/assets/emotes/emoticons/4x/BOOMER.png b/assets/emotes/emoticons/4x/BOOMER.png
new file mode 100644
index 00000000..64b90a05
Binary files /dev/null and b/assets/emotes/emoticons/4x/BOOMER.png differ
diff --git a/assets/emotes/emoticons/4x/ComfyFeels.png b/assets/emotes/emoticons/4x/ComfyFeels.png
index 2b978176..b41a866c 100644
Binary files a/assets/emotes/emoticons/4x/ComfyFeels.png and b/assets/emotes/emoticons/4x/ComfyFeels.png differ
diff --git a/assets/emotes/emoticons/4x/DEEEATH.png b/assets/emotes/emoticons/4x/DEEEATH.png
deleted file mode 100644
index 69ea2f65..00000000
Binary files a/assets/emotes/emoticons/4x/DEEEATH.png and /dev/null differ
diff --git a/assets/emotes/emoticons/4x/DELUSIONAL.png b/assets/emotes/emoticons/4x/DELUSIONAL.png
index 03375fe9..4750fdfa 100644
Binary files a/assets/emotes/emoticons/4x/DELUSIONAL.png and b/assets/emotes/emoticons/4x/DELUSIONAL.png differ
diff --git a/assets/emotes/emoticons/4x/DuckerZ.png b/assets/emotes/emoticons/4x/DuckerZ.png
index 9fafaba8..dbd2a4bd 100644
Binary files a/assets/emotes/emoticons/4x/DuckerZ.png and b/assets/emotes/emoticons/4x/DuckerZ.png differ
diff --git a/assets/emotes/emoticons/4x/GRUG.png b/assets/emotes/emoticons/4x/GRUG.png
index 9d8b5355..49d70e95 100644
Binary files a/assets/emotes/emoticons/4x/GRUG.png and b/assets/emotes/emoticons/4x/GRUG.png differ
diff --git a/assets/emotes/emoticons/4x/GimliFlushed.png b/assets/emotes/emoticons/4x/GimliFlushed.png
deleted file mode 100644
index 31d8106f..00000000
Binary files a/assets/emotes/emoticons/4x/GimliFlushed.png and /dev/null differ
diff --git a/assets/emotes/emoticons/4x/KING.png b/assets/emotes/emoticons/4x/KING.png
index 54a20bef..d1a96de0 100644
Binary files a/assets/emotes/emoticons/4x/KING.png and b/assets/emotes/emoticons/4x/KING.png differ
diff --git a/assets/emotes/emoticons/4x/LeRuse.png b/assets/emotes/emoticons/4x/LeRuse.png
deleted file mode 100644
index c58c03e8..00000000
Binary files a/assets/emotes/emoticons/4x/LeRuse.png and /dev/null differ
diff --git a/assets/emotes/emoticons/4x/PEPE.png b/assets/emotes/emoticons/4x/PEPE.png
index 680db6e5..a49b1fc1 100644
Binary files a/assets/emotes/emoticons/4x/PEPE.png and b/assets/emotes/emoticons/4x/PEPE.png differ
diff --git a/assets/emotes/emoticons/4x/POKE.png b/assets/emotes/emoticons/4x/POKE.png
index 39a5a238..8373599b 100644
Binary files a/assets/emotes/emoticons/4x/POKE.png and b/assets/emotes/emoticons/4x/POKE.png differ
diff --git a/assets/emotes/emoticons/4x/PepoComfy.png b/assets/emotes/emoticons/4x/PepoComfy.png
index 4066d6cb..1b11e090 100644
Binary files a/assets/emotes/emoticons/4x/PepoComfy.png and b/assets/emotes/emoticons/4x/PepoComfy.png differ
diff --git a/assets/emotes/emoticons/4x/PepoFight.png b/assets/emotes/emoticons/4x/PepoFight.png
deleted file mode 100644
index dc4eb2ce..00000000
Binary files a/assets/emotes/emoticons/4x/PepoFight.png and /dev/null differ
diff --git a/assets/emotes/emoticons/4x/PepoWant.png b/assets/emotes/emoticons/4x/PepoWant.png
new file mode 100644
index 00000000..fc7e52a5
Binary files /dev/null and b/assets/emotes/emoticons/4x/PepoWant.png differ
diff --git a/assets/emotes/emoticons/4x/QUEEN.png b/assets/emotes/emoticons/4x/QUEEN.png
index 6de9a826..9f59d30b 100644
Binary files a/assets/emotes/emoticons/4x/QUEEN.png and b/assets/emotes/emoticons/4x/QUEEN.png differ
diff --git a/assets/emotes/emoticons/4x/Riperino.png b/assets/emotes/emoticons/4x/Riperino.png
index fae25f85..f1fce302 100644
Binary files a/assets/emotes/emoticons/4x/Riperino.png and b/assets/emotes/emoticons/4x/Riperino.png differ
diff --git a/assets/emotes/emoticons/4x/SMOrc.png b/assets/emotes/emoticons/4x/SMOrc.png
index bebb4cbe..d6d8662c 100644
Binary files a/assets/emotes/emoticons/4x/SMOrc.png and b/assets/emotes/emoticons/4x/SMOrc.png differ
diff --git a/assets/emotes/emoticons/4x/SpookerZ.png b/assets/emotes/emoticons/4x/SpookerZ.png
index 0cc17191..97c6b425 100644
Binary files a/assets/emotes/emoticons/4x/SpookerZ.png and b/assets/emotes/emoticons/4x/SpookerZ.png differ
diff --git a/assets/emotes/emoticons/4x/ZOOMER.png b/assets/emotes/emoticons/4x/ZOOMER.png
new file mode 100644
index 00000000..3824b3b0
Binary files /dev/null and b/assets/emotes/emoticons/4x/ZOOMER.png differ
diff --git a/assets/emotes/emoticons/4x/monkaHmm.png b/assets/emotes/emoticons/4x/monkaHmm.png
index e3d01bf1..dfac8985 100644
Binary files a/assets/emotes/emoticons/4x/monkaHmm.png and b/assets/emotes/emoticons/4x/monkaHmm.png differ
diff --git a/assets/emotes/emoticons/4x/peepoStab.png b/assets/emotes/emoticons/4x/peepoStab.png
index 46ce5a34..39e50f98 100644
Binary files a/assets/emotes/emoticons/4x/peepoStab.png and b/assets/emotes/emoticons/4x/peepoStab.png differ
diff --git a/assets/emotes/emoticons/BOOMER.png b/assets/emotes/emoticons/BOOMER.png
new file mode 100644
index 00000000..896bc34a
Binary files /dev/null and b/assets/emotes/emoticons/BOOMER.png differ
diff --git a/assets/emotes/emoticons/CampFire.png b/assets/emotes/emoticons/CampFire.png
new file mode 100644
index 00000000..98314f7d
Binary files /dev/null and b/assets/emotes/emoticons/CampFire.png differ
diff --git a/assets/emotes/emoticons/ComfyFeels.png b/assets/emotes/emoticons/ComfyFeels.png
index 0db40c3c..dfb45f7b 100644
Binary files a/assets/emotes/emoticons/ComfyFeels.png and b/assets/emotes/emoticons/ComfyFeels.png differ
diff --git a/assets/emotes/emoticons/DEEEATH.png b/assets/emotes/emoticons/DEEEATH.png
deleted file mode 100644
index 26186b6b..00000000
Binary files a/assets/emotes/emoticons/DEEEATH.png and /dev/null differ
diff --git a/assets/emotes/emoticons/DELUSIONAL.png b/assets/emotes/emoticons/DELUSIONAL.png
index f470cbb2..3f87731c 100644
Binary files a/assets/emotes/emoticons/DELUSIONAL.png and b/assets/emotes/emoticons/DELUSIONAL.png differ
diff --git a/assets/emotes/emoticons/DuckerZ.png b/assets/emotes/emoticons/DuckerZ.png
index 77d94bbb..03f50b5b 100644
Binary files a/assets/emotes/emoticons/DuckerZ.png and b/assets/emotes/emoticons/DuckerZ.png differ
diff --git a/assets/emotes/emoticons/GRUG.png b/assets/emotes/emoticons/GRUG.png
index b1f7ad8e..74d1ba93 100644
Binary files a/assets/emotes/emoticons/GRUG.png and b/assets/emotes/emoticons/GRUG.png differ
diff --git a/assets/emotes/emoticons/GimliFlushed.png b/assets/emotes/emoticons/GimliFlushed.png
deleted file mode 100644
index a36e35bb..00000000
Binary files a/assets/emotes/emoticons/GimliFlushed.png and /dev/null differ
diff --git a/assets/emotes/emoticons/KING.png b/assets/emotes/emoticons/KING.png
index 31a0db63..e1d7dae2 100644
Binary files a/assets/emotes/emoticons/KING.png and b/assets/emotes/emoticons/KING.png differ
diff --git a/assets/emotes/emoticons/LeRuse.png b/assets/emotes/emoticons/LeRuse.png
index 664785e3..067620e6 100644
Binary files a/assets/emotes/emoticons/LeRuse.png and b/assets/emotes/emoticons/LeRuse.png differ
diff --git a/assets/emotes/emoticons/PEPE.png b/assets/emotes/emoticons/PEPE.png
index cff32329..7b353f28 100644
Binary files a/assets/emotes/emoticons/PEPE.png and b/assets/emotes/emoticons/PEPE.png differ
diff --git a/assets/emotes/emoticons/POKE.png b/assets/emotes/emoticons/POKE.png
index f31b4af4..573b74a9 100644
Binary files a/assets/emotes/emoticons/POKE.png and b/assets/emotes/emoticons/POKE.png differ
diff --git a/assets/emotes/emoticons/PepoComfy.png b/assets/emotes/emoticons/PepoComfy.png
index b3b924e3..2ac76899 100644
Binary files a/assets/emotes/emoticons/PepoComfy.png and b/assets/emotes/emoticons/PepoComfy.png differ
diff --git a/assets/emotes/emoticons/PepoFight.png b/assets/emotes/emoticons/PepoFight.png
deleted file mode 100644
index fc06ca9d..00000000
Binary files a/assets/emotes/emoticons/PepoFight.png and /dev/null differ
diff --git a/assets/emotes/emoticons/PepoWant.png b/assets/emotes/emoticons/PepoWant.png
new file mode 100644
index 00000000..d2433a4c
Binary files /dev/null and b/assets/emotes/emoticons/PepoWant.png differ
diff --git a/assets/emotes/emoticons/QUEEN.png b/assets/emotes/emoticons/QUEEN.png
index c30a6e1a..f76a1990 100644
Binary files a/assets/emotes/emoticons/QUEEN.png and b/assets/emotes/emoticons/QUEEN.png differ
diff --git a/assets/emotes/emoticons/Riperino.png b/assets/emotes/emoticons/Riperino.png
index 91b640c1..21ffc79c 100644
Binary files a/assets/emotes/emoticons/Riperino.png and b/assets/emotes/emoticons/Riperino.png differ
diff --git a/assets/emotes/emoticons/SMOrc.png b/assets/emotes/emoticons/SMOrc.png
index b5ea731f..1a5a10fb 100644
Binary files a/assets/emotes/emoticons/SMOrc.png and b/assets/emotes/emoticons/SMOrc.png differ
diff --git a/assets/emotes/emoticons/SpookerZ.png b/assets/emotes/emoticons/SpookerZ.png
index 7cc9fa3c..3c7ffffc 100644
Binary files a/assets/emotes/emoticons/SpookerZ.png and b/assets/emotes/emoticons/SpookerZ.png differ
diff --git a/assets/emotes/emoticons/ZOOMER.png b/assets/emotes/emoticons/ZOOMER.png
new file mode 100644
index 00000000..1d10b5ed
Binary files /dev/null and b/assets/emotes/emoticons/ZOOMER.png differ
diff --git a/assets/emotes/emoticons/monkaHmm.png b/assets/emotes/emoticons/monkaHmm.png
index 4e8df48c..8703482d 100644
Binary files a/assets/emotes/emoticons/monkaHmm.png and b/assets/emotes/emoticons/monkaHmm.png differ
diff --git a/assets/emotes/emoticons/old/CampFire.png b/assets/emotes/emoticons/old/CampFire.png
new file mode 100644
index 00000000..949dce37
Binary files /dev/null and b/assets/emotes/emoticons/old/CampFire.png differ
diff --git a/assets/emotes/emoticons/peepoStab.png b/assets/emotes/emoticons/peepoStab.png
index 9050453f..e2de9451 100644
Binary files a/assets/emotes/emoticons/peepoStab.png and b/assets/emotes/emoticons/peepoStab.png differ