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 0362852cb5b..00f6f136b90 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
@@ -2693,9 +2693,10 @@ public class ScryfallImageSupportTokens {
             put("TDM/Reliquary Dragon", "https://api.scryfall.com/cards/ttdm/15/en?format=image");
             put("TDM/Soldier/1", "https://api.scryfall.com/cards/ttdm/4/en?format=image");
             put("TDM/Soldier/2", "https://api.scryfall.com/cards/ttdm/5/en?format=image");
-            put("TDM/Spirit/1", "https://api.scryfall.com/cards/ttdm/9/en?format=image");
-            put("TDM/Spirit/2", "https://api.scryfall.com/cards/ttdm/6/en?format=image");
-            // TODO: 2/2 and 3/3 Spirit tokens (no relevant cards revealed, token not implemented)
+            put("TDM/Spirit/1", "https://api.scryfall.com/cards/ttdm/9/en?format=image"); // */*
+            put("TDM/Spirit/2", "https://api.scryfall.com/cards/ttdm/6/en?format=image"); // 1/1
+            put("TDM/Spirit/3", "https://api.scryfall.com/cards/ttdm/7/en?format=image"); // 2/2
+            put("TDM/Spirit/4", "https://api.scryfall.com/cards/ttdm/8/en?format=image"); // 3/3
             put("TDM/Treasure", "https://api.scryfall.com/cards/ttdm/16/en?format=image");
             put("TDM/Warrior", "https://api.scryfall.com/cards/ttdm/13/en?format=image");
             put("TDM/Zombie Druid", "https://api.scryfall.com/cards/ttdm/10/en?format=image");
diff --git a/Mage/src/main/java/mage/game/permanent/token/NoFlyingSpiritWhite22Token.java b/Mage/src/main/java/mage/game/permanent/token/NoFlyingSpiritWhite22Token.java
new file mode 100644
index 00000000000..fdb77e4aabc
--- /dev/null
+++ b/Mage/src/main/java/mage/game/permanent/token/NoFlyingSpiritWhite22Token.java
@@ -0,0 +1,29 @@
+package mage.game.permanent.token;
+
+import mage.MageInt;
+import mage.constants.CardType;
+import mage.constants.SubType;
+
+/**
+ * @author muz
+ */
+public final class NoFlyingSpiritWhite22Token extends TokenImpl {
+
+    public NoFlyingSpiritWhite22Token() {
+        super("Spirit Token", "2/2 white Spirit creature token");
+        cardType.add(CardType.CREATURE);
+        subtype.add(SubType.SPIRIT);
+        color.setWhite(true);
+        power = new MageInt(2);
+        toughness = new MageInt(2);
+    }
+
+    private NoFlyingSpiritWhite22Token(final NoFlyingSpiritWhite22Token token) {
+        super(token);
+    }
+
+    @Override
+    public NoFlyingSpiritWhite22Token copy() {
+        return new NoFlyingSpiritWhite22Token(this);
+    }
+}
diff --git a/Mage/src/main/java/mage/game/permanent/token/NoFlyingSpiritWhite33Token.java b/Mage/src/main/java/mage/game/permanent/token/NoFlyingSpiritWhite33Token.java
new file mode 100644
index 00000000000..7af8197fedb
--- /dev/null
+++ b/Mage/src/main/java/mage/game/permanent/token/NoFlyingSpiritWhite33Token.java
@@ -0,0 +1,29 @@
+package mage.game.permanent.token;
+
+import mage.MageInt;
+import mage.constants.CardType;
+import mage.constants.SubType;
+
+/**
+ * @author muz
+ */
+public final class NoFlyingSpiritWhite33Token extends TokenImpl {
+
+    public NoFlyingSpiritWhite33Token() {
+        super("Spirit Token", "3/3 white Spirit creature token");
+        cardType.add(CardType.CREATURE);
+        subtype.add(SubType.SPIRIT);
+        color.setWhite(true);
+        power = new MageInt(3);
+        toughness = new MageInt(3);
+    }
+
+    private NoFlyingSpiritWhite33Token(final NoFlyingSpiritWhite33Token token) {
+        super(token);
+    }
+
+    @Override
+    public NoFlyingSpiritWhite33Token copy() {
+        return new NoFlyingSpiritWhite33Token(this);
+    }
+}
diff --git a/Mage/src/main/resources/tokens-database.txt b/Mage/src/main/resources/tokens-database.txt
index 567a0c00390..914c73bc127 100644
--- a/Mage/src/main/resources/tokens-database.txt
+++ b/Mage/src/main/resources/tokens-database.txt
@@ -2733,8 +2733,8 @@
 |Generate|TOK:TDM|Soldier|2||Soldier22Token|
 |Generate|TOK:TDM|Spirit|1||SpiritXXToken|
 |Generate|TOK:TDM|Spirit|2||NoFlyingSpiritWhite11Token|
-# TODO: 2/2 Spirit (no relevant cards revealed, token not implemented)
-# TODO: 3/3 Spirit (no relevant cards revealed, token not implemented)
+|Generate|TOK:TDM|Spirit|3||NoFlyingSpiritWhite22Token|
+|Generate|TOK:TDM|Spirit|4||NoFlyingSpiritWhite33Token|
 |Generate|TOK:TDM|Treasure|||TreasureToken|
 |Generate|TOK:TDM|Warrior|||RedWarriorToken|
 |Generate|TOK:TDM|Zombie Druid|||ZombieDruidToken|