diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/LyricsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/other/LyricsFragment.kt
index 67aaf859d..76335e7e7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/LyricsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/other/LyricsFragment.kt
@@ -41,7 +41,6 @@ import code.name.monkey.retromusic.databinding.FragmentLyricsBinding
 import code.name.monkey.retromusic.databinding.FragmentNormalLyricsBinding
 import code.name.monkey.retromusic.databinding.FragmentSyncedLyricsBinding
 import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.surfaceColor
 import code.name.monkey.retromusic.extensions.textColorSecondary
 import code.name.monkey.retromusic.extensions.uri
 import code.name.monkey.retromusic.fragments.base.AbsMusicServiceFragment
@@ -150,9 +149,6 @@ class LyricsFragment : AbsMusicServiceFragment(R.layout.fragment_lyrics) {
         ViewCompat.setTransitionName(binding.container, "lyrics")
 
         setupWakelock()
-
-        binding.tabLyrics.setBackgroundColor(surfaceColor())
-        binding.container.setBackgroundColor(surfaceColor())
         setupViews()
         setupToolbar()
         updateTitleSong()
@@ -186,7 +182,6 @@ class LyricsFragment : AbsMusicServiceFragment(R.layout.fragment_lyrics) {
 
     private fun setupToolbar() {
         mainActivity.setSupportActionBar(binding.toolbar)
-        binding.toolbar.setBackgroundColor(surfaceColor())
         ToolbarContentTintHelper.colorBackButton(binding.toolbar)
         binding.toolbar.setNavigationOnClickListener {
             findNavController().navigateUp()
diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/DurationPreference.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/DurationPreference.kt
index e71ba1094..6f7445c25 100644
--- a/app/src/main/java/code/name/monkey/retromusic/preferences/DurationPreference.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/preferences/DurationPreference.kt
@@ -53,7 +53,7 @@ class DurationPreferenceDialog : DialogFragment() {
         return materialDialog(R.string.audio_fade_duration)
             .setNegativeButton(android.R.string.cancel, null)
             .setPositiveButton(R.string.save) { _, _ -> updateDuration(binding.slider.value.toInt()) }
-            .setView(view)
+            .setView(binding.root)
             .create()
             .colorButtons()
     }
diff --git a/app/src/main/res/layout/fragment_lyrics.xml b/app/src/main/res/layout/fragment_lyrics.xml
index 09fd7f01e..0df8c9767 100644
--- a/app/src/main/res/layout/fragment_lyrics.xml
+++ b/app/src/main/res/layout/fragment_lyrics.xml
@@ -5,6 +5,7 @@
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
     android:fitsSystemWindows="true"
     android:paddingBottom="@dimen/mini_player_height">
 
@@ -35,6 +36,7 @@
             app:subtitleTextAppearance="@style/TextViewCaption"
             app:titleMargin="0dp"
             app:titleMarginStart="0dp"
+            android:background="?attr/colorSurface"
             app:titleTextAppearance="@style/TextViewSubtitle1"
             tools:subtitle="@tools:sample/full_names"
             tools:title="@tools:sample/full_names" />
@@ -62,7 +64,7 @@
             android:id="@+id/tabLyrics"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:elevation="@dimen/toolbar_elevation"
+            android:background="?attr/colorSurface"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"