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 c0a011e468a..4e27dbb7edb 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
@@ -1605,6 +1605,22 @@ public class ScryfallImageSupportTokens {
             // E02
             put ("E02/Saproling", "https://api.scryfall.com/cards/e02/T1/en?format=image");
 
+            // A25
+            put ("A25/Angel", "https://api.scryfall.com/cards/ta25/2/en?format=image");
+            put ("A25/Elf Warrior", "https://api.scryfall.com/cards/ta25/11/en?format=image");
+            put ("A25/Fish", "https://api.scryfall.com/cards/ta25/5/en?format=image");
+            put ("A25/Goblin", "https://api.scryfall.com/cards/ta25/9/en?format=image");
+            put ("A25/Insect", "https://api.scryfall.com/cards/ta25/12/en?format=image");
+            put ("A25/Kobolds of Kher Keep", "https://api.scryfall.com/cards/ta25/10/en?format=image");
+            put ("A25/Kraken", "https://api.scryfall.com/cards/ta25/6/en?format=image");
+            put ("A25/Skeleton", "https://api.scryfall.com/cards/ta25/8/en?format=image");
+            put ("A25/Soldier", "https://api.scryfall.com/cards/ta25/3/en?format=image");
+            put ("A25/Spirit/1", "https://api.scryfall.com/cards/ta25/1/en?format=image");
+            put ("A25/Spirit/2", "https://api.scryfall.com/cards/ta25/4/en?format=image");
+            put ("A25/Stangg Twin", "https://api.scryfall.com/cards/ta25/14/en?format=image");
+            put ("A25/Whale", "https://api.scryfall.com/cards/ta25/7/en?format=image");
+            put ("A25/Wolf", "https://api.scryfall.com/cards/ta25/13/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 9843079e707..bdc2b332bc9 100644
--- a/Mage.Client/src/main/resources/card-pictures-tok.txt
+++ b/Mage.Client/src/main/resources/card-pictures-tok.txt
@@ -1814,4 +1814,20 @@
 # DDT
 |Generate|TOK:DDT|Elemental|||MasterOfWavesElementalToken|
 |Generate|TOK:DDT|Goblin|||GoblinToken|
-|Generate|TOK:DDT|Wall|||TidalWaveWallToken|
\ No newline at end of file
+|Generate|TOK:DDT|Wall|||TidalWaveWallToken|
+
+# A25
+|Generate|TOK:A25|Angel|||AngelToken|
+|Generate|TOK:A25|Elf Warrior|||ElfWarriorToken|
+|Generate|TOK:A25|Fish|||ReefWormFishToken|
+|Generate|TOK:A25|Goblin|||GoblinToken|
+|Generate|TOK:A25|Insect|||InsectToken|
+|Generate|TOK:A25|Kobolds of Kher Keep|||KherKeepKoboldToken|
+|Generate|TOK:A25|Kraken|||Kraken99Token|
+|Generate|TOK:A25|Skeleton|||SkeletonRegenerateToken|
+|Generate|TOK:A25|Soldier|||SoldierToken|
+|Generate|TOK:A25|Spirit|1||SpiritToken|
+|Generate|TOK:A25|Spirit|2||SpiritWhiteToken|
+|Generate|TOK:A25|Stangg Twin|||StanggTwinToken|
+|Generate|TOK:A25|Whale|||ReefWormWhaleToken|
+|Generate|TOK:A25|Wolf|||WolfToken|
\ No newline at end of file
diff --git a/Mage/src/main/java/mage/game/permanent/token/AngelToken.java b/Mage/src/main/java/mage/game/permanent/token/AngelToken.java
index a6b1a782248..489490ca61c 100644
--- a/Mage/src/main/java/mage/game/permanent/token/AngelToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/AngelToken.java
@@ -20,7 +20,7 @@ public final class AngelToken extends TokenImpl {
         addAbility(FlyingAbility.getInstance());
 
         availableImageSetCodes = Arrays.asList("APC", "AVR", "C14", "C15", "C18", "CON", "DDQ", "GTC",
-                "ISD", "M14", "MM3", "NEM", "OGW", "ORI", "PC2", "SCG", "SOI", "ZEN", "C20", "M21", "CMR", "AFC", "VOC", "2XM", "IMA", "PCA");
+                "ISD", "M14", "MM3", "NEM", "OGW", "ORI", "PC2", "SCG", "SOI", "ZEN", "C20", "M21", "CMR", "AFC", "VOC", "2XM", "IMA", "PCA", "A25");
     }
 
     public AngelToken(final AngelToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/ElfWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/ElfWarriorToken.java
index 6cb27c3e2ee..2243ac7b085 100644
--- a/Mage/src/main/java/mage/game/permanent/token/ElfWarriorToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/ElfWarriorToken.java
@@ -20,7 +20,7 @@ public final class ElfWarriorToken extends TokenImpl {
         power = new MageInt(1);
         toughness = new MageInt(1);
 
-        availableImageSetCodes = Arrays.asList("C14", "C16", "EVG", "EMA", "LRW", "ORI", "SHM", "M19", "CMR", "KHM", "NCC", "DDU", "CMA", "DD1", "DDS");
+        availableImageSetCodes = Arrays.asList("C14", "C16", "EVG", "EMA", "LRW", "ORI", "SHM", "M19", "CMR", "KHM", "NCC", "DDU", "CMA", "DD1", "DDS", "A25");
     }
 
     public ElfWarriorToken(final ElfWarriorToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java
index 4095addd71e..b401a2c62ba 100644
--- a/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/GoblinToken.java
@@ -32,7 +32,7 @@ public final class GoblinToken extends TokenImpl {
 
         availableImageSetCodes = Arrays.asList("10E", "ALA", "SOM", "M10", "M13", "RTR",
                 "MMA", "M15", "C14", "KTK", "EVG", "DTK", "ORI", "DDG", "DDN", "MM2",
-                "MM3", "EMA", "C16", "DOM", "ANA", "RNA", "WAR", "MH1", "TSR", "MH2", "AFR", "NEC", "M19", "CM2", "PCA", "DD1", "DDS", "DDT");
+                "MM3", "EMA", "C16", "DOM", "ANA", "RNA", "WAR", "MH1", "TSR", "MH2", "AFR", "NEC", "M19", "CM2", "PCA", "DD1", "DDS", "DDT", "A25");
     }
 
     public GoblinToken(final GoblinToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/InsectToken.java b/Mage/src/main/java/mage/game/permanent/token/InsectToken.java
index 3a4529f45a0..78685e2ffb2 100644
--- a/Mage/src/main/java/mage/game/permanent/token/InsectToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/InsectToken.java
@@ -24,7 +24,7 @@ public final class InsectToken extends TokenImpl {
         power = new MageInt(1);
         toughness = new MageInt(1);
 
-        availableImageSetCodes = Arrays.asList("M10", "MM2", "SOI", "ZNR", "VOW", "NCC", "PCA", "CN2");
+        availableImageSetCodes = Arrays.asList("M10", "MM2", "SOI", "ZNR", "VOW", "NCC", "PCA", "CN2", "A25");
     }
 
     public InsectToken(final InsectToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/KherKeepKoboldToken.java b/Mage/src/main/java/mage/game/permanent/token/KherKeepKoboldToken.java
index c2b71ce24aa..302e7b64bd7 100644
--- a/Mage/src/main/java/mage/game/permanent/token/KherKeepKoboldToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/KherKeepKoboldToken.java
@@ -21,7 +21,7 @@ public final class KherKeepKoboldToken extends TokenImpl {
         power = new MageInt(0);
         toughness = new MageInt(1);
 
-        availableImageSetCodes = Arrays.asList("TSR");
+        availableImageSetCodes = Arrays.asList("A25", "TSR");
     }
     public KherKeepKoboldToken(final KherKeepKoboldToken token) {
         super(token);
diff --git a/Mage/src/main/java/mage/game/permanent/token/Kraken99Token.java b/Mage/src/main/java/mage/game/permanent/token/Kraken99Token.java
index 5a1feb18078..b24889d849b 100644
--- a/Mage/src/main/java/mage/game/permanent/token/Kraken99Token.java
+++ b/Mage/src/main/java/mage/game/permanent/token/Kraken99Token.java
@@ -19,7 +19,7 @@ public final class Kraken99Token extends TokenImpl {
         power = new MageInt(9);
         toughness = new MageInt(9);
 
-        availableImageSetCodes = Arrays.asList("BNG", "C14", "DDO", "C21");
+        availableImageSetCodes = Arrays.asList("BNG", "C14", "DDO", "C21", "A25");
     }
 
     public Kraken99Token(final Kraken99Token token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/ReefWormFishToken.java b/Mage/src/main/java/mage/game/permanent/token/ReefWormFishToken.java
index 707763f9b47..e303069632c 100644
--- a/Mage/src/main/java/mage/game/permanent/token/ReefWormFishToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/ReefWormFishToken.java
@@ -23,7 +23,7 @@ public final class ReefWormFishToken extends TokenImpl {
 
         addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new ReefWormWhaleToken())));
 
-        availableImageSetCodes = Arrays.asList("C14", "C21");
+        availableImageSetCodes = Arrays.asList("C14", "A25", "C21");
     }
 
     public ReefWormFishToken(final ReefWormFishToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/ReefWormWhaleToken.java b/Mage/src/main/java/mage/game/permanent/token/ReefWormWhaleToken.java
index 537e48db9db..6c10c18d322 100644
--- a/Mage/src/main/java/mage/game/permanent/token/ReefWormWhaleToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/ReefWormWhaleToken.java
@@ -23,7 +23,7 @@ public final class ReefWormWhaleToken extends TokenImpl {
 
         addAbility(new DiesSourceTriggeredAbility(new CreateTokenEffect(new Kraken99Token())));
 
-        availableImageSetCodes.addAll(Arrays.asList("C14", "C21"));
+        availableImageSetCodes.addAll(Arrays.asList("C14", "A25", "C21"));
     }
 
     public ReefWormWhaleToken(final ReefWormWhaleToken token) {
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 8b78d1af266..c0d0fae633c 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");
+                "DOM", "MH1", "M20", "C20", "M21", "CMR", "KHC", "TSR", "2XM", "MED", "M19", "MD1", "A25");
     }
 
     public SoldierToken(final SoldierToken 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 cfd4a652072..0c419728c51 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", "CHK", "EMA", "EXP", "NEO", "SOK", "V12", "VOC");
+        availableImageSetCodes = Arrays.asList("C16", "CHK", "EMA", "EXP", "NEO", "SOK", "V12", "VOC", "A25");
     }
 
     @Override
@@ -36,6 +36,10 @@ public final class SpiritToken extends TokenImpl {
         if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C16")) {
             setTokenType(1);
         }
+
+        if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("A25")) {
+            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 3bc8bc5f58a..1e53acb52b7 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", "ANA", "GPT", "RAV", "EMN", "RNA", "M20", "C19", "C20", "CMR", "KHM",
-                "MID", "VOW", "UMA", "BBD", "IMA", "CM2", "MD1", "DVD", "DDQ", "CN2");
+                "MID", "VOW", "UMA", "BBD", "IMA", "CM2", "MD1", "DVD", "DDQ", "CN2", "A25");
     }
 
     @Override
@@ -42,6 +42,9 @@ public final class SpiritWhiteToken extends TokenImpl {
         if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("UMA")) {
             setTokenType(1);
         }
+        if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("A25")) {
+            setTokenType(2);
+        }
     }
 
     public SpiritWhiteToken(final SpiritWhiteToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/StanggTwinToken.java b/Mage/src/main/java/mage/game/permanent/token/StanggTwinToken.java
index 332f316d37d..727c207fc45 100644
--- a/Mage/src/main/java/mage/game/permanent/token/StanggTwinToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/StanggTwinToken.java
@@ -6,6 +6,8 @@ import mage.constants.SubType;
 import mage.MageInt;
 import mage.constants.SuperType;
 
+import java.util.Arrays;
+
 /**
  *
  * @author L_J
@@ -23,6 +25,8 @@ public final class StanggTwinToken extends TokenImpl {
         this.color.setGreen(true);
         this.power = new MageInt(3);
         this.toughness = new MageInt(4);
+
+        availableImageSetCodes = Arrays.asList("A25");
     }
 
     public StanggTwinToken(final StanggTwinToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/WolfToken.java b/Mage/src/main/java/mage/game/permanent/token/WolfToken.java
index 21341f3e941..21e692eecbd 100644
--- a/Mage/src/main/java/mage/game/permanent/token/WolfToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/WolfToken.java
@@ -23,7 +23,7 @@ public final class WolfToken extends TokenImpl {
 
         availableImageSetCodes = Arrays.asList("BNG", "C14", "C15", "CMA", "CMD", "CNS", "ISD",
                 "LRW", "M10", "M14", "MM2", "SHM", "SOI", "SOM", "V10", "ZEN", "WAR", "M20",
-                "THB", "AFR", "MID", "VOW", "2XM");
+                "THB", "AFR", "MID", "VOW", "2XM", "A25");
     }
 
     @Override