diff --git a/build.sh b/build.sh
index b2592a76a..d71b3575e 100755
--- a/build.sh
+++ b/build.sh
@@ -38,7 +38,7 @@ export `grep "AppFullName=" AndroidAppSettings.cfg`
 if ( grep "package $AppFullName;" project/src/Globals.java > /dev/null 2>&1 && \
 		[ "`readlink AndroidAppSettings.cfg`" -ot "project/src/Globals.java" ] && \
 		[ -z "`find project/java/* project/AndroidManifestTemplate.xml -cnewer project/src/Globals.java`" ] ) ; then true ; else
-	./changeAppSettings.sh -a
+	./changeAppSettings.sh -a || exit 1
 	sleep 1
 	touch project/src/Globals.java
 fi
diff --git a/changeAppSettings.sh b/changeAppSettings.sh
index 8d60200b4..4b87daf7e 100755
--- a/changeAppSettings.sh
+++ b/changeAppSettings.sh
@@ -1277,6 +1277,9 @@ for F in *.java; do
 	cat $F | sed "s/package .*;/package $AppFullName;/" >> ../src/$F # | sed 's@$@ // THIS FILE IS AUTO-GENERATED@' >>
 done
 
+if [ -e ../jni/application/src/java.diff ]; then patch < ../jni/application/src/java.diff || exit 1 ; fi
+if [ -e ../jni/application/src/java.patch ]; then patch < ../jni/application/src/java.patch || exit 1 ; fi
+
 cd ../..
 
 # In case we use SDL2 let simlink the SDLActivity source file
diff --git a/project/jni/application/xserver/AndroidAppSettings.cfg b/project/jni/application/xserver/AndroidAppSettings.cfg
index b87935975..77f28ac28 100644
--- a/project/jni/application/xserver/AndroidAppSettings.cfg
+++ b/project/jni/application/xserver/AndroidAppSettings.cfg
@@ -158,7 +158,7 @@ StartupMenuButtonTimeout=3000
 
 # Menu items to hide from startup menu, available menu items:
 #  SettingsMenu.OkButton SettingsMenu.DummyMenu SettingsMenu.MainMenu  SettingsMenuMisc.DownloadConfig SettingsMenuMisc.OptionalDownloadConfig SettingsMenuMisc.AudioConfig SettingsMenuMisc.VideoSettingsConfig SettingsMenuMisc.ShowReadme SettingsMenuMisc.GyroscopeCalibration SettingsMenuMisc.ResetToDefaultsConfig  SettingsMenuMouse.MouseConfigMainMenu SettingsMenuMouse.DisplaySizeConfig SettingsMenuMouse.LeftClickConfig SettingsMenuMouse.RightClickConfig SettingsMenuMouse.AdditionalMouseConfig SettingsMenuMouse.JoystickMouseConfig SettingsMenuMouse.TouchPressureMeasurementTool SettingsMenuMouse.CalibrateTouchscreenMenu  SettingsMenuKeyboard.KeyboardConfigMainMenu SettingsMenuKeyboard.ScreenKeyboardSizeConfig SettingsMenuKeyboard.ScreenKeyboardDrawSizeConfig SettingsMenuKeyboard.ScreenKeyboardThemeConfig SettingsMenuKeyboard.ScreenKeyboardTransparencyConfig SettingsMenuKeyboard.RemapHwKeysConfig SettingsMenuKeyboard.RemapScreenKbConfig SettingsMenuKeyboard.ScreenGesturesConfig SettingsMenuKeyboard.CustomizeScreenKbLayout 
-HiddenMenuOptions='SettingsMenuMisc.OptionalDownloadConfig'
+HiddenMenuOptions='SettingsMenuMisc.OptionalDownloadConfig SettingsMenuMouse.DisplaySizeConfig'
 
 # Menu items to show at startup - this is Java code snippet, leave empty for default
 # new SettingsMenuMisc.ShowReadme(), (AppUsesMouse \&\& \! ForceRelativeMouseMode \? new SettingsMenuMouse.DisplaySizeConfig(true) : new SettingsMenu.DummyMenu()), new SettingsMenuMisc.OptionalDownloadConfig(true), new SettingsMenuMisc.GyroscopeCalibration()
diff --git a/project/jni/application/xserver/java.diff b/project/jni/application/xserver/java.diff
new file mode 100644
index 000000000..4462801de
--- /dev/null
+++ b/project/jni/application/xserver/java.diff
@@ -0,0 +1,22 @@
+diff --git a/project/java/Globals.java b/project/java/Globals.java
+index 04df3ed..bddaeb1 100644
+--- a/project/java/Globals.java
++++ b/project/java/Globals.java
+@@ -90,7 +90,7 @@ class Globals
+ 	public static int TrackballDampening = 0;
+ 	public static int AudioBufferConfig = 0;
+ 	public static boolean OptionalDataDownload[] = null;
+-	public static int LeftClickMethod = Mouse.LEFT_CLICK_NORMAL;
++	public static int LeftClickMethod = Mouse.LEFT_CLICK_NEAR_CURSOR;
+ 	public static int LeftClickKey = KeyEvent.KEYCODE_DPAD_CENTER;
+ 	public static int LeftClickTimeout = 3;
+ 	public static int RightClickTimeout = 4;
+@@ -103,7 +103,7 @@ class Globals
+ 	public static boolean RelativeMouseMovement = ForceRelativeMouseMode; // Laptop touchpad mode
+ 	public static int RelativeMouseMovementSpeed = 2;
+ 	public static int RelativeMouseMovementAccel = 0;
+-	public static int ShowScreenUnderFinger = Mouse.ZOOM_NONE;
++	public static int ShowScreenUnderFinger = Mouse.ZOOM_MAGNIFIER;
+ 	public static boolean KeepAspectRatio = KeepAspectRatioDefaultSetting;
+ 	public static int ClickScreenPressure = 0;
+ 	public static int ClickScreenTouchspotSize = 0;