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 a62e9919ed..860de1041e 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
@@ -1321,6 +1321,16 @@ public class ScryfallImageSupportTokens {
             put ("DDI/Emblem Koth of the Hammer", "https://api.scryfall.com/cards/tddi/2/en?format=image");
             put ("DDI/Emblem Venser, the Sojourner", "https://api.scryfall.com/cards/tddi/1/en?format=image");
 
+            // AVR
+            put ("AVR/Angel", "https://api.scryfall.com/cards/tavr/1/en?format=image");
+            put ("AVR/Demon", "https://api.scryfall.com/cards/tavr/5/en?format=image");
+            put ("AVR/Human/1", "https://api.scryfall.com/cards/tavr/7/en?format=image");
+            put ("AVR/Human/2", "https://api.scryfall.com/cards/tavr/2/en?format=image");
+            put ("AVR/Spirit/1", "https://api.scryfall.com/cards/tavr/4/en?format=image");
+            put ("AVR/Spirit/2", "https://api.scryfall.com/cards/tavr/3/en?format=image");
+            put ("AVR/Emblem Tamiyo, the Moon Sage", "https://api.scryfall.com/cards/tavr/8/en?format=image");
+            put ("AVR/Zombie", "https://api.scryfall.com/cards/tavr/6/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 21f1275192..507a092818 100644
--- a/Mage.Client/src/main/resources/card-pictures-tok.txt
+++ b/Mage.Client/src/main/resources/card-pictures-tok.txt
@@ -262,10 +262,10 @@
 |Generate|TOK:ATQ|Tetravite|||TetraviteToken|
 |Generate|TOK:AVR|Angel|||AngelToken|
 |Generate|TOK:AVR|Demon|||DemonToken|
-|Generate|TOK:AVR|Human|1||HumanToken|
-|Generate|TOK:AVR|Human|2||RedHumanToken|
-|Generate|TOK:AVR|Spirit|1||SpiritWhiteToken|
-|Generate|TOK:AVR|Spirit|2||Spirit|
+|Generate|TOK:AVR|Human|1||RedHumanToken|
+|Generate|TOK:AVR|Human|2||HumanToken|
+|Generate|TOK:AVR|Spirit|1||SpiritBlueToken|
+|Generate|TOK:AVR|Spirit|2||SpiritWhiteToken|
 |Generate|TOK:AVR|Zombie|||ZombieToken|
 |Generate|TOK:BFZ|Dragon|||DragonToken2|
 |Generate|TOK:BFZ|Eldrazi Scion|1||EldraziScionToken|
diff --git a/Mage/src/main/java/mage/game/permanent/token/HumanToken.java b/Mage/src/main/java/mage/game/permanent/token/HumanToken.java
index a179a48eb8..85300e4cc2 100644
--- a/Mage/src/main/java/mage/game/permanent/token/HumanToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/HumanToken.java
@@ -38,5 +38,8 @@ public final class HumanToken extends TokenImpl {
         if (getOriginalExpansionSetCode().equals("VOW")) {
             this.setTokenType(2);
         }
+        if (getOriginalExpansionSetCode().equals("AVR")) {
+            this.setTokenType(2);
+        }
     }
 }
diff --git a/Mage/src/main/java/mage/game/permanent/token/RedHumanToken.java b/Mage/src/main/java/mage/game/permanent/token/RedHumanToken.java
index 264b43d91c..c0e2977f3a 100644
--- a/Mage/src/main/java/mage/game/permanent/token/RedHumanToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/RedHumanToken.java
@@ -31,7 +31,7 @@ public final class RedHumanToken extends TokenImpl {
         super.setExpansionSetCodeForImage(code);
 
         if (getOriginalExpansionSetCode().equals("AVR")) {
-            this.setTokenType(2);
+            this.setTokenType(1);
         }
     }
 
diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritBlueToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritBlueToken.java
index 836d21d1ef..42c8f2b324 100644
--- a/Mage/src/main/java/mage/game/permanent/token/SpiritBlueToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/SpiritBlueToken.java
@@ -6,6 +6,8 @@ import mage.constants.SubType;
 import mage.MageInt;
 import mage.abilities.keyword.FlyingAbility;
 
+import java.util.Arrays;
+
 /**
  *
  * @author spjspj
@@ -21,6 +23,16 @@ public final class SpiritBlueToken extends TokenImpl {
         toughness = new MageInt(1);
         setTokenType(2);
         addAbility(FlyingAbility.getInstance());
+
+        availableImageSetCodes = Arrays.asList("AVR");
+    }
+
+    @Override
+    public void setExpansionSetCodeForImage(String code) {
+        super.setExpansionSetCodeForImage(code);
+        if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("AVR")) {
+            setTokenType(1);
+        }
     }
 
     public SpiritBlueToken(final SpiritBlueToken token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java b/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java
index b47419787a..6c0df4f0d3 100644
--- a/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java
@@ -31,7 +31,7 @@ public final class SpiritWhiteToken extends TokenImpl {
     public void setExpansionSetCodeForImage(String code) {
         super.setExpansionSetCodeForImage(code);
         if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("AVR")) {
-            setTokenType(1);
+            setTokenType(2);
         }
         if (getOriginalExpansionSetCode() != null && getOriginalExpansionSetCode().equals("C16")) {
             setTokenType(2);
diff --git a/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java
index ceba4121bc..bbdc0118be 100644
--- a/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/ZombieToken.java
@@ -31,7 +31,7 @@ public final class ZombieToken extends TokenImpl {
                 "M20", "C19", "C20", "THB",
                 "M21", "CMR", "C21", "MH2",
                 "AFR", "MIC", "VOW", "UMA",
-                "NCC", "MED", "BBD", "M19", "CM2", "PCA");
+                "NCC", "MED", "BBD", "M19", "CM2", "PCA", "AVR");
     }
 
     @Override