diff --git a/core/src/io/anuke/mindustry/ui/ItemImage.java b/core/src/io/anuke/mindustry/ui/ItemImage.java
index aa1a370efd..bffd0077d9 100644
--- a/core/src/io/anuke/mindustry/ui/ItemImage.java
+++ b/core/src/io/anuke/mindustry/ui/ItemImage.java
@@ -15,7 +15,7 @@ public class ItemImage extends Stack{
     public ItemImage(TextureRegion region, Supplier<CharSequence> text){
         Table t = new Table().left().bottom();
 
-        t.label(text).color(Color.DARK_GRAY).padBottom(-Core.skin.font().getData().capHeight * 2).get().setFontScale(Unit.dp.scl(0.5f));
+        t.label(text).color(Color.DARK_GRAY).padBottom(-Core.skin.font().getData().capHeight * 2 / Unit.dp.scl(1f)).get().setFontScale(Unit.dp.scl(0.5f));
         t.row();
         t.label(text).get().setFontScale(Unit.dp.scl(0.5f));
 
@@ -26,7 +26,7 @@ public class ItemImage extends Stack{
     public ItemImage(ItemStack stack){
         Table t = new Table().left().bottom();
 
-        t.add(stack.amount + "").color(Color.DARK_GRAY).padBottom(-Core.skin.font().getData().capHeight * 2).get().setFontScale(Unit.dp.scl(0.5f));
+        t.add(stack.amount + "").color(Color.DARK_GRAY).padBottom(-Core.skin.font().getData().capHeight * 2 / Unit.dp.scl(1f)).get().setFontScale(Unit.dp.scl(0.5f));
         t.row();
         t.add(stack.amount + "").get().setFontScale(Unit.dp.scl(0.5f));
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java b/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java
index e6dc2950e4..b8a845928f 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java
@@ -17,6 +17,11 @@ public class OverflowGate extends Router{
     @Override
     public void update(Tile tile){
         SplitterEntity entity = tile.entity();
+
+        if(entity.lastItem == null && entity.items.total() > 0){
+            entity.items.clear();
+        }
+
         if(entity.lastItem != null){
             entity.time += 1f/speed * Timers.delta();
             Tile target = getTileTarget(tile, entity.lastItem, entity.lastInput, false);
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java
index 92760c8a1b..1705c812db 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java
@@ -34,8 +34,7 @@ public class Router extends Block{
         SplitterEntity entity = tile.entity();
 
         if(entity.lastItem == null && entity.items.total() > 0){
-            entity.lastItem = entity.items.take();
-            entity.items.add(entity.lastItem, 1);
+            entity.items.clear();
         }
 
         if(entity.lastItem != null){