diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 7e450a1267..ce51a727de 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -10,7 +10,7 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name" >
         <activity
-            android:name=".MainActivity"
+            android:name=".main"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -18,6 +18,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:label="@string/app_name" android:name="rombrowser" />
     </application>
     <!-- Tell the system this app requires OpenGL ES 2.0. -->
     <uses-feature android:glEsVersion="0x00020000" android:required="true" />
diff --git a/android/bin/classes/com/retroarch/MainActivity.class b/android/bin/classes/com/retroarch/MainActivity.class
deleted file mode 100644
index d5fba4e868..0000000000
Binary files a/android/bin/classes/com/retroarch/MainActivity.class and /dev/null differ
diff --git a/android/bin/classes/com/retroarch/R$drawable.class b/android/bin/classes/com/retroarch/R$drawable.class
index 62036ee00a..7978de43c0 100644
Binary files a/android/bin/classes/com/retroarch/R$drawable.class and b/android/bin/classes/com/retroarch/R$drawable.class differ
diff --git a/android/bin/classes/com/retroarch/R$layout.class b/android/bin/classes/com/retroarch/R$layout.class
index 78c6034104..481d24b928 100644
Binary files a/android/bin/classes/com/retroarch/R$layout.class and b/android/bin/classes/com/retroarch/R$layout.class differ
diff --git a/android/bin/classes/com/retroarch/R$string.class b/android/bin/classes/com/retroarch/R$string.class
index e0ffa75cf2..a6f1f30f88 100644
Binary files a/android/bin/classes/com/retroarch/R$string.class and b/android/bin/classes/com/retroarch/R$string.class differ
diff --git a/android/gen/com/retroarch/R.java b/android/gen/com/retroarch/R.java
index 083d090c3b..c135920b23 100644
--- a/android/gen/com/retroarch/R.java
+++ b/android/gen/com/retroarch/R.java
@@ -14,23 +14,24 @@ public final class R {
         public static final int ic_action_close=0x7f020000;
         public static final int ic_action_history=0x7f020001;
         public static final int ic_action_load=0x7f020002;
-        public static final int ic_action_open=0x7f020003;
-        public static final int ic_action_quit=0x7f020004;
+        public static final int ic_action_main=0x7f020003;
+        public static final int ic_action_open=0x7f020004;
         public static final int ic_action_save=0x7f020005;
         public static final int ic_action_settings=0x7f020006;
         public static final int ic_launcher=0x7f020007;
     }
     public static final class id {
-        public static final int close=0x7f060001;
-        public static final int history=0x7f060004;
-        public static final int load=0x7f060002;
-        public static final int open=0x7f060000;
-        public static final int quit=0x7f060006;
-        public static final int save=0x7f060003;
-        public static final int settings=0x7f060005;
+        public static final int close=0x7f060002;
+        public static final int history=0x7f060005;
+        public static final int load=0x7f060003;
+        public static final int main=0x7f060000;
+        public static final int open=0x7f060001;
+        public static final int save=0x7f060004;
+        public static final int settings=0x7f060006;
     }
     public static final class layout {
         public static final int main=0x7f030000;
+        public static final int rombrowser=0x7f030001;
     }
     public static final class menu {
         public static final int main_menu=0x7f050000;
diff --git a/android/res/drawable-hdpi/ic_action_main.png b/android/res/drawable-hdpi/ic_action_main.png
new file mode 100644
index 0000000000..c659124b9e
Binary files /dev/null and b/android/res/drawable-hdpi/ic_action_main.png differ
diff --git a/android/res/drawable-hdpi/ic_action_quit.png b/android/res/drawable-hdpi/ic_action_quit.png
deleted file mode 100644
index 10dc28fcbb..0000000000
Binary files a/android/res/drawable-hdpi/ic_action_quit.png and /dev/null differ
diff --git a/android/res/drawable-ldpi/ic_action_main.png b/android/res/drawable-ldpi/ic_action_main.png
new file mode 100644
index 0000000000..81b838512f
Binary files /dev/null and b/android/res/drawable-ldpi/ic_action_main.png differ
diff --git a/android/res/drawable-ldpi/ic_action_quit.png b/android/res/drawable-ldpi/ic_action_quit.png
deleted file mode 100644
index 203696e713..0000000000
Binary files a/android/res/drawable-ldpi/ic_action_quit.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_action_main.png b/android/res/drawable-mdpi/ic_action_main.png
new file mode 100644
index 0000000000..65b5553331
Binary files /dev/null and b/android/res/drawable-mdpi/ic_action_main.png differ
diff --git a/android/res/drawable-mdpi/ic_action_quit.png b/android/res/drawable-mdpi/ic_action_quit.png
deleted file mode 100644
index 369120e38c..0000000000
Binary files a/android/res/drawable-mdpi/ic_action_quit.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/ic_action_main.png b/android/res/drawable-xhdpi/ic_action_main.png
new file mode 100644
index 0000000000..e5090aa3d9
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_action_main.png differ
diff --git a/android/res/drawable-xhdpi/ic_action_quit.png b/android/res/drawable-xhdpi/ic_action_quit.png
deleted file mode 100644
index 041de185be..0000000000
Binary files a/android/res/drawable-xhdpi/ic_action_quit.png and /dev/null differ
diff --git a/android/res/layout/rombrowser.xml b/android/res/layout/rombrowser.xml
new file mode 100644
index 0000000000..1555563624
--- /dev/null
+++ b/android/res/layout/rombrowser.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="Hello world from RomBrowser" />
+
+</LinearLayout>
diff --git a/android/res/menu/main_menu.xml b/android/res/menu/main_menu.xml
index bdf9374246..63b1f18b81 100644
--- a/android/res/menu/main_menu.xml
+++ b/android/res/menu/main_menu.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
-<item android:id="@+id/open" android:showAsAction="ifRoom|withText" android:title="Open ROM" android:icon="@drawable/ic_action_open"></item>
+<item android:id="@+id/main" android:showAsAction="ifRoom|withText" android:title="Main" android:icon="@drawable/ic_action_main"></item>
+<item android:id="@+id/open" android:showAsAction="collapseActionView" android:title="Open ROM" android:icon="@drawable/ic_action_open"></item>
 <item android:id="@+id/close" android:showAsAction="collapseActionView" android:title="Close ROM" android:icon="@drawable/ic_action_close"></item>
 <item android:id="@+id/load" android:showAsAction="collapseActionView" android:title="Load" android:icon="@drawable/ic_action_load"></item>
 <item android:id="@+id/save" android:showAsAction="collapseActionView" android:title="Save" android:icon="@drawable/ic_action_save"></item>
 <item android:id="@+id/history" android:showAsAction="collapseActionView" android:title="History" android:icon="@drawable/ic_action_history"></item>
 <item android:id="@+id/settings" android:showAsAction="collapseActionView" android:title="Settings" android:icon="@drawable/ic_action_settings"></item>
-<item android:id="@+id/quit" android:showAsAction="collapseActionView" android:title="Quit" android:icon="@drawable/ic_action_quit"></item>
-
 
 </menu>
diff --git a/android/src/com/retroarch/MainActivity.java b/android/src/com/retroarch/main.java
similarity index 76%
rename from android/src/com/retroarch/MainActivity.java
rename to android/src/com/retroarch/main.java
index 957f352602..05e6a629cb 100644
--- a/android/src/com/retroarch/MainActivity.java
+++ b/android/src/com/retroarch/main.java
@@ -1,7 +1,11 @@
 package com.retroarch;
 
-import android.app.ActionBar;
+import com.retroarch.R;
+import com.retroarch.R.id;
+import com.retroarch.R.menu;
+
 import android.app.Activity;
+import android.content.Intent;
 import android.content.Context;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -10,7 +14,7 @@ import android.widget.Toast;
 import android.opengl.GLSurfaceView;
 import android.os.Bundle;
 
-public class MainActivity extends Activity
+public class main extends Activity
 {
 	private GLSurfaceView ctx_gl;
 	
@@ -34,13 +38,19 @@ public class MainActivity extends Activity
     {
     	switch (item.getItemId())
     	{
-    		case R.id.quit:
-    			android.os.Process.killProcess(android.os.Process.myPid());
-    			return true;
+    	    case R.id.main:
+    	    	this.finish();
+    		    break;
+    	    case R.id.open:
+    	    	Intent myIntent = new Intent(main.this, rombrowser.class);
+    	    	main.this.startActivity(myIntent);
+    		    break;
     		default:
     	    	Toast.makeText(this, "MenuItem " + item.getTitle() + " selected.", Toast.LENGTH_SHORT).show();
-    	    	return true;
+    	    	break;
     	}
+    	
+    	return true;
     }
     
     @Override