diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt
index 7098ae0232..9ec6a72ed4 100644
--- a/Mage.Client/src/main/resources/card-pictures-tok.txt
+++ b/Mage.Client/src/main/resources/card-pictures-tok.txt
@@ -1013,20 +1013,6 @@
 |Generate|TOK:THS|Soldier|2||SoldierToken|
 |Generate|TOK:THS|Soldier|3||AkroanSoldierToken|
 |Generate|TOK:TOR|Squirrel|||SquirrelToken|
-|Generate|TOK:TSP|Assembly-Worker|||AssembleWorkerToken|
-|Generate|TOK:TSP|Bat|||SengirNosferatuBatToken|
-|Generate|TOK:TSP|Citizen|||CitizenToken|
-|Generate|TOK:TSP|Elephant|||ElephantToken|
-|Generate|TOK:TSP|Goblin|||GoblinToken|
-|Generate|TOK:TSP|Griffin|||GriffinToken|
-|Generate|TOK:TSP|Kobold|||ProsshKoboldToken|
-|Generate|TOK:TSP|Pegasus|||PegasusToken|
-|Generate|TOK:TSP|Saproling|||SaprolingToken|
-|Generate|TOK:TSP|Serf|||SerfToken|
-|Generate|TOK:TSP|Spider|||PenumbraSpiderToken|
-|Generate|TOK:TSP|Thrull|||ThrullToken|
-|Generate|TOK:TSP|Triskelavite|||TriskelaviteToken|
-|Generate|TOK:TSP|Wurm|||WurmCallingWurmToken|
 |Generate|TOK:UDS|Goblin|||GoblinToken|
 |Generate|TOK:ULG|Ape|||PongifyApeToken|
 |Generate|TOK:ULG|Skeleton|||SkeletonRegenerateToken|
diff --git a/Mage/src/main/java/mage/game/permanent/token/CitizenToken.java b/Mage/src/main/java/mage/game/permanent/token/CitizenToken.java
index a46541ed98..be7ee81d83 100644
--- a/Mage/src/main/java/mage/game/permanent/token/CitizenToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/CitizenToken.java
@@ -6,6 +6,8 @@ import mage.MageInt;
 import mage.constants.CardType;
 import mage.constants.SubType;
 
+import java.util.Arrays;
+
 /**
  *
  * @author Quercitron
@@ -20,6 +22,8 @@ public final class CitizenToken extends TokenImpl {
         subtype.add(SubType.CITIZEN);
         power = new MageInt(1);
         toughness = new MageInt(1);
+
+        availableImageSetCodes = Arrays.asList("UMA");
     }
 
     public CitizenToken(final CitizenToken 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 ca32b24162..d228bdbf0c 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", "CNS", "GVL", "DDD",
-                "EMA", "INV", "JUD", "MM2", "ODY", "TSP", "VMA", "WWK", "MH1", "CMR", "C21", "MIC", "NEC", "2XM", "NCC", "MM3", "DDS");
+                "EMA", "INV", "JUD", "MM2", "ODY", "VMA", "WWK", "MH1", "CMR", "C21", "MIC", "NEC", "2XM", "NCC", "MM3", "DDS");
     }
 
     public ElephantToken(final ElephantToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java b/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java
index 3996699ab5..cc8f969f99 100644
--- a/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/GriffinToken.java
@@ -23,7 +23,7 @@ public final class GriffinToken extends TokenImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
 
-        availableImageSetCodes = Arrays.asList("DDH", "DDL", "TSP", "M21", "TSR");
+        availableImageSetCodes = Arrays.asList("DDH", "DDL", "M21", "TSR");
     }
 
     public GriffinToken(final GriffinToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/PegasusToken.java b/Mage/src/main/java/mage/game/permanent/token/PegasusToken.java
index ecf03841aa..64a485f579 100644
--- a/Mage/src/main/java/mage/game/permanent/token/PegasusToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/PegasusToken.java
@@ -22,7 +22,7 @@ public final class PegasusToken extends TokenImpl {
 
         addAbility(FlyingAbility.getInstance());
 
-        availableImageSetCodes = Arrays.asList("C14", "C19", "TSP", "THB", "KHC", "CLB");
+        availableImageSetCodes = Arrays.asList("C14", "C19", "THB", "KHC", "CLB");
     }
 
     public PegasusToken(final PegasusToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/PenumbraSpiderToken.java b/Mage/src/main/java/mage/game/permanent/token/PenumbraSpiderToken.java
index bf7fddf7ab..a3e08fd758 100644
--- a/Mage/src/main/java/mage/game/permanent/token/PenumbraSpiderToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/PenumbraSpiderToken.java
@@ -24,7 +24,7 @@ public final class PenumbraSpiderToken extends TokenImpl {
 
         addAbility(ReachAbility.getInstance());
 
-        availableImageSetCodes = Arrays.asList("MMA", "PC2", "TSP", "TSR", "PCA", "MM3");
+        availableImageSetCodes = Arrays.asList("MMA", "PC2", "TSR", "PCA", "MM3");
     }
 
     public PenumbraSpiderToken(final PenumbraSpiderToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java b/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java
index 23662c07a3..c5c487f5bd 100644
--- a/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java
@@ -44,7 +44,7 @@ public final class SengirNosferatuBatToken extends TokenImpl {
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);
 
-        availableImageSetCodes = Arrays.asList("TSP", "TSR");
+        availableImageSetCodes = Arrays.asList("TSR");
     }
 
     public SengirNosferatuBatToken(final SengirNosferatuBatToken token) {