diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java
index fb668a44eae..56864206cdf 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java
@@ -1715,6 +1715,32 @@ public class ScryfallImageSupportTokens {
             put ("LRW/Shapeshifter", "https://api.scryfall.com/cards/tlrw/11/en?format=image");
             put ("LRW/Wolf", "https://api.scryfall.com/cards/tlrw/10/en?format=image");
 
+            // 2X2
+            put ("2X2/Angel", "https://api.scryfall.com/cards/t2x2/3/en?format=image");
+            put ("2X2/Bear", "https://api.scryfall.com/cards/t2x2/14/en?format=image");
+            put ("2X2/Boar", "https://api.scryfall.com/cards/t2x2/15/en?format=image");
+            put ("2X2/Cat Dragon", "https://api.scryfall.com/cards/t2x2/19/en?format=image");
+            put ("2X2/Drake", "https://api.scryfall.com/cards/t2x2/10/en?format=image");
+            put ("2X2/Egg", "https://api.scryfall.com/cards/t2x2/16/en?format=image");
+            put ("2X2/Eldrazi Scion", "https://api.scryfall.com/cards/t2x2/1/en?format=image");
+            put ("2X2/Elemental", "https://api.scryfall.com/cards/t2x2/13/en?format=image");
+            put ("2X2/Faerie Rogue", "https://api.scryfall.com/cards/t2x2/11/en?format=image");
+            put ("2X2/Knight", "https://api.scryfall.com/cards/t2x2/5/en?format=image");
+            put ("2X2/Emblem Liliana", "https://api.scryfall.com/cards/t2x2/23/en?format=image");
+            put ("2X2/Monk", "https://api.scryfall.com/cards/t2x2/6/en?format=image");
+            put ("2X2/Phyrexian Golem", "https://api.scryfall.com/cards/t2x2/21/en?format=image");
+            put ("2X2/Saproling", "https://api.scryfall.com/cards/t2x2/17/en?format=image");
+            put ("2X2/Soldier", "https://api.scryfall.com/cards/t2x2/7/en?format=image");
+            put ("2X2/Spider", "https://api.scryfall.com/cards/t2x2/18/en?format=image");
+            put ("2X2/Spirit/1", "https://api.scryfall.com/cards/t2x2/2/en?format=image");
+            put ("2X2/Spirit/2", "https://api.scryfall.com/cards/t2x2/8/en?format=image");
+            put ("2X2/Treasure", "https://api.scryfall.com/cards/t2x2/22/en?format=image");
+            put ("2X2/Vampire", "https://api.scryfall.com/cards/t2x2/9/en?format=image");
+            put ("2X2/Worm", "https://api.scryfall.com/cards/t2x2/20/en?format=image");
+            put ("2X2/Emblem Wrenn and Six", "https://api.scryfall.com/cards/t2x2/24/en?format=image");
+            put ("2X2/Zombie", "https://api.scryfall.com/cards/t2x2/12/en?format=image");
+
+
             // generate supported sets
             supportedSets.clear();
             for (String cardName : this.keySet()) {
diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt
index f992c951f04..9b3c0867623 100644
--- a/Mage.Client/src/main/resources/card-pictures-tok.txt
+++ b/Mage.Client/src/main/resources/card-pictures-tok.txt
@@ -86,6 +86,7 @@
 |Generate|EMBLEM!:BBD|Emblem Will Kenrith|||WillKenrithEmblem|
 |Generate|EMBLEM!:CLB|Emblem Rowan Kenrith|||RowanKenrithEmblem|
 |Generate|EMBLEM!:CLB|Emblem Will Kenrith|||WillKenrithEmblem|
+|Generate|EMBLEM!:2X2|Emblem Liliana|||LilianaTheLastHopeEmblem|
 |Generate|EMBLEM:THS|Elspeth, Sun's Champion||Emblem Elspeth|ElspethSunsChampionEmblem|
 |Generate|EMBLEM:AVR|Tamiyo, the Moon Sage||Emblem Tamiyo|TamiyoTheMoonSageEmblem|
 |Generate|EMBLEM:BNG|Kiora, the Crashing Wave||Emblem Kiora|KioraEmblem|
@@ -133,6 +134,7 @@
 |Generate|EMBLEM:VOW|Chandra, Dressed to Kill||Emblem Chandra|ChandraDressedToKillEmblem|
 |Generate|EMBLEM:NEO|Kaito Shizuki||Emblem Kaito|KaitoShizukiEmblem|
 |Generate|EMBLEM:NEO|Tezzeret, Betrayer of Flesh||Emblem Tezzeret|TezzeretBetrayerOfFleshEmblem|
+|Generate|EMBLEM:2X2|Wrenn and Six||Emblem Wrenn|WrennAndSixEmblem|
 
 # Planes
 |Generate|PLANE:PCA|Plane - Academy at Tolaria West|||AcademyAtTolariaWestPlane|
@@ -1835,4 +1837,27 @@
 |Generate|TOK:CLB|Warrior|||MarduStrikeLeaderWarriorToken|
 |Generate|TOK:CLB|Wizard|||MagesAttendantToken|
 |Generate|TOK:CLB|Wolf|||WolfToken|
-|Generate|TOK:CLB|Wurm|||Wurm55Token|
\ No newline at end of file
+|Generate|TOK:CLB|Wurm|||Wurm55Token|
+
+# 2X2
+|Generate|TOK:2X2|Angel|||AngelVigilanceToken|
+|Generate|TOK:2X2|Bear|||BearsCompanionBearToken|
+|Generate|TOK:2X2|Boar|||BoarToken|
+|Generate|TOK:2X2|Cat Dragon|||WasitoraCatDragonToken|
+|Generate|TOK:2X2|Drake|||DrakeToken|
+|Generate|TOK:2X2|Egg|||AtlaPalaniToken|
+|Generate|TOK:2X2|Eldrazi Scion|||EldraziScionToken|
+|Generate|TOK:2X2|Elemental|||RedElementalToken|
+|Generate|TOK:2X2|Faerie Rogue|||FaerieRogueToken|
+|Generate|TOK:2X2|Knight|||KnightToken|
+|Generate|TOK:2X2|Monk|||MonasteryMentorToken|
+|Generate|TOK:2X2|Phyrexian Golem|||PhyrexianGolemToken|
+|Generate|TOK:2X2|Saproling|||SaprolingToken|
+|Generate|TOK:2X2|Soldier|||SoldierToken|
+|Generate|TOK:2X2|Spider|||SpiderToken|
+|Generate|TOK:2X2|Spirit|1||SpiritToken|
+|Generate|TOK:2X2|Spirit|2||SpiritWhiteToken|
+|Generate|TOK:2X2|Treasure|||TreasureToken|
+|Generate|TOK:2X2|Vampire|||IxalanVampireToken|
+|Generate|TOK:2X2|Worm|||BlackGreenWormToken|
+|Generate|TOK:2X2|Zombie|||ZombieToken|
\ No newline at end of file
diff --git a/Mage/src/main/java/mage/game/command/emblems/LilianaTheLastHopeEmblem.java b/Mage/src/main/java/mage/game/command/emblems/LilianaTheLastHopeEmblem.java
index cc9d5f9c506..cde0889b392 100644
--- a/Mage/src/main/java/mage/game/command/emblems/LilianaTheLastHopeEmblem.java
+++ b/Mage/src/main/java/mage/game/command/emblems/LilianaTheLastHopeEmblem.java
@@ -27,7 +27,7 @@ public final class LilianaTheLastHopeEmblem extends Emblem {
                 TargetController.YOU, null, false);
         this.getAbilities().add(ability);
 
-        availableImageSetCodes = Arrays.asList("EMN", "MED");
+        availableImageSetCodes = Arrays.asList("EMN", "MED", "2X2");
     }
 }
 
diff --git a/Mage/src/main/java/mage/game/command/emblems/WrennAndSixEmblem.java b/Mage/src/main/java/mage/game/command/emblems/WrennAndSixEmblem.java
index 7433864b775..a4931d38c0f 100644
--- a/Mage/src/main/java/mage/game/command/emblems/WrennAndSixEmblem.java
+++ b/Mage/src/main/java/mage/game/command/emblems/WrennAndSixEmblem.java
@@ -11,6 +11,7 @@ import mage.game.Game;
 import mage.game.command.Emblem;
 import mage.players.Player;
 
+import java.util.Arrays;
 import java.util.UUID;
 import mage.cards.ModalDoubleFacesCard;
 import mage.cards.ModalDoubleFacesCardHalf;
@@ -25,7 +26,8 @@ public final class WrennAndSixEmblem extends Emblem {
     public WrennAndSixEmblem() {
         this.setName("Emblem Wrenn");
         this.getAbilities().add(new SimpleStaticAbility(Zone.COMMAND, new WrennAndSixEmblemEffect()));
-        this.setExpansionSetCodeForImage("MH1");
+
+        availableImageSetCodes = Arrays.asList("MH1", "2X2");
     }
 }
 
diff --git a/Mage/src/main/java/mage/game/permanent/token/AngelVigilanceToken.java b/Mage/src/main/java/mage/game/permanent/token/AngelVigilanceToken.java
index f44cd62f23b..ce20e04b5dc 100644
--- a/Mage/src/main/java/mage/game/permanent/token/AngelVigilanceToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/AngelVigilanceToken.java
@@ -20,7 +20,7 @@ public final class AngelVigilanceToken extends TokenImpl {
         addAbility(FlyingAbility.getInstance());
         addAbility(VigilanceAbility.getInstance());
 
-        availableImageSetCodes = Arrays.asList("NEC", "MH1", "WAR", "GRN", "M19");
+        availableImageSetCodes = Arrays.asList("NEC", "MH1", "WAR", "GRN", "M19", "2X2");
     }
 
     public AngelVigilanceToken(final AngelVigilanceToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/AtlaPalaniToken.java b/Mage/src/main/java/mage/game/permanent/token/AtlaPalaniToken.java
index 47f2a42e839..d9b89ca128c 100644
--- a/Mage/src/main/java/mage/game/permanent/token/AtlaPalaniToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/AtlaPalaniToken.java
@@ -5,6 +5,8 @@ import mage.abilities.keyword.DefenderAbility;
 import mage.constants.CardType;
 import mage.constants.SubType;
 
+import java.util.Arrays;
+
 /**
  * @author TheElk801
  */
@@ -18,6 +20,8 @@ public final class AtlaPalaniToken extends TokenImpl {
         power = new MageInt(0);
         toughness = new MageInt(1);
         addAbility(DefenderAbility.getInstance());
+
+        availableImageSetCodes = Arrays.asList("C19","2X2");
     }
 
     private AtlaPalaniToken(final AtlaPalaniToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/BearsCompanionBearToken.java b/Mage/src/main/java/mage/game/permanent/token/BearsCompanionBearToken.java
index 71253db6209..b9cb00e49d1 100644
--- a/Mage/src/main/java/mage/game/permanent/token/BearsCompanionBearToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/BearsCompanionBearToken.java
@@ -5,6 +5,8 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.MageInt;
 
+import java.util.Arrays;
+
 /**
  *
  * @author spjspj
@@ -13,12 +15,13 @@ public final class BearsCompanionBearToken extends TokenImpl {
 
     public BearsCompanionBearToken() {
         super("Bear Token", "4/4 green Bear creature token");
-        setOriginalExpansionSetCode("KTK");
         cardType.add(CardType.CREATURE);
         color.setGreen(true);
         subtype.add(SubType.BEAR);
         power = new MageInt(4);
         toughness = new MageInt(4);
+
+        availableImageSetCodes = Arrays.asList("KTK", "2X2");
     }
     public BearsCompanionBearToken(final BearsCompanionBearToken token) {
         super(token);
diff --git a/Mage/src/main/java/mage/game/permanent/token/BlackGreenWormToken.java b/Mage/src/main/java/mage/game/permanent/token/BlackGreenWormToken.java
index a932760bb6a..35175c0cdc8 100644
--- a/Mage/src/main/java/mage/game/permanent/token/BlackGreenWormToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/BlackGreenWormToken.java
@@ -22,7 +22,7 @@ public final class BlackGreenWormToken extends TokenImpl {
         power = new MageInt(1);
         toughness = new MageInt(1);
 
-        availableImageSetCodes = Arrays.asList("EVE", "MMA", "MM2", "C16", "C18");
+        availableImageSetCodes = Arrays.asList("EVE", "MMA", "MM2", "C16", "C18", "2X2");
     }
 
     public BlackGreenWormToken(final BlackGreenWormToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/BoarToken.java b/Mage/src/main/java/mage/game/permanent/token/BoarToken.java
index 414a11d934a..20e475b2a53 100644
--- a/Mage/src/main/java/mage/game/permanent/token/BoarToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/BoarToken.java
@@ -21,7 +21,7 @@ public final class BoarToken extends TokenImpl {
         power = new MageInt(3);
         toughness = new MageInt(3);
 
-        availableImageSetCodes = Arrays.asList("PCA");
+        availableImageSetCodes = Arrays.asList("PCA", "2X2");
     }
 
     public BoarToken(final BoarToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/DrakeToken.java b/Mage/src/main/java/mage/game/permanent/token/DrakeToken.java
index ef2465275c4..36cef34f309 100644
--- a/Mage/src/main/java/mage/game/permanent/token/DrakeToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/DrakeToken.java
@@ -24,7 +24,7 @@ public final class DrakeToken extends TokenImpl {
 
         this.addAbility(FlyingAbility.getInstance());
 
-        availableImageSetCodes = Arrays.asList("AKH", "C15", "C19", "M13", "C20", "ZNR", "C21", "UMA", "NCC", "DDS");
+        availableImageSetCodes = Arrays.asList("AKH", "C15", "C19", "M13", "C20", "ZNR", "C21", "UMA", "NCC", "DDS", "2X2");
     }
 
     public DrakeToken(final DrakeToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java
index f029d8cdb5e..5726410b9c3 100644
--- a/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java
@@ -23,7 +23,7 @@ public final class EldraziScionToken extends TokenImpl {
     static final private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("BFZ", "OGW", "DDR"));
+        tokenImageSets.addAll(Arrays.asList("BFZ", "OGW", "DDR", "2X2"));
     }
 
     public EldraziScionToken() {
diff --git a/Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java b/Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java
index 0b4e64bdb11..9769fda79e0 100644
--- a/Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java
@@ -23,7 +23,7 @@ public final class FaerieRogueToken extends TokenImpl {
         toughness = new MageInt(1);
         addAbility(FlyingAbility.getInstance());
 
-        availableImageSetCodes = Arrays.asList("MOR", "MM2", "ZNC", "UMA", "SLD");
+        availableImageSetCodes = Arrays.asList("MOR", "MM2", "ZNC", "UMA", "SLD", "2X2");
     }
 
     @Override
diff --git a/Mage/src/main/java/mage/game/permanent/token/IxalanVampireToken.java b/Mage/src/main/java/mage/game/permanent/token/IxalanVampireToken.java
index 65a194af0a5..fea019148ec 100644
--- a/Mage/src/main/java/mage/game/permanent/token/IxalanVampireToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/IxalanVampireToken.java
@@ -6,6 +6,8 @@ import mage.constants.SubType;
 import mage.MageInt;
 import mage.abilities.keyword.LifelinkAbility;
 
+import java.util.Arrays;
+
 /**
  *
  * @author TheElk801
@@ -20,6 +22,8 @@ public final class IxalanVampireToken extends TokenImpl {
         power = new MageInt(1);
         toughness = new MageInt(1);
         addAbility(LifelinkAbility.getInstance());
+
+        availableImageSetCodes = Arrays.asList("XLN", "2X2");
     }
 
     public IxalanVampireToken(final IxalanVampireToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/KnightToken.java b/Mage/src/main/java/mage/game/permanent/token/KnightToken.java
index 6b214769aaa..b94a072287c 100644
--- a/Mage/src/main/java/mage/game/permanent/token/KnightToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/KnightToken.java
@@ -23,7 +23,7 @@ public final class KnightToken extends TokenImpl {
         toughness = new MageInt(2);
         this.addAbility(VigilanceAbility.getInstance());
 
-        availableImageSetCodes = Arrays.asList("C15", "CMA", "ORI", "RTR", "M19", "ELD", "M21", "AFC", "MIC", "DOM");
+        availableImageSetCodes = Arrays.asList("C15", "CMA", "ORI", "RTR", "M19", "ELD", "M21", "AFC", "MIC", "DOM", "2X2");
     }
 
     public KnightToken(final KnightToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/MonasteryMentorToken.java b/Mage/src/main/java/mage/game/permanent/token/MonasteryMentorToken.java
index b1e1a2e6c19..803d3ecd054 100644
--- a/Mage/src/main/java/mage/game/permanent/token/MonasteryMentorToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/MonasteryMentorToken.java
@@ -6,6 +6,8 @@ import mage.constants.SubType;
 import mage.MageInt;
 import mage.abilities.keyword.ProwessAbility;
 
+import java.util.Arrays;
+
 /**
  *
  * @author spjspj
@@ -20,6 +22,8 @@ public final class MonasteryMentorToken extends TokenImpl {
         power = new MageInt(1);
         toughness = new MageInt(1);
         this.addAbility(new ProwessAbility());
+
+        availableImageSetCodes = Arrays.asList("FRF", "2X2");
     }
 
     public MonasteryMentorToken(final MonasteryMentorToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/PhyrexianGolemToken.java b/Mage/src/main/java/mage/game/permanent/token/PhyrexianGolemToken.java
index 791860ca837..c01f324c115 100644
--- a/Mage/src/main/java/mage/game/permanent/token/PhyrexianGolemToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/PhyrexianGolemToken.java
@@ -20,7 +20,7 @@ public final class PhyrexianGolemToken extends TokenImpl {
         power = new MageInt(3);
         toughness = new MageInt(3);
 
-        availableImageSetCodes = Arrays.asList("MM2", "NPH", "SOM", "MH1", "M20", "CMR", "MM3");
+        availableImageSetCodes = Arrays.asList("MM2", "NPH", "SOM", "MH1", "M20", "CMR", "MM3", "2X2");
     }
 
     public PhyrexianGolemToken(final PhyrexianGolemToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/RedElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/RedElementalToken.java
index 435450b72a2..107dc0b3c79 100644
--- a/Mage/src/main/java/mage/game/permanent/token/RedElementalToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/RedElementalToken.java
@@ -20,7 +20,7 @@ public final class RedElementalToken extends TokenImpl {
         power = new MageInt(1);
         toughness = new MageInt(1);
 
-        availableImageSetCodes = Arrays.asList("EMA", "M14", "SHM", "MH1", "M20", "RIX", "UMA", "NEC", "DDS");
+        availableImageSetCodes = Arrays.asList("EMA", "M14", "SHM", "MH1", "M20", "RIX", "UMA", "NEC", "DDS", "2X2");
     }
 
     @Override
diff --git a/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java b/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java
index e78fd167b6a..84b658f4958 100644
--- a/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java
@@ -54,7 +54,8 @@ public final class SaprolingToken extends TokenImpl {
                 "PCA",
                 "GK1",
                 "GK2",
-                "CLB"
+                "CLB",
+                "2X2"
         ));
     }
 
diff --git a/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java
index 166ac176677..7bc4ac788f7 100644
--- a/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/SoldierToken.java
@@ -22,7 +22,7 @@ public final class SoldierToken extends TokenImpl {
 
         availableImageSetCodes = Arrays.asList("10E", "M15", "C14", "ORI", "ALA", "DDF", "THS", "M12", "M13",
                 "MM2", "MMA", "RTR", "SOM", "DDO", "M10", "ORI", "EMN", "EMA", "CN2", "C16", "C18", "MM3", "E01",
-                "DOM", "MH1", "M20", "C20", "M21", "CMR", "KHC", "TSR", "2XM", "MED", "M19", "MD1", "A25", "CLB");
+                "DOM", "MH1", "M20", "C20", "M21", "CMR", "KHC", "TSR", "2XM", "MED", "M19", "MD1", "A25", "CLB", "2X2");
     }
 
     public SoldierToken(final SoldierToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java
index 570b2087d63..439c6a346d3 100644
--- a/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/SpiderToken.java
@@ -22,7 +22,7 @@ public final class SpiderToken extends TokenImpl {
 
         this.addAbility(ReachAbility.getInstance());
 
-        availableImageSetCodes.addAll(Arrays.asList("C15", "EMN", "ISD", "SHM", "MH1", "THB", "MID", "UMA", "NCC", "CMA", "CLB"));
+        availableImageSetCodes.addAll(Arrays.asList("C15", "EMN", "ISD", "SHM", "MH1", "THB", "MID", "UMA", "NCC", "CMA", "CLB", "2X2"));
     }
 
     public SpiderToken(final SpiderToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java
index 7a1e351f103..535895518fe 100644
--- a/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java
@@ -18,7 +18,7 @@ public final class SpiritToken extends TokenImpl {
         power = new MageInt(1);
         toughness = new MageInt(1);
 
-        availableImageSetCodes = Arrays.asList("C16", "EMA", "NEO", "VOC", "A25");
+        availableImageSetCodes = Arrays.asList("C16", "EMA", "NEO", "VOC", "A25", "2X2");
     }
 
     @Override
@@ -44,6 +44,10 @@ public final class SpiritToken extends TokenImpl {
         if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("VOC")) {
             setTokenType(1);
         }
+
+        if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("2X2")) {
+            setTokenType(1);
+        }
     }
 
     public SpiritToken(final SpiritToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java
index 68ef2e6a30f..103e2a9d914 100644
--- a/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java
@@ -24,7 +24,7 @@ public final class SpiritWhiteToken extends TokenImpl {
 
         availableImageSetCodes = Arrays.asList("AVR", "C14", "CNS", "DDC", "DDK", "FRF", "ISD", "KTK", "M15", "MM2", "SHM",
                 "SOI", "EMA", "C16", "MM3", "CMA", "E01", "RAV", "EMN", "M20", "C19", "C20", "CMR", "KHM",
-                "MID", "VOW", "UMA", "BBD", "IMA", "CM2", "MD1", "DVD", "DDQ", "CN2", "A25", "GK2");
+                "MID", "VOW", "UMA", "BBD", "IMA", "CM2", "MD1", "DVD", "DDQ", "CN2", "A25", "GK2", "2X2");
     }
 
     @Override
@@ -45,6 +45,9 @@ public final class SpiritWhiteToken extends TokenImpl {
         if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("A25")) {
             setTokenType(2);
         }
+        if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("2X2")) {
+            setTokenType(2);
+        }
     }
 
     public SpiritWhiteToken(final SpiritWhiteToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java b/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java
index f2be790b8b8..af0d00aab89 100644
--- a/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java
@@ -27,7 +27,7 @@ public final class TreasureToken extends TokenImpl {
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);
 
-        availableImageSetCodes = Arrays.asList("XLN", "RNA", "M20", "C19", "C20", "M21", "CMR", "KHM", "STX", "MH2", "AFR", "VOW", "NEO", "SLD", "2XM", "SNC", "CLB");
+        availableImageSetCodes = Arrays.asList("XLN", "RNA", "M20", "C19", "C20", "M21", "CMR", "KHM", "STX", "MH2", "AFR", "VOW", "NEO", "SLD", "2XM", "SNC", "CLB", "2X2");
     }
 
     public TreasureToken(final TreasureToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java
index 64b3e2aaf66..4985d895aec 100644
--- a/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java
@@ -18,14 +18,13 @@ public final class WasitoraCatDragonToken extends TokenImpl {
     static final private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("C17"));
+        tokenImageSets.addAll(Arrays.asList("C17", "2X2"));
     }
     
     public WasitoraCatDragonToken() {
         super("Cat Dragon Token", "3/3 black, red, and green Cat Dragon creature token with flying");
         
         availableImageSetCodes = tokenImageSets;
-        setOriginalExpansionSetCode("C17");
 
         cardType.add(CardType.CREATURE);
         this.subtype.add(SubType.CAT);
diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java
index 68995d05364..328a40cc8bd 100644
--- a/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java
@@ -27,11 +27,13 @@ public final class ZombieToken extends TokenImpl {
                 "MMA", "BNG", "KTK", "DTK",
                 "ORI", "OGW", "SOI", "EMN",
                 "EMA", "MM3", "AKH", "CMA",
-                "RNA", "WAR", "MH1",
-                "M20", "C19", "C20", "THB",
-                "M21", "CMR", "C21", "MH2",
-                "AFR", "MIC", "VOW", "UMA",
-                "NCC", "MED", "BBD", "M19", "CM2", "PCA", "AVR", "DDQ", "CN2");
+                "RNA", "WAR", "MH1", "M20",
+                "C19", "C20", "THB", "M21",
+                "CMR", "C21", "MH2", "AFR",
+                "MIC", "VOW", "UMA", "NCC",
+                "MED", "BBD", "M19", "CM2",
+                "PCA", "AVR", "DDQ", "CN2",
+                "2X2");
     }
 
     @Override