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 ea1e716ac1..3e4914ce3d 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
@@ -1245,6 +1245,15 @@ public class ScryfallImageSupportTokens {
             put ("WWK/Plant", "https://api.scryfall.com/cards/twwk/5/en?format=image");
             put ("WWK/Soldier Ally", "https://api.scryfall.com/cards/twwk/1/en?format=image");
 
+            // ROE
+            put ("ROE/Eldrazi Spawn/1", "https://api.scryfall.com/cards/troe/1a/en?format=image");
+            put ("ROE/Eldrazi Spawn/2", "https://api.scryfall.com/cards/troe/1b/en?format=image");
+            put ("ROE/Eldrazi Spawn/3", "https://api.scryfall.com/cards/troe/1c/en?format=image");
+            put ("ROE/Elemental", "https://api.scryfall.com/cards/troe/2/en?format=image");
+            put ("ROE/Hellion", "https://api.scryfall.com/cards/troe/3/en?format=image");
+            put ("ROE/Ooze", "https://api.scryfall.com/cards/troe/4/en?format=image");
+            put ("ROE/Tuktuk the Returned", "https://api.scryfall.com/cards/troe/5/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 a74e4300fc..0bfd6ddd06 100644
--- a/Mage.Client/src/main/resources/card-pictures-tok.txt
+++ b/Mage.Client/src/main/resources/card-pictures-tok.txt
@@ -1021,16 +1021,13 @@
 |Generate|TOK:RIX|Elemental|2||RedElementalToken|
 |Generate|TOK:RIX|Golem|||GoldForgeGarrisonGolemToken|
 |Generate|TOK:RIX|Saproling|||SaprolingToken|
-|Generate|TOK:ROE|Dragon|||DragonToken2|
 |Generate|TOK:ROE|Eldrazi Spawn|1||EldraziSpawnToken|
 |Generate|TOK:ROE|Eldrazi Spawn|2||EldraziSpawnToken|
 |Generate|TOK:ROE|Eldrazi Spawn|3||EldraziSpawnToken|
 |Generate|TOK:ROE|Elemental|||DevastatingSummonsElementalToken|
-|Generate|TOK:ROE|Elephant|||ElephantToken|
-|Generate|TOK:ROE|Goblin Golem|||TuktukTheReturnedToken|
 |Generate|TOK:ROE|Hellion|||HellionToken|
-|Generate|TOK:ROE|Kor Soldier|||KorSoldierToken|
-|Generate|TOK:ROE|Ooze|||MysticGenesisOozeToken|
+|Generate|TOK:ROE|Ooze|||OozeToken|
+|Generate|TOK:ROE|Tuktuk the Returned|||TuktukTheReturnedToken|
 |Generate|TOK:RTR|Assassin|||AssassinToken|
 |Generate|TOK:RTR|Bird|||BirdToken|
 |Generate|TOK:RTR|Centaur|||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 d5eac19ebf..ccfc2de697 100644
--- a/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java
+++ b/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java
@@ -22,7 +22,7 @@ public final class DragonToken2 extends TokenImpl {
 
         addAbility(FlyingAbility.getInstance());
 
-        availableImageSetCodes = Arrays.asList("10E", "BFZ", "C15", "C19", "CMA", "CMD", "ONS", "ROE", "SCG", "WWK", "M19", "KHM", "AFC", "IMA", "PCA");
+        availableImageSetCodes = Arrays.asList("10E", "BFZ", "C15", "C19", "CMA", "CMD", "ONS", "SCG", "WWK", "M19", "KHM", "AFC", "IMA", "PCA");
     }
 
     public DragonToken2(final DragonToken2 token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java b/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java
index d054696233..4c0a4c43b4 100644
--- a/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/ElephantToken.java
@@ -20,7 +20,7 @@ public final class ElephantToken extends TokenImpl {
         toughness = new MageInt(3);
 
         availableImageSetCodes = Arrays.asList("C14", "C15", "CMA", "CMD", "CNS", "GVL", "DDD",
-                "EMA", "INV", "JUD", "MM2", "ODY", "ROE", "TSP", "VMA", "WWK", "MH1", "CMR", "C21", "MIC", "NEC", "2XM", "NCC");
+                "EMA", "INV", "JUD", "MM2", "ODY", "TSP", "VMA", "WWK", "MH1", "CMR", "C21", "MIC", "NEC", "2XM", "NCC");
     }
 
     public ElephantToken(final ElephantToken token) {