diff --git a/icons/pokeball/beast.png b/icons/ball/beast.png
similarity index 100%
rename from icons/pokeball/beast.png
rename to icons/ball/beast.png
diff --git a/icons/pokeball/cherish.png b/icons/ball/cherish.png
similarity index 100%
rename from icons/pokeball/cherish.png
rename to icons/ball/cherish.png
diff --git a/icons/pokeball/dive.png b/icons/ball/dive.png
similarity index 100%
rename from icons/pokeball/dive.png
rename to icons/ball/dive.png
diff --git a/icons/pokeball/dream.png b/icons/ball/dream.png
similarity index 100%
rename from icons/pokeball/dream.png
rename to icons/ball/dream.png
diff --git a/icons/pokeball/dusk.png b/icons/ball/dusk.png
similarity index 100%
rename from icons/pokeball/dusk.png
rename to icons/ball/dusk.png
diff --git a/icons/pokeball/fast.png b/icons/ball/fast.png
similarity index 100%
rename from icons/pokeball/fast.png
rename to icons/ball/fast.png
diff --git a/icons/pokeball/friend.png b/icons/ball/friend.png
similarity index 100%
rename from icons/pokeball/friend.png
rename to icons/ball/friend.png
diff --git a/icons/pokeball/great.png b/icons/ball/great.png
similarity index 100%
rename from icons/pokeball/great.png
rename to icons/ball/great.png
diff --git a/icons/pokeball/heal.png b/icons/ball/heal.png
similarity index 100%
rename from icons/pokeball/heal.png
rename to icons/ball/heal.png
diff --git a/icons/pokeball/heavy.png b/icons/ball/heavy.png
similarity index 100%
rename from icons/pokeball/heavy.png
rename to icons/ball/heavy.png
diff --git a/icons/pokeball/level.png b/icons/ball/level.png
similarity index 100%
rename from icons/pokeball/level.png
rename to icons/ball/level.png
diff --git a/icons/pokeball/love.png b/icons/ball/love.png
similarity index 100%
rename from icons/pokeball/love.png
rename to icons/ball/love.png
diff --git a/icons/pokeball/lure.png b/icons/ball/lure.png
similarity index 100%
rename from icons/pokeball/lure.png
rename to icons/ball/lure.png
diff --git a/icons/pokeball/luxury.png b/icons/ball/luxury.png
similarity index 100%
rename from icons/pokeball/luxury.png
rename to icons/ball/luxury.png
diff --git a/icons/pokeball/master.png b/icons/ball/master.png
similarity index 100%
rename from icons/pokeball/master.png
rename to icons/ball/master.png
diff --git a/icons/pokeball/moon.png b/icons/ball/moon.png
similarity index 100%
rename from icons/pokeball/moon.png
rename to icons/ball/moon.png
diff --git a/icons/pokeball/nest.png b/icons/ball/nest.png
similarity index 100%
rename from icons/pokeball/nest.png
rename to icons/ball/nest.png
diff --git a/icons/pokeball/net.png b/icons/ball/net.png
similarity index 100%
rename from icons/pokeball/net.png
rename to icons/ball/net.png
diff --git a/icons/pokeball/park.png b/icons/ball/park.png
similarity index 100%
rename from icons/pokeball/park.png
rename to icons/ball/park.png
diff --git a/icons/pokeball/poke.png b/icons/ball/poke.png
similarity index 100%
rename from icons/pokeball/poke.png
rename to icons/ball/poke.png
diff --git a/icons/pokeball/premier.png b/icons/ball/premier.png
similarity index 100%
rename from icons/pokeball/premier.png
rename to icons/ball/premier.png
diff --git a/icons/pokeball/quick.png b/icons/ball/quick.png
similarity index 100%
rename from icons/pokeball/quick.png
rename to icons/ball/quick.png
diff --git a/icons/pokeball/repeat.png b/icons/ball/repeat.png
similarity index 100%
rename from icons/pokeball/repeat.png
rename to icons/ball/repeat.png
diff --git a/icons/pokeball/safari.png b/icons/ball/safari.png
similarity index 100%
rename from icons/pokeball/safari.png
rename to icons/ball/safari.png
diff --git a/icons/pokeball/sport.png b/icons/ball/sport.png
similarity index 100%
rename from icons/pokeball/sport.png
rename to icons/ball/sport.png
diff --git a/icons/pokeball/timer.png b/icons/ball/timer.png
similarity index 100%
rename from icons/pokeball/timer.png
rename to icons/ball/timer.png
diff --git a/icons/pokeball/ultra.png b/icons/ball/ultra.png
similarity index 100%
rename from icons/pokeball/ultra.png
rename to icons/ball/ultra.png
diff --git a/icons/key-item/basement-key-gen4.png b/icons/key-item/basement-key--goldenrod.png
similarity index 100%
rename from icons/key-item/basement-key-gen4.png
rename to icons/key-item/basement-key--goldenrod.png
diff --git a/icons/key-item/bicycle.png b/icons/key-item/bicycle.png
new file mode 100644
index 00000000..fd52f25e
Binary files /dev/null and b/icons/key-item/bicycle.png differ
diff --git a/icons/key-item/green-bike.png b/icons/key-item/bike--green.png
similarity index 100%
rename from icons/key-item/green-bike.png
rename to icons/key-item/bike--green.png
diff --git a/icons/key-item/yellow-bike.png b/icons/key-item/bike--yellow.png
similarity index 100%
rename from icons/key-item/yellow-bike.png
rename to icons/key-item/bike--yellow.png
diff --git a/icons/key-item/contest-costume-cute.png b/icons/key-item/contest-costume--dress.png
similarity index 100%
rename from icons/key-item/contest-costume-cute.png
rename to icons/key-item/contest-costume--dress.png
diff --git a/icons/key-item/contest-costume-cool.png b/icons/key-item/contest-costume--jacket.png
similarity index 100%
rename from icons/key-item/contest-costume-cool.png
rename to icons/key-item/contest-costume--jacket.png
diff --git a/icons/key-item/devon-goods.png b/icons/key-item/devon-parts.png
similarity index 100%
rename from icons/key-item/devon-goods.png
rename to icons/key-item/devon-parts.png
diff --git a/icons/key-item/dropped-item-red.png b/icons/key-item/dropped-item--red.png
similarity index 100%
rename from icons/key-item/dropped-item-red.png
rename to icons/key-item/dropped-item--red.png
diff --git a/icons/key-item/dropped-item-yellow.png b/icons/key-item/dropped-item--yellow.png
similarity index 100%
rename from icons/key-item/dropped-item-yellow.png
rename to icons/key-item/dropped-item--yellow.png
diff --git a/icons/key-item/holo-caster-green.png b/icons/key-item/holo-caster--green.png
similarity index 100%
rename from icons/key-item/holo-caster-green.png
rename to icons/key-item/holo-caster--green.png
diff --git a/icons/key-item/holo-caster-red.png b/icons/key-item/holo-caster--red.png
similarity index 100%
rename from icons/key-item/holo-caster-red.png
rename to icons/key-item/holo-caster--red.png
diff --git a/icons/key-item/meteorite-stage-2.png b/icons/key-item/meteorite--2.png
similarity index 100%
rename from icons/key-item/meteorite-stage-2.png
rename to icons/key-item/meteorite--2.png
diff --git a/icons/key-item/meteorite-stage-3.png b/icons/key-item/meteorite--3.png
similarity index 100%
rename from icons/key-item/meteorite-stage-3.png
rename to icons/key-item/meteorite--3.png
diff --git a/icons/key-item/meteorite-stage-4.png b/icons/key-item/meteorite--4.png
similarity index 100%
rename from icons/key-item/meteorite-stage-4.png
rename to icons/key-item/meteorite--4.png
diff --git a/icons/key-item/meteorite-stage-1.png b/icons/key-item/meteorite.png
similarity index 100%
rename from icons/key-item/meteorite-stage-1.png
rename to icons/key-item/meteorite.png
diff --git a/icons/key-item/storage-key--galactic-warehouse.png b/icons/key-item/storage-key--galactic-warehouse.png
new file mode 100644
index 00000000..1d81d60c
Binary files /dev/null and b/icons/key-item/storage-key--galactic-warehouse.png differ
diff --git a/icons/key-item/storage-key-gen3.png b/icons/key-item/storage-key-gen3.png
deleted file mode 100644
index f6a2130c..00000000
Binary files a/icons/key-item/storage-key-gen3.png and /dev/null differ
diff --git a/icons/key-item/storage-key.png b/icons/key-item/storage-key.png
index 1d81d60c..f6a2130c 100644
Binary files a/icons/key-item/storage-key.png and b/icons/key-item/storage-key.png differ
diff --git a/icons/key-item/travel-trunk-gold.png b/icons/key-item/travel-trunk--gold.png
similarity index 100%
rename from icons/key-item/travel-trunk-gold.png
rename to icons/key-item/travel-trunk--gold.png
diff --git a/icons/key-item/travel-trunk-silver.png b/icons/key-item/travel-trunk--silver.png
similarity index 100%
rename from icons/key-item/travel-trunk-silver.png
rename to icons/key-item/travel-trunk--silver.png
diff --git a/icons/key-item/xtransceiver-blue.png b/icons/key-item/xtransceiver--blue.png
similarity index 100%
rename from icons/key-item/xtransceiver-blue.png
rename to icons/key-item/xtransceiver--blue.png
diff --git a/icons/key-item/xtransceiver-red.png b/icons/key-item/xtransceiver--red.png
similarity index 100%
rename from icons/key-item/xtransceiver-red.png
rename to icons/key-item/xtransceiver--red.png
diff --git a/icons/key-item/xtransceiver-yellow.png b/icons/key-item/xtransceiver--yellow.png
similarity index 100%
rename from icons/key-item/xtransceiver-yellow.png
rename to icons/key-item/xtransceiver--yellow.png
diff --git a/icons/mega-stone/glalite.png b/icons/mega-stone/glalitite.png
similarity index 100%
rename from icons/mega-stone/glalite.png
rename to icons/mega-stone/glalitite.png
diff --git a/icons/pokemon/regular/genesect-fire.png b/icons/pokemon/regular/genesect-burn.png
similarity index 100%
rename from icons/pokemon/regular/genesect-fire.png
rename to icons/pokemon/regular/genesect-burn.png
diff --git a/icons/pokemon/regular/genesect-ice.png b/icons/pokemon/regular/genesect-chill.png
similarity index 100%
rename from icons/pokemon/regular/genesect-ice.png
rename to icons/pokemon/regular/genesect-chill.png
diff --git a/icons/pokemon/regular/genesect-water.png b/icons/pokemon/regular/genesect-douse.png
similarity index 100%
rename from icons/pokemon/regular/genesect-water.png
rename to icons/pokemon/regular/genesect-douse.png
diff --git a/icons/pokemon/regular/genesect-electric.png b/icons/pokemon/regular/genesect-shock.png
similarity index 100%
rename from icons/pokemon/regular/genesect-electric.png
rename to icons/pokemon/regular/genesect-shock.png
diff --git a/icons/pokemon/regular/genesect-normal.png b/icons/pokemon/regular/genesect-standard.png
similarity index 100%
rename from icons/pokemon/regular/genesect-normal.png
rename to icons/pokemon/regular/genesect-standard.png
diff --git a/icons/pokemon/regular/minior-core-blue.png b/icons/pokemon/regular/minior-blue.png
similarity index 100%
rename from icons/pokemon/regular/minior-core-blue.png
rename to icons/pokemon/regular/minior-blue.png
diff --git a/icons/pokemon/regular/minior-core-green.png b/icons/pokemon/regular/minior-green.png
similarity index 100%
rename from icons/pokemon/regular/minior-core-green.png
rename to icons/pokemon/regular/minior-green.png
diff --git a/icons/pokemon/regular/minior-core-indigo.png b/icons/pokemon/regular/minior-indigo.png
similarity index 100%
rename from icons/pokemon/regular/minior-core-indigo.png
rename to icons/pokemon/regular/minior-indigo.png
diff --git a/icons/pokemon/regular/minior-core-orange.png b/icons/pokemon/regular/minior-orange.png
similarity index 100%
rename from icons/pokemon/regular/minior-core-orange.png
rename to icons/pokemon/regular/minior-orange.png
diff --git a/icons/pokemon/regular/minior-core-red.png b/icons/pokemon/regular/minior-red.png
similarity index 100%
rename from icons/pokemon/regular/minior-core-red.png
rename to icons/pokemon/regular/minior-red.png
diff --git a/icons/pokemon/regular/minior-core-violet.png b/icons/pokemon/regular/minior-violet.png
similarity index 100%
rename from icons/pokemon/regular/minior-core-violet.png
rename to icons/pokemon/regular/minior-violet.png
diff --git a/icons/pokemon/regular/minior-core-yellow.png b/icons/pokemon/regular/minior-yellow.png
similarity index 100%
rename from icons/pokemon/regular/minior-core-yellow.png
rename to icons/pokemon/regular/minior-yellow.png
diff --git a/icons/pokemon/regular/necrozma-dawn-wings.png b/icons/pokemon/regular/necrozma-dawn.png
similarity index 100%
rename from icons/pokemon/regular/necrozma-dawn-wings.png
rename to icons/pokemon/regular/necrozma-dawn.png
diff --git a/icons/pokemon/regular/necrozma-dusk-mane.png b/icons/pokemon/regular/necrozma-dusk.png
similarity index 100%
rename from icons/pokemon/regular/necrozma-dusk-mane.png
rename to icons/pokemon/regular/necrozma-dusk.png
diff --git a/icons/pokemon/regular/oricorio-pa-u.png b/icons/pokemon/regular/oricorio-pau.png
similarity index 100%
rename from icons/pokemon/regular/oricorio-pa-u.png
rename to icons/pokemon/regular/oricorio-pau.png
diff --git a/icons/pokemon/regular/pikachu-beautiful.png b/icons/pokemon/regular/pikachu-belle.png
similarity index 100%
rename from icons/pokemon/regular/pikachu-beautiful.png
rename to icons/pokemon/regular/pikachu-belle.png
diff --git a/icons/pokemon/regular/pikachu-tough.png b/icons/pokemon/regular/pikachu-libre.png
similarity index 100%
rename from icons/pokemon/regular/pikachu-tough.png
rename to icons/pokemon/regular/pikachu-libre.png
diff --git a/icons/pokemon/regular/pikachu-clever.png b/icons/pokemon/regular/pikachu-phd.png
similarity index 100%
rename from icons/pokemon/regular/pikachu-clever.png
rename to icons/pokemon/regular/pikachu-phd.png
diff --git a/icons/pokemon/regular/pikachu-cute.png b/icons/pokemon/regular/pikachu-pop-star.png
similarity index 100%
rename from icons/pokemon/regular/pikachu-cute.png
rename to icons/pokemon/regular/pikachu-pop-star.png
diff --git a/icons/pokemon/regular/pikachu-cool.png b/icons/pokemon/regular/pikachu-rock-star.png
similarity index 100%
rename from icons/pokemon/regular/pikachu-cool.png
rename to icons/pokemon/regular/pikachu-rock-star.png
diff --git a/icons/pokemon/regular/right/minior-core-blue.png b/icons/pokemon/regular/right/minior-blue.png
similarity index 100%
rename from icons/pokemon/regular/right/minior-core-blue.png
rename to icons/pokemon/regular/right/minior-blue.png
diff --git a/icons/pokemon/regular/right/minior-core-green.png b/icons/pokemon/regular/right/minior-green.png
similarity index 100%
rename from icons/pokemon/regular/right/minior-core-green.png
rename to icons/pokemon/regular/right/minior-green.png
diff --git a/icons/pokemon/regular/right/minior-core-indigo.png b/icons/pokemon/regular/right/minior-indigo.png
similarity index 100%
rename from icons/pokemon/regular/right/minior-core-indigo.png
rename to icons/pokemon/regular/right/minior-indigo.png
diff --git a/icons/pokemon/regular/right/minior-core-orange.png b/icons/pokemon/regular/right/minior-orange.png
similarity index 100%
rename from icons/pokemon/regular/right/minior-core-orange.png
rename to icons/pokemon/regular/right/minior-orange.png
diff --git a/icons/pokemon/regular/right/minior-core-red.png b/icons/pokemon/regular/right/minior-red.png
similarity index 100%
rename from icons/pokemon/regular/right/minior-core-red.png
rename to icons/pokemon/regular/right/minior-red.png
diff --git a/icons/pokemon/regular/right/minior-core-violet.png b/icons/pokemon/regular/right/minior-violet.png
similarity index 100%
rename from icons/pokemon/regular/right/minior-core-violet.png
rename to icons/pokemon/regular/right/minior-violet.png
diff --git a/icons/pokemon/regular/right/minior-core-yellow.png b/icons/pokemon/regular/right/minior-yellow.png
similarity index 100%
rename from icons/pokemon/regular/right/minior-core-yellow.png
rename to icons/pokemon/regular/right/minior-yellow.png
diff --git a/icons/pokemon/regular/right/necrozma-dawn-wings.png b/icons/pokemon/regular/right/necrozma-dawn.png
similarity index 100%
rename from icons/pokemon/regular/right/necrozma-dawn-wings.png
rename to icons/pokemon/regular/right/necrozma-dawn.png
diff --git a/icons/pokemon/regular/right/necrozma-dusk-mane.png b/icons/pokemon/regular/right/necrozma-dusk.png
similarity index 100%
rename from icons/pokemon/regular/right/necrozma-dusk-mane.png
rename to icons/pokemon/regular/right/necrozma-dusk.png
diff --git a/icons/pokemon/regular/right/pikachu-beautiful.png b/icons/pokemon/regular/right/pikachu-belle.png
similarity index 100%
rename from icons/pokemon/regular/right/pikachu-beautiful.png
rename to icons/pokemon/regular/right/pikachu-belle.png
diff --git a/icons/pokemon/regular/right/pikachu-cute.png b/icons/pokemon/regular/right/pikachu-pop-star.png
similarity index 100%
rename from icons/pokemon/regular/right/pikachu-cute.png
rename to icons/pokemon/regular/right/pikachu-pop-star.png
diff --git a/icons/pokemon/regular/right/zygarde-10-percent.png b/icons/pokemon/regular/right/zygarde-10.png
similarity index 100%
rename from icons/pokemon/regular/right/zygarde-10-percent.png
rename to icons/pokemon/regular/right/zygarde-10.png
diff --git a/icons/pokemon/regular/zygarde-10-percent.png b/icons/pokemon/regular/zygarde-10.png
similarity index 100%
rename from icons/pokemon/regular/zygarde-10-percent.png
rename to icons/pokemon/regular/zygarde-10.png
diff --git a/icons/pokemon/shiny/genesect-fire.png b/icons/pokemon/shiny/genesect-burn.png
similarity index 100%
rename from icons/pokemon/shiny/genesect-fire.png
rename to icons/pokemon/shiny/genesect-burn.png
diff --git a/icons/pokemon/shiny/genesect-ice.png b/icons/pokemon/shiny/genesect-chill.png
similarity index 100%
rename from icons/pokemon/shiny/genesect-ice.png
rename to icons/pokemon/shiny/genesect-chill.png
diff --git a/icons/pokemon/shiny/genesect-water.png b/icons/pokemon/shiny/genesect-douse.png
similarity index 100%
rename from icons/pokemon/shiny/genesect-water.png
rename to icons/pokemon/shiny/genesect-douse.png
diff --git a/icons/pokemon/shiny/genesect-electric.png b/icons/pokemon/shiny/genesect-shock.png
similarity index 100%
rename from icons/pokemon/shiny/genesect-electric.png
rename to icons/pokemon/shiny/genesect-shock.png
diff --git a/icons/pokemon/shiny/genesect-normal.png b/icons/pokemon/shiny/genesect-standard.png
similarity index 100%
rename from icons/pokemon/shiny/genesect-normal.png
rename to icons/pokemon/shiny/genesect-standard.png
diff --git a/icons/pokemon/shiny/minior-core-blue.png b/icons/pokemon/shiny/minior-blue.png
similarity index 100%
rename from icons/pokemon/shiny/minior-core-blue.png
rename to icons/pokemon/shiny/minior-blue.png
diff --git a/icons/pokemon/shiny/minior-core-green.png b/icons/pokemon/shiny/minior-green.png
similarity index 100%
rename from icons/pokemon/shiny/minior-core-green.png
rename to icons/pokemon/shiny/minior-green.png
diff --git a/icons/pokemon/shiny/minior-core-indigo.png b/icons/pokemon/shiny/minior-indigo.png
similarity index 100%
rename from icons/pokemon/shiny/minior-core-indigo.png
rename to icons/pokemon/shiny/minior-indigo.png
diff --git a/icons/pokemon/shiny/minior-core-orange.png b/icons/pokemon/shiny/minior-orange.png
similarity index 100%
rename from icons/pokemon/shiny/minior-core-orange.png
rename to icons/pokemon/shiny/minior-orange.png
diff --git a/icons/pokemon/shiny/minior-core-red.png b/icons/pokemon/shiny/minior-red.png
similarity index 100%
rename from icons/pokemon/shiny/minior-core-red.png
rename to icons/pokemon/shiny/minior-red.png
diff --git a/icons/pokemon/shiny/minior-core-violet.png b/icons/pokemon/shiny/minior-violet.png
similarity index 100%
rename from icons/pokemon/shiny/minior-core-violet.png
rename to icons/pokemon/shiny/minior-violet.png
diff --git a/icons/pokemon/shiny/minior-core-yellow.png b/icons/pokemon/shiny/minior-yellow.png
similarity index 100%
rename from icons/pokemon/shiny/minior-core-yellow.png
rename to icons/pokemon/shiny/minior-yellow.png
diff --git a/icons/pokemon/shiny/necrozma-dawn-wings.png b/icons/pokemon/shiny/necrozma-dawn.png
similarity index 100%
rename from icons/pokemon/shiny/necrozma-dawn-wings.png
rename to icons/pokemon/shiny/necrozma-dawn.png
diff --git a/icons/pokemon/shiny/necrozma-dusk-mane.png b/icons/pokemon/shiny/necrozma-dusk.png
similarity index 100%
rename from icons/pokemon/shiny/necrozma-dusk-mane.png
rename to icons/pokemon/shiny/necrozma-dusk.png
diff --git a/icons/pokemon/shiny/oricorio-pa-u.png b/icons/pokemon/shiny/oricorio-pau.png
similarity index 100%
rename from icons/pokemon/shiny/oricorio-pa-u.png
rename to icons/pokemon/shiny/oricorio-pau.png
diff --git a/icons/pokemon/shiny/pikachu-beautiful.png b/icons/pokemon/shiny/pikachu-belle.png
similarity index 100%
rename from icons/pokemon/shiny/pikachu-beautiful.png
rename to icons/pokemon/shiny/pikachu-belle.png
diff --git a/icons/pokemon/shiny/pikachu-tough.png b/icons/pokemon/shiny/pikachu-libre.png
similarity index 100%
rename from icons/pokemon/shiny/pikachu-tough.png
rename to icons/pokemon/shiny/pikachu-libre.png
diff --git a/icons/pokemon/shiny/pikachu-clever.png b/icons/pokemon/shiny/pikachu-phd.png
similarity index 100%
rename from icons/pokemon/shiny/pikachu-clever.png
rename to icons/pokemon/shiny/pikachu-phd.png
diff --git a/icons/pokemon/shiny/pikachu-cute.png b/icons/pokemon/shiny/pikachu-pop-star.png
similarity index 100%
rename from icons/pokemon/shiny/pikachu-cute.png
rename to icons/pokemon/shiny/pikachu-pop-star.png
diff --git a/icons/pokemon/shiny/pikachu-cool.png b/icons/pokemon/shiny/pikachu-rock-star.png
similarity index 100%
rename from icons/pokemon/shiny/pikachu-cool.png
rename to icons/pokemon/shiny/pikachu-rock-star.png
diff --git a/icons/pokemon/shiny/right/minior-core-blue.png b/icons/pokemon/shiny/right/minior-blue.png
similarity index 100%
rename from icons/pokemon/shiny/right/minior-core-blue.png
rename to icons/pokemon/shiny/right/minior-blue.png
diff --git a/icons/pokemon/shiny/right/minior-core-green.png b/icons/pokemon/shiny/right/minior-green.png
similarity index 100%
rename from icons/pokemon/shiny/right/minior-core-green.png
rename to icons/pokemon/shiny/right/minior-green.png
diff --git a/icons/pokemon/shiny/right/minior-core-indigo.png b/icons/pokemon/shiny/right/minior-indigo.png
similarity index 100%
rename from icons/pokemon/shiny/right/minior-core-indigo.png
rename to icons/pokemon/shiny/right/minior-indigo.png
diff --git a/icons/pokemon/shiny/right/minior-core-orange.png b/icons/pokemon/shiny/right/minior-orange.png
similarity index 100%
rename from icons/pokemon/shiny/right/minior-core-orange.png
rename to icons/pokemon/shiny/right/minior-orange.png
diff --git a/icons/pokemon/shiny/right/minior-core-red.png b/icons/pokemon/shiny/right/minior-red.png
similarity index 100%
rename from icons/pokemon/shiny/right/minior-core-red.png
rename to icons/pokemon/shiny/right/minior-red.png
diff --git a/icons/pokemon/shiny/right/minior-core-violet.png b/icons/pokemon/shiny/right/minior-violet.png
similarity index 100%
rename from icons/pokemon/shiny/right/minior-core-violet.png
rename to icons/pokemon/shiny/right/minior-violet.png
diff --git a/icons/pokemon/shiny/right/minior-core-yellow.png b/icons/pokemon/shiny/right/minior-yellow.png
similarity index 100%
rename from icons/pokemon/shiny/right/minior-core-yellow.png
rename to icons/pokemon/shiny/right/minior-yellow.png
diff --git a/icons/pokemon/shiny/right/necrozma-dawn-wings.png b/icons/pokemon/shiny/right/necrozma-dawn.png
similarity index 100%
rename from icons/pokemon/shiny/right/necrozma-dawn-wings.png
rename to icons/pokemon/shiny/right/necrozma-dawn.png
diff --git a/icons/pokemon/shiny/right/necrozma-dusk-mane.png b/icons/pokemon/shiny/right/necrozma-dusk.png
similarity index 100%
rename from icons/pokemon/shiny/right/necrozma-dusk-mane.png
rename to icons/pokemon/shiny/right/necrozma-dusk.png
diff --git a/icons/pokemon/shiny/right/pikachu-beautiful.png b/icons/pokemon/shiny/right/pikachu-belle.png
similarity index 100%
rename from icons/pokemon/shiny/right/pikachu-beautiful.png
rename to icons/pokemon/shiny/right/pikachu-belle.png
diff --git a/icons/pokemon/shiny/right/pikachu-cute.png b/icons/pokemon/shiny/right/pikachu-pop-star.png
similarity index 100%
rename from icons/pokemon/shiny/right/pikachu-cute.png
rename to icons/pokemon/shiny/right/pikachu-pop-star.png
diff --git a/icons/pokemon/shiny/right/zygarde-10-percent.png b/icons/pokemon/shiny/right/zygarde-10.png
similarity index 100%
rename from icons/pokemon/shiny/right/zygarde-10-percent.png
rename to icons/pokemon/shiny/right/zygarde-10.png
diff --git a/icons/pokemon/shiny/zygarde-10-percent.png b/icons/pokemon/shiny/zygarde-10.png
similarity index 100%
rename from icons/pokemon/shiny/zygarde-10-percent.png
rename to icons/pokemon/shiny/zygarde-10.png
diff --git a/icons/z-crystals/aloraichium-z-bag.png b/icons/z-crystals/aloraichium-z--bag.png
similarity index 100%
rename from icons/z-crystals/aloraichium-z-bag.png
rename to icons/z-crystals/aloraichium-z--bag.png
diff --git a/icons/z-crystals/aloraichium-z-held.png b/icons/z-crystals/aloraichium-z--held.png
similarity index 100%
rename from icons/z-crystals/aloraichium-z-held.png
rename to icons/z-crystals/aloraichium-z--held.png
diff --git a/icons/z-crystals/buginium-z-bag.png b/icons/z-crystals/buginium-z--bag.png
similarity index 100%
rename from icons/z-crystals/buginium-z-bag.png
rename to icons/z-crystals/buginium-z--bag.png
diff --git a/icons/z-crystals/buginium-z-held.png b/icons/z-crystals/buginium-z--held.png
similarity index 100%
rename from icons/z-crystals/buginium-z-held.png
rename to icons/z-crystals/buginium-z--held.png
diff --git a/icons/z-crystals/darkinium-z-bag.png b/icons/z-crystals/darkinium-z--bag.png
similarity index 100%
rename from icons/z-crystals/darkinium-z-bag.png
rename to icons/z-crystals/darkinium-z--bag.png
diff --git a/icons/z-crystals/darkinium-z-held.png b/icons/z-crystals/darkinium-z--held.png
similarity index 100%
rename from icons/z-crystals/darkinium-z-held.png
rename to icons/z-crystals/darkinium-z--held.png
diff --git a/icons/z-crystals/decidium-z-bag.png b/icons/z-crystals/decidium-z--bag.png
similarity index 100%
rename from icons/z-crystals/decidium-z-bag.png
rename to icons/z-crystals/decidium-z--bag.png
diff --git a/icons/z-crystals/decidium-z-held.png b/icons/z-crystals/decidium-z--held.png
similarity index 100%
rename from icons/z-crystals/decidium-z-held.png
rename to icons/z-crystals/decidium-z--held.png
diff --git a/icons/z-crystals/dragonium-z-bag.png b/icons/z-crystals/dragonium-z--bag.png
similarity index 100%
rename from icons/z-crystals/dragonium-z-bag.png
rename to icons/z-crystals/dragonium-z--bag.png
diff --git a/icons/z-crystals/dragonium-z-held.png b/icons/z-crystals/dragonium-z--held.png
similarity index 100%
rename from icons/z-crystals/dragonium-z-held.png
rename to icons/z-crystals/dragonium-z--held.png
diff --git a/icons/z-crystals/eevium-z-bag.png b/icons/z-crystals/eevium-z--bag.png
similarity index 100%
rename from icons/z-crystals/eevium-z-bag.png
rename to icons/z-crystals/eevium-z--bag.png
diff --git a/icons/z-crystals/eevium-z-held.png b/icons/z-crystals/eevium-z--held.png
similarity index 100%
rename from icons/z-crystals/eevium-z-held.png
rename to icons/z-crystals/eevium-z--held.png
diff --git a/icons/z-crystals/electrium-z-bag.png b/icons/z-crystals/electrium-z--bag.png
similarity index 100%
rename from icons/z-crystals/electrium-z-bag.png
rename to icons/z-crystals/electrium-z--bag.png
diff --git a/icons/z-crystals/electrium-z-held.png b/icons/z-crystals/electrium-z--held.png
similarity index 100%
rename from icons/z-crystals/electrium-z-held.png
rename to icons/z-crystals/electrium-z--held.png
diff --git a/icons/z-crystals/fairium-z-bag.png b/icons/z-crystals/fairium-z--bag.png
similarity index 100%
rename from icons/z-crystals/fairium-z-bag.png
rename to icons/z-crystals/fairium-z--bag.png
diff --git a/icons/z-crystals/fairium-z-held.png b/icons/z-crystals/fairium-z--held.png
similarity index 100%
rename from icons/z-crystals/fairium-z-held.png
rename to icons/z-crystals/fairium-z--held.png
diff --git a/icons/z-crystals/fightinium-z-bag.png b/icons/z-crystals/fightinium-z--bag.png
similarity index 100%
rename from icons/z-crystals/fightinium-z-bag.png
rename to icons/z-crystals/fightinium-z--bag.png
diff --git a/icons/z-crystals/fightinium-z-held.png b/icons/z-crystals/fightinium-z--held.png
similarity index 100%
rename from icons/z-crystals/fightinium-z-held.png
rename to icons/z-crystals/fightinium-z--held.png
diff --git a/icons/z-crystals/firium-z-bag.png b/icons/z-crystals/firium-z--bag.png
similarity index 100%
rename from icons/z-crystals/firium-z-bag.png
rename to icons/z-crystals/firium-z--bag.png
diff --git a/icons/z-crystals/firium-z-held.png b/icons/z-crystals/firium-z--held.png
similarity index 100%
rename from icons/z-crystals/firium-z-held.png
rename to icons/z-crystals/firium-z--held.png
diff --git a/icons/z-crystals/flyinium-z-bag.png b/icons/z-crystals/flyinium-z--bag.png
similarity index 100%
rename from icons/z-crystals/flyinium-z-bag.png
rename to icons/z-crystals/flyinium-z--bag.png
diff --git a/icons/z-crystals/flyinium-z-held.png b/icons/z-crystals/flyinium-z--held.png
similarity index 100%
rename from icons/z-crystals/flyinium-z-held.png
rename to icons/z-crystals/flyinium-z--held.png
diff --git a/icons/z-crystals/ghostium-z-bag.png b/icons/z-crystals/ghostium-z--bag.png
similarity index 100%
rename from icons/z-crystals/ghostium-z-bag.png
rename to icons/z-crystals/ghostium-z--bag.png
diff --git a/icons/z-crystals/ghostium-z-held.png b/icons/z-crystals/ghostium-z--held.png
similarity index 100%
rename from icons/z-crystals/ghostium-z-held.png
rename to icons/z-crystals/ghostium-z--held.png
diff --git a/icons/z-crystals/grassium-z-bag.png b/icons/z-crystals/grassium-z--bag.png
similarity index 100%
rename from icons/z-crystals/grassium-z-bag.png
rename to icons/z-crystals/grassium-z--bag.png
diff --git a/icons/z-crystals/grassium-z-held.png b/icons/z-crystals/grassium-z--held.png
similarity index 100%
rename from icons/z-crystals/grassium-z-held.png
rename to icons/z-crystals/grassium-z--held.png
diff --git a/icons/z-crystals/groundium-z-bag.png b/icons/z-crystals/groundium-z--bag.png
similarity index 100%
rename from icons/z-crystals/groundium-z-bag.png
rename to icons/z-crystals/groundium-z--bag.png
diff --git a/icons/z-crystals/groundium-z-held.png b/icons/z-crystals/groundium-z--held.png
similarity index 100%
rename from icons/z-crystals/groundium-z-held.png
rename to icons/z-crystals/groundium-z--held.png
diff --git a/icons/z-crystals/icium-z-bag.png b/icons/z-crystals/icium-z--bag.png
similarity index 100%
rename from icons/z-crystals/icium-z-bag.png
rename to icons/z-crystals/icium-z--bag.png
diff --git a/icons/z-crystals/icium-z-held.png b/icons/z-crystals/icium-z--held.png
similarity index 100%
rename from icons/z-crystals/icium-z-held.png
rename to icons/z-crystals/icium-z--held.png
diff --git a/icons/z-crystals/incinium-z-bag.png b/icons/z-crystals/incinium-z--bag.png
similarity index 100%
rename from icons/z-crystals/incinium-z-bag.png
rename to icons/z-crystals/incinium-z--bag.png
diff --git a/icons/z-crystals/incinium-z-held.png b/icons/z-crystals/incinium-z--held.png
similarity index 100%
rename from icons/z-crystals/incinium-z-held.png
rename to icons/z-crystals/incinium-z--held.png
diff --git a/icons/z-crystals/kommonium-z-bag.png b/icons/z-crystals/kommonium-z--bag.png
similarity index 100%
rename from icons/z-crystals/kommonium-z-bag.png
rename to icons/z-crystals/kommonium-z--bag.png
diff --git a/icons/z-crystals/kommonium-z-held.png b/icons/z-crystals/kommonium-z--held.png
similarity index 100%
rename from icons/z-crystals/kommonium-z-held.png
rename to icons/z-crystals/kommonium-z--held.png
diff --git a/icons/z-crystals/lunalium-z-bag.png b/icons/z-crystals/lunalium-z--bag.png
similarity index 100%
rename from icons/z-crystals/lunalium-z-bag.png
rename to icons/z-crystals/lunalium-z--bag.png
diff --git a/icons/z-crystals/lunalium-z-held.png b/icons/z-crystals/lunalium-z--held.png
similarity index 100%
rename from icons/z-crystals/lunalium-z-held.png
rename to icons/z-crystals/lunalium-z--held.png
diff --git a/icons/z-crystals/lycanium-z-bag.png b/icons/z-crystals/lycanium-z--bag.png
similarity index 100%
rename from icons/z-crystals/lycanium-z-bag.png
rename to icons/z-crystals/lycanium-z--bag.png
diff --git a/icons/z-crystals/lycanium-z-held.png b/icons/z-crystals/lycanium-z--held.png
similarity index 100%
rename from icons/z-crystals/lycanium-z-held.png
rename to icons/z-crystals/lycanium-z--held.png
diff --git a/icons/z-crystals/marshadium-z-bag.png b/icons/z-crystals/marshadium-z--bag.png
similarity index 100%
rename from icons/z-crystals/marshadium-z-bag.png
rename to icons/z-crystals/marshadium-z--bag.png
diff --git a/icons/z-crystals/marshadium-z-held.png b/icons/z-crystals/marshadium-z--held.png
similarity index 100%
rename from icons/z-crystals/marshadium-z-held.png
rename to icons/z-crystals/marshadium-z--held.png
diff --git a/icons/z-crystals/mewnium-z-bag.png b/icons/z-crystals/mewnium-z--bag.png
similarity index 100%
rename from icons/z-crystals/mewnium-z-bag.png
rename to icons/z-crystals/mewnium-z--bag.png
diff --git a/icons/z-crystals/mewnium-z-held.png b/icons/z-crystals/mewnium-z--held.png
similarity index 100%
rename from icons/z-crystals/mewnium-z-held.png
rename to icons/z-crystals/mewnium-z--held.png
diff --git a/icons/z-crystals/mimikium-z-bag.png b/icons/z-crystals/mimikium-z--bag.png
similarity index 100%
rename from icons/z-crystals/mimikium-z-bag.png
rename to icons/z-crystals/mimikium-z--bag.png
diff --git a/icons/z-crystals/mimikium-z-held.png b/icons/z-crystals/mimikium-z--held.png
similarity index 100%
rename from icons/z-crystals/mimikium-z-held.png
rename to icons/z-crystals/mimikium-z--held.png
diff --git a/icons/z-crystals/normalium-z-bag.png b/icons/z-crystals/normalium-z--bag.png
similarity index 100%
rename from icons/z-crystals/normalium-z-bag.png
rename to icons/z-crystals/normalium-z--bag.png
diff --git a/icons/z-crystals/normalium-z-held.png b/icons/z-crystals/normalium-z--held.png
similarity index 100%
rename from icons/z-crystals/normalium-z-held.png
rename to icons/z-crystals/normalium-z--held.png
diff --git a/icons/z-crystals/pikanium-z-bag.png b/icons/z-crystals/pikanium-z--bag.png
similarity index 100%
rename from icons/z-crystals/pikanium-z-bag.png
rename to icons/z-crystals/pikanium-z--bag.png
diff --git a/icons/z-crystals/pikanium-z-held.png b/icons/z-crystals/pikanium-z--held.png
similarity index 100%
rename from icons/z-crystals/pikanium-z-held.png
rename to icons/z-crystals/pikanium-z--held.png
diff --git a/icons/z-crystals/pikashunium-z-bag.png b/icons/z-crystals/pikashunium-z--bag.png
similarity index 100%
rename from icons/z-crystals/pikashunium-z-bag.png
rename to icons/z-crystals/pikashunium-z--bag.png
diff --git a/icons/z-crystals/pikashunium-z-held.png b/icons/z-crystals/pikashunium-z--held.png
similarity index 100%
rename from icons/z-crystals/pikashunium-z-held.png
rename to icons/z-crystals/pikashunium-z--held.png
diff --git a/icons/z-crystals/poisonium-z-bag.png b/icons/z-crystals/poisonium-z--bag.png
similarity index 100%
rename from icons/z-crystals/poisonium-z-bag.png
rename to icons/z-crystals/poisonium-z--bag.png
diff --git a/icons/z-crystals/poisonium-z-held.png b/icons/z-crystals/poisonium-z--held.png
similarity index 100%
rename from icons/z-crystals/poisonium-z-held.png
rename to icons/z-crystals/poisonium-z--held.png
diff --git a/icons/z-crystals/primarium-z-bag.png b/icons/z-crystals/primarium-z--bag.png
similarity index 100%
rename from icons/z-crystals/primarium-z-bag.png
rename to icons/z-crystals/primarium-z--bag.png
diff --git a/icons/z-crystals/primarium-z-held.png b/icons/z-crystals/primarium-z--held.png
similarity index 100%
rename from icons/z-crystals/primarium-z-held.png
rename to icons/z-crystals/primarium-z--held.png
diff --git a/icons/z-crystals/psychium-z-bag.png b/icons/z-crystals/psychium-z--bag.png
similarity index 100%
rename from icons/z-crystals/psychium-z-bag.png
rename to icons/z-crystals/psychium-z--bag.png
diff --git a/icons/z-crystals/psychium-z-held.png b/icons/z-crystals/psychium-z--held.png
similarity index 100%
rename from icons/z-crystals/psychium-z-held.png
rename to icons/z-crystals/psychium-z--held.png
diff --git a/icons/z-crystals/rockium-z-bag.png b/icons/z-crystals/rockium-z--bag.png
similarity index 100%
rename from icons/z-crystals/rockium-z-bag.png
rename to icons/z-crystals/rockium-z--bag.png
diff --git a/icons/z-crystals/rockium-z-held.png b/icons/z-crystals/rockium-z--held.png
similarity index 100%
rename from icons/z-crystals/rockium-z-held.png
rename to icons/z-crystals/rockium-z--held.png
diff --git a/icons/z-crystals/snorlium-z-bag.png b/icons/z-crystals/snorlium-z--bag.png
similarity index 100%
rename from icons/z-crystals/snorlium-z-bag.png
rename to icons/z-crystals/snorlium-z--bag.png
diff --git a/icons/z-crystals/snorlium-z-held.png b/icons/z-crystals/snorlium-z--held.png
similarity index 100%
rename from icons/z-crystals/snorlium-z-held.png
rename to icons/z-crystals/snorlium-z--held.png
diff --git a/icons/z-crystals/solganium-z-bag.png b/icons/z-crystals/solganium-z--bag.png
similarity index 100%
rename from icons/z-crystals/solganium-z-bag.png
rename to icons/z-crystals/solganium-z--bag.png
diff --git a/icons/z-crystals/solganium-z-held.png b/icons/z-crystals/solganium-z--held.png
similarity index 100%
rename from icons/z-crystals/solganium-z-held.png
rename to icons/z-crystals/solganium-z--held.png
diff --git a/icons/z-crystals/steelium-z-bag.png b/icons/z-crystals/steelium-z--bag.png
similarity index 100%
rename from icons/z-crystals/steelium-z-bag.png
rename to icons/z-crystals/steelium-z--bag.png
diff --git a/icons/z-crystals/steelium-z-held.png b/icons/z-crystals/steelium-z--held.png
similarity index 100%
rename from icons/z-crystals/steelium-z-held.png
rename to icons/z-crystals/steelium-z--held.png
diff --git a/icons/z-crystals/tapunium-z-bag.png b/icons/z-crystals/tapunium-z--bag.png
similarity index 100%
rename from icons/z-crystals/tapunium-z-bag.png
rename to icons/z-crystals/tapunium-z--bag.png
diff --git a/icons/z-crystals/tapunium-z-held.png b/icons/z-crystals/tapunium-z--held.png
similarity index 100%
rename from icons/z-crystals/tapunium-z-held.png
rename to icons/z-crystals/tapunium-z--held.png
diff --git a/icons/z-crystals/ultranecrozium-z-bag.png b/icons/z-crystals/ultranecrozium-z--bag.png
similarity index 100%
rename from icons/z-crystals/ultranecrozium-z-bag.png
rename to icons/z-crystals/ultranecrozium-z--bag.png
diff --git a/icons/z-crystals/ultranecrozium-z-held.png b/icons/z-crystals/ultranecrozium-z--held.png
similarity index 100%
rename from icons/z-crystals/ultranecrozium-z-held.png
rename to icons/z-crystals/ultranecrozium-z--held.png
diff --git a/icons/z-crystals/waterium-z-bag.png b/icons/z-crystals/waterium-z--bag.png
similarity index 100%
rename from icons/z-crystals/waterium-z-bag.png
rename to icons/z-crystals/waterium-z--bag.png
diff --git a/icons/z-crystals/waterium-z-held.png b/icons/z-crystals/waterium-z--held.png
similarity index 100%
rename from icons/z-crystals/waterium-z-held.png
rename to icons/z-crystals/waterium-z--held.png