diff --git a/play.pokemonshowdown.com/src/battle-dex-data.ts b/play.pokemonshowdown.com/src/battle-dex-data.ts
index df2ec834d..b3f995ddd 100644
--- a/play.pokemonshowdown.com/src/battle-dex-data.ts
+++ b/play.pokemonshowdown.com/src/battle-dex-data.ts
@@ -572,221 +572,222 @@ export const BattlePokemonIconIndexes: { [id: string]: number } = {
 	zygardemega: 1320 + 107,
 	drampamega: 1320 + 108,
 	falinksmega: 1320 + 109,
-	raichumegax: 26,
-	raichumegay: 26,
-	chimechomega: 358,
-	absolmegaz: 359,
-	staraptormega: 398,
-	garchompmegaz: 445,
-	lucariomegaz: 448,
-	heatranmega: 485,
-	darkraimega: 491,
-	golurkmega: 623,
-	meowsticmmega: 678,
-	meowsticfmega: 1032 + 115,
-	crabominablemega: 740,
-	golisopodmega: 768,
-	magearnamega: 801,
-	magearnaoriginalmega: 1032 + 152,
-	zeraoramega: 807,
-	scovillainmega: 952,
-	glimmoramega: 970,
-	tatsugiricurlymega: 978,
-	baxcaliburmega: 998,
-	tatsugiridroopymega: 1032 + 231,
-	tatsugiristretchymega: 1032 + 232,
+	raichumegax: 1320 + 110,
+	raichumegay: 1320 + 111,
+	chimechomega: 1320 + 112,
+	absolmegaz: 1320 + 113,
+	staraptormega: 1320 + 114,
+	garchompmegaz: 1320 + 115,
+	lucariomegaz: 1320 + 116,
+	heatranmega: 1320 + 117,
+	darkraimega: 1320 + 118,
+	golurkmega: 1320 + 119,
+	meowsticmmega: 1320 + 120,
+	meowsticfmega: 1320 + 120,
+	crabominablemega: 1320 + 121,
+	golisopodmega: 1320 + 122,
+	magearnamega: 1320 + 123,
+	magearnaoriginalmega: 1320 + 124,
+	zeraoramega: 1320 + 125,
+	scovillainmega: 1320 + 126,
+	glimmoramega: 1320 + 127,
+	tatsugiricurlymega: 1320 + 128,
+	tatsugiridroopymega: 1320 + 129,
+	tatsugiristretchymega: 1320 + 130,
+	baxcaliburmega: 1320 + 131,
 
 	// CAP
-	syclant: 1548 + 0,
-	revenankh: 1548 + 1,
-	pyroak: 1548 + 2,
-	fidgit: 1548 + 3,
-	stratagem: 1548 + 4,
-	arghonaut: 1548 + 5,
-	kitsunoh: 1548 + 6,
-	cyclohm: 1548 + 7,
-	colossoil: 1548 + 8,
-	krilowatt: 1548 + 9,
-	voodoom: 1548 + 10,
-	tomohawk: 1548 + 11,
-	necturna: 1548 + 12,
-	mollux: 1548 + 13,
-	aurumoth: 1548 + 14,
-	malaconda: 1548 + 15,
-	cawmodore: 1548 + 16,
-	volkraken: 1548 + 17,
-	plasmanta: 1548 + 18,
-	naviathan: 1548 + 19,
-	crucibelle: 1548 + 20,
-	crucibellemega: 1548 + 21,
-	kerfluffle: 1548 + 22,
-	pajantom: 1548 + 23,
-	jumbao: 1548 + 24,
-	caribolt: 1548 + 25,
-	smokomodo: 1548 + 26,
-	snaelstrom: 1548 + 27,
-	equilibra: 1548 + 28,
-	astrolotl: 1548 + 29,
-	miasmaw: 1548 + 30,
-	chromera: 1548 + 31,
-	venomicon: 1548 + 32,
-	venomiconepilogue: 1548 + 33,
-	saharaja: 1548 + 34,
-	hemogoblin: 1548 + 35,
-	syclar: 1548 + 36,
-	embirch: 1548 + 37,
-	flarelm: 1548 + 38,
-	breezi: 1548 + 39,
-	scratchet: 1548 + 40,
-	necturine: 1548 + 41,
-	cupra: 1548 + 42,
-	argalis: 1548 + 43,
-	brattler: 1548 + 44,
-	cawdet: 1548 + 45,
-	volkritter: 1548 + 46,
-	snugglow: 1548 + 47,
-	floatoy: 1548 + 48,
-	caimanoe: 1548 + 49,
-	pluffle: 1548 + 50,
-	rebble: 1548 + 51,
-	tactite: 1548 + 52,
-	privatyke: 1548 + 53,
-	nohface: 1548 + 54,
-	monohm: 1548 + 55,
-	duohm: 1548 + 56,
-	protowatt: 1548 + 57,
-	voodoll: 1548 + 58,
-	mumbao: 1548 + 59,
-	fawnifer: 1548 + 60,
-	electrelk: 1548 + 61,
-	smogecko: 1548 + 62,
-	smoguana: 1548 + 63,
-	swirlpool: 1548 + 64,
-	coribalis: 1548 + 65,
-	justyke: 1548 + 66,
-	solotl: 1548 + 67,
-	miasmite: 1548 + 68,
-	dorsoil: 1548 + 69,
-	saharascal: 1548 + 70,
-	ababo: 1548 + 71,
-	scattervein: 1548 + 72,
-	cresceidon: 1548 + 73,
-	chuggalong: 1548 + 74,
-	shox: 1548 + 75,
-	chuggon: 1548 + 76,
-	draggalong: 1548 + 77,
-	ramnarok: 1548 + 78,
-	ramnarokradiant: 1548 + 79,
+	syclant: 1560 + 0,
+	revenankh: 1560 + 1,
+	pyroak: 1560 + 2,
+	fidgit: 1560 + 3,
+	stratagem: 1560 + 4,
+	arghonaut: 1560 + 5,
+	kitsunoh: 1560 + 6,
+	cyclohm: 1560 + 7,
+	colossoil: 1560 + 8,
+	krilowatt: 1560 + 9,
+	voodoom: 1560 + 10,
+	tomohawk: 1560 + 11,
+	necturna: 1560 + 12,
+	mollux: 1560 + 13,
+	aurumoth: 1560 + 14,
+	malaconda: 1560 + 15,
+	cawmodore: 1560 + 16,
+	volkraken: 1560 + 17,
+	plasmanta: 1560 + 18,
+	naviathan: 1560 + 19,
+	crucibelle: 1560 + 20,
+	crucibellemega: 1560 + 21,
+	kerfluffle: 1560 + 22,
+	pajantom: 1560 + 23,
+	jumbao: 1560 + 24,
+	caribolt: 1560 + 25,
+	smokomodo: 1560 + 26,
+	snaelstrom: 1560 + 27,
+	equilibra: 1560 + 28,
+	astrolotl: 1560 + 29,
+	miasmaw: 1560 + 30,
+	chromera: 1560 + 31,
+	venomicon: 1560 + 32,
+	venomiconepilogue: 1560 + 33,
+	saharaja: 1560 + 34,
+	hemogoblin: 1560 + 35,
+	syclar: 1560 + 36,
+	embirch: 1560 + 37,
+	flarelm: 1560 + 38,
+	breezi: 1560 + 39,
+	scratchet: 1560 + 40,
+	necturine: 1560 + 41,
+	cupra: 1560 + 42,
+	argalis: 1560 + 43,
+	brattler: 1560 + 44,
+	cawdet: 1560 + 45,
+	volkritter: 1560 + 46,
+	snugglow: 1560 + 47,
+	floatoy: 1560 + 48,
+	caimanoe: 1560 + 49,
+	pluffle: 1560 + 50,
+	rebble: 1560 + 51,
+	tactite: 1560 + 52,
+	privatyke: 1560 + 53,
+	nohface: 1560 + 54,
+	monohm: 1560 + 55,
+	duohm: 1560 + 56,
+	protowatt: 1560 + 57,
+	voodoll: 1560 + 58,
+	mumbao: 1560 + 59,
+	fawnifer: 1560 + 60,
+	electrelk: 1560 + 61,
+	smogecko: 1560 + 62,
+	smoguana: 1560 + 63,
+	swirlpool: 1560 + 64,
+	coribalis: 1560 + 65,
+	justyke: 1560 + 66,
+	solotl: 1560 + 67,
+	miasmite: 1560 + 68,
+	dorsoil: 1560 + 69,
+	saharascal: 1560 + 70,
+	ababo: 1560 + 71,
+	scattervein: 1560 + 72,
+	cresceidon: 1560 + 73,
+	chuggalong: 1560 + 74,
+	shox: 1560 + 75,
+	chuggon: 1560 + 76,
+	draggalong: 1560 + 77,
+	ramnarok: 1560 + 78,
+	ramnarokradiant: 1560 + 79,
+	flox: 1560 + 80,
 };
 
 export const BattlePokemonIconIndexesLeft: { [id: string]: number } = {
-	pikachubelle: 1440 + 0,
-	pikachupopstar: 1440 + 1,
-	clefairy: 1440 + 2,
-	clefable: 1440 + 3,
-	jigglypuff: 1440 + 4,
-	wigglytuff: 1440 + 5,
-	dugtrioalola: 1440 + 6,
-	poliwhirl: 1440 + 7,
-	poliwrath: 1440 + 8,
-	mukalola: 1440 + 9,
-	kingler: 1440 + 10,
-	croconaw: 1440 + 11,
-	cleffa: 1440 + 12,
-	igglybuff: 1440 + 13,
-	politoed: 1440 + 14,
-	unownb: 1440 + 15,
-	unownc: 1440 + 16,
-	unownd: 1440 + 17,
-	unowne: 1440 + 18,
-	unownf: 1440 + 19,
-	unowng: 1440 + 20,
-	unownh: 1440 + 21,
-	unownj: 1440 + 22,
-	unownk: 1440 + 23,
-	unownl: 1440 + 24,
-	unownm: 1440 + 25,
-	unownn: 1440 + 26,
-	unownp: 1440 + 27,
-	unownq: 1440 + 28,
-	unownquestion: 1440 + 29,
-	unownr: 1440 + 30,
-	unowns: 1440 + 31,
-	unownt: 1440 + 32,
-	unownv: 1440 + 33,
-	unownz: 1440 + 34,
-	sneasel: 1440 + 35,
-	teddiursa: 1440 + 36,
-	roselia: 1440 + 37,
-	zangoose: 1440 + 38,
-	seviper: 1440 + 39,
-	castformsnowy: 1440 + 40,
-	absolmega: 1440 + 41,
-	absol: 1440 + 42,
-	regirock: 1440 + 43,
-	torterra: 1440 + 44,
-	budew: 1440 + 45,
-	roserade: 1440 + 46,
-	magmortar: 1440 + 47,
-	togekiss: 1440 + 48,
-	rotomwash: 1440 + 49,
-	shayminsky: 1440 + 50,
-	emboar: 1440 + 51,
-	pansear: 1440 + 52,
-	simisear: 1440 + 53,
-	drilbur: 1440 + 54,
-	excadrill: 1440 + 55,
-	sawk: 1440 + 56,
-	lilligant: 1440 + 57,
-	garbodor: 1440 + 58,
-	solosis: 1440 + 59,
-	vanilluxe: 1440 + 60,
-	amoonguss: 1440 + 61,
-	klink: 1440 + 62,
-	klang: 1440 + 63,
-	klinklang: 1440 + 64,
-	litwick: 1440 + 65,
-	golett: 1440 + 66,
-	golurk: 1440 + 67,
-	kyuremblack: 1440 + 68,
-	kyuremwhite: 1440 + 69,
-	kyurem: 1440 + 70,
-	keldeoresolute: 1440 + 71,
-	meloetta: 1440 + 72,
-	greninja: 1440 + 73,
-	greninjabond: 1440 + 73,
-	greninjaash: 1440 + 74,
-	furfroudebutante: 1440 + 75,
-	barbaracle: 1440 + 76,
-	clauncher: 1440 + 77,
-	clawitzer: 1440 + 78,
-	sylveon: 1440 + 79,
-	klefki: 1440 + 80,
-	zygarde: 1440 + 81,
-	zygarde10: 1440 + 82,
-	zygardecomplete: 1440 + 83,
-	dartrix: 1440 + 84,
-	steenee: 1440 + 85,
-	tsareena: 1440 + 86,
-	comfey: 1440 + 87,
-	miniormeteor: 1440 + 88,
-	minior: 1440 + 89,
-	miniororange: 1440 + 90,
-	minioryellow: 1440 + 91,
-	miniorgreen: 1440 + 92,
-	miniorblue: 1440 + 93,
-	miniorviolet: 1440 + 94,
-	miniorindigo: 1440 + 95,
-	dhelmise: 1440 + 96,
-	necrozma: 1440 + 97,
-	marshadow: 1440 + 98,
-	pikachuoriginal: 1440 + 99,
-	pikachupartner: 1440 + 100,
-	necrozmaduskmane: 1440 + 101,
-	necrozmadawnwings: 1440 + 102,
-	necrozmaultra: 1440 + 103,
-	stakataka: 1440 + 104,
-	blacephalon: 1440 + 105,
+	pikachubelle: 1452 + 0,
+	pikachupopstar: 1452 + 1,
+	clefairy: 1452 + 2,
+	clefable: 1452 + 3,
+	jigglypuff: 1452 + 4,
+	wigglytuff: 1452 + 5,
+	dugtrioalola: 1452 + 6,
+	poliwhirl: 1452 + 7,
+	poliwrath: 1452 + 8,
+	mukalola: 1452 + 9,
+	kingler: 1452 + 10,
+	croconaw: 1452 + 11,
+	cleffa: 1452 + 12,
+	igglybuff: 1452 + 13,
+	politoed: 1452 + 14,
+	unownb: 1452 + 15,
+	unownc: 1452 + 16,
+	unownd: 1452 + 17,
+	unowne: 1452 + 18,
+	unownf: 1452 + 19,
+	unowng: 1452 + 20,
+	unownh: 1452 + 21,
+	unownj: 1452 + 22,
+	unownk: 1452 + 23,
+	unownl: 1452 + 24,
+	unownm: 1452 + 25,
+	unownn: 1452 + 26,
+	unownp: 1452 + 27,
+	unownq: 1452 + 28,
+	unownquestion: 1452 + 29,
+	unownr: 1452 + 30,
+	unowns: 1452 + 31,
+	unownt: 1452 + 32,
+	unownv: 1452 + 33,
+	unownz: 1452 + 34,
+	sneasel: 1452 + 35,
+	teddiursa: 1452 + 36,
+	roselia: 1452 + 37,
+	zangoose: 1452 + 38,
+	seviper: 1452 + 39,
+	castformsnowy: 1452 + 40,
+	absolmega: 1452 + 41,
+	absol: 1452 + 42,
+	regirock: 1452 + 43,
+	torterra: 1452 + 44,
+	budew: 1452 + 45,
+	roserade: 1452 + 46,
+	magmortar: 1452 + 47,
+	togekiss: 1452 + 48,
+	rotomwash: 1452 + 49,
+	shayminsky: 1452 + 50,
+	emboar: 1452 + 51,
+	pansear: 1452 + 52,
+	simisear: 1452 + 53,
+	drilbur: 1452 + 54,
+	excadrill: 1452 + 55,
+	sawk: 1452 + 56,
+	lilligant: 1452 + 57,
+	garbodor: 1452 + 58,
+	solosis: 1452 + 59,
+	vanilluxe: 1452 + 60,
+	amoonguss: 1452 + 61,
+	klink: 1452 + 62,
+	klang: 1452 + 63,
+	klinklang: 1452 + 64,
+	litwick: 1452 + 65,
+	golett: 1452 + 66,
+	golurk: 1452 + 67,
+	kyuremblack: 1452 + 68,
+	kyuremwhite: 1452 + 69,
+	kyurem: 1452 + 70,
+	keldeoresolute: 1452 + 71,
+	meloetta: 1452 + 72,
+	greninja: 1452 + 73,
+	greninjabond: 1452 + 73,
+	greninjaash: 1452 + 74,
+	furfroudebutante: 1452 + 75,
+	barbaracle: 1452 + 76,
+	clauncher: 1452 + 77,
+	clawitzer: 1452 + 78,
+	sylveon: 1452 + 79,
+	klefki: 1452 + 80,
+	zygarde: 1452 + 81,
+	zygarde10: 1452 + 82,
+	zygardecomplete: 1452 + 83,
+	dartrix: 1452 + 84,
+	steenee: 1452 + 85,
+	tsareena: 1452 + 86,
+	comfey: 1452 + 87,
+	miniormeteor: 1452 + 88,
+	minior: 1452 + 89,
+	miniororange: 1452 + 90,
+	minioryellow: 1452 + 91,
+	miniorgreen: 1452 + 92,
+	miniorblue: 1452 + 93,
+	miniorviolet: 1452 + 94,
+	miniorindigo: 1452 + 95,
+	dhelmise: 1452 + 96,
+	necrozma: 1452 + 97,
+	marshadow: 1452 + 98,
+	pikachuoriginal: 1452 + 99,
+	pikachupartner: 1452 + 100,
+	necrozmaduskmane: 1452 + 101,
+	necrozmadawnwings: 1452 + 102,
+	necrozmaultra: 1452 + 103,
+	stakataka: 1452 + 104,
+	blacephalon: 1452 + 105,
 };
 
 export const BattleAvatarNumbers: { [k: string]: string } = {
diff --git a/play.pokemonshowdown.com/src/battle-dex.ts b/play.pokemonshowdown.com/src/battle-dex.ts
index 85b8b04a1..d81f64eff 100644
--- a/play.pokemonshowdown.com/src/battle-dex.ts
+++ b/play.pokemonshowdown.com/src/battle-dex.ts
@@ -830,7 +830,7 @@ export const Dex = new class implements ModdedDex {
 		let left = (num % 12) * 40;
 		let fainted = ((pokemon as Pokemon | ServerPokemon)?.fainted ?
 			`;opacity:.3;filter:grayscale(100%) brightness(.5)` : ``);
-		return `background:transparent url(${Dex.resourcePrefix}sprites/pokemonicons-sheet.png?v20) no-repeat scroll -${left}px -${top}px${fainted}`;
+		return `background:transparent url(${Dex.resourcePrefix}sprites/pokemonicons-sheet.png?v21) no-repeat scroll -${left}px -${top}px${fainted}`;
 	}
 
 	getTeambuilderSpriteData(pokemon: any, dex: ModdedDex = Dex): TeambuilderSpriteData {