diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/UserDataActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/UserDataActivity.java
index 8781158141..4bacd9edfc 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/UserDataActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/UserDataActivity.java
@@ -52,6 +52,9 @@ public class UserDataActivity extends AppCompatActivity implements View.OnClickL
     buttonOpenSystemFileManager.setVisibility(android_11 ? View.VISIBLE : View.GONE);
 
     buttonOpenSystemFileManager.setOnClickListener(this);
+
+    // show up button
+    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
   }
 
   @Override
@@ -81,6 +84,13 @@ public class UserDataActivity extends AppCompatActivity implements View.OnClickL
     }
   }
 
+  @Override
+  public boolean onSupportNavigateUp()
+  {
+    onBackPressed();
+    return true;
+  }
+
   private Intent getFileManagerIntent(String packageName)
   {
     // Fragile, but some phones don't expose the system file manager in any better way
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 58f3bbafb7..ec73916955 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
@@ -133,7 +133,7 @@ public final class TvMainActivity extends FragmentActivity
 
     // Set display parameters for the BrowseFragment
     mBrowseFragment.setHeadersState(BrowseSupportFragment.HEADERS_ENABLED);
-    mBrowseFragment.setBrandColor(ContextCompat.getColor(this, R.color.dolphin_blue_dark));
+    mBrowseFragment.setBrandColor(ContextCompat.getColor(this, R.color.dolphin_blue_secondary));
     buildRowsAdapter();
 
     mBrowseFragment.setOnItemViewClickedListener(
diff --git a/Source/Android/app/src/main/res/color/button_text_color.xml b/Source/Android/app/src/main/res/color/button_text_color.xml
index 6a2e41bfff..0f38d0d449 100644
--- a/Source/Android/app/src/main/res/color/button_text_color.xml
+++ b/Source/Android/app/src/main/res/color/button_text_color.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-        android:color="@color/dolphin_blue_dark"
+        android:color="@color/dolphin_blue_secondary"
         android:state_focused="true"/>
     <item
         android:color="@android:color/white"/>
diff --git a/Source/Android/app/src/main/res/drawable/tv_card_background_gamecube.xml b/Source/Android/app/src/main/res/drawable/tv_card_background_gamecube.xml
index 66636c9c5e..58ae5f09a8 100644
--- a/Source/Android/app/src/main/res/drawable/tv_card_background_gamecube.xml
+++ b/Source/Android/app/src/main/res/drawable/tv_card_background_gamecube.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:state_selected="true"
-        android:drawable="@color/dolphin_accent_gamecube"/>
+        android:drawable="@color/dolphin_blue"/>
     <item
         android:drawable="@color/tv_card_unselected"/>
 </selector>
diff --git a/Source/Android/app/src/main/res/layout-ldrtl/list_item_cheat.xml b/Source/Android/app/src/main/res/layout-ldrtl/list_item_cheat.xml
index 7f1c4d524c..b45bccf00d 100644
--- a/Source/Android/app/src/main/res/layout-ldrtl/list_item_cheat.xml
+++ b/Source/Android/app/src/main/res/layout-ldrtl/list_item_cheat.xml
@@ -13,7 +13,7 @@
         android:id="@+id/text_name"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        style="@style/TextAppearance.AppCompat.Headline"
+        style="@style/TextAppearance.MaterialComponents.Headline5"
         android:textSize="16sp"
         tools:text="Hyrule Field Speed Hack"
         android:layout_margin="@dimen/spacing_large"
diff --git a/Source/Android/app/src/main/res/layout/activity_main.xml b/Source/Android/app/src/main/res/layout/activity_main.xml
index 95b631a698..775e8183d7 100644
--- a/Source/Android/app/src/main/res/layout/activity_main.xml
+++ b/Source/Android/app/src/main/res/layout/activity_main.xml
@@ -9,23 +9,25 @@
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+        android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar_main"
-            android:background="?colorPrimary"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
+            android:background="@color/dolphin_blue"
             app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.DayNight"/>
+            app:popupTheme="@style/Theme.MaterialComponents.DayNight" />
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabs_platforms"
             style="@style/Widget.Design.TabLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:tabBackground="?colorPrimary"
+            android:background="@color/dolphin_blue"
             app:tabGravity="fill"
+            app:tabIndicatorColor="@color/dolphin_white"
+            app:tabIndicatorHeight="3dp"
             app:tabMode="fixed"
             app:tabTextAppearance="@style/MyCustomTextAppearance" />
 
@@ -42,10 +44,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
+        android:backgroundTint="@color/dolphin_blue"
+        android:minHeight="48dp"
         android:src="@drawable/ic_add"
         app:borderWidth="0dp"
         app:layout_anchor="@+id/pager_platforms"
         app:layout_anchorGravity="bottom|right|end"
-        app:rippleColor="?android:colorPrimaryDark" />
+        app:tint="@android:color/white" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/Source/Android/app/src/main/res/layout/dialog_input_adjust.xml b/Source/Android/app/src/main/res/layout/dialog_input_adjust.xml
index d37e0ee25a..5818a6ab57 100644
--- a/Source/Android/app/src/main/res/layout/dialog_input_adjust.xml
+++ b/Source/Android/app/src/main/res/layout/dialog_input_adjust.xml
@@ -15,7 +15,7 @@
 
         <TextView
             android:id="@+id/input_scale_name"
-            style="@style/TextAppearance.AppCompat.Headline"
+            style="@style/TextAppearance.MaterialComponents.Headline5"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentStart="true"
@@ -62,7 +62,7 @@
 
         <TextView
             android:id="@+id/input_opacity_name"
-            style="@style/TextAppearance.AppCompat.Headline"
+            style="@style/TextAppearance.MaterialComponents.Headline5"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentStart="true"
diff --git a/Source/Android/app/src/main/res/layout/fragment_cheat_details.xml b/Source/Android/app/src/main/res/layout/fragment_cheat_details.xml
index c758b919ba..5cbadebc3d 100644
--- a/Source/Android/app/src/main/res/layout/fragment_cheat_details.xml
+++ b/Source/Android/app/src/main/res/layout/fragment_cheat_details.xml
@@ -24,7 +24,7 @@
                 android:id="@+id/label_name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/TextAppearance.AppCompat.Headline"
+                style="@style/TextAppearance.MaterialComponents.Headline5"
                 android:textSize="18sp"
                 android:text="@string/cheats_name"
                 android:layout_margin="@dimen/spacing_large"
@@ -52,7 +52,7 @@
                 android:id="@+id/label_creator"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/TextAppearance.AppCompat.Headline"
+                style="@style/TextAppearance.MaterialComponents.Headline5"
                 android:textSize="18sp"
                 android:text="@string/cheats_creator"
                 android:layout_margin="@dimen/spacing_large"
@@ -79,7 +79,7 @@
                 android:id="@+id/label_notes"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/TextAppearance.AppCompat.Headline"
+                style="@style/TextAppearance.MaterialComponents.Headline5"
                 android:textSize="18sp"
                 android:text="@string/cheats_notes"
                 android:layout_margin="@dimen/spacing_large"
@@ -106,7 +106,7 @@
                 android:id="@+id/label_code"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/TextAppearance.AppCompat.Headline"
+                style="@style/TextAppearance.MaterialComponents.Headline5"
                 android:textSize="18sp"
                 android:text="@string/cheats_code"
                 android:layout_margin="@dimen/spacing_large"
diff --git a/Source/Android/app/src/main/res/layout/fragment_cheat_warning.xml b/Source/Android/app/src/main/res/layout/fragment_cheat_warning.xml
index 61078fa3a6..d1cb2e90d0 100644
--- a/Source/Android/app/src/main/res/layout/fragment_cheat_warning.xml
+++ b/Source/Android/app/src/main/res/layout/fragment_cheat_warning.xml
@@ -22,6 +22,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/spacing_small"
         android:text="@string/cheats_open_settings"
+        android:textColor="@color/dolphin_white"
         app:layout_constraintStart_toEndOf="@id/text_warning"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml b/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml
index a05bbe3d23..26331f5ee3 100644
--- a/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml
+++ b/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml
@@ -5,7 +5,7 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:paddingBottom="16dp"
-              android:background="@color/dolphin_blue_dark"
+              android:background="@color/dolphin_blue"
               tools:layout_width="250dp">
 
     <TextView
diff --git a/Source/Android/app/src/main/res/layout/list_item_cheat.xml b/Source/Android/app/src/main/res/layout/list_item_cheat.xml
index 1b663780f7..2c49c85bad 100644
--- a/Source/Android/app/src/main/res/layout/list_item_cheat.xml
+++ b/Source/Android/app/src/main/res/layout/list_item_cheat.xml
@@ -13,7 +13,7 @@
         android:id="@+id/text_name"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        style="@style/TextAppearance.AppCompat.Headline"
+        style="@style/TextAppearance.MaterialComponents.Headline5"
         android:textSize="16sp"
         tools:text="Hyrule Field Speed Hack"
         android:layout_margin="@dimen/spacing_large"
diff --git a/Source/Android/app/src/main/res/layout/list_item_header.xml b/Source/Android/app/src/main/res/layout/list_item_header.xml
index 58850ca801..fc17c23d06 100644
--- a/Source/Android/app/src/main/res/layout/list_item_header.xml
+++ b/Source/Android/app/src/main/res/layout/list_item_header.xml
@@ -12,7 +12,7 @@
         tools:text="CPU Settings"
         android:layout_marginStart="@dimen/spacing_large"
         android:layout_marginBottom="@dimen/spacing_small"
-        android:textColor="?android:colorAccent"
+        android:textColor="@color/dolphin_blue"
         android:textStyle="bold"
         android:layout_gravity="start|bottom"/>
 
diff --git a/Source/Android/app/src/main/res/layout/list_item_setting.xml b/Source/Android/app/src/main/res/layout/list_item_setting.xml
index d8adc26476..21d4a23971 100644
--- a/Source/Android/app/src/main/res/layout/list_item_setting.xml
+++ b/Source/Android/app/src/main/res/layout/list_item_setting.xml
@@ -11,7 +11,7 @@
     <TextView
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        style="@style/TextAppearance.AppCompat.Headline"
+        style="@style/TextAppearance.MaterialComponents.Headline5"
         tools:text="Setting Name"
         android:layout_alignParentEnd="true"
         android:layout_alignParentStart="true"
diff --git a/Source/Android/app/src/main/res/layout/list_item_setting_checkbox.xml b/Source/Android/app/src/main/res/layout/list_item_setting_checkbox.xml
index 6642745131..ea894da77b 100644
--- a/Source/Android/app/src/main/res/layout/list_item_setting_checkbox.xml
+++ b/Source/Android/app/src/main/res/layout/list_item_setting_checkbox.xml
@@ -10,7 +10,7 @@
 
     <TextView
         android:id="@+id/text_setting_name"
-        style="@style/TextAppearance.AppCompat.Headline"
+        style="@style/TextAppearance.MaterialComponents.Headline5"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_alignParentStart="true"
@@ -43,7 +43,8 @@
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
         android:layout_marginEnd="@dimen/spacing_large"
+        android:clickable="false"
         android:focusable="false"
-        android:clickable="false"/>
+        android:buttonTint="@color/dolphin_blue"/>
 
 </RelativeLayout>
diff --git a/Source/Android/app/src/main/res/layout/list_item_submenu.xml b/Source/Android/app/src/main/res/layout/list_item_submenu.xml
index e640620a3f..a751e11fd6 100644
--- a/Source/Android/app/src/main/res/layout/list_item_submenu.xml
+++ b/Source/Android/app/src/main/res/layout/list_item_submenu.xml
@@ -11,7 +11,7 @@
     <TextView
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        style="@style/TextAppearance.AppCompat.Headline"
+        style="@style/TextAppearance.MaterialComponents.Headline5"
         tools:text="Setting Name"
         android:layout_alignParentEnd="true"
         android:layout_alignParentStart="true"
diff --git a/Source/Android/app/src/main/res/values-night/colors.xml b/Source/Android/app/src/main/res/values-night/colors.xml
index 61b58361b3..b2c5676f35 100644
--- a/Source/Android/app/src/main/res/values-night/colors.xml
+++ b/Source/Android/app/src/main/res/values-night/colors.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="dolphin_purple">#A277FF</color>
+    <color name="dolphin_blue">#1976d2</color>
+    <color name="dolphin_blue_secondary">#2196f3</color>
+    <color name="dolphin_white">#FFFFFF</color>
+
+    <color name="dolphin_accent_wii">#9e9e9e</color>
+    <color name="dolphin_accent_wiiware">#2979ff</color>
+
+    <color name="tv_card_unselected">#444444</color>
+
+    <color name="invalid_setting_overlay">#36ff0000</color>
 </resources>
diff --git a/Source/Android/app/src/main/res/values/colors.xml b/Source/Android/app/src/main/res/values/colors.xml
index 111c03802b..4a70ae74f5 100644
--- a/Source/Android/app/src/main/res/values/colors.xml
+++ b/Source/Android/app/src/main/res/values/colors.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <color name="dolphin_blue">#2196f3</color>
-    <color name="dolphin_blue_dark">#1976d2</color>
-    <color name="dolphin_purple">#651fff</color>
+    <color name="dolphin_blue_secondary">#21b0f3</color>
+    <color name="dolphin_white">#ffffff</color>
 
     <color name="dolphin_accent_wii">#9e9e9e</color>
     <color name="dolphin_accent_wiiware">#2979ff</color>
-    <color name="dolphin_accent_gamecube">#651fff</color>
 
     <color name="tv_card_unselected">#444444</color>
 
     <color name="invalid_setting_overlay">#36ff0000</color>
-
 </resources>
diff --git a/Source/Android/app/src/main/res/values/styles.xml b/Source/Android/app/src/main/res/values/styles.xml
index 9d05da9d09..faa9fcf033 100644
--- a/Source/Android/app/src/main/res/values/styles.xml
+++ b/Source/Android/app/src/main/res/values/styles.xml
@@ -2,13 +2,13 @@
 <resources>
 
     <!-- Inherit from the material theme -->
-    <style name="DolphinBase" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="DolphinBase" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Main theme colors -->
         <!-- Branding color for the app bar -->
+        <item name="colorSurface">@color/dolphin_blue</item>
         <item name="colorPrimary">@color/dolphin_blue</item>
-        <!-- Darker variant for the status bar and contextual app bars -->
-        <item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
-        <item name="colorAccent">@color/dolphin_purple</item>
+        <item name="colorPrimaryDark">@color/dolphin_blue</item>
+        <item name="colorAccent">@color/dolphin_blue_secondary</item>
 
         <!-- Enable window content transitions -->
         <item name="android:windowContentTransitions">true</item>
@@ -19,20 +19,24 @@
     </style>
 
     <!-- Same as above, but use default action bar, and mandate margins. -->
-    <style name="DolphinSettingsBase" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="DolphinSettingsBase" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <item name="colorSurface">@color/dolphin_blue</item>
         <item name="colorPrimary">@color/dolphin_blue</item>
-        <item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
-        <item name="colorAccent">@color/dolphin_purple</item>
+        <item name="colorPrimaryDark">@color/dolphin_blue</item>
+        <item name="colorAccent">@color/dolphin_blue_secondary</item>
     </style>
 
     <!-- Themes for Dialogs -->
 
-    <style name="DolphinDialogBase" parent="Theme.AppCompat.DayNight.Dialog.Alert" />
-
-    <style name="DolphinEmulationBase" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="DolphinDialogBase" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
         <item name="colorPrimary">@color/dolphin_blue</item>
-        <item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
-        <item name="colorAccent">@color/dolphin_purple</item>
+        <item name="colorAccent">@color/dolphin_blue_secondary</item>
+    </style>
+
+    <style name="DolphinEmulationBase" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <item name="colorPrimary">@color/dolphin_blue</item>
+        <item name="colorPrimaryDark">@color/dolphin_blue</item>
+        <item name="colorAccent">@color/dolphin_blue_secondary</item>
         <item name="android:windowTranslucentNavigation">true</item>
 
         <item name="android:windowBackground">@android:color/black</item>
@@ -50,9 +54,10 @@
 
     <!-- Android TV Themes -->
     <style name="DolphinTvBase" parent="Theme.Leanback.Browse">
+        <item name="colorSurface">@color/dolphin_blue</item>
         <item name="colorPrimary">@color/dolphin_blue</item>
-        <item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
-        <item name="colorAccent">@color/dolphin_purple</item>
+        <item name="colorPrimaryDark">@color/dolphin_blue</item>
+        <item name="colorAccent">@color/dolphin_blue_secondary</item>
 
         <!-- Enable window content transitions -->
         <item name="android:windowContentTransitions">true</item>
@@ -63,7 +68,7 @@
         <item name="browseTitleViewLayout">@layout/titleview</item>
     </style>
 
-    <style name="InGameMenuOption" parent="Widget.AppCompat.Button.Borderless">
+    <style name="InGameMenuOption" parent="Widget.MaterialComponents.Button.TextButton">
         <item name="android:textSize">16sp</item>
         <item name="android:fontFamily">sans-serif-condensed</item>
         <item name="android:textColor">@android:color/white</item>
@@ -86,8 +91,8 @@
     <!-- Inherit from a base file picker theme that handles day/night -->
     <style name="FilePickerTheme" parent="FilePickerBaseTheme">
         <item name="colorPrimary">@color/dolphin_blue</item>
-        <item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
-        <item name="colorAccent">@color/dolphin_accent_gamecube</item>
+        <item name="colorPrimaryDark">@color/dolphin_blue</item>
+        <item name="colorAccent">@color/dolphin_blue_secondary</item>
 
         <!--&lt;!&ndash; Setting a divider is entirely optional &ndash;&gt;-->
         <item name="nnf_list_item_divider">?android:attr/listDivider</item>
@@ -97,13 +102,14 @@
 
         <!-- If you want to set a specific toolbar theme, do it here -->
 
-        <item name="nnf_toolbarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
+        <item name="nnf_toolbarTheme">@style/ThemeOverlay.MaterialComponents.Dark.ActionBar</item>
     </style>
 
-    <style name="FilePickerAlertDialogTheme" parent="Theme.AppCompat.DayNight.Dialog.Alert">
+    <style name="FilePickerAlertDialogTheme" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
+        <item name="colorSurface">@color/dolphin_blue</item>
         <item name="colorPrimary">@color/dolphin_blue</item>
-        <item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
-        <item name="colorAccent">@color/dolphin_accent_gamecube</item>
+        <item name="colorPrimaryDark">@color/dolphin_blue</item>
+        <item name="colorAccent">@color/dolphin_blue_secondary</item>
     </style>
 
 </resources>