diff --git a/src/main/res/drawable/appbar_background.xml b/src/main/res/drawable/appbar_background.xml
new file mode 100644
index 00000000..58b1f17f
--- /dev/null
+++ b/src/main/res/drawable/appbar_background.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?colorSurface" />
+    <corners
+        android:bottomRightRadius="@dimen/shape_large_corner"
+        android:bottomLeftRadius="@dimen/shape_large_corner" />
+</shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/background_recycler_bottom.xml b/src/main/res/drawable/background_recycler_bottom.xml
deleted file mode 100644
index cdd07d48..00000000
--- a/src/main/res/drawable/background_recycler_bottom.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?android:colorBackground" />
-    <corners
-        android:topLeftRadius="@dimen/shape_large_corner"
-        android:topRightRadius="@dimen/shape_large_corner" />
-</shape>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_main_x.xml b/src/main/res/layout/activity_main_x.xml
index fc4c1cad..8627391f 100644
--- a/src/main/res/layout/activity_main_x.xml
+++ b/src/main/res/layout/activity_main_x.xml
@@ -8,14 +8,12 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?colorSurface">
+        android:layout_height="match_parent">
 
         <androidx.coordinatorlayout.widget.CoordinatorLayout
             android:id="@+id/coordinator"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:background="?colorSurface"
             app:layout_constraintBottom_toTopOf="@id/bottom_navigation"
             app:layout_constraintTop_toTopOf="parent">
 
@@ -23,8 +21,7 @@
                 android:id="@+id/appbar_layout"
                 style="?attr/appBarLayoutStyle"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@android:color/transparent">
+                android:layout_height="wrap_content">
 
                 <com.google.android.material.appbar.CollapsingToolbarLayout
                     android:id="@+id/collapsing_toolbar"
@@ -47,8 +44,6 @@
                 android:name="androidx.navigation.fragment.NavHostFragment"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@drawable/background_recycler_bottom"
-                android:backgroundTint="?android:colorBackground"
                 app:defaultNavHost="true"
                 app:layout_behavior="@string/appbar_scrolling_view_behavior"
                 app:navGraph="@navigation/navigation_graph_main" />
@@ -56,14 +51,9 @@
 
         <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/bottom_navigation"
-            style="@style/Widget.Material3.BottomNavigationView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            app:itemActiveIndicatorStyle="@style/Widget.Material3.BottomNavigationView.ActiveIndicator"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/coordinator"
             app:menu="@menu/navigation_menu_main" />
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/src/main/res/layout/activity_prefs_x.xml b/src/main/res/layout/activity_prefs_x.xml
index 64aa4f1a..a2901d73 100644
--- a/src/main/res/layout/activity_prefs_x.xml
+++ b/src/main/res/layout/activity_prefs_x.xml
@@ -8,14 +8,12 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?colorSurface">
+        android:layout_height="match_parent">
 
         <androidx.coordinatorlayout.widget.CoordinatorLayout
             android:id="@+id/coordinator"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:background="?colorSurface"
             app:layout_constraintBottom_toTopOf="@id/bottom_navigation"
             app:layout_constraintTop_toTopOf="parent">
 
@@ -23,8 +21,7 @@
                 android:id="@+id/appbar_layout"
                 style="?attr/appBarLayoutStyle"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@android:color/transparent">
+                android:layout_height="wrap_content">
 
                 <com.google.android.material.appbar.CollapsingToolbarLayout
                     android:id="@+id/collapsing_toolbar"
@@ -46,8 +43,6 @@
                 android:name="androidx.navigation.fragment.NavHostFragment"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@drawable/background_recycler_bottom"
-                android:backgroundTint="?android:colorBackground"
                 app:defaultNavHost="true"
                 app:layout_behavior="@string/appbar_scrolling_view_behavior"
                 app:navGraph="@navigation/navigation_graph_prefs" />
@@ -55,14 +50,9 @@
 
         <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/bottom_navigation"
-            style="@style/Widget.Material3.BottomNavigationView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            app:itemActiveIndicatorStyle="@style/Widget.Material3.BottomNavigationView.ActiveIndicator"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/coordinator"
             app:menu="@menu/navigation_menu_prefs" />
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index af0e1522..09f15183 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -118,6 +118,7 @@
     </style>
 
     <style name="Theme.AppBarLayout" parent="Widget.Material3.AppBarLayout">
+        <item name="android:background">@drawable/appbar_background</item>
         <item name="android:backgroundTint">?attr/colorSurface</item>
         <item name="android:fitsSystemWindows">true</item>
     </style>
@@ -131,6 +132,7 @@
     </style>
 
     <style name="Theme.Toolbar" parent="Widget.Material3.Toolbar.Surface">
+        <item name="android:background">@drawable/appbar_background</item>
         <item name="layout_collapseMode">pin</item>
         <item name="android:backgroundTint">?attr/colorSurface</item>
     </style>