diff --git a/Mage/src/main/java/mage/game/permanent/token/Shapeshifter32Token.java b/Mage/src/main/java/mage/game/permanent/token/Shapeshifter32Token.java
index 5fa88e40ed..e71bec84e0 100644
--- a/Mage/src/main/java/mage/game/permanent/token/Shapeshifter32Token.java
+++ b/Mage/src/main/java/mage/game/permanent/token/Shapeshifter32Token.java
@@ -30,6 +30,15 @@ public final class Shapeshifter32Token extends TokenImpl {
         addAbility(new ChangelingAbility());
     }
 
+    @Override
+    public void setExpansionSetCodeForImage(String code) {
+        super.setExpansionSetCodeForImage(code);
+
+        if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("CLB")) {
+            this.setTokenType(3);
+        }
+    }
+
     public Shapeshifter32Token(final Shapeshifter32Token token) {
         super(token);
     }
diff --git a/Mage/src/main/java/mage/game/permanent/token/ShapeshifterBlueToken.java b/Mage/src/main/java/mage/game/permanent/token/ShapeshifterBlueToken.java
index 86ca3b8554..b98a3dc4b4 100644
--- a/Mage/src/main/java/mage/game/permanent/token/ShapeshifterBlueToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/ShapeshifterBlueToken.java
@@ -25,6 +25,15 @@ public final class ShapeshifterBlueToken extends TokenImpl {
         availableImageSetCodes = Arrays.asList("KHM", "CLB");
     }
 
+    @Override
+    public void setExpansionSetCodeForImage(String code) {
+        super.setExpansionSetCodeForImage(code);
+
+        if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("CLB")) {
+            this.setTokenType(4);
+        }
+    }
+
     private ShapeshifterBlueToken(final ShapeshifterBlueToken token) {
         super(token);
     }
diff --git a/Mage/src/main/java/mage/game/permanent/token/ShapeshifterToken.java b/Mage/src/main/java/mage/game/permanent/token/ShapeshifterToken.java
index f86b17c459..62b49c9a3b 100644
--- a/Mage/src/main/java/mage/game/permanent/token/ShapeshifterToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/ShapeshifterToken.java
@@ -4,10 +4,7 @@ import mage.MageInt;
 import mage.abilities.keyword.ChangelingAbility;
 import mage.constants.CardType;
 import mage.constants.SubType;
-
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 
 /**
  * @author TheElk801
@@ -26,6 +23,15 @@ public final class ShapeshifterToken extends TokenImpl {
         availableImageSetCodes = Arrays.asList("MH1", "CLB");
     }
 
+    @Override
+    public void setExpansionSetCodeForImage(String code) {
+        super.setExpansionSetCodeForImage(code);
+
+        if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("CLB")) {
+            this.setTokenType(2);
+        }
+    }
+
     public ShapeshifterToken(final ShapeshifterToken token) {
         super(token);
     }