diff --git a/src/main/java/storagecraft/block/BlockSolderer.java b/src/main/java/storagecraft/block/BlockSolderer.java
index 294eceaed..533322919 100644
--- a/src/main/java/storagecraft/block/BlockSolderer.java
+++ b/src/main/java/storagecraft/block/BlockSolderer.java
@@ -1,14 +1,21 @@
 package storagecraft.block;
 
 import net.minecraft.block.ITileEntityProvider;
+import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import storagecraft.StorageCraft;
 import storagecraft.tile.TileSolderer;
 
 public class BlockSolderer extends BlockBase implements ITileEntityProvider
 {
+	private IIcon sideIcon;
+	private IIcon connectedIcon;
+	private IIcon disconnectedIcon;
+
 	public BlockSolderer()
 	{
 		super("solderer");
@@ -30,4 +37,36 @@ public class BlockSolderer extends BlockBase implements ITileEntityProvider
 
 		return true;
 	}
+
+	@Override
+	public void registerBlockIcons(IIconRegister register)
+	{
+		connectedIcon = register.registerIcon("storagecraft:soldererConnected");
+		disconnectedIcon = register.registerIcon("storagecraft:soldererDisconnected");
+		sideIcon = register.registerIcon("storagecraft:generic");
+	}
+
+	@Override
+	public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side)
+	{
+		TileSolderer tile = (TileSolderer) world.getTileEntity(x, y, z);
+
+		if (side == tile.getDirection().ordinal())
+		{
+			return tile.isConnected() ? connectedIcon : disconnectedIcon;
+		}
+
+		return sideIcon;
+	}
+
+	@Override
+	public IIcon getIcon(int side, int damage)
+	{
+		if (side == 3)
+		{
+			return disconnectedIcon;
+		}
+
+		return sideIcon;
+	}
 }
diff --git a/src/main/java/storagecraft/nei/NEIConfig.java b/src/main/java/storagecraft/nei/NEIConfig.java
index 818c16a4c..90ae63cfc 100644
--- a/src/main/java/storagecraft/nei/NEIConfig.java
+++ b/src/main/java/storagecraft/nei/NEIConfig.java
@@ -11,7 +11,6 @@ public class NEIConfig implements IConfigureNEI
 	{
 		API.registerRecipeHandler(new CraftingHandlerSolderer());
 		API.registerUsageHandler(new CraftingHandlerSolderer());
-		// API.setGuiOffset(GuiSolderer.class, 0, 0);
 	}
 
 	@Override
diff --git a/src/main/resources/assets/storagecraft/textures/blocks/soldererConnected.png b/src/main/resources/assets/storagecraft/textures/blocks/soldererConnected.png
new file mode 100644
index 000000000..a878f35ad
Binary files /dev/null and b/src/main/resources/assets/storagecraft/textures/blocks/soldererConnected.png differ
diff --git a/src/main/resources/assets/storagecraft/textures/blocks/soldererDisconnected.png b/src/main/resources/assets/storagecraft/textures/blocks/soldererDisconnected.png
new file mode 100644
index 000000000..d74c3b694
Binary files /dev/null and b/src/main/resources/assets/storagecraft/textures/blocks/soldererDisconnected.png differ