diff --git a/core/assets-raw/sprites/weapons/chain-blaster-equip.png b/core/assets-raw/sprites/weapons/chain-blaster-equip.png
index 6591a21135..d2bc4331f4 100644
Binary files a/core/assets-raw/sprites/weapons/chain-blaster-equip.png and b/core/assets-raw/sprites/weapons/chain-blaster-equip.png differ
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 0c8c9edd58..ddab23a4e3 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/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java
index ee5306da67..58dfd7fe7c 100644
--- a/core/src/io/anuke/mindustry/content/Zones.java
+++ b/core/src/io/anuke/mindustry/content/Zones.java
@@ -21,7 +21,8 @@ public class Zones implements ContentList{
             deployCost = ItemStack.with(Items.copper, 60);
             startingItems = ItemStack.with(Items.copper, 50);
             alwaysUnlocked = true;
-            conditionWave = 10;
+            conditionWave = 5;
+            launchPeriod = 5;
             rules = () -> new Rules(){{
                 waves = true;
                 waveTimer = true;
@@ -109,7 +110,6 @@ public class Zones implements ContentList{
 
         frozenForest = new Zone("frozenForest", new MapGenerator("frozenForest", 2)
             .decor(new Decoration(Blocks.snow, Blocks.sporeCluster, 0.02))){{
-            alwaysUnlocked = true;
             deployCost = ItemStack.with(Items.copper, 500);
             startingItems = ItemStack.with(Items.copper, 400);
             conditionWave = 15;
diff --git a/core/src/io/anuke/mindustry/entities/type/Player.java b/core/src/io/anuke/mindustry/entities/type/Player.java
index c3f645a900..69181c989a 100644
--- a/core/src/io/anuke/mindustry/entities/type/Player.java
+++ b/core/src/io/anuke/mindustry/entities/type/Player.java
@@ -284,7 +284,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{
         if(dead) return;
 
         if(!movement.isZero() && moved && !state.isPaused()){
-            walktime += movement.len() / 0.7f * getFloorOn().speedMultiplier;
+            walktime += movement.len() / 1f * getFloorOn().speedMultiplier;
             baseRotation = Mathf.slerpDelta(baseRotation, movement.angle(), 0.13f);
         }
 
diff --git a/core/src/io/anuke/mindustry/type/Mech.java b/core/src/io/anuke/mindustry/type/Mech.java
index d72190a1e7..7c28c72576 100644
--- a/core/src/io/anuke/mindustry/type/Mech.java
+++ b/core/src/io/anuke/mindustry/type/Mech.java
@@ -33,7 +33,7 @@ public class Mech extends UnlockableContent{
     public boolean turnCursor = true;
     public boolean canHeal = false;
 
-    public float weaponOffsetX, weaponOffsetY, engineOffset = 6f, engineSize = 2f;
+    public float weaponOffsetX, weaponOffsetY, engineOffset = 5f, engineSize = 2.5f;
     public Weapon weapon;
 
     public TextureRegion baseRegion, legRegion, region, iconRegion;
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java
index a4da5816f4..aac01a18a2 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java
@@ -38,8 +38,8 @@ public class DatabaseDialog extends FloatingDialog{
         for(int j = 0; j < allContent.length; j ++){
             ContentType type = ContentType.values()[j];
 
-            Array<Content> array = allContent[j];
-            if(array.size == 0 || !(array.first() instanceof UnlockableContent)) continue;
+            Array<Content> array = allContent[j].select(c -> c instanceof UnlockableContent && !((UnlockableContent)c).isHidden());
+            if(array.size == 0) continue;
 
             table.add("$content." + type.name() + ".name").growX().left().color(Palette.accent);
             table.row();
@@ -49,15 +49,13 @@ public class DatabaseDialog extends FloatingDialog{
                 list.left();
 
                 int maxWidth = UIUtils.portrait() ? 7 : 13;
-                int size = 8 * 6;
+                int size = 8 * 4;
 
                 int count = 0;
 
                 for(int i = 0; i < array.size; i++){
                     UnlockableContent unlock = (UnlockableContent) array.get(i);
 
-                    if(unlock.isHidden()) continue;
-
                     Image image = data.isUnlocked(unlock) ? new Image(unlock.getContentIcon()) : new Image("icon-tree-locked");
                     image.addListener(new HandCursorListener());
                     list.add(image).size(size).pad(3);
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java
index a06768c83a..1bf68c9563 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java
@@ -48,12 +48,6 @@ public class DeployDialog extends FloatingDialog{
     }
 
     public void setup(){
-        if(!System.getProperty("mindustry.debug", "false").equals("true")){
-            ui.showInfo("This is not ready for testing. Play custom games instead.");
-            Core.app.post(this::hide);
-            return;
-        }
-
         cont.clear();
         titleTable.remove();
         marginTop(0f);
diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java
index d486b96c14..adef75d8d0 100644
--- a/core/src/io/anuke/mindustry/world/Block.java
+++ b/core/src/io/anuke/mindustry/world/Block.java
@@ -259,7 +259,7 @@ public class Block extends BlockStorage{
 
     @Override
     public TextureRegion getContentIcon(){
-        return icon(Icon.large);
+        return icon(Icon.medium);
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
index d1e0ab6132..34beaf6245 100644
--- a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
@@ -124,7 +124,9 @@ public class BuildBlock extends Block{
 
         if(entity.previous == null) return;
 
-        Draw.rect(entity.previous.icon(Icon.full), tile.drawx(), tile.drawy(), entity.previous.rotate ? tile.getRotation() * 90 : 0);
+        if(Core.atlas.isFound(entity.previous.icon(Icon.full))){
+            Draw.rect(entity.previous.icon(Icon.full), tile.drawx(), tile.drawy(), entity.previous.rotate ? tile.getRotation() * 90 : 0);
+        }
     }
 
     @Override