diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java
index f248782e51f..c37de75285a 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportTokens.java
@@ -1298,6 +1298,20 @@ public class ScryfallImageSupportTokens {
             put ("DDH/Griffin", "https://api.scryfall.com/cards/tddh/1/en?format=image");
             put ("DDH/Saproling", "https://api.scryfall.com/cards/tddh/2/en?format=image");
 
+            // ISD
+            put ("ISD/Angel", "https://api.scryfall.com/cards/tisd/1/en?format=image");
+            put ("ISD/Demon", "https://api.scryfall.com/cards/tisd/4/en?format=image");
+            put ("ISD/Homunculus", "https://api.scryfall.com/cards/tisd/3/en?format=image");
+            put ("ISD/Ooze", "https://api.scryfall.com/cards/tisd/10/en?format=image");
+            put ("ISD/Spider", "https://api.scryfall.com/cards/tisd/11/en?format=image");
+            put ("ISD/Spirit", "https://api.scryfall.com/cards/tisd/2/en?format=image");
+            put ("ISD/Vampire", "https://api.scryfall.com/cards/tisd/5/en?format=image");
+            put ("ISD/Wolf/1", "https://api.scryfall.com/cards/tisd/6/en?format=image");
+            put ("ISD/Wolf/2", "https://api.scryfall.com/cards/tisd/12/en?format=image");
+            put ("ISD/Zombie/1", "https://api.scryfall.com/cards/tisd/7/en?format=image");
+            put ("ISD/Zombie/2", "https://api.scryfall.com/cards/tisd/8/en?format=image");
+            put ("ISD/Zombie/3", "https://api.scryfall.com/cards/tisd/9/en?format=image");
+
             // generate supported sets
             supportedSets.clear();
             for (String cardName : this.keySet()) {
diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt
index 000abc80b86..ecdef761df9 100644
--- a/Mage.Client/src/main/resources/card-pictures-tok.txt
+++ b/Mage.Client/src/main/resources/card-pictures-tok.txt
@@ -716,7 +716,7 @@
 |Generate|TOK:ISD|Spider|||SpiderToken|
 |Generate|TOK:ISD|Spirit|||SpiritWhiteToken|
 |Generate|TOK:ISD|Vampire|||VampireToken|
-|Generate|TOK:ISD|Wolf|1||WolfToken|
+|Generate|TOK:ISD|Wolf|1||WolfTokenWithDeathtouch|
 |Generate|TOK:ISD|Wolf|2||WolfToken|
 |Generate|TOK:ISD|Zombie|1||ZombieToken|
 |Generate|TOK:ISD|Zombie|2||ZombieToken|
diff --git a/Mage/src/main/java/mage/game/permanent/token/StitchersApprenticeHomunculusToken.java b/Mage/src/main/java/mage/game/permanent/token/StitchersApprenticeHomunculusToken.java
index 387e3d0f287..4780b5e1a01 100644
--- a/Mage/src/main/java/mage/game/permanent/token/StitchersApprenticeHomunculusToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/StitchersApprenticeHomunculusToken.java
@@ -21,7 +21,7 @@ public final class StitchersApprenticeHomunculusToken extends TokenImpl {
         power = new MageInt(2);
         toughness = new MageInt(2);
 
-        availableImageSetCodes = Arrays.asList("UMA");
+        availableImageSetCodes = Arrays.asList("ISD", "UMA");
     }
 
     public StitchersApprenticeHomunculusToken(final StitchersApprenticeHomunculusToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/VampireToken.java b/Mage/src/main/java/mage/game/permanent/token/VampireToken.java
index 936357d1756..78067d197b2 100644
--- a/Mage/src/main/java/mage/game/permanent/token/VampireToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/VampireToken.java
@@ -6,6 +6,8 @@ import mage.constants.SubType;
 import mage.MageInt;
 import mage.abilities.keyword.FlyingAbility;
 
+import java.util.Arrays;
+
 /**
  *
  * @author spjspj
@@ -20,6 +22,8 @@ public final class VampireToken extends TokenImpl {
         power = new MageInt(2);
         toughness = new MageInt(2);
         addAbility(FlyingAbility.getInstance());
+
+        availableImageSetCodes = Arrays.asList("ISD", "KTK");
     }
 
     public VampireToken(final VampireToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/WolfToken.java b/Mage/src/main/java/mage/game/permanent/token/WolfToken.java
index 99aae34257b..5e6d3d027ef 100644
--- a/Mage/src/main/java/mage/game/permanent/token/WolfToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/WolfToken.java
@@ -31,7 +31,7 @@ public final class WolfToken extends TokenImpl {
         super.setExpansionSetCodeForImage(code);
 
         if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ISD")) {
-            this.setTokenType(RandomUtil.nextInt(2) + 1); // 2 images
+            this.setTokenType(2);
         }
         if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("CMA")) {
             this.setTokenType(RandomUtil.nextInt(2) + 1); // 2 images
diff --git a/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java b/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java
index a9202f14f28..9457a47c04b 100644
--- a/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java
+++ b/Mage/src/main/java/mage/game/permanent/token/WolfTokenWithDeathtouch.java
@@ -6,6 +6,9 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.MageInt;
 import mage.abilities.keyword.DeathtouchAbility;
+import mage.util.RandomUtil;
+
+import java.util.Arrays;
 
 /**
  *
@@ -22,6 +25,17 @@ public final class WolfTokenWithDeathtouch extends TokenImpl {
         toughness = new MageInt(1);
 
         addAbility(DeathtouchAbility.getInstance());
+
+        availableImageSetCodes = Arrays.asList("ISD");
+    }
+
+    @Override
+    public void setExpansionSetCodeForImage(String code) {
+        super.setExpansionSetCodeForImage(code);
+
+        if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("ISD")) {
+            this.setTokenType(1);
+        }
     }
 
     public WolfTokenWithDeathtouch(final WolfTokenWithDeathtouch token) {