diff --git a/android/native/jni/input_android.c b/android/native/jni/input_android.c
index 88e9205d8b..671e6d1c80 100644
--- a/android/native/jni/input_android.c
+++ b/android/native/jni/input_android.c
@@ -1174,9 +1174,9 @@ static void android_input_set_keybinds(void *data, unsigned device,
             keycode_lut[AKEYCODE_BUTTON_R1] |=  ((RETRO_DEVICE_ID_JOYPAD_R+1)      << shift);
             keycode_lut[AKEYCODE_BUTTON_L2] |=  ((RETRO_DEVICE_ID_JOYPAD_L2+1)      << shift);
             keycode_lut[AKEYCODE_BUTTON_R2] |=  ((RETRO_DEVICE_ID_JOYPAD_R2+1)      << shift);
-            keycode_lut[AKEYCODE_BUTTON_THUMBL] |=  ((RETRO_DEVICE_ID_JOYPAD_L3+1)      << shift);
-            keycode_lut[AKEYCODE_BUTTON_THUMBR] |=  ((RETRO_DEVICE_ID_JOYPAD_R3+1)      << shift);
-            keycode_lut[AKEYCODE_MENU] |=  ((RETRO_DEVICE_ID_JOYPAD_START+1)      << shift);
+            keycode_lut[AKEYCODE_BUTTON_THUMBL] |=  ((RETRO_DEVICE_ID_JOYPAD_SELECT+1)      << shift);
+            keycode_lut[AKEYCODE_BUTTON_THUMBR] |=  ((RETRO_DEVICE_ID_JOYPAD_START+1)      << shift);
+            keycode_lut[AKEYCODE_MENU] |=  ((RARCH_MENU_TOGGLE+1)      << shift);
             break;
          case DEVICE_HOLTEK_JC_U912F:
             g_settings.input.device[port] = device;
diff --git a/android/phoenix/AndroidManifest.xml b/android/phoenix/AndroidManifest.xml
index 91a2251e12..5a387e090b 100644
--- a/android/phoenix/AndroidManifest.xml
+++ b/android/phoenix/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.retroarch"
-    android:versionCode="16"
-    android:versionName="0.9.9.2" >
+    android:versionCode="17"
+    android:versionName="0.9.9.3" >
 	<uses-feature android:glEsVersion="0x00020000" />
     <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
     <uses-sdk
diff --git a/android/phoenix/assets/Shaders/.dummy b/android/phoenix/assets/Shaders/.dummy
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/android/phoenix/res/layout/faq_whats_new.xml b/android/phoenix/res/layout/faq_whats_new.xml
index c93682e9fb..0347b5dd56 100644
--- a/android/phoenix/res/layout/faq_whats_new.xml
+++ b/android/phoenix/res/layout/faq_whats_new.xml
@@ -10,6 +10,17 @@
         android:layout_height="wrap_content"
         android:layout_margin="40px"
         android:text="
+        r17 (June 28, 2013)\n\n
+        * [Android] Input autodetection expanded -\n
+        - Xperia Play controls fixed once and for all (thanks to littleguy77)\n
+        - JC U912F gamepad\n
+        * [GENERAL] Should fix GPU screenshots if last frame was duped\n
+        * [PCSX ReARMed] Add core option to switch between Dual Shock and regular gamepad modes\n
+        * [TyrQuake] Add core option so that you can change the internal screen resolution (note that TyrQuake uses the software renderer - it is slow - an OpenGL ES option will be added in the future for mobile devices and others)\n
+        * [TyrQuake] For RetroArch ports that support RETRO_KEYBOARD and RETRO_MOUSE -mouse/keyboard controls should work now\n
+        * [Genesis Plus GX] Updated to the latest version - 1.7.4 -\n
+          - fixed SRAM incompatibilities between BIG ENDIAN and LITTLE ENDIAN platforms for libretro (note: this breaks old .srm files with LITTLE ENDIAN platform ports - which includes iOS, Android, PC)\n
+          - A lot of compatibility/maintenance fixes by ekeeke (main author)\n
         r16 (June 17, 2013)\n\n
         * (LIBRETRO) Added MAME 2003 [0.78] (PC/Android/iOS)\n
         * (MAME 2003 0.78) Add speedhack core option so that MAME can run at fullspeed on average Cortex A9 CPUs for games like Mortal Kombat 2/3/Ultimate/NBA Jam (DCS sound harware games)\n