diff --git a/public/images/pokemon/icons/3/350s.png b/public/images/pokemon/icons/3/350s.png
index eaed5c4bd11..4f5de9f5d57 100644
Binary files a/public/images/pokemon/icons/3/350s.png and b/public/images/pokemon/icons/3/350s.png differ
diff --git a/public/images/pokemon/icons/variant/1/133-partner_2.png b/public/images/pokemon/icons/variant/1/133-partner_2.png
new file mode 100644
index 00000000000..3e082ae0bd4
Binary files /dev/null and b/public/images/pokemon/icons/variant/1/133-partner_2.png differ
diff --git a/public/images/pokemon/icons/variant/1/133-partner_3.png b/public/images/pokemon/icons/variant/1/133-partner_3.png
new file mode 100644
index 00000000000..57c969d855c
Binary files /dev/null and b/public/images/pokemon/icons/variant/1/133-partner_3.png differ
diff --git a/public/images/pokemon/icons/variant/1/133_2.png b/public/images/pokemon/icons/variant/1/133_2.png
index 7ab496699f7..b17979df07a 100644
Binary files a/public/images/pokemon/icons/variant/1/133_2.png and b/public/images/pokemon/icons/variant/1/133_2.png differ
diff --git a/public/images/pokemon/icons/variant/1/133_3.png b/public/images/pokemon/icons/variant/1/133_3.png
index f999dd0fff7..fa4d99879ae 100644
Binary files a/public/images/pokemon/icons/variant/1/133_3.png and b/public/images/pokemon/icons/variant/1/133_3.png differ
diff --git a/public/images/pokemon/icons/variant/1/42_1.png b/public/images/pokemon/icons/variant/1/42_1.png
index 17c82d9dd9e..91d7fae345d 100644
Binary files a/public/images/pokemon/icons/variant/1/42_1.png and b/public/images/pokemon/icons/variant/1/42_1.png differ
diff --git a/public/images/pokemon/icons/variant/1/42_2.png b/public/images/pokemon/icons/variant/1/42_2.png
index 91d7fae345d..17c82d9dd9e 100644
Binary files a/public/images/pokemon/icons/variant/1/42_2.png and b/public/images/pokemon/icons/variant/1/42_2.png differ
diff --git a/public/images/pokemon/icons/variant/3/427_2.png b/public/images/pokemon/icons/variant/3/427_2.png
deleted file mode 100644
index ceaf11acb48..00000000000
Binary files a/public/images/pokemon/icons/variant/3/427_2.png and /dev/null differ
diff --git a/public/images/pokemon/icons/variant/3/427_3.png b/public/images/pokemon/icons/variant/3/427_3.png
deleted file mode 100644
index 5972f5e9489..00000000000
Binary files a/public/images/pokemon/icons/variant/3/427_3.png and /dev/null differ
diff --git a/public/images/pokemon/icons/variant/3/428-mega_2.png b/public/images/pokemon/icons/variant/3/428-mega_2.png
deleted file mode 100644
index 32c3293a796..00000000000
Binary files a/public/images/pokemon/icons/variant/3/428-mega_2.png and /dev/null differ
diff --git a/public/images/pokemon/icons/variant/3/428_2.png b/public/images/pokemon/icons/variant/3/428_2.png
deleted file mode 100644
index 5b325f3256a..00000000000
Binary files a/public/images/pokemon/icons/variant/3/428_2.png and /dev/null differ
diff --git a/public/images/pokemon/icons/variant/3/429_1.png b/public/images/pokemon/icons/variant/3/429_1.png
deleted file mode 100644
index 667f389f5c1..00000000000
Binary files a/public/images/pokemon/icons/variant/3/429_1.png and /dev/null differ
diff --git a/public/images/pokemon/icons/variant/3/429_2.png b/public/images/pokemon/icons/variant/3/429_2.png
deleted file mode 100644
index 85cd47bd85f..00000000000
Binary files a/public/images/pokemon/icons/variant/3/429_2.png and /dev/null differ
diff --git a/public/images/pokemon/icons/variant/3/429_3.png b/public/images/pokemon/icons/variant/3/429_3.png
deleted file mode 100644
index bb9b2384514..00000000000
Binary files a/public/images/pokemon/icons/variant/3/429_3.png and /dev/null differ
diff --git a/public/images/pokemon/icons/variant/3/475-mega_3.png b/public/images/pokemon/icons/variant/3/475-mega_3.png
deleted file mode 100644
index c067c36c836..00000000000
Binary files a/public/images/pokemon/icons/variant/3/475-mega_3.png and /dev/null differ
diff --git a/public/images/pokemon/icons/variant/3/475_3.png b/public/images/pokemon/icons/variant/3/475_3.png
deleted file mode 100644
index 4a8f5bdb56d..00000000000
Binary files a/public/images/pokemon/icons/variant/3/475_3.png and /dev/null differ
diff --git a/public/images/pokemon/icons/variant/4/427_2.png b/public/images/pokemon/icons/variant/4/427_2.png
index 1b5d9271624..ceaf11acb48 100644
Binary files a/public/images/pokemon/icons/variant/4/427_2.png and b/public/images/pokemon/icons/variant/4/427_2.png differ
diff --git a/public/images/pokemon/icons/variant/4/427_3.png b/public/images/pokemon/icons/variant/4/427_3.png
index a3f90ea6dfa..5972f5e9489 100644
Binary files a/public/images/pokemon/icons/variant/4/427_3.png and b/public/images/pokemon/icons/variant/4/427_3.png differ
diff --git a/public/images/pokemon/icons/variant/4/428-mega_2.png b/public/images/pokemon/icons/variant/4/428-mega_2.png
index 43dfa05d438..32c3293a796 100644
Binary files a/public/images/pokemon/icons/variant/4/428-mega_2.png and b/public/images/pokemon/icons/variant/4/428-mega_2.png differ
diff --git a/public/images/pokemon/icons/variant/4/428_2.png b/public/images/pokemon/icons/variant/4/428_2.png
index 1e42720c78b..5b325f3256a 100644
Binary files a/public/images/pokemon/icons/variant/4/428_2.png and b/public/images/pokemon/icons/variant/4/428_2.png differ
diff --git a/public/images/pokemon/icons/variant/4/429_1.png b/public/images/pokemon/icons/variant/4/429_1.png
index 7354a6a6be7..667f389f5c1 100644
Binary files a/public/images/pokemon/icons/variant/4/429_1.png and b/public/images/pokemon/icons/variant/4/429_1.png differ
diff --git a/public/images/pokemon/icons/variant/4/429_2.png b/public/images/pokemon/icons/variant/4/429_2.png
index 9ec7cd5e76e..85cd47bd85f 100644
Binary files a/public/images/pokemon/icons/variant/4/429_2.png and b/public/images/pokemon/icons/variant/4/429_2.png differ
diff --git a/public/images/pokemon/icons/variant/4/429_3.png b/public/images/pokemon/icons/variant/4/429_3.png
index 48f7068ced8..bb9b2384514 100644
Binary files a/public/images/pokemon/icons/variant/4/429_3.png and b/public/images/pokemon/icons/variant/4/429_3.png differ
diff --git a/public/images/pokemon/icons/variant/8/851-gigantamax.png b/public/images/pokemon/icons/variant/8/851-gigantamax.png
new file mode 100644
index 00000000000..e757af7b4fa
Binary files /dev/null and b/public/images/pokemon/icons/variant/8/851-gigantamax.png differ
diff --git a/public/images/pokemon/icons/variant/8/851-gigantamax_2.png b/public/images/pokemon/icons/variant/8/851-gigantamax_2.png
new file mode 100644
index 00000000000..081d8284b3d
Binary files /dev/null and b/public/images/pokemon/icons/variant/8/851-gigantamax_2.png differ
diff --git a/public/images/pokemon/icons/variant/8/851-gigantamax_3.png b/public/images/pokemon/icons/variant/8/851-gigantamax_3.png
new file mode 100644
index 00000000000..6d26a7395f2
Binary files /dev/null and b/public/images/pokemon/icons/variant/8/851-gigantamax_3.png differ
diff --git a/public/images/pokemon/icons/variant/8/851s-gigantamax.png b/public/images/pokemon/icons/variant/8/851s-gigantamax.png
new file mode 100644
index 00000000000..73fb57b8a5a
Binary files /dev/null and b/public/images/pokemon/icons/variant/8/851s-gigantamax.png differ
diff --git a/public/images/pokemon/icons/variant/8/909_2.png b/public/images/pokemon/icons/variant/8/909_2.png
deleted file mode 100644
index 73f71bd49d3..00000000000
Binary files a/public/images/pokemon/icons/variant/8/909_2.png and /dev/null differ
diff --git a/public/images/pokemon/icons/variant/8/909_3.png b/public/images/pokemon/icons/variant/8/909_3.png
deleted file mode 100644
index 5fb79e5b917..00000000000
Binary files a/public/images/pokemon/icons/variant/8/909_3.png and /dev/null differ
diff --git a/public/images/pokemon/icons/variant/8/1003_2.png b/public/images/pokemon/icons/variant/9/1003_2.png
similarity index 100%
rename from public/images/pokemon/icons/variant/8/1003_2.png
rename to public/images/pokemon/icons/variant/9/1003_2.png
diff --git a/public/images/pokemon/icons/variant/8/1003_3.png b/public/images/pokemon/icons/variant/9/1003_3.png
similarity index 100%
rename from public/images/pokemon/icons/variant/8/1003_3.png
rename to public/images/pokemon/icons/variant/9/1003_3.png
diff --git a/public/images/pokemon/icons/variant/8/1006_2.png b/public/images/pokemon/icons/variant/9/1006_2.png
similarity index 100%
rename from public/images/pokemon/icons/variant/8/1006_2.png
rename to public/images/pokemon/icons/variant/9/1006_2.png
diff --git a/public/images/pokemon/icons/variant/8/1006_3.png b/public/images/pokemon/icons/variant/9/1006_3.png
similarity index 100%
rename from public/images/pokemon/icons/variant/8/1006_3.png
rename to public/images/pokemon/icons/variant/9/1006_3.png
diff --git a/public/images/pokemon/icons/variant/8/1010_2.png b/public/images/pokemon/icons/variant/9/1010_2.png
similarity index 100%
rename from public/images/pokemon/icons/variant/8/1010_2.png
rename to public/images/pokemon/icons/variant/9/1010_2.png
diff --git a/public/images/pokemon/icons/variant/8/1010_3.png b/public/images/pokemon/icons/variant/9/1010_3.png
similarity index 100%
rename from public/images/pokemon/icons/variant/8/1010_3.png
rename to public/images/pokemon/icons/variant/9/1010_3.png
diff --git a/public/images/pokemon/icons/variant/9/909_2.png b/public/images/pokemon/icons/variant/9/909_2.png
index 95cf5e14d4e..73f71bd49d3 100644
Binary files a/public/images/pokemon/icons/variant/9/909_2.png and b/public/images/pokemon/icons/variant/9/909_2.png differ
diff --git a/public/images/pokemon/icons/variant/9/909_3.png b/public/images/pokemon/icons/variant/9/909_3.png
index d4d7a9593a4..5fb79e5b917 100644
Binary files a/public/images/pokemon/icons/variant/9/909_3.png and b/public/images/pokemon/icons/variant/9/909_3.png differ
diff --git a/public/images/pokemon/icons/variant/8/912_2.png b/public/images/pokemon/icons/variant/9/912_2.png
similarity index 100%
rename from public/images/pokemon/icons/variant/8/912_2.png
rename to public/images/pokemon/icons/variant/9/912_2.png
diff --git a/public/images/pokemon/icons/variant/8/912_3.png b/public/images/pokemon/icons/variant/9/912_3.png
similarity index 100%
rename from public/images/pokemon/icons/variant/8/912_3.png
rename to public/images/pokemon/icons/variant/9/912_3.png
diff --git a/public/images/pokemon/icons/variant/8/913_2.png b/public/images/pokemon/icons/variant/9/913_2.png
similarity index 100%
rename from public/images/pokemon/icons/variant/8/913_2.png
rename to public/images/pokemon/icons/variant/9/913_2.png
diff --git a/public/images/pokemon/icons/variant/8/913_3.png b/public/images/pokemon/icons/variant/9/913_3.png
similarity index 100%
rename from public/images/pokemon/icons/variant/8/913_3.png
rename to public/images/pokemon/icons/variant/9/913_3.png
diff --git a/public/images/pokemon/icons/variant/8/914_2.png b/public/images/pokemon/icons/variant/9/914_2.png
similarity index 100%
rename from public/images/pokemon/icons/variant/8/914_2.png
rename to public/images/pokemon/icons/variant/9/914_2.png
diff --git a/public/images/pokemon/icons/variant/8/914_3.png b/public/images/pokemon/icons/variant/9/914_3.png
similarity index 100%
rename from public/images/pokemon/icons/variant/8/914_3.png
rename to public/images/pokemon/icons/variant/9/914_3.png
diff --git a/public/images/pokemon/icons/variant/8/940_2.png b/public/images/pokemon/icons/variant/9/940_2.png
similarity index 100%
rename from public/images/pokemon/icons/variant/8/940_2.png
rename to public/images/pokemon/icons/variant/9/940_2.png
diff --git a/public/images/pokemon/icons/variant/8/940_3.png b/public/images/pokemon/icons/variant/9/940_3.png
similarity index 100%
rename from public/images/pokemon/icons/variant/8/940_3.png
rename to public/images/pokemon/icons/variant/9/940_3.png
diff --git a/public/images/pokemon/icons/variant/8/941_2.png b/public/images/pokemon/icons/variant/9/941_2.png
similarity index 100%
rename from public/images/pokemon/icons/variant/8/941_2.png
rename to public/images/pokemon/icons/variant/9/941_2.png
diff --git a/public/images/pokemon/icons/variant/8/941_3.png b/public/images/pokemon/icons/variant/9/941_3.png
similarity index 100%
rename from public/images/pokemon/icons/variant/8/941_3.png
rename to public/images/pokemon/icons/variant/9/941_3.png
diff --git a/public/images/pokemon/icons/variant/8/953_2.png b/public/images/pokemon/icons/variant/9/953_2.png
similarity index 100%
rename from public/images/pokemon/icons/variant/8/953_2.png
rename to public/images/pokemon/icons/variant/9/953_2.png
diff --git a/public/images/pokemon/icons/variant/8/953_3.png b/public/images/pokemon/icons/variant/9/953_3.png
similarity index 100%
rename from public/images/pokemon/icons/variant/8/953_3.png
rename to public/images/pokemon/icons/variant/9/953_3.png
diff --git a/public/images/pokemon/icons/variant/8/954_2.png b/public/images/pokemon/icons/variant/9/954_2.png
similarity index 100%
rename from public/images/pokemon/icons/variant/8/954_2.png
rename to public/images/pokemon/icons/variant/9/954_2.png
diff --git a/public/images/pokemon/icons/variant/8/954_3.png b/public/images/pokemon/icons/variant/9/954_3.png
similarity index 100%
rename from public/images/pokemon/icons/variant/8/954_3.png
rename to public/images/pokemon/icons/variant/9/954_3.png
diff --git a/public/images/pokemon/icons/variant/8/981_2.png b/public/images/pokemon/icons/variant/9/981_2.png
similarity index 100%
rename from public/images/pokemon/icons/variant/8/981_2.png
rename to public/images/pokemon/icons/variant/9/981_2.png
diff --git a/public/images/pokemon/icons/variant/8/981_3.png b/public/images/pokemon/icons/variant/9/981_3.png
similarity index 100%
rename from public/images/pokemon/icons/variant/8/981_3.png
rename to public/images/pokemon/icons/variant/9/981_3.png