diff --git a/Mage.Sets/src/mage/sets/AlaraReborn.java b/Mage.Sets/src/mage/sets/AlaraReborn.java
index 5e6e5503bd..9d48c75ef7 100644
--- a/Mage.Sets/src/mage/sets/AlaraReborn.java
+++ b/Mage.Sets/src/mage/sets/AlaraReborn.java
@@ -45,7 +45,7 @@ public class AlaraReborn extends ExpansionSet {
     }
 
     private AlaraReborn() {
-        super("Alara Reborn", "ARB", "seticon_mtgarb", "mage.sets.alarareborn", new GregorianCalendar(2009, 3, 25).getTime(), SetType.EXPANSION);
+        super("Alara Reborn", "ARB", "mage.sets.alarareborn", new GregorianCalendar(2009, 3, 25).getTime(), SetType.EXPANSION);
         this.blockName = "Shards of Alara";
         this.parentSet = ShardsOfAlara.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/Alliances.java b/Mage.Sets/src/mage/sets/Alliances.java
index 8343a639da..b3fd79d942 100644
--- a/Mage.Sets/src/mage/sets/Alliances.java
+++ b/Mage.Sets/src/mage/sets/Alliances.java
@@ -13,7 +13,7 @@ public class Alliances extends ExpansionSet {
     }
 
     private Alliances() {
-        super("Alliances", "ALL", "", "mage.sets.alliances", new GregorianCalendar(1996, 6, 10).getTime(), Constants.SetType.EXPANSION);
+        super("Alliances", "ALL", "mage.sets.alliances", new GregorianCalendar(1996, 6, 10).getTime(), Constants.SetType.EXPANSION);
         this.blockName = "Ice Age";
         this.parentSet = IceAge.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/Antiquities.java b/Mage.Sets/src/mage/sets/Antiquities.java
index 32b997992e..206d0830cd 100644
--- a/Mage.Sets/src/mage/sets/Antiquities.java
+++ b/Mage.Sets/src/mage/sets/Antiquities.java
@@ -44,7 +44,7 @@ public class Antiquities extends ExpansionSet {
     }
 
     private Antiquities() {
-        super("Antiquities", "ATQ", "", "mage.sets.antiquities", new GregorianCalendar(1994, 2, 1).getTime(), Constants.SetType.EXPANSION);
+        super("Antiquities", "ATQ", "mage.sets.antiquities", new GregorianCalendar(1994, 2, 1).getTime(), Constants.SetType.EXPANSION);
         this.hasBasicLands = false;
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage.Sets/src/mage/sets/Apocalypse.java b/Mage.Sets/src/mage/sets/Apocalypse.java
index a342bdfaed..4ec29df8e0 100644
--- a/Mage.Sets/src/mage/sets/Apocalypse.java
+++ b/Mage.Sets/src/mage/sets/Apocalypse.java
@@ -13,7 +13,7 @@ public class Apocalypse extends ExpansionSet {
     }
 
     private Apocalypse() {
-        super("Apocalypse", "APC", "", "mage.sets.apocalypse", new GregorianCalendar(2001, 5, 1).getTime(), Constants.SetType.EXPANSION);
+        super("Apocalypse", "APC", "mage.sets.apocalypse", new GregorianCalendar(2001, 5, 1).getTime(), Constants.SetType.EXPANSION);
         this.blockName = "Invasion";
         this.parentSet = Invasion.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/ArabianNights.java b/Mage.Sets/src/mage/sets/ArabianNights.java
index 3f7d582555..e4311eb265 100644
--- a/Mage.Sets/src/mage/sets/ArabianNights.java
+++ b/Mage.Sets/src/mage/sets/ArabianNights.java
@@ -44,7 +44,7 @@ public class ArabianNights extends ExpansionSet {
     }
 
     private ArabianNights() {
-        super("Arabian Nights", "ARN", "", "mage.sets.arabiannights", new GregorianCalendar(1993, 11, 1).getTime(), Constants.SetType.EXPANSION);
+        super("Arabian Nights", "ARN", "mage.sets.arabiannights", new GregorianCalendar(1993, 11, 1).getTime(), Constants.SetType.EXPANSION);
         this.hasBasicLands = false;
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage.Sets/src/mage/sets/AvacynRestored.java b/Mage.Sets/src/mage/sets/AvacynRestored.java
index 8977ba8014..35883b267a 100644
--- a/Mage.Sets/src/mage/sets/AvacynRestored.java
+++ b/Mage.Sets/src/mage/sets/AvacynRestored.java
@@ -44,7 +44,7 @@ public class AvacynRestored extends ExpansionSet {
     }
 
     private AvacynRestored() {
-        super("Avacyn Restored", "AVR", "seticon_mtgavr", "mage.sets.avacynrestored", new GregorianCalendar(2012, 4, 4).getTime(), SetType.EXPANSION);
+        super("Avacyn Restored", "AVR", "mage.sets.avacynrestored", new GregorianCalendar(2012, 4, 4).getTime(), SetType.EXPANSION);
         this.blockName = "Innistrad";
         this.parentSet = Innistrad.getInstance();
         this.hasBoosters = true;
diff --git a/Mage.Sets/src/mage/sets/BetrayersOfKamigawa.java b/Mage.Sets/src/mage/sets/BetrayersOfKamigawa.java
index 1c3a00757f..8159fcb1e2 100644
--- a/Mage.Sets/src/mage/sets/BetrayersOfKamigawa.java
+++ b/Mage.Sets/src/mage/sets/BetrayersOfKamigawa.java
@@ -44,7 +44,7 @@ public class BetrayersOfKamigawa extends ExpansionSet {
     }
 
     private BetrayersOfKamigawa() {
-        super("Betrayers of Kamigawa", "BOK", "", "mage.sets.betrayersofkamigawa", new GregorianCalendar(2005, 1, 4).getTime(), SetType.EXPANSION);
+        super("Betrayers of Kamigawa", "BOK", "mage.sets.betrayersofkamigawa", new GregorianCalendar(2005, 1, 4).getTime(), SetType.EXPANSION);
         this.blockName = "Kamigawa";
         this.parentSet = ChampionsOfKamigawa.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java b/Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java
index e049b5be44..4dd42d22dc 100644
--- a/Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java
+++ b/Mage.Sets/src/mage/sets/ChampionsOfKamigawa.java
@@ -13,7 +13,7 @@ public class ChampionsOfKamigawa extends ExpansionSet {
     }
 
     private ChampionsOfKamigawa() {
-        super("Champions of Kamigawa", "CHK", "", "mage.sets.championsofkamigawa",  new GregorianCalendar(2004, 9, 1).getTime(), Constants.SetType.EXPANSION);
+        super("Champions of Kamigawa", "CHK", "mage.sets.championsofkamigawa",  new GregorianCalendar(2004, 9, 1).getTime(), Constants.SetType.EXPANSION);
         this.blockName = "Kamigawa";
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage.Sets/src/mage/sets/Coldsnap.java b/Mage.Sets/src/mage/sets/Coldsnap.java
index 702a9f3477..1488a7eb84 100644
--- a/Mage.Sets/src/mage/sets/Coldsnap.java
+++ b/Mage.Sets/src/mage/sets/Coldsnap.java
@@ -44,7 +44,7 @@ public class Coldsnap extends ExpansionSet {
     }
 
     private Coldsnap() {
-        super("Coldsnap", "CSP", "", "mage.sets.coldsnap", new GregorianCalendar(2006, 6, 21).getTime(), Constants.SetType.EXPANSION);
+        super("Coldsnap", "CSP", "mage.sets.coldsnap", new GregorianCalendar(2006, 6, 21).getTime(), Constants.SetType.EXPANSION);
         this.blockName = "Ice Age";
         this.hasBoosters = true;
         this.numBoosterLands = 0;
diff --git a/Mage.Sets/src/mage/sets/Commander.java b/Mage.Sets/src/mage/sets/Commander.java
index f643794925..b527b31572 100644
--- a/Mage.Sets/src/mage/sets/Commander.java
+++ b/Mage.Sets/src/mage/sets/Commander.java
@@ -47,7 +47,7 @@ public class Commander extends ExpansionSet {
     }
 
     private Commander() {
-        super("Magic: The Gathering-Commander", "CMD", "", "mage.sets.commander", new GregorianCalendar(2011, 6, 17).getTime(), SetType.REPRINT);
+        super("Magic: The Gathering-Commander", "CMD", "mage.sets.commander", new GregorianCalendar(2011, 6, 17).getTime(), SetType.REPRINT);
     }
 
 }
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/Conflux.java b/Mage.Sets/src/mage/sets/Conflux.java
index c3a2e94848..dc41fddae9 100644
--- a/Mage.Sets/src/mage/sets/Conflux.java
+++ b/Mage.Sets/src/mage/sets/Conflux.java
@@ -45,7 +45,7 @@ public class Conflux extends ExpansionSet {
     }
 
     private Conflux() {
-        super("Conflux", "CON", "seticon_conflux", "mage.sets.conflux", new GregorianCalendar(2009, 0, 31).getTime(), SetType.EXPANSION);
+        super("Conflux", "CON", "mage.sets.conflux", new GregorianCalendar(2009, 0, 31).getTime(), SetType.EXPANSION);
         this.blockName = "Shards of Alara";
         this.parentSet = ShardsOfAlara.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/DarkAscension.java b/Mage.Sets/src/mage/sets/DarkAscension.java
index 8addd54499..80175bdd63 100644
--- a/Mage.Sets/src/mage/sets/DarkAscension.java
+++ b/Mage.Sets/src/mage/sets/DarkAscension.java
@@ -44,7 +44,7 @@ public class DarkAscension  extends ExpansionSet {
     }
 
     private DarkAscension() {
-        super("Dark Ascension", "DKA", "seticon_mtgdka", "mage.sets.darkascension", new GregorianCalendar(2012, 1, 3).getTime(), SetType.EXPANSION);
+        super("Dark Ascension", "DKA", "mage.sets.darkascension", new GregorianCalendar(2012, 1, 3).getTime(), SetType.EXPANSION);
         this.blockName = "Innistrad";
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage.Sets/src/mage/sets/Darksteel.java b/Mage.Sets/src/mage/sets/Darksteel.java
index 4cb8f530bb..c41df02de5 100644
--- a/Mage.Sets/src/mage/sets/Darksteel.java
+++ b/Mage.Sets/src/mage/sets/Darksteel.java
@@ -14,7 +14,7 @@ public class Darksteel extends ExpansionSet {
     }
 
     public Darksteel() {
-        super("Darksteel", "DST", "", "mage.sets.darksteel", new GregorianCalendar(2004, 1, 6).getTime(), Constants.SetType.EXPANSION);
+        super("Darksteel", "DST", "mage.sets.darksteel", new GregorianCalendar(2004, 1, 6).getTime(), Constants.SetType.EXPANSION);
         this.blockName = "Mirrodin";
         this.parentSet = Mirrodin.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/Dissension.java b/Mage.Sets/src/mage/sets/Dissension.java
index 22f0044128..b21766cda6 100644
--- a/Mage.Sets/src/mage/sets/Dissension.java
+++ b/Mage.Sets/src/mage/sets/Dissension.java
@@ -47,7 +47,7 @@ public class Dissension extends ExpansionSet {
     }
 
     private Dissension() {
-        super("Dissension", "DIS", "", "mage.sets.dissension", new GregorianCalendar(2006, 4, 5).getTime(), Constants.SetType.EXPANSION);
+        super("Dissension", "DIS", "mage.sets.dissension", new GregorianCalendar(2006, 4, 5).getTime(), Constants.SetType.EXPANSION);
         this.blockName = "Ravnika";
         this.parentSet = RavnicaCityOfGuilds.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/DragonsMaze.java b/Mage.Sets/src/mage/sets/DragonsMaze.java
index 0935f7a50a..e78a5d62d2 100644
--- a/Mage.Sets/src/mage/sets/DragonsMaze.java
+++ b/Mage.Sets/src/mage/sets/DragonsMaze.java
@@ -54,7 +54,7 @@ public class DragonsMaze extends ExpansionSet {
     }
 
     private DragonsMaze() {
-        super("Dragon's Maze", "DGM", "seticon_mtggtc", "mage.sets.dragonsmaze", new GregorianCalendar(2013, 5, 03).getTime(), Constants.SetType.EXPANSION);
+        super("Dragon's Maze", "DGM", "mage.sets.dragonsmaze", new GregorianCalendar(2013, 5, 03).getTime(), Constants.SetType.EXPANSION);
         this.blockName = "Return to Ravnica";
         this.hasBoosters = true;
         this.numBoosterSpecial = 1;
diff --git a/Mage.Sets/src/mage/sets/EighthEdition.java b/Mage.Sets/src/mage/sets/EighthEdition.java
index df2c53e69d..2dd11abd7d 100644
--- a/Mage.Sets/src/mage/sets/EighthEdition.java
+++ b/Mage.Sets/src/mage/sets/EighthEdition.java
@@ -13,7 +13,7 @@ public class EighthEdition extends ExpansionSet {
     }
 
     private EighthEdition() {
-        super("Eighth Edition", "8ED", "", "mage.sets.eighthedition", new GregorianCalendar(2003, 7, 28).getTime(), SetType.CORE);
+        super("Eighth Edition", "8ED", "mage.sets.eighthedition", new GregorianCalendar(2003, 7, 28).getTime(), SetType.CORE);
         this.hasBoosters = true;
         this.numBoosterLands = 1;
         this.numBoosterCommon = 10;
diff --git a/Mage.Sets/src/mage/sets/ElspethvsTezzeret.java b/Mage.Sets/src/mage/sets/ElspethvsTezzeret.java
index c246cf1bc6..0487cf8336 100644
--- a/Mage.Sets/src/mage/sets/ElspethvsTezzeret.java
+++ b/Mage.Sets/src/mage/sets/ElspethvsTezzeret.java
@@ -13,6 +13,6 @@ public class ElspethvsTezzeret extends ExpansionSet {
     }
 
     private ElspethvsTezzeret() {
-        super("Duel Decks: Elspeth vs. Tezzeret", "DDF", "", "mage.sets.elspethvstezzeret", new GregorianCalendar(2010, 8, 3).getTime(), Constants.SetType.REPRINT);
+        super("Duel Decks: Elspeth vs. Tezzeret", "DDF", "mage.sets.elspethvstezzeret", new GregorianCalendar(2010, 8, 3).getTime(), Constants.SetType.REPRINT);
     }
 }
diff --git a/Mage.Sets/src/mage/sets/Eventide.java b/Mage.Sets/src/mage/sets/Eventide.java
index bd6ce65834..b4f0e48665 100644
--- a/Mage.Sets/src/mage/sets/Eventide.java
+++ b/Mage.Sets/src/mage/sets/Eventide.java
@@ -13,7 +13,7 @@ public class Eventide extends ExpansionSet {
     }
 
     private Eventide() {
-        super("Eventide", "EVE", "", "mage.sets.eventide", new GregorianCalendar(2008, 6, 25).getTime(), Constants.SetType.EXPANSION);
+        super("Eventide", "EVE", "mage.sets.eventide", new GregorianCalendar(2008, 6, 25).getTime(), Constants.SetType.EXPANSION);
         this.blockName = "Shadowmoor";
         this.parentSet = Shadowmoor.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/Exodus.java b/Mage.Sets/src/mage/sets/Exodus.java
index 58b39e2263..c0e700288f 100644
--- a/Mage.Sets/src/mage/sets/Exodus.java
+++ b/Mage.Sets/src/mage/sets/Exodus.java
@@ -44,7 +44,7 @@ public class Exodus extends ExpansionSet {
     }
 
     private Exodus() {
-        super("Exodus", "EXO", "", "mage.sets.exodus", new GregorianCalendar(1998, 5, 6).getTime(), Constants.SetType.EXPANSION);
+        super("Exodus", "EXO", "mage.sets.exodus", new GregorianCalendar(1998, 5, 6).getTime(), Constants.SetType.EXPANSION);
         this.blockName = "Tempest";
         this.parentSet = Tempest.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/FallenEmpires.java b/Mage.Sets/src/mage/sets/FallenEmpires.java
index 305a19dcc7..d4db8631ae 100644
--- a/Mage.Sets/src/mage/sets/FallenEmpires.java
+++ b/Mage.Sets/src/mage/sets/FallenEmpires.java
@@ -44,7 +44,7 @@ public class FallenEmpires extends ExpansionSet {
     }
 
     private FallenEmpires() {
-        super("Fallen Empires", "FEM", "", "mage.sets.fallenempires", new GregorianCalendar(1994, 10, 1).getTime(), Constants.SetType.EXPANSION);
+        super("Fallen Empires", "FEM", "mage.sets.fallenempires", new GregorianCalendar(1994, 10, 1).getTime(), Constants.SetType.EXPANSION);
         this.hasBasicLands = false;
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage.Sets/src/mage/sets/FifthDawn.java b/Mage.Sets/src/mage/sets/FifthDawn.java
index ef38ba6bd7..ac186d45d0 100644
--- a/Mage.Sets/src/mage/sets/FifthDawn.java
+++ b/Mage.Sets/src/mage/sets/FifthDawn.java
@@ -44,7 +44,7 @@ public class FifthDawn extends ExpansionSet {
     }
 
     private FifthDawn() {
-        super("Fifth Dawn", "5DN", "", "mage.sets.fifthdawn", new GregorianCalendar(2004, 5, 4).getTime(), SetType.EXPANSION);
+        super("Fifth Dawn", "5DN", "mage.sets.fifthdawn", new GregorianCalendar(2004, 5, 4).getTime(), SetType.EXPANSION);
         this.blockName = "Mirrodin";
         this.parentSet = Mirrodin.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/FifthEdition.java b/Mage.Sets/src/mage/sets/FifthEdition.java
index 3a1a801dc0..b52aa88d51 100644
--- a/Mage.Sets/src/mage/sets/FifthEdition.java
+++ b/Mage.Sets/src/mage/sets/FifthEdition.java
@@ -13,7 +13,7 @@ public class FifthEdition extends ExpansionSet {
     }
 
     private FifthEdition() {
-        super("Fifth Edition", "5ED", "", "mage.sets.fifthedition", new GregorianCalendar(1997, 3, 1).getTime(), SetType.CORE);
+        super("Fifth Edition", "5ED", "mage.sets.fifthedition", new GregorianCalendar(1997, 3, 1).getTime(), SetType.CORE);
         this.hasBoosters = true;
         this.numBoosterLands = 1;
         this.numBoosterCommon = 10;
diff --git a/Mage.Sets/src/mage/sets/FourthEdition.java b/Mage.Sets/src/mage/sets/FourthEdition.java
index e636c722a4..a7c65e632b 100644
--- a/Mage.Sets/src/mage/sets/FourthEdition.java
+++ b/Mage.Sets/src/mage/sets/FourthEdition.java
@@ -44,7 +44,7 @@ public class FourthEdition extends ExpansionSet {
     }
 
     private FourthEdition() {
-        super("Fourth Edition", "4ED", "", "mage.sets.fourthedition", new GregorianCalendar(1995, 3, 1).getTime(), Constants.SetType.CORE);
+        super("Fourth Edition", "4ED", "mage.sets.fourthedition", new GregorianCalendar(1995, 3, 1).getTime(), Constants.SetType.CORE);
         this.hasBoosters = true;
         this.numBoosterLands = 1;
         this.numBoosterCommon = 10;
diff --git a/Mage.Sets/src/mage/sets/FutureSight.java b/Mage.Sets/src/mage/sets/FutureSight.java
index 296abdd034..18381a7e30 100644
--- a/Mage.Sets/src/mage/sets/FutureSight.java
+++ b/Mage.Sets/src/mage/sets/FutureSight.java
@@ -44,7 +44,7 @@ public class FutureSight extends ExpansionSet {
     }
 
     private FutureSight() {
-        super("Future Sight", "FUT", "", "mage.sets.futuresight", new GregorianCalendar(2007, 4, 4).getTime(), SetType.EXPANSION);
+        super("Future Sight", "FUT", "mage.sets.futuresight", new GregorianCalendar(2007, 4, 4).getTime(), SetType.EXPANSION);
         this.blockName = "Time Spiral";
         this.parentSet = TimeSpiral.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/Gatecrash.java b/Mage.Sets/src/mage/sets/Gatecrash.java
index 2e518c7b69..cb10c052e1 100644
--- a/Mage.Sets/src/mage/sets/Gatecrash.java
+++ b/Mage.Sets/src/mage/sets/Gatecrash.java
@@ -44,7 +44,7 @@ public class Gatecrash extends ExpansionSet {
     }
 
     private Gatecrash() {
-        super("Gatecrash", "GTC", "seticon_mtggtc", "mage.sets.gatecrash", new GregorianCalendar(2013, 2, 01).getTime(), SetType.EXPANSION);
+        super("Gatecrash", "GTC", "mage.sets.gatecrash", new GregorianCalendar(2013, 2, 01).getTime(), SetType.EXPANSION);
         this.blockName = "Return to Ravnica";
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage.Sets/src/mage/sets/Guildpact.java b/Mage.Sets/src/mage/sets/Guildpact.java
index 67bec1bb49..99420bd692 100644
--- a/Mage.Sets/src/mage/sets/Guildpact.java
+++ b/Mage.Sets/src/mage/sets/Guildpact.java
@@ -47,7 +47,7 @@ public class Guildpact extends ExpansionSet {
     }
 
     private Guildpact() {
-        super("Guildpact", "GPT", "", "mage.sets.guildpact", new GregorianCalendar(2006, 1, 3).getTime(), Constants.SetType.EXPANSION);
+        super("Guildpact", "GPT", "mage.sets.guildpact", new GregorianCalendar(2006, 1, 3).getTime(), Constants.SetType.EXPANSION);
         this.blockName = "Ravnika";
         this.parentSet = RavnicaCityOfGuilds.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/Guru.java b/Mage.Sets/src/mage/sets/Guru.java
index 16e3a000bb..b7e6fff246 100644
--- a/Mage.Sets/src/mage/sets/Guru.java
+++ b/Mage.Sets/src/mage/sets/Guru.java
@@ -14,6 +14,6 @@ public class Guru extends ExpansionSet {
 
     private Guru() {
         //TODO find correct release date, wiki don't known anything about this expansion
-        super("Guru", "GUR", "", "mage.sets.guru", new GregorianCalendar(1990, 1, 2).getTime(), Constants.SetType.REPRINT);
+        super("Guru", "GUR", "mage.sets.guru", new GregorianCalendar(1990, 1, 2).getTime(), Constants.SetType.REPRINT);
     }
 }
diff --git a/Mage.Sets/src/mage/sets/Homelands.java b/Mage.Sets/src/mage/sets/Homelands.java
index a1e58a6480..7c539d26b5 100644
--- a/Mage.Sets/src/mage/sets/Homelands.java
+++ b/Mage.Sets/src/mage/sets/Homelands.java
@@ -44,7 +44,7 @@ public class Homelands extends ExpansionSet {
     }
 
     private Homelands() {
-        super("Homelands", "HML", "", "mage.sets.homelands", new GregorianCalendar(1995, 9, 1).getTime(), Constants.SetType.EXPANSION);
+        super("Homelands", "HML", "mage.sets.homelands", new GregorianCalendar(1995, 9, 1).getTime(), Constants.SetType.EXPANSION);
         this.hasBasicLands = false;
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage.Sets/src/mage/sets/IceAge.java b/Mage.Sets/src/mage/sets/IceAge.java
index f0847ab6d2..c92929a4eb 100644
--- a/Mage.Sets/src/mage/sets/IceAge.java
+++ b/Mage.Sets/src/mage/sets/IceAge.java
@@ -44,7 +44,7 @@ public class IceAge extends ExpansionSet {
     }
 
     private IceAge() {
-        super("Ice Age", "ICE", "", "mage.sets.iceage", new GregorianCalendar(1995, 5, 1).getTime(), Constants.SetType.EXPANSION);
+        super("Ice Age", "ICE", "mage.sets.iceage", new GregorianCalendar(1995, 5, 1).getTime(), Constants.SetType.EXPANSION);
         this.blockName = "Ice Age";
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage.Sets/src/mage/sets/Innistrad.java b/Mage.Sets/src/mage/sets/Innistrad.java
index e1e15d9510..f4be5d7dd4 100644
--- a/Mage.Sets/src/mage/sets/Innistrad.java
+++ b/Mage.Sets/src/mage/sets/Innistrad.java
@@ -45,7 +45,7 @@ public class Innistrad extends ExpansionSet {
     }
 
     private Innistrad() {
-        super("Innistrad", "ISD", "seticon_mtgisd", "mage.sets.innistrad", new GregorianCalendar(2011, 9, 30).getTime(), SetType.EXPANSION);
+        super("Innistrad", "ISD", "mage.sets.innistrad", new GregorianCalendar(2011, 9, 30).getTime(), SetType.EXPANSION);
         this.blockName = "Innistrad";
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage.Sets/src/mage/sets/Invasion.java b/Mage.Sets/src/mage/sets/Invasion.java
index 58e82db6cb..fbc7f11aef 100644
--- a/Mage.Sets/src/mage/sets/Invasion.java
+++ b/Mage.Sets/src/mage/sets/Invasion.java
@@ -43,7 +43,7 @@ public class Invasion extends ExpansionSet {
     }
 
     private Invasion() {
-        super("Invasion", "INV", "", "mage.sets.invasion", new GregorianCalendar(2000, 9, 2).getTime(), SetType.EXPANSION);
+        super("Invasion", "INV", "mage.sets.invasion", new GregorianCalendar(2000, 9, 2).getTime(), SetType.EXPANSION);
         this.blockName = "Invasion";
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage.Sets/src/mage/sets/Judgment.java b/Mage.Sets/src/mage/sets/Judgment.java
index 888681603a..ca63cf6439 100644
--- a/Mage.Sets/src/mage/sets/Judgment.java
+++ b/Mage.Sets/src/mage/sets/Judgment.java
@@ -44,7 +44,7 @@ public class Judgment extends ExpansionSet {
     }
 
     private Judgment() {
-        super("Judgment", "JUD", "exp_symbol_mtgjud", "mage.sets.judgment", new GregorianCalendar(2002, 5, 27).getTime(), SetType.EXPANSION);
+        super("Judgment", "JUD", "mage.sets.judgment", new GregorianCalendar(2002, 5, 27).getTime(), SetType.EXPANSION);
         this.blockName = "Odyssey";
         this.parentSet = Odyssey.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/Legends.java b/Mage.Sets/src/mage/sets/Legends.java
index 03a5324fee..583504a511 100644
--- a/Mage.Sets/src/mage/sets/Legends.java
+++ b/Mage.Sets/src/mage/sets/Legends.java
@@ -44,7 +44,7 @@ public class Legends extends ExpansionSet {
     }
 
     private Legends() {
-        super("Legends", "LEG", "", "mage.sets.legends", new GregorianCalendar(1994, 5, 1).getTime(), Constants.SetType.EXPANSION);
+        super("Legends", "LEG", "mage.sets.legends", new GregorianCalendar(1994, 5, 1).getTime(), Constants.SetType.EXPANSION);
         this.hasBasicLands = false;
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage.Sets/src/mage/sets/Legions.java b/Mage.Sets/src/mage/sets/Legions.java
index 9bc97b0869..784cb988ff 100644
--- a/Mage.Sets/src/mage/sets/Legions.java
+++ b/Mage.Sets/src/mage/sets/Legions.java
@@ -44,7 +44,7 @@ public class Legions extends ExpansionSet {
     }
 
     private Legions() {
-        super("Legions", "LGN", "", "mage.sets.legions", new GregorianCalendar(2003, 0, 25).getTime(), Constants.SetType.EXPANSION);
+        super("Legions", "LGN", "mage.sets.legions", new GregorianCalendar(2003, 0, 25).getTime(), Constants.SetType.EXPANSION);
         this.blockName = "Onslaught";
         this.parentSet = Onslaught.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/LimitedEditionAlpha.java b/Mage.Sets/src/mage/sets/LimitedEditionAlpha.java
index c9655b3246..567258da70 100644
--- a/Mage.Sets/src/mage/sets/LimitedEditionAlpha.java
+++ b/Mage.Sets/src/mage/sets/LimitedEditionAlpha.java
@@ -17,7 +17,7 @@ public class LimitedEditionAlpha extends ExpansionSet {
     }
 
     private LimitedEditionAlpha() {
-        super("Limited Edition Alpha", "LEA", "", "mage.sets.limitedalpha", new GregorianCalendar(1993, 7, 1).getTime(), Constants.SetType.CORE);
+        super("Limited Edition Alpha", "LEA", "mage.sets.limitedalpha", new GregorianCalendar(1993, 7, 1).getTime(), Constants.SetType.CORE);
         this.hasBoosters = true;
         this.numBoosterLands = 1;
         this.numBoosterCommon = 10;
diff --git a/Mage.Sets/src/mage/sets/LimitedEditionBeta.java b/Mage.Sets/src/mage/sets/LimitedEditionBeta.java
index b0bff49d1c..4bd511865d 100644
--- a/Mage.Sets/src/mage/sets/LimitedEditionBeta.java
+++ b/Mage.Sets/src/mage/sets/LimitedEditionBeta.java
@@ -17,7 +17,7 @@ public class LimitedEditionBeta extends ExpansionSet {
     }
 
     private LimitedEditionBeta() {
-        super("Limited Edition Beta", "LEB", "", "mage.sets.limitedbeta", new GregorianCalendar(1993, 9, 1).getTime(), Constants.SetType.CORE);
+        super("Limited Edition Beta", "LEB", "mage.sets.limitedbeta", new GregorianCalendar(1993, 9, 1).getTime(), Constants.SetType.CORE);
         this.hasBoosters = true;
         this.numBoosterLands = 1;
         this.numBoosterCommon = 10;
diff --git a/Mage.Sets/src/mage/sets/Lorwyn.java b/Mage.Sets/src/mage/sets/Lorwyn.java
index a849952cd4..5d999d2409 100644
--- a/Mage.Sets/src/mage/sets/Lorwyn.java
+++ b/Mage.Sets/src/mage/sets/Lorwyn.java
@@ -44,7 +44,7 @@ public class Lorwyn extends ExpansionSet {
     }
 
     private Lorwyn() {
-        super("Lorwyn", "LRW", "", "mage.sets.lorwyn", new GregorianCalendar(2007, 9, 12).getTime(), SetType.EXPANSION);
+        super("Lorwyn", "LRW", "mage.sets.lorwyn", new GregorianCalendar(2007, 9, 12).getTime(), SetType.EXPANSION);
         this.blockName = "Lorwyn";
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage.Sets/src/mage/sets/Magic2010.java b/Mage.Sets/src/mage/sets/Magic2010.java
index 26c9de26d1..420dc0a7ea 100644
--- a/Mage.Sets/src/mage/sets/Magic2010.java
+++ b/Mage.Sets/src/mage/sets/Magic2010.java
@@ -45,7 +45,7 @@ public class Magic2010 extends ExpansionSet {
     }
 
     private Magic2010() {
-        super("Magic 2010", "M10", "seticon_M10", "mage.sets.magic2010", new GregorianCalendar(2009, 6, 17).getTime(), SetType.CORE);
+        super("Magic 2010", "M10", "mage.sets.magic2010", new GregorianCalendar(2009, 6, 17).getTime(), SetType.CORE);
         this.hasBoosters = true;
         this.numBoosterLands = 1;
         this.numBoosterCommon = 10;
diff --git a/Mage.Sets/src/mage/sets/Magic2011.java b/Mage.Sets/src/mage/sets/Magic2011.java
index 4379b9bb86..0531651e5e 100644
--- a/Mage.Sets/src/mage/sets/Magic2011.java
+++ b/Mage.Sets/src/mage/sets/Magic2011.java
@@ -45,7 +45,7 @@ public class Magic2011 extends ExpansionSet {
     }
 
     private Magic2011() {
-        super("Magic 2011", "M11", "seticon_M11", "mage.sets.magic2011", new GregorianCalendar(2010, 6, 16).getTime(), SetType.CORE);
+        super("Magic 2011", "M11", "mage.sets.magic2011", new GregorianCalendar(2010, 6, 16).getTime(), SetType.CORE);
         this.hasBoosters = true;
         this.numBoosterLands = 1;
         this.numBoosterCommon = 10;
diff --git a/Mage.Sets/src/mage/sets/Magic2012.java b/Mage.Sets/src/mage/sets/Magic2012.java
index 545b9a0346..64a00c23e0 100644
--- a/Mage.Sets/src/mage/sets/Magic2012.java
+++ b/Mage.Sets/src/mage/sets/Magic2012.java
@@ -44,7 +44,7 @@ public class Magic2012 extends ExpansionSet {
     }
 
     private Magic2012() {
-        super("Magic 2012", "M12", "seticon_M12", "mage.sets.magic2012", new GregorianCalendar(2011, 6, 9).getTime(), SetType.CORE);
+        super("Magic 2012", "M12", "mage.sets.magic2012", new GregorianCalendar(2011, 6, 9).getTime(), SetType.CORE);
         this.hasBoosters = true;
         this.numBoosterLands = 1;
         this.numBoosterCommon = 10;
diff --git a/Mage.Sets/src/mage/sets/Magic2013.java b/Mage.Sets/src/mage/sets/Magic2013.java
index f8bd79d21e..4464205412 100644
--- a/Mage.Sets/src/mage/sets/Magic2013.java
+++ b/Mage.Sets/src/mage/sets/Magic2013.java
@@ -44,7 +44,7 @@ public class Magic2013 extends ExpansionSet {
     }
 
     private Magic2013() {
-        super("Magic 2013", "M13", "seticon_M13", "mage.sets.magic2013", new GregorianCalendar(2012, 6, 7).getTime(), SetType.CORE);
+        super("Magic 2013", "M13", "mage.sets.magic2013", new GregorianCalendar(2012, 6, 7).getTime(), SetType.CORE);
         this.hasBoosters = true;
         this.numBoosterLands = 1;
         this.numBoosterCommon = 10;
diff --git a/Mage.Sets/src/mage/sets/MagicPlayerRewards.java b/Mage.Sets/src/mage/sets/MagicPlayerRewards.java
index bf68e6d2b8..c28fa05d3c 100644
--- a/Mage.Sets/src/mage/sets/MagicPlayerRewards.java
+++ b/Mage.Sets/src/mage/sets/MagicPlayerRewards.java
@@ -13,7 +13,7 @@ public class MagicPlayerRewards extends ExpansionSet {
     }
 
     private MagicPlayerRewards() {
-        super("Magic Player Rewards", "MPR", "", "mage.sets.playerrewards", new GregorianCalendar(1990, 1, 1).getTime(), Constants.SetType.EXPANSION);
+        super("Magic Player Rewards", "MPR", "mage.sets.playerrewards", new GregorianCalendar(1990, 1, 1).getTime(), Constants.SetType.EXPANSION);
         this.hasBoosters = false;
     }
 }
diff --git a/Mage.Sets/src/mage/sets/MercadianMasques.java b/Mage.Sets/src/mage/sets/MercadianMasques.java
index 51a299bdb8..ada416db5b 100644
--- a/Mage.Sets/src/mage/sets/MercadianMasques.java
+++ b/Mage.Sets/src/mage/sets/MercadianMasques.java
@@ -44,7 +44,7 @@ public class MercadianMasques extends ExpansionSet {
     }
 
     private MercadianMasques() {
-        super("Mercadian Masques", "MMQ", "", "mage.sets.mercadianmasques", new GregorianCalendar(1999, 8, 25).getTime(), Constants.SetType.EXPANSION);
+        super("Mercadian Masques", "MMQ", "mage.sets.mercadianmasques", new GregorianCalendar(1999, 8, 25).getTime(), Constants.SetType.EXPANSION);
         this.blockName = "Masques";
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage.Sets/src/mage/sets/Mirage.java b/Mage.Sets/src/mage/sets/Mirage.java
index 0dec91929e..a17ff57205 100644
--- a/Mage.Sets/src/mage/sets/Mirage.java
+++ b/Mage.Sets/src/mage/sets/Mirage.java
@@ -43,7 +43,7 @@ public class Mirage extends ExpansionSet {
     }
 
     private Mirage() {
-        super("Mirage", "MIR", "", "mage.sets.mirage", new GregorianCalendar(1996, 8, 21).getTime(), Constants.SetType.EXPANSION);
+        super("Mirage", "MIR", "mage.sets.mirage", new GregorianCalendar(1996, 8, 21).getTime(), Constants.SetType.EXPANSION);
         this.blockName = "Mirage";
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage.Sets/src/mage/sets/Mirrodin.java b/Mage.Sets/src/mage/sets/Mirrodin.java
index 2bca8c6228..7bcb4a2359 100644
--- a/Mage.Sets/src/mage/sets/Mirrodin.java
+++ b/Mage.Sets/src/mage/sets/Mirrodin.java
@@ -13,7 +13,7 @@ public class Mirrodin extends ExpansionSet {
     }
 
     private Mirrodin() {
-        super("Mirrodin", "MRD", "", "mage.sets.mirrodin", new GregorianCalendar(2003, 9, 2).getTime(), Constants.SetType.EXPANSION);
+        super("Mirrodin", "MRD", "mage.sets.mirrodin", new GregorianCalendar(2003, 9, 2).getTime(), Constants.SetType.EXPANSION);
         this.blockName = "Mirrodin";
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage.Sets/src/mage/sets/MirrodinBesieged.java b/Mage.Sets/src/mage/sets/MirrodinBesieged.java
index 2199817504..7dfc555242 100644
--- a/Mage.Sets/src/mage/sets/MirrodinBesieged.java
+++ b/Mage.Sets/src/mage/sets/MirrodinBesieged.java
@@ -47,7 +47,7 @@ public class MirrodinBesieged extends ExpansionSet {
     }
 
     private MirrodinBesieged() {
-        super("Mirrodin Besieged", "MBS", "seticon_mtgmbs", "mage.sets.mirrodinbesieged", new GregorianCalendar(2011, 1, 4).getTime(), SetType.EXPANSION);
+        super("Mirrodin Besieged", "MBS", "mage.sets.mirrodinbesieged", new GregorianCalendar(2011, 1, 4).getTime(), SetType.EXPANSION);
         this.blockName = "Scars of Mirrodin";
         this.parentSet = ScarsOfMirrodin.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/ModernMasters.java b/Mage.Sets/src/mage/sets/ModernMasters.java
index 72fe20786a..e0c306da85 100644
--- a/Mage.Sets/src/mage/sets/ModernMasters.java
+++ b/Mage.Sets/src/mage/sets/ModernMasters.java
@@ -45,7 +45,7 @@ public class ModernMasters extends ExpansionSet {
     }
 
     private ModernMasters() {
-        super("Modern Masters", "MMA", "", "mage.sets.modernmasters", new GregorianCalendar(2016, 6, 7).getTime(), SetType.REPRINT);
+        super("Modern Masters", "MMA", "mage.sets.modernmasters", new GregorianCalendar(2016, 6, 7).getTime(), SetType.REPRINT);
         this.hasBasicLands = false;
         this.hasBoosters = true;
         this.numBoosterLands = 0;
diff --git a/Mage.Sets/src/mage/sets/Morningtide.java b/Mage.Sets/src/mage/sets/Morningtide.java
index 58f9a734fc..7893315768 100644
--- a/Mage.Sets/src/mage/sets/Morningtide.java
+++ b/Mage.Sets/src/mage/sets/Morningtide.java
@@ -44,7 +44,7 @@ public class Morningtide extends ExpansionSet {
     }
 
     private Morningtide() {
-        super("Morningtide", "MOR", "", "mage.sets.morningtide", new GregorianCalendar(2008, 1, 1).getTime(), SetType.EXPANSION);
+        super("Morningtide", "MOR", "mage.sets.morningtide", new GregorianCalendar(2008, 1, 1).getTime(), SetType.EXPANSION);
         this.blockName = "Lorwyn";
         this.parentSet = Morningtide.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/Nemesis.java b/Mage.Sets/src/mage/sets/Nemesis.java
index 58915e92fb..0e829d7615 100644
--- a/Mage.Sets/src/mage/sets/Nemesis.java
+++ b/Mage.Sets/src/mage/sets/Nemesis.java
@@ -44,7 +44,7 @@ public class Nemesis extends ExpansionSet {
     }
 
     private Nemesis() {
-        super("Nemesis", "NMS", "", "mage.sets.nemesis", new GregorianCalendar(2000, 1, 5).getTime(), Constants.SetType.EXPANSION);
+        super("Nemesis", "NMS", "mage.sets.nemesis", new GregorianCalendar(2000, 1, 5).getTime(), Constants.SetType.EXPANSION);
         this.blockName = "Masques";
         this.parentSet = MercadianMasques.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/NewPhyrexia.java b/Mage.Sets/src/mage/sets/NewPhyrexia.java
index 1c00acb22c..5e78569612 100644
--- a/Mage.Sets/src/mage/sets/NewPhyrexia.java
+++ b/Mage.Sets/src/mage/sets/NewPhyrexia.java
@@ -13,7 +13,7 @@ public class NewPhyrexia extends ExpansionSet {
     }
 
     private NewPhyrexia() {
-        super("New Phyrexia", "NPH", "", "mage.sets.newphyrexia", new GregorianCalendar(2011, 4, 4).getTime(), Constants.SetType.EXPANSION);
+        super("New Phyrexia", "NPH", "mage.sets.newphyrexia", new GregorianCalendar(2011, 4, 4).getTime(), Constants.SetType.EXPANSION);
         this.blockName = "Scars of Mirrodin";
         this.parentSet = ScarsOfMirrodin.getInstance();
         this.hasBoosters = true;
diff --git a/Mage.Sets/src/mage/sets/NinthEdition.java b/Mage.Sets/src/mage/sets/NinthEdition.java
index a4726314e6..6905607fc7 100644
--- a/Mage.Sets/src/mage/sets/NinthEdition.java
+++ b/Mage.Sets/src/mage/sets/NinthEdition.java
@@ -13,7 +13,7 @@ public class NinthEdition extends ExpansionSet {
     }
 
     private NinthEdition() {
-        super("Ninth Edition", "9ED", "", "mage.sets.ninthedition", new GregorianCalendar(2005, 7, 29).getTime(), SetType.CORE);
+        super("Ninth Edition", "9ED", "mage.sets.ninthedition", new GregorianCalendar(2005, 7, 29).getTime(), SetType.CORE);
         this.hasBoosters = true;
         this.numBoosterLands = 1;
         this.numBoosterCommon = 10;
diff --git a/Mage.Sets/src/mage/sets/Odyssey.java b/Mage.Sets/src/mage/sets/Odyssey.java
index a544dced2f..c369b4a5ae 100644
--- a/Mage.Sets/src/mage/sets/Odyssey.java
+++ b/Mage.Sets/src/mage/sets/Odyssey.java
@@ -43,7 +43,7 @@ public class Odyssey extends ExpansionSet {
     }
 
     private Odyssey() {
-        super("Odyssey", "ODY", "", "mage.sets.odyssey", new GregorianCalendar(2001, 9, 22).getTime(), Constants.SetType.EXPANSION);
+        super("Odyssey", "ODY", "mage.sets.odyssey", new GregorianCalendar(2001, 9, 22).getTime(), Constants.SetType.EXPANSION);
         this.blockName = "Odyssey";
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage.Sets/src/mage/sets/Onslaught.java b/Mage.Sets/src/mage/sets/Onslaught.java
index 3cff944bfc..14b64b1e21 100644
--- a/Mage.Sets/src/mage/sets/Onslaught.java
+++ b/Mage.Sets/src/mage/sets/Onslaught.java
@@ -13,7 +13,7 @@ public class Onslaught extends ExpansionSet {
     }
 
     private Onslaught() {
-        super("Onslaught", "ONS", "", "mage.sets.onslaught", new GregorianCalendar(2002, 10, 7).getTime(), Constants.SetType.EXPANSION);
+        super("Onslaught", "ONS", "mage.sets.onslaught", new GregorianCalendar(2002, 10, 7).getTime(), Constants.SetType.EXPANSION);
         this.blockName = "Onslaught";
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage.Sets/src/mage/sets/PlanarChaos.java b/Mage.Sets/src/mage/sets/PlanarChaos.java
index 9c00033a00..27d8996f61 100644
--- a/Mage.Sets/src/mage/sets/PlanarChaos.java
+++ b/Mage.Sets/src/mage/sets/PlanarChaos.java
@@ -44,7 +44,7 @@ public class PlanarChaos extends ExpansionSet {
     }
 
     private PlanarChaos() {
-        super("Planar Chaos", "PLC", "", "mage.sets.planarchaos", new GregorianCalendar(2007, 1, 2).getTime(), SetType.EXPANSION);
+        super("Planar Chaos", "PLC", "mage.sets.planarchaos", new GregorianCalendar(2007, 1, 2).getTime(), SetType.EXPANSION);
         this.blockName = "Time Spiral";
         this.parentSet = TimeSpiral.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/Planechase.java b/Mage.Sets/src/mage/sets/Planechase.java
index 0330e7bacc..e27f791041 100644
--- a/Mage.Sets/src/mage/sets/Planechase.java
+++ b/Mage.Sets/src/mage/sets/Planechase.java
@@ -45,7 +45,7 @@ public class Planechase extends ExpansionSet {
     }
 
     private Planechase() {
-        super("Planechase", "HOP", "", "mage.sets.planechase", new GregorianCalendar(2009, 8, 4).getTime(), SetType.REPRINT);
+        super("Planechase", "HOP", "mage.sets.planechase", new GregorianCalendar(2009, 8, 4).getTime(), SetType.REPRINT);
     }
 
 }
diff --git a/Mage.Sets/src/mage/sets/Planechase2012.java b/Mage.Sets/src/mage/sets/Planechase2012.java
index a505169cec..58923c53db 100644
--- a/Mage.Sets/src/mage/sets/Planechase2012.java
+++ b/Mage.Sets/src/mage/sets/Planechase2012.java
@@ -45,7 +45,7 @@ public class Planechase2012 extends ExpansionSet {
     }
 
     private Planechase2012() {
-        super("Planechase (2012 Edition)", "PC2", "", "mage.sets.planechase2012", new GregorianCalendar(2012, 6, 1).getTime(), SetType.REPRINT);
+        super("Planechase (2012 Edition)", "PC2", "mage.sets.planechase2012", new GregorianCalendar(2012, 6, 1).getTime(), SetType.REPRINT);
     }
 
 }
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/Planeshift.java b/Mage.Sets/src/mage/sets/Planeshift.java
index 0d0704227b..0419e87e03 100644
--- a/Mage.Sets/src/mage/sets/Planeshift.java
+++ b/Mage.Sets/src/mage/sets/Planeshift.java
@@ -44,7 +44,7 @@ public class Planeshift extends ExpansionSet {
     }
 
     private Planeshift() {
-        super("Planeshift", "PLS", "", "mage.sets.planeshift", new GregorianCalendar(2001, 1, 5).getTime(), SetType.EXPANSION);
+        super("Planeshift", "PLS", "mage.sets.planeshift", new GregorianCalendar(2001, 1, 5).getTime(), SetType.EXPANSION);
         this.blockName = "Invasion";
         this.parentSet = Invasion.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/Prophecy.java b/Mage.Sets/src/mage/sets/Prophecy.java
index 902f6a84c2..dc2b58f3ca 100644
--- a/Mage.Sets/src/mage/sets/Prophecy.java
+++ b/Mage.Sets/src/mage/sets/Prophecy.java
@@ -44,7 +44,7 @@ public class Prophecy extends ExpansionSet {
     }
 
     private Prophecy() {
-        super("Prophecy", "PCY", "", "mage.sets.prophecy", new GregorianCalendar(2000, 4, 27).getTime(), Constants.SetType.EXPANSION);
+        super("Prophecy", "PCY", "mage.sets.prophecy", new GregorianCalendar(2000, 4, 27).getTime(), Constants.SetType.EXPANSION);
         this.blockName = "Masques";
         this.parentSet = MercadianMasques.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/RavnicaCityOfGuilds.java b/Mage.Sets/src/mage/sets/RavnicaCityOfGuilds.java
index 6e5b0ef4e7..754cfaeaf2 100644
--- a/Mage.Sets/src/mage/sets/RavnicaCityOfGuilds.java
+++ b/Mage.Sets/src/mage/sets/RavnicaCityOfGuilds.java
@@ -45,7 +45,7 @@ public class RavnicaCityOfGuilds extends ExpansionSet {
     }
 
     private RavnicaCityOfGuilds() {
-        super("Ravnica: City of Guilds", "RAV", "seticon_RAV", "mage.sets.ravnika", new GregorianCalendar(2005, 9, 24).getTime(), SetType.EXPANSION);
+        super("Ravnica: City of Guilds", "RAV", "mage.sets.ravnika", new GregorianCalendar(2005, 9, 24).getTime(), SetType.EXPANSION);
         this.blockName = "Ravnika";
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage.Sets/src/mage/sets/ReturnToRavnica.java b/Mage.Sets/src/mage/sets/ReturnToRavnica.java
index d89b5d065b..33d9757407 100644
--- a/Mage.Sets/src/mage/sets/ReturnToRavnica.java
+++ b/Mage.Sets/src/mage/sets/ReturnToRavnica.java
@@ -45,7 +45,7 @@ public class ReturnToRavnica extends ExpansionSet {
     }
 
     private ReturnToRavnica() {
-        super("Return to Ravnica", "RTR", "seticon_mtgrtr", "mage.sets.returntoravnica", new GregorianCalendar(2012, 9, 29).getTime(), SetType.EXPANSION);
+        super("Return to Ravnica", "RTR", "mage.sets.returntoravnica", new GregorianCalendar(2012, 9, 29).getTime(), SetType.EXPANSION);
         this.blockName = "Return to Ravnica";
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage.Sets/src/mage/sets/RevisedEdition.java b/Mage.Sets/src/mage/sets/RevisedEdition.java
index 2c5405805a..05b25a9893 100644
--- a/Mage.Sets/src/mage/sets/RevisedEdition.java
+++ b/Mage.Sets/src/mage/sets/RevisedEdition.java
@@ -17,7 +17,7 @@ public class RevisedEdition extends ExpansionSet {
     }
 
     private RevisedEdition() {
-        super("Revised Edition", "3ED", "", "mage.sets.revisededition", new GregorianCalendar(1994, 3, 1).getTime(), Constants.SetType.CORE);
+        super("Revised Edition", "3ED", "mage.sets.revisededition", new GregorianCalendar(1994, 3, 1).getTime(), Constants.SetType.CORE);
         this.hasBoosters = true;
         this.numBoosterLands = 1;
         this.numBoosterCommon = 10;
diff --git a/Mage.Sets/src/mage/sets/RiseOfTheEldrazi.java b/Mage.Sets/src/mage/sets/RiseOfTheEldrazi.java
index 8075b47faa..78c62f6156 100644
--- a/Mage.Sets/src/mage/sets/RiseOfTheEldrazi.java
+++ b/Mage.Sets/src/mage/sets/RiseOfTheEldrazi.java
@@ -45,7 +45,7 @@ public class RiseOfTheEldrazi extends ExpansionSet {
     }
 
     private RiseOfTheEldrazi() {
-        super("Rise of the Eldrazi", "ROE", "seticon_ROE", "mage.sets.riseoftheeldrazi", new GregorianCalendar(2010, 3, 17).getTime(), SetType.EXPANSION);
+        super("Rise of the Eldrazi", "ROE", "mage.sets.riseoftheeldrazi", new GregorianCalendar(2010, 3, 17).getTime(), SetType.EXPANSION);
         this.blockName = "Zendikar";
         this.parentSet = Zendikar.getInstance();
         this.hasBoosters = true;
diff --git a/Mage.Sets/src/mage/sets/SaviorsOfKamigawa.java b/Mage.Sets/src/mage/sets/SaviorsOfKamigawa.java
index 5d0eff9ee0..4ca99190d6 100644
--- a/Mage.Sets/src/mage/sets/SaviorsOfKamigawa.java
+++ b/Mage.Sets/src/mage/sets/SaviorsOfKamigawa.java
@@ -44,7 +44,7 @@ public class SaviorsOfKamigawa extends ExpansionSet {
     }
 
     private SaviorsOfKamigawa() {
-        super("Saviors of Kamigawa", "SOK", "", "mage.sets.saviorsofkamigawa", new GregorianCalendar(2005, 5, 3).getTime(), SetType.EXPANSION);
+        super("Saviors of Kamigawa", "SOK", "mage.sets.saviorsofkamigawa", new GregorianCalendar(2005, 5, 3).getTime(), SetType.EXPANSION);
         this.blockName = "Kamigawa";
         this.parentSet = ChampionsOfKamigawa.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/ScarsOfMirrodin.java b/Mage.Sets/src/mage/sets/ScarsOfMirrodin.java
index 7c734077a4..857cfeb74b 100644
--- a/Mage.Sets/src/mage/sets/ScarsOfMirrodin.java
+++ b/Mage.Sets/src/mage/sets/ScarsOfMirrodin.java
@@ -46,7 +46,7 @@ public class ScarsOfMirrodin extends ExpansionSet {
     }
 
     private ScarsOfMirrodin() {
-        super("Scars of Mirrodin", "SOM", "seticon_mtgsom", "mage.sets.scarsofmirrodin", new GregorianCalendar(2010, 10, 1).getTime(), SetType.EXPANSION);
+        super("Scars of Mirrodin", "SOM", "mage.sets.scarsofmirrodin", new GregorianCalendar(2010, 10, 1).getTime(), SetType.EXPANSION);
         this.blockName = "Scars of Mirrodin";
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage.Sets/src/mage/sets/Scourge.java b/Mage.Sets/src/mage/sets/Scourge.java
index 6d1d45c83a..e815eb1675 100644
--- a/Mage.Sets/src/mage/sets/Scourge.java
+++ b/Mage.Sets/src/mage/sets/Scourge.java
@@ -44,7 +44,7 @@ public class Scourge extends ExpansionSet {
     }
 
     private Scourge() {
-        super("Scourge", "SCG", "", "mage.sets.scourge", new GregorianCalendar(2003, 5, 17).getTime(), Constants.SetType.EXPANSION);
+        super("Scourge", "SCG", "mage.sets.scourge", new GregorianCalendar(2003, 5, 17).getTime(), Constants.SetType.EXPANSION);
         this.blockName = "Onslaught";
         this.parentSet = Onslaught.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/SeventhEdition.java b/Mage.Sets/src/mage/sets/SeventhEdition.java
index 20dae0edcd..930c08e23c 100644
--- a/Mage.Sets/src/mage/sets/SeventhEdition.java
+++ b/Mage.Sets/src/mage/sets/SeventhEdition.java
@@ -44,7 +44,7 @@ public class SeventhEdition extends ExpansionSet {
     }
 
     private SeventhEdition() {
-        super("Seventh Edition", "7ED", "", "mage.sets.seventhedition", new GregorianCalendar(2001, 3, 11).getTime(), Constants.SetType.CORE);
+        super("Seventh Edition", "7ED", "mage.sets.seventhedition", new GregorianCalendar(2001, 3, 11).getTime(), Constants.SetType.CORE);
         this.hasBoosters = true;
         this.numBoosterLands = 1;
         this.numBoosterCommon = 10;
diff --git a/Mage.Sets/src/mage/sets/Shadowmoor.java b/Mage.Sets/src/mage/sets/Shadowmoor.java
index ead0b1a41c..229f3b21f7 100644
--- a/Mage.Sets/src/mage/sets/Shadowmoor.java
+++ b/Mage.Sets/src/mage/sets/Shadowmoor.java
@@ -44,7 +44,7 @@ public class Shadowmoor extends ExpansionSet {
     }
 
     private Shadowmoor() {
-        super("Shadowmoor", "SHM", "", "mage.sets.shadowmoor", new GregorianCalendar(2008, 4, 2).getTime(), SetType.EXPANSION);
+        super("Shadowmoor", "SHM", "mage.sets.shadowmoor", new GregorianCalendar(2008, 4, 2).getTime(), SetType.EXPANSION);
         this.blockName = "Shadowmoor";
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage.Sets/src/mage/sets/ShardsOfAlara.java b/Mage.Sets/src/mage/sets/ShardsOfAlara.java
index 8b20f5745e..e78683ef4a 100644
--- a/Mage.Sets/src/mage/sets/ShardsOfAlara.java
+++ b/Mage.Sets/src/mage/sets/ShardsOfAlara.java
@@ -45,7 +45,7 @@ public class ShardsOfAlara extends ExpansionSet {
     }
 
     private ShardsOfAlara() {
-        super("Shards of Alara", "ALA", "seticon_mtgala", "mage.sets.shardsofalara", new GregorianCalendar(2008, 8, 27).getTime(), SetType.EXPANSION);
+        super("Shards of Alara", "ALA", "mage.sets.shardsofalara", new GregorianCalendar(2008, 8, 27).getTime(), SetType.EXPANSION);
         this.blockName = "Shards of Alara";
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage.Sets/src/mage/sets/SixthEdition.java b/Mage.Sets/src/mage/sets/SixthEdition.java
index 4b21bd207e..daff5fd26f 100644
--- a/Mage.Sets/src/mage/sets/SixthEdition.java
+++ b/Mage.Sets/src/mage/sets/SixthEdition.java
@@ -44,7 +44,7 @@ public class SixthEdition extends ExpansionSet {
     }
 
     private SixthEdition() {
-        super("Sixth Edition", "6ED", "", "mage.sets.sixthedition", new GregorianCalendar(1999, 3, 28).getTime(), Constants.SetType.CORE);
+        super("Sixth Edition", "6ED", "mage.sets.sixthedition", new GregorianCalendar(1999, 3, 28).getTime(), Constants.SetType.CORE);
         this.hasBoosters = true;
         this.numBoosterLands = 1;
         this.numBoosterCommon = 10;
diff --git a/Mage.Sets/src/mage/sets/Stronghold.java b/Mage.Sets/src/mage/sets/Stronghold.java
index 9edc7c59e4..7b3856019b 100644
--- a/Mage.Sets/src/mage/sets/Stronghold.java
+++ b/Mage.Sets/src/mage/sets/Stronghold.java
@@ -44,7 +44,7 @@ public class Stronghold extends ExpansionSet {
     }
 
     private Stronghold() {
-        super("Stronghold", "STH", "", "mage.sets.stronghold", new GregorianCalendar(1998, 1, 21).getTime(), Constants.SetType.EXPANSION);
+        super("Stronghold", "STH", "mage.sets.stronghold", new GregorianCalendar(1998, 1, 21).getTime(), Constants.SetType.EXPANSION);
         this.blockName = "Tempest";
         this.parentSet = Tempest.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/Tempest.java b/Mage.Sets/src/mage/sets/Tempest.java
index aabbf466f5..e40bf6e91a 100644
--- a/Mage.Sets/src/mage/sets/Tempest.java
+++ b/Mage.Sets/src/mage/sets/Tempest.java
@@ -13,7 +13,7 @@ public class Tempest extends ExpansionSet {
     }
 
     private Tempest() {
-        super("Tempest", "TMP", "", "mage.sets.tempest", new GregorianCalendar(1997, 9, 1).getTime(), Constants.SetType.EXPANSION);
+        super("Tempest", "TMP", "mage.sets.tempest", new GregorianCalendar(1997, 9, 1).getTime(), Constants.SetType.EXPANSION);
         this.blockName = "Tempest";
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage.Sets/src/mage/sets/Tenth.java b/Mage.Sets/src/mage/sets/Tenth.java
index 2f301ad3ae..6a86a69b47 100644
--- a/Mage.Sets/src/mage/sets/Tenth.java
+++ b/Mage.Sets/src/mage/sets/Tenth.java
@@ -45,7 +45,7 @@ public class Tenth extends ExpansionSet {
     }
 
     private Tenth() {
-        super("Tenth Edition", "10E", "exp_symbol_mtg10e", "mage.sets.tenth", new GregorianCalendar(2007, 6, 14).getTime(), SetType.CORE);
+        super("Tenth Edition", "10E", "mage.sets.tenth", new GregorianCalendar(2007, 6, 14).getTime(), SetType.CORE);
         this.hasBoosters = true;
         this.numBoosterLands = 1;
         this.numBoosterCommon = 10;
diff --git a/Mage.Sets/src/mage/sets/TheDark.java b/Mage.Sets/src/mage/sets/TheDark.java
index 0f5dd4197f..e65181fc2d 100644
--- a/Mage.Sets/src/mage/sets/TheDark.java
+++ b/Mage.Sets/src/mage/sets/TheDark.java
@@ -44,7 +44,7 @@ public class TheDark extends ExpansionSet {
     }
 
     private TheDark() {
-        super("The Dark", "DRK", "", "mage.sets.thedark", new GregorianCalendar(1994, 7, 1).getTime(), Constants.SetType.EXPANSION);
+        super("The Dark", "DRK", "mage.sets.thedark", new GregorianCalendar(1994, 7, 1).getTime(), Constants.SetType.EXPANSION);
         this.hasBasicLands = false;
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage.Sets/src/mage/sets/TimeSpiral.java b/Mage.Sets/src/mage/sets/TimeSpiral.java
index 5ee7eb4c9e..bb6a0caac4 100644
--- a/Mage.Sets/src/mage/sets/TimeSpiral.java
+++ b/Mage.Sets/src/mage/sets/TimeSpiral.java
@@ -14,7 +14,7 @@ public class TimeSpiral extends ExpansionSet {
     }
 
     private TimeSpiral() {
-        super("Time Spiral", "TSP", "", "mage.sets.timespiral", new GregorianCalendar(2006, 9, 9).getTime(), Constants.SetType.EXPANSION);
+        super("Time Spiral", "TSP", "mage.sets.timespiral", new GregorianCalendar(2006, 9, 9).getTime(), Constants.SetType.EXPANSION);
         this.blockName = "Time Spiral";
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage.Sets/src/mage/sets/TimeSpiralTimeshifted.java b/Mage.Sets/src/mage/sets/TimeSpiralTimeshifted.java
index e5cff83aa1..efc35a7870 100644
--- a/Mage.Sets/src/mage/sets/TimeSpiralTimeshifted.java
+++ b/Mage.Sets/src/mage/sets/TimeSpiralTimeshifted.java
@@ -44,7 +44,7 @@ public class TimeSpiralTimeshifted extends ExpansionSet {
     }
 
     private TimeSpiralTimeshifted() {
-        super("Time Spiral \"Timeshifted\"", "TSB", "", "mage.sets.timeshifted", new GregorianCalendar(2006, 9, 9).getTime(), SetType.EXPANSION);
+        super("Time Spiral \"Timeshifted\"", "TSB", "mage.sets.timeshifted", new GregorianCalendar(2006, 9, 9).getTime(), SetType.EXPANSION);
         this.blockName = "Time Spiral";
         this.parentSet = TimeSpiral.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/Torment.java b/Mage.Sets/src/mage/sets/Torment.java
index 105c5355e8..66113067b9 100644
--- a/Mage.Sets/src/mage/sets/Torment.java
+++ b/Mage.Sets/src/mage/sets/Torment.java
@@ -44,7 +44,7 @@ public class Torment extends ExpansionSet {
     }
 
     private Torment() {
-        super("Torment", "TOR", "", "mage.sets.torment", new GregorianCalendar(2002, 0, 26).getTime(), Constants.SetType.EXPANSION);
+        super("Torment", "TOR", "mage.sets.torment", new GregorianCalendar(2002, 0, 26).getTime(), Constants.SetType.EXPANSION);
         this.blockName = "Odyssey";
         this.parentSet = Odyssey.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/UnlimitedEdition.java b/Mage.Sets/src/mage/sets/UnlimitedEdition.java
index 1fd5e11fc2..cbbd2552f1 100644
--- a/Mage.Sets/src/mage/sets/UnlimitedEdition.java
+++ b/Mage.Sets/src/mage/sets/UnlimitedEdition.java
@@ -17,7 +17,7 @@ public class UnlimitedEdition extends ExpansionSet {
     }
 
     private UnlimitedEdition() {
-        super("Unlimited Edition", "2ED", "", "mage.sets.unlimitededition", new GregorianCalendar(1993, 11, 1).getTime(), Constants.SetType.CORE);
+        super("Unlimited Edition", "2ED", "mage.sets.unlimitededition", new GregorianCalendar(1993, 11, 1).getTime(), Constants.SetType.CORE);
         this.hasBoosters = true;
         this.numBoosterLands = 1;
         this.numBoosterCommon = 10;
diff --git a/Mage.Sets/src/mage/sets/UrzasDestiny.java b/Mage.Sets/src/mage/sets/UrzasDestiny.java
index cefd170783..c713f4a5c2 100644
--- a/Mage.Sets/src/mage/sets/UrzasDestiny.java
+++ b/Mage.Sets/src/mage/sets/UrzasDestiny.java
@@ -44,7 +44,7 @@ public class UrzasDestiny extends ExpansionSet {
     }
 
     private UrzasDestiny() {
-        super("Urza's Destiny", "UDS", "exp_symbol_mtguds", "mage.sets.urzasdestiny", new GregorianCalendar(1999, 6, 23).getTime(), SetType.EXPANSION);
+        super("Urza's Destiny", "UDS", "mage.sets.urzasdestiny", new GregorianCalendar(1999, 6, 23).getTime(), SetType.EXPANSION);
         this.blockName = "Urza";
         this.parentSet = UrzasSaga.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/UrzasLegacy.java b/Mage.Sets/src/mage/sets/UrzasLegacy.java
index bee37d9c8f..d287027d03 100644
--- a/Mage.Sets/src/mage/sets/UrzasLegacy.java
+++ b/Mage.Sets/src/mage/sets/UrzasLegacy.java
@@ -46,7 +46,7 @@ public class UrzasLegacy extends ExpansionSet {
     }
 
     private UrzasLegacy() {
-        super("Urza's Legacy", "ULG", "exp_symbol_mtgulg", "mage.sets.urzaslegacy", new GregorianCalendar(1999, 2, 6).getTime(), SetType.EXPANSION);
+        super("Urza's Legacy", "ULG", "mage.sets.urzaslegacy", new GregorianCalendar(1999, 2, 6).getTime(), SetType.EXPANSION);
         this.blockName = "Urza";
         this.parentSet = UrzasSaga.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/UrzasSaga.java b/Mage.Sets/src/mage/sets/UrzasSaga.java
index 5d5a33e336..9c5cd95151 100644
--- a/Mage.Sets/src/mage/sets/UrzasSaga.java
+++ b/Mage.Sets/src/mage/sets/UrzasSaga.java
@@ -45,7 +45,7 @@ public class UrzasSaga extends ExpansionSet {
     }
 
     private UrzasSaga() {
-        super("Urza's Saga", "USG", "exp_symbol_mtgusg", "mage.sets.urzassaga", new GregorianCalendar(1998, 10, 1).getTime(), SetType.EXPANSION);
+        super("Urza's Saga", "USG", "mage.sets.urzassaga", new GregorianCalendar(1998, 10, 1).getTime(), SetType.EXPANSION);
         this.blockName = "Urza";
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage.Sets/src/mage/sets/Visions.java b/Mage.Sets/src/mage/sets/Visions.java
index 43dc5b3164..d97d1549f3 100644
--- a/Mage.Sets/src/mage/sets/Visions.java
+++ b/Mage.Sets/src/mage/sets/Visions.java
@@ -44,7 +44,7 @@ public class Visions extends ExpansionSet {
     }
 
     private Visions() {
-        super("Visions", "VIS", "", "mage.sets.visions", new GregorianCalendar(1997, 0, 11).getTime(), Constants.SetType.EXPANSION);
+        super("Visions", "VIS", "mage.sets.visions", new GregorianCalendar(1997, 0, 11).getTime(), Constants.SetType.EXPANSION);
         this.blockName = "Mirage";
         this.parentSet = Mirage.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/Weatherlight.java b/Mage.Sets/src/mage/sets/Weatherlight.java
index 667f978527..f5b78af064 100644
--- a/Mage.Sets/src/mage/sets/Weatherlight.java
+++ b/Mage.Sets/src/mage/sets/Weatherlight.java
@@ -46,7 +46,7 @@ public class Weatherlight extends ExpansionSet {
     }
 
     private Weatherlight() {
-        super("Weatherlight", "WTH", "exp_symbol_mtgwth", "mage.sets.weatherlight", new GregorianCalendar(1997, 5, 31).getTime(), SetType.EXPANSION);
+        super("Weatherlight", "WTH", "mage.sets.weatherlight", new GregorianCalendar(1997, 5, 31).getTime(), SetType.EXPANSION);
         this.blockName = "Mirage";
         this.parentSet = Mirage.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/Worldwake.java b/Mage.Sets/src/mage/sets/Worldwake.java
index 4f08bdcfec..6fe69adb46 100644
--- a/Mage.Sets/src/mage/sets/Worldwake.java
+++ b/Mage.Sets/src/mage/sets/Worldwake.java
@@ -45,7 +45,7 @@ public class Worldwake extends ExpansionSet {
     }
 
     private Worldwake() {
-        super("Worldwake", "WWK", "seticon_WWK", "mage.sets.worldwake", new GregorianCalendar(2010, 0, 30).getTime(), SetType.EXPANSION);
+        super("Worldwake", "WWK", "mage.sets.worldwake", new GregorianCalendar(2010, 0, 30).getTime(), SetType.EXPANSION);
         this.blockName = "Zendikar";
         this.parentSet = Zendikar.getInstance();
         this.hasBasicLands = false;
diff --git a/Mage.Sets/src/mage/sets/Zendikar.java b/Mage.Sets/src/mage/sets/Zendikar.java
index 50c802e388..8ccb42c204 100644
--- a/Mage.Sets/src/mage/sets/Zendikar.java
+++ b/Mage.Sets/src/mage/sets/Zendikar.java
@@ -45,7 +45,7 @@ public class Zendikar extends ExpansionSet {
     }
 
     private Zendikar() {
-        super("Zendikar", "ZEN", "seticon_ZEN", "mage.sets.zendikar", new GregorianCalendar(2009, 8, 26).getTime(), SetType.EXPANSION);
+        super("Zendikar", "ZEN", "mage.sets.zendikar", new GregorianCalendar(2009, 8, 26).getTime(), SetType.EXPANSION);
         this.blockName = "Zendikar";
         this.hasBoosters = true;
         this.numBoosterLands = 1;
diff --git a/Mage/src/mage/cards/ExpansionSet.java b/Mage/src/mage/cards/ExpansionSet.java
index 6c0193dd29..c6d7e7cfdd 100644
--- a/Mage/src/mage/cards/ExpansionSet.java
+++ b/Mage/src/mage/cards/ExpansionSet.java
@@ -33,28 +33,25 @@ import mage.Constants.SetType;
 import mage.cards.repository.CardCriteria;
 import mage.cards.repository.CardInfo;
 import mage.cards.repository.CardRepository;
-import org.apache.log4j.Logger;
 
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Random;
 
 /**
  * @author BetaSteward_at_googlemail.com
  */
 public abstract class ExpansionSet implements Serializable {
 
-    private static final Logger logger = Logger.getLogger(ExpansionSet.class);
-
     protected static Random rnd = new Random();
 
     protected String name;
     protected String code;
-    protected String symbolCode;
     protected Date releaseDate;
     protected ExpansionSet parentSet;
-    protected List<Card> cards;
     protected SetType setType;
-    protected Map<Rarity, List<Card>> rarities;
     protected boolean hasBasicLands = true;
 
     protected String blockName;
@@ -69,10 +66,9 @@ public abstract class ExpansionSet implements Serializable {
 
     protected String packageName;
 
-    public ExpansionSet(String name, String code, String symbolCode, String packageName, Date releaseDate, SetType setType) {
+    public ExpansionSet(String name, String code, String packageName, Date releaseDate, SetType setType) {
         this.name = name;
         this.code = code;
-        this.symbolCode = symbolCode;
         this.releaseDate = releaseDate;
         this.setType = setType;
         this.packageName = packageName;
@@ -86,10 +82,6 @@ public abstract class ExpansionSet implements Serializable {
         return code;
     }
 
-    public String getSymbolCode() {
-        return symbolCode;
-    }
-
     public Date getReleaseDate() {
         return releaseDate;
     }