diff --git a/js/battledata.js b/js/battledata.js
index 590f314c5..4ad79a772 100644
--- a/js/battledata.js
+++ b/js/battledata.js
@@ -1340,12 +1340,12 @@ var Tools = {
 		return 'background:transparent url(' + Tools.resourcePrefix + 'sprites/' + (newSize ? 'xyicons-sheet.png?a1' : 'bwicons-sheet.png?g6') + ') no-repeat scroll -' + left + 'px -' + top + 'px' + fainted;
 	},
 
-	getTeambuilderSprite: function (pokemon) {
+	getTeambuilderSprite: function (pokemon, gen) {
 		if (!pokemon) return '';
 		var id = toId(pokemon.species);
 		var spriteid = pokemon.spriteid;
+		var template = Tools.getTemplate(pokemon.species);
 		if (pokemon.species && !spriteid) {
-			var template = Tools.getTemplate(pokemon.species);
 			if (template.spriteid) {
 				spriteid = template.spriteid;
 			} else {
@@ -1356,25 +1356,39 @@ var Tools = {
 			return 'background-image:url(' + Tools.resourcePrefix + 'sprites/bw/0.png);background-position:10px 5px;background-repeat:no-repeat';
 		}
 		var shiny = (pokemon.shiny ? '-shiny' : '');
-		var sdata;
-		if (BattlePokemonSprites[id] && BattlePokemonSprites[id].front && !Tools.prefs('bwgfx')) {
-			if (BattlePokemonSprites[id].front.anif && pokemon.gender === 'F') {
-				spriteid += '-f';
-				sdata = BattlePokemonSprites[id].front.anif;
-			} else {
-				sdata = BattlePokemonSprites[id].front.ani;
-			}
-		} else {
-			return 'background-image:url(' + Tools.resourcePrefix + 'sprites/bw' + shiny + '/' + spriteid + '.png);background-position:10px 5px;background-repeat:no-repeat';
+		// var sdata;
+		// if (BattlePokemonSprites[id] && BattlePokemonSprites[id].front && !Tools.prefs('bwgfx')) {
+		// 	if (BattlePokemonSprites[id].front.anif && pokemon.gender === 'F') {
+		// 		spriteid += '-f';
+		// 		sdata = BattlePokemonSprites[id].front.anif;
+		// 	} else {
+		// 		sdata = BattlePokemonSprites[id].front.ani;
+		// 	}
+		// } else {
+		// 	return 'background-image:url(' + Tools.resourcePrefix + 'sprites/bw' + shiny + '/' + spriteid + '.png);background-position:10px 5px;background-repeat:no-repeat';
+		// }
+		if (Tools.prefs('nopastgens')) gen = 6;
+		if ((!gen || gen === 6) && !template.isNonstandard && !Tools.prefs('bwgfx')) {
+			var offset = '-2px -3px';
+			if (id.substr(0, 6) === 'arceus') offset = '-2px 7px';
+			if (id === 'garchomp') offset = '-2px 2px';
+			if (id === 'garchompmega') offset = '-2px 0px';
+			return 'background-image:url(' + Tools.resourcePrefix + 'sprites/xydex' + shiny + '/' + spriteid + '.png);background-position:' + offset + ';background-repeat:no-repeat';
 		}
-		var w = Math.round(57 - sdata.w / 2), h = Math.round(57 - sdata.h / 2);
-		if (id === 'altariamega' || id === 'dianciemega' || id === 'charizardmegay') h += 15;
-		if (id === 'gliscor' || id === 'gardevoirmega' || id === 'garchomp' || id === 'garchompmega' || id === 'lugia' || id === 'golurk') h += 8;
-		if (id === 'manectricmega') h -= 8;
-		if (id === 'giratinaorigin' || id === 'steelixmega') h -= 15;
-		if (id === 'lugia' || id === 'latiosmega' || id === 'latias' || id === 'garchompmega' || id === 'kyuremwhite') w += 8;
-		if (id === 'rayquazamega' || id === 'giratinaorigin' || id === 'wailord' || id === 'latiasmega') w += 15;
-		return 'background-image:url(' + Tools.resourcePrefix + 'sprites/xy' + shiny + '/' + spriteid + '.png);background-position:' + w + 'px ' + h + 'px;background-repeat:no-repeat';
+		var spriteDir = Tools.resourcePrefix + 'sprites/bw';
+		if (gen <= 1 && template.gen <= 1) spriteDir = Tools.resourcePrefix + 'sprites/rby';
+		else if (gen <= 2 && template.gen <= 2) spriteDir = Tools.resourcePrefix + 'sprites/gsc';
+		else if (gen <= 3 && template.gen <= 3) spriteDir = Tools.resourcePrefix + 'sprites/rse';
+		else if (gen <= 4 && template.gen <= 4) spriteDir = Tools.resourcePrefix + 'sprites/dpp';
+		return 'background-image:url(' + spriteDir + shiny + '/' + spriteid + '.png);background-position:10px 5px;background-repeat:no-repeat';
+		// var w = Math.round(57 - sdata.w / 2), h = Math.round(57 - sdata.h / 2);
+		// if (id === 'altariamega' || id === 'dianciemega' || id === 'charizardmegay') h += 15;
+		// if (id === 'gliscor' || id === 'gardevoirmega' || id === 'garchomp' || id === 'garchompmega' || id === 'lugia' || id === 'golurk') h += 8;
+		// if (id === 'manectricmega') h -= 8;
+		// if (id === 'giratinaorigin' || id === 'steelixmega') h -= 15;
+		// if (id === 'lugia' || id === 'latiosmega' || id === 'latias' || id === 'garchompmega' || id === 'kyuremwhite') w += 8;
+		// if (id === 'rayquazamega' || id === 'giratinaorigin' || id === 'wailord' || id === 'latiasmega') w += 15;
+		// return 'background-image:url(' + Tools.resourcePrefix + 'sprites/xy' + shiny + '/' + spriteid + '.png);background-position:' + w + 'px ' + h + 'px;background-repeat:no-repeat';
 	},
 
 	getItemIcon: function (item) {
diff --git a/js/client-teambuilder.js b/js/client-teambuilder.js
index 9c0ebb621..4e34e8b30 100644
--- a/js/client-teambuilder.js
+++ b/js/client-teambuilder.js
@@ -1014,7 +1014,7 @@
 			buf += '<div class="setchart-nickname">';
 			buf += '<label>Nickname</label><input type="text" value="' + Tools.escapeHTML(set.name || set.species) + '" name="nickname" />';
 			buf += '</div>';
-			buf += '<div class="setchart" style="' + Tools.getTeambuilderSprite(set) + ';">';
+			buf += '<div class="setchart" style="' + Tools.getTeambuilderSprite(set, this.curTeam.gen) + ';">';
 
 			// icon
 			var itemicon = '<span class="itemicon"></span>';
@@ -1448,7 +1448,7 @@
 			var set = this.curSet;
 			if (!set) return;
 
-			this.$('.setchart').attr('style', Tools.getTeambuilderSprite(set));
+			this.$('.setchart').attr('style', Tools.getTeambuilderSprite(set, this.curTeam.gen));
 
 			this.$('.pokemonicon-' + this.curSetLoc).css('background', Tools.getPokemonIcon(set).substr(11));