diff --git a/common/mekanism/client/render/MekanismRenderer.java b/common/mekanism/client/render/MekanismRenderer.java
index 0afde58ac..5460d0ec6 100644
--- a/common/mekanism/client/render/MekanismRenderer.java
+++ b/common/mekanism/client/render/MekanismRenderer.java
@@ -82,7 +82,13 @@ public class MekanismRenderer
 			{
 				if(gas instanceof OreGas)
 				{
-					gas.setIcon(event.map.registerIcon("mekanism:LiquidOre"));
+					if(gas.getUnlocalizedName().contains("clean"))
+					{
+						gas.setIcon(event.map.registerIcon("mekanism:LiquidCleanOre"));
+					}
+					else {
+						gas.setIcon(event.map.registerIcon("mekanism:LiquidOre"));
+					}
 				}
 			}
 
diff --git a/common/mekanism/common/multipart/PartSidedPipe.java b/common/mekanism/common/multipart/PartSidedPipe.java
index 04698c74a..172f81e10 100644
--- a/common/mekanism/common/multipart/PartSidedPipe.java
+++ b/common/mekanism/common/multipart/PartSidedPipe.java
@@ -461,13 +461,16 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
 			}
 		}
 		
-		onRefresh();
-		
 		if(!world().isRemote)
 		{
 			currentTransmitterConnections = possibleTransmitters;
 			currentAcceptorConnections = possibleAcceptors;
-			
+		}
+		
+		onRefresh();
+		
+		if(!world().isRemote)
+		{			
 			sendDesc = true;
 		}
 	}
@@ -611,7 +614,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
 	
 	public boolean canConnectToAcceptor(ForgeDirection side, boolean ignoreActive)
 	{
-		if(!isValidAcceptor(Coord4D.get(tile()).getFromSide(side).getTileEntity(world()), side))
+		if(!isValidAcceptor(Coord4D.get(tile()).getFromSide(side).getTileEntity(world()), side) || !connectionMapContainsSide(currentAcceptorConnections, side))
 		{
 			return false;
 		}
diff --git a/resources/assets/mekanism/textures/blocks/LiquidCleanOre.png b/resources/assets/mekanism/textures/blocks/LiquidCleanOre.png
new file mode 100644
index 000000000..12a045fea
Binary files /dev/null and b/resources/assets/mekanism/textures/blocks/LiquidCleanOre.png differ
diff --git a/resources/assets/mekanism/textures/blocks/LiquidCleanOre.png.mcmeta b/resources/assets/mekanism/textures/blocks/LiquidCleanOre.png.mcmeta
new file mode 100644
index 000000000..4b721e09a
--- /dev/null
+++ b/resources/assets/mekanism/textures/blocks/LiquidCleanOre.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}