diff --git a/core/deps/libelf/elf64.cpp b/core/deps/libelf/elf64.cpp
index 7366f7845..f69f6ccfe 100644
--- a/core/deps/libelf/elf64.cpp
+++ b/core/deps/libelf/elf64.cpp
@@ -157,7 +157,7 @@ elf64_getSectionName(void *elfFile, int i)
 	struct Elf64_Shdr *sections = elf64_getSectionTable((Elf64_Header*)elfFile);
 	char           *str_table = elf64_getSegmentStringTable((Elf64_Header*)elfFile);
 	if (str_table == NULL) {
-		return "<corrupted>";
+		return (char*)"<corrupted>";
 	} else {
 		return str_table + sections[i].sh_name;
 	}
diff --git a/core/hw/mem/_vmem.cpp b/core/hw/mem/_vmem.cpp
index 43e050c11..c7957eb0f 100644
--- a/core/hw/mem/_vmem.cpp
+++ b/core/hw/mem/_vmem.cpp
@@ -761,7 +761,7 @@ bool _vmem_reserve()
 	//[0x10000000,0x20000000) -> unused
 	unused_buffer(0x10000000,0x20000000);
 
-	printf("vmem reserve: base: %08X, aram: %08x, vram: %08X, ram: %08X\n",virt_ram_base,aica_ram.data,vram.data,mem_b.data);
+	printf("vmem reserve: base: %8s, aram: %8s, vram: %8s, ram: %8s\n",virt_ram_base,aica_ram.data,vram.data,mem_b.data);
 
 	printf("Resetting mem\n");
 
diff --git a/core/hw/naomi/naomi_cart.cpp b/core/hw/naomi/naomi_cart.cpp
index f1310fa14..49e707d00 100644
--- a/core/hw/naomi/naomi_cart.cpp
+++ b/core/hw/naomi/naomi_cart.cpp
@@ -50,7 +50,7 @@ bool naomi_cart_LoadRom(char* file)
 
 	char* eon = strstr(line, "\n");
 	if (!eon)
-		printf("+Loading naomi rom that has no name\n", line);
+		printf("+Loading naomi rom that has no name\n");
 	else
 		*eon = 0;
 
diff --git a/core/hw/pvr/Renderer_if.cpp b/core/hw/pvr/Renderer_if.cpp
index 5af14df8c..ec13030e5 100644
--- a/core/hw/pvr/Renderer_if.cpp
+++ b/core/hw/pvr/Renderer_if.cpp
@@ -318,7 +318,6 @@ void rend_start_render()
 			}
 
 			if (fCheckFrames) {
-				u8 v;
 				u8 digest2[16];
 				int ch = fgetc(fCheckFrames);
 
@@ -420,11 +419,11 @@ void rend_end_wait()
 
 bool rend_init()
 {
-	if (fLogFrames = fopen(settings.pvr.HashLogFile.c_str(), "wb")) {
+	if ((fLogFrames = fopen(settings.pvr.HashLogFile.c_str(), "wb"))) {
 		printf("Saving frame hashes to: '%s'\n", settings.pvr.HashLogFile.c_str());
 	}
 
-	if (fCheckFrames = fopen(settings.pvr.HashCheckFile.c_str(), "rb")) {
+	if ((fCheckFrames = fopen(settings.pvr.HashCheckFile.c_str(), "rb"))) {
 		printf("Comparing frame hashes against: '%s'\n", settings.pvr.HashCheckFile.c_str());
 	}
 
diff --git a/core/hw/pvr/drkPvr.cpp b/core/hw/pvr/drkPvr.cpp
index 50c88c05a..d372c910c 100644
--- a/core/hw/pvr/drkPvr.cpp
+++ b/core/hw/pvr/drkPvr.cpp
@@ -16,7 +16,6 @@
 #include "pvr_regs.h"
 #include "pvr_mem.h"
 #include "Renderer_if.h"
-#include <algorithm>
 
 
 void libPvr_LockedBlockWrite (vram_block* block,u32 addr)
diff --git a/core/hw/pvr/pvr_mem.cpp b/core/hw/pvr/pvr_mem.cpp
index 9d44f1693..98aa79ddf 100644
--- a/core/hw/pvr/pvr_mem.cpp
+++ b/core/hw/pvr/pvr_mem.cpp
@@ -13,7 +13,6 @@
 
 //TODO : move code later to a plugin
 //TODO : Fix registers arrays , they must be smaller now doe to the way SB registers are handled
-#include "types.h"
 #include "hw/holly/holly_intc.h"
 
 
@@ -237,7 +236,6 @@ void TAWrite(u32 address,u32* data,u32 count)
 }
 
 #include "hw/sh4/sh4_mmr.h"
-#include "hw/pvr/ta.h"
 
 void NOINLINE MemWrite32(void* dst, void* src)
 {
diff --git a/core/hw/pvr/pvr_sb_regs.cpp b/core/hw/pvr/pvr_sb_regs.cpp
index bb7b1a59d..75965622a 100644
--- a/core/hw/pvr/pvr_sb_regs.cpp
+++ b/core/hw/pvr/pvr_sb_regs.cpp
@@ -9,7 +9,6 @@
 #include "hw/sh4/modules/dmac.h"
 #include "hw/sh4/sh4_mem.h"
 #include "pvr_sb_regs.h"
-#include "types.h"
 #include "hw/sh4/sh4_mmr.h"
 #include "ta.h"
 
diff --git a/core/hw/sh4/dyna/blockmanager.cpp b/core/hw/sh4/dyna/blockmanager.cpp
index 51f9f02fb..f64c3e4c7 100644
--- a/core/hw/sh4/dyna/blockmanager.cpp
+++ b/core/hw/sh4/dyna/blockmanager.cpp
@@ -122,7 +122,7 @@ RuntimeBlockInfo* bm_GetBlock(void* dynarec_code)
 	}
 	else
 	{
-		printf("bm_GetBlock(%08X) failed ..\n",dynarec_code);
+		printf("bm_GetBlock(%8s) failed ..\n",dynarec_code);
 		return 0;
 	}
 }
@@ -510,7 +510,7 @@ void bm_PrintTopBlocks()
 		sel_hops+=all_blocks[i]->host_opcodes*all_blocks[i]->runs;
 	}
 
-	printf(" >-< %.2f%% covered in top 1% blocks\n",sel_hops/total_hops);
+	printf(" >-< %.2f%% covered in top 1%% blocks\n",sel_hops/total_hops);
 
 	size_t i;
 	for (i=all_blocks.size()/100;sel_hops/total_hops<50;i++)
diff --git a/core/hw/sh4/sh4_opcode_list.cpp b/core/hw/sh4/sh4_opcode_list.cpp
index 02ad57709..811e69b09 100644
--- a/core/hw/sh4/sh4_opcode_list.cpp
+++ b/core/hw/sh4/sh4_opcode_list.cpp
@@ -2,7 +2,6 @@
 #include "interpr/sh4_opcodes.h"
 #include "sh4_opcode_list.h"
 #include "dyna/decoder_opcodes.h"
-#include "types.h"
 #include "hw/sh4/dyna/shil.h"
 #include "reios/reios.h"
 
diff --git a/core/imgread/cdi.cpp b/core/imgread/cdi.cpp
index 913259406..ab1433f31 100644
--- a/core/imgread/cdi.cpp
+++ b/core/imgread/cdi.cpp
@@ -68,7 +68,7 @@ Disc* cdi_parse(const wchar* file)
 				case 2 :
 				default: printf("Mode2/"); break;
 				}
-				printf("%d  ",track.sector_size);
+				printf("%lu  ",track.sector_size);
 				
 				printf("Pregap: %-3ld  ",track.pregap_length);
 				printf("Size: %-6ld  ",track.length);
@@ -122,7 +122,7 @@ Disc* cdi_parse(const wchar* file)
 					else
 					{
 						
-						printf("Track position: %d\n",track.position + track.pregap_length * track.sector_size);
+						printf("Track position: %lu\n",track.position + track.pregap_length * track.sector_size);
 						core_fseek(fsource, track.position, SEEK_SET);
 						//     fseek(fsource, track->pregap_length * track->sector_size, SEEK_CUR);
 						//     fseek(fsource, track->length * track->sector_size, SEEK_CUR);
@@ -198,4 +198,4 @@ Disc* cdi_parse(const wchar* file)
 	pfctoc_mod=0;
 
 	return rv;
-#endif
\ No newline at end of file
+#endif
diff --git a/core/linux/common.cpp b/core/linux/common.cpp
index ab5591557..8830668af 100644
--- a/core/linux/common.cpp
+++ b/core/linux/common.cpp
@@ -95,7 +95,7 @@ void fault_handler (int sn, siginfo_t * si, void *segfault_ctx)
 	#endif
 	else
 	{
-		printf("SIGSEGV @ %p (fault_handler+0x%p) ... %p -> was not in vram\n", ctx.pc, ctx.pc - (unat)fault_handler, si->si_addr);
+		printf("SIGSEGV @ %u (fault_handler+0x%u) ... %p -> was not in vram\n", ctx.pc, ctx.pc - (unat)fault_handler, si->si_addr);
 		die("segfault");
 		signal(SIGSEGV, SIG_DFL);
 	}
@@ -196,7 +196,7 @@ void VArray2::LockRegion(u32 offset,u32 size)
 	u32 rv=mprotect (data+offset-inpage, size+inpage, PROT_READ );
 	if (rv!=0)
 	{
-		printf("mprotect(%08X,%08X,R) failed: %d | %d\n",data+offset-inpage,size+inpage,rv,errno);
+		printf("mprotect(%8s,%08X,R) failed: %d | %d\n",data+offset-inpage,size+inpage,rv,errno);
 		die("mprotect  failed ..\n");
 	}
 
diff --git a/core/reios/gdrom_hle.cpp b/core/reios/gdrom_hle.cpp
index 24009dfeb..a43fbeb9a 100644
--- a/core/reios/gdrom_hle.cpp
+++ b/core/reios/gdrom_hle.cpp
@@ -110,7 +110,7 @@ void GD_HLE_Command(u32 cc, u32 prm)
 	switch(cc)
 	{
 	case GDCC_GETTOC:
-		printf("GDROM:\t*FIXME* CMD GETTOC PRM:%X\n",cc,prm);
+		printf("GDROM:\t*FIXME* CMD GETTOC CC:%X PRM:%X\n",cc,prm);
 		break;
 
 	case GDCC_GETTOC2:
@@ -118,12 +118,12 @@ void GD_HLE_Command(u32 cc, u32 prm)
 		break;
 
 	case GDCC_GETSES:
-		debugf("GDROM:\tGETSES PRM:%X\n", cc, prm);
+		debugf("GDROM:\tGETSES CC:%X PRM:%X\n", cc, prm);
 		GDROM_HLE_ReadSES(r[5]);
 		break;
 
 	case GDCC_INIT:
-		printf("GDROM:\tCMD INIT PRM:%X\n",cc,prm);
+		printf("GDROM:\tCMD INIT CC:%X PRM:%X\n",cc,prm);
 		break;
 
 	case GDCC_PIOREAD:
@@ -131,30 +131,30 @@ void GD_HLE_Command(u32 cc, u32 prm)
 		break;
 
 	case GDCC_DMAREAD:
-		debugf("GDROM:\tCMD DMAREAD PRM:%X\n", cc, prm);
+		debugf("GDROM:\tCMD DMAREAD CC:%X PRM:%X\n", cc, prm);
 		GDROM_HLE_ReadDMA(r[5]);
 		break;
 
 
 	case GDCC_PLAY_SECTOR:
-		printf("GDROM:\tCMD PLAYSEC? PRM:%X\n",cc,prm);
+		printf("GDROM:\tCMD PLAYSEC? CC:%X PRM:%X\n",cc,prm);
 		break;
 
 	case GDCC_RELEASE:
-		printf("GDROM:\tCMD RELEASE? PRM:%X\n",cc,prm);
+		printf("GDROM:\tCMD RELEASE? CC:%X PRM:%X\n",cc,prm);
 		break;
 
-	case GDCC_STOP:	printf("GDROM:\tCMD STOP PRM:%X\n",cc,prm);		break;
-	case GDCC_SEEK:	printf("GDROM:\tCMD SEEK PRM:%X\n",cc,prm);	break;
-	case GDCC_PLAY:	printf("GDROM:\tCMD PLAY PRM:%X\n",cc,prm);	break;
-	case GDCC_PAUSE:printf("GDROM:\tCMD PAUSE PRM:%X\n",cc,prm);	break;
+	case GDCC_STOP:	printf("GDROM:\tCMD STOP CC:%X PRM:%X\n",cc,prm);	break;
+	case GDCC_SEEK:	printf("GDROM:\tCMD SEEK CC:%X PRM:%X\n",cc,prm);	break;
+	case GDCC_PLAY:	printf("GDROM:\tCMD PLAY CC:%X PRM:%X\n",cc,prm);	break;
+	case GDCC_PAUSE:printf("GDROM:\tCMD PAUSE CC:%X PRM:%X\n",cc,prm);	break;
 
 	case GDCC_READ:
-		printf("GDROM:\tCMD READ PRM:%X\n",cc,prm);
+		printf("GDROM:\tCMD READ CC:%X PRM:%X\n",cc,prm);
 		break;
 
 	case GDCC_GETSCD:
-		debugf("GDROM:\tGETSCD PRM:%X\n",cc,prm);
+		debugf("GDROM:\tGETSCD CC:%X PRM:%X\n",cc,prm);
 		GDCC_HLE_GETSCD(r[5]);
 		break;
 
diff --git a/core/rend/gles/gles.cpp b/core/rend/gles/gles.cpp
index 64c8f406a..6c665bf4c 100755
--- a/core/rend/gles/gles.cpp
+++ b/core/rend/gles/gles.cpp
@@ -457,7 +457,7 @@ int screen_height;
 		screen_width=w;
 		screen_height=h;
 
-		printf("EGL config: %08X, %08X, %08X %dx%d\n",gl.setup.context,gl.setup.display,gl.setup.surface,w,h);
+		printf("EGL config: %p, %08X, %08X %dx%d\n",gl.setup.context,gl.setup.display,gl.setup.surface,w,h);
 		return true;
 	}
 
diff --git a/shell/android-studio/reicast/build.gradle b/shell/android-studio/reicast/build.gradle
index 77d9f5c4b..802a62da9 100644
--- a/shell/android-studio/reicast/build.gradle
+++ b/shell/android-studio/reicast/build.gradle
@@ -47,6 +47,7 @@ android {
     buildTypes {
         release {
             minifyEnabled false
+            zipAlignEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
             signingConfig signingConfigs.release
         }
diff --git a/shell/android-studio/reicast/src/main/java/com/android/util/DreamTime.java b/shell/android-studio/reicast/src/main/java/com/android/util/DreamTime.java
index e25b1b3f3..d28ea0aeb 100644
--- a/shell/android-studio/reicast/src/main/java/com/android/util/DreamTime.java
+++ b/shell/android-studio/reicast/src/main/java/com/android/util/DreamTime.java
@@ -4,13 +4,10 @@ import java.util.Calendar;
 
 public class DreamTime {
 
-	private static long dreamRTC = ((20 * 365 + 5) * 86400) - 1;
-
 	public static long getDreamtime() {
+		long dreamRTC = ((20 * 365 + 5) * 86400) - 1;
 		Calendar cal = Calendar.getInstance();
-		int utcOffset = cal.get(Calendar.ZONE_OFFSET)
-				+ cal.get(Calendar.DST_OFFSET);
-		return (System.currentTimeMillis() / 1000) + dreamRTC
-				+ (utcOffset / 1000);
+		int utcOffset = cal.get(Calendar.ZONE_OFFSET) + cal.get(Calendar.DST_OFFSET);
+		return (System.currentTimeMillis() / 1000) + dreamRTC + (utcOffset / 1000);
 	}
 }
diff --git a/shell/android-studio/reicast/src/main/java/com/android/util/FileUtils.java b/shell/android-studio/reicast/src/main/java/com/android/util/FileUtils.java
index d7a3305f5..110f06b87 100644
--- a/shell/android-studio/reicast/src/main/java/com/android/util/FileUtils.java
+++ b/shell/android-studio/reicast/src/main/java/com/android/util/FileUtils.java
@@ -24,6 +24,7 @@ import java.text.SimpleDateFormat;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 import java.util.Vector;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
@@ -63,15 +64,14 @@ public class FileUtils {
 	public Collection<File> listFiles(File directory, FilenameFilter[] filter,
 			int recurse) {
 
-		Vector<File> files = new Vector<File>();
+		Vector<File> files = new Vector<>();
 
 		File[] entries = directory.listFiles();
 
 		if (entries != null) {
 			for (File entry : entries) {
 				for (FilenameFilter filefilter : filter) {
-					if (filter == null
-							|| filefilter.accept(directory, entry.getName())) {
+					if (filefilter.accept(directory, entry.getName())) {
 						files.add(entry);
 					}
 				}
@@ -90,7 +90,7 @@ public class FileUtils {
 			SharedPreferences mPrefs = PreferenceManager.getDefaultSharedPreferences(c);
 			File dir = new File(mPrefs.getString(Config.pref_home,
 					Environment.getExternalStorageDirectory().getAbsolutePath()));
-			SimpleDateFormat s = new SimpleDateFormat("yyyyMMddHHmmss");
+			SimpleDateFormat s = new SimpleDateFormat("yyyyMMddHHmmss", Locale.getDefault());
 			String timestamp = s.format(new Date());
 			File f = new File(dir.getAbsolutePath(), timestamp+".jpeg");
 			FileOutputStream out = new FileOutputStream(f);
@@ -129,8 +129,6 @@ public class FileUtils {
 				bt[(h-k-1)*w+j]=pix1;
 			}
 		}
-
-		Bitmap sb=Bitmap.createBitmap(bt, w, h, Bitmap.Config.ARGB_8888);
-		return sb;
+		return Bitmap.createBitmap(bt, w, h, Bitmap.Config.ARGB_8888);
 	}
 }
\ No newline at end of file
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/CloudFragment.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/CloudFragment.java
index 6918c7f24..6df27828f 100644
--- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/CloudFragment.java
+++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/CloudFragment.java
@@ -212,13 +212,9 @@ class DropBoxClient {
 		Editor edit = prefs.edit();
 		edit.putString("DBoxKey", key);
 		edit.putString("DBoxSecret", secret);
-		edit.commit();
+		edit.apply();
 	}
 
-
-
-
-
 	private AndroidAuthSession buildSession() {
 		AppKeyPair appKeyPair = new AppKeyPair(APP_KEY, APP_SECRET);
 		AndroidAuthSession session;
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/FileBrowser.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/FileBrowser.java
index fac533da5..20e69c811 100644
--- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/FileBrowser.java
+++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/FileBrowser.java
@@ -416,7 +416,7 @@ public class FileBrowser extends Fragment {
 		private String heading;
 		private File parent;
 
-		public navigate(FileBrowser context) {
+		navigate(FileBrowser context) {
 			browser = new WeakReference<>(context);
 		}
 
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/MainActivity.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/MainActivity.java
index eb71bcae7..659d28b4c 100644
--- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/MainActivity.java
+++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/MainActivity.java
@@ -225,9 +225,6 @@ public class MainActivity extends AppCompatActivity implements
 	}
 
 	public void onGameSelected(Uri uri) {
-		if (Config.readOutput("uname -a").equals(getString(R.string.error_kernel))) {
-			showToastMessage(getString(R.string.unsupported), Snackbar.LENGTH_SHORT);
-		}
 		String home_directory = mPrefs.getString(Config.pref_home,
 				Environment.getExternalStorageDirectory().getAbsolutePath());
 
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/OptionsFragment.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/OptionsFragment.java
index ab72e5e0e..e2a5b9b71 100644
--- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/OptionsFragment.java
+++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/OptionsFragment.java
@@ -50,6 +50,7 @@ import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.lang.ref.WeakReference;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -132,7 +133,7 @@ public class OptionsFragment extends Fragment {
 
 		Button mainBrowse = (Button) getView().findViewById(R.id.browse_main_path);
 		mSpnrThemes = (Spinner) getView().findViewById(R.id.pick_button_theme);
-		new LocateThemes().execute(home_directory + "/themes");
+		new LocateThemes(this).execute(home_directory + "/themes");
 
 		final EditText editBrowse = (EditText) getView().findViewById(R.id.main_path);
 		editBrowse.setText(home_directory);
@@ -156,7 +157,7 @@ public class OptionsFragment extends Fragment {
 					}
 					mPrefs.edit().putString(Config.pref_home, home_directory).apply();
 					JNIdc.config(home_directory);
-					new LocateThemes().execute(home_directory + "/themes");
+					new LocateThemes(OptionsFragment.this).execute(home_directory + "/themes");
 				}
 			}
 
@@ -606,11 +607,17 @@ public class OptionsFragment extends Fragment {
 		});
 	}
 
-	private final class LocateThemes extends AsyncTask<String, Integer, List<File>> {
+	private static class LocateThemes extends AsyncTask<String, Integer, List<File>> {
+		private WeakReference<OptionsFragment> options;
+
+		LocateThemes(OptionsFragment context) {
+			options = new WeakReference<>(context);
+		}
+
 		@Override
 		protected List<File> doInBackground(String... paths) {
 			File storage = new File(paths[0]);
-			String[] mediaTypes = getResources().getStringArray(R.array.themes);
+			String[] mediaTypes = options.get().getResources().getStringArray(R.array.themes);
 			FilenameFilter[] filter = new FilenameFilter[mediaTypes.length];
 			int i = 0;
 			for (final String type : mediaTypes) {
@@ -641,18 +648,18 @@ public class OptionsFragment extends Fragment {
 				}
 				themes[items.size()] = "None";
 				ArrayAdapter<String> themeAdapter = new ArrayAdapter<String>(
-						getActivity(), android.R.layout.simple_spinner_item, themes);
+						options.get().getActivity(), android.R.layout.simple_spinner_item, themes);
 				themeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-				mSpnrThemes.setAdapter(themeAdapter);
-				mSpnrThemes.setOnItemSelectedListener(new OnItemSelectedListener() {
+				options.get().mSpnrThemes.setAdapter(themeAdapter);
+				options.get().mSpnrThemes.setOnItemSelectedListener(new OnItemSelectedListener() {
 					@Override
 					public void onItemSelected(AdapterView<?> parentView, View selectedItemView, int position, long id) {
 						String theme = String.valueOf(parentView.getItemAtPosition(position));
 						if (theme.equals("None")) {
-							mPrefs.edit().remove(Config.pref_theme).apply();
+							options.get().mPrefs.edit().remove(Config.pref_theme).apply();
 						} else {
-							String theme_path = home_directory + "/themes/" + theme;
-							mPrefs.edit().putString(Config.pref_theme, theme_path).apply();
+							String theme_path = options.get().home_directory + "/themes/" + theme;
+							options.get().mPrefs.edit().putString(Config.pref_theme, theme_path).apply();
 						}
 					}
 					@Override
@@ -661,7 +668,7 @@ public class OptionsFragment extends Fragment {
 					}
 				});
 			} else {
-				mSpnrThemes.setEnabled(false);
+				options.get().mSpnrThemes.setEnabled(false);
 			}
 		}
 	}
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/debug/GitAdapter.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/debug/GitAdapter.java
index 8808899b1..9103839ab 100644
--- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/debug/GitAdapter.java
+++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/debug/GitAdapter.java
@@ -34,13 +34,11 @@ import java.util.HashMap;
 
 public class GitAdapter extends BaseAdapter {
 
-	private static Activity activity;
 	private ArrayList<HashMap<String, String>> data;
 	private LayoutInflater inflater = null;
 	private DisplayImageOptions options;
 
-	public GitAdapter(Activity a, ArrayList<HashMap<String, String>> d) {
-		activity = a;
+	public GitAdapter(Activity activity, ArrayList<HashMap<String, String>> d) {
 		this.data = d;
 		this.inflater = (LayoutInflater) activity
 				.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
@@ -141,16 +139,10 @@ public class GitAdapter extends BaseAdapter {
 									 WebView mWebView) {
 		mWebView.getSettings().setSupportZoom(true);
 		mWebView.getSettings().setBuiltInZoomControls(true);
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-			mWebView.getSettings().setDisplayZoomControls(false);
-		}
+		mWebView.getSettings().setDisplayZoomControls(false);
 		mWebView.setInitialScale(1);
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ECLAIR) {
-			mWebView.getSettings().setUseWideViewPort(true);
-		}
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ECLAIR_MR1) {
-			mWebView.getSettings().setLoadWithOverviewMode(true);
-		}
+		mWebView.getSettings().setUseWideViewPort(true);
+		mWebView.getSettings().setLoadWithOverviewMode(true);
 		mWebView.getSettings().setJavaScriptEnabled(true);
 		mWebView.getSettings().setPluginState(PluginState.ON);
 		mWebView.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GLCFactory14.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GLCFactory14.java
index cc27b165f..18978e122 100644
--- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GLCFactory14.java
+++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GLCFactory14.java
@@ -161,7 +161,7 @@ public class GLCFactory14 {
 				if (r == mRedSize && g == mGreenSize && b == mBlueSize
 						&& a == mAlphaSize)
 					if (GL2JNIView.DEBUG) {
-						LOGW(String.format("Configuration %d:", i));
+						LOGW(String.format(Locale.ENGLISH, "Configuration %d:", i));
 						printConfig(display, configs[i]);
 					}
 				return config;
diff --git a/shell/android-studio/reicast/src/main/jni/src/Android.cpp b/shell/android-studio/reicast/src/main/jni/src/Android.cpp
index f14384394..c73b3844a 100644
--- a/shell/android-studio/reicast/src/main/jni/src/Android.cpp
+++ b/shell/android-studio/reicast/src/main/jni/src/Android.cpp
@@ -8,18 +8,14 @@
 
 #include <EGL/egl.h>
 #include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
 
 #include "types.h"
 #include "profiler/profiler.h"
-#include "cfg/cfg.h"
 #include "rend/TexCache.h"
 #include "hw/maple/maple_devs.h"
 #include "hw/maple/maple_if.h"
 #include "oslib/audiobackend_android.h"
 
-#include "utils.h"
-
 extern "C"
 {
   JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_config(JNIEnv *env,jobject obj,jstring dirName)  __attribute__((visibility("default")));
diff --git a/shell/android-studio/reicast/src/main/jni/src/utils.cpp b/shell/android-studio/reicast/src/main/jni/src/utils.cpp
index 76182accb..d3a44885f 100644
--- a/shell/android-studio/reicast/src/main/jni/src/utils.cpp
+++ b/shell/android-studio/reicast/src/main/jni/src/utils.cpp
@@ -1,6 +1,5 @@
 #include <EGL/egl.h>
 #include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
 extern "C" {
 #include "deps/libpng/png.h"
 }
diff --git a/shell/android-studio/reicast/src/main/res/drawable/background.xml b/shell/android-studio/reicast/src/main/res/drawable/background.xml
index 03ea5be22..ae833c037 100644
--- a/shell/android-studio/reicast/src/main/res/drawable/background.xml
+++ b/shell/android-studio/reicast/src/main/res/drawable/background.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle" android:padding="10dp" >
             <solid android:color="#D0000000"/>
@@ -9,7 +8,7 @@
     <item>
         <bitmap
             android:gravity="center"
-            app:srcCompat="@drawable/menutile"
+            android:src="@drawable/menutile"
             android:tileMode="repeat" />
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/shell/android-studio/reicast/src/main/res/layout-v14/configure_fragment.xml b/shell/android-studio/reicast/src/main/res/layout-v14/configure_fragment.xml
index 13495f88b..3ddbcdee5 100644
--- a/shell/android-studio/reicast/src/main/res/layout-v14/configure_fragment.xml
+++ b/shell/android-studio/reicast/src/main/res/layout-v14/configure_fragment.xml
@@ -523,7 +523,7 @@
                     <Spinner
                         android:id="@+id/depth_spinner"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_height="0dp"
                         android:layout_weight="1"
                         android:ems="10" />
                 </LinearLayout>
@@ -599,7 +599,7 @@
                     <Spinner
                         android:id="@+id/cable_spinner"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_height="0dp"
                         android:layout_weight="1"
                         android:ems="10" />
                 </LinearLayout>
@@ -628,7 +628,7 @@
                     <Spinner
                         android:id="@+id/region_spinner"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_height="0dp"
                         android:layout_weight="1"
                         android:ems="10" />
                 </LinearLayout>
@@ -657,7 +657,7 @@
                     <Spinner
                         android:id="@+id/broadcast_spinner"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_height="0dp"
                         android:layout_weight="1"
                         android:ems="10" />
                 </LinearLayout>
diff --git a/shell/android-studio/reicast/src/main/res/layout-v14/input_fragment.xml b/shell/android-studio/reicast/src/main/res/layout-v14/input_fragment.xml
index 263add193..62b5a2a8d 100644
--- a/shell/android-studio/reicast/src/main/res/layout-v14/input_fragment.xml
+++ b/shell/android-studio/reicast/src/main/res/layout-v14/input_fragment.xml
@@ -34,7 +34,7 @@
                     <Button
                         android:id="@+id/buttonLaunchEditor"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_height="0dp"
                         android:layout_weight="1"
                         android:ems="8"
                         android:text="@string/launch_editor" />
@@ -142,7 +142,7 @@
                     <Button
                         android:id="@+id/buttonKeycodeEditor"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_height="0dp"
                         android:layout_weight="1"
                         android:ems="8"
                         android:text="@string/launch_editor" />
@@ -168,7 +168,7 @@
                         android:scaleType="fitCenter" />
 			        
 	                <TextView
-	                    android:layout_width="wrap_content"
+	                    android:layout_width="0dp"
 	                    android:layout_height="wrap_content"
 	                    android:layout_weight="0.5"
 	                    android:ems="10"
@@ -237,7 +237,7 @@
                     </RelativeLayout>
 
                     <LinearLayout
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="6dp"
                         android:layout_weight="1"
@@ -319,7 +319,7 @@
                     </RelativeLayout>
 
                     <LinearLayout
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="6dp"
                         android:layout_weight="1"
@@ -401,7 +401,7 @@
                     </RelativeLayout>
 
                     <LinearLayout
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="6dp"
                         android:layout_weight="1"
@@ -483,7 +483,7 @@
                     </RelativeLayout>
 
                     <LinearLayout
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="6dp"
                         android:layout_weight="1"
diff --git a/shell/android-studio/reicast/src/main/res/layout/about_fragment.xml b/shell/android-studio/reicast/src/main/res/layout/about_fragment.xml
index 4d527cfab..2b029c765 100644
--- a/shell/android-studio/reicast/src/main/res/layout/about_fragment.xml
+++ b/shell/android-studio/reicast/src/main/res/layout/about_fragment.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_horizontal"
diff --git a/shell/android-studio/reicast/src/main/res/layout/app_bar_main.xml b/shell/android-studio/reicast/src/main/res/layout/app_bar_main.xml
index a14b7c6d6..c2ad62b49 100644
--- a/shell/android-studio/reicast/src/main/res/layout/app_bar_main.xml
+++ b/shell/android-studio/reicast/src/main/res/layout/app_bar_main.xml
@@ -14,7 +14,7 @@
         <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_height="?android:attr/actionBarSize"
             android:background="@android:color/black"
             app:popupTheme="@style/AppTheme.PopupOverlay">
 
diff --git a/shell/android-studio/reicast/src/main/res/layout/bios_list_item.xml b/shell/android-studio/reicast/src/main/res/layout/bios_list_item.xml
index 61e61ab7a..2b587ffc7 100644
--- a/shell/android-studio/reicast/src/main/res/layout/bios_list_item.xml
+++ b/shell/android-studio/reicast/src/main/res/layout/bios_list_item.xml
@@ -30,7 +30,7 @@
         <TextView
             android:id="@+id/item_name"
             style="@android:style/TextAppearance.Small"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_weight="1"
diff --git a/shell/android-studio/reicast/src/main/res/layout/browser_fragment.xml b/shell/android-studio/reicast/src/main/res/layout/browser_fragment.xml
index 06222f357..0a55a1d8d 100644
--- a/shell/android-studio/reicast/src/main/res/layout/browser_fragment.xml
+++ b/shell/android-studio/reicast/src/main/res/layout/browser_fragment.xml
@@ -1,5 +1,4 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/root_list"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -14,14 +13,14 @@
     <ScrollView
         android:id="@+id/game_scroller"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
         android:layout_weight="1"
         android:fillViewport="true" >
 
         <LinearLayout
             android:id="@+id/game_list"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical" >
 
             <requestFocus />
diff --git a/shell/android-studio/reicast/src/main/res/layout/browser_fragment_header.xml b/shell/android-studio/reicast/src/main/res/layout/browser_fragment_header.xml
index 6429146a1..8687f7712 100644
--- a/shell/android-studio/reicast/src/main/res/layout/browser_fragment_header.xml
+++ b/shell/android-studio/reicast/src/main/res/layout/browser_fragment_header.xml
@@ -30,7 +30,7 @@
         <TextView
             android:id="@+id/item_name"
             style="@android:style/TextAppearance.Medium"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginLeft="6dp"
             android:layout_gravity="center_vertical"
diff --git a/shell/android-studio/reicast/src/main/res/layout/cloud_fragment.xml b/shell/android-studio/reicast/src/main/res/layout/cloud_fragment.xml
index 9a11bbcc7..1ed5eb8cc 100644
--- a/shell/android-studio/reicast/src/main/res/layout/cloud_fragment.xml
+++ b/shell/android-studio/reicast/src/main/res/layout/cloud_fragment.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_horizontal"
diff --git a/shell/android-studio/reicast/src/main/res/layout/configure_fragment.xml b/shell/android-studio/reicast/src/main/res/layout/configure_fragment.xml
index 11395fbae..a1b9cb39e 100644
--- a/shell/android-studio/reicast/src/main/res/layout/configure_fragment.xml
+++ b/shell/android-studio/reicast/src/main/res/layout/configure_fragment.xml
@@ -523,7 +523,7 @@
                     <Spinner
                         android:id="@+id/depth_spinner"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_height="0dp"
                         android:layout_weight="1"
                         android:ems="10" />
                 </LinearLayout>
@@ -599,7 +599,7 @@
                     <Spinner
                         android:id="@+id/cable_spinner"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_height="0dp"
                         android:layout_weight="1"
                         android:ems="10" />
                 </LinearLayout>
@@ -628,7 +628,7 @@
                     <Spinner
                         android:id="@+id/region_spinner"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_height="0dp"
                         android:layout_weight="1"
                         android:ems="10" />
                 </LinearLayout>
@@ -657,7 +657,7 @@
                     <Spinner
                         android:id="@+id/broadcast_spinner"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_height="0dp"
                         android:layout_weight="1"
                         android:ems="10" />
                 </LinearLayout>
diff --git a/shell/android-studio/reicast/src/main/res/layout/input_fragment.xml b/shell/android-studio/reicast/src/main/res/layout/input_fragment.xml
index 731c563f6..d88f02a2e 100644
--- a/shell/android-studio/reicast/src/main/res/layout/input_fragment.xml
+++ b/shell/android-studio/reicast/src/main/res/layout/input_fragment.xml
@@ -34,7 +34,7 @@
                     <Button
                         android:id="@+id/buttonLaunchEditor"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_height="0dp"
                         android:layout_weight="1"
                         android:ems="8"
                         android:text="@string/launch_editor" />
@@ -142,7 +142,7 @@
                     <Button
                         android:id="@+id/buttonKeycodeEditor"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_height="0dp"
                         android:layout_weight="1"
                         android:ems="8"
                         android:text="@string/launch_editor" />
@@ -168,7 +168,7 @@
                         android:scaleType="fitCenter" />
 			        
 	                <TextView
-	                    android:layout_width="wrap_content"
+	                    android:layout_width="0dp"
 	                    android:layout_height="wrap_content"
 	                    android:layout_weight="0.5"
 	                    android:ems="10"
@@ -237,7 +237,7 @@
                     </RelativeLayout>
 
                     <LinearLayout
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="6dp"
                         android:layout_weight="1"
@@ -319,7 +319,7 @@
                     </RelativeLayout>
 
                     <LinearLayout
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="6dp"
                         android:layout_weight="1"
@@ -401,7 +401,7 @@
                     </RelativeLayout>
 
                     <LinearLayout
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="6dp"
                         android:layout_weight="1"
@@ -483,7 +483,7 @@
                     </RelativeLayout>
 
                     <LinearLayout
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="6dp"
                         android:layout_weight="1"
diff --git a/shell/android-studio/reicast/src/main/res/layout/menu_popup_config.xml b/shell/android-studio/reicast/src/main/res/layout/menu_popup_config.xml
index ef2b5b1de..84eb9dbaf 100644
--- a/shell/android-studio/reicast/src/main/res/layout/menu_popup_config.xml
+++ b/shell/android-studio/reicast/src/main/res/layout/menu_popup_config.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/menuConfig"
     android:layout_width="280dp"
     android:layout_height="wrap_content"
diff --git a/shell/android-studio/reicast/src/main/res/layout/menu_popup_debug.xml b/shell/android-studio/reicast/src/main/res/layout/menu_popup_debug.xml
index a5d4c05c9..7dcd0d3a5 100644
--- a/shell/android-studio/reicast/src/main/res/layout/menu_popup_debug.xml
+++ b/shell/android-studio/reicast/src/main/res/layout/menu_popup_debug.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/menuDebug"
     android:layout_width="280dp"
     android:layout_height="wrap_content"
diff --git a/shell/android-studio/reicast/src/main/res/layout/menu_popup_main.xml b/shell/android-studio/reicast/src/main/res/layout/menu_popup_main.xml
index 4a7c9f2b6..3c4fdbe41 100644
--- a/shell/android-studio/reicast/src/main/res/layout/menu_popup_main.xml
+++ b/shell/android-studio/reicast/src/main/res/layout/menu_popup_main.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/menuMain"
     android:layout_width="280dp"
     android:layout_height="wrap_content"
diff --git a/shell/android-studio/reicast/src/main/res/layout/spinner_selected.xml b/shell/android-studio/reicast/src/main/res/layout/spinner_selected.xml
index 67794e7b0..e65fb9757 100644
--- a/shell/android-studio/reicast/src/main/res/layout/spinner_selected.xml
+++ b/shell/android-studio/reicast/src/main/res/layout/spinner_selected.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+android:id/text1"
+    android:id="@android:id/text1"
     style="?android:attr/spinnerItemStyle"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
diff --git a/shell/android-studio/reicast/src/main/res/layout/webview.xml b/shell/android-studio/reicast/src/main/res/layout/webview.xml
index 6e532a676..4408a6eed 100644
--- a/shell/android-studio/reicast/src/main/res/layout/webview.xml
+++ b/shell/android-studio/reicast/src/main/res/layout/webview.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:layout_gravity="center"
diff --git a/shell/android-studio/reicast/src/main/res/values-da/strings.xml b/shell/android-studio/reicast/src/main/res/values-da/strings.xml
index 9a273ca85..6896ba519 100644
--- a/shell/android-studio/reicast/src/main/res/values-da/strings.xml
+++ b/shell/android-studio/reicast/src/main/res/values-da/strings.xml
@@ -38,7 +38,6 @@
     <string name="select_software">Tving software rendering</string>
     <string name="select_sound">Deaktiver emulator lyd</string>
     <string name="select_depth">Renderingsdybde</string>
-    <string name="default_disk">Sæt standard disk</string>
 
     <string name="games_listing">Dreamcast spil</string>
     
diff --git a/shell/android-studio/reicast/src/main/res/values-de/strings.xml b/shell/android-studio/reicast/src/main/res/values-de/strings.xml
index 4d78e7f33..d119453b2 100644
--- a/shell/android-studio/reicast/src/main/res/values-de/strings.xml
+++ b/shell/android-studio/reicast/src/main/res/values-de/strings.xml
@@ -46,7 +46,6 @@
     <string name="select_software">Softwarerendering erzwingen</string>
     <string name="select_sound">Emulator-Sound deaktivieren</string>
     <string name="select_depth">Rendering-Tiefe</string>
-    <string name="default_disk">Wähle Standard-Datenträger</string>
 
     <string name="games_listing">Verfügbare Dreamcast-Spiele</string>
 
diff --git a/shell/android-studio/reicast/src/main/res/values-fr/strings.xml b/shell/android-studio/reicast/src/main/res/values-fr/strings.xml
index 02bc90395..488a71026 100644
--- a/shell/android-studio/reicast/src/main/res/values-fr/strings.xml
+++ b/shell/android-studio/reicast/src/main/res/values-fr/strings.xml
@@ -44,8 +44,7 @@ Last Edit: 21 May 2014
     <string name="select_software">Forcer le rendu logiciel</string>
     <string name="select_sound">Désactiver le son de l\'émulateur</string>
     <string name="select_depth">Rendu de profondeur</string>
-    <string name="default_disk">Réglage du disque par défaut</string>
- 
+
     <string name="games_listing">Liste des jeux disponibles</string>
 
     <string name="game_details">Infos du jeu - %1$s</string>
diff --git a/shell/android-studio/reicast/src/main/res/values-it/strings.xml b/shell/android-studio/reicast/src/main/res/values-it/strings.xml
index 07c638f75..2fec0e9ff 100644
--- a/shell/android-studio/reicast/src/main/res/values-it/strings.xml
+++ b/shell/android-studio/reicast/src/main/res/values-it/strings.xml
@@ -44,8 +44,7 @@
     <string name="select_software">Forza il Rendering Software</string>
     <string name="select_sound">Disabilita l\'Emulazione del Sonoro</string>
     <string name="select_depth">Profondità di Rendering</string>
-    <string name="default_disk">Disco Predefinito</string>
-    
+
     <string name="games_listing">Lista Giochi</string>
     
     <string name="game_details">Dettagli Gioco - %1$s</string>
diff --git a/shell/android-studio/reicast/src/main/res/values-jp/strings.xml b/shell/android-studio/reicast/src/main/res/values-jp/strings.xml
index 830a38191..4e3cd62b0 100644
--- a/shell/android-studio/reicast/src/main/res/values-jp/strings.xml
+++ b/shell/android-studio/reicast/src/main/res/values-jp/strings.xml
@@ -35,8 +35,7 @@
     <string name="select_software">ソフトウェアレンダリング</string>
     <string name="select_sound">サウンドを無効に</string>
     <string name="select_depth">レンダラの深度</string>
-    <string name="default_disk">デフォルトディスク</string>
-    
+
     <string name="games_listing">ゲームリスト</string>
     
     <string name="report_issue">前回のクラッシュ検出された</string>
diff --git a/shell/android-studio/reicast/src/main/res/values-ko/strings.xml b/shell/android-studio/reicast/src/main/res/values-ko/strings.xml
index eea6c9921..c3b40c826 100644
--- a/shell/android-studio/reicast/src/main/res/values-ko/strings.xml
+++ b/shell/android-studio/reicast/src/main/res/values-ko/strings.xml
@@ -24,7 +24,6 @@
     <string name="select_stretch">와이드 스크린 모드</string>
     <string name="set_frameskip">frameskip있는 값</string>
     <string name="select_render">PVR 렌더링 (지금은 아무것도하지 않습니다)</string>
-    <string name="default_disk">설정 기본 디스크</string>
 
     <string name="games_listing">드림 캐스트 게임 목록</string>
 
diff --git a/shell/android-studio/reicast/src/main/res/values-pl/strings.xml b/shell/android-studio/reicast/src/main/res/values-pl/strings.xml
index 4b40eddcc..a5f4b1ec5 100644
--- a/shell/android-studio/reicast/src/main/res/values-pl/strings.xml
+++ b/shell/android-studio/reicast/src/main/res/values-pl/strings.xml
@@ -23,7 +23,6 @@
     <string name="select_stretch">Tryb Szerokoekranowy</string>
     <string name="set_frameskip">Wartość Frameskip</string>
     <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>
 
diff --git a/shell/android-studio/reicast/src/main/res/values-pt/strings.xml b/shell/android-studio/reicast/src/main/res/values-pt/strings.xml
index 0d66a9556..79701448a 100644
--- a/shell/android-studio/reicast/src/main/res/values-pt/strings.xml
+++ b/shell/android-studio/reicast/src/main/res/values-pt/strings.xml
@@ -46,7 +46,6 @@
     <string name="select_software">Forçar Renderização por Software</string>
     <string name="select_sound">Desabilitar Som do Emulador</string>
     <string name="select_depth">Profundidade da Renderização</string>
-    <string name="default_disk">Disco padrão</string>
 
     <string name="games_listing">Lista de jogos</string>
 
diff --git a/shell/android-studio/reicast/src/main/res/values-ru/strings.xml b/shell/android-studio/reicast/src/main/res/values-ru/strings.xml
index 490a5aa28..b28463f54 100644
--- a/shell/android-studio/reicast/src/main/res/values-ru/strings.xml
+++ b/shell/android-studio/reicast/src/main/res/values-ru/strings.xml
@@ -49,7 +49,6 @@
     <string name="select_software">Программный рендеринг</string>
     <string name="select_sound">Без эмуляции звука</string>
     <string name="select_depth">Глубина рендеринга</string>
-    <string name="default_disk">Диск по умолчанию</string>
     
     <string name="games_listing">Список игр</string>
     
diff --git a/shell/android-studio/reicast/src/main/res/values-zh-rCN/strings.xml b/shell/android-studio/reicast/src/main/res/values-zh-rCN/strings.xml
index e53ca2653..acf1b53a3 100644
--- a/shell/android-studio/reicast/src/main/res/values-zh-rCN/strings.xml
+++ b/shell/android-studio/reicast/src/main/res/values-zh-rCN/strings.xml
@@ -23,7 +23,6 @@
     <string name="select_render">PVR 渲染 (目前没有任何作用)</string>
     <string name="select_software">强制使用软件渲染</string>
 
-    <string name="default_disk">设置默认光盘</string>
     <string name="games_listing">可用的Dreamcast游戏</string>
     <string name="customize_touch_controls">自定义触屏控制</string>
     <string name="launch_editor">打开编辑器</string>
diff --git a/shell/android-studio/reicast/src/main/res/values-zh/strings.xml b/shell/android-studio/reicast/src/main/res/values-zh/strings.xml
index 2f4f72e09..64817765d 100644
--- a/shell/android-studio/reicast/src/main/res/values-zh/strings.xml
+++ b/shell/android-studio/reicast/src/main/res/values-zh/strings.xml
@@ -23,7 +23,6 @@
     <string name="select_render">PVR 渲染 (目前沒有任何作用)</string>
     <string name="select_software">強制使用軟件渲染</string>
 
-    <string name="default_disk">設置默認光盤</string>
     <string name="games_listing">可用的Dreamcast遊戲</string>
     <string name="customize_touch_controls">自定義觸屏控制</string>
     <string name="launch_editor">打開編輯器</string>
diff --git a/shell/android-studio/reicast/src/main/res/values/donottranslate.xml b/shell/android-studio/reicast/src/main/res/values/donottranslate.xml
index 7995cd293..c6c5b472f 100644
--- a/shell/android-studio/reicast/src/main/res/values/donottranslate.xml
+++ b/shell/android-studio/reicast/src/main/res/values/donottranslate.xml
@@ -1,10 +1,8 @@
 <resources>
 
-    <string name="app_name">reicast</string>
+    <string name="app_name" translatable="false">reicast</string>
 
-    <string name="app_site">http://reicast.com</string>
-
-    <string name="error_kernel"></string>
+    <string name="app_site" translatable="false">http://reicast.com</string>
 
     <string-array name="depth">
         <item>16</item>
diff --git a/shell/android-studio/reicast/src/main/res/values/styles.xml b/shell/android-studio/reicast/src/main/res/values/styles.xml
index 96a4d7b56..c58ab9898 100644
--- a/shell/android-studio/reicast/src/main/res/values/styles.xml
+++ b/shell/android-studio/reicast/src/main/res/values/styles.xml
@@ -44,7 +44,7 @@
         <item name="android:paddingLeft">4dp</item>
         <item name="android:paddingBottom">4dp</item>
         <item name="android:textColor">#ffff00</item>
-        <item name="android:textSize">32dp</item>
+        <item name="android:textSize">32sp</item>
         <item name="android:shadowColor">#000000</item>
         <item name="android:shadowDx">1</item>
         <item name="android:shadowDy">1</item>