diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png
index 169d20ee31..add890caaf 100644
Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ
diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java
index e903d0af6c..c3526feb10 100644
--- a/core/src/mindustry/core/Renderer.java
+++ b/core/src/mindustry/core/Renderer.java
@@ -180,6 +180,7 @@ public class Renderer implements ApplicationListener{
         }
 
         graphics.clear(clearColor);
+        Draw.reset();
 
         //TODO 'animated water' is a bad name for this setting
         if(Core.settings.getBool("animatedwater") || Core.settings.getBool("animatedshields")){
@@ -204,7 +205,7 @@ public class Renderer implements ApplicationListener{
             blocks.floor.endDraw();
         });
 
-        Draw.drawRange(Layer.blockBuilding, () -> Draw.shader(Shaders.blockbuild, false), Draw::shader);
+        Draw.drawRange(Layer.blockBuilding, () -> Draw.shader(Shaders.blockbuild, true), Draw::shader);
 
         if(state.rules.lighting){
             Draw.draw(Layer.light, lights::draw);
diff --git a/core/src/mindustry/world/blocks/BuildBlock.java b/core/src/mindustry/world/blocks/BuildBlock.java
index 64352eb073..833a7e137b 100644
--- a/core/src/mindustry/world/blocks/BuildBlock.java
+++ b/core/src/mindustry/world/blocks/BuildBlock.java
@@ -169,14 +169,7 @@ public class BuildBlock extends Block{
 
         @Override
         public void draw(){
-            //When breaking, don't draw the previous block... since it's the thing you were breaking
-            if(cblock != null && previous == cblock){
-                return;
-            }
-
-            if(previous == null || cblock == null) return;
-
-            if(Core.atlas.isFound(previous.icon(Cicon.full))){
+            if(!(previous == null || cblock == null || previous == cblock) && Core.atlas.isFound(previous.icon(Cicon.full))){
                 Draw.rect(previous.icon(Cicon.full), x, y, previous.rotate ? tile.rotation() * 90 : 0);
             }