diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt
index 5c59e59c9c..92e8911e18 100644
--- a/Mage.Client/src/main/resources/card-pictures-tok.txt
+++ b/Mage.Client/src/main/resources/card-pictures-tok.txt
@@ -345,6 +345,17 @@
 |Generate|TOK:C16|Thopter||
 |Generate|TOK:C16|Worm||
 |Generate|TOK:C16|Zombie||
+|Generate|TOK:C17|Bat||
+|Generate|TOK:C17|Cat||
+|Generate|TOK:C17|Cat Dragon|||WasitoraCatDragonToken|
+|Generate|TOK:C17|Cat Warrior||
+|Generate|TOK:C17|Dragon|1||DragonToken|
+|Generate|TOK:C17|Dragon|2||UtavaraHellkiteDragonToken|
+|Generate|TOK:C17|Eldrazi Spawn||
+|Generate|TOK:C17|Gold||
+|Generate|TOK:C17|Rat|||DeathtouchRatToken|
+|Generate|TOK:C17|Vampire|||EdgarMarkovToken|
+|Generate|TOK:C17|Zombie||
 |Generate|TOK:CHK|Dragon Spirit|||TatsumaDragonToken|
 |Generate|TOK:CHK|Elemental|||SeedGuardianToken|
 |Generate|TOK:CHK|Illusion|||MelokuTheCloudedMirrorToken|
diff --git a/Mage/src/main/java/mage/game/permanent/token/BatToken.java b/Mage/src/main/java/mage/game/permanent/token/BatToken.java
index a62ecd7c7b..68059eb78f 100644
--- a/Mage/src/main/java/mage/game/permanent/token/BatToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/BatToken.java
@@ -1,14 +1,24 @@
 package mage.game.permanent.token;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import mage.MageInt;
 import mage.abilities.keyword.FlyingAbility;
 import mage.constants.CardType;
 import mage.constants.SubType;
 
 public class BatToken extends TokenImpl {
+    
+    final static private List<String> tokenImageSets = new ArrayList<>();
+
+    static {
+        tokenImageSets.addAll(Arrays.asList("MMA", "C17"));
+    }
 
     public BatToken() {
         super("Bat", "1/1 black Bat creature token with flying");
+        availableImageSetCodes = tokenImageSets;
         cardType.add(CardType.CREATURE);
         color.setBlack(true);
         subtype.add(SubType.BAT);
diff --git a/Mage/src/main/java/mage/game/permanent/token/CatToken.java b/Mage/src/main/java/mage/game/permanent/token/CatToken.java
index 52c5ff44b7..5af06d6042 100644
--- a/Mage/src/main/java/mage/game/permanent/token/CatToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/CatToken.java
@@ -44,7 +44,7 @@ public class CatToken extends TokenImpl {
     final static private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("SOM", "M13", "M14", "C14", "C15"));
+        tokenImageSets.addAll(Arrays.asList("SOM", "M13", "M14", "C14", "C15", "C17"));
     }
 
     public CatToken() {
diff --git a/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java
index 147b1ab620..0e526afe6a 100644
--- a/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java
@@ -27,6 +27,9 @@
  */
 
 package mage.game.permanent.token;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import mage.constants.CardType;
 import mage.abilities.keyword.ForestwalkAbility;
 import mage.constants.SubType;
@@ -37,8 +40,15 @@ import mage.constants.SubType;
  */
 public class CatWarriorToken extends TokenImpl {
 
+    final static private List<String> tokenImageSets = new ArrayList<>();
+
+    static {
+        tokenImageSets.addAll(Arrays.asList("PLC", "C17"));
+    }
+
     public CatWarriorToken() {
         super("Cat Warrior", "2/2 green Cat Warrior creature token with forestwalk");
+        availableImageSetCodes = tokenImageSets;
         this.setOriginalExpansionSetCode("PLC");
         this.getPower().modifyBaseValue(2);
         this.getToughness().modifyBaseValue(2);
diff --git a/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java b/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java
index 91cf8cf3d7..385cf06345 100644
--- a/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java
@@ -27,6 +27,9 @@
  */
 
 package mage.game.permanent.token;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import mage.constants.CardType;
 import mage.MageInt;
 import mage.abilities.keyword.DeathtouchAbility;
@@ -37,10 +40,16 @@ import mage.constants.SubType;
  * @author Saga
  */
 public class DeathtouchRatToken extends TokenImpl {
+    
+    final static private List<String> tokenImageSets = new ArrayList<>();
+    static {
+        tokenImageSets.addAll(Arrays.asList("C17"));
+    }
 
     public DeathtouchRatToken() {
         super("Rat", "1/1 black Rat creature token with deathtouch");
         this.setExpansionSetCodeForImage("C17");
+        availableImageSetCodes = tokenImageSets;
         this.cardType.add(CardType.CREATURE);
         this.color.setBlack(true);
         this.subtype.add(SubType.RAT);
diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonToken.java
index 125243d346..9d6473f30b 100644
--- a/Mage/src/main/java/mage/game/permanent/token/DragonToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/DragonToken.java
@@ -45,7 +45,7 @@ public class DragonToken extends TokenImpl {
     final static private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("DTK", "MMA", "ALA", "MM3"));
+        tokenImageSets.addAll(Arrays.asList("DTK", "MMA", "ALA", "MM3", "C17"));
     }
 
     public DragonToken() {
diff --git a/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java b/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java
index fb84b3ddac..ac8b587e67 100644
--- a/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java
@@ -27,6 +27,9 @@
  */
 package mage.game.permanent.token;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.MageInt;
@@ -37,8 +40,15 @@ import mage.MageInt;
  */
 public class EdgarMarkovToken extends TokenImpl {
 
+    final static private List<String> tokenImageSets = new ArrayList<>();
+    static {
+        tokenImageSets.addAll(Arrays.asList("C17"));
+    }
+
     public EdgarMarkovToken() {
         super("Vampire", "1/1 black Vampire creature token");
+        availableImageSetCodes = tokenImageSets;
+        setExpansionSetCodeForImage("C17");
         cardType.add(CardType.CREATURE);
         color.setBlack(true);
         subtype.add(SubType.VAMPIRE);
diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java
index 0060d39336..9cb67ede91 100644
--- a/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java
@@ -49,7 +49,7 @@ public class EldraziSpawnToken extends TokenImpl {
     final static private List<String> tokenImageSets = new ArrayList<>();
 
     static {
-        tokenImageSets.addAll(Arrays.asList("ROE", "MM2", "DDP"));
+        tokenImageSets.addAll(Arrays.asList("ROE", "MM2", "DDP", "C17"));
     }
 
     public EldraziSpawnToken() {
@@ -62,8 +62,8 @@ public class EldraziSpawnToken extends TokenImpl {
         addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(1), new SacrificeSourceCost()));
 
         availableImageSetCodes = tokenImageSets;
-        // Get one of the three possible token images
-        this.setTokenType(RandomUtil.nextInt(3) + 1);
+        // Get one of the four possible token images
+        this.setTokenType(RandomUtil.nextInt(4) + 1);
     }
 
     public EldraziSpawnToken(final EldraziSpawnToken token) {
@@ -73,4 +73,4 @@ public class EldraziSpawnToken extends TokenImpl {
     public EldraziSpawnToken copy() {
         return new EldraziSpawnToken(this);
     }
-}
\ No newline at end of file
+}
diff --git a/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java
index b2a74140ff..73c4fe7a90 100644
--- a/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java
@@ -27,6 +27,9 @@
  */
 package mage.game.permanent.token;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.MageInt;
@@ -37,9 +40,16 @@ import mage.abilities.keyword.FlyingAbility;
  * @author spjspj
  */
 public class UtvaraHellkiteDragonToken extends TokenImpl {
+    
+    final static private List<String> tokenImageSets = new ArrayList<>();
+    static {
+        tokenImageSets.addAll(Arrays.asList("C17"));
+    }
 
     public UtvaraHellkiteDragonToken() {
         super("Dragon", "6/6 red Dragon creature token with flying");
+        availableImageSetCodes = tokenImageSets;
+        setExpansionSetCodeForImage("C17");
         cardType.add(CardType.CREATURE);
         color.setRed(true);
         subtype.add(SubType.DRAGON);
diff --git a/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java
index eeb7623d96..2db41d82e3 100644
--- a/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java
@@ -27,6 +27,9 @@
  */
 package mage.game.permanent.token;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.MageInt;
@@ -38,8 +41,17 @@ import mage.abilities.keyword.FlyingAbility;
  */
 public class WasitoraCatDragonToken extends TokenImpl {
 
+    final static private List<String> tokenImageSets = new ArrayList<>();
+
+    static {
+        tokenImageSets.addAll(Arrays.asList("C17"));
+    }
+    
     public WasitoraCatDragonToken() {
         super("Cat Dragon", "3/3 black, red, and green Cat Dragon creature token with flying");
+        
+        availableImageSetCodes = tokenImageSets;
+        setOriginalExpansionSetCode("C17");
 
         cardType.add(CardType.CREATURE);
         this.subtype.add(SubType.CAT);