diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt
index 5ba4ee8863a..068eead09fd 100644
--- a/Mage.Client/src/main/resources/card-pictures-tok.txt
+++ b/Mage.Client/src/main/resources/card-pictures-tok.txt
@@ -373,7 +373,7 @@
 |Generate|TOK:C16|Worm||
 |Generate|TOK:C16|Zombie||
 |Generate|TOK:C17|Bat||
-|Generate|TOK:C17|Cat||
+|Generate|TOK:C17|Cat|||CatToken|
 |Generate|TOK:C17|Cat Dragon|||WasitoraCatDragonToken|
 |Generate|TOK:C17|Cat Warrior||
 |Generate|TOK:C17|Dragon|1||DragonToken|
diff --git a/Mage/src/main/java/mage/game/permanent/token/BeastToken.java b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java
index 8e3a85a3bb3..b4452e1c246 100644
--- a/Mage/src/main/java/mage/game/permanent/token/BeastToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java
@@ -4,21 +4,13 @@ import mage.MageInt;
 import mage.constants.CardType;
 import mage.constants.SubType;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 
 /**
  * @author BetaSteward_at_googlemail.com
  */
 public final class BeastToken extends TokenImpl {
 
-    static final private List<String> tokenImageSets = new ArrayList<>();
-
-    static {
-        tokenImageSets.addAll(Arrays.asList("C14", "LRW", "M15", "M14", "DDL", "M13", "M12", "DD3GVL", "NPH", "M11", "M10", "EVE", "MM3", "CMA", "E01", "C19", "IKO"));
-    }
-
     public BeastToken() {
         this(null, 0);
     }
@@ -29,7 +21,6 @@ public final class BeastToken extends TokenImpl {
 
     public BeastToken(String setCode, int tokenType) {
         super("Beast", "3/3 green Beast creature token");
-        availableImageSetCodes = tokenImageSets;
         setOriginalExpansionSetCode(setCode);
         cardType.add(CardType.CREATURE);
         color.setGreen(true);
@@ -37,11 +28,13 @@ public final class BeastToken extends TokenImpl {
         power = new MageInt(3);
         toughness = new MageInt(3);
 
+        availableImageSetCodes = Arrays.asList("C14", "LRW", "M15", "M14", "DDL", "M13", "M12", "DD3GVL", "NPH", "M11", "M10", "EVE", "MM3", "CMA", "E01", "C19", "IKO");
     }
 
     @Override
     public void setExpansionSetCodeForImage(String code) {
         super.setExpansionSetCodeForImage(code);
+
         if (getOriginalExpansionSetCode().equals("M15")) {
             this.setTokenType(2);
         }
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 bfc82b39696..7848d6cff87 100644
--- a/Mage/src/main/java/mage/game/permanent/token/CatToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/CatToken.java
@@ -1,43 +1,25 @@
-
-
 package mage.game.permanent.token;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import mage.MageInt;
 import mage.constants.CardType;
 import mage.constants.SubType;
 
+import java.util.Arrays;
+
 /**
- *
  * @author LoneFox
  */
 public final class CatToken extends TokenImpl {
 
-    static final private List<String> tokenImageSets = new ArrayList<>();
-
-    static {
-        tokenImageSets.addAll(Arrays.asList("SOM", "M13", "M14", "C14", "C15", "C17"));
-    }
-
     public CatToken() {
-        this(null, 0);
-    }
-
-    public CatToken(String setCode) {
-        this(setCode, 0);
-    }
-
-    public CatToken(String setCode, int tokenType) {
         super("Cat", "2/2 white Cat creature token");
-        availableImageSetCodes = tokenImageSets;
-        setOriginalExpansionSetCode(setCode);
         cardType.add(CardType.CREATURE);
         color.setWhite(true);
         subtype.add(SubType.CAT);
         power = new MageInt(2);
         toughness = new MageInt(2);
+
+        availableImageSetCodes = Arrays.asList("MBP", "C14", "C15", "C17", "C18", "M13", "M14", "MBS", "SOM");
     }
 
     public CatToken(final CatToken token) {
@@ -47,5 +29,4 @@ public final class CatToken extends TokenImpl {
     public CatToken copy() {
         return new CatToken(this);
     }
-    
 }
diff --git a/Mage/src/main/java/mage/game/permanent/token/CatToken2.java b/Mage/src/main/java/mage/game/permanent/token/CatToken2.java
index f751d049e08..3e9ce3a75d5 100644
--- a/Mage/src/main/java/mage/game/permanent/token/CatToken2.java
+++ b/Mage/src/main/java/mage/game/permanent/token/CatToken2.java
@@ -1,5 +1,3 @@
-
-
 package mage.game.permanent.token;
 
 import mage.MageInt;
@@ -7,26 +5,25 @@ import mage.abilities.keyword.LifelinkAbility;
 import mage.constants.CardType;
 import mage.constants.SubType;
 
+import java.util.Arrays;
+
 /**
- *
  * @author fireshoes
  */
 public final class CatToken2 extends TokenImpl {
 
     public CatToken2() {
-        this((String)null);
-    }
-    
-    public CatToken2(String setCode) {
         super("Cat", "1/1 white Cat creature token with lifelink");
-        setOriginalExpansionSetCode("AKH");
         cardType.add(CardType.CREATURE);
         color.setWhite(true);
         subtype.add(SubType.CAT);
         power = new MageInt(1);
         toughness = new MageInt(1);
         addAbility(LifelinkAbility.getInstance());
+
+        availableImageSetCodes = Arrays.asList("AKH", "M19", "IKO");
     }
+
     public CatToken2(final CatToken2 token) {
         super(token);
     }
@@ -34,5 +31,5 @@ public final class CatToken2 extends TokenImpl {
     public CatToken2 copy() {
         return new CatToken2(this);
     }
-    
+
 }
diff --git a/Mage/src/main/java/mage/game/permanent/token/ElementalTokenWithHaste.java b/Mage/src/main/java/mage/game/permanent/token/ElementalTokenWithHaste.java
index f916272c557..b01be1d5489 100644
--- a/Mage/src/main/java/mage/game/permanent/token/ElementalTokenWithHaste.java
+++ b/Mage/src/main/java/mage/game/permanent/token/ElementalTokenWithHaste.java
@@ -5,24 +5,15 @@ import mage.abilities.keyword.HasteAbility;
 import mage.constants.CardType;
 import mage.constants.SubType;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 
 /**
  * @author magenoxx
  */
 public final class ElementalTokenWithHaste extends TokenImpl {
 
-    static final private List<String> tokenImageSets = new ArrayList<>();
-
-    static {
-        tokenImageSets.addAll(Arrays.asList("C20", "MBP", "OGW", "SOK", "MRD"));
-    }
-
     public ElementalTokenWithHaste() {
         super("Elemental", "3/1 red Elemental creature token with haste");
-        availableImageSetCodes = tokenImageSets;
         cardType.add(CardType.CREATURE);
         color.setRed(true);
         subtype.add(SubType.ELEMENTAL);
@@ -30,6 +21,21 @@ public final class ElementalTokenWithHaste extends TokenImpl {
         toughness = new MageInt(1);
         this.addAbility(HasteAbility.getInstance());
 
+        availableImageSetCodes = Arrays.asList("C20", "MBP", "OGW", "SOK", "MRD");
+    }
+
+    public ElementalTokenWithHaste(final ElementalTokenWithHaste token) {
+        super(token);
+    }
+
+    public ElementalTokenWithHaste copy() {
+        return new ElementalTokenWithHaste(this);
+    }
+
+    @Override
+    public void setExpansionSetCodeForImage(String code) {
+        super.setExpansionSetCodeForImage(code);
+
         if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("OGW")) {
             setTokenType(2);
         }
@@ -40,12 +46,4 @@ public final class ElementalTokenWithHaste extends TokenImpl {
             setTokenType(1);
         }
     }
-
-    public ElementalTokenWithHaste(final ElementalTokenWithHaste token) {
-        super(token);
-    }
-
-    public ElementalTokenWithHaste copy() {
-        return new ElementalTokenWithHaste(this);
-    }
 }