diff --git a/Source/Android/app/src/main/res/animator-ldrtl/menu_slide_out_to_end.xml b/Source/Android/app/src/main/res/animator-ldrtl/menu_slide_out_to_end.xml
index eadf33156c..ede4eb37cb 100644
--- a/Source/Android/app/src/main/res/animator-ldrtl/menu_slide_out_to_end.xml
+++ b/Source/Android/app/src/main/res/animator-ldrtl/menu_slide_out_to_end.xml
@@ -2,7 +2,7 @@
 <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"
+    <objectAnimator
         android:propertyName="translationX"
         android:valueType="floatType"
         android:valueFrom="0"
@@ -10,7 +10,7 @@
         android:interpolator="@android:interpolator/decelerate_quad"
         android:duration="200"/>
 
-    <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+    <objectAnimator
         android:propertyName="alpha"
         android:valueType="floatType"
         android:valueFrom="1"
diff --git a/Source/Android/app/src/main/res/animator/button_elevation.xml b/Source/Android/app/src/main/res/animator/button_elevation.xml
deleted file mode 100644
index b6a0974a09..0000000000
--- a/Source/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/Source/Android/app/src/main/res/animator/menu_slide_out_to_end.xml b/Source/Android/app/src/main/res/animator/menu_slide_out_to_end.xml
index 5c38a06fd8..d650237d6f 100644
--- a/Source/Android/app/src/main/res/animator/menu_slide_out_to_end.xml
+++ b/Source/Android/app/src/main/res/animator/menu_slide_out_to_end.xml
@@ -2,20 +2,20 @@
 <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
+        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"/>
+    <objectAnimator
+        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
+</set>
diff --git a/Source/Android/app/src/main/res/layout-port/fragment_emulation.xml b/Source/Android/app/src/main/res/layout-port/fragment_emulation.xml
index 4f54974a5b..64d27bdf12 100644
--- a/Source/Android/app/src/main/res/layout-port/fragment_emulation.xml
+++ b/Source/Android/app/src/main/res/layout-port/fragment_emulation.xml
@@ -7,7 +7,6 @@
 
     <!-- Places the emulation surface to the top half of the screen -->
     <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
diff --git a/Source/Android/app/src/main/res/layout-television/activity_emulation.xml b/Source/Android/app/src/main/res/layout-television/activity_emulation.xml
index abe99bfb40..5e516d04ad 100644
--- a/Source/Android/app/src/main/res/layout-television/activity_emulation.xml
+++ b/Source/Android/app/src/main/res/layout-television/activity_emulation.xml
@@ -17,7 +17,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"
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
deleted file mode 100644
index 151d307c51..0000000000
--- a/Source/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/dolphin_blue"
-        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/Source/Android/app/src/main/res/layout/list_item_settings_header.xml b/Source/Android/app/src/main/res/layout/list_item_settings_header.xml
index 1c0cd336c3..58850ca801 100644
--- a/Source/Android/app/src/main/res/layout/list_item_settings_header.xml
+++ b/Source/Android/app/src/main/res/layout/list_item_settings_header.xml
@@ -14,6 +14,6 @@
         android:layout_marginBottom="@dimen/spacing_small"
         android:textColor="?android:colorAccent"
         android:textStyle="bold"
-        android:layout_gravity="left|bottom"/>
+        android:layout_gravity="start|bottom"/>
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/Source/Android/app/src/main/res/layout/tv_title.xml b/Source/Android/app/src/main/res/layout/tv_title.xml
index 49dd2969ee..9980b6b6e3 100644
--- a/Source/Android/app/src/main/res/layout/tv_title.xml
+++ b/Source/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/Source/Android/app/src/main/res/menu/menu_add_directory.xml b/Source/Android/app/src/main/res/menu/menu_add_directory.xml
deleted file mode 100644
index 9a1f7c863b..0000000000
--- a/Source/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/Source/Android/app/src/main/res/values/dimens.xml b/Source/Android/app/src/main/res/values/dimens.xml
index 0798c90a96..e0e16c895e 100644
--- a/Source/Android/app/src/main/res/values/dimens.xml
+++ b/Source/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/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml
index e72828590a..ba8377e099 100644
--- a/Source/Android/app/src/main/res/values/strings.xml
+++ b/Source/Android/app/src/main/res/values/strings.xml
@@ -302,6 +302,7 @@
     <string name="other">Other</string>
 
     <!-- Game Grid Screen-->
+    <string name="add_directory_title">Add Folder to Library</string>
     <string name="grid_menu_config">Config</string>
     <string name="grid_menu_graphics_settings">Graphics Settings</string>
     <string name="grid_menu_gcpad_settings">GameCube Input</string>
@@ -312,11 +313,6 @@
     <string name="wad_install_success">Successfully installed this title to the NAND.</string>
     <string name="wad_install_failure">Failed to install this title to the NAND.</string>
 
-    <!-- Add Directory Screen-->
-    <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>