diff --git a/build/android/Makefile b/build/android/Makefile
index f6b7cfb08..c54fa1783 100644
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -18,11 +18,12 @@ ANDROID_VERSION_CODE = 1
 
 TARGET_HOST = arm-linux
 TARGET_HOST2 = arm-linux
-TARGET_ABI = armeabi-v7a
+TARGET_ABI = armeabi-v7a-hard
 TARGET_LIBDIR = armeabi-v7a
 TARGET_TOOLCHAIN = arm-linux-androideabi-
-TARGET_CFLAGS_ADDON = -mfloat-abi=softfp -Ofast
+TARGET_CFLAGS_ADDON = -D_NDK_MATH_NO_SOFTFP=1 -mfloat-abi=hard -Ofast -march=armv7-a
 TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON)
+TARGET_LDFLAGS_ADDON = -Wl,--no-warn-mismatch -lm_hard
 TARGET_ARCH = armv7
 CROSS_PREFIX = arm-linux-androideabi-
 COMPILER_VERSION = 4.9
diff --git a/src/game.cpp b/src/game.cpp
index 17e61c472..a5c6e1ee6 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1073,11 +1073,9 @@ static inline void create_formspec_menu(GUIFormSpecMenu **cur_formspec,
 #ifdef __ANDROID__
 #   define SIZE_TAG "size[11,5.5]"
 #   define PAUSE_MENU_SIZE_TAG "size[5,3.5]"
-#   define PAUSE_MENU_BUTTON_LEFT 1.5
 #else
 #   define SIZE_TAG "size[11,5.5,true]" // Fixed size on desktop
 #   define PAUSE_MENU_SIZE_TAG "size[11,5.5,true]" // Fixed size on desktop
-#   define PAUSE_MENU_BUTTON_LEFT 4
 #endif
 
 static void show_chat_menu(GUIFormSpecMenu **cur_formspec,
diff --git a/src/main.cpp b/src/main.cpp
index 5a2d43473..b2667c027 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -719,10 +719,10 @@ static bool game_configure_subgame(GameParams *game_params, const Settings &cmd_
 #else
 	SubgameSpec gamespec;
 
-	gamespec = findSubgame("MultiCraft_game");
+	gamespec = findSubgame("default");
 	success = gamespec.isValid();
 	if (!success) {
-		errorstream << "MultiCraft game files not found!" << std::endl;
+		errorstream << "Game files not found!" << std::endl;
 	}
 #endif
 	return success;
diff --git a/src/touchscreengui.cpp b/src/touchscreengui.cpp
index 91e7a9176..ad6b0e31e 100644
--- a/src/touchscreengui.cpp
+++ b/src/touchscreengui.cpp
@@ -193,7 +193,7 @@ void TouchScreenGUI::initButton(touch_gui_button_id id, rect<s32> button_rect,
 }
 
 static int getMaxControlPadSize(float density) {
-	return 220 * density * g_settings->getFloat("hud_scaling");
+	return 230 * density * g_settings->getFloat("hud_scaling");
 }
 
 int TouchScreenGUI::getGuiButtonSize()