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 5f94f6432..7a611f303 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
@@ -1,7 +1,9 @@
 package com.reicast.emulator.config;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
@@ -567,6 +569,23 @@ public class OptionsFragment extends Fragment {
 
 			}
 		});
+
+		Button resetEmu = (Button) getView().findViewById(R.id.reset_emu_settings);
+		resetEmu.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View view) {
+				AlertDialog.Builder b = new AlertDialog.Builder(getActivity());
+				b.setIcon(android.R.drawable.ic_dialog_alert);
+				b.setTitle(getActivity().getString(R.string.reset_emu_title) + "?");
+				b.setMessage(getActivity().getString(R.string.reset_emu_details));
+				b.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
+					public void onClick(DialogInterface dialog, int id) {
+						resetEmuSettings();
+					}
+				});
+				b.setNegativeButton(android.R.string.no, null);
+				b.show();
+			}
+		});
 	}
 
 	private final class LocateThemes extends AsyncTask<String, Integer, List<File>> {
@@ -685,7 +704,7 @@ public class OptionsFragment extends Fragment {
 		}
 	}
 
-	private void resetConfig() {
+	private void resetEmuSettings() {
 		mPrefs.edit().remove(Emulator.pref_usereios).apply();
 		mPrefs.edit().remove(Config.pref_gamedetails).apply();
 		mPrefs.edit().remove(Emulator.pref_nativeact).apply();
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 60601e937..d13947dab 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
@@ -501,34 +501,6 @@
                 </LinearLayout>
             </TableRow>
 
-            <TableRow
-                android:layout_marginTop="10dp"
-                android:gravity="center_vertical" >
-
-                <TextView
-                    android:id="@+id/select_egl14_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.5"
-                    android:ems="10"
-                    android:gravity="center_vertical|left"
-                    android:text="@string/select_egl14" />
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="right"
-                    android:orientation="vertical" >
-
-                    <Switch
-                        android:id="@+id/force_gpu_option"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:focusable="true" />
-                </LinearLayout>
-            </TableRow>
-
             <TableRow
                 android:layout_marginTop="20dp"
                 android:gravity="center_vertical" >
@@ -803,6 +775,34 @@
                     </EditText>
                 </LinearLayout>
             </LinearLayout>
+
+            <TableRow
+                android:layout_marginTop="10dp"
+                android:gravity="center_vertical" >
+
+                <TextView
+                    android:id="@+id/reset_emu_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5"
+                    android:ems="10"
+                    android:gravity="center_vertical|left"
+                    android:text="@string/reset_emu_title" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="right"
+                    android:orientation="vertical" >
+
+                    <Button
+                        android:id="@+id/reset_emu_settings"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/reset_emu" />
+                </LinearLayout>
+            </TableRow>
         </TableLayout>
     </LinearLayout>
 
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 0b7f3ade7..d84858907 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
@@ -501,34 +501,6 @@
                 </LinearLayout>
             </TableRow>
 
-            <TableRow
-                android:layout_marginTop="10dp"
-                android:gravity="center_vertical" >
-
-                <TextView
-                    android:id="@+id/select_egl14_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.5"
-                    android:ems="10"
-                    android:gravity="center_vertical|left"
-                    android:text="@string/select_egl14" />
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="right"
-                    android:orientation="vertical" >
-
-                    <Checkbox
-                        android:id="@+id/force_gpu_option"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:focusable="true" />
-                </LinearLayout>
-            </TableRow>
-
             <TableRow
                 android:layout_marginTop="20dp"
                 android:gravity="center_vertical" >
@@ -803,6 +775,34 @@
                     </EditText>
                 </LinearLayout>
             </LinearLayout>
+
+            <TableRow
+                android:layout_marginTop="10dp"
+                android:gravity="center_vertical" >
+
+                <TextView
+                    android:id="@+id/reset_emu_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5"
+                    android:ems="10"
+                    android:gravity="center_vertical|left"
+                    android:text="@string/reset_emu_title" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="right"
+                    android:orientation="vertical" >
+
+                    <Button
+                        android:id="@+id/reset_emu_settings"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/reset_emu" />
+                </LinearLayout>
+            </TableRow>
         </TableLayout>
     </LinearLayout>
 
diff --git a/shell/android-studio/reicast/src/main/res/values/strings.xml b/shell/android-studio/reicast/src/main/res/values/strings.xml
index 32fe15b9b..2aefc6a68 100644
--- a/shell/android-studio/reicast/src/main/res/values/strings.xml
+++ b/shell/android-studio/reicast/src/main/res/values/strings.xml
@@ -52,8 +52,11 @@
     <string name="select_software">Force Software Rendering</string>
     <string name="select_sound">Disable Emulator Sound</string>
     <string name="select_depth">Rendering Depth</string>
-    <string name="select_egl14">Use EGL14 GLCFactory</string>
     <string name="default_disk">Default Disk</string>
+
+    <string name="reset_emu">Reset Emu</string>
+    <string name="reset_emu_title">Reset Emulator Settings</string>
+    <string name="reset_emu_details">All emulator settings will be cleared. BIOS, game, and controller settings will NOT be removed. Are you sure you want to continue?</string>
     
     <string name="games_listing">Game List</string>
     <string name="search_hint">Game (ie. Crazy Taxi)</string>