diff --git a/android/res/drawable-hdpi/ic_launcher.png b/android/res/drawable-hdpi/ic_launcher.png
index 273651417a..b43bb84e6e 100644
Binary files a/android/res/drawable-hdpi/ic_launcher.png and b/android/res/drawable-hdpi/ic_launcher.png differ
diff --git a/android/res/drawable-mdpi/ic_launcher.png b/android/res/drawable-mdpi/ic_launcher.png
index c5039e6079..91d97a6051 100644
Binary files a/android/res/drawable-mdpi/ic_launcher.png and b/android/res/drawable-mdpi/ic_launcher.png differ
diff --git a/android/res/drawable-xhdpi/ic_launcher.png b/android/res/drawable-xhdpi/ic_launcher.png
index 7e2d2c0a8d..2adf4e8f9a 100644
Binary files a/android/res/drawable-xhdpi/ic_launcher.png and b/android/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/android/res/drawable-xxhdpi/ic_launcher.png b/android/res/drawable-xxhdpi/ic_launcher.png
index 052a0d02ac..a2131b698e 100644
Binary files a/android/res/drawable-xxhdpi/ic_launcher.png and b/android/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_launcher.png b/android/res/drawable-xxxhdpi/ic_launcher.png
index 7e5a96be63..f625a1e78e 100644
Binary files a/android/res/drawable-xxxhdpi/ic_launcher.png and b/android/res/drawable-xxxhdpi/ic_launcher.png differ
diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java
index 2fa54148dd..d1f0cd7aab 100644
--- a/core/src/io/anuke/mindustry/Vars.java
+++ b/core/src/io/anuke/mindustry/Vars.java
@@ -22,7 +22,7 @@ public class Vars{
 	//respawn time in frames
 	public static final float respawnduration = 60*4;
 	//time between waves in frames (on normal mode)
-	public static final float wavespace = 50*60*(android ? 1 : 1);
+	public static final float wavespace = 60*60*(android ? 1 : 1);
 	//waves can last no longer than 5 minutes, otherwise the next one spawns
 	public static final float maxwavespace = 60*60*5;
 	//advance time the pathfinding starts at
diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java
index 397728ef71..40f43dbdbe 100644
--- a/core/src/io/anuke/mindustry/core/Control.java
+++ b/core/src/io/anuke/mindustry/core/Control.java
@@ -458,7 +458,7 @@ public class Control extends Module{
 		
 		if(!GameState.is(State.menu)){
 			
-			if(Inputs.keyUp("pause") && (GameState.is(State.paused) || GameState.is(State.playing))){
+			if(Inputs.keyUp("pause") && !ui.isGameOver() && (GameState.is(State.paused) || GameState.is(State.playing))){
 				GameState.set(GameState.is(State.playing) ? State.paused : State.playing);
 			}
 			
@@ -466,7 +466,7 @@ public class Control extends Module{
 				if(GameState.is(State.paused)){
 					ui.hideMenu();
 					GameState.set(State.playing);
-				}else{
+				}else if (!ui.isGameOver()){
 					ui.showMenu();
 					GameState.set(State.paused);
 				}
diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java
index 5a903f5b11..4481a56ebb 100644
--- a/core/src/io/anuke/mindustry/core/UI.java
+++ b/core/src/io/anuke/mindustry/core/UI.java
@@ -405,6 +405,10 @@ public class UI extends SceneModule{
 		return scene.getKeyboardFocus() instanceof Dialog;
 	}
 	
+	public boolean isGameOver(){
+		return restart.getScene() != null;
+	}
+	
 	public void showUpgrades(){
 		upgrades.show();
 	}
diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java
index dfec7fcb2a..0d2c38b571 100644
--- a/core/src/io/anuke/mindustry/world/Block.java
+++ b/core/src/io/anuke/mindustry/world/Block.java
@@ -46,7 +46,7 @@ public class Block{
 	/**whether you can break this with rightblick*/
 	public boolean breakable;
 	/**time it takes to break*/
-	public float breaktime = 30;
+	public float breaktime = 18;
 	/**tile entity health*/
 	public int health = 40;
 	/**the shadow drawn under the block*/
diff --git a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java
index 99bdc98fad..79715caa9d 100644
--- a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java
+++ b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java
@@ -15,7 +15,7 @@ public class ProductionBlocks{
 	
 	core = new Block("core"){
 		{
-			health = 600;
+			health = 800;
 			solid = true;
 			destructible = true;
 			width = 3;
@@ -24,7 +24,7 @@ public class ProductionBlocks{
 		
 		@Override
 		public int handleDamage(Tile tile, int amount){
-			return Vars.debug ? 0 : amount;
+			return Vars.debug ? amount : amount;
 		}
 		
 		@Override