diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/TrackViewHolder.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/TrackViewHolder.kt
index 61d48ae3..d2fffdf6 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/TrackViewHolder.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/TrackViewHolder.kt
@@ -166,19 +166,22 @@ class TrackViewHolder(val view: View) :
         ContextCompat.getDrawable(view.context, R.drawable.ic_stat_play)!!
     }
 
+    @Suppress("MagicNumber")
     private fun setPlayIcon(isPlaying: Boolean) {
         if (isPlaying && !isPlayingCached) {
             isPlayingCached = true
             title.setCompoundDrawablesWithIntrinsicBounds(
                 playingIcon, null, null, null
             )
-            songLayout.backgroundTintMode = PorterDuff.Mode.ADD
+            songLayout.backgroundTintMode = PorterDuff.Mode.MULTIPLY
+            songLayout.elevation = 3F
         } else if (!isPlaying && isPlayingCached) {
             isPlayingCached = false
             title.setCompoundDrawablesWithIntrinsicBounds(
                 0, 0, 0, 0
             )
-            songLayout.backgroundTintMode = PorterDuff.Mode.MULTIPLY
+            songLayout.backgroundTintMode = PorterDuff.Mode.ADD
+            songLayout.elevation = 0F
         }
     }
 
diff --git a/ultrasonic/src/main/res/layout/list_item_track.xml b/ultrasonic/src/main/res/layout/list_item_track.xml
index 03913132..adf5be3e 100644
--- a/ultrasonic/src/main/res/layout/list_item_track.xml
+++ b/ultrasonic/src/main/res/layout/list_item_track.xml
@@ -5,9 +5,9 @@
     a:id="@+id/song_layout"
     a:layout_width="fill_parent"
     a:layout_height="?android:attr/listPreferredItemHeight"
-    a:background="#00000000"
-    a:backgroundTint="@color/material_on_surface_stroke"
-    a:backgroundTintMode="multiply"
+    a:background="?attr/colorSurface"
+    a:backgroundTint="?attr/colorPrimaryContainer"
+    a:backgroundTintMode="add"
     a:minHeight="?android:attr/listPreferredItemHeight"
     a:orientation="horizontal">