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 6df6d4041b2..eae431a84a0 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
@@ -1519,6 +1519,24 @@ public class ScryfallImageSupportTokens {
             put ("DDQ/Spirit", "https://api.scryfall.com/cards/ddq/79/en?format=image");
             put ("DDQ/Zombie", "https://api.scryfall.com/cards/ddq/80/en?format=image");
 
+            // EMA
+            put ("EMA/Carnivore", "https://api.scryfall.com/cards/tema/7/en?format=image");
+            put ("EMA/Emblem Dack Fayden", "https://api.scryfall.com/cards/tema/16/en?format=image");
+            put ("EMA/Dragon", "https://api.scryfall.com/cards/tema/8/en?format=image");
+            put ("EMA/Elemental/1", "https://api.scryfall.com/cards/tema/9/en?format=image");
+            put ("EMA/Elemental/2", "https://api.scryfall.com/cards/tema/14/en?format=image");
+            put ("EMA/Elephant", "https://api.scryfall.com/cards/tema/11/en?format=image");
+            put ("EMA/Elf Warrior", "https://api.scryfall.com/cards/tema/12/en?format=image");
+            put ("EMA/Goblin", "https://api.scryfall.com/cards/tema/10/en?format=image");
+            put ("EMA/Goblin Soldier", "https://api.scryfall.com/cards/tema/15/en?format=image");
+            put ("EMA/Serf", "https://api.scryfall.com/cards/tema/5/en?format=image");
+            put ("EMA/Soldier", "https://api.scryfall.com/cards/tema/2/en?format=image");
+            put ("EMA/Spirit/1", "https://api.scryfall.com/cards/tema/1/en?format=image");
+            put ("EMA/Spirit/2", "https://api.scryfall.com/cards/tema/3/en?format=image");
+            put ("EMA/Wall", "https://api.scryfall.com/cards/tema/4/en?format=image");
+            put ("EMA/Wurm", "https://api.scryfall.com/cards/tema/13/en?format=image");
+            put ("EMA/Zombie", "https://api.scryfall.com/cards/tema/6/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 dc87612400c..1bed6989029 100644
--- a/Mage.Client/src/main/resources/card-pictures-tok.txt
+++ b/Mage.Client/src/main/resources/card-pictures-tok.txt
@@ -588,9 +588,7 @@
 |Generate|TOK:E01|Spirit|||SpiritWhiteToken|
 |Generate|TOK:E01|Zombie|||ZombieToken|
 |Generate|TOK:E02|Saproling|||SaprolingToken|
-|Generate|TOK:EMA|Assembly-Worker|||AssemblyWorkerToken|
-|Generate|TOK:EMA|Beast|||CarnivoreToken|
-|Generate|TOK:EMA|Carnivore||
+|Generate|TOK:EMA|Carnivore|||CarnivoreToken|
 |Generate|TOK:EMA|Dragon|||DragonEggDragonToken|
 |Generate|TOK:EMA|Elemental|1||RedElementalToken|
 |Generate|TOK:EMA|Elemental|2||CallTheSkyBreakerElementalToken|
@@ -600,8 +598,8 @@
 |Generate|TOK:EMA|Goblin|||GoblinToken|
 |Generate|TOK:EMA|Serf|||SerfToken|
 |Generate|TOK:EMA|Soldier|||SoldierToken|
-|Generate|TOK:EMA|Spirit|1||SpiritWhiteToken|
-|Generate|TOK:EMA|Spirit|2||SpiritToken|
+|Generate|TOK:EMA|Spirit|1||SpiritToken|
+|Generate|TOK:EMA|Spirit|2||SpiritWhiteToken|
 |Generate|TOK:EMA|Wall|||TidalWaveWallToken|
 |Generate|TOK:EMA|Wurm|||WurmToken|
 |Generate|TOK:EMA|Zombie|||ZombieToken|
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 91421d3de00..fcd7385dbc7 100644
--- a/Mage/src/main/java/mage/game/permanent/token/RedElementalToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/RedElementalToken.java
@@ -46,6 +46,10 @@ public final class RedElementalToken extends TokenImpl {
         if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("UMA")) {
             setTokenType(RandomUtil.nextInt(2) + 2); // 2..3
         }
+
+        if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("EMA")) {
+            setTokenType(1);
+        }
     }
 
     public RedElementalToken(final RedElementalToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/SerfToken.java b/Mage/src/main/java/mage/game/permanent/token/SerfToken.java
index f09c4693835..d7b7915b07e 100644
--- a/Mage/src/main/java/mage/game/permanent/token/SerfToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/SerfToken.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 SerfToken extends TokenImpl {
         subtype.add(SubType.SERF);
         power = new MageInt(0);
         toughness = new MageInt(1);
+
+        availableImageSetCodes = Arrays.asList("EMA");
     }
 
     public SerfToken(final SerfToken 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 7ec6e19f7e7..cfd4a652072 100644
--- a/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java
@@ -26,7 +26,7 @@ public final class SpiritToken extends TokenImpl {
         super.setExpansionSetCodeForImage(code);
 
         if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("EMA")) {
-            setTokenType(2);
+            setTokenType(1);
         }
 
         if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("NEO")) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/TidalWaveWallToken.java b/Mage/src/main/java/mage/game/permanent/token/TidalWaveWallToken.java
index ee2ffdffa83..4fd89ce29f8 100644
--- a/Mage/src/main/java/mage/game/permanent/token/TidalWaveWallToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/TidalWaveWallToken.java
@@ -6,6 +6,8 @@ import mage.constants.SubType;
 import mage.MageInt;
 import mage.abilities.keyword.DefenderAbility;
 
+import java.util.Arrays;
+
 /**
  *
  * @author spjspj
@@ -20,6 +22,8 @@ public final class TidalWaveWallToken extends TokenImpl {
         power = new MageInt(5);
         toughness = new MageInt(5);
         this.addAbility(DefenderAbility.getInstance());
+
+        availableImageSetCodes = Arrays.asList("EMA", "DDT");
     }
 
     public TidalWaveWallToken(final TidalWaveWallToken token) {