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 08d2b216d3..4b3fa78c32 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
@@ -1368,6 +1368,19 @@ public class ScryfallImageSupportTokens {
             put ("DDL/Beast", "https://api.scryfall.com/cards/tddl/2/en?format=image");
             put ("DDL/Griffin", "https://api.scryfall.com/cards/tddl/1/en?format=image");
 
+            // THS
+            put ("THS/Bird", "https://api.scryfall.com/cards/tths/4/en?format=image");
+            put ("THS/Boar", "https://api.scryfall.com/cards/tths/8/en?format=image");
+            put ("THS/Cleric", "https://api.scryfall.com/cards/tths/1/en?format=image");
+            put ("THS/Elemental", "https://api.scryfall.com/cards/tths/5/en?format=image");
+            put ("THS/Emblem Elspeth, Sun's Champion", "https://api.scryfall.com/cards/tths/11/en?format=image");
+            put ("THS/Golem", "https://api.scryfall.com/cards/tths/10/en?format=image");
+            put ("THS/Harpy", "https://api.scryfall.com/cards/tths/6/en?format=image");
+            put ("THS/Satyr", "https://api.scryfall.com/cards/tths/9/en?format=image");
+            put ("THS/Soldier/1", "https://api.scryfall.com/cards/tths/2/en?format=image");
+            put ("THS/Soldier/2", "https://api.scryfall.com/cards/tths/3/en?format=image");
+            put ("THS/Soldier/3", "https://api.scryfall.com/cards/tths/7/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 5830fefb37..0d91006302 100644
--- a/Mage.Client/src/main/resources/card-pictures-tok.txt
+++ b/Mage.Client/src/main/resources/card-pictures-tok.txt
@@ -83,7 +83,7 @@
 |Generate|EMBLEM!:MED|Emblem Vraska|||VraskaGolgariQueenEmblem|
 |Generate|EMBLEM!:BBD|Emblem Rowan Kenrith|||RowanKenrithEmblem|
 |Generate|EMBLEM!:BBD|Emblem Will Kenrith|||WillKenrithEmblem|
-|Generate|EMBLEM:THS|Elspeth, Suns Champion||Emblem Elspeth|ElspethSunsChampionEmblem|
+|Generate|EMBLEM:THS|Elspeth, Sun's Champion||Emblem Elspeth|ElspethSunsChampionEmblem|
 |Generate|EMBLEM:AVR|Tamiyo, the Moon Sage||Emblem Tamiyo|TamiyoTheMoonSageEmblem|
 |Generate|EMBLEM:BNG|Kiora, the Crashing Wave||Emblem Kiora|KioraEmblem|
 |Generate|EMBLEM:DDI|Koth of the Hammer||Emblem Koth|KothOfTheHammerEmblem|
diff --git a/Mage/src/main/java/mage/game/permanent/token/MasterOfWavesElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/MasterOfWavesElementalToken.java
index 7a05eb10de..09e6098d19 100644
--- a/Mage/src/main/java/mage/game/permanent/token/MasterOfWavesElementalToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/MasterOfWavesElementalToken.java
@@ -5,6 +5,8 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.MageInt;
 
+import java.util.Arrays;
+
 /**
  *
  * @author spjspj
@@ -20,6 +22,8 @@ public final class MasterOfWavesElementalToken extends TokenImpl {
 
         this.power = new MageInt(1);
         this.toughness = new MageInt(0);
+
+        availableImageSetCodes = Arrays.asList("THS", "DDT");
     }
 
     public MasterOfWavesElementalToken(final MasterOfWavesElementalToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/SwanSongBirdToken.java b/Mage/src/main/java/mage/game/permanent/token/SwanSongBirdToken.java
index 7e98535d22..7c2214cabc 100644
--- a/Mage/src/main/java/mage/game/permanent/token/SwanSongBirdToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/SwanSongBirdToken.java
@@ -6,6 +6,8 @@ import mage.constants.SubType;
 import mage.MageInt;
 import mage.abilities.keyword.FlyingAbility;
 
+import java.util.Arrays;
+
 /**
  *
  * @author spjspj
@@ -17,12 +19,20 @@ public final class SwanSongBirdToken extends TokenImpl {
         cardType.add(CardType.CREATURE);
         color.setBlue(true);
         subtype.add(SubType.BIRD);
-        if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C16")) {
-            setTokenType(1);
-        }
         power = new MageInt(2);
         toughness = new MageInt(2);
         this.addAbility(FlyingAbility.getInstance());
+
+        availableImageSetCodes = Arrays.asList("THS", "C16");
+    }
+
+    @Override
+    public void setExpansionSetCodeForImage(String code) {
+        super.setExpansionSetCodeForImage(code);
+
+        if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C16")) {
+            setTokenType(1);
+        }
     }
 
     public SwanSongBirdToken(final SwanSongBirdToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/XenagosSatyrToken.java b/Mage/src/main/java/mage/game/permanent/token/XenagosSatyrToken.java
index af90ba5d06..aeb72ef194 100644
--- a/Mage/src/main/java/mage/game/permanent/token/XenagosSatyrToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/XenagosSatyrToken.java
@@ -6,6 +6,8 @@ import mage.constants.SubType;
 import mage.MageInt;
 import mage.abilities.keyword.HasteAbility;
 
+import java.util.Arrays;
+
 /**
  *
  * @author spjspj
@@ -22,6 +24,8 @@ public final class XenagosSatyrToken extends TokenImpl {
         toughness = new MageInt(2);
 
         this.addAbility(HasteAbility.getInstance());
+
+        availableImageSetCodes = Arrays.asList("THS");
     }
     public XenagosSatyrToken(final XenagosSatyrToken token) {
         super(token);