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 a673adf907c..e751e2baf03 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
@@ -1224,6 +1224,19 @@ public class ScryfallImageSupportTokens {
             put ("10E/Wasp", "https://api.scryfall.com/cards/t10e/6/en?format=image");
             put ("10E/Zombie", "https://api.scryfall.com/cards/t10e/2/en?format=image");
 
+            // ZEN
+            put ("ZEN/Angel", "https://api.scryfall.com/cards/tzen/1/en?format=image");
+            put ("ZEN/Beast", "https://api.scryfall.com/cards/tzen/9/en?format=image");
+            put ("ZEN/Bird", "https://api.scryfall.com/cards/tzen/2/en?format=image");
+            put ("ZEN/Elemental", "https://api.scryfall.com/cards/tzen/8/en?format=image");
+            put ("ZEN/Illusion", "https://api.scryfall.com/cards/tzen/4/en?format=image");
+            put ("ZEN/Kor Soldier", "https://api.scryfall.com/cards/tzen/3/en?format=image");
+            put ("ZEN/Merfolk", "https://api.scryfall.com/cards/tzen/5/en?format=image");
+            put ("ZEN/Snake", "https://api.scryfall.com/cards/tzen/10/en?format=image");
+            put ("ZEN/Vampire", "https://api.scryfall.com/cards/tzen/6/en?format=image");
+            put ("ZEN/Wolf", "https://api.scryfall.com/cards/tzen/11/en?format=image");
+            put ("ZEN/Zombie Giant", "https://api.scryfall.com/cards/tzen/7/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 824322d0094..9a159ec950d 100644
--- a/Mage.Client/src/main/resources/card-pictures-tok.txt
+++ b/Mage.Client/src/main/resources/card-pictures-tok.txt
@@ -1193,14 +1193,12 @@
 |Generate|TOK:ZEN|Angel|||AngelToken|
 |Generate|TOK:ZEN|Beast|||BeastToken2|
 |Generate|TOK:ZEN|Bird|||BirdToken|
-|Generate|TOK:ZEN|Elemental|1||RedElementalWithTrampleAndHaste|
-|Generate|TOK:ZEN|Elemental|2||RedElementalWithTrampleAndHaste|
+|Generate|TOK:ZEN|Elemental|||RedElementalWithTrampleAndHaste|
 |Generate|TOK:ZEN|Illusion|||IllusionToken|
 |Generate|TOK:ZEN|Kor Soldier|||KorSoldierToken|
-|Generate|TOK:ZEN|Merfolk||
-|Generate|TOK:ZEN|Plant|||PlantToken|
+|Generate|TOK:ZEN|Merfolk|||MerfolkToken|
 |Generate|TOK:ZEN|Snake|||SnakeToken|
-|Generate|TOK:ZEN|Vampire||
+|Generate|TOK:ZEN|Vampire|||KalitasVampireToken|
 |Generate|TOK:ZEN|Wolf|||WolfToken|
 |Generate|TOK:ZEN|Zombie Giant|||QuestForTheGravelordZombieToken|
 |Generate|TOK:RNA|Beast|||RedGreenBeastToken|
diff --git a/Mage/src/main/java/mage/game/permanent/token/IllusionToken.java b/Mage/src/main/java/mage/game/permanent/token/IllusionToken.java
index da30f56feb8..430dca6853c 100644
--- a/Mage/src/main/java/mage/game/permanent/token/IllusionToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/IllusionToken.java
@@ -4,6 +4,8 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.MageInt;
 
+import java.util.Arrays;
+
 /**
  *
  * @author spjspj
@@ -18,6 +20,8 @@ public final class IllusionToken extends TokenImpl {
         subtype.add(SubType.ILLUSION);
         power = new MageInt(2);
         toughness = new MageInt(2);
+
+        availableImageSetCodes = Arrays.asList("ZEN");
     }
 
     public IllusionToken(final IllusionToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java b/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java
index 18f0acb9e76..cb92959db7c 100644
--- a/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/MerfolkToken.java
@@ -5,6 +5,8 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.MageInt;
 
+import java.util.Arrays;
+
 /**
  *
  * @author spjspj
@@ -18,6 +20,8 @@ public final class MerfolkToken extends TokenImpl {
         subtype.add(SubType.MERFOLK);
         power = new MageInt(1);
         toughness = new MageInt(1);
+
+        availableImageSetCodes = Arrays.asList("ZEN");
     }
 
     public MerfolkToken(final MerfolkToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/PlantToken.java b/Mage/src/main/java/mage/game/permanent/token/PlantToken.java
index 13c73c3dc7c..a418bb34962 100644
--- a/Mage/src/main/java/mage/game/permanent/token/PlantToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/PlantToken.java
@@ -16,7 +16,7 @@ public final class PlantToken extends TokenImpl {
         power = new MageInt(0);
         toughness = new MageInt(1);
 
-        availableImageSetCodes = Arrays.asList("ARC", "C18", "DDP", "OGW", "PC2", "WWK", "XLN", "ZEN", "ZNR", "CMR", "NEC", "2XM", "NCC", "PCA");
+        availableImageSetCodes = Arrays.asList("ARC", "C18", "DDP", "OGW", "PC2", "WWK", "XLN", "ZNR", "CMR", "NEC", "2XM", "NCC", "PCA");
     }
 
     public PlantToken(final PlantToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/RedElementalWithTrampleAndHaste.java b/Mage/src/main/java/mage/game/permanent/token/RedElementalWithTrampleAndHaste.java
index 08512f80491..8aaca8dc4b3 100644
--- a/Mage/src/main/java/mage/game/permanent/token/RedElementalWithTrampleAndHaste.java
+++ b/Mage/src/main/java/mage/game/permanent/token/RedElementalWithTrampleAndHaste.java
@@ -23,15 +23,6 @@ public final class RedElementalWithTrampleAndHaste extends TokenImpl {
         addAbility(HasteAbility.getInstance());
     }
 
-    @Override
-    public void setExpansionSetCodeForImage(String code) {
-        super.setExpansionSetCodeForImage(code);
-
-        if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ZEN")) {
-            setTokenType(RandomUtil.nextInt(2) + 1);
-        }
-    }
-
     public RedElementalWithTrampleAndHaste(final RedElementalWithTrampleAndHaste token) {
         super(token);
     }