diff --git a/app/src/main/res/drawable/button_accent_background.xml b/app/src/main/res/drawable/button_accent_background.xml
index 6badef84..d64219d4 100644
--- a/app/src/main/res/drawable/button_accent_background.xml
+++ b/app/src/main/res/drawable/button_accent_background.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/neutral_100">
+    android:color="?attr/colorControlHighlight">
     <item android:id="@android:id/background">
         <shape android:shape="rectangle">
             <solid android:color="@color/neutral_700" />
diff --git a/app/src/main/res/drawable/button_setup_background.xml b/app/src/main/res/drawable/button_setup_background.xml
index b9d949cb..cdef1226 100644
--- a/app/src/main/res/drawable/button_setup_background.xml
+++ b/app/src/main/res/drawable/button_setup_background.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?attr/colorPrimaryVariant">
-    <item android:id="@android:id/background">
-        <shape android:shape="rectangle">
-            <solid android:color="?attr/colorPrimary" />
-            <corners
-                android:radius="10dp" />
-        </shape>
-    </item>
-</ripple>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="?attr/colorPrimary" />
+    <corners android:radius="10dp" />
+</shape>
diff --git a/app/src/main/res/drawable/ripple_background.xml b/app/src/main/res/drawable/ripple_background.xml
new file mode 100644
index 00000000..671c284a
--- /dev/null
+++ b/app/src/main/res/drawable/ripple_background.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/colorControlHighlight">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <corners android:radius="10dp"/>
+            <solid android:color="#ffffff"/>
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/transparent_circle_background.xml b/app/src/main/res/drawable/transparent_circle_background.xml
index 6d78ee5e..cc91339a 100644
--- a/app/src/main/res/drawable/transparent_circle_background.xml
+++ b/app/src/main/res/drawable/transparent_circle_background.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/white">
+    android:color="?attr/colorControlHighlight">
     <item android:id="@android:id/mask">
         <shape android:shape="oval">
-            <solid android:color="@color/white"/>
+            <solid android:color="@color/white" />
         </shape>
     </item>
     <item>
         <shape>
-            <solid android:color="@android:color/transparent"/>
+            <solid android:color="@android:color/transparent" />
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/layout/base_item.xml b/app/src/main/res/layout/base_item.xml
index f701a1f8..1f74a8fc 100644
--- a/app/src/main/res/layout/base_item.xml
+++ b/app/src/main/res/layout/base_item.xml
@@ -18,7 +18,9 @@
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="12dp"
         android:layout_marginBottom="24dp"
-        android:foreground="?android:attr/selectableItemBackground"
+        android:clickable="true"
+        android:focusable="true"
+        android:foreground="@drawable/ripple_background"
         android:orientation="vertical">
 
         <com.google.android.material.imageview.ShapeableImageView
diff --git a/app/src/main/res/layout/collection_item.xml b/app/src/main/res/layout/collection_item.xml
index 8a1a7dad..20c0b5d3 100644
--- a/app/src/main/res/layout/collection_item.xml
+++ b/app/src/main/res/layout/collection_item.xml
@@ -15,7 +15,9 @@
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="12dp"
         android:layout_marginBottom="24dp"
-        android:foreground="?android:attr/selectableItemBackground"
+        android:clickable="true"
+        android:focusable="true"
+        android:foreground="@drawable/ripple_background"
         android:orientation="vertical">
 
         <com.google.android.material.imageview.ShapeableImageView
diff --git a/app/src/main/res/layout/episode_bottom_sheet.xml b/app/src/main/res/layout/episode_bottom_sheet.xml
index a7fc7396..ac239823 100644
--- a/app/src/main/res/layout/episode_bottom_sheet.xml
+++ b/app/src/main/res/layout/episode_bottom_sheet.xml
@@ -153,6 +153,7 @@
                     android:layout_height="48dp"
                     android:background="@drawable/button_setup_background"
                     android:contentDescription="@string/play_button_description"
+                    android:foreground="@drawable/ripple_background"
                     android:paddingHorizontal="24dp"
                     android:paddingVertical="12dp"
                     android:src="@drawable/ic_play" />
diff --git a/app/src/main/res/layout/episode_item.xml b/app/src/main/res/layout/episode_item.xml
index b6e96225..994fd225 100644
--- a/app/src/main/res/layout/episode_item.xml
+++ b/app/src/main/res/layout/episode_item.xml
@@ -19,7 +19,9 @@
         android:layout_height="100dp"
         android:layout_marginHorizontal="24dp"
         android:layout_marginBottom="24dp"
-        android:foreground="?android:attr/selectableItemBackground">
+        android:clickable="true"
+        android:focusable="true"
+        android:foreground="@drawable/ripple_background">
 
         <com.google.android.material.imageview.ShapeableImageView
             android:id="@+id/episode_image"
diff --git a/app/src/main/res/layout/fragment_media_info.xml b/app/src/main/res/layout/fragment_media_info.xml
index f92fecce..ed0b4265 100644
--- a/app/src/main/res/layout/fragment_media_info.xml
+++ b/app/src/main/res/layout/fragment_media_info.xml
@@ -24,10 +24,10 @@
             android:id="@+id/media_info_scrollview"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent">
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -147,6 +147,7 @@
                             android:layout_height="48dp"
                             android:background="@drawable/button_setup_background"
                             android:contentDescription="@string/play_button_description"
+                            android:foreground="@drawable/ripple_background"
                             android:paddingHorizontal="24dp"
                             android:paddingVertical="12dp"
                             android:src="@drawable/ic_play" />
@@ -350,7 +351,9 @@
                         android:layout_width="@dimen/nextup_media_width"
                         android:layout_height="wrap_content"
                         android:layout_marginHorizontal="24dp"
-                        android:foreground="?attr/selectableItemBackground"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:foreground="@drawable/ripple_background"
                         android:orientation="vertical">
 
                         <com.google.android.material.imageview.ShapeableImageView
diff --git a/app/src/main/res/layout/home_episode_item.xml b/app/src/main/res/layout/home_episode_item.xml
index 24213bfe..0614d651 100644
--- a/app/src/main/res/layout/home_episode_item.xml
+++ b/app/src/main/res/layout/home_episode_item.xml
@@ -14,7 +14,9 @@
         android:layout_width="240dp"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="12dp"
-        android:foreground="?android:attr/selectableItemBackground"
+        android:clickable="true"
+        android:focusable="true"
+        android:foreground="@drawable/ripple_background"
         android:orientation="vertical">
 
         <com.google.android.material.imageview.ShapeableImageView
diff --git a/app/src/main/res/layout/server_item.xml b/app/src/main/res/layout/server_item.xml
index 752cb452..e40043e8 100644
--- a/app/src/main/res/layout/server_item.xml
+++ b/app/src/main/res/layout/server_item.xml
@@ -13,6 +13,9 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:clickable="true"
+        android:focusable="true"
+        android:foreground="@drawable/ripple_background"
         android:orientation="vertical"
         android:paddingStart="12dp"
         android:paddingEnd="12dp"