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 6632fab3ca..c88dcda8f4 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
@@ -48,16 +48,17 @@ public class ScryfallImageSupportTokens {
             put("RNA/Thopter", "https://api.scryfall.com/cards/trna/11/en?format=image");
             put("RNA/Treasure", "https://api.scryfall.com/cards/trna/12/en?format=image");
             put("RNA/Zombie", "https://api.scryfall.com/cards/trna/3/en?format=image");
-            
+
             //GRN
             put("GRN/Angel", "https://api.scryfall.com/cards/tgrn/1/en?format=image");
+            put("GRN/Bird Illusion", "https://api.scryfall.com/cards/tgrn/3/en?format=image");
             put("GRN/Elf Knight", "https://api.scryfall.com/cards/tgrn/6/en?format=image");
             put("GRN/Goblin", "https://api.scryfall.com/cards/tgrn/4/en?format=image");
             put("GRN/Insect", "https://api.scryfall.com/cards/tgrn/5/en?format=image");
             put("GRN/Emblem Ral, Izzet Viceroy", "https://api.scryfall.com/cards/tgrn/7/en?format=image");
             put("GRN/Soldier", "https://api.scryfall.com/cards/tgrn/2/en?format=image");
             put("GRN/Emblem Vraska, Golgari Queen", "https://api.scryfall.com/cards/tgrn/8/en?format=image");
-            
+
             //DOM
             put("DOM/Cleric", "https://api.scryfall.com/cards/tdom/4/en?format=image");
             put("DOM/Construct", "https://api.scryfall.com/cards/tdom/14/en?format=image");
@@ -75,7 +76,7 @@ public class ScryfallImageSupportTokens {
             put("DOM/Soldier", "https://api.scryfall.com/cards/tdom/3/en?format=image");
             put("DOM/Emblem Teferi, Hero of Dominaria", "https://api.scryfall.com/cards/tdom/16/en?format=image");
             put("DOM/Zombie Knight", "https://api.scryfall.com/cards/tdom/5/en?format=image");
-            
+
             //XLN
             put("XLN/Dinosaur", "https://api.scryfall.com/cards/txln/5/en?format=image");
             put("XLN/Illusion", "https://api.scryfall.com/cards/txln/2/en?format=image");
@@ -87,29 +88,29 @@ public class ScryfallImageSupportTokens {
             put("XLN/Treasure/3", "https://api.scryfall.com/cards/txln/9/en?format=image");
             put("XLN/Treasure/4", "https://api.scryfall.com/cards/txln/10/en?format=image");
             put("XLN/Vampire", "https://api.scryfall.com/cards/txln/1/en?format=image");
-            
+
             //HOU
             put("HOU/Horse", "https://api.scryfall.com/cards/thou/10/en?format=image");
             put("HOU/Insect", "https://api.scryfall.com/cards/thou/12/en?format=image");
             put("HOU/Snake", "https://api.scryfall.com/cards/thou/11/en?format=image");
-            
+
             //AKH
             put("AKH/Beast", "https://api.scryfall.com/cards/takh/21/en?format=image");
             put("AKH/Cat", "https://api.scryfall.com/cards/takh/16/en?format=image");
             put("AKH/Drake", "https://api.scryfall.com/cards/takh/18/en?format=image");
-            put("AKH/Emblem - Gideon", "https://api.scryfall.com/cards/takh/25/en?format=image");
+            put("AKH/Emblem Gideon", "https://api.scryfall.com/cards/takh/25/en?format=image");
             put("AKH/Hippo", "https://api.scryfall.com/cards/takh/22/en?format=image");
             put("AKH/Snake", "https://api.scryfall.com/cards/takh/23/en?format=image");
             put("AKH/Warrior", "https://api.scryfall.com/cards/takh/17/en?format=image");
             put("AKH/Wurm", "https://api.scryfall.com/cards/takh/24/en?format=image");
             put("AKH/Zombie", "https://api.scryfall.com/cards/takh/20/en?format=image");
-            
+
             //AER
             put("AER/Etherium Cell", "https://api.scryfall.com/cards/taer/3/en?format=image");
             put("AER/Gremlin", "https://api.scryfall.com/cards/taer/1/en?format=image");
             put("AER/Ragavan", "https://api.scryfall.com/cards/taer/2/en?format=image");
             put("AER/Emblem Tezzeret the Schemer", "https://api.scryfall.com/cards/taer/4/en?format=image");
-            
+
             //KLD
             put("KLD/Beast", "https://api.scryfall.com/cards/tkld/1/en?format=image");
             put("KLD/Emblem Chandra", "https://api.scryfall.com/cards/tkld/10/en?format=image");
@@ -123,7 +124,7 @@ public class ScryfallImageSupportTokens {
             put("KLD/Thopter/1", "https://api.scryfall.com/cards/tkld/7/en?format=image");
             put("KLD/Thopter/2", "https://api.scryfall.com/cards/tkld/8/en?format=image");
             put("KLD/Thopter/3", "https://api.scryfall.com/cards/tkld/9/en?format=image");
-            
+
             //EMN
             put("EMN/Eldrazi Horror", "https://api.scryfall.com/cards/temn/1/en?format=image");
             put("EMN/Human", "https://api.scryfall.com/cards/temn/7/en?format=image");
@@ -135,7 +136,7 @@ public class ScryfallImageSupportTokens {
             put("EMN/Zombie/2", "https://api.scryfall.com/cards/temn/4/en?format=image");
             put("EMN/Zombie/3", "https://api.scryfall.com/cards/temn/5/en?format=image");
             put("EMN/Zombie/4", "https://api.scryfall.com/cards/temn/6/en?format=image");
-            
+
             //SOI
             put("SOI/Angel", "https://api.scryfall.com/cards/tsoi/1/en?format=image");
             put("SOI/Emblem Arlinn", "https://api.scryfall.com/cards/tsoi/18/en?format=image");
@@ -155,7 +156,7 @@ public class ScryfallImageSupportTokens {
             put("SOI/Vampire Knight", "https://api.scryfall.com/cards/tsoi/4/en?format=image");
             put("SOI/Wolf", "https://api.scryfall.com/cards/tsoi/9/en?format=image");
             put("SOI/Zombie", "https://api.scryfall.com/cards/tsoi/5/en?format=image");
-            
+
             //OGW
             put("OGW/Angel", "https://api.scryfall.com/cards/togw/7/en?format=image");
             put("OGW/Eldrazi Scion/1", "https://api.scryfall.com/cards/togw/1/en?format=image");
@@ -168,7 +169,7 @@ public class ScryfallImageSupportTokens {
             put("OGW/Elemental/2", "https://api.scryfall.com/cards/togw/9/en?format=image");
             put("OGW/Plant", "https://api.scryfall.com/cards/togw/11/en?format=image");
             put("OGW/Zombie", "https://api.scryfall.com/cards/togw/8/en?format=image");
-            
+
             //BFZ
             put("BFZ/Dragon", "https://api.scryfall.com/cards/tbfz/8/en?format=image");
             put("BFZ/Eldrazi", "https://api.scryfall.com/cards/tbfz/1/en?format=image");
@@ -184,7 +185,7 @@ public class ScryfallImageSupportTokens {
             put("BFZ/Emblem Nixilis", "https://api.scryfall.com/cards/tbfz/13/en?format=image");
             put("BFZ/Octopus", "https://api.scryfall.com/cards/tbfz/7/en?format=image");
             put("BFZ/Plant", "https://api.scryfall.com/cards/tbfz/10/en?format=image");
-            
+
             // WAR
             put("WAR/Angel", "https://api.scryfall.com/cards/twar/2/en?format=image");
             put("WAR/Assassin", "https://api.scryfall.com/cards/twar/6/en?format=image");
@@ -284,7 +285,7 @@ public class ScryfallImageSupportTokens {
             put("C18/Thopter/3", "https://api.scryfall.com/cards/tc18/8/en?format=image");
             put("C18/Worm", "https://api.scryfall.com/cards/tc18/18/en?format=image");
             put("C18/Zombie", "https://api.scryfall.com/cards/tc18/9/en?format=image");
-            
+
             //C19
             put("C19/Assassin", "https://api.scryfall.com/cards/tc19/9/en?format=image");
             put("C19/Beast/1", "https://api.scryfall.com/cards/tc19/13/en?format=image");
diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPicturesService.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPicturesService.java
index 5aa3c54b79..396ad95087 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPicturesService.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPicturesService.java
@@ -547,9 +547,11 @@ public class DownloadPicturesService extends DefaultBoundedRangeModel implements
                             CardDownloadData card = new CardDownloadData(params[3], set, "0", false, type, "", "", true, fileName);
                             card.setTokenClassName(tokenClassName);
                             list.add(card);
+                        } else {
+                            logger.error("wrong line format in tokens file: " + line);
                         }
                     } else {
-                        logger.error("wrong format for image urls: " + line);
+                        logger.error("wrong line data in tokens file: " + line);
                     }
                 }
                 line = reader.readLine();
diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt
index 01c97d879e..39f2e7804f 100644
--- a/Mage.Client/src/main/resources/card-pictures-tok.txt
+++ b/Mage.Client/src/main/resources/card-pictures-tok.txt
@@ -48,7 +48,7 @@
 |Generate|EMBLEM!:BFZ|Emblem Gideon|||GideonAllyOfZendikarEmblem|
 |Generate|EMBLEM!:BFZ|Emblem Kiora|||KioraMasterOfTheDepthsEmblem|
 |Generate|EMBLEM!:BFZ|Emblem Nixilis|||ObNixilisReignitedEmblem|
-|Generate|EMBLEM!:AKH|Emblem - Gideon|||GideonOfTheTrialsEmblem|
+|Generate|EMBLEM!:AKH|Emblem Gideon|||GideonOfTheTrialsEmblem|
 |Generate|EMBLEM!:C14|Emblem Daretti|||DarettiScrapSavantEmblem|
 |Generate|EMBLEM!:C14|Emblem Daretti||Emblem Daretti|DarettiScrapSavantEmblem|
 |Generate|EMBLEM!:C14|Emblem Nixilis|||ObNixilisOfTheBlackOathEmblem|
@@ -165,29 +165,30 @@
 |Generate|TOK:AER|Etherium Cell|||EtheriumCellToken|
 |Generate|TOK:AER|Gremlin|||GremlinToken|
 |Generate|TOK:AER|Ragavan|||RagavanToken|
-|Generate|TOK:AKH|Angel of Sanctions||
-|Generate|TOK:AKH|Anointer Priest||
-|Generate|TOK:AKH|Aven Initiate||
-|Generate|TOK:AKH|Aven Wind Guide||
 |Generate|TOK:AKH|Beast|||BeastToken3|
 |Generate|TOK:AKH|Cat|||CatToken2|
 |Generate|TOK:AKH|Drake|||DrakeToken|
-|Generate|TOK:AKH|Glyph Keeper||
-|Generate|TOK:AKH|Heart-Piercer Manticore||
 |Generate|TOK:AKH|Hippo|||HippoToken2|
-|Generate|TOK:AKH|Honored Hydra||
-|Generate|TOK:AKH|Labyrinth Guardian||
-|Generate|TOK:AKH|Oketra's Attendant||
-|Generate|TOK:AKH|Sacred Cat||
 |Generate|TOK:AKH|Snake|||DeathtouchSnakeToken|
-|Generate|TOK:AKH|Tah-Crop Skirmisher||
-|Generate|TOK:AKH|Temmet, Vizier of Naktamun||
-|Generate|TOK:AKH|Trueheart Duelist||
-|Generate|TOK:AKH|Unwavering Initiate||
-|Generate|TOK:AKH|Vizier of Many Faces||
 |Generate|TOK:AKH|Warrior|||WarriorVigilantToken|
 |Generate|TOK:AKH|Wurm|||WurmToken3|
 |Generate|TOK:AKH|Zombie|||ZombieToken
+#TOK:AKH - some tokens from real cards (see Embalm ability)
+#|Generate|TOK:AKH|Angel of Sanctions||
+#|Generate|TOK:AKH|Anointer Priest||
+#|Generate|TOK:AKH|Aven Initiate||
+#|Generate|TOK:AKH|Aven Wind Guide||
+#|Generate|TOK:AKH|Glyph Keeper||
+#|Generate|TOK:AKH|Heart-Piercer Manticore||
+#|Generate|TOK:AKH|Honored Hydra||
+#|Generate|TOK:AKH|Labyrinth Guardian||
+#|Generate|TOK:AKH|Oketra's Attendant||
+#|Generate|TOK:AKH|Sacred Cat||
+#|Generate|TOK:AKH|Tah-Crop Skirmisher||
+#|Generate|TOK:AKH|Temmet, Vizier of Naktamun||
+#|Generate|TOK:AKH|Trueheart Duelist||
+#|Generate|TOK:AKH|Unwavering Initiate||
+#|Generate|TOK:AKH|Vizier of Many Faces||
 |Generate|TOK:ALA|Beast|||GodSireBeastToken|
 |Generate|TOK:ALA|Dragon|||DragonToken|
 |Generate|TOK:ALA|Goblin|||GoblinTokenWithHaste|
@@ -242,7 +243,7 @@
 |Generate|TOK:BFZ|Eldrazi Scion|3||EldraziScionToken|
 |Generate|TOK:BFZ|Eldrazi|||EldraziToken|
 |Generate|TOK:BFZ|Elemental|1||OmnathElementalToken|
-|Generate|TOK:BFZ|Elemental|2||ElementalToken|
+|Generate|TOK:BFZ|Elemental|2||AkoumStonewakerElementalToken|
 |Generate|TOK:BFZ|Knight Ally|||KnightAllyToken|
 |Generate|TOK:BFZ|Kor Ally|||KorAllyToken|
 |Generate|TOK:BFZ|Octopus|||OctopusToken|
@@ -580,7 +581,7 @@
 |Generate|TOK:DOM|Construct|||KarnConstructToken|
 |Generate|TOK:DOM|Demon|||BelzenlokDemonToken|
 |Generate|TOK:DOM|Elemental|||ValdukElementalToken|
-|Gererate|TOK:DOM|Goblin|||GoblinToken|
+|Generate|TOK:DOM|Goblin|||GoblinToken|
 |Generate|TOK:DOM|Karox Bladewing|||KaroxBladewingDragonToken|
 |Generate|TOK:DOM|Knight|1||KnightToken|
 |Generate|TOK:DOM|Knight|2||KnightToken|
@@ -628,15 +629,16 @@
 |Generate|TOK:EMA|Wall|||TidalWaveWallToken|
 |Generate|TOK:EMA|Wurm|||WurmToken|
 |Generate|TOK:EMA|Zombie|||ZombieToken|
-|Generate|TOK:EMN|Devil|||DevilToken|
+#TOK:EMN - Human Soldier, Spirit, Devil, Insect and Wolf tokens from SOI set
+#|Generate|TOK:EMN|Devil|||DevilToken|
+#|Generate|TOK:EMN|Human Soldier|||HumanSoldierToken|
+#|Generate|TOK:EMN|Insect|||InsectToken|
+#|Generate|TOK:EMN|Spirit|||SpiritWhiteToken|
+#|Generate|TOK:EMN|Wolf|||WolfToken|
 |Generate|TOK:EMN|Eldrazi Horror|||EldraziHorrorToken|
-|Generate|TOK:EMN|Human Soldier|||HumanSoldierToken|
 |Generate|TOK:EMN|Human Wizard|||HumanWizardToken|
 |Generate|TOK:EMN|Human|||RedHumanToken|
-|Generate|TOK:EMN|Insect|||InsectToken|
 |Generate|TOK:EMN|Spider|||SpiderToken|
-|Generate|TOK:EMN|Spirit|||SpiritWhiteToken|
-|Generate|TOK:EMN|Wolf|||WolfToken|
 |Generate|TOK:EMN|Zombie|1||ZombieToken|
 |Generate|TOK:EMN|Zombie|2||ZombieToken|
 |Generate|TOK:EMN|Zombie|3||ZombieToken|
@@ -706,19 +708,20 @@
 |Generate|TOK:HOP|Pentavite|||PentaviteToken|
 |Generate|TOK:HOP|Pest|||PestToken|
 |Generate|TOK:HOP|Saproling|||SaprolingToken|
+|Generate|TOK:HOU|Horse|||CrestedSunmareToken|
+|Generate|TOK:HOU|Insect|||TheLocustGodInsectToken|
+|Generate|TOK:HOU|Snake|||RhonassLastStandToken|
+#TOK:HOU - some tokens from real cards (see Eternalize ability)
+#TOK:HOU - Cat, Warrior and Zombie tokens from AKH set
 |Generate|TOK:HOU|Adorned Pouncer||||
 |Generate|TOK:HOU|Champion of Wits||||
 |Generate|TOK:HOU|Dreamstealer||||
 |Generate|TOK:HOU|Earthshaker Khenra||||
-|Generate|TOK:HOU|Horse|||CrestedSunmareToken|
-|Generate|TOK:HOU|Insect|||TheLocustGodInsectToken|
 |Generate|TOK:HOU|Proven Combatant||||
 |Generate|TOK:HOU|Resilient Khenra||||
 |Generate|TOK:HOU|Sinuous Striker||||
-|Generate|TOK:HOU|Snake|||RhonassLastStandToken|
 |Generate|TOK:HOU|Steadfast Sentinel||||
 |Generate|TOK:HOU|Sunscourge Champion||||
-|Generate|TOK:HOU|Zombie||
 |Generate|TOK:ICE|Caribou|||CaribouToken|
 |Generate|TOK:INV|Bird|||OwlToken|
 |Generate|TOK:INV|Elephant|||ElephantToken|
@@ -1256,6 +1259,7 @@
 |Generate|TOK:RNA|Treasure|||TreasureToken|
 |Generate|TOK:RNA|Zombie|||ZombieToken|
 |Generate|TOK:GRN|Angel|||AngelVigilanceToken|
+|Generate|TOK:GRN|Bird Illusion|||BirdIllusionToken|
 |Generate|TOK:GRN|Elf Knight|||ElfKnightToken|
 |Generate|TOK:GRN|Goblin|||GoblinToken|
 |Generate|TOK:GRN|Insect|||IzoniInsectToken|
diff --git a/Mage.Sets/src/mage/cards/c/ChandraFlamecaller.java b/Mage.Sets/src/mage/cards/c/ChandraFlamecaller.java
index 7de1fc1432..be87c242af 100644
--- a/Mage.Sets/src/mage/cards/c/ChandraFlamecaller.java
+++ b/Mage.Sets/src/mage/cards/c/ChandraFlamecaller.java
@@ -1,8 +1,5 @@
-
 package mage.cards.c;
 
-import java.util.Set;
-import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.LoyaltyAbility;
 import mage.abilities.common.PlaneswalkerEntersWithLoyaltyCountersAbility;
@@ -17,22 +14,24 @@ import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.SubType;
 import mage.constants.Outcome;
+import mage.constants.SubType;
 import mage.constants.SuperType;
 import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.game.permanent.token.ElementalToken;
 import mage.players.Player;
 
+import java.util.Set;
+import java.util.UUID;
+
 /**
- *
  * @author fireshoes
  */
 public final class ChandraFlamecaller extends CardImpl {
 
     public ChandraFlamecaller(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.PLANESWALKER},"{4}{R}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, "{4}{R}{R}");
         this.addSuperType(SuperType.LEGENDARY);
         this.subtype.add(SubType.CHANDRA);
 
@@ -78,7 +77,7 @@ class ChandraElementalEffect extends OneShotEffect {
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         if (controller != null) {
-            CreateTokenEffect effect = new CreateTokenEffect(new ElementalToken("OGW", 1, true), 2);
+            CreateTokenEffect effect = new CreateTokenEffect(new ElementalToken("OGW", 2, true), 2);
             effect.apply(game, source);
             effect.exileTokensCreatedAtNextEndStep(game, source);
             return true;
diff --git a/Mage/src/main/java/mage/game/command/emblems/GideonOfTheTrialsEmblem.java b/Mage/src/main/java/mage/game/command/emblems/GideonOfTheTrialsEmblem.java
index 60a9820f35..b9b2cd4683 100644
--- a/Mage/src/main/java/mage/game/command/emblems/GideonOfTheTrialsEmblem.java
+++ b/Mage/src/main/java/mage/game/command/emblems/GideonOfTheTrialsEmblem.java
@@ -1,4 +1,3 @@
-
 package mage.game.command.emblems;
 
 import mage.abilities.Ability;
@@ -15,13 +14,12 @@ import mage.game.command.Emblem;
 import mage.game.events.GameEvent;
 
 /**
- *
  * @author spjspj
  */
 public final class GideonOfTheTrialsEmblem extends Emblem {
 
     public GideonOfTheTrialsEmblem() {
-        this.setName("Emblem - Gideon");
+        this.setName("Emblem Gideon");
         Ability ability = new SimpleStaticAbility(Zone.COMMAND, new GideonOfTheTrialsCantLoseEffect());
         this.getAbilities().add(ability);
     }
@@ -53,9 +51,7 @@ class GideonOfTheTrialsCantLoseEffect extends ContinuousRuleModifyingEffectImpl
     public boolean applies(GameEvent event, Ability source, Game game) {
         if ((event.getType() == GameEvent.EventType.WINS && game.getOpponents(source.getControllerId()).contains(event.getPlayerId()))
                 || (event.getType() == GameEvent.EventType.LOSES && event.getPlayerId().equals(source.getControllerId()))) {
-            if (game.getBattlefield().contains(filter, source.getControllerId(), 1, game)) {
-                return true;
-            }
+            return game.getBattlefield().contains(filter, source.getControllerId(), 1, game);
         }
         return false;
     }
diff --git a/Mage/src/main/java/mage/game/permanent/token/AkoumStonewakerElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/AkoumStonewakerElementalToken.java
index 08554ef49e..d992ba44f4 100644
--- a/Mage/src/main/java/mage/game/permanent/token/AkoumStonewakerElementalToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/AkoumStonewakerElementalToken.java
@@ -24,6 +24,10 @@ public final class AkoumStonewakerElementalToken extends TokenImpl {
         this.addAbility(HasteAbility.getInstance());
         availableImageSetCodes.addAll(Arrays.asList("BFZ", "MH1"));
 
+        if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("BFZ")) {
+            setTokenType(2);
+        }
+
         if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("MH1")) {
             setTokenType(2);
         }
diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java
index ed845d62cc..50727e81da 100644
--- a/Mage/src/main/java/mage/game/permanent/token/BeastToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java
@@ -1,15 +1,14 @@
-
 package mage.game.permanent.token;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import mage.MageInt;
 import mage.constants.CardType;
 import mage.constants.SubType;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 /**
- *
  * @author BetaSteward_at_googlemail.com
  */
 public final class BeastToken extends TokenImpl {
@@ -17,7 +16,7 @@ public final class BeastToken extends TokenImpl {
     static final private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("C14", "LRW", "M15", "M14", "DDL", "M13", "M12", "DD3GVL", "NPH", "M11", "M10", "EVE", "MM3", "CMA", "E01"));
+        tokenImageSets.addAll(Arrays.asList("C14", "LRW", "M15", "M14", "DDL", "M13", "M12", "DD3GVL", "NPH", "M11", "M10", "EVE", "MM3", "CMA", "E01", "C19"));
     }
 
     public BeastToken() {
diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java
index a65f361af9..f59cbc94a6 100644
--- a/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java
+++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken2.java
@@ -1,15 +1,14 @@
-
 package mage.game.permanent.token;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import mage.MageInt;
 import mage.constants.CardType;
 import mage.constants.SubType;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 /**
- *
  * @author LoneFox
  */
 public final class BeastToken2 extends TokenImpl {
@@ -17,7 +16,7 @@ public final class BeastToken2 extends TokenImpl {
     static final private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("ZEN", "C14", "DDD", "C15", "DD3GVL", "MM3", "CMA", "E01"));
+        tokenImageSets.addAll(Arrays.asList("ZEN", "C14", "DDD", "C15", "DD3GVL", "MM3", "CMA", "E01", "C19"));
     }
 
     public BeastToken2() {
diff --git a/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java b/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java
index 30c1e3baa1..2af5a0e77f 100644
--- a/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/CentaurToken.java
@@ -17,7 +17,7 @@ public final class CentaurToken extends TokenImpl {
     static final private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("RTR", "MM3", "RNA"));
+        tokenImageSets.addAll(Arrays.asList("RTR", "MM3", "RNA", "C19"));
     }
 
     public CentaurToken() {
diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java b/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java
index a5436d7f7c..d6444d782d 100644
--- a/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java
+++ b/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java
@@ -1,16 +1,15 @@
-
 package mage.game.permanent.token;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import mage.MageInt;
 import mage.abilities.keyword.FlyingAbility;
 import mage.constants.CardType;
 import mage.constants.SubType;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 /**
- *
  * @author LoneFox
  */
 public final class DragonToken2 extends TokenImpl {
@@ -18,11 +17,11 @@ public final class DragonToken2 extends TokenImpl {
     static final private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("WWK", "10E", "BFZ", "C15", "CN2", "CMA"));
+        tokenImageSets.addAll(Arrays.asList("WWK", "10E", "BFZ", "C15", "CN2", "CMA", "C19"));
     }
 
     public DragonToken2() {
-        this((String)null);
+        this((String) null);
     }
 
     public DragonToken2(String setCode) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanToken.java
index 3b565946ca..79f039152e 100644
--- a/Mage/src/main/java/mage/game/permanent/token/HumanToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/HumanToken.java
@@ -18,7 +18,7 @@ public final class HumanToken extends TokenImpl {
         subtype.add(SubType.HUMAN);
         power = new MageInt(1);
         toughness = new MageInt(1);
-        availableImageSetCodes.addAll(Arrays.asList("DKA", "AVR", "FNMP", "RNA", "ELD"));
+        availableImageSetCodes.addAll(Arrays.asList("DKA", "AVR", "FNMP", "RNA", "ELD", "C19"));
     }
 
     public HumanToken(final HumanToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/OmnathElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/OmnathElementalToken.java
index 5c47fb395b..34bebdf023 100644
--- a/Mage/src/main/java/mage/game/permanent/token/OmnathElementalToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/OmnathElementalToken.java
@@ -1,19 +1,17 @@
-
-
 package mage.game.permanent.token;
+
+import mage.MageInt;
 import mage.constants.CardType;
 import mage.constants.SubType;
-import mage.MageInt;
 
 /**
- *
  * @author spjspj
  */
 public final class OmnathElementalToken extends TokenImpl {
 
     public OmnathElementalToken() {
         super("Elemental", "5/5 red and green Elemental creature token");
-        setTokenType(2);
+        setTokenType(1);
         setOriginalExpansionSetCode("BFZ");
         cardType.add(CardType.CREATURE);
         subtype.add(SubType.ELEMENTAL);
@@ -23,6 +21,7 @@ public final class OmnathElementalToken extends TokenImpl {
         power = new MageInt(5);
         toughness = new MageInt(5);
     }
+
     public OmnathElementalToken(final OmnathElementalToken token) {
         super(token);
     }
@@ -30,5 +29,5 @@ public final class OmnathElementalToken extends TokenImpl {
     public OmnathElementalToken copy() {
         return new OmnathElementalToken(this);
     }
-    
+
 }
diff --git a/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java b/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java
index 29cc9829ef..3c08fd7f26 100644
--- a/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/RhinoToken.java
@@ -21,7 +21,7 @@ public final class RhinoToken extends TokenImpl {
         toughness = new MageInt(4);
         addAbility(TrampleAbility.getInstance());
 
-        availableImageSetCodes.addAll(Arrays.asList("DGM", "RTR", "MH1"));
+        availableImageSetCodes.addAll(Arrays.asList("DGM", "RTR", "MH1", "C19"));
     }
 
     public RhinoToken(final RhinoToken token) {
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 a653c0ddbc..828a2545d8 100644
--- a/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java
@@ -1,17 +1,15 @@
-
-
 package mage.game.permanent.token;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import mage.MageInt;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.util.RandomUtil;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 /**
- *
  * @author BetaSteward_at_googlemail.com
  */
 public final class SaprolingToken extends TokenImpl {
@@ -39,7 +37,8 @@ public final class SaprolingToken extends TokenImpl {
                 "VMA", // 2 different token, one with DIFFERENT stats, "Saproling Burst" create different token, see https://scryfall.com/card/tvma/12
                 "E02",
                 "RIX",
-                "DOM" // 3 different token images
+                "DOM", // 3 different token images
+                "C19"
         ));
     }
 
diff --git a/Mage/src/main/java/mage/game/permanent/token/SeedGuardianToken.java b/Mage/src/main/java/mage/game/permanent/token/SeedGuardianToken.java
index 7d6b2a7d2a..ddf2bbefa6 100644
--- a/Mage/src/main/java/mage/game/permanent/token/SeedGuardianToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/SeedGuardianToken.java
@@ -1,12 +1,10 @@
-
-
 package mage.game.permanent.token;
+
+import mage.MageInt;
 import mage.constants.CardType;
 import mage.constants.SubType;
-import mage.MageInt;
 
 /**
- *
  * @author spjspj
  */
 public final class SeedGuardianToken extends TokenImpl {
@@ -14,9 +12,10 @@ public final class SeedGuardianToken extends TokenImpl {
     public SeedGuardianToken() {
         this(1);
     }
+
     public SeedGuardianToken(int xValue) {
         super("Elemental", "X/X green Elemental creature token");
-        setTokenType(2);
+        setTokenType(1);
         setOriginalExpansionSetCode("OGW");
         cardType.add(CardType.CREATURE);
         color.setGreen(true);
diff --git a/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java b/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java
index 88ccc6b506..2b7069db4e 100644
--- a/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/SnakeToken.java
@@ -1,16 +1,14 @@
-
-
 package mage.game.permanent.token;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import mage.MageInt;
 import mage.constants.CardType;
 import mage.constants.SubType;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 /**
- *
  * @author BetaSteward_at_googlemail.com
  */
 public final class SnakeToken extends TokenImpl {
@@ -18,11 +16,11 @@ public final class SnakeToken extends TokenImpl {
     static final private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("ZEN", "KTK", "MM2", "C15"));
+        tokenImageSets.addAll(Arrays.asList("ZEN", "KTK", "MM2", "C15", "C19"));
     }
 
     public SnakeToken() {
-        this((String)null);
+        this((String) null);
     }
 
     public SnakeToken(String setCode) {
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 8264a002ee..7f64cfe920 100644
--- a/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java
@@ -1,12 +1,12 @@
-
 package mage.game.permanent.token;
 
+import mage.MageInt;
+import mage.constants.CardType;
+import mage.constants.SubType;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import mage.MageInt;
-import mage.constants.CardType;
-import mage.constants.SubType;
 
 /**
  * @author Loki
@@ -16,7 +16,7 @@ public final class SpiritToken extends TokenImpl {
     static final private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("CHK", "EMA", "C16"));
+        tokenImageSets.addAll(Arrays.asList("CHK", "EMA", "C16", "C19"));
     }
 
     public SpiritToken() {
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 ef9c1a0fe9..dd23d59eda 100644
--- a/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/TreasureToken.java
@@ -21,7 +21,7 @@ public final class TreasureToken extends TokenImpl {
     static final private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("XLN", "RNA", "M20"));
+        tokenImageSets.addAll(Arrays.asList("XLN", "RNA", "M20", "C19"));
     }
 
     public TreasureToken() {
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 2309f2124d..f52d3eb7ad 100644
--- a/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java
@@ -18,7 +18,7 @@ public final class ZombieToken extends TokenImpl {
 
     static {
         tokenImageSets.addAll(Arrays.asList("10E", "M10", "M11", "M12", "M13", "M14", "M15", "MBS", "ALA", "ISD", "C14", "C15", "C16", "C17", "CNS",
-                "MMA", "BNG", "KTK", "DTK", "ORI", "OGW", "SOI", "EMN", "EMA", "MM3", "AKH", "CMA", "E01", "RNA", "WAR", "MH1", "M20"));
+                "MMA", "BNG", "KTK", "DTK", "ORI", "OGW", "SOI", "EMN", "EMA", "MM3", "AKH", "CMA", "E01", "RNA", "WAR", "MH1", "M20", "C19"));
     }
 
     public ZombieToken() {
@@ -34,6 +34,7 @@ public final class ZombieToken extends TokenImpl {
     @Override
     public void setExpansionSetCodeForImage(String code) {
         super.setExpansionSetCodeForImage(code);
+
         if (getOriginalExpansionSetCode().equals("ISD")) {
             this.setTokenType(RandomUtil.nextInt(3) + 1);
         }
@@ -43,6 +44,9 @@ public final class ZombieToken extends TokenImpl {
         if (getOriginalExpansionSetCode().equals("EMN")) {
             this.setTokenType(RandomUtil.nextInt(4) + 1);
         }
+        if (getOriginalExpansionSetCode().equals("C19")) {
+            this.setTokenType(RandomUtil.nextInt(2) + 1);
+        }
     }
 
     public ZombieToken(final ZombieToken token) {