diff --git a/core/assets-raw/sprites/blocks/distribution/mass-driver-turret.png b/core/assets-raw/sprites/blocks/distribution/mass-driver.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/distribution/mass-driver-turret.png
rename to core/assets-raw/sprites/blocks/distribution/mass-driver.png
diff --git a/core/assets-raw/sprites/ui/icons/icon-add.png b/core/assets-raw/sprites/ui/icons/icon-add.png
index 2cee82e07d..50c7a2c330 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-add.png and b/core/assets-raw/sprites/ui/icons/icon-add.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-file-image.png b/core/assets-raw/sprites/ui/icons/icon-file-image.png
index 254ea95f3d..5b0d2adbe5 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-file-image.png and b/core/assets-raw/sprites/ui/icons/icon-file-image.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-fill.png b/core/assets-raw/sprites/ui/icons/icon-fill.png
index 79bc8b2c39..25d439a830 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-fill.png and b/core/assets-raw/sprites/ui/icons/icon-fill.png differ
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 86174c1897..335db5129f 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/src/io/anuke/mindustry/content/Bullets.java b/core/src/io/anuke/mindustry/content/Bullets.java
index f7b8dafd70..de4797ac75 100644
--- a/core/src/io/anuke/mindustry/content/Bullets.java
+++ b/core/src/io/anuke/mindustry/content/Bullets.java
@@ -685,7 +685,7 @@ public class Bullets implements ContentList{
                 lifetime = 23f;
                 speed = 1f;
                 splashDamageRadius = 50f;
-                splashDamage = 30f;
+                splashDamage = 20f;
             }
 
             @Override
diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java
index 9666005734..4d62540b51 100644
--- a/core/src/io/anuke/mindustry/world/Block.java
+++ b/core/src/io/anuke/mindustry/world/Block.java
@@ -363,7 +363,11 @@ public class Block extends BlockStorage{
         }
 
         if(hasPower && consumes.has(ConsumePower.class)){
-            bars.add("power", entity -> new Bar(consumes.get(ConsumePower.class).isBuffered ? "blocks.power" : "blocks.power.satisfaction", Pal.powerBar, () -> entity.power.satisfaction));
+            boolean buffered = consumes.get(ConsumePower.class).isBuffered;
+            float capacity = consumes.get(ConsumePower.class).powerCapacity;
+
+            bars.add("power", entity -> new Bar(() -> buffered ? Core.bundle.format("blocks.powerbalance", Float.isNaN(entity.power.satisfaction * capacity) ? "<BUGGED>" : (int)(entity.power.satisfaction * capacity)) :
+                Core.bundle.get("blocks.power"), () -> Pal.powerBar, () -> entity.power.satisfaction));
         }
     }
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java
index 01d1f3f740..37c059464a 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java
@@ -111,7 +111,7 @@ public class MassDriver extends Block{
 
     @Override
     public TextureRegion[] generateIcons(){
-        return new TextureRegion[]{Core.atlas.find(name + "-base"), Core.atlas.find(name + "-turret")};
+        return new TextureRegion[]{Core.atlas.find(name + "-base"), Core.atlas.find(name)};
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java
index e01eb0294c..35a3d7ba51 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java
@@ -123,7 +123,7 @@ public class PowerGraph{
 
     public void distributePower(float needed, float produced){
         //distribute even if not needed. this is because some might be requiring power but not requesting it; it updates consumers
-        float coverage = Math.min(1, produced / needed);
+        float coverage = Math.min(1, produced / (Mathf.isZero(needed) ? 1f : needed));
         for(Tile consumer : consumers){
             Consumers consumes = consumer.block().consumes;
             if(consumes.has(ConsumePower.class)){
diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java b/core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java
index ef37e6679f..3707752cf9 100644
--- a/core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java
+++ b/core/src/io/anuke/mindustry/world/blocks/storage/Unloader.java
@@ -77,7 +77,7 @@ public class Unloader extends Block implements SelectionTrait{
 
         SortedUnloaderEntity entity = tile.entity();
 
-        Draw.color(entity.sortItem == null ? Color.WHITE : entity.sortItem.color);
+        Draw.color(entity.sortItem == null ? Color.CLEAR : entity.sortItem.color);
         Draw.rect("blank", tile.worldx(), tile.worldy(), 2f, 2f);
         Draw.color();
     }
diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeItem.java b/core/src/io/anuke/mindustry/world/consumers/ConsumeItem.java
index 2afce34150..d6806db4c5 100644
--- a/core/src/io/anuke/mindustry/world/consumers/ConsumeItem.java
+++ b/core/src/io/anuke/mindustry/world/consumers/ConsumeItem.java
@@ -4,6 +4,7 @@ import io.anuke.arc.scene.ui.layout.Table;
 import io.anuke.mindustry.entities.type.TileEntity;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.type.Item.Icon;
+import io.anuke.mindustry.type.ItemStack;
 import io.anuke.mindustry.ui.ItemImage;
 import io.anuke.mindustry.ui.ReqImage;
 import io.anuke.mindustry.world.Block;
@@ -60,6 +61,6 @@ public class ConsumeItem extends Consume{
 
     @Override
     public void display(BlockStats stats){
-        stats.add(boost ? BlockStat.boostItem : BlockStat.inputItem, item);
+        stats.add(boost ? BlockStat.boostItem : BlockStat.inputItem, new ItemStack(item, amount));
     }
 }
diff --git a/core/src/io/anuke/mindustry/world/modules/PowerModule.java b/core/src/io/anuke/mindustry/world/modules/PowerModule.java
index fead3d97c7..265724c974 100644
--- a/core/src/io/anuke/mindustry/world/modules/PowerModule.java
+++ b/core/src/io/anuke/mindustry/world/modules/PowerModule.java
@@ -34,5 +34,6 @@ public class PowerModule extends BlockModule{
             links.add(stream.readInt());
         }
         satisfaction = stream.readFloat();
+        if(Float.isNaN(satisfaction) || Float.isInfinite(satisfaction)) satisfaction = 0f;
     }
 }