diff --git a/Source/Android/app/src/main/AndroidManifest.xml b/Source/Android/app/src/main/AndroidManifest.xml
index 981d4117e9..d10632b868 100644
--- a/Source/Android/app/src/main/AndroidManifest.xml
+++ b/Source/Android/app/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
         <activity
             android:name=".activities.GameGridActivity"
             android:label="Dolphin New UI"
-            android:theme="@style/DolphinWii">
+            android:theme="@style/DolphinGamecube">
 
             <!-- This intentfilter marks this Activity as the one that gets launched from Home screen. -->
             <intent-filter>
@@ -25,6 +25,12 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".activities.AddDirectoryActivity"
+            android:theme="@style/DolphinWii"
+            android:label="@string/add_directory_title"/>
+
+
         <activity
             android:name="org.dolphinemu.dolphinemu.gamelist.GameListActivity"
             android:label="@string/app_name"
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/AddDirectoryActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/AddDirectoryActivity.java
new file mode 100644
index 0000000000..3a282f6433
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/AddDirectoryActivity.java
@@ -0,0 +1,96 @@
+package org.dolphinemu.dolphinemu.activities;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.widget.Toolbar;
+
+import org.dolphinemu.dolphinemu.BuildConfig;
+import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.dolphinemu.adapters.FileAdapter;
+
+public class AddDirectoryActivity extends Activity implements FileAdapter.FileClickListener
+{
+	public static final String KEY_CURRENT_PATH = BuildConfig.APPLICATION_ID + ".path";
+
+	private FileAdapter mAdapter;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState)
+	{
+		super.onCreate(savedInstanceState);
+
+		setContentView(R.layout.activity_add_directory);
+
+		Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar_folder_list);
+		setActionBar(toolbar);
+
+		RecyclerView recyclerView = (RecyclerView) findViewById(R.id.list_files);
+
+		// Specifying the LayoutManager determines how the RecyclerView arranges views.
+		RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false);
+		recyclerView.setLayoutManager(layoutManager);
+
+		String path;
+		// Stuff in this block only happens when this activity is newly created (i.e. not a rotation)
+		if (savedInstanceState == null)
+		{
+			path = Environment.getExternalStorageDirectory().getPath();
+		} else
+		{
+			// Get the path we were looking at before we rotated.
+			path = savedInstanceState.getString(KEY_CURRENT_PATH);
+		}
+
+		mAdapter = new FileAdapter(path, this);
+		recyclerView.setAdapter(mAdapter);
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu)
+	{
+		MenuInflater inflater = getMenuInflater();
+		inflater.inflate(R.menu.menu_add_directory, menu);
+
+		return true;
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item)
+	{
+		switch (item.getItemId())
+		{
+			case R.id.menu_up_one_level:
+				mAdapter.setPath(mAdapter.getPath() + "/..");
+				break;
+		}
+
+		return super.onOptionsItemSelected(item);
+	}
+
+	@Override
+	protected void onSaveInstanceState(Bundle outState)
+	{
+		super.onSaveInstanceState(outState);
+
+		// Save the path we're looking at so when rotation is done, we start from same folder.
+		outState.putString(KEY_CURRENT_PATH, mAdapter.getPath());
+	}
+
+	@Override
+	public void finishSuccessfully()
+	{
+		Intent resultData = new Intent();
+
+		resultData.putExtra(KEY_CURRENT_PATH, mAdapter.getPath());
+		setResult(RESULT_OK, resultData);
+
+		finish();
+	}
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/GameGridActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/GameGridActivity.java
index be0fbbed1a..14633d1277 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/GameGridActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/GameGridActivity.java
@@ -2,13 +2,21 @@ package org.dolphinemu.dolphinemu.activities;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.content.SharedPreferences;
+import android.database.Cursor;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
+import android.preference.PreferenceManager;
+import android.provider.DocumentsContract;
+import android.provider.OpenableColumns;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
+import android.view.View;
+import android.widget.ImageButton;
 import android.widget.Toolbar;
 
 import org.dolphinemu.dolphinemu.AssetCopyService;
@@ -24,11 +32,11 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-public class GameGridActivity extends Activity
+public final class GameGridActivity extends Activity
 {
-	private RecyclerView mRecyclerView;
-	private RecyclerView.Adapter mAdapter;
-	private RecyclerView.LayoutManager mLayoutManager;
+	private static final int REQUEST_ADD_DIRECTORY = 1;
+
+	private GameAdapter mAdapter;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState)
@@ -39,21 +47,32 @@ public class GameGridActivity extends Activity
 		Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar_game_list);
 		setActionBar(toolbar);
 
-		mRecyclerView = (RecyclerView) findViewById(R.id.grid_games);
+		ImageButton buttonAddDirectory = (ImageButton) findViewById(R.id.button_add_directory);
+		RecyclerView recyclerView = (RecyclerView) findViewById(R.id.grid_games);
 
 		// use this setting to improve performance if you know that changes
 		// in content do not change the layout size of the RecyclerView
 		//mRecyclerView.setHasFixedSize(true);
 
 		// Specifying the LayoutManager determines how the RecyclerView arranges views.
-		mLayoutManager = new GridLayoutManager(this, 4);
-		mRecyclerView.setLayoutManager(mLayoutManager);
+		RecyclerView.LayoutManager layoutManager = new GridLayoutManager(this, 4);
+		recyclerView.setLayoutManager(layoutManager);
 
-		mRecyclerView.addItemDecoration(new GameAdapter.SpacesItemDecoration(8));
+		recyclerView.addItemDecoration(new GameAdapter.SpacesItemDecoration(8));
 
 		// Create an adapter that will relate the dataset to the views on-screen.
 		mAdapter = new GameAdapter(getGameList());
-		mRecyclerView.setAdapter(mAdapter);
+		recyclerView.setAdapter(mAdapter);
+
+		buttonAddDirectory.setOnClickListener(new View.OnClickListener()
+		{
+			@Override
+			public void onClick(View view)
+			{
+				Intent fileChooser = new Intent(GameGridActivity.this, AddDirectoryActivity.class);
+				startActivityForResult(fileChooser, REQUEST_ADD_DIRECTORY);
+			}
+		});
 
 		// Stuff in this block only happens when this activity is newly created (i.e. not a rotation)
 		if (savedInstanceState == null)
@@ -64,11 +83,33 @@ public class GameGridActivity extends Activity
 		}
 	}
 
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent result)
+	{
+		if (resultCode == RESULT_OK)
+		{
+			if (requestCode == REQUEST_ADD_DIRECTORY)
+			{
+				String path = result.getStringExtra(AddDirectoryActivity.KEY_CURRENT_PATH);
+
+				SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+				SharedPreferences.Editor editor = prefs.edit();
+
+				editor.putString(AddDirectoryActivity.KEY_CURRENT_PATH, path);
+
+				// Using commit in order to block so the next method has the correct data to load.
+				editor.commit();
+
+				mAdapter.setGameList(getGameList());
+			}
+		}
+	}
+
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu)
 	{
 		MenuInflater inflater = getMenuInflater();
-		inflater.inflate(R.menu.gamelist_menu, menu);
+		inflater.inflate(R.menu.menu_game_grid, menu);
 		return true;
 
 	}
@@ -82,48 +123,43 @@ public class GameGridActivity extends Activity
 
 		NativeLibrary.SetUserDirectory(DefaultDir);
 
-		String Directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "ISOPaths", "0");
-		Log.v("DolphinEmu", "Directories: " + Directories);
-		int intDirectories = Integer.parseInt(Directories);
-
 		// Extensions to filter by.
 		Set<String> exts = new HashSet<String>(Arrays.asList(".dff", ".dol", ".elf", ".gcm", ".gcz", ".iso", ".wad", ".wbfs"));
 
-		for (int a = 0; a < intDirectories; ++a)
+		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+
+		String path = prefs.getString(AddDirectoryActivity.KEY_CURRENT_PATH, "/");
+
+		File currentDir = new File(path);
+		File[] dirs = currentDir.listFiles();
+		try
 		{
-			String BrowseDir = NativeLibrary.GetConfig("Dolphin.ini", "General", "ISOPath" + a, "");
-			Log.v("DolphinEmu", "Directory " + a + ": " + BrowseDir);
-
-			File currentDir = new File(BrowseDir);
-			File[] dirs = currentDir.listFiles();
-			try
+			for (File entry : dirs)
 			{
-				for (File entry : dirs)
+				if (!entry.isHidden() && !entry.isDirectory())
 				{
-					if (!entry.isHidden() && !entry.isDirectory())
+					String entryName = entry.getName();
+
+					// Check that the file has an appropriate extension before trying to read out of it.
+					if (exts.contains(entryName.toLowerCase().substring(entryName.lastIndexOf('.'))))
 					{
-						String entryName = entry.getName();
-
-						// Check that the file has an appropriate extension before trying to read out of it.
-						if (exts.contains(entryName.toLowerCase().substring(entryName.lastIndexOf('.'))))
-						{
-							GcGame game = new GcGame(NativeLibrary.GetTitle(entry.getAbsolutePath()),
-									NativeLibrary.GetDescription(entry.getAbsolutePath()).replace("\n", " "),
-									// TODO Some games might actually not be from this region, believe it or not.
-									"United States",
-									entry.getAbsolutePath(),
-									NativeLibrary.GetGameId(entry.getAbsolutePath()),
-									NativeLibrary.GetDate(entry.getAbsolutePath()));
-
-							gameList.add(game);
-						}
+						GcGame game = new GcGame(NativeLibrary.GetTitle(entry.getAbsolutePath()),
+								NativeLibrary.GetDescription(entry.getAbsolutePath()).replace("\n", " "),
+								// TODO Some games might actually not be from this region, believe it or not.
+								"United States",
+								entry.getAbsolutePath(),
+								NativeLibrary.GetGameId(entry.getAbsolutePath()),
+								NativeLibrary.GetDate(entry.getAbsolutePath()));
 
+						gameList.add(game);
 					}
 
 				}
-			} catch (Exception ignored)
-			{
+
 			}
+		} catch (Exception ignored)
+		{
+
 		}
 
 		return gameList;
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/FileAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/FileAdapter.java
new file mode 100644
index 0000000000..7f4acf6abe
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/FileAdapter.java
@@ -0,0 +1,161 @@
+package org.dolphinemu.dolphinemu.adapters;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.dolphinemu.model.FileListItem;
+import org.dolphinemu.dolphinemu.viewholders.FileViewHolder;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+
+public class FileAdapter extends RecyclerView.Adapter<FileViewHolder> implements View.OnClickListener
+{
+	private ArrayList<FileListItem> mFileList;
+
+	private String mPath;
+
+	private FileClickListener mListener;
+
+	/**
+	 * Initializes the dataset to be displayed, and associates the Adapter with the
+	 * Activity as an event listener.
+	 *
+	 * @param gameList
+	 */
+	public FileAdapter(String path, FileClickListener listener)
+	{
+		mFileList = generateFileList(new File(path));
+		mListener = listener;
+	}
+
+	/**
+	 * Called by the LayoutManager when it is necessary to create a new view.
+	 *
+	 * @param parent   The RecyclerView (I think?) the created view will be thrown into.
+	 * @param viewType Not used here, but useful when more than one type of child will be used in the RecyclerView.
+	 * @return The created ViewHolder with references to all the child view's members.
+	 */
+	@Override
+	public FileViewHolder onCreateViewHolder(ViewGroup parent, int viewType)
+	{
+		// Create a new view.
+		View listItem = LayoutInflater.from(parent.getContext())
+				.inflate(R.layout.list_item_file, parent, false);
+
+		listItem.setOnClickListener(this);
+
+		// Use that view to create a ViewHolder.
+		return new FileViewHolder(listItem);
+	}
+
+	/**
+	 * Called by the LayoutManager when a new view is not necessary because we can recycle
+	 * an existing one (for example, if a view just scrolled onto the screen from the bottom, we
+	 * can use the view that just scrolled off the top instead of inflating a new one.)
+	 *
+	 * @param holder   A ViewHolder representing the view we're recycling.
+	 * @param position The position of the 'new' view in the dataset.
+	 */
+	@Override
+	public void onBindViewHolder(FileViewHolder holder, int position)
+	{
+		// Get a reference to the item from the dataset; we'll use this to fill in the view contents.
+		final FileListItem file = mFileList.get(position);
+
+		// Fill in the view contents.
+		switch (file.getType())
+		{
+			case FileListItem.TYPE_FOLDER:
+				holder.imageType.setImageResource(R.drawable.ic_folder);
+				break;
+
+			case FileListItem.TYPE_GC:
+				holder.imageType.setImageResource(R.drawable.ic_gamecube);
+				break;
+
+			case FileListItem.TYPE_WII:
+				holder.imageType.setImageResource(R.drawable.ic_wii);
+				break;
+
+			case FileListItem.TYPE_OTHER:
+				holder.imageType.setImageResource(android.R.color.transparent);
+				break;
+		}
+
+		holder.textFileName.setText(file.getFilename());
+		holder.itemView.setTag(file.getPath());
+	}
+
+	/**
+	 * Called by the LayoutManager to find out how much data we have.
+	 *
+	 * @return Size of the dataset.
+	 */
+	@Override
+	public int getItemCount()
+	{
+		return mFileList.size();
+	}
+
+	@Override
+	public void onClick(View view)
+	{
+		String path = (String) view.getTag();
+
+		File clickedFile = new File(path);
+
+		if (clickedFile.isDirectory())
+		{
+			mFileList = generateFileList(clickedFile);
+			notifyDataSetChanged();
+		} else
+		{
+			// Pass the activity the path of the parent directory of the clicked file.
+			mListener.finishSuccessfully();
+		}
+	}
+
+	private ArrayList<FileListItem> generateFileList(File directory)
+	{
+		File[] children = directory.listFiles();
+		ArrayList<FileListItem> fileList = new ArrayList<FileListItem>(children.length);
+
+		for (File child : children)
+		{
+			if (!child.isHidden())
+			{
+				FileListItem item = new FileListItem(child);
+				fileList.add(item);
+			}
+		}
+
+		mPath = directory.getAbsolutePath();
+
+		Collections.sort(fileList);
+		return fileList;
+	}
+
+	public String getPath()
+	{
+		return mPath;
+	}
+
+	public void setPath(String path)
+	{
+		mPath = path;
+		File parentDirectory = new File(path);
+
+		mFileList = generateFileList(parentDirectory);
+		notifyDataSetChanged();
+	}
+
+	public static interface FileClickListener
+	{
+		public void finishSuccessfully();
+	}
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java
index d868ed46de..bf7bf435b7 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java
@@ -79,7 +79,6 @@ public class GameAdapter extends RecyclerView.Adapter<GameViewHolder>
 		holder.path = game.getPath();
 		holder.screenshotPath = game.getScreenPath();
 		holder.game = game;
-
 	}
 
 	/**
@@ -112,4 +111,10 @@ public class GameAdapter extends RecyclerView.Adapter<GameViewHolder>
 
 		}
 	}
+
+	public void setGameList(ArrayList<Game> gameList)
+	{
+		mGameList = gameList;
+		notifyDataSetChanged();
+	}
 }
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/FileListItem.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/FileListItem.java
new file mode 100644
index 0000000000..e15516dbaf
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/FileListItem.java
@@ -0,0 +1,81 @@
+package org.dolphinemu.dolphinemu.model;
+
+
+import org.dolphinemu.dolphinemu.NativeLibrary;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+public class FileListItem implements Comparable<FileListItem>
+{
+	public static final int TYPE_FOLDER = 0;
+	public static final int TYPE_GC = 1;
+	public static final int TYPE_WII = 2;
+	public static final int TYPE_OTHER = 3;
+
+	private int mType;
+	private String mFilename;
+	private String mPath;
+
+	public FileListItem(File file)
+	{
+		mPath = file.getAbsolutePath();
+
+		if (file.isDirectory())
+		{
+			mType = TYPE_FOLDER;
+		} else
+		{
+			String fileExtension = mPath.substring(mPath.lastIndexOf('.'));
+
+			// Extensions to filter by.
+			Set<String> allowedExtensions = new HashSet<String>(Arrays.asList(".dff", ".dol", ".elf", ".gcm", ".gcz", ".iso", ".wad", ".wbfs"));
+
+			// Check that the file has an appropriate extension before trying to read out of it.
+			if (allowedExtensions.contains(fileExtension))
+			{
+				mType = NativeLibrary.IsWiiTitle(mPath) ? TYPE_WII : TYPE_GC;
+			} else
+			{
+				mType = TYPE_OTHER;
+			}
+		}
+
+		mFilename = file.getName();
+	}
+
+	public int getType()
+	{
+		return mType;
+	}
+
+	public String getFilename()
+	{
+		return mFilename;
+	}
+
+	public String getPath()
+	{
+		return mPath;
+	}
+
+	@Override
+	public int compareTo(FileListItem theOther)
+	{
+		if (theOther.getType() == getType())
+		{
+			return getFilename().toLowerCase().compareTo(theOther.getFilename().toLowerCase());
+		} else
+		{
+			if (getType() > theOther.getType())
+			{
+				return 1;
+			} else
+			{
+				return -1;
+			}
+		}
+	}
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/FileViewHolder.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/FileViewHolder.java
new file mode 100644
index 0000000000..79acc8400b
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/FileViewHolder.java
@@ -0,0 +1,27 @@
+package org.dolphinemu.dolphinemu.viewholders;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.dolphinemu.dolphinemu.R;
+
+
+public class FileViewHolder extends RecyclerView.ViewHolder
+{
+	public View itemView;
+
+	public TextView textFileName;
+	public ImageView imageType;
+
+	public FileViewHolder(View itemView)
+	{
+		super(itemView);
+
+		this.itemView = itemView;
+
+		textFileName = (TextView) itemView.findViewById(R.id.text_file_name);
+		imageType = (ImageView) itemView.findViewById(R.id.image_type);
+	}
+}
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_add.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_add.png
new file mode 100644
index 0000000000..481643ecd5
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/ic_add.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_folder.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_folder.png
new file mode 100644
index 0000000000..9f5c756099
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/ic_folder.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_gamecube.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_gamecube.png
new file mode 100644
index 0000000000..d128a17277
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/ic_gamecube.png differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_wii.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_wii.png
new file mode 100644
index 0000000000..ab4d4be283
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-hdpi/ic_wii.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_add.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_add.png
new file mode 100644
index 0000000000..977dd3427a
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/ic_add.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_folder.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_folder.png
new file mode 100644
index 0000000000..1c5797c9e0
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/ic_folder.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_gamecube.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_gamecube.png
new file mode 100644
index 0000000000..5f972fb801
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/ic_gamecube.png differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_wii.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_wii.png
new file mode 100644
index 0000000000..43718bf98d
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-mdpi/ic_wii.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_add.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_add.png
new file mode 100644
index 0000000000..67042105d2
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/ic_add.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_folder.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_folder.png
new file mode 100644
index 0000000000..e5f54cef01
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/ic_folder.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_gamecube.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_gamecube.png
new file mode 100644
index 0000000000..5efa0a6ced
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/ic_gamecube.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_wii.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_wii.png
new file mode 100644
index 0000000000..048ab5609f
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xhdpi/ic_wii.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_add.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_add.png
new file mode 100644
index 0000000000..72cedcad4f
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_add.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_folder.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_folder.png
new file mode 100644
index 0000000000..0d1ac48767
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_folder.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_gamecube.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_gamecube.png
new file mode 100644
index 0000000000..03271360fb
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_gamecube.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_wii.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_wii.png
new file mode 100644
index 0000000000..161241408e
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_wii.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_add.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_add.png
new file mode 100644
index 0000000000..2bef059583
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_add.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_folder.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_folder.png
new file mode 100644
index 0000000000..7a3c198ee4
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_folder.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_gamecube.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_gamecube.png
new file mode 100644
index 0000000000..a24c1f14fb
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_gamecube.png differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_wii.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_wii.png
new file mode 100644
index 0000000000..97717c2fc8
Binary files /dev/null and b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_wii.png differ
diff --git a/Source/Android/app/src/main/res/drawable/oval_ripple_gc.xml b/Source/Android/app/src/main/res/drawable/oval_ripple_gc.xml
index 0477ba84fe..167d3ef13a 100644
--- a/Source/Android/app/src/main/res/drawable/oval_ripple_gc.xml
+++ b/Source/Android/app/src/main/res/drawable/oval_ripple_gc.xml
@@ -2,7 +2,7 @@
         android:color="?android:colorControlHighlight">
     <item>
         <shape android:shape="oval">
-            <solid android:color="@color/dolphin_gamecube_accent"/>
+            <solid android:color="@color/dolphin_accent_gamecube"/>
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/drawable/oval_ripple_grey.xml b/Source/Android/app/src/main/res/drawable/oval_ripple_grey.xml
new file mode 100644
index 0000000000..31f064c0ac
--- /dev/null
+++ b/Source/Android/app/src/main/res/drawable/oval_ripple_grey.xml
@@ -0,0 +1,8 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="?android:colorControlHighlight">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/circle_grey"/>
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/drawable/oval_ripple_wii.xml b/Source/Android/app/src/main/res/drawable/oval_ripple_wii.xml
index 35c767805c..644876eda3 100644
--- a/Source/Android/app/src/main/res/drawable/oval_ripple_wii.xml
+++ b/Source/Android/app/src/main/res/drawable/oval_ripple_wii.xml
@@ -2,7 +2,7 @@
         android:color="?android:colorControlHighlight">
     <item>
         <shape android:shape="oval">
-            <solid android:color="@color/dolphin_wii_accent"/>
+            <solid android:color="@color/dolphin_accent_wii"/>
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/layout/activity_add_directory.xml b/Source/Android/app/src/main/res/layout/activity_add_directory.xml
new file mode 100644
index 0000000000..72d66c3950
--- /dev/null
+++ b/Source/Android/app/src/main/res/layout/activity_add_directory.xml
@@ -0,0 +1,29 @@
+<?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="match_parent"
+              android:orientation="vertical">
+
+    <Toolbar
+        android:id="@+id/toolbar_folder_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/dolphin_blue"
+        android:minHeight="?android:attr/actionBarSize"
+        android:theme="@android:style/ThemeOverlay.Material.Dark.ActionBar"
+        android:elevation="6dp"/>
+
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/list_files"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="@dimen/activity_horizontal_margin"
+        android:layout_marginRight="@dimen/activity_horizontal_margin"
+        tools:listitem="@layout/list_item_file"
+        android:elevation="4dp"
+        android:background="@android:color/white"/>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/layout/activity_game_grid.xml b/Source/Android/app/src/main/res/layout/activity_game_grid.xml
index e87f859787..2dc6416a94 100644
--- a/Source/Android/app/src/main/res/layout/activity_game_grid.xml
+++ b/Source/Android/app/src/main/res/layout/activity_game_grid.xml
@@ -9,9 +9,10 @@
         android:id="@+id/toolbar_game_list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/dolphin_wii"
+        android:background="@color/dolphin_blue"
         android:minHeight="?android:attr/actionBarSize"
-        android:theme="@android:style/ThemeOverlay.Material.Dark.ActionBar"/>
+        android:theme="@android:style/ThemeOverlay.Material.Dark.ActionBar"
+        android:elevation="6dp"/>
 
     <FrameLayout
         android:layout_width="match_parent"
@@ -32,8 +33,8 @@
             android:layout_alignBottom="@+id/image_game_screen"
             android:layout_alignEnd="@+id/text_game_title"
             android:layout_marginBottom="28dp"
-            android:background="@drawable/oval_ripple_wii"
-            android:src="@drawable/ic_play"
+            android:background="@drawable/oval_ripple_gc"
+            android:src="@drawable/ic_add"
             android:stateListAnimator="@anim/button_elevation"
             android:elevation="4dp"
             android:layout_gravity="bottom|right"
diff --git a/Source/Android/app/src/main/res/layout/list_item_file.xml b/Source/Android/app/src/main/res/layout/list_item_file.xml
new file mode 100644
index 0000000000..3999d0368b
--- /dev/null
+++ b/Source/Android/app/src/main/res/layout/list_item_file.xml
@@ -0,0 +1,30 @@
+<?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:orientation="horizontal"
+              android:layout_width="match_parent"
+              android:layout_height="56dp">
+
+    <ImageView
+        android:id="@+id/image_type"
+        android:background="@drawable/oval_ripple_grey"
+        tools:src="@drawable/ic_wii"
+        android:layout_gravity="center_vertical"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:padding="4dp"/>
+
+    <TextView
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        tools:text="File Name"
+        android:textSize="16sp"
+        android:layout_gravity="center_vertical"
+        android:id="@+id/text_file_name"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/menu/menu_add_directory.xml b/Source/Android/app/src/main/res/menu/menu_add_directory.xml
new file mode 100644
index 0000000000..c459811868
--- /dev/null
+++ b/Source/Android/app/src/main/res/menu/menu_add_directory.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/menu_up_one_level"
+        android:title="@string/add_directory_up_one_level"
+        android:showAsAction="ifRoom|withText"/>
+</menu>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/menu/menu_game_grid.xml b/Source/Android/app/src/main/res/menu/menu_game_grid.xml
new file mode 100644
index 0000000000..0d689474ad
--- /dev/null
+++ b/Source/Android/app/src/main/res/menu/menu_game_grid.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/clearGameList"
+        android:title="@string/clear_game_list"
+        android:showAsAction="never"/>
+</menu>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/values/colors.xml b/Source/Android/app/src/main/res/values/colors.xml
index a4174647c7..d7b7847125 100644
--- a/Source/Android/app/src/main/res/values/colors.xml
+++ b/Source/Android/app/src/main/res/values/colors.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="dolphin_wii">#2196f3</color>
-    <color name="dolphin_wii_dark">#1976d2</color>
-    <color name="dolphin_wii_accent">#651fff</color>
+    <color name="dolphin_blue">#2196f3</color>
+    <color name="dolphin_blue_dark">#1976d2</color>
 
-    <color name="dolphin_gamecube">#673ab7</color>
-    <color name="dolphin_gamecube_dark">#512da8</color>
-    <color name="dolphin_gamecube_accent">#2979ff</color>
+    <color name="dolphin_accent_wii">#9e9e9e</color>
+    <color name="dolphin_accent_wiiware">#2979ff</color>
+    <color name="dolphin_accent_gamecube">#651fff</color>
+
+    <color name="circle_grey">#bdbdbd</color>
 </resources>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml
index f321d08df2..37ce0b1365 100644
--- a/Source/Android/app/src/main/res/values/strings.xml
+++ b/Source/Android/app/src/main/res/values/strings.xml
@@ -220,4 +220,7 @@
     <string name="disabled">Disabled</string>
     <string name="other">Other</string>
 
+
+    <string name="add_directory_title">Add Directory to Library</string>
+    <string name="add_directory_up_one_level">Up one level</string>
 </resources>
diff --git a/Source/Android/app/src/main/res/values/styles.xml b/Source/Android/app/src/main/res/values/styles.xml
index a0bfbb1865..b185e6cf10 100644
--- a/Source/Android/app/src/main/res/values/styles.xml
+++ b/Source/Android/app/src/main/res/values/styles.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- inherit from the material theme -->
-    <style name="DolphinWii" parent="android:Theme.Material.Light.NoActionBar">
+    <style name="DolphinBase" parent="android:Theme.Material.Light.NoActionBar">
         <!-- Main theme colors -->
         <!--   your app branding color for the app bar -->
-        <item name="android:colorPrimary">@color/dolphin_wii</item>
+        <item name="android:colorPrimary">@color/dolphin_blue</item>
         <!--   darker variant for the status bar and contextual app bars -->
-        <item name="android:colorPrimaryDark">@color/dolphin_wii_dark</item>
+        <item name="android:colorPrimaryDark">@color/dolphin_blue_dark</item>
+    </style>
+
+    <!-- Inherit from the Base Dolphin Theme-->
+    <style name="DolphinWii" parent="DolphinBase">
         <!--   theme UI controls like checkboxes and text fields -->
-        <item name="android:colorAccent">@color/dolphin_wii_accent</item>
+        <item name="android:colorAccent">@color/dolphin_accent_wii</item>
     </style>
 
-    <style name="DolphinGamecube" parent="android:Theme.Material.Light.NoActionBar">
-        <item name="android:colorPrimary">@color/dolphin_gamecube</item>
-        <item name="android:colorPrimaryDark">@color/dolphin_gamecube_dark</item>
-        <item name="android:colorAccent">@color/dolphin_gamecube_accent</item>
-
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowActionBar">false</item>
+    <style name="DolphinGamecube" parent="DolphinBase">
+        <!--   theme UI controls like checkboxes and text fields -->
+        <item name="android:colorAccent">@color/dolphin_accent_gamecube</item>
     </style>
 
-    <style name="DolphinWiiTransparent" parent="android:Theme.Material.Light.NoActionBar.TranslucentDecor">
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
+    <style name="DolphinWiiware" parent="DolphinBase">
+        <!--   theme UI controls like checkboxes and text fields -->
+        <item name="android:colorAccent">@color/dolphin_accent_wiiware</item>
     </style>
 </resources>
\ No newline at end of file