diff --git a/src/main/java/cpw/mods/ironchest/BlockIronChest.java b/src/main/java/cpw/mods/ironchest/BlockIronChest.java
index c674ad2..49b82f7 100644
--- a/src/main/java/cpw/mods/ironchest/BlockIronChest.java
+++ b/src/main/java/cpw/mods/ironchest/BlockIronChest.java
@@ -33,6 +33,9 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockIronChest extends BlockContainer {
+	@SideOnly(Side.CLIENT)
+    public static IIcon icon[] = new IIcon[IronChestType.values().length];
+
     public BlockIronChest()
     {
         super(Material.iron);
@@ -68,14 +71,22 @@ public class BlockIronChest extends BlockContainer {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public IIcon getIcon(int i, int j)
+    public void registerBlockIcons(IIconRegister r)
     {
-        if (j < IronChestType.values().length)
-        {
-            IronChestType type = IronChestType.values()[j];
-            return type.getIcon(i);
-        }
-        return null;
+    	for (IronChestType type : IronChestType.values())
+    	{
+    		if (type.isValidForCreativeMode())
+    		{
+    			icon[type.ordinal()] = r.registerIcon("ironchest:" + type.name().toLowerCase());
+    		}
+    	}
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public IIcon getIcon(int side, int meta)
+    {
+    	return icon[meta];
     }
 
     @Override
@@ -238,16 +249,6 @@ public class BlockIronChest extends BlockContainer {
         return 0;
     }
 
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void registerBlockIcons(IIconRegister par1IconRegister)
-    {
-        for (IronChestType typ: IronChestType.values())
-        {
-            typ.makeIcons(par1IconRegister);
-        }
-    }
-
     @Override
     public ForgeDirection[] getValidRotations(World worldObj, int x, int y, int z)
     {
diff --git a/src/main/java/cpw/mods/ironchest/IronChestType.java b/src/main/java/cpw/mods/ironchest/IronChestType.java
index 8c1bb73..e69eec2 100644
--- a/src/main/java/cpw/mods/ironchest/IronChestType.java
+++ b/src/main/java/cpw/mods/ironchest/IronChestType.java
@@ -4,17 +4,13 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagByte;
-import net.minecraft.util.IIcon;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public enum IronChestType {
     IRON(54, 9, true, "Iron Chest", "ironchest.png", 0, Arrays.asList("ingotIron", "ingotRefinedIron"), TileEntityIronChest.class, "mmmmPmmmm", "mGmG3GmGm"),
@@ -204,32 +200,6 @@ public enum IronChestType {
         return this == OBSIDIAN;
     }
 
-    @SideOnly(Side.CLIENT)
-    private IIcon[] icons;
-
-    @SideOnly(Side.CLIENT)
-    public void makeIcons(IIconRegister par1IconRegister)
-    {
-        if (isValidForCreativeMode())
-        {
-            icons = new IIcon[3];
-            int i = 0;
-            for (String s : sideNames)
-            {
-                icons[i++] = par1IconRegister.registerIcon(String.format("ironchest:%s_%s",name().toLowerCase(),s));
-            }
-        }
-    }
-
-    @SideOnly(Side.CLIENT)
-    public IIcon getIcon(int side)
-    {
-        return icons[sideMapping[side]];
-    }
-
-    private static String[] sideNames = { "top", "front", "side" };
-    private static int[] sideMapping = { 0, 0, 2, 1, 2, 2, 2 };
-
     public boolean acceptsStack(ItemStack itemstack)
     {
         return itemFilter == null || itemstack == null || itemstack.getItem() == itemFilter;
diff --git a/src/main/resources/assets/ironchest/textures/blocks/copper_top.png b/src/main/resources/assets/ironchest/textures/blocks/copper.png
similarity index 100%
rename from src/main/resources/assets/ironchest/textures/blocks/copper_top.png
rename to src/main/resources/assets/ironchest/textures/blocks/copper.png
diff --git a/src/main/resources/assets/ironchest/textures/blocks/copper_front.png b/src/main/resources/assets/ironchest/textures/blocks/copper_front.png
deleted file mode 100644
index 8ca415c..0000000
Binary files a/src/main/resources/assets/ironchest/textures/blocks/copper_front.png and /dev/null differ
diff --git a/src/main/resources/assets/ironchest/textures/blocks/copper_side.png b/src/main/resources/assets/ironchest/textures/blocks/copper_side.png
deleted file mode 100644
index 864e950..0000000
Binary files a/src/main/resources/assets/ironchest/textures/blocks/copper_side.png and /dev/null differ
diff --git a/src/main/resources/assets/ironchest/textures/blocks/crystal_top.png b/src/main/resources/assets/ironchest/textures/blocks/crystal.png
similarity index 100%
rename from src/main/resources/assets/ironchest/textures/blocks/crystal_top.png
rename to src/main/resources/assets/ironchest/textures/blocks/crystal.png
diff --git a/src/main/resources/assets/ironchest/textures/blocks/crystal_front.png b/src/main/resources/assets/ironchest/textures/blocks/crystal_front.png
deleted file mode 100644
index c517953..0000000
Binary files a/src/main/resources/assets/ironchest/textures/blocks/crystal_front.png and /dev/null differ
diff --git a/src/main/resources/assets/ironchest/textures/blocks/crystal_side.png b/src/main/resources/assets/ironchest/textures/blocks/crystal_side.png
deleted file mode 100644
index 842cc18..0000000
Binary files a/src/main/resources/assets/ironchest/textures/blocks/crystal_side.png and /dev/null differ
diff --git a/src/main/resources/assets/ironchest/textures/blocks/diamond_top.png b/src/main/resources/assets/ironchest/textures/blocks/diamond.png
similarity index 100%
rename from src/main/resources/assets/ironchest/textures/blocks/diamond_top.png
rename to src/main/resources/assets/ironchest/textures/blocks/diamond.png
diff --git a/src/main/resources/assets/ironchest/textures/blocks/diamond_front.png b/src/main/resources/assets/ironchest/textures/blocks/diamond_front.png
deleted file mode 100644
index d5e6373..0000000
Binary files a/src/main/resources/assets/ironchest/textures/blocks/diamond_front.png and /dev/null differ
diff --git a/src/main/resources/assets/ironchest/textures/blocks/diamond_side.png b/src/main/resources/assets/ironchest/textures/blocks/diamond_side.png
deleted file mode 100644
index 3c69947..0000000
Binary files a/src/main/resources/assets/ironchest/textures/blocks/diamond_side.png and /dev/null differ
diff --git a/src/main/resources/assets/ironchest/textures/blocks/dirtchest9000_top.png b/src/main/resources/assets/ironchest/textures/blocks/dirtchest9000.png
similarity index 100%
rename from src/main/resources/assets/ironchest/textures/blocks/dirtchest9000_top.png
rename to src/main/resources/assets/ironchest/textures/blocks/dirtchest9000.png
diff --git a/src/main/resources/assets/ironchest/textures/blocks/dirtchest9000_front.png b/src/main/resources/assets/ironchest/textures/blocks/dirtchest9000_front.png
deleted file mode 100644
index 4e1e1fd..0000000
Binary files a/src/main/resources/assets/ironchest/textures/blocks/dirtchest9000_front.png and /dev/null differ
diff --git a/src/main/resources/assets/ironchest/textures/blocks/dirtchest9000_side.png b/src/main/resources/assets/ironchest/textures/blocks/dirtchest9000_side.png
deleted file mode 100644
index ebda19f..0000000
Binary files a/src/main/resources/assets/ironchest/textures/blocks/dirtchest9000_side.png and /dev/null differ
diff --git a/src/main/resources/assets/ironchest/textures/blocks/gold_top.png b/src/main/resources/assets/ironchest/textures/blocks/gold.png
similarity index 100%
rename from src/main/resources/assets/ironchest/textures/blocks/gold_top.png
rename to src/main/resources/assets/ironchest/textures/blocks/gold.png
diff --git a/src/main/resources/assets/ironchest/textures/blocks/gold_front.png b/src/main/resources/assets/ironchest/textures/blocks/gold_front.png
deleted file mode 100644
index 56f1d4d..0000000
Binary files a/src/main/resources/assets/ironchest/textures/blocks/gold_front.png and /dev/null differ
diff --git a/src/main/resources/assets/ironchest/textures/blocks/gold_side.png b/src/main/resources/assets/ironchest/textures/blocks/gold_side.png
deleted file mode 100644
index f06fb4f..0000000
Binary files a/src/main/resources/assets/ironchest/textures/blocks/gold_side.png and /dev/null differ
diff --git a/src/main/resources/assets/ironchest/textures/blocks/iron_top.png b/src/main/resources/assets/ironchest/textures/blocks/iron.png
similarity index 100%
rename from src/main/resources/assets/ironchest/textures/blocks/iron_top.png
rename to src/main/resources/assets/ironchest/textures/blocks/iron.png
diff --git a/src/main/resources/assets/ironchest/textures/blocks/iron_front.png b/src/main/resources/assets/ironchest/textures/blocks/iron_front.png
deleted file mode 100644
index a3db415..0000000
Binary files a/src/main/resources/assets/ironchest/textures/blocks/iron_front.png and /dev/null differ
diff --git a/src/main/resources/assets/ironchest/textures/blocks/iron_side.png b/src/main/resources/assets/ironchest/textures/blocks/iron_side.png
deleted file mode 100644
index 1486949..0000000
Binary files a/src/main/resources/assets/ironchest/textures/blocks/iron_side.png and /dev/null differ
diff --git a/src/main/resources/assets/ironchest/textures/blocks/obsidian_top.png b/src/main/resources/assets/ironchest/textures/blocks/obsidian.png
similarity index 100%
rename from src/main/resources/assets/ironchest/textures/blocks/obsidian_top.png
rename to src/main/resources/assets/ironchest/textures/blocks/obsidian.png
diff --git a/src/main/resources/assets/ironchest/textures/blocks/obsidian_front.png b/src/main/resources/assets/ironchest/textures/blocks/obsidian_front.png
deleted file mode 100644
index ed1ef0d..0000000
Binary files a/src/main/resources/assets/ironchest/textures/blocks/obsidian_front.png and /dev/null differ
diff --git a/src/main/resources/assets/ironchest/textures/blocks/obsidian_side.png b/src/main/resources/assets/ironchest/textures/blocks/obsidian_side.png
deleted file mode 100644
index dc8d227..0000000
Binary files a/src/main/resources/assets/ironchest/textures/blocks/obsidian_side.png and /dev/null differ
diff --git a/src/main/resources/assets/ironchest/textures/blocks/silver_top.png b/src/main/resources/assets/ironchest/textures/blocks/silver.png
similarity index 100%
rename from src/main/resources/assets/ironchest/textures/blocks/silver_top.png
rename to src/main/resources/assets/ironchest/textures/blocks/silver.png
diff --git a/src/main/resources/assets/ironchest/textures/blocks/silver_front.png b/src/main/resources/assets/ironchest/textures/blocks/silver_front.png
deleted file mode 100644
index 3a8a37e..0000000
Binary files a/src/main/resources/assets/ironchest/textures/blocks/silver_front.png and /dev/null differ
diff --git a/src/main/resources/assets/ironchest/textures/blocks/silver_side.png b/src/main/resources/assets/ironchest/textures/blocks/silver_side.png
deleted file mode 100644
index d4df077..0000000
Binary files a/src/main/resources/assets/ironchest/textures/blocks/silver_side.png and /dev/null differ