diff --git a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
index 51ceca53a..2b58cd071 100644
--- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
@@ -276,6 +276,16 @@ class PlayerFragment : Fragment() {
                 .remove(this)
                 .commit()
         }
+        // show the advanced player options
+        playerBinding.toggleOptions.setOnClickListener {
+            if (playerBinding.advancedOptions.isVisible) {
+                playerBinding.toggleOptions.animate().rotationX(0F).setDuration(200).start()
+                playerBinding.advancedOptions.visibility = View.GONE
+            } else {
+                playerBinding.toggleOptions.animate().rotationX(180F).setDuration(200).start()
+                playerBinding.advancedOptions.visibility = View.VISIBLE
+            }
+        }
         binding.playImageView.setOnClickListener {
             paused = if (paused) {
                 binding.playImageView.setImageResource(R.drawable.ic_pause)
diff --git a/app/src/main/java/com/github/libretube/views/CustomExoPlayerView.kt b/app/src/main/java/com/github/libretube/views/CustomExoPlayerView.kt
index a3886f8ce..dc520f502 100644
--- a/app/src/main/java/com/github/libretube/views/CustomExoPlayerView.kt
+++ b/app/src/main/java/com/github/libretube/views/CustomExoPlayerView.kt
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.util.AttributeSet
 import android.view.MotionEvent
+import android.view.View
 import com.github.libretube.databinding.ExoStyledPlayerControlViewBinding
 import com.google.android.exoplayer2.ui.StyledPlayerView
 
@@ -13,6 +14,12 @@ internal class CustomExoPlayerView(
 ) : StyledPlayerView(context, attributeSet) {
     val binding: ExoStyledPlayerControlViewBinding = ExoStyledPlayerControlViewBinding.bind(this)
 
+    override fun hideController() {
+        super.hideController()
+        binding.toggleOptions.animate().rotationX(0F).start()
+        binding.advancedOptions.visibility = View.GONE
+    }
+
     @SuppressLint("ClickableViewAccessibility")
     override fun onTouchEvent(event: MotionEvent): Boolean {
         when (event.action) {
diff --git a/app/src/main/res/layout/exo_styled_player_control_view.xml b/app/src/main/res/layout/exo_styled_player_control_view.xml
index 8df359629..e7c188e64 100644
--- a/app/src/main/res/layout/exo_styled_player_control_view.xml
+++ b/app/src/main/res/layout/exo_styled_player_control_view.xml
@@ -11,73 +11,105 @@
     <LinearLayout
         android:id="@+id/exo_top_bar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/exo_styled_bottom_bar_height"
+        android:layout_height="wrap_content"
         android:layout_gravity="top"
-        android:layout_marginBottom="@dimen/exo_styled_bottom_bar_margin_top"
-        android:layoutDirection="ltr">
+        android:animateLayoutChanges="true"
+        android:orientation="vertical"
+        android:paddingStart="5dp"
+        android:paddingEnd="10dp">
 
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginStart="5dp"
             android:layoutDirection="ltr">
 
-            <ImageView
-                android:id="@+id/close_imageButton"
-                style="@style/PlayerControlTop"
-                android:src="@drawable/ic_close"
-                app:tint="@android:color/white" />
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layoutDirection="ltr">
 
-            <ImageView
-                android:id="@+id/lock_player"
-                style="@style/PlayerControlTop"
-                android:layout_marginStart="-5dp"
-                android:scaleX=".9"
-                android:scaleY=".9"
-                android:src="@drawable/ic_unlocked" />
+                <ImageView
+                    android:id="@+id/close_imageButton"
+                    style="@style/PlayerControlTop"
+                    android:src="@drawable/ic_close"
+                    app:tint="@android:color/white" />
+
+                <ImageView
+                    android:id="@+id/lock_player"
+                    style="@style/PlayerControlTop"
+                    android:layout_marginStart="-5dp"
+                    android:scaleX=".9"
+                    android:scaleY=".9"
+                    android:src="@drawable/ic_unlocked" />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/exo_title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginHorizontal="10dp"
+                android:layout_weight="1"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textColor="@android:color/white"
+                android:textSize="18sp"
+                android:visibility="invisible" />
+
+            <LinearLayout
+                android:id="@+id/exo_top_bar_right"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layoutDirection="ltr">
+
+                <TextView
+                    android:id="@+id/speed_text"
+                    style="@style/PlayerControlTop"
+                    android:text="1x" />
+
+                <TextView
+                    android:id="@+id/quality_text"
+                    style="@style/PlayerControlTop"
+                    android:text="@string/hls" />
+
+                <ImageButton
+                    android:id="@+id/toggle_options"
+                    style="@style/PlayerControlTop"
+                    android:layout_marginTop="-.5dp"
+                    android:src="@drawable/ic_arrow_down"
+                    app:tint="@android:color/white" />
+
+            </LinearLayout>
 
         </LinearLayout>
 
-        <TextView
-            android:id="@+id/exo_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginHorizontal="10dp"
-            android:layout_weight="1"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="@android:color/white"
-            android:textSize="18sp"
-            android:visibility="invisible" />
-
         <LinearLayout
-            android:id="@+id/exo_top_bar_right"
+            android:id="@+id/advanced_options"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginEnd="10dp"
-            android:layoutDirection="ltr">
+            android:layout_gravity="right"
+            android:layout_marginTop="-10dp"
+            android:orientation="horizontal"
+            android:visibility="gone">
+
+            <ImageButton
+                android:id="@id/exo_subtitle"
+                style="@style/PlayerControlBottom" />
+
+            <ImageButton
+                android:id="@+id/repeat_toggle"
+                style="@style/PlayerControlTop"
+                android:src="@drawable/ic_repeat"
+                app:tint="@android:color/darker_gray" />
 
             <ImageView
                 android:id="@+id/aspect_ratio_button"
                 style="@style/PlayerControlTop"
-                android:layout_marginTop="-1dp"
-                android:scaleX=".9"
-                android:scaleY=".9"
                 android:src="@drawable/ic_aspect_ratio" />
 
-            <TextView
-                android:id="@+id/speed_text"
-                style="@style/PlayerControlTop"
-                android:text="1x" />
-
-            <TextView
-                android:id="@+id/quality_text"
-                style="@style/PlayerControlTop"
-                android:text="@string/hls" />
-
         </LinearLayout>
 
     </LinearLayout>
@@ -150,19 +182,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content">
 
-                <ImageButton
-                    android:id="@+id/repeat_toggle"
-                    style="@style/PlayerControlBottom"
-                    android:src="@drawable/ic_repeat"
-                    app:tint="@android:color/darker_gray" />
-
-                <ImageButton
-                    android:id="@id/exo_subtitle"
-                    style="@style/PlayerControlBottom" />
-
                 <ImageButton
                     android:id="@+id/fullscreen"
                     style="@style/PlayerControlBottom"
+                    android:layout_marginEnd="5dp"
                     android:src="@drawable/ic_fullscreen"
                     app:tint="@android:color/white" />
 
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index 892f10cbf..35811e6c4 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -379,7 +379,7 @@
             android:id="@+id/doubleTapOverlayLL"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginVertical="50dp">
+            android:layout_marginVertical="60dp">
 
             <!-- double tap rewind btn -->
             <FrameLayout