diff --git a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java
index 2209c4cbc15..f2c684c097c 100644
--- a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java
+++ b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java
@@ -1026,6 +1026,9 @@ public static Fluid registerFluid(String name, String fluidName, String blockNam
         block.setBlockName(blockName);
         GameRegistry.registerBlock(block, blockName);
 
+        fluid.setBlock(block);
+        block.setFluid(fluid);
+
         // if the fluid was already registered we use that one instead
         if (isFluidPreRegistered)
         {
diff --git a/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java b/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java
index a26f160a7f0..94e9ea714ed 100644
--- a/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java
+++ b/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java
@@ -14,6 +14,7 @@ public class TConstructFluid extends BlockFluidClassic
     public IIcon stillIcon;
     public IIcon flowIcon;
     boolean overwriteFluidIcons = true;
+    private Fluid fluid = null;
 
     public TConstructFluid(Fluid fluid, Material material, String texture)
     {
@@ -42,6 +43,9 @@ public void registerBlockIcons (IIconRegister iconRegister)
 
         if (overwriteFluidIcons)
             this.getFluid().setIcons(stillIcon, flowIcon);
+
+        if(this.getFluid().getBlock() != this && fluid != null)
+            fluid.setIcons(stillIcon, flowIcon);
     }
 
     @Override
@@ -58,4 +62,7 @@ public void suppressOverwritingFluidIcons ()
         overwriteFluidIcons = false;
     }
 
+    public void setFluid(Fluid fluid) {
+        this.fluid = fluid;
+    }
 }
\ No newline at end of file