diff --git a/app/src/main/res/drawable/ui_background_ripple.xml b/app/src/main/res/drawable/ui_background_ripple.xml
index a67a05c68..e7c0e0f1b 100644
--- a/app/src/main/res/drawable/ui_background_ripple.xml
+++ b/app/src/main/res/drawable/ui_background_ripple.xml
@@ -6,10 +6,10 @@
         </shape>
     </item>
     <item>
-        <ripple android:color="@color/selection_color">
+        <ripple android:color="?attr/colorControlHighlight">
             <item android:id="@android:id/mask">
                 <shape android:shape="rectangle">
-                    <solid android:color="@color/selection_color" />
+                    <solid android:color="?attr/colorControlHighlight" />
                 </shape>
             </item>
         </ripple>
diff --git a/app/src/main/res/drawable/ui_circle_ripple.xml b/app/src/main/res/drawable/ui_circle_ripple.xml
index 05b1590f7..bf4d9664d 100644
--- a/app/src/main/res/drawable/ui_circle_ripple.xml
+++ b/app/src/main/res/drawable/ui_circle_ripple.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/selection_color">
+    android:color="?attr/colorControlHighlight">
     <item>
         <shape android:shape="oval">
             <solid android:color="@android:color/white" />
diff --git a/app/src/main/res/drawable/ui_small_unbounded_ripple.xml b/app/src/main/res/drawable/ui_small_unbounded_ripple.xml
index 3184f2385..b4367d84b 100644
--- a/app/src/main/res/drawable/ui_small_unbounded_ripple.xml
+++ b/app/src/main/res/drawable/ui_small_unbounded_ripple.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/selection_color"
+    android:color="?attr/colorControlHighlight"
     android:radius="@dimen/size_small_unb_ripple" />
diff --git a/app/src/main/res/drawable/ui_unbounded_ripple.xml b/app/src/main/res/drawable/ui_unbounded_ripple.xml
index c9219546f..003c9a27b 100644
--- a/app/src/main/res/drawable/ui_unbounded_ripple.xml
+++ b/app/src/main/res/drawable/ui_unbounded_ripple.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/selection_color"
+    android:color="?attr/colorControlHighlight"
     android:radius="@dimen/size_unb_ripple" />
diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml
index 3845f7901..035a0c839 100644
--- a/app/src/main/res/layout/fragment_detail.xml
+++ b/app/src/main/res/layout/fragment_detail.xml
@@ -26,7 +26,7 @@
             android:id="@+id/detail_recycler"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginTop="?attr/actionBarSize"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             tools:listitem="@layout/item_artist_header" />
 
diff --git a/app/src/main/res/values-large/styles.xml b/app/src/main/res/values-large/styles.xml
index 2cfa3494d..65bbc6a11 100644
--- a/app/src/main/res/values-large/styles.xml
+++ b/app/src/main/res/values-large/styles.xml
@@ -6,7 +6,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:clickable">true</item>
         <item name="android:focusable">true</item>
-        <item name="rippleColor">@color/selection_color</item>
+        <item name="rippleColor">?attr/colorControlHighlight</item>
         <item name="fontFamily">@font/inter_semibold</item>
         <item name="textAllCaps">false</item>
         <item name="cornerRadius">0dp</item>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index bd4845afe..b00ebc3a4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -218,7 +218,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:clickable">true</item>
         <item name="android:focusable">true</item>
-        <item name="rippleColor">@color/selection_color</item>
+        <item name="rippleColor">?attr/colorControlHighlight</item>
         <item name="fontFamily">@font/inter_semibold</item>
         <item name="textAllCaps">false</item>
         <item name="cornerRadius">0dp</item>
@@ -237,7 +237,7 @@
     <style name="Widget.MaterialComponents.Button.Highlighted" parent="@style/Widget.MaterialComponents.Button.Base">
         <item name="android:layout_marginStart">@dimen/spacing_small</item>
         <item name="android:layout_marginEnd">@dimen/spacing_medium</item>
-        <item name="rippleColor">@color/selection_color</item>
+        <item name="rippleColor">?attr/colorControlHighlight</item>
         <item name="fontFamily">@font/inter_semibold</item>
         <item name="textAllCaps">false</item>
         <item name="android:textColor">@color/background</item>