diff --git a/app/src/main/java/org/akanework/gramophone/ui/components/FullBottomSheet.kt b/app/src/main/java/org/akanework/gramophone/ui/components/FullBottomSheet.kt
index 6b73482706..b924e17d4a 100644
--- a/app/src/main/java/org/akanework/gramophone/ui/components/FullBottomSheet.kt
+++ b/app/src/main/java/org/akanework/gramophone/ui/components/FullBottomSheet.kt
@@ -17,6 +17,7 @@
 
 package org.akanework.gramophone.ui.components
 
+import android.animation.ObjectAnimator
 import android.animation.ValueAnimator
 import android.annotation.SuppressLint
 import android.content.Context
@@ -36,14 +37,18 @@ import android.util.AttributeSet
 import android.view.AbsSavedState
 import android.view.Gravity
 import android.view.KeyEvent
+import android.view.MotionEvent
 import android.view.View
+import android.view.ViewConfiguration
 import android.view.ViewGroup
 import android.view.ViewPropertyAnimator
 import android.view.WindowInsets
+import android.view.animation.LinearInterpolator
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.CheckBox
 import android.widget.EditText
+import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.ListView
 import android.widget.SeekBar
@@ -140,6 +145,7 @@ import uk.akane.libphonograph.items.artistId
 import uk.akane.libphonograph.manipulator.PlaylistSerializer.Entry
 import java.text.NumberFormat
 import java.text.ParseException
+import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.min
 
@@ -170,6 +176,9 @@ class FullBottomSheet
 
     private val prefs = PreferenceManager.getDefaultSharedPreferences(context.applicationContext)
     private var currentFormat: AudioFormatDetector.AudioFormats? = null
+    private var rotateCookieButton = false
+    private var swipeToSwitchTrackEnabled = false
+    private var cookieRotationAnimator: ObjectAnimator? = null
 
     companion object {
         const val SLIDER_UPDATE_INTERVAL: Long = 100
@@ -252,6 +261,7 @@ class FullBottomSheet
     private val bottomSheetFullTitle: TextView
     private val bottomSheetFullSubtitle: TextView
     private val bottomSheetFullControllerButton: MaterialButton
+    private val bottomSheetFullControllerButtonBg: ImageView
     private val bottomSheetFullNextButton: MaterialButton
     private val bottomSheetFullPreviousButton: MaterialButton
     private val bottomSheetFullDuration: TextView
@@ -280,6 +290,7 @@ class FullBottomSheet
         bottomSheetFullSubtitle = findViewById(R.id.full_song_artist)
         bottomSheetFullPreviousButton = findViewById(R.id.sheet_previous_song)
         bottomSheetFullControllerButton = findViewById(R.id.sheet_mid_button)
+        bottomSheetFullControllerButtonBg = findViewById(R.id.sheet_mid_button_bg)
         bottomSheetFullNextButton = findViewById(R.id.sheet_next_song)
         bottomSheetFullPosition = findViewById(R.id.position)
         bottomSheetFullDuration = findViewById(R.id.duration)
@@ -356,6 +367,52 @@ class FullBottomSheet
             }
         }
 
+        var startX = 0f
+        var startY = 0f
+        val touchSlop = ViewConfiguration.get(context).scaledTouchSlop
+        val swipeThresholdPx = 50.dpToPx(context)
+        bottomSheetFullCover.setOnTouchListener { v, event ->
+            if (!swipeToSwitchTrackEnabled) return@setOnTouchListener false
+            when (event.actionMasked) {
+                MotionEvent.ACTION_DOWN -> {
+                    startX = event.x
+                    startY = event.y
+                    true
+                }
+                MotionEvent.ACTION_MOVE -> {
+                    val dx = event.x - startX
+                    val dy = event.y - startY
+                    if (abs(dx) > touchSlop && abs(dx) > abs(dy)) {
+                        v.parent?.requestDisallowInterceptTouchEvent(true)
+                    }
+                    true
+                }
+                MotionEvent.ACTION_UP -> {
+                    v.parent?.requestDisallowInterceptTouchEvent(false)
+                    val dx = event.x - startX
+                    val dy = event.y - startY
+                    val absDx = abs(dx)
+                    val absDy = abs(dy)
+                    if (absDx > absDy && absDx > swipeThresholdPx) {
+                        ViewCompat.performHapticFeedback(v, HapticFeedbackConstantsCompat.GESTURE_END)
+                        if (dx < 0) {
+                            instance?.seekToNext()
+                        } else {
+                            instance?.seekToPrevious()
+                        }
+                    } else {
+                        v.performClick()
+                    }
+                    true
+                }
+                MotionEvent.ACTION_CANCEL -> {
+                    v.parent?.requestDisallowInterceptTouchEvent(false)
+                    false
+                }
+                else -> false
+            }
+        }
+
         bottomSheetFullTitle.setOnClickListener {
             minimize?.invoke()
             activity.startFragment(GeneralSubFragment()) {
@@ -623,6 +680,42 @@ class FullBottomSheet
             ),
         )
         bottomSheetFullSeekBar.progressTintList = ColorStateList.valueOf(colorPrimary)
+        if (rotateCookieButton && instance?.isPlaying == true) {
+            startButtonRotation()
+        }
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        stopButtonRotation(reset = false)
+    }
+
+    private fun startButtonRotation() {
+        if (!rotateCookieButton) return
+        if (cookieRotationAnimator == null) {
+            val currentRotation = bottomSheetFullControllerButtonBg.rotation % 360f
+            cookieRotationAnimator = ObjectAnimator.ofFloat(
+                bottomSheetFullControllerButtonBg,
+                View.ROTATION,
+                currentRotation,
+                currentRotation + 360f
+            ).apply {
+                duration = 36000L
+                repeatCount = ValueAnimator.INFINITE
+                interpolator = LinearInterpolator()
+                start()
+            }
+        } else if (cookieRotationAnimator?.isStarted != true) {
+            cookieRotationAnimator?.start()
+        }
+    }
+
+    private fun stopButtonRotation(reset: Boolean = false) {
+        cookieRotationAnimator?.cancel()
+        cookieRotationAnimator = null
+        if (reset) {
+            bottomSheetFullControllerButtonBg.rotation = 0f
+        }
     }
 
     override fun onSaveInstanceState(): Parcelable {
@@ -711,6 +804,17 @@ class FullBottomSheet
         if (key == null || key == "cookie_cover") {
             bottomSheetFullCover.setClip(prefs.getBooleanStrict("cookie_cover", false))
         }
+        if (key == null || key == "rotate_cookie_button") {
+            rotateCookieButton = prefs.getBooleanStrict("rotate_cookie_button", false)
+            if (rotateCookieButton && instance?.isPlaying == true) {
+                startButtonRotation()
+            } else {
+                stopButtonRotation(reset = true)
+            }
+        }
+        if (key == null || key == "swipe_to_switch_track") {
+            swipeToSwitchTrackEnabled = prefs.getBooleanStrict("swipe_to_switch_track", false)
+        }
     }
 
     private fun showPlaybackSpeedDialog() {
@@ -1139,7 +1243,8 @@ class FullBottomSheet
             )
 
             val secondaryContainerTransition = ValueAnimator.ofArgb(
-                bottomSheetFullControllerButton.backgroundTintList!!.defaultColor,
+                bottomSheetFullControllerButtonBg.imageTintList?.defaultColor
+                    ?: colorSecondaryContainer,
                 colorSecondaryContainer
             )
 
@@ -1226,7 +1331,7 @@ class FullBottomSheet
             secondaryContainerTransition.apply {
                 addUpdateListener { animation ->
                     val progressColor = animation.animatedValue as Int
-                    bottomSheetFullControllerButton.backgroundTintList =
+                    bottomSheetFullControllerButtonBg.imageTintList =
                         ColorStateList.valueOf(progressColor)
                 }
                 duration = BACKGROUND_COLOR_TRANSITION_SEC
@@ -1350,7 +1455,7 @@ class FullBottomSheet
             bottomSheetFullSubtitle.setTextColor(
                 colorSecondary
             )
-            bottomSheetFullControllerButton.backgroundTintList =
+            bottomSheetFullControllerButtonBg.imageTintList =
                 ColorStateList.valueOf(colorSecondaryContainer)
             bottomSheetFullControllerButton.iconTint =
                 ColorStateList.valueOf(colorOnSecondaryContainer)
@@ -1537,10 +1642,14 @@ class FullBottomSheet
                         wrappedContext ?: context,
                         R.drawable.play_anim
                     )
-                bottomSheetFullControllerButton.background =
+                bottomSheetFullControllerButtonBg.setImageDrawable(
                     AppCompatResources.getDrawable(context, R.drawable.bg_play_anim)
+                )
                 bottomSheetFullControllerButton.icon.startAnimation()
-                bottomSheetFullControllerButton.background.startAnimation()
+                bottomSheetFullControllerButtonBg.drawable?.startAnimation()
+                val pauseDesc = context.getString(R.string.pause)
+                bottomSheetFullControllerButton.contentDescription = pauseDesc
+                TooltipCompat.setTooltipText(bottomSheetFullControllerButton, pauseDesc)
                 bottomSheetFullControllerButton.setTag(R.id.play_next, 1)
             }
             if (!isUserTracking) {
@@ -1551,6 +1660,7 @@ class FullBottomSheet
                 handler.postDelayed(positionRunnable, SLIDER_UPDATE_INTERVAL)
             }
             bottomSheetFullCover.startRotation()
+            startButtonRotation()
         } else if (playbackState != Player.STATE_BUFFERING) {
             if (bottomSheetFullControllerButton.getTag(R.id.play_next) as Int? != 2) {
                 bottomSheetFullControllerButton.icon =
@@ -1558,12 +1668,17 @@ class FullBottomSheet
                         wrappedContext ?: context,
                         R.drawable.pause_anim
                     )
-                bottomSheetFullControllerButton.background =
+                bottomSheetFullControllerButtonBg.setImageDrawable(
                     AppCompatResources.getDrawable(context, R.drawable.bg_pause_anim)
+                )
                 bottomSheetFullControllerButton.icon.startAnimation()
-                bottomSheetFullControllerButton.background.startAnimation()
+                bottomSheetFullControllerButtonBg.drawable?.startAnimation()
+                val playDesc = context.getString(R.string.play)
+                bottomSheetFullControllerButton.contentDescription = playDesc
+                TooltipCompat.setTooltipText(bottomSheetFullControllerButton, playDesc)
                 bottomSheetFullControllerButton.setTag(R.id.play_next, 2)
                 bottomSheetFullCover.stopRotation()
+                stopButtonRotation(reset = false)
             }
             if (!isUserTracking) {
                 progressDrawable.animate = false
diff --git a/app/src/main/res/layout-w600dp-land/full_player.xml b/app/src/main/res/layout-w600dp-land/full_player.xml
index bd831d0458..5ade7121f6 100644
--- a/app/src/main/res/layout-w600dp-land/full_player.xml
+++ b/app/src/main/res/layout-w600dp-land/full_player.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!-- Full Player Layout -->
+<!--
+    NOTE: This layout variant is matched by all landscape smartphones and tablets with available width >= 600dp.
+    Any ID or hierarchy changes must be kept in strict sync with layout/full_player.xml.
+-->
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -200,7 +204,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="28dp"
-            app:layout_constraintBottom_toTopOf="@id/sheet_mid_button"
+            app:layout_constraintBottom_toTopOf="@id/sheet_mid_button_frame"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/slider"
@@ -210,7 +214,6 @@
                 android:id="@+id/position"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="start"
                 android:fontFamily="sans-serif"
                 android:text="@string/default_time"
                 android:textColor="?colorOnSurfaceVariant"
@@ -223,12 +226,12 @@
                 android:id="@+id/quality_details"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
                 android:drawablePadding="4dp"
                 android:fontFamily="sans-serif"
                 android:gravity="center"
                 android:textColor="?attr/colorOnSurfaceVariant"
                 android:textSize="12sp"
+                app:drawableTint="?attr/colorOnSurfaceVariant"
                 app:layout_constrainedWidth="true"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/duration"
@@ -242,7 +245,6 @@
                 android:id="@+id/duration"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="end"
                 android:fontFamily="sans-serif"
                 android:text="@string/default_time"
                 android:textColor="?colorOnSurfaceVariant"
@@ -253,37 +255,22 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/sheet_mid_button"
+        <include
+            android:id="@+id/sheet_mid_button_frame"
+            layout="@layout/sheet_cookie_button"
             android:layout_width="90dp"
             android:layout_height="90dp"
-            android:layout_centerHorizontal="true"
             android:layout_marginTop="18dp"
-            android:background="@drawable/bg_play_anim"
-            android:contentDescription="@string/play"
-            android:insetLeft="0dp"
-            android:insetTop="0dp"
-            android:insetRight="0dp"
-            android:insetBottom="0dp"
-            app:backgroundTint="?attr/colorSecondaryContainer"
-            app:icon="@drawable/play_anim"
-            app:iconGravity="textStart"
-            app:iconPadding="0dp"
-            app:iconSize="42dp"
-            app:iconTint="?attr/colorOnSecondaryContainer"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/duration_frame"
-            app:tooltipText="@string/play" />
+            app:layout_constraintTop_toBottomOf="@id/duration_frame" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/sheet_previous_song"
             android:layout_width="90dp"
             android:layout_height="90dp"
-            android:layout_gravity="center"
             android:layout_marginEnd="8dp"
-            android:layout_toStartOf="@id/sheet_mid_button"
             android:background="@drawable/rp_buttons_dynamic"
             android:contentDescription="@string/skip_previous"
             android:insetLeft="0dp"
@@ -295,20 +282,18 @@
             app:iconPadding="0dp"
             app:iconSize="38sp"
             app:iconTint="?attr/colorOnSurface"
-            app:layout_constraintBottom_toBottomOf="@id/sheet_mid_button"
-            app:layout_constraintEnd_toStartOf="@id/sheet_mid_button"
+            app:layout_constraintBottom_toBottomOf="@id/sheet_mid_button_frame"
+            app:layout_constraintEnd_toStartOf="@id/sheet_mid_button_frame"
             app:layout_constraintHorizontal_bias="0.80"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/sheet_mid_button"
+            app:layout_constraintTop_toTopOf="@id/sheet_mid_button_frame"
             app:tooltipText="@string/skip_previous" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/sheet_next_song"
             android:layout_width="90dp"
             android:layout_height="90dp"
-            android:layout_gravity="center"
             android:layout_marginStart="8dp"
-            android:layout_toEndOf="@id/sheet_mid_button"
             android:background="@drawable/rp_buttons_dynamic"
             android:contentDescription="@string/skip_next"
             android:insetLeft="0dp"
@@ -320,11 +305,11 @@
             app:iconPadding="0dp"
             app:iconSize="38sp"
             app:iconTint="?attr/colorOnSurface"
-            app:layout_constraintBottom_toBottomOf="@id/sheet_mid_button"
+            app:layout_constraintBottom_toBottomOf="@id/sheet_mid_button_frame"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.20"
-            app:layout_constraintStart_toEndOf="@id/sheet_mid_button"
-            app:layout_constraintTop_toTopOf="@id/sheet_mid_button"
+            app:layout_constraintStart_toEndOf="@id/sheet_mid_button_frame"
+            app:layout_constraintTop_toTopOf="@id/sheet_mid_button_frame"
             app:tooltipText="@string/skip_next" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/full_player.xml b/app/src/main/res/layout/full_player.xml
index 0fa6a1c4a3..f9d62b2246 100644
--- a/app/src/main/res/layout/full_player.xml
+++ b/app/src/main/res/layout/full_player.xml
@@ -207,7 +207,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="36dp"
-            app:layout_constraintBottom_toTopOf="@id/sheet_mid_button"
+            app:layout_constraintBottom_toTopOf="@id/sheet_mid_button_frame"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/slider"
@@ -217,7 +217,6 @@
                 android:id="@+id/position"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="start"
                 android:fontFamily="sans-serif"
                 android:text="@string/default_time"
                 android:textColor="?colorOnSurfaceVariant"
@@ -230,7 +229,6 @@
                 android:id="@+id/quality_details"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
                 android:drawablePadding="4dp"
                 android:fontFamily="sans-serif"
                 android:gravity="center"
@@ -250,7 +248,6 @@
                 android:id="@+id/duration"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="end"
                 android:fontFamily="sans-serif"
                 android:text="@string/default_time"
                 android:textColor="?colorOnSurfaceVariant"
@@ -261,37 +258,22 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/sheet_mid_button"
+        <include
+            android:id="@+id/sheet_mid_button_frame"
+            layout="@layout/sheet_cookie_button"
             android:layout_width="90dp"
             android:layout_height="90dp"
-            android:layout_centerHorizontal="true"
             android:layout_marginTop="18dp"
-            android:background="@drawable/bg_play_anim"
-            android:contentDescription="@string/play"
-            android:insetLeft="0dp"
-            android:insetTop="0dp"
-            android:insetRight="0dp"
-            android:insetBottom="0dp"
-            app:backgroundTint="?attr/colorSecondaryContainer"
-            app:icon="@drawable/play_anim"
-            app:iconGravity="textStart"
-            app:iconPadding="0dp"
-            app:iconSize="42dp"
-            app:iconTint="?attr/colorOnSecondaryContainer"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/duration_frame"
-            app:tooltipText="@string/play" />
+            app:layout_constraintTop_toBottomOf="@id/duration_frame" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/sheet_previous_song"
             android:layout_width="90dp"
             android:layout_height="90dp"
-            android:layout_gravity="center"
             android:layout_marginEnd="8dp"
-            android:layout_toStartOf="@id/sheet_mid_button"
             android:background="@drawable/rp_buttons_dynamic"
             android:contentDescription="@string/skip_previous"
             android:insetLeft="0dp"
@@ -303,20 +285,18 @@
             app:iconPadding="0dp"
             app:iconSize="38sp"
             app:iconTint="?attr/colorOnSurface"
-            app:layout_constraintBottom_toBottomOf="@id/sheet_mid_button"
-            app:layout_constraintEnd_toStartOf="@id/sheet_mid_button"
+            app:layout_constraintBottom_toBottomOf="@id/sheet_mid_button_frame"
+            app:layout_constraintEnd_toStartOf="@id/sheet_mid_button_frame"
             app:layout_constraintHorizontal_bias="0.80"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/sheet_mid_button"
+            app:layout_constraintTop_toTopOf="@id/sheet_mid_button_frame"
             app:tooltipText="@string/skip_previous" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/sheet_next_song"
             android:layout_width="90dp"
             android:layout_height="90dp"
-            android:layout_gravity="center"
             android:layout_marginStart="8dp"
-            android:layout_toEndOf="@id/sheet_mid_button"
             android:background="@drawable/rp_buttons_dynamic"
             android:contentDescription="@string/skip_next"
             android:insetLeft="0dp"
@@ -328,11 +308,11 @@
             app:iconPadding="0dp"
             app:iconSize="38sp"
             app:iconTint="?attr/colorOnSurface"
-            app:layout_constraintBottom_toBottomOf="@id/sheet_mid_button"
+            app:layout_constraintBottom_toBottomOf="@id/sheet_mid_button_frame"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.20"
-            app:layout_constraintStart_toEndOf="@id/sheet_mid_button"
-            app:layout_constraintTop_toTopOf="@id/sheet_mid_button"
+            app:layout_constraintStart_toEndOf="@id/sheet_mid_button_frame"
+            app:layout_constraintTop_toTopOf="@id/sheet_mid_button_frame"
             app:tooltipText="@string/skip_next" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/sheet_cookie_button.xml b/app/src/main/res/layout/sheet_cookie_button.xml
new file mode 100644
index 0000000000..41ae5553e5
--- /dev/null
+++ b/app/src/main/res/layout/sheet_cookie_button.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~     Copyright (C) 2026 stevezmtstudios <me@stevezmt.top>
+  ~
+  ~     Gramophone is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU General Public License as published by
+  ~     the Free Software Foundation, either version 3 of the License, or
+  ~     (at your option) any later version.
+  ~
+  ~     Gramophone is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU General Public License
+  ~     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/sheet_mid_button_frame"
+    android:layout_width="90dp"
+    android:layout_height="90dp">
+
+    <ImageView
+        android:id="@+id/sheet_mid_button_bg"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:contentDescription="@null"
+        android:importantForAccessibility="no"
+        android:src="@drawable/bg_play_anim"
+        app:tint="?attr/colorSecondaryContainer" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/sheet_mid_button"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:contentDescription="@string/play"
+        android:insetTop="0dp"
+        android:insetBottom="0dp"
+        app:backgroundTint="@android:color/transparent"
+        app:icon="@drawable/play_anim"
+        app:iconGravity="textStart"
+        app:iconPadding="0dp"
+        app:iconSize="42dp"
+        app:iconTint="?attr/colorOnSecondaryContainer"
+        app:rippleColor="?attr/colorControlHighlight"
+        app:tooltipText="@string/play" />
+
+</FrameLayout>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index e560b9b47b..cd861b39cf 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -148,6 +148,7 @@
     <string name="remove">移除</string>
     <string name="more">更多</string>
     <string name="play">播放</string>
+    <string name="pause">暂停</string>
     <string name="sort">排序</string>
     <string name="play_all">全部播放</string>
     <string name="settings_preference_category_home">主屏幕</string>
@@ -157,6 +158,10 @@
     <string name="settings_status_bar_lyrics_summary">启用魅族状态栏歌词（仅适用于部分设备）</string>
     <string name="settings_lyrics_ui">启用新歌词界面</string>
     <string name="lyric_widget_description">显示当前播放媒体歌词的小部件</string>
+    <string name="settings_rotate_cookie_button">旋转播放按钮</string>
+    <string name="settings_rotate_cookie_button_summary">播放时让饼干样式的播放/暂停按钮细微地转动</string>
+    <string name="settings_swipe_to_switch_track">滑动切歌</string>
+    <string name="settings_swipe_to_switch_track_summary">在播放器封面上左右滑动以切换上一曲/下一曲</string>
     <string name="scroll_to_albums">滚动到专辑</string>
     <string name="scroll_to_songs">滚动到歌曲</string>
     <string name="expand_less">关闭</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0173690f0f..883a9802b7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -374,6 +374,8 @@
     <string name="scroll_to_songs">Scroll to songs</string>
     <!-- Tooltip for play button in full player -->
     <string name="play">Play</string>
+    <!-- Tooltip for pause button in full player -->
+    <string name="pause">Pause</string>
     <!-- Tooltip for three dots button opening context menu -->
     <string name="more">More</string>
     <!-- Tooltip for x button removing song from queue/playlist -->
@@ -404,6 +406,14 @@
     <string name="settings_always_skip_previous">Always skip to previous track</string>
     <!-- Settings toggle in behavior settings to always skip to previous track on previous button press. Subtext -->
     <string name="settings_always_skip_previous_summary">Directly switch to previous track when pressing previous button instead of seeking to start</string>
+    <!-- Settings toggle in player settings to enable subtle rotation of cookie-styled play button. Title -->
+    <string name="settings_rotate_cookie_button">Rotate play button</string>
+    <!-- Settings toggle in player settings to enable subtle rotation of cookie-styled play button. Subtext -->
+    <string name="settings_rotate_cookie_button_summary">Subtly rotate the cookie-style play/pause button while playing</string>
+    <!-- Settings toggle in player settings to enable swipe gestures on album cover to switch tracks. Title -->
+    <string name="settings_swipe_to_switch_track">Swipe to switch track</string>
+    <!-- Settings toggle in player settings to enable swipe gestures on album cover to switch tracks. Subtext -->
+    <string name="settings_swipe_to_switch_track_summary">Swipe left or right on the album cover to switch tracks</string>
     <!-- Context menu item to delete song/album/playlist -->
     <string name="delete">Delete</string>
     <!-- Dialog text to confirm user wants to delete a specific song or playlist with user defined name -->
diff --git a/app/src/main/res/xml/settings_player.xml b/app/src/main/res/xml/settings_player.xml
index f83d70ca24..eea66380cc 100644
--- a/app/src/main/res/xml/settings_player.xml
+++ b/app/src/main/res/xml/settings_player.xml
@@ -85,6 +85,24 @@
             android:title="@string/settings_cookie_info"
             android:widgetLayout="@layout/preference_switch_widget" />
 
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:icon="@drawable/ic_refresh"
+            android:key="rotate_cookie_button"
+            android:layout="@layout/preference_switch"
+            android:summary="@string/settings_rotate_cookie_button_summary"
+            android:title="@string/settings_rotate_cookie_button"
+            android:widgetLayout="@layout/preference_switch_widget" />
+
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:icon="@drawable/ic_skip_next"
+            android:key="swipe_to_switch_track"
+            android:layout="@layout/preference_switch"
+            android:summary="@string/settings_swipe_to_switch_track_summary"
+            android:title="@string/settings_swipe_to_switch_track"
+            android:widgetLayout="@layout/preference_switch_widget" />
+
     </PreferenceCategory>
 
     <PreferenceCategory