diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt
index 20fff4b1a..7b15c9479 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt
@@ -81,7 +81,7 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
     private var recyclerViewTouchActionGuardManager: RecyclerViewTouchActionGuardManager? = null
     private var playingQueueAdapter: PlayingQueueAdapter? = null
     private lateinit var linearLayoutManager: LinearLayoutManager
-    private var bottomInsets = 0
+    private var navBarHeight = 0
 
     private var _binding: FragmentGradientPlayerBinding? = null
     private val binding get() = _binding!!
@@ -92,8 +92,8 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
             binding.playerQueueSheet.updatePadding(
                 top = (slideOffset * binding.statusBarLayout.statusBar.height).toInt()
             )
-            binding.container.updatePadding(
-                bottom = ((1 - slideOffset) * bottomInsets).toInt()
+            binding.recyclerView.updatePadding(
+                top = ((1 - slideOffset) * navBarHeight).toInt()
             )
         }
 
@@ -161,8 +161,8 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
         ViewCompat.setOnApplyWindowInsetsListener(
             (binding.container)
         ) { v: View, insets: WindowInsetsCompat ->
-            bottomInsets = insets.safeGetBottomInsets()
-            v.updatePadding(bottom = bottomInsets)
+            navBarHeight = insets.safeGetBottomInsets()
+            binding.recyclerView.updatePadding(top = navBarHeight)
             insets
         }
         binding.playbackControlsFragment.root.drawAboveSystemBars()
@@ -479,7 +479,7 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
         oldBottom: Int
     ) {
         val panel = getQueuePanel()
-        panel.peekHeight = binding.container.height
+        panel.peekHeight = binding.container.height + navBarHeight
     }
 
     private fun setupRecyclerView() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt
index bbeafa735..37926da08 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt
@@ -201,7 +201,7 @@ class PlayingNotificationImpl(
         if (!isPlaying) {
             addAction(buildDismissAction())
         } else {
-            mActions.removeAt(4)
+            if (mActions.size == 5) mActions.removeAt(4)
         }
     }
 
diff --git a/app/src/main/res/layout/fragment_gradient_player.xml b/app/src/main/res/layout/fragment_gradient_player.xml
index b8ab7af9b..ea2e8b1e5 100644
--- a/app/src/main/res/layout/fragment_gradient_player.xml
+++ b/app/src/main/res/layout/fragment_gradient_player.xml
@@ -150,7 +150,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:background="?attr/colorSurface"
-                app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/container"