diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackLayout.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackLayout.kt
index fb553cb8b..eefca4290 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackLayout.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackLayout.kt
@@ -24,9 +24,8 @@ import org.oxycblt.auxio.R
 import org.oxycblt.auxio.detail.DetailViewModel
 import org.oxycblt.auxio.music.Song
 import org.oxycblt.auxio.util.getAttrColorSafe
-import org.oxycblt.auxio.util.getDimenSafe
+import org.oxycblt.auxio.util.getDimenSizeSafe
 import org.oxycblt.auxio.util.getDrawableSafe
-import org.oxycblt.auxio.util.pxOfDp
 import org.oxycblt.auxio.util.replaceInsetsCompat
 import org.oxycblt.auxio.util.stateList
 import org.oxycblt.auxio.util.systemBarInsetsCompat
@@ -98,7 +97,6 @@ class PlaybackLayout @JvmOverloads constructor(
     private var initMotionX = 0f
     private var initMotionY = 0f
     private val tRect = Rect()
-    private val elevationNormal = context.getDimenSafe(R.dimen.elevation_normal)
 
     /** See [isDragging] */
     private val dragStateField = ViewDragHelper::class.java.getDeclaredField("mDragState").apply {
@@ -119,7 +117,7 @@ class PlaybackLayout @JvmOverloads constructor(
 
             playbackContainerBg = MaterialShapeDrawable.createWithElevationOverlay(context).apply {
                 fillColor = context.getAttrColorSafe(R.attr.colorSurface).stateList
-                elevation = context.pxOfDp(elevationNormal).toFloat()
+                elevation = context.getDimenSizeSafe(R.dimen.elevation_normal).toFloat()
             }
 
             // The way we fade out the elevation overlay is not by actually reducing the elevation
@@ -537,7 +535,6 @@ class PlaybackLayout @JvmOverloads constructor(
         // Slowly reduce the elevation of the container as we slide up, eventually resulting in a
         // neutral color instead of an elevated one when fully expanded.
         playbackContainerBg.alpha = (outRatio * 255).toInt()
-        playbackContainerView.translationZ = elevationNormal * outRatio
 
         // Fade out our bar view as we slide up
         playbackBarView.apply {
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 4ae3627f6..76cdfb2dd 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -12,9 +12,7 @@
 
         <org.oxycblt.auxio.ui.EdgeAppBarLayout
             android:id="@+id/about_appbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/colorSurface"
+            style="@style/Widget.Auxio.AppBarLayout"
             app:liftOnScroll="true">
 
             <com.google.android.material.appbar.MaterialToolbar
diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml
index 68b1cb612..ebaa0dcd4 100644
--- a/app/src/main/res/layout/fragment_detail.xml
+++ b/app/src/main/res/layout/fragment_detail.xml
@@ -15,9 +15,7 @@
 
             <org.oxycblt.auxio.detail.DetailAppBarLayout
                 android:id="@+id/detail_appbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?attr/colorSurface"
+                style="@style/Widget.Auxio.AppBarLayout"
                 app:liftOnScroll="true"
                 app:liftOnScrollTargetViewId="@id/detail_recycler">
 
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 285774204..4bb06bb87 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -11,9 +11,7 @@
 
         <org.oxycblt.auxio.ui.EdgeAppBarLayout
             android:id="@+id/home_appbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/colorSurface"
+            style="@style/Widget.Auxio.AppBarLayout"
             app:liftOnScroll="true">
 
             <com.google.android.material.appbar.MaterialToolbar
diff --git a/app/src/main/res/layout/fragment_queue.xml b/app/src/main/res/layout/fragment_queue.xml
index 2c80466f9..b769bbc70 100644
--- a/app/src/main/res/layout/fragment_queue.xml
+++ b/app/src/main/res/layout/fragment_queue.xml
@@ -13,9 +13,7 @@
 
         <org.oxycblt.auxio.ui.EdgeAppBarLayout
             android:id="@+id/queue_appbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/colorSurface"
+            style="@style/Widget.Auxio.AppBarLayout"
             app:liftOnScroll="true"
             app:liftOnScrollTargetViewId="@id/queue_recycler">
 
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 4cf5d42cc..5108175dc 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -9,9 +9,7 @@
 
         <org.oxycblt.auxio.ui.EdgeAppBarLayout
             android:id="@+id/search_appbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/colorSurface"
+            style="@style/Widget.Auxio.AppBarLayout"
             app:liftOnScroll="true"
             app:liftOnScrollTargetViewId="@id/search_recycler">
 
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 89c367e0b..f2110e80b 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -13,9 +13,7 @@
 
         <org.oxycblt.auxio.ui.EdgeAppBarLayout
             android:id="@+id/settings_appbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/colorSurface"
+            style="@style/Widget.Auxio.AppBarLayout"
             android:clickable="true"
             android:focusable="true"
             app:liftOnScroll="true">
diff --git a/app/src/main/res/values/styles_ui.xml b/app/src/main/res/values/styles_ui.xml
index 7194f18c1..e738fd67a 100644
--- a/app/src/main/res/values/styles_ui.xml
+++ b/app/src/main/res/values/styles_ui.xml
@@ -2,6 +2,11 @@
 <resources>
     <!-- SHARED RE-USABLE UI STYLES -->
 
+    <style name="Widget.Auxio.AppBarLayout" parent="Widget.Material3.AppBarLayout">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
     <!-- Base toolbar style -->
     <style name="Widget.Auxio.Toolbar" parent="">
         <item name="android:layout_width">match_parent</item>