diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt
index c0e6bf5e061..e4ea3b9f9f4 100644
--- a/Mage.Client/src/main/resources/card-pictures-tok.txt
+++ b/Mage.Client/src/main/resources/card-pictures-tok.txt
@@ -434,7 +434,6 @@
 |Generate|TOK:CHK|Illusion|||MelokuTheCloudedMirrorToken|
 |Generate|TOK:CHK|Rat|||RatToken|
 |Generate|TOK:CHK|Snake|||SnakeToken|
-|Generate|TOK:CHK|Spirit|||SpiritToken|
 |Generate|TOK:CHR|Snake|||SerpentGeneratorSnakeToken|
 |Generate|TOK:CMA|Beast|1||BeastToken|
 |Generate|TOK:CMA|Beast|2||BeastToken2|
@@ -629,7 +628,6 @@
 |Generate|TOK:EVG|Goblin|||GoblinToken|
 |Generate|TOK:EXO|Pegasus|||PegasusToken|
 |Generate|TOK:EXO|Thopter|||ThopterColorlessToken|
-|Generate|TOK:EXP|Spirit|||SpiritToken|
 |Generate|TOK:FEM|Camarid|||CamaridToken|
 |Generate|TOK:FEM|Citizen|||CitizenToken|
 |Generate|TOK:FEM|Goblin|||GoblinToken|
@@ -1021,7 +1019,6 @@
 |Generate|TOK:SOI|Zombie|||ZombieToken|
 |Generate|TOK:SOK|Elemental|||ElementalTokenWithHaste|
 |Generate|TOK:SOK|Snake|||SnakeToken|
-|Generate|TOK:SOK|Spirit|||SpiritToken|
 |Generate|TOK:SOK|Urami|||UramiToken|
 |Generate|TOK:SOK|Warrior|||RallyTheHordeWarriorToken|
 |Generate|TOK:SOM|Cat|||CatToken|
@@ -1091,7 +1088,6 @@
 |Generate|TOK:UST|Storm Crow|||StormCrowToken|
 |Generate|TOK:V10|Wolf|||WolfToken|
 |Generate|TOK:V11|Faerie Rogue|||OonaQueenFaerieToken|
-|Generate|TOK:V12|Spirit|||SpiritToken|
 |Generate|TOK:VIS|Butterfly|||ButterflyToken|
 |Generate|TOK:VIS|Insect|||InsectToken|
 |Generate|TOK:VIS|Prism|||PrismToken|
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 0c419728c51..7a1e351f103 100644
--- a/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/SpiritToken.java
@@ -18,7 +18,7 @@ public final class SpiritToken extends TokenImpl {
         power = new MageInt(1);
         toughness = new MageInt(1);
 
-        availableImageSetCodes = Arrays.asList("C16", "CHK", "EMA", "EXP", "NEO", "SOK", "V12", "VOC", "A25");
+        availableImageSetCodes = Arrays.asList("C16", "EMA", "NEO", "VOC", "A25");
     }
 
     @Override
@@ -40,6 +40,10 @@ public final class SpiritToken extends TokenImpl {
         if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("A25")) {
             setTokenType(1);
         }
+
+        if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("VOC")) {
+            setTokenType(1);
+        }
     }
 
     public SpiritToken(final SpiritToken token) {