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 4b3fa78c32..53f61398ca 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
@@ -1381,6 +1381,15 @@ public class ScryfallImageSupportTokens {
             put ("THS/Soldier/2", "https://api.scryfall.com/cards/tths/3/en?format=image");
             put ("THS/Soldier/3", "https://api.scryfall.com/cards/tths/7/en?format=image");
 
+            // EVE
+            put ("EVE/Beast", "https://api.scryfall.com/cards/teve/3/en?format=image");
+            put ("EVE/Bird", "https://api.scryfall.com/cards/teve/2/en?format=image");
+            put ("EVE/Elemental", "https://api.scryfall.com/cards/teve/5/en?format=image");
+            put ("EVE/Goat", "https://api.scryfall.com/cards/teve/1/en?format=image");
+            put ("EVE/Goblin Soldier", "https://api.scryfall.com/cards/teve/7/en?format=image");
+            put ("EVE/Spirit", "https://api.scryfall.com/cards/teve/4/en?format=image");
+            put ("EVE/Worm", "https://api.scryfall.com/cards/teve/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 d4a4d34358..14ab78b8bf 100644
--- a/Mage.Client/src/main/resources/card-pictures-tok.txt
+++ b/Mage.Client/src/main/resources/card-pictures-tok.txt
@@ -629,9 +629,7 @@
 |Generate|TOK:EVE|Elemental|||CallTheSkyBreakerElementalToken|
 |Generate|TOK:EVE|Goat|||GoatToken|
 |Generate|TOK:EVE|Goblin Soldier|||GoblinSoldierToken|
-|Generate|TOK:EVE|Kithkin Soldier|||KithkinSoldierToken|
-|Generate|TOK:EVE|Spirit|||BeckonApparitionToken|
-|Generate|TOK:EVE|Wolf|||WolfToken|
+|Generate|TOK:EVE|Spirit|||WhiteBlackSpiritToken|
 |Generate|TOK:EVE|Worm|||BlackGreenWormToken|
 |Generate|TOK:EVG|Elemental|||VoiceOfTheWoodsElementalToken|
 |Generate|TOK:EVG|Elf Warrior|||ElfWarriorToken|
diff --git a/Mage/src/main/java/mage/game/permanent/token/GoblinSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/GoblinSoldierToken.java
index c47025526f..fd134cf469 100644
--- a/Mage/src/main/java/mage/game/permanent/token/GoblinSoldierToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/GoblinSoldierToken.java
@@ -3,6 +3,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 GoblinSoldierToken extends TokenImpl {
         subtype.add(SubType.SOLDIER);
         power = new MageInt(1);
         toughness = new MageInt(1);
+
+        availableImageSetCodes = Arrays.asList("EVE", "EMA");
     }
 
     public GoblinSoldierToken(final GoblinSoldierToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/KithkinSoldierToken.java b/Mage/src/main/java/mage/game/permanent/token/KithkinSoldierToken.java
index ec66e8f757..fd3d9c469f 100644
--- a/Mage/src/main/java/mage/game/permanent/token/KithkinSoldierToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/KithkinSoldierToken.java
@@ -20,7 +20,7 @@ public final class KithkinSoldierToken extends TokenImpl {
         power = new MageInt(1);
         toughness = new MageInt(1);
 
-        availableImageSetCodes = Arrays.asList("CMD", "EVE", "LRW", "MMA", "SHM", "MMA", "KHC", "CMA");
+        availableImageSetCodes = Arrays.asList("CMD", "LRW", "MMA", "SHM", "MMA", "KHC", "CMA");
     }
 
     public KithkinSoldierToken(final KithkinSoldierToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/WhiteBlackSpiritToken.java b/Mage/src/main/java/mage/game/permanent/token/WhiteBlackSpiritToken.java
index 30b0d3c013..fdb9c2253b 100644
--- a/Mage/src/main/java/mage/game/permanent/token/WhiteBlackSpiritToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/WhiteBlackSpiritToken.java
@@ -22,7 +22,7 @@ public final class WhiteBlackSpiritToken extends TokenImpl {
         toughness = new MageInt(1);
         this.addAbility(FlyingAbility.getInstance());
 
-        availableImageSetCodes.addAll(Arrays.asList("GTC", "MH1", "C15", "C21", "UMA"));
+        availableImageSetCodes.addAll(Arrays.asList("GTC", "EVE", "MH1", "C15", "C21", "UMA"));
     }
 
     @Override
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 82746f9c86..21341f3e94 100644
--- a/Mage/src/main/java/mage/game/permanent/token/WolfToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/WolfToken.java
@@ -21,7 +21,7 @@ public final class WolfToken extends TokenImpl {
         power = new MageInt(2);
         toughness = new MageInt(2);
 
-        availableImageSetCodes = Arrays.asList("BNG", "C14", "C15", "CMA", "CMD", "CNS", "EVE", "ISD",
+        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");
     }