Some golem token image handling.

Mage.Sets/src/mage/sets/fifthdawn/GuardianIdol.java

@@ -56,7 +56,7 @@ public class GuardianIdol extends CardImpl {
         // {tap}: Add {1} to your mana pool.
         this.addAbility(new ColorlessManaAbility());
         // {2}: Guardian Idol becomes a 2/2 Golem artifact creature until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new GolemToken(), "", Duration.EndOfTurn), new ManaCostsImpl("{2}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new GuardianIdolGolemToken(), "", Duration.EndOfTurn), new ManaCostsImpl("{2}")));
     }
 
     public GuardianIdol(final GuardianIdol card) {
@@ -69,9 +69,9 @@ public class GuardianIdol extends CardImpl {
     }
 }
 
-class GolemToken extends Token {
+class GuardianIdolGolemToken extends Token {
 
-    public GolemToken() {
+    public GuardianIdolGolemToken() {
         super("Golem", "a 2/2 Golem artifact creature token");
         cardType.add(CardType.ARTIFACT);
         cardType.add(CardType.CREATURE);

Mage.Sets/src/mage/sets/mirrodinbesieged/TitanForge.java

@@ -58,7 +58,7 @@ public class TitanForge extends CardImpl {
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
 
-        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GolemToken()), new TapSourceCost());
+        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new TitanForgeGolemToken()), new TapSourceCost());
         ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance(3)));
         this.addAbility(ability);
 
@@ -75,8 +75,8 @@ public class TitanForge extends CardImpl {
 
 }
 
-class GolemToken extends Token {
+class TitanForgeGolemToken extends Token {
-    GolemToken() {
+    TitanForgeGolemToken() {
         super("Golem", "a 9/9 colorless Golem artifact creature token");
         cardType.add(CardType.ARTIFACT);
         cardType.add(CardType.CREATURE);

Mage.Sets/src/mage/sets/newphyrexia/BladeSplicer.java

@@ -66,7 +66,11 @@ public class BladeSplicer extends CardImpl {
 
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
-        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GolemToken())));
+        
+        // When Blade Splicer enters the battlefield, put a 3/3 colorless Golem artifact creature token onto the battlefield.        
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GolemToken(expansionSetCode))));
+        
+        // Golem creatures you control have first strike.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FirstStrikeAbility.getInstance(), Duration.WhileOnBattlefield, filter)));
     }
 

Mage.Sets/src/mage/sets/newphyrexia/ConversionChamber.java

@@ -62,7 +62,7 @@ public class ConversionChamber extends CardImpl {
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
         // {2}, {T}, Remove a charge counter from Conversion Chamber: Put a 3/3 colorless Golem artifact creature token onto the battlefield.
-        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GolemToken()), new GenericManaCost(2));
+        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new GolemToken(expansionSetCode)), new GenericManaCost(2));
         ability.addCost(new TapSourceCost());
         ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance()));
         this.addAbility(ability);

Mage.Sets/src/mage/sets/newphyrexia/MasterSplicer.java

@@ -63,7 +63,7 @@ public class MasterSplicer extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GolemToken())));
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GolemToken(expansionSetCode))));
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostControlledEffect(1, 1, Duration.WhileOnBattlefield, filter, false)));
     }
 

Mage.Sets/src/mage/sets/newphyrexia/MaulSplicer.java

@@ -66,7 +66,10 @@ public class MaulSplicer extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GolemToken(), 2)));
+        // When Maul Splicer enters the battlefield, put two 3/3 colorless Golem artifact creature tokens onto the battlefield.        
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GolemToken(expansionSetCode), 2)));
+        
+        // Golem creatures you control have trample.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(TrampleAbility.getInstance(), Duration.WhileOnBattlefield, filter)));
     }
 

Mage.Sets/src/mage/sets/newphyrexia/SensorSplicer.java

@@ -65,7 +65,10 @@ public class SensorSplicer extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GolemToken())));
+        // When Sensor Splicer enters the battlefield, put a 3/3 colorless Golem artifact creature token onto the battlefield.
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GolemToken(expansionSetCode))));
+
+        // Golem creatures you control have vigilance.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, filter)));
     }
 

Mage.Sets/src/mage/sets/newphyrexia/VitalSplicer.java

@@ -71,7 +71,7 @@ public class VitalSplicer extends CardImpl {
         this.toughness = new MageInt(1);
 
         // When Vital Splicer enters the battlefield, put a 3/3 colorless Golem artifact creature token onto the battlefield.
-        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GolemToken())));
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GolemToken(expansionSetCode))));
 
         // {1}: Regenerate target Golem you control.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{1}"));

Mage.Sets/src/mage/sets/newphyrexia/WingSplicer.java

@@ -66,7 +66,10 @@ public class WingSplicer extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GolemToken())));
+        // When Wing Splicer enters the battlefield, put a 3/3 colorless Golem artifact creature token onto the battlefield.
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new GolemToken(expansionSetCode))));
+        
+        // Golem creatures you control have flying.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityControlledEffect(FlyingAbility.getInstance(), Duration.WhileOnBattlefield, filter)));
     }
 

Mage.Sets/src/mage/sets/theros/HammerOfPurphoros.java

@@ -45,7 +45,6 @@ import mage.constants.Rarity;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledLandPermanent;
 import mage.filter.common.FilterCreaturePermanent;
-import mage.game.permanent.token.SaprolingToken;
 import mage.game.permanent.token.Token;
 import mage.target.common.TargetControlledPermanent;
 
@@ -60,10 +59,10 @@ public class HammerOfPurphoros extends CardImpl {
         this.expansionSetCode = "THS";
         this.supertype.add("Legendary");
 
-
         // Creatures you control have haste.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
                 new GainAbilityControlledEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield, new FilterCreaturePermanent("Creatures"))));
+        
         // {2}{R}, {tap}, Sacrifice a land: Put a 3/3 colorless Golem enchantment artifact creature token onto the battlefield.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new HammerOfPurphorosGolemToken()), new ManaCostsImpl("{2}{R}"));
         ability.addCost(new TapSourceCost());
@@ -84,6 +83,7 @@ class HammerOfPurphorosGolemToken extends Token {
 
     public HammerOfPurphorosGolemToken() {
         super("Golem", "3/3 colorless Golem enchantment artifact creature token");
+        setOriginalExpansionSetCode("THS");
         cardType.add(CardType.ENCHANTMENT);
         cardType.add(CardType.ARTIFACT);
         cardType.add(CardType.CREATURE);

Mage/src/mage/game/permanent/token/GolemToken.java

@@ -37,7 +37,12 @@ import mage.MageInt;
 public class GolemToken extends Token {
 
     public GolemToken() {
+        this("SOM");
+    }
+
+    public GolemToken(String setCode) {
         super("Golem", "a 3/3 colorless Golem artifact creature token");
+        setOriginalExpansionSetCode(setCode);
         cardType.add(CardType.ARTIFACT);
         cardType.add(CardType.CREATURE);
         subtype.add("Golem");