diff --git a/core/assets-raw/sprites/blocks/production/pulverizer-rotator.png b/core/assets-raw/sprites/blocks/production/pulverizer-rotator.png
index f5522cfd11..e89e5ed5e7 100644
Binary files a/core/assets-raw/sprites/blocks/production/pulverizer-rotator.png and b/core/assets-raw/sprites/blocks/production/pulverizer-rotator.png differ
diff --git a/core/assets-raw/sprites/blocks/production/pulverizer-top.png b/core/assets-raw/sprites/blocks/production/pulverizer-top.png
index 621e52e4cb..6c2aa6d653 100644
Binary files a/core/assets-raw/sprites/blocks/production/pulverizer-top.png and b/core/assets-raw/sprites/blocks/production/pulverizer-top.png differ
diff --git a/core/assets-raw/sprites/blocks/production/pulverizer.png b/core/assets-raw/sprites/blocks/production/pulverizer.png
index 1132418067..bd07997cdf 100644
Binary files a/core/assets-raw/sprites/blocks/production/pulverizer.png and b/core/assets-raw/sprites/blocks/production/pulverizer.png differ
diff --git a/core/src/mindustry/world/draw/DrawLiquid.java b/core/src/mindustry/world/draw/DrawLiquid.java
index 2ea18ae1b1..16cfd14934 100644
--- a/core/src/mindustry/world/draw/DrawLiquid.java
+++ b/core/src/mindustry/world/draw/DrawLiquid.java
@@ -10,16 +10,19 @@ import mindustry.world.blocks.production.GenericCrafter.*;
 public class DrawLiquid extends DrawBlock{
     public TextureRegion liquid, top;
 
-    public void draw(GenericCrafterBuild entity){
-        Draw.rect(entity.block.region, entity.x, entity.y);
+    @Override
+    public void draw(GenericCrafterBuild build){
+        Draw.rect(build.block.region, build.x, build.y);
+        GenericCrafter type = (GenericCrafter)build.block;
 
-        if(entity.liquids.total() > 0.001f){
-            Drawf.liquid(liquid, entity.x, entity.y,
-                entity.liquids.get(((GenericCrafter)entity.block).outputLiquid.liquid) / entity.block.liquidCapacity,
-                ((GenericCrafter)entity.block).outputLiquid.liquid.color);
+        if(type.outputLiquid != null && build.liquids.get(type.outputLiquid.liquid) > 0){
+            Drawf.liquid(liquid, build.x, build.y,
+                build.liquids.get(type.outputLiquid.liquid) / type.liquidCapacity,
+                type.outputLiquid.liquid.color
+            );
         }
 
-        if(top.found()) Draw.rect(top, entity.x, entity.y);
+        if(top.found()) Draw.rect(top, build.x, build.y);
     }
 
     @Override
@@ -28,6 +31,7 @@ public class DrawLiquid extends DrawBlock{
         liquid = Core.atlas.find(block.name + "-liquid");
     }
 
+    @Override
     public TextureRegion[] icons(Block block){
         return top.found() ? new TextureRegion[]{block.region, top} : new TextureRegion[]{block.region};
     }
diff --git a/core/src/mindustry/world/draw/DrawRotator.java b/core/src/mindustry/world/draw/DrawRotator.java
index 0b2fbe7151..5d75b77825 100644
--- a/core/src/mindustry/world/draw/DrawRotator.java
+++ b/core/src/mindustry/world/draw/DrawRotator.java
@@ -9,10 +9,10 @@ public class DrawRotator extends DrawBlock{
     public TextureRegion rotator, top;
 
     @Override
-    public void draw(GenericCrafterBuild entity){
-        Draw.rect(entity.block.region, entity.x, entity.y);
-        Draw.rect(rotator, entity.x, entity.y, entity.totalProgress * 2f);
-        if(top.found()) Draw.rect(top, entity.x, entity.y);
+    public void draw(GenericCrafterBuild build){
+        Draw.rect(build.block.region, build.x, build.y);
+        Draw.rect(rotator, build.x, build.y, build.totalProgress * 2f);
+        if(top.found()) Draw.rect(top, build.x, build.y);
     }
 
     @Override