diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java
index 31bb583471..d486533c55 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java
@@ -359,7 +359,7 @@ public final class TvMainActivity extends FragmentActivity
     ArrayObjectAdapter rowItems = new ArrayObjectAdapter(new SettingsRowPresenter());
 
     rowItems.add(new TvSettingsItem(R.id.menu_settings,
-            R.drawable.ic_settings_tv,
+            R.drawable.ic_settings,
             R.string.grid_menu_settings));
 
     rowItems.add(new TvSettingsItem(R.id.button_add_directory,
@@ -367,7 +367,7 @@ public final class TvMainActivity extends FragmentActivity
             R.string.add_directory_title));
 
     rowItems.add(new TvSettingsItem(R.id.menu_refresh,
-            R.drawable.ic_refresh_tv,
+            R.drawable.ic_refresh,
             R.string.grid_menu_refresh));
 
     rowItems.add(new TvSettingsItem(R.id.menu_open_file,
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
deleted file mode 100644
index 4006b497ca..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-hdpi/ic_add.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_back.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_back.png
deleted file mode 100644
index dd4ead3bf4..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-hdpi/ic_back.png and /dev/null 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
deleted file mode 100644
index f7f540e22b..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-hdpi/ic_folder.png and /dev/null 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
deleted file mode 100644
index a22978c4d9..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-hdpi/ic_gamecube.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_play.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_play.png
deleted file mode 100644
index eaf8e908da..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-hdpi/ic_play.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_quickload.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_quickload.png
deleted file mode 100644
index ffac124584..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-hdpi/ic_quickload.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_quicksave.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_quicksave.png
deleted file mode 100644
index 71f99767c3..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-hdpi/ic_quicksave.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_refresh.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_refresh.png
deleted file mode 100644
index ffac124584..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-hdpi/ic_refresh.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_screenshot.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_screenshot.png
deleted file mode 100644
index f93c09e4cc..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-hdpi/ic_screenshot.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_settings.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_settings.png
deleted file mode 100644
index 9059e0021a..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-hdpi/ic_settings.png and /dev/null 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
deleted file mode 100644
index caf49dbbf3..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-hdpi/ic_wii.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_back.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_back.png
deleted file mode 100644
index c0848a19a4..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-mdpi/ic_back.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_quickload.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_quickload.png
deleted file mode 100644
index f2bf47306a..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-mdpi/ic_quickload.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_quicksave.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_quicksave.png
deleted file mode 100644
index 2481f79f00..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-mdpi/ic_quicksave.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_screenshot.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_screenshot.png
deleted file mode 100644
index f929d012c5..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-mdpi/ic_screenshot.png and /dev/null 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
deleted file mode 100644
index eb6e9be684..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xhdpi/ic_add.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_back.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_back.png
deleted file mode 100644
index 0bd2469c1c..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xhdpi/ic_back.png and /dev/null 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
deleted file mode 100644
index 1dfae07fda..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xhdpi/ic_folder.png and /dev/null 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
deleted file mode 100644
index bedd22534a..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xhdpi/ic_gamecube.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_play.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_play.png
deleted file mode 100644
index 4a3a6a8cfc..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xhdpi/ic_play.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_quickload.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_quickload.png
deleted file mode 100644
index 8f8b3743f6..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xhdpi/ic_quickload.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_quicksave.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_quicksave.png
deleted file mode 100644
index 230428c367..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xhdpi/ic_quicksave.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_refresh.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_refresh.png
deleted file mode 100644
index 8f8b3743f6..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xhdpi/ic_refresh.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_screenshot.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_screenshot.png
deleted file mode 100644
index ae19dd4112..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xhdpi/ic_screenshot.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings.png
deleted file mode 100644
index 307389f320..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings.png and /dev/null 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
deleted file mode 100644
index 3776ff52fe..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xhdpi/ic_wii.png and /dev/null 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
deleted file mode 100644
index a82ed81940..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_add.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_back.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_back.png
deleted file mode 100644
index 8316057723..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_back.png and /dev/null 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
deleted file mode 100644
index 309864a2a1..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_folder.png and /dev/null 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
deleted file mode 100644
index e0313db136..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_gamecube.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_play.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_play.png
deleted file mode 100644
index 5131eea839..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_play.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_quickload.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_quickload.png
deleted file mode 100644
index 0ec259b835..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_quickload.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_quicksave.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_quicksave.png
deleted file mode 100644
index d60937caaf..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_quicksave.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_refresh.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_refresh.png
deleted file mode 100644
index 0ec259b835..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_refresh.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_screenshot.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_screenshot.png
deleted file mode 100644
index 1fe0b70f1f..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_screenshot.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings.png
deleted file mode 100644
index 45d855b496..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings.png and /dev/null 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
deleted file mode 100644
index 7a8dfe007e..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_wii.png and /dev/null 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
deleted file mode 100644
index 21e9f6e09f..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_add.png and /dev/null 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
deleted file mode 100644
index df3fb04514..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_folder.png and /dev/null 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
deleted file mode 100644
index 3ed299e0a7..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_gamecube.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_play.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_play.png
deleted file mode 100644
index 18b7ebc7d9..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_play.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_quickload.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_quickload.png
deleted file mode 100644
index af689bf9ea..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_quickload.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_quicksave.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_quicksave.png
deleted file mode 100644
index 5c71725d9e..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_quicksave.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_refresh.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_refresh.png
deleted file mode 100644
index af689bf9ea..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_refresh.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_screenshot.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_screenshot.png
deleted file mode 100644
index f9eaa0d2e4..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_screenshot.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings.png
deleted file mode 100644
index 46180dd6f3..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings.png and /dev/null 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
deleted file mode 100644
index 996cecf656..0000000000
Binary files a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_wii.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable/ic_add.xml b/Source/Android/app/src/main/res/drawable/ic_add.xml
new file mode 100644
index 0000000000..bdd99f48d5
--- /dev/null
+++ b/Source/Android/app/src/main/res/drawable/ic_add.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/Source/Android/app/src/main/res/drawable/ic_add_tv.png b/Source/Android/app/src/main/res/drawable/ic_add_tv.png
deleted file mode 100644
index 77f0b3aeec..0000000000
Binary files a/Source/Android/app/src/main/res/drawable/ic_add_tv.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable/ic_add_tv.xml b/Source/Android/app/src/main/res/drawable/ic_add_tv.xml
new file mode 100644
index 0000000000..76b80f814c
--- /dev/null
+++ b/Source/Android/app/src/main/res/drawable/ic_add_tv.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13h-4v4h-2v-4L7,13v-2h4L11,7h2v4h4v2z"/>
+</vector>
diff --git a/Source/Android/app/src/main/res/drawable-anydpi/ic_back.xml b/Source/Android/app/src/main/res/drawable/ic_back.xml
similarity index 72%
rename from Source/Android/app/src/main/res/drawable-anydpi/ic_back.xml
rename to Source/Android/app/src/main/res/drawable/ic_back.xml
index e15be555e1..45a504f227 100644
--- a/Source/Android/app/src/main/res/drawable-anydpi/ic_back.xml
+++ b/Source/Android/app/src/main/res/drawable/ic_back.xml
@@ -2,10 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#FFFFFF"
-    android:alpha="1"
-    android:autoMirrored="true">
+    android:viewportHeight="24">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
diff --git a/Source/Android/app/src/main/res/drawable/ic_folder.xml b/Source/Android/app/src/main/res/drawable/ic_folder.xml
new file mode 100644
index 0000000000..c66a174f4b
--- /dev/null
+++ b/Source/Android/app/src/main/res/drawable/ic_folder.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
+</vector>
diff --git a/Source/Android/app/src/main/res/drawable/ic_gamecube.xml b/Source/Android/app/src/main/res/drawable/ic_gamecube.xml
new file mode 100644
index 0000000000..48f7d23a95
--- /dev/null
+++ b/Source/Android/app/src/main/res/drawable/ic_gamecube.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="1402"
+    android:viewportWidth="1402" >
+    <path android:fillColor="#ffffff"
+        android:pathData="M634.7,41.1c-38.4,21.9 -70.2,39.9 -70.7,39.9 -0.4,-0 -7,3.6 -14.6,7.9 -23,13.1 -339.6,193.5 -387.6,220.9 -24.7,14 -44.8,25.7 -44.8,26.1 0.1,0.3 40.9,25 90.7,54.9l90.7,54.3 40,-23c22.1,-12.6 113.2,-64.8 202.5,-116 89.3,-51.2 162.7,-93.1 163.2,-93.1 0.4,-0 64.6,38.3 142.6,85.1 78,46.8 142.3,85.3 142.9,85.6 1.1,0.4 44.5,-25.1 49.5,-29.1 1.4,-1.2 32.1,-19.7 68.1,-41.1 53.6,-31.9 65.2,-39.2 63.9,-40.1 -3,-2 -464.3,-271.6 -465.5,-271.9 -0.6,-0.2 -32.5,17.6 -70.9,39.6z"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="M99,369.2c0,17.1 -4.4,473.4 -6.2,644l-0.3,26.7 13,7.7c7.2,4.2 72.6,42.9 145.5,85.9 72.9,43 178.9,105.5 235.5,139 56.7,33.4 126.5,74.7 155.2,91.6 28.7,17 52.5,30.9 52.8,30.9 0.3,-0 0.5,-48.5 0.5,-107.8l0,-107.7 -207.5,-117 -207.5,-117 0,-244 0,-244 -88.1,-54c-48.5,-29.7 -89.2,-54.6 -90.5,-55.3l-2.4,-1.3 0,22.3z"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="M1268.5,378.6c-22,12.9 -154.5,93 -294.5,178.2l-254.5,154.9 -0.3,152.1 -0.2,152.1 6.7,-3.8c9.6,-5.4 164.8,-91.9 213.3,-118.9 22.3,-12.3 41,-23 41.6,-23.6 0.8,-0.7 1.7,-18.8 2.9,-55.6 0.9,-30 1.9,-54.8 2.1,-55.2 0.9,-1.4 137.3,-82.8 138.8,-82.8 1.4,-0 1.6,13.3 1.6,133.2l0,133.3 -43.3,25.1c-38.1,22.2 -114.5,66.5 -308.2,179.1l-55,32 -0.3,106.6c-0.1,58.7 0,106.7 0.2,106.7 0.2,-0 75.2,-42.8 166.7,-95.1 91.5,-52.3 168.2,-95.9 170.4,-96.9 3.8,-1.7 249.3,-141.5 250.5,-142.6 0.4,-0.4 2,-701.7 1.6,-702 -0.1,-0 -18.1,10.4 -40.1,23.2z"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="M576.5,451.1c-74.2,42.4 -135.4,77.4 -135.8,77.9 -0.5,0.4 59.2,36.8 132.7,80.9l133.5,80.2 134.6,-78.3c74,-43 134.2,-78.5 133.8,-78.9 -0.5,-0.4 -59,-35.6 -130.1,-78.3 -71.1,-42.7 -130.3,-78.3 -131.5,-79.1 -2.1,-1.3 -10.4,3.3 -137.2,75.6z"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="M428,554.1c0,3 -0.7,59.4 -1.5,125.4 -0.8,66 -1.5,133.3 -1.6,149.5l-0.1,29.5 65.3,37.8c163.7,94.7 202.2,116.9 203.5,117.4 1.2,0.4 1.4,-21.1 1.2,-150.7l-0.3,-151.3 -132,-81c-72.6,-44.5 -132.6,-81.1 -133.2,-81.4 -1,-0.4 -1.3,1 -1.3,4.8z"/>
+</vector>
diff --git a/Source/Android/app/src/main/res/drawable/ic_play.xml b/Source/Android/app/src/main/res/drawable/ic_play.xml
new file mode 100644
index 0000000000..8986c1d045
--- /dev/null
+++ b/Source/Android/app/src/main/res/drawable/ic_play.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M8,5v14l11,-7z"/>
+</vector>
diff --git a/Source/Android/app/src/main/res/drawable/ic_quicksave.xml b/Source/Android/app/src/main/res/drawable/ic_quicksave.xml
new file mode 100644
index 0000000000..aa71b08c00
--- /dev/null
+++ b/Source/Android/app/src/main/res/drawable/ic_quicksave.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
+</vector>
diff --git a/Source/Android/app/src/main/res/drawable/ic_refresh.xml b/Source/Android/app/src/main/res/drawable/ic_refresh.xml
new file mode 100644
index 0000000000..5ab492cabe
--- /dev/null
+++ b/Source/Android/app/src/main/res/drawable/ic_refresh.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+</vector>
diff --git a/Source/Android/app/src/main/res/drawable/ic_refresh_tv.png b/Source/Android/app/src/main/res/drawable/ic_refresh_tv.png
deleted file mode 100644
index d9a7b69a08..0000000000
Binary files a/Source/Android/app/src/main/res/drawable/ic_refresh_tv.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable/ic_screenshot.xml b/Source/Android/app/src/main/res/drawable/ic_screenshot.xml
new file mode 100644
index 0000000000..5b075cd027
--- /dev/null
+++ b/Source/Android/app/src/main/res/drawable/ic_screenshot.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
+</vector>
diff --git a/Source/Android/app/src/main/res/drawable/ic_settings.xml b/Source/Android/app/src/main/res/drawable/ic_settings.xml
new file mode 100644
index 0000000000..b86b554dff
--- /dev/null
+++ b/Source/Android/app/src/main/res/drawable/ic_settings.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
+</vector>
diff --git a/Source/Android/app/src/main/res/drawable/ic_settings_tv.png b/Source/Android/app/src/main/res/drawable/ic_settings_tv.png
deleted file mode 100644
index 46180dd6f3..0000000000
Binary files a/Source/Android/app/src/main/res/drawable/ic_settings_tv.png and /dev/null differ
diff --git a/Source/Android/app/src/main/res/drawable/ic_wii.xml b/Source/Android/app/src/main/res/drawable/ic_wii.xml
new file mode 100644
index 0000000000..3efe3227db
--- /dev/null
+++ b/Source/Android/app/src/main/res/drawable/ic_wii.xml
@@ -0,0 +1,17 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="2157"
+    android:viewportWidth="2157">
+    <path android:fillColor="#ffffff"
+        android:pathData="M1593,564.1c-55.8,6.9 -99.4,51 -105,106.4 -5.7,55.8 33.7,110.3 90.9,125.7 9.6,2.6 35.1,3.6 47.3,1.9 17,-2.5 38,-9.2 50.8,-16.3 18.8,-10.4 35.9,-28.5 45.9,-48.6 15.9,-31.7 16,-73.6 0.4,-104.7 -6.1,-11.9 -17.7,-25.6 -32.4,-37.8 -21.3,-17.7 -45.2,-26.1 -77.9,-27.2 -6.9,-0.2 -15.9,-0 -20,0.6z"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="M2014.5,564.2c-12.5,1.4 -26,5.4 -38.1,11.2 -53.2,26 -79.8,86.4 -61.8,140.5 13.7,41.4 50.1,73.6 92.2,81.7 4.1,0.8 13.4,1.4 21.2,1.4 40.9,-0 78.8,-15.8 100.6,-41.9 32.4,-38.7 37.2,-94.7 11.7,-136 -5.9,-9.6 -27.8,-31.7 -38.4,-38.7 -21.7,-14.5 -56.5,-21.7 -87.4,-18.2z"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="M677.5,613.6c-19.6,2.7 -27.7,5 -41.5,11.9 -15.9,8.1 -29.9,19.3 -41.1,33.2 -19.9,24.8 -26.1,41.5 -56.3,152.3 -18.2,66.9 -62.7,235.8 -115.2,437.5 -10.9,41.8 -20,76.3 -20.3,76.7 -0.3,0.4 -12.2,-45.1 -26.5,-101 -95.8,-376.4 -151.6,-593.9 -154.1,-600.4 -0.4,-0.9 -1.6,-1.9 -2.8,-2.2 -3,-0.8 -218.7,-0.8 -218.7,-0 0,0.7 4.4,16.5 74.6,268.9 110.9,398.3 151.9,542.4 166.4,585 8.7,25.6 18.4,43 35,62.8 20,23.8 49.2,43.9 74.3,51.1 16.9,4.9 54.5,5.9 76.5,2 16.1,-2.8 35.2,-11 50.2,-21.5 9.7,-6.8 27.9,-25.1 35.4,-35.8 12.9,-18.1 23.4,-39.3 31.8,-64.1 7.1,-20.9 37,-127.4 84.9,-302 38.7,-140.8 63.4,-228.5 68.7,-244l1.9,-5.5 1.1,3.5c1.8,5.7 9.3,33 54.2,197.5 69.4,254.4 85.1,310.1 99.4,352 14.2,41.8 23,57 46.6,80.5 24.3,24.1 41.9,34.1 69.8,39.7 12.3,2.4 51.8,2.5 64.8,-0 52,-9.6 98.8,-53.9 119.4,-113.2 18.9,-54.6 62.3,-206.4 192.9,-676 22,-79.2 42.3,-151.9 45,-161.5 2.7,-9.6 4.5,-17.9 4.1,-18.4 -1.7,-1.7 -38.9,-2.5 -128.7,-2.5 -86.9,-0.1 -92.2,-0 -92.7,1.6 -0.3,1 -19.9,77.8 -43.6,170.8 -76.7,300.5 -110.5,431.6 -126.5,490 -10.1,36.8 -10.5,38.2 -11.5,36.5 -1.1,-2.1 -12.2,-43.8 -59.5,-224.5 -91.7,-350.5 -101.4,-385.3 -113.9,-409.9 -18.6,-36.6 -49.5,-61.4 -86.1,-69.2 -6.7,-1.5 -50.7,-2.8 -58,-1.8z"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="M1509,1250.5l0,336.5 104.5,-0 104.5,-0 0,-336.5 0,-336.5 -104.5,-0 -104.5,-0 0,336.5z"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="M1930,1250.5l0,336.5 104.8,-0.2 104.7,-0.3 0.3,-336.3 0.2,-336.2 -105,-0 -105,-0 0,336.5z"/>
+</vector>