diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt
index ba20a0a9b3..cad05be5ef 100644
--- a/Mage.Client/src/main/resources/card-pictures-tok.txt
+++ b/Mage.Client/src/main/resources/card-pictures-tok.txt
@@ -506,7 +506,7 @@
 |Generate|TOK:CNS|Wolf|||WolfToken|
 |Generate|TOK:CNS|Zombie|||ZombieToken|
 |Generate|TOK:CON|Angel|||AngelToken|
-|Generate|TOK:CON|Elemental|||RakkaMarElementalToken|
+|Generate|TOK:CON|Elemental|||ElementalTokenWithHaste|
 |Generate|TOK:CON|Saproling|||SaprolingToken|
 |Generate|TOK:CON|Soldier|||SoldierToken|
 |Generate|TOK:CON|Zombie|||ZombieToken|
@@ -1050,7 +1050,7 @@
 |Generate|TOK:RAV|Wolf|||VojaToken|
 |Generate|TOK:RAV|Faerie|||FaerieToken|
 |Generate|TOK:RIX|Elemental|1||RekindlingPhoenixToken|
-|Generate|TOK:RIX|Elemental|2||TilonallisSummonerElementalToken|
+|Generate|TOK:RIX|Elemental|2||RedElementalToken|
 |Generate|TOK:RIX|Golem|||GoldForgeGarrisonGolemToken|
 |Generate|TOK:RIX|Saproling|||SaprolingToken|
 |Generate|TOK:ROE|Dragon|||DragonToken2|
@@ -1664,4 +1664,4 @@
 |Generate|TOK:VOW|Wolf|1||WolfToken|
 |Generate|TOK:VOW|Wolf|2||RedWolfToken|
 |Generate|TOK:VOW|Zombie|1||ZombieToken|
-|Generate|TOK:VOW|Zombie|2||StitcherGeralfZombieToken|
\ No newline at end of file
+|Generate|TOK:VOW|Zombie|2||StitcherGeralfZombieToken|
diff --git a/Mage.Sets/src/mage/cards/r/RakkaMar.java b/Mage.Sets/src/mage/cards/r/RakkaMar.java
index 22e48170c3..194d852723 100644
--- a/Mage.Sets/src/mage/cards/r/RakkaMar.java
+++ b/Mage.Sets/src/mage/cards/r/RakkaMar.java
@@ -1,20 +1,19 @@
-
 package mage.cards.r;
 
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.costs.mana.ColoredManaCost;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.keyword.HasteAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.ColoredManaSymbol;
 import mage.constants.SubType;
 import mage.constants.SuperType;
-import mage.constants.Zone;
-import mage.game.permanent.token.RakkaMarElementalToken;
+import mage.game.permanent.token.ElementalTokenWithHaste;
 
 import java.util.UUID;
 
@@ -34,9 +33,8 @@ public final class RakkaMar extends CardImpl {
         this.addAbility(HasteAbility.getInstance());
 
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
-                new CreateTokenEffect(new RakkaMarElementalToken()),
-                new ManaCostsImpl("{R}")
+                new CreateTokenEffect(new ElementalTokenWithHaste()),
+                new ColoredManaCost(ColoredManaSymbol.R)
         );
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
diff --git a/Mage/src/main/java/mage/game/permanent/token/ElementalTokenWithHaste.java b/Mage/src/main/java/mage/game/permanent/token/ElementalTokenWithHaste.java
index a37a3ce773..21e431a94d 100644
--- a/Mage/src/main/java/mage/game/permanent/token/ElementalTokenWithHaste.java
+++ b/Mage/src/main/java/mage/game/permanent/token/ElementalTokenWithHaste.java
@@ -21,7 +21,7 @@ public final class ElementalTokenWithHaste extends TokenImpl {
         toughness = new MageInt(1);
         this.addAbility(HasteAbility.getInstance());
 
-        availableImageSetCodes = Arrays.asList("C20", "PMEI", "OGW", "SOK", "MRD");
+        availableImageSetCodes = Arrays.asList("C20", "PMEI", "OGW", "SOK", "MRD", "CON");
     }
 
     public ElementalTokenWithHaste(final ElementalTokenWithHaste token) {
diff --git a/Mage/src/main/java/mage/game/permanent/token/RakkaMarElementalToken.java b/Mage/src/main/java/mage/game/permanent/token/RakkaMarElementalToken.java
deleted file mode 100644
index b31b937743..0000000000
--- a/Mage/src/main/java/mage/game/permanent/token/RakkaMarElementalToken.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package mage.game.permanent.token;
-
-import mage.MageInt;
-import mage.abilities.keyword.HasteAbility;
-import mage.constants.CardType;
-import mage.constants.SubType;
-
-/**
- * @author spjspj
- */
-public final class RakkaMarElementalToken extends TokenImpl {
-
-    public RakkaMarElementalToken() {
-        super("Elemental", "3/1 red Elemental creature token with haste");
-        cardType.add(CardType.CREATURE);
-        color.setRed(true);
-        subtype.add(SubType.ELEMENTAL);
-        power = new MageInt(3);
-        toughness = new MageInt(1);
-        addAbility(HasteAbility.getInstance());
-    }
-
-    public RakkaMarElementalToken(final RakkaMarElementalToken token) {
-        super(token);
-    }
-
-    public RakkaMarElementalToken copy() {
-        return new RakkaMarElementalToken(this);
-    }
-}