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 d54e5507df..d3c0afd4eb 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
@@ -1647,6 +1647,11 @@ public class ScryfallImageSupportTokens {
             put ("GK2/Spirit", "https://api.scryfall.com/cards/tgk2/2/en?format=image");
             put ("GK2/Wurm", "https://api.scryfall.com/cards/tgk2/8/en?format=image");
 
+            // GN2
+            put ("GN2/Dinosaur", "https://api.scryfall.com/cards/tgn2/3/en?format=image");
+            put ("GN2/Dragon/1", "https://api.scryfall.com/cards/tgn2/1/en?format=image");
+            put ("GN2/Dragon/2", "https://api.scryfall.com/cards/tgn2/2/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 2506342c03..9865dd43b5 100644
--- a/Mage.Client/src/main/resources/card-pictures-tok.txt
+++ b/Mage.Client/src/main/resources/card-pictures-tok.txt
@@ -1856,4 +1856,9 @@
 |Generate|TOK:GK2|Ooze|||OozeToken|
 |Generate|TOK:GK2|Saproling|||SaprolingToken|
 |Generate|TOK:GK2|Spirit|||SpiritWhiteToken|
-|Generate|TOK:GK2|Wurm|||WurmToken|
\ No newline at end of file
+|Generate|TOK:GK2|Wurm|||WurmToken|
+
+# GN2
+|Generate|TOK:GN2|Dinosaur|||DinosaurToken|
+|Generate|TOK:GN2|Dragon|1||DragonEggDragonToken|
+|Generate|TOK:GN2|Dragon|2||DragonToken2|
\ No newline at end of file
diff --git a/Mage/src/main/java/mage/game/permanent/token/DinosaurToken.java b/Mage/src/main/java/mage/game/permanent/token/DinosaurToken.java
index bc8e3b2be5..1fda65c4fa 100644
--- a/Mage/src/main/java/mage/game/permanent/token/DinosaurToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/DinosaurToken.java
@@ -6,6 +6,8 @@ import mage.MageInt;
 import mage.abilities.keyword.TrampleAbility;
 import mage.constants.SubType;
 
+import java.util.Arrays;
+
 /**
  *
  * @author TheElk801
@@ -20,6 +22,8 @@ public final class DinosaurToken extends TokenImpl {
         power = new MageInt(3);
         toughness = new MageInt(3);
         addAbility(TrampleAbility.getInstance());
+
+        availableImageSetCodes = Arrays.asList("XLN", "GN2");
     }
 
     public DinosaurToken(final DinosaurToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java b/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java
index 3d4614632d..891a296457 100644
--- a/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/DragonEggDragonToken.java
@@ -28,7 +28,7 @@ public final class DragonEggDragonToken extends TokenImpl {
         this.addAbility(FlyingAbility.getInstance());
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}")));
 
-        availableImageSetCodes = Arrays.asList("C18", "EMA", "M14", "M15", "M19", "CMR", "IMA");
+        availableImageSetCodes = Arrays.asList("C18", "EMA", "M14", "M15", "M19", "CMR", "IMA", "GN2");
     }
 
     public DragonEggDragonToken(final DragonEggDragonToken token) {
@@ -49,5 +49,8 @@ public final class DragonEggDragonToken extends TokenImpl {
         if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("M19")) {
             this.setTokenType(1);
         }
+        if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("GN2")) {
+            this.setTokenType(1);
+        }
     }
 }
diff --git a/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java b/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java
index 7b7301dc48..a332316020 100644
--- a/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java
+++ b/Mage/src/main/java/mage/game/permanent/token/DragonToken2.java
@@ -22,7 +22,7 @@ public final class DragonToken2 extends TokenImpl {
 
         addAbility(FlyingAbility.getInstance());
 
-        availableImageSetCodes = Arrays.asList("10E", "BFZ", "C15", "C19", "CMA", "CMD", "SCG", "WWK", "M19", "KHM", "AFC", "IMA", "PCA", "CN2");
+        availableImageSetCodes = Arrays.asList("10E", "BFZ", "C15", "C19", "CMA", "CMD", "SCG", "WWK", "M19", "KHM", "AFC", "IMA", "PCA", "CN2", "GN2");
     }
 
     public DragonToken2(final DragonToken2 token) {
@@ -43,5 +43,8 @@ public final class DragonToken2 extends TokenImpl {
         if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("IMA")) {
             this.setTokenType(2);
         }
+        if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("GN2")) {
+            this.setTokenType(2);
+        }
     }
 }