diff --git a/shell/android/res/values-pl/strings.xml b/shell/android/res/values-pl/strings.xml
index d65cfa4bf..58fa9253c 100644
--- a/shell/android/res/values-pl/strings.xml
+++ b/shell/android/res/values-pl/strings.xml
@@ -6,9 +6,9 @@
     <string name="games_path">Ścieżka obrazów (lokalizacja obrazów dysków .gdi, .chd or .cdi)</string>
     <string name="game_path">Domyślna ścieżka obrazów</string>
     
-    <string name="boot_bios">Uruchom BIOS'a Dreamcast'a</string>
-    <string name="missing_bios">Brak BIOS'u. BIOS Dreamcast'a jest potrzebny, aby ten emulator działał. Skopiuj BIOS do %1$s/data/dc_boot.bin</string>
-    <string name="missing_flash">Brak Flash'a. Plik Flash Dreamcast'a jest potrzebny, aby ten emulator działał. Skopiuj plik Flash do %1$s/data/dc_flash.bin</string>    <string name="require_bios">You have to provide the BIOS</string>
+    <string name="boot_bios">Uruchom BIOS\'a Dreamcast\'a</string>
+    <string name="missing_bios">Brak BIOS\'u. BIOS Dreamcast\'a jest potrzebny, aby ten emulator działał. Skopiuj BIOS do %1$s/data/dc_boot.bin</string>
+    <string name="missing_flash">Brak Flash\'a. Plik Flash Dreamcast\'a jest potrzebny, aby ten emulator działał. Skopiuj plik Flash do %1$s/data/dc_flash.bin</string>    <string name="require_bios">You have to provide the BIOS</string>
     
     <string name="folder_bios">URUCHOM BIOS</string>
     <string name="folder_select">WYBIERZ BIEŻĄCY FOLDER</string>
@@ -23,7 +23,7 @@
     <string name="select_render">PVR Rendering (na razie nie działa)</string>
     <string name="default_disk">Ustaw domyślny dysk</string>
 
-    <string name="games_listing">Dostępne gry Dreamcast'a</string>
+    <string name="games_listing">Dostępne gry Dreamcast\'a</string>
 
     <string name="customize_touch_controls">Dostosuj układ przycisków dotykowych</string>
     <string name="launch_editor">Uruchom Edytor</string>
@@ -49,10 +49,10 @@
     <string name="moga_pro_connect">MOGA Pro przyłączona!</string>
     <string name="moga_connect">MOGA przyłączona!</string>
 
-    <string name="about_text">reicast jest emulatorem dreamcast'a</string>
+    <string name="about_text">reicast jest emulatorem dreamcast\'a</string>
     <string name="revision_text">Wersja: %1$s [%2$s]</string>
     
-    <string-array name="kontrolery">
+    <string-array name="controllers">
     <item>Controller A</item>
     <item>Controller B</item>
     <item>Controller C</item>
diff --git a/shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java b/shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java
index b7bee4a63..417f15229 100644
--- a/shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java
+++ b/shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java
@@ -211,18 +211,6 @@ public class GL2JNIActivity extends Activity {
 		// Create the actual GLES view
 		mView = new GL2JNIView(getApplication(), fileName, false, prefs.getInt("depth_render", 24), 0, false);
 		setContentView(mView);
-		
-		String menu_spec;
-		if (isXperiaPlay) {
-			menu_spec = getApplicationContext().getString(R.string.menu_button);
-		} else {
-			menu_spec = getApplicationContext().getString(R.string.back_button);
-		}
-		Toast.makeText(
-				getApplicationContext(),
-				getApplicationContext()
-						.getString(R.string.bios_menu, menu_spec),
-				Toast.LENGTH_SHORT).show();
 
 		//setup mic
 		boolean micPluggedIn = prefs.getBoolean("mic_plugged_in", false);
@@ -526,12 +514,8 @@ public class GL2JNIActivity extends Activity {
 			if (keyCode == KeyEvent.KEYCODE_BACK) {
 				return false;
 			}
-		} else if (isOuyaOrTV) {
-			if (keyCode == OuyaController.BUTTON_R3) {
-				return showMenu();
-			}
 		} else {
-			if (keyCode == KeyEvent.KEYCODE_BACK) {
+			if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == OuyaController.BUTTON_MENU) {
 				return showMenu();
 			}
 		}
diff --git a/shell/android/src/com/reicast/emulator/emu/GL2JNIView.java b/shell/android/src/com/reicast/emulator/emu/GL2JNIView.java
index 0c65fe97e..3906cfe3d 100644
--- a/shell/android/src/com/reicast/emulator/emu/GL2JNIView.java
+++ b/shell/android/src/com/reicast/emulator/emu/GL2JNIView.java
@@ -106,6 +106,10 @@ public class GL2JNIView extends GLSurfaceView
 	      }
 	    });
     }
+    
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+        setPreserveEGLContextOnPause(true);
+    }
 
     vib=(Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
     
@@ -794,11 +798,13 @@ private static class ContextFactory implements GLSurfaceView.EGLContextFactory
 
 	  public void onSurfaceChanged(GL10 gl,int width,int height)
 	  {
+		  Log.d("GL2JNIView Renderer", "onSurfaceChanged");
 		  JNIdc.rendinit(width,height);
 	  }
 
 	  public void onSurfaceCreated(GL10 gl,EGLConfig config)
 	  {
+		  Log.d("GL2JNIView Renderer", "onSurfaceCreated");
 		  onSurfaceChanged(gl, 800, 480);
 	  }
 
diff --git a/shell/android/src/com/reicast/emulator/periph/Gamepad.java b/shell/android/src/com/reicast/emulator/periph/Gamepad.java
index c5d907d06..918552d15 100644
--- a/shell/android/src/com/reicast/emulator/periph/Gamepad.java
+++ b/shell/android/src/com/reicast/emulator/periph/Gamepad.java
@@ -71,7 +71,7 @@ public class Gamepad {
 				OuyaController.BUTTON_DPAD_LEFT, 	key_CONT_DPAD_LEFT,
 				OuyaController.BUTTON_DPAD_RIGHT, 	key_CONT_DPAD_RIGHT,
 
-				OuyaController.BUTTON_MENU, 		key_CONT_START,
+				OuyaController.BUTTON_R3, 			key_CONT_START,
 				KeyEvent.KEYCODE_BUTTON_START, 		key_CONT_START
 		};
 	}