diff --git a/build/android/Makefile b/build/android/Makefile
index d7df78ce8..1255581bd 100644
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -21,7 +21,7 @@ TARGET_HOST2 = arm-linux
 TARGET_ABI = armeabi-v7a-hard
 TARGET_LIBDIR = armeabi-v7a
 TARGET_TOOLCHAIN = arm-linux-androideabi-
-TARGET_CFLAGS_ADDON = -mhard-float -march=armv7-a -D_NDK_MATH_NO_SOFTFP=1 -Ofast
+TARGET_CFLAGS_ADDON = -mfpu=vfpv3-d16 -D_NDK_MATH_NO_SOFTFP=1 -mfloat-abi=hard -march=armv7-a -Ofast
 TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON)
 TARGET_LDFLAGS_ADDON = -Wl,--no-warn-mismatch -lm_hard
 TARGET_ARCH = armv7
diff --git a/build/android/irrlicht-optimization.patch b/build/android/irrlicht-optimization.patch
index ce757bd50..79ac2031a 100644
--- a/build/android/irrlicht-optimization.patch
+++ b/build/android/irrlicht-optimization.patch
@@ -1,11 +1,12 @@
 --- irrlicht/source/Irrlicht/Android/jni/Android.mk.orig	2016-02-15 05:33:03.000000000 +0200
 +++ irrlicht/source/Irrlicht/Android/jni/Android.mk	2016-02-15 05:34:34.913711815 +0200
-@@ -11,7 +11,7 @@
+@@ -11,7 +11,8 @@
  ifndef NDEBUG
  LOCAL_CFLAGS += -g -D_DEBUG
  else
 -LOCAL_CFLAGS += -fexpensive-optimizations -O3
-+LOCAL_CFLAGS += -D_NDK_MATH_NO_SOFTFP=1 -mfloat-abi=hard -Ofast -march=armv7-a
++LOCAL_CFLAGS += -mfpu=vfpv3-d16 -D_NDK_MATH_NO_SOFTFP=1 -mfloat-abi=hard -march=armv7-a -Ofast
++LOCAL_LDFLAGS = -Wl,--no-warn-mismatch -lm_hard
  endif
  
  LOCAL_C_INCLUDES := ../../../include
diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk
index a23e4a308..4f5590f95 100644
--- a/build/android/jni/Android.mk
+++ b/build/android/jni/Android.mk
@@ -80,9 +80,11 @@ LOCAL_CFLAGS := -D_IRR_ANDROID_PLATFORM_      \
 ifndef NDEBUG
 LOCAL_CFLAGS += -g -D_DEBUG -O0 -fno-omit-frame-pointer
 else
-LOCAL_CFLAGS += -mhard-float -march=armv7-a -D_NDK_MATH_NO_SOFTFP=1 -Ofast -fno-fast-math -Wl,--gc-sections
-LOCAL_LDFLAGS  = -Wl,--no-warn-mismatch -lm_hard
+
+LOCAL_CFLAGS += -mfpu=vfpv3-d16 -D_NDK_MATH_NO_SOFTFP=1 -mfloat-abi=hard -march=armv7-a -Ofast -fno-fast-math
+LOCAL_LDFLAGS = -Wl,--no-warn-mismatch -lm_hard
 # ToDo - disable for x86!
+
 endif
 
 ifdef GPROF
diff --git a/build/android/jni/Application.mk b/build/android/jni/Application.mk
index c8d229826..f1c8edfd1 100644
--- a/build/android/jni/Application.mk
+++ b/build/android/jni/Application.mk
@@ -1,4 +1,6 @@
 NDK_TOOLCHAIN_VERSION := 4.9
 APP_MODULES := multicraft
 APP_STL := gnustl_static
-APP_CPPFLAGS += -fexceptions -std=c++11
\ No newline at end of file
+
+APP_CPPFLAGS += -fexceptions
+APP_GNUSTL_FORCE_CPP_FEATURES := rtti
\ No newline at end of file
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 4dda3fc8e..f7c4069c4 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -177,7 +177,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("enable_shaders", "true");
 	settings->setDefault("repeat_rightclick_time", "0.25");
 	settings->setDefault("enable_particles", "true");
-	settings->setDefault("enable_mesh_cache", "true");
+	settings->setDefault("enable_mesh_cache", "false");
 
 	settings->setDefault("enable_minimap", "true");
 	settings->setDefault("minimap_shape_round", "true");
@@ -362,12 +362,12 @@ void set_default_settings(Settings *settings)
 	float x_inches = ((double) porting::getDisplaySize().X /
 			(160 * porting::getDisplayDensity()));
 	if (x_inches < 3.5) {
-		settings->setDefault("hud_scaling", "0.55");
+		settings->setDefault("hud_scaling", "0.5");
 		settings->setDefault("mouse_sensitivity", "0.1");
 		settings->setDefault("font_size","12");
 	}
 	else if (x_inches < 5.5) {
-		settings->setDefault("hud_scaling", "0.65");
+		settings->setDefault("hud_scaling", "0.6");
 		settings->setDefault("mouse_sensitivity", "0.1");
 		settings->setDefault("font_size","14");
 	}
diff --git a/src/touchscreengui.cpp b/src/touchscreengui.cpp
index 3d5317d77..4051e1d75 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 280 * density * g_settings->getFloat("hud_scaling");
+	return 300 * density * g_settings->getFloat("hud_scaling");
 }
 
 int TouchScreenGUI::getGuiButtonSize()
@@ -884,4 +884,4 @@ void TouchScreenGUI::show()
 		return;
 
 	Toggle(true);
-}
\ No newline at end of file
+}
diff --git a/textures/base/pack/halo.png b/textures/base/pack/halo.png
index 6f9788d00..dd310be6d 100644
Binary files a/textures/base/pack/halo.png and b/textures/base/pack/halo.png differ
diff --git a/textures/base/pack/object_marker_red.png b/textures/base/pack/object_marker_red.png
index 013e2a97a..bb89de1b6 100644
Binary files a/textures/base/pack/object_marker_red.png and b/textures/base/pack/object_marker_red.png differ