diff --git a/app/src/main/res/values-night-v27/styles.xml b/app/src/main/res/values-night-v27/styles.xml
index 696621d6d..b9edf9747 100644
--- a/app/src/main/res/values-night-v27/styles.xml
+++ b/app/src/main/res/values-night-v27/styles.xml
@@ -30,5 +30,6 @@
         <item name="colorSurface">@color/darkColorSurface</item>
         <item name="materialCardViewStyle">@style/Widget.MaterialComponents.CardView</item>
         <item name="bottomSheetTint">@color/bottomSheetColor</item>
+        <item name="elevationOverlayColor">@color/elevationOverlayDark</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors_md3.xml b/app/src/main/res/values-night/colors_md3.xml
new file mode 100644
index 000000000..4450fd615
--- /dev/null
+++ b/app/src/main/res/values-night/colors_md3.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="elevationOverlay">@color/elevationOverlayDark</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 545d17a8e..8a999c3eb 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -31,5 +31,6 @@
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
         <item name="bottomSheetTint">@color/bottomSheetColor</item>
+        <item name="elevationOverlayColor">@color/elevationOverlayDark</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v27/styles_parents.xml b/app/src/main/res/values-v27/styles_parents.xml
index b2fcc3abc..3ef2b2de9 100644
--- a/app/src/main/res/values-v27/styles_parents.xml
+++ b/app/src/main/res/values-v27/styles_parents.xml
@@ -28,6 +28,7 @@
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
         <item name="bottomSheetTint">@color/bottomSheetColor</item>
+        <item name="elevationOverlayColor">@color/elevationOverlay</item>
     </style>
 
     <style name="Theme.RetroMusic.Base" parent="Theme.Material3.DayNight.NoActionBar">
@@ -49,6 +50,7 @@
         <item name="android:windowBackground">@color/window_color_dark</item>
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
         <item name="bottomSheetTint">@color/bottomSheetColorDark</item>
+        <item name="elevationOverlayColor">@color/elevationOverlayDark</item>
     </style>
 
     <style name="Theme.RetroMusic.Base.Light" parent="Theme.Material3.Light.NoActionBar">
@@ -67,6 +69,6 @@
         <item name="bottomNavigationStyle">@style/Widget.Material3.BottomNavigationView</item>
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
         <item name="bottomSheetTint">@color/bottomSheetColorLight</item>
-        <item name="elevationOverlayColor">@color/md_grey_400</item>
+        <item name="elevationOverlayColor">@color/elevationOverlayLight</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v31/colors_md3.xml b/app/src/main/res/values-v31/colors_md3.xml
new file mode 100644
index 000000000..92a586af6
--- /dev/null
+++ b/app/src/main/res/values-v31/colors_md3.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="elevationOverlayLight">@android:color/system_accent1_100</color>
+    <color name="elevationOverlayDark">@android:color/system_accent1_900</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors_md3.xml b/app/src/main/res/values/colors_md3.xml
new file mode 100644
index 000000000..c1144310f
--- /dev/null
+++ b/app/src/main/res/values/colors_md3.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="elevationOverlayLight">@color/md_grey_600</color>
+    <color name="elevationOverlayDark">@color/md_grey_700</color>
+    <color name="elevationOverlay">@color/elevationOverlayLight</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml
index 1cdf495ff..6be8a9879 100644
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@@ -16,6 +16,7 @@
         <item name="popupWindowStyle">@style/MaterialPopupMenuStyle</item>
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
         <item name="bottomSheetTint">@color/bottomSheetColor</item>
+        <item name="elevationOverlayColor">@color/elevationOverlay</item>
     </style>
 
     <style name="Theme.RetroMusic.Base" parent="Theme.Material3.DayNight.NoActionBar">
@@ -36,6 +37,7 @@
         <item name="popupMenuStyle">@style/MaterialPopupMenuStyle</item>
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
         <item name="bottomSheetTint">@color/bottomSheetColorDark</item>
+        <item name="elevationOverlayColor">@color/elevationOverlayDark</item>
     </style>
 
     <style name="Theme.RetroMusic.Base.Black" parent="Theme.Material3.DayNight.NoActionBar">
@@ -54,6 +56,7 @@
         <item name="popupMenuStyle">@style/MaterialPopupMenuStyle</item>
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
         <item name="bottomSheetTint">@color/bottomSheetColorBlack</item>
+        <item name="elevationOverlayColor">@color/elevationOverlayDark</item>
     </style>
 
     <style name="Theme.RetroMusic.Base.Light" parent="Theme.Material3.Light.NoActionBar">
@@ -72,7 +75,7 @@
         <item name="popupMenuStyle">@style/MaterialPopupMenuStyle</item>
         <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
         <item name="bottomSheetTint">@color/bottomSheetColorLight</item>
-        <item name="elevationOverlayColor">@color/md_grey_400</item>
+        <item name="elevationOverlayColor">@color/elevationOverlayLight</item>
     </style>
 
     <style name="MusicProgressSliderParent">
diff --git a/appthemehelper/src/main/res/values/colors_material_design.xml b/appthemehelper/src/main/res/values/colors_material_design.xml
index da37551bf..035d1c051 100755
--- a/appthemehelper/src/main/res/values/colors_material_design.xml
+++ b/appthemehelper/src/main/res/values/colors_material_design.xml
@@ -30,6 +30,8 @@
     <color name="md_grey_200">#EEEEEE</color>
     <color name="md_grey_400">#BDBDBD</color>
     <color name="md_grey_500">#9E9E9E</color>
+    <color name="md_grey_600">#757575</color>
+    <color name="md_grey_700">#616161</color>
     <color name="md_grey_800">#424242</color>
 
     <color name="md_black_1000">#000000</color>