diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt
index 0609d4e9eae..5ba4ee8863a 100644
--- a/Mage.Client/src/main/resources/card-pictures-tok.txt
+++ b/Mage.Client/src/main/resources/card-pictures-tok.txt
@@ -1372,7 +1372,7 @@
 # IKO
 |Generate|TOK:IKO|Beast|||BeastToken|
 |Generate|TOK:IKO|Cat Bird|||CatBirdToken|
-|Generate|TOK:IKO|Cat|||CatToken|
+|Generate|TOK:IKO|Cat|||CatToken2|
 |Generate|TOK:IKO|Dinosaur Beast|||DinosaurBeastToken|
 |Generate|TOK:IKO|Dinosaur|||DinosaurHasteToken|
 |Generate|TOK:IKO|Feather|||FeatherToken|
diff --git a/Mage.Sets/src/mage/cards/c/Cubwarden.java b/Mage.Sets/src/mage/cards/c/Cubwarden.java
index 91897e4f145..0d5daa788d5 100644
--- a/Mage.Sets/src/mage/cards/c/Cubwarden.java
+++ b/Mage.Sets/src/mage/cards/c/Cubwarden.java
@@ -9,7 +9,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
-import mage.game.permanent.token.CatToken;
+import mage.game.permanent.token.CatToken2;
 
 import java.util.UUID;
 
@@ -32,7 +32,7 @@ public final class Cubwarden extends CardImpl {
         this.addAbility(LifelinkAbility.getInstance());
 
         // Whenever this creature mutates, create two 1/1 white Cat creature tokens with lifelink.
-        this.addAbility(new MutatesSourceTriggeredAbility(new CreateTokenEffect(new CatToken(), 2)));
+        this.addAbility(new MutatesSourceTriggeredAbility(new CreateTokenEffect(new CatToken2(), 2)));
     }
 
     private Cubwarden(final Cubwarden card) {
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 50727e81da4..8e3a85a3bb3 100644
--- a/Mage/src/main/java/mage/game/permanent/token/BeastToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/BeastToken.java
@@ -16,7 +16,7 @@ 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"));
+        tokenImageSets.addAll(Arrays.asList("C14", "LRW", "M15", "M14", "DDL", "M13", "M12", "DD3GVL", "NPH", "M11", "M10", "EVE", "MM3", "CMA", "E01", "C19", "IKO"));
     }
 
     public BeastToken() {