diff --git a/android/andretro/res/drawable-hdpi/ic_dir.png b/android/andretro/res/drawable-hdpi/ic_dir.png
new file mode 100755
index 0000000000..48489b00dc
Binary files /dev/null and b/android/andretro/res/drawable-hdpi/ic_dir.png differ
diff --git a/android/andretro/res/drawable-hdpi/ic_file.png b/android/andretro/res/drawable-hdpi/ic_file.png
new file mode 100755
index 0000000000..64459b45a1
Binary files /dev/null and b/android/andretro/res/drawable-hdpi/ic_file.png differ
diff --git a/android/andretro/res/drawable-ldpi/ic_dir.png b/android/andretro/res/drawable-ldpi/ic_dir.png
new file mode 100755
index 0000000000..28456b7fca
Binary files /dev/null and b/android/andretro/res/drawable-ldpi/ic_dir.png differ
diff --git a/android/andretro/res/drawable-ldpi/ic_file.png b/android/andretro/res/drawable-ldpi/ic_file.png
new file mode 100755
index 0000000000..e22348ed60
Binary files /dev/null and b/android/andretro/res/drawable-ldpi/ic_file.png differ
diff --git a/android/andretro/res/drawable-mdpi/ic_dir.png b/android/andretro/res/drawable-mdpi/ic_dir.png
new file mode 100755
index 0000000000..3159fbada2
Binary files /dev/null and b/android/andretro/res/drawable-mdpi/ic_dir.png differ
diff --git a/android/andretro/res/drawable-mdpi/ic_file.png b/android/andretro/res/drawable-mdpi/ic_file.png
new file mode 100755
index 0000000000..ff4a435259
Binary files /dev/null and b/android/andretro/res/drawable-mdpi/ic_file.png differ
diff --git a/android/andretro/res/drawable-nodpi/file.png b/android/andretro/res/drawable-nodpi/file.png
deleted file mode 100755
index 7a2442eae4..0000000000
Binary files a/android/andretro/res/drawable-nodpi/file.png and /dev/null differ
diff --git a/android/andretro/res/drawable-nodpi/folder.png b/android/andretro/res/drawable-nodpi/folder.png
deleted file mode 100755
index eb4bed47bf..0000000000
Binary files a/android/andretro/res/drawable-nodpi/folder.png and /dev/null differ
diff --git a/android/andretro/res/drawable-xhdpi/ic_dir.png b/android/andretro/res/drawable-xhdpi/ic_dir.png
new file mode 100755
index 0000000000..c6908c2f14
Binary files /dev/null and b/android/andretro/res/drawable-xhdpi/ic_dir.png differ
diff --git a/android/andretro/res/drawable-xhdpi/ic_file.png b/android/andretro/res/drawable-xhdpi/ic_file.png
new file mode 100755
index 0000000000..4425035db7
Binary files /dev/null and b/android/andretro/res/drawable-xhdpi/ic_file.png differ
diff --git a/android/andretro/src/org/retroarch/browser/DirectoryActivity.java b/android/andretro/src/org/retroarch/browser/DirectoryActivity.java
index b3cdc14898..90a7f8508b 100644
--- a/android/andretro/src/org/retroarch/browser/DirectoryActivity.java
+++ b/android/andretro/src/org/retroarch/browser/DirectoryActivity.java
@@ -37,7 +37,7 @@ class FileWrapper implements IconAdapterItem
     
     @Override public int getIconResourceId()
     {
-    	return file.isFile() ? R.drawable.file : R.drawable.folder;
+    	return file.isFile() ? R.drawable.ic_file : R.drawable.ic_dir;
     }
     
     @Override public Drawable getIconDrawable()
@@ -85,10 +85,7 @@ public class DirectoryActivity extends Activity implements AdapterView.OnItemCli
         
         // Load Directory
         String path = getIntent().getStringExtra("ROM");
-        if(path == null)
-        {
-            path = Environment.getExternalStorageDirectory().getPath();
-        }
+        path = (path == null) ? "/" : path;
         
         wrapFiles(new File(path));
         setTitle(path);
diff --git a/android/andretro/src/org/retroarch/browser/ModuleActivity.java b/android/andretro/src/org/retroarch/browser/ModuleActivity.java
index b0b5dba23f..179da18e2f 100644
--- a/android/andretro/src/org/retroarch/browser/ModuleActivity.java
+++ b/android/andretro/src/org/retroarch/browser/ModuleActivity.java
@@ -43,14 +43,12 @@ class ModuleWrapper implements IconAdapterItem
 
 public class ModuleActivity extends Activity implements AdapterView.OnItemClickListener
 {
-	// HACK: Hard path
-	private static final String modulePath = "/data/data/org.retroarch/lib/";
     private IconAdapter<ModuleWrapper> adapter;
     
     @Override public void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
-        
+               
         setContentView(R.layout.line_list);
         
         // Setup the list
@@ -61,6 +59,8 @@ public class ModuleActivity extends Activity implements AdapterView.OnItemClickL
         
         setTitle("Select Emulator");
     	
+    	// Populate the list
+    	final String modulePath = getApplicationInfo().nativeLibraryDir;
         for(final File lib: new File(modulePath).listFiles())
         {
         	if(lib.getName().startsWith("libretro_"))