diff --git a/resources/assets/resonantinduction/textures/items/models/lainWire.png b/resources/assets/resonantinduction/textures/items/models/flatWire.png
similarity index 100%
rename from resources/assets/resonantinduction/textures/items/models/lainWire.png
rename to resources/assets/resonantinduction/textures/items/models/flatWire.png
diff --git a/resources/assets/resonantinduction/textures/items/models/insulationtiny.png b/resources/assets/resonantinduction/textures/items/models/insulationtiny.png
deleted file mode 100644
index ca3dbc44..00000000
Binary files a/resources/assets/resonantinduction/textures/items/models/insulationtiny.png and /dev/null differ
diff --git a/resources/assets/resonantinduction/textures/items/models/wire.png b/resources/assets/resonantinduction/textures/items/models/wire.png
deleted file mode 100644
index 1244ffb7..00000000
Binary files a/resources/assets/resonantinduction/textures/items/models/wire.png and /dev/null differ
diff --git a/src/resonantinduction/wire/ItemPartWire.java b/src/resonantinduction/wire/ItemPartWire.java
index b47eb9e1..bbcd5d5a 100644
--- a/src/resonantinduction/wire/ItemPartWire.java
+++ b/src/resonantinduction/wire/ItemPartWire.java
@@ -14,7 +14,6 @@ import resonantinduction.ResonantInduction;
 import resonantinduction.TabRI;
 import resonantinduction.Utility;
 import resonantinduction.wire.part.FlatWire;
-import resonantinduction.wire.render.RenderPartWire;
 import universalelectricity.api.energy.UnitDisplay;
 import universalelectricity.api.energy.UnitDisplay.Unit;
 import codechicken.lib.vec.BlockCoord;
@@ -27,6 +26,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class ItemPartWire extends JItemMultiPart
 {
+	public static Icon flatWireTexture;
 	private Icon[] icons = new Icon[EnumWireMaterial.values().length];
 
 	public ItemPartWire(int id)
@@ -86,7 +86,7 @@ public class ItemPartWire extends JItemMultiPart
 			icons[material.ordinal()] = register.registerIcon(ResonantInduction.PREFIX + "wire." + EnumWireMaterial.values()[material.ordinal()].getName().toLowerCase());
 		}
 
-		RenderPartWire.registerIcons(register);
+		flatWireTexture = register.registerIcon(ResonantInduction.PREFIX + "models/flatWire");
 	}
 
 	@Override
diff --git a/src/resonantinduction/wire/part/FlatWire.java b/src/resonantinduction/wire/part/FlatWire.java
index 3673dc9e..368cf725 100644
--- a/src/resonantinduction/wire/part/FlatWire.java
+++ b/src/resonantinduction/wire/part/FlatWire.java
@@ -14,8 +14,8 @@ import org.lwjgl.opengl.GL11;
 import resonantinduction.Utility;
 import resonantinduction.wire.EnumWireMaterial;
 import resonantinduction.wire.IAdvancedConductor;
+import resonantinduction.wire.ItemPartWire;
 import resonantinduction.wire.render.RenderFlatWire;
-import resonantinduction.wire.render.RenderPartWire;
 import codechicken.lib.colour.Colour;
 import codechicken.lib.data.MCDataInput;
 import codechicken.lib.data.MCDataOutput;
@@ -198,7 +198,7 @@ public class FlatWire extends PartWireBase implements TFacePart, JNormalOcclusio
 			connMap = 0;
 
 			updateInternalConnections();
-			
+
 			if (updateOpenConnections())
 			{
 				updateExternalConnections();
@@ -212,14 +212,14 @@ public class FlatWire extends PartWireBase implements TFacePart, JNormalOcclusio
 	public void onAdded()
 	{
 		super.onAdded();
-		
+
 		if (!world().isRemote)
 		{
 			updateOpenConnections();
 			boolean changed = updateInternalConnections();
 			// don't use || because it's fail fast
 			changed |= updateExternalConnections();
-			
+
 			if (changed)
 			{
 				sendConnUpdate();
@@ -279,10 +279,12 @@ public class FlatWire extends PartWireBase implements TFacePart, JNormalOcclusio
 
 		for (int r = 0; r < 4; r++)
 		{
-			/*if (!maskOpen(r))
-			{
-				continue;
-			}*/
+			/*
+			 * if (!maskOpen(r))
+			 * {
+			 * continue;
+			 * }
+			 */
 
 			if (connectStraight(r))
 			{
@@ -621,7 +623,7 @@ public class FlatWire extends PartWireBase implements TFacePart, JNormalOcclusio
 	@SideOnly(Side.CLIENT)
 	public Icon getIcon()
 	{
-		return RenderPartWire.lainWireIcon;
+		return ItemPartWire.flatWireTexture;
 	}
 
 	public Colour getColour()