diff --git a/src/android/app/src/main/res/animator/button_elevation.xml b/src/android/app/src/main/res/animator/button_elevation.xml
deleted file mode 100644
index b6a0974a0..000000000
--- a/src/android/app/src/main/res/animator/button_elevation.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="true">
-        <objectAnimator
-            android:propertyName="translationZ"
-            android:duration="@android:integer/config_shortAnimTime"
-            android:valueFrom="@dimen/elevation_low"
-            android:valueTo="@dimen/elevation_high"
-            android:valueType="floatType"/>
-    </item>
-
-    <item>
-        <objectAnimator
-            android:propertyName="translationZ"
-            android:duration="@android:integer/config_shortAnimTime"
-            android:valueFrom="@dimen/elevation_high"
-            android:valueTo="@dimen/elevation_low"
-            android:valueType="floatType"/>
-    </item>
-
-</set>
\ No newline at end of file
diff --git a/src/android/app/src/main/res/animator/menu_slide_in_from_right.xml b/src/android/app/src/main/res/animator/menu_slide_in_from_right.xml
deleted file mode 100644
index 3f1495c75..000000000
--- a/src/android/app/src/main/res/animator/menu_slide_in_from_right.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <objectAnimator
-        android:propertyName="translationX"
-        android:valueType="floatType"
-        android:valueFrom="1280dp"
-        android:valueTo="0"
-        android:interpolator="@android:interpolator/decelerate_quad"
-        android:duration="300"/>
-
-    <objectAnimator
-        android:propertyName="alpha"
-        android:valueType="floatType"
-        android:valueFrom="0"
-        android:valueTo="1"
-        android:interpolator="@android:interpolator/accelerate_quad"
-        android:duration="300"/>
-
-</set>
\ No newline at end of file
diff --git a/src/android/app/src/main/res/animator/menu_slide_out_to_right.xml b/src/android/app/src/main/res/animator/menu_slide_out_to_right.xml
deleted file mode 100644
index 78edf872c..000000000
--- a/src/android/app/src/main/res/animator/menu_slide_out_to_right.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- This animation is used ONLY when a submenu is replaced. -->
-    <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
-         android:propertyName="translationX"
-         android:valueType="floatType"
-         android:valueFrom="0"
-         android:valueTo="1280dp"
-         android:interpolator="@android:interpolator/decelerate_quad"
-         android:duration="200"/>
-
-    <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
-         android:propertyName="alpha"
-         android:valueType="floatType"
-         android:valueFrom="1"
-         android:valueTo="0"
-         android:interpolator="@android:interpolator/decelerate_quad"
-         android:duration="200"/>
-
-</set>
\ No newline at end of file
diff --git a/src/android/app/src/main/res/color/button_text_color.xml b/src/android/app/src/main/res/color/button_text_color.xml
deleted file mode 100644
index f8c103e03..000000000
--- a/src/android/app/src/main/res/color/button_text_color.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:color="@color/citra_orange_dark"
-        android:state_focused="true"/>
-    <item
-        android:color="@android:color/white"/>
-</selector>
diff --git a/src/android/app/src/main/res/drawable-hdpi/button_home.png b/src/android/app/src/main/res/drawable-hdpi/button_home.png
deleted file mode 100644
index 0e7d5f393..000000000
Binary files a/src/android/app/src/main/res/drawable-hdpi/button_home.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-hdpi/button_home_pressed.png b/src/android/app/src/main/res/drawable-hdpi/button_home_pressed.png
deleted file mode 100644
index 499179f09..000000000
Binary files a/src/android/app/src/main/res/drawable-hdpi/button_home_pressed.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-hdpi/ic_company.png b/src/android/app/src/main/res/drawable-hdpi/ic_company.png
deleted file mode 100644
index 88e21de29..000000000
Binary files a/src/android/app/src/main/res/drawable-hdpi/ic_company.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-hdpi/ic_country.png b/src/android/app/src/main/res/drawable-hdpi/ic_country.png
deleted file mode 100644
index 6e71c3a40..000000000
Binary files a/src/android/app/src/main/res/drawable-hdpi/ic_country.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-hdpi/ic_play.png b/src/android/app/src/main/res/drawable-hdpi/ic_play.png
deleted file mode 100644
index eaf8e908d..000000000
Binary files a/src/android/app/src/main/res/drawable-hdpi/ic_play.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-hdpi/ic_refresh.png b/src/android/app/src/main/res/drawable-hdpi/ic_refresh.png
deleted file mode 100644
index ffac12458..000000000
Binary files a/src/android/app/src/main/res/drawable-hdpi/ic_refresh.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-mdpi/ic_quickload.png b/src/android/app/src/main/res/drawable-mdpi/ic_quickload.png
deleted file mode 100644
index f2bf47306..000000000
Binary files a/src/android/app/src/main/res/drawable-mdpi/ic_quickload.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-mdpi/ic_quicksave.png b/src/android/app/src/main/res/drawable-mdpi/ic_quicksave.png
deleted file mode 100644
index 2481f79f0..000000000
Binary files a/src/android/app/src/main/res/drawable-mdpi/ic_quicksave.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-mdpi/ic_screenshot.png b/src/android/app/src/main/res/drawable-mdpi/ic_screenshot.png
deleted file mode 100644
index f929d012c..000000000
Binary files a/src/android/app/src/main/res/drawable-mdpi/ic_screenshot.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/src/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
deleted file mode 100644
index c7bd21dbd..000000000
--- a/src/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="78.5885"
-                android:endY="90.9159"
-                android:startX="48.7653"
-                android:startY="61.0927"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1" />
-</vector>
diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_home.png b/src/android/app/src/main/res/drawable-xhdpi/button_home.png
deleted file mode 100644
index 32555cdad..000000000
Binary files a/src/android/app/src/main/res/drawable-xhdpi/button_home.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-xhdpi/button_home_pressed.png b/src/android/app/src/main/res/drawable-xhdpi/button_home_pressed.png
deleted file mode 100644
index cad234a12..000000000
Binary files a/src/android/app/src/main/res/drawable-xhdpi/button_home_pressed.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-xhdpi/ic_company.png b/src/android/app/src/main/res/drawable-xhdpi/ic_company.png
deleted file mode 100644
index 26b1ccfcf..000000000
Binary files a/src/android/app/src/main/res/drawable-xhdpi/ic_company.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-xhdpi/ic_country.png b/src/android/app/src/main/res/drawable-xhdpi/ic_country.png
deleted file mode 100644
index 5d500f5f0..000000000
Binary files a/src/android/app/src/main/res/drawable-xhdpi/ic_country.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-xhdpi/ic_play.png b/src/android/app/src/main/res/drawable-xhdpi/ic_play.png
deleted file mode 100644
index 4a3a6a8cf..000000000
Binary files a/src/android/app/src/main/res/drawable-xhdpi/ic_play.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-xhdpi/ic_refresh.png b/src/android/app/src/main/res/drawable-xhdpi/ic_refresh.png
deleted file mode 100644
index 8f8b3743f..000000000
Binary files a/src/android/app/src/main/res/drawable-xhdpi/ic_refresh.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_home.png b/src/android/app/src/main/res/drawable-xxhdpi/button_home.png
deleted file mode 100644
index c24e758b8..000000000
Binary files a/src/android/app/src/main/res/drawable-xxhdpi/button_home.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/button_home_pressed.png b/src/android/app/src/main/res/drawable-xxhdpi/button_home_pressed.png
deleted file mode 100644
index 2fb4c9215..000000000
Binary files a/src/android/app/src/main/res/drawable-xxhdpi/button_home_pressed.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/ic_company.png b/src/android/app/src/main/res/drawable-xxhdpi/ic_company.png
deleted file mode 100644
index ac4c2c70e..000000000
Binary files a/src/android/app/src/main/res/drawable-xxhdpi/ic_company.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/ic_country.png b/src/android/app/src/main/res/drawable-xxhdpi/ic_country.png
deleted file mode 100644
index 077ae487a..000000000
Binary files a/src/android/app/src/main/res/drawable-xxhdpi/ic_country.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/ic_play.png b/src/android/app/src/main/res/drawable-xxhdpi/ic_play.png
deleted file mode 100644
index 5131eea83..000000000
Binary files a/src/android/app/src/main/res/drawable-xxhdpi/ic_play.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/ic_refresh.png b/src/android/app/src/main/res/drawable-xxhdpi/ic_refresh.png
deleted file mode 100644
index 0ec259b83..000000000
Binary files a/src/android/app/src/main/res/drawable-xxhdpi/ic_refresh.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/button_home.png b/src/android/app/src/main/res/drawable-xxxhdpi/button_home.png
deleted file mode 100644
index 17ee00f9a..000000000
Binary files a/src/android/app/src/main/res/drawable-xxxhdpi/button_home.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/button_home_pressed.png b/src/android/app/src/main/res/drawable-xxxhdpi/button_home_pressed.png
deleted file mode 100644
index 769289947..000000000
Binary files a/src/android/app/src/main/res/drawable-xxxhdpi/button_home_pressed.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/ic_company.png b/src/android/app/src/main/res/drawable-xxxhdpi/ic_company.png
deleted file mode 100644
index 6742ce771..000000000
Binary files a/src/android/app/src/main/res/drawable-xxxhdpi/ic_company.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/ic_country.png b/src/android/app/src/main/res/drawable-xxxhdpi/ic_country.png
deleted file mode 100644
index 27c03a523..000000000
Binary files a/src/android/app/src/main/res/drawable-xxxhdpi/ic_country.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/ic_play.png b/src/android/app/src/main/res/drawable-xxxhdpi/ic_play.png
deleted file mode 100644
index 18b7ebc7d..000000000
Binary files a/src/android/app/src/main/res/drawable-xxxhdpi/ic_play.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/ic_refresh.png b/src/android/app/src/main/res/drawable-xxxhdpi/ic_refresh.png
deleted file mode 100644
index af689bf9e..000000000
Binary files a/src/android/app/src/main/res/drawable-xxxhdpi/ic_refresh.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable/ic_launcher_background.xml b/src/android/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index d5fccc538..000000000
--- a/src/android/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillColor="#26A69A"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeColor="#33FFFFFF"
-        android:strokeWidth="0.8" />
-</vector>
diff --git a/src/android/app/src/main/res/drawable/ic_refresh_tv.png b/src/android/app/src/main/res/drawable/ic_refresh_tv.png
deleted file mode 100644
index d9a7b69a0..000000000
Binary files a/src/android/app/src/main/res/drawable/ic_refresh_tv.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable/ic_settings_graphics_tv.png b/src/android/app/src/main/res/drawable/ic_settings_graphics_tv.png
deleted file mode 100644
index d99de5502..000000000
Binary files a/src/android/app/src/main/res/drawable/ic_settings_graphics_tv.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable/oval_ripple_grey.xml b/src/android/app/src/main/res/drawable/oval_ripple_grey.xml
deleted file mode 100644
index 31f064c0a..000000000
--- a/src/android/app/src/main/res/drawable/oval_ripple_grey.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<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/src/android/app/src/main/res/layout-television/activity_emulation.xml b/src/android/app/src/main/res/layout-television/activity_emulation.xml
index b52535e02..7632b5a97 100644
--- a/src/android/app/src/main/res/layout-television/activity_emulation.xml
+++ b/src/android/app/src/main/res/layout-television/activity_emulation.xml
@@ -24,7 +24,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:baselineAligned="false">
 
         <FrameLayout
             android:id="@+id/frame_menu"
@@ -33,12 +34,6 @@
             android:layout_weight=".25"
             tools:layout="@layout/fragment_ingame_menu"/>
 
-        <FrameLayout
-            android:id="@+id/frame_submenu"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight=".75"/>
-
     </LinearLayout>
 
 </FrameLayout>
diff --git a/src/android/app/src/main/res/layout/activity_add_directory.xml b/src/android/app/src/main/res/layout/activity_add_directory.xml
deleted file mode 100644
index 6b98b5ce8..000000000
--- a/src/android/app/src/main/res/layout/activity_add_directory.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar_folder_list"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/citra_orange"
-        android:minHeight="?android:attr/actionBarSize"
-        android:theme="@android:style/ThemeOverlay.Material.Dark.ActionBar"
-        android:elevation="6dp"/>
-
-    <androidx.recyclerview.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>
diff --git a/src/android/app/src/main/res/layout/card_game.xml b/src/android/app/src/main/res/layout/card_game.xml
index 81bcb31b4..5d80c3cc0 100644
--- a/src/android/app/src/main/res/layout/card_game.xml
+++ b/src/android/app/src/main/res/layout/card_game.xml
@@ -26,8 +26,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:scaleType="fitCenter"
-            tools:src="@drawable/placeholder_screenshot" />
+            tools:scaleType="fitCenter" />
 
         <TextView
             android:id="@+id/text_game_title"
diff --git a/src/android/app/src/main/res/layout/fragment_emulation.xml b/src/android/app/src/main/res/layout/fragment_emulation.xml
index dc112e62f..cc90a1680 100644
--- a/src/android/app/src/main/res/layout/fragment_emulation.xml
+++ b/src/android/app/src/main/res/layout/fragment_emulation.xml
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/show_fps_text"
-        android:layout_marginLeft="8dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="2dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/src/android/app/src/main/res/layout/list_item_setting_checkbox.xml b/src/android/app/src/main/res/layout/list_item_setting_checkbox.xml
index f5093a308..53addf638 100644
--- a/src/android/app/src/main/res/layout/list_item_setting_checkbox.xml
+++ b/src/android/app/src/main/res/layout/list_item_setting_checkbox.xml
@@ -20,7 +20,7 @@
         android:layout_marginTop="@dimen/spacing_large"
         android:layout_toStartOf="@+id/checkbox"
         android:textSize="16sp"
-        tools:text="@string/overclock_enable"/>
+        tools:text="@string/frame_limit_enable"/>
 
     <TextView
         android:id="@+id/text_setting_description"
@@ -35,7 +35,7 @@
         android:layout_marginTop="@dimen/spacing_small"
         android:layout_toStartOf="@+id/checkbox"
         android:textAlignment="textStart"
-        tools:text="@string/overclock_enable_description" />
+        tools:text="@string/frame_limit_enable_description" />
 
     <CheckBox
         android:id="@+id/checkbox"
diff --git a/src/android/app/src/main/res/layout/tv_title.xml b/src/android/app/src/main/res/layout/tv_title.xml
index 404697c12..00cac7f55 100644
--- a/src/android/app/src/main/res/layout/tv_title.xml
+++ b/src/android/app/src/main/res/layout/tv_title.xml
@@ -12,7 +12,7 @@
             android:visibility="gone"
             android:layout_alignTop="@+id/badge"
             android:layout_alignBottom="@+id/badge"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:id="@+id/title"
             android:gravity="center_vertical"
             android:layout_width="wrap_content"
@@ -21,7 +21,7 @@
 
         <ImageView
             android:visibility="gone"
-            android:layout_toLeftOf="@id/title"
+            android:layout_toStartOf="@id/title"
             android:id="@+id/badge"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/src/android/app/src/main/res/menu/menu_add_directory.xml b/src/android/app/src/main/res/menu/menu_add_directory.xml
deleted file mode 100644
index 9a1f7c863..000000000
--- a/src/android/app/src/main/res/menu/menu_add_directory.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <!-- TODO Please give me an icon! -->
-    <item
-        android:id="@+id/menu_up_one_level"
-        android:title="@string/add_directory_up_one_level"
-        app:showAsAction="ifRoom|withText"/>
-
-</menu>
\ No newline at end of file
diff --git a/src/android/app/src/main/res/menu/menu_game_grid.xml b/src/android/app/src/main/res/menu/menu_game_grid.xml
index 0983b322b..5016b80d2 100644
--- a/src/android/app/src/main/res/menu/menu_game_grid.xml
+++ b/src/android/app/src/main/res/menu/menu_game_grid.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/button_add_directory"
-        android:title="@string/add_directory_title"
         android:icon="@drawable/ic_add"
-        app:showAsAction="always"/>
+        android:title="@string/add_directory_title"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/menu_settings_core"
-        android:title="@string/grid_menu_core_settings"
         android:icon="@drawable/ic_settings_core"
-        app:showAsAction="always"/>
+        android:title="@string/grid_menu_core_settings"
+        app:showAsAction="ifRoom" />
 
 </menu>
\ No newline at end of file
diff --git a/src/android/app/src/main/res/menu/menu_settings.xml b/src/android/app/src/main/res/menu/menu_settings.xml
index f156b75b3..1fe7aa6d4 100644
--- a/src/android/app/src/main/res/menu/menu_settings.xml
+++ b/src/android/app/src/main/res/menu/menu_settings.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu></menu>
\ No newline at end of file
+<menu />
\ No newline at end of file
diff --git a/src/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/src/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index 036d09bc5..000000000
--- a/src/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/src/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/src/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index 57ea32d88..000000000
Binary files a/src/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ
diff --git a/src/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/src/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index 7052f4077..000000000
Binary files a/src/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ
diff --git a/src/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/src/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index 4d3e9fc41..000000000
Binary files a/src/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/src/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/src/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index d2c6d0692..000000000
Binary files a/src/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/src/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/src/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index 1aa7f3ae2..000000000
Binary files a/src/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/src/android/app/src/main/res/values/arrays.xml b/src/android/app/src/main/res/values/arrays.xml
index 2b5f45064..134ee0754 100644
--- a/src/android/app/src/main/res/values/arrays.xml
+++ b/src/android/app/src/main/res/values/arrays.xml
@@ -64,22 +64,6 @@
         <item>11</item>
     </integer-array>
 
-    <string-array name="countryNames">
-        <item>Europe</item>
-        <item>Japan</item>
-        <item>USA</item>
-        <item>Australia</item>
-        <item>France</item>
-        <item>Germany</item>
-        <item>Italy</item>
-        <item>Korea</item>
-        <item>Netherlands</item>
-        <item>Russia</item>
-        <item>Spain</item>
-        <item>Taiwan</item>
-        <item>Unknown</item>
-    </string-array>
-
     <string-array name="n3dsButtons">
         <item>a</item>
         <item>b</item>
diff --git a/src/android/app/src/main/res/values/colors.xml b/src/android/app/src/main/res/values/colors.xml
index ddc730af3..a8454c25b 100644
--- a/src/android/app/src/main/res/values/colors.xml
+++ b/src/android/app/src/main/res/values/colors.xml
@@ -5,8 +5,6 @@
     <color name="citra_orange_dark">#fe8a03</color>
     <color name="citra_accent">#c77413</color>
 
-    <color name="circle_grey">#bdbdbd</color>
-
     <color name="tv_card_unselected">#444444</color>
 
 </resources>
diff --git a/src/android/app/src/main/res/values/dimens.xml b/src/android/app/src/main/res/values/dimens.xml
index ae8cd232a..b3d186d88 100644
--- a/src/android/app/src/main/res/values/dimens.xml
+++ b/src/android/app/src/main/res/values/dimens.xml
@@ -2,9 +2,6 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
 
-    <dimen name="elevation_low">1dp</dimen>
-    <dimen name="elevation_high">4dp</dimen>
-
     <dimen name="spacing_small">4dp</dimen>
     <dimen name="spacing_medlarge">12dp</dimen>
     <dimen name="spacing_large">16dp</dimen>
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index a3391b1ea..0300edfea 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -2,10 +2,10 @@
 <resources>
 
     <!-- General application strings -->
-    <string name="app_name">Citra</string>
+    <string name="app_name" translatable="false">Citra</string>
     <string name="app_disclaimer">This software will run games for the Nintendo 3DS handheld game console. No game titles are included.\n\nBefore you run, please place your rightfully owned 3DS game files onto your device storage.</string>
-    <string name="app_notification_channel_name">Citra</string>
-    <string name="app_notification_channel_id">Citra</string>
+    <string name="app_notification_channel_name" translatable="false">Citra</string>
+    <string name="app_notification_channel_id" translatable="false">Citra</string>
     <string name="app_notification_channel_description">Citra 3DS emulator notifications</string>
     <string name="app_notification_running">Citra is running</string>
 
@@ -16,32 +16,25 @@
     <string name="controller_dpad">D-Pad</string>
     <string name="controller_axis_vertical">Up/Down Axis</string>
     <string name="controller_axis_horizontal">Left/Right Axis</string>
-    <string name="modifier_range">Modifier Range</string>
-    <string name="analog_radius">Analog Radius (High value = High sensitivity)</string>
-    <string name="analog_threshold">Analog Threshold (Low value = High sensitivity)</string>
     <string name="input_binding">Input Binding</string>
     <string name="input_binding_description">Press or move an input to bind it to %1$s.</string>
     <string name="input_binding_description_vertical_axis">Move your joystick up or down.</string>
     <string name="input_binding_description_horizontal_axis">Move your joystick left or right.</string>
-    <string name="button_a">A</string>
-    <string name="button_b">B</string>
-    <string name="button_select">SELECT</string>
-    <string name="button_start">START</string>
-    <string name="button_x">X</string>
-    <string name="button_y">Y</string>
-    <string name="button_l">L</string>
-    <string name="button_r">R</string>
-    <string name="button_zl">ZL</string>
-    <string name="button_zr">ZR</string>
+    <string name="button_a" translatable="false">A</string>
+    <string name="button_b" translatable="false">B</string>
+    <string name="button_select" translatable="false">SELECT</string>
+    <string name="button_start" translatable="false">START</string>
+    <string name="button_x" translatable="false">X</string>
+    <string name="button_y" translatable="false">Y</string>
+    <string name="button_l" translatable="false">L</string>
+    <string name="button_r" translatable="false">R</string>
+    <string name="button_zl" translatable="false">ZL</string>
+    <string name="button_zr" translatable="false">ZR</string>
     <string name="input_message_analog_only">This control must be bound to a gamepad analog stick or D-pad axis!</string>
     <string name="input_message_button_only">This control must be bound to a gamepad button!</string>
 
     <!-- Generic buttons (Shared with lots of stuff) -->
     <string name="generic_buttons">Buttons</string>
-    <string name="generic_up">Up</string>
-    <string name="generic_down">Down</string>
-    <string name="generic_left">Left</string>
-    <string name="generic_right">Right</string>
 
     <!-- Core settings strings -->
     <string name="cpu_jit">Enable CPU JIT</string>
@@ -79,8 +72,6 @@
 
     <!-- Miscellaneous -->
     <string name="clear">Clear</string>
-    <string name="disabled">Disabled</string>
-    <string name="other">Other</string>
     <string name="slider_default">Default</string>
 
     <!-- Game Grid Screen-->
@@ -89,14 +80,9 @@
     <!-- Add Directory Screen-->
     <string name="select_game_folder">Select Game Folder</string>
     <string name="add_directory_title">Add Folder to Library</string>
-    <string name="add_directory_up_one_level">Up one level</string>
-    <string name="add_directory_empty_folder">That folder is empty.</string>
 
     <!-- Preferences Screen -->
-    <string name="preferences_save_exit">Save and Exit</string>
     <string name="preferences_settings">Settings</string>
-    <string name="preferences_game_settings">Game Settings</string>
-    <string name="preferences_extensions">Extension Bindings</string>
     <string name="preferences_general">General</string>
     <string name="preferences_system">System</string>
     <string name="preferences_controls">Gamepad</string>
@@ -115,10 +101,7 @@
     <string name="emulation_edit_layout">Edit Layout</string>
     <string name="emulation_done">Done</string>
     <string name="emulation_toggle_controls">Toggle Controls</string>
-    <string name="emulation_toggle_all">Toggle All</string>
     <string name="emulation_control_scale">Adjust Scale</string>
-    <string name="emulation_choose_controller">Choose Controller</string>
-    <string name="emulation_controller_changed">You may have to reload the game after changing extensions.</string>
     <string name="emulation_open_settings">Open Settings</string>
     <string name="emulation_switch_screen_layout">Landscape Screen Layout</string>
     <string name="emulation_screen_layout_landscape">Default</string>
diff --git a/src/android/app/src/main/res/values/styles.xml b/src/android/app/src/main/res/values/styles.xml
index d612da627..2060d786e 100644
--- a/src/android/app/src/main/res/values/styles.xml
+++ b/src/android/app/src/main/res/values/styles.xml
@@ -71,9 +71,6 @@
     </style>
 
     <!-- Hax to make Tablayout render icons -->
-    <style name="MyCustomTextAppearance" parent="TextAppearance.Design.Tab">
-        <item name="textAllCaps">false</item>
-    </style>
 
     <!-- Android TV Themes -->
     <style name="CitraTvBase" parent="Theme.Leanback.Browse">
@@ -104,10 +101,6 @@
         <item name="android:layout_margin">0dp</item>
     </style>
 
-    <style name="OverlayInGameMenuOption" parent="InGameMenuOption">
-        <item name="android:textColor">@color/button_text_color</item>
-    </style>
-
     <!-- Inherit from a base file picker theme that handles day/night -->
     <style name="FilePickerTheme" parent="FilePickerBaseTheme">
         <item name="colorPrimary">@color/citra_orange</item>