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 8e984af08c9..80d1b0fa76c 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
@@ -1591,6 +1591,12 @@ public class ScryfallImageSupportTokens {
             put ("DDS/Goblin", "https://api.scryfall.com/cards/tdds/3/en?format=image");
             put ("DDS/Wurm", "https://api.scryfall.com/cards/tdds/7/en?format=image");
 
+            // E01
+            put ("E01/Beast/1", "https://api.scryfall.com/cards/te01/4/en?format=image");
+            put ("E01/Beast/2", "https://api.scryfall.com/cards/te01/5/en?format=image");
+            put ("E01/Soldier", "https://api.scryfall.com/cards/te01/1/en?format=image");
+            put ("E01/Spirit", "https://api.scryfall.com/cards/te01/2/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 eb752f7f287..963dac76c42 100644
--- a/Mage.Client/src/main/resources/card-pictures-tok.txt
+++ b/Mage.Client/src/main/resources/card-pictures-tok.txt
@@ -585,7 +585,6 @@
 |Generate|TOK:E01|Beast|2||BeastToken2|
 |Generate|TOK:E01|Soldier|||SoldierToken|
 |Generate|TOK:E01|Spirit|||SpiritWhiteToken|
-|Generate|TOK:E01|Zombie|||ZombieToken|
 |Generate|TOK:E02|Saproling|||SaprolingToken|
 |Generate|TOK:EMA|Carnivore|||CarnivoreToken|
 |Generate|TOK:EMA|Dragon|||DragonEggDragonToken|
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 765622a5684..c553c609955 100644
--- a/Mage/src/main/java/mage/game/permanent/token/BeastToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java
@@ -53,6 +53,9 @@ public final class BeastToken extends TokenImpl {
         if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("DDD")) {
             setTokenType(1);
         }
+        if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("E01")) {
+            setTokenType(1);
+        }
     }
 
     public BeastToken(final BeastToken token) {
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 9e562721b9c..68995d05364 100644
--- a/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java
@@ -27,7 +27,7 @@ public final class ZombieToken extends TokenImpl {
                 "MMA", "BNG", "KTK", "DTK",
                 "ORI", "OGW", "SOI", "EMN",
                 "EMA", "MM3", "AKH", "CMA",
-                "E01", "RNA", "WAR", "MH1",
+                "RNA", "WAR", "MH1",
                 "M20", "C19", "C20", "THB",
                 "M21", "CMR", "C21", "MH2",
                 "AFR", "MIC", "VOW", "UMA",