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 d6e3c2ed2..c529b8d16 100644
--- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
@@ -23,6 +23,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.constraintlayout.motion.widget.MotionLayout
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.net.toUri
 import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
@@ -718,6 +719,9 @@ class PlayerFragment : Fragment() {
                 params.height = videoSize.height / videoSize.width * params.width
                 binding.player.layoutParams = params
                 binding.player.requestLayout()
+                (binding.mainContainer.layoutParams as ConstraintLayout.LayoutParams).apply{
+                    matchConstraintPercentHeight = (videoSize.height / videoSize.width).toFloat()
+                }
             }
 
             @Deprecated(message = "Deprecated", level = DeprecationLevel.HIDDEN)
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index 104158e71..e5f62cab0 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -361,43 +361,43 @@
         app:layout_constraintBottom_toBottomOf="@id/main_container"
         app:layout_constraintStart_toStartOf="@id/main_container"
         app:layout_constraintTop_toTopOf="@id/main_container"
-        app:show_buffering="always" >
+        app:show_buffering="always">
 
         <FrameLayout
             android:id="@+id/forwardFL"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_gravity="center_vertical|end"
-            android:layout_weight="1">
+            android:layout_marginVertical="50dp">
 
             <ImageButton
                 android:id="@+id/forwardBTN"
                 android:layout_width="150dp"
-                android:layout_height="200dp"
+                android:layout_height="match_parent"
                 android:background="?android:selectableItemBackgroundBorderless"
-                android:src="@drawable/ic_forward"
                 android:clickable="false"
-                app:tint="@android:color/white"
-                android:visibility="invisible"/>
+                android:src="@drawable/ic_forward"
+                android:visibility="invisible"
+                app:tint="@android:color/white" />
 
         </FrameLayout>
 
         <FrameLayout
             android:id="@+id/rewindFL"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_gravity="center_vertical|start"
-            android:layout_weight="1">
+            android:layout_marginVertical="50dp">
 
             <ImageButton
                 android:id="@+id/rewindBTN"
                 android:layout_width="150dp"
-                android:layout_height="200dp"
+                android:layout_height="match_parent"
                 android:background="?android:selectableItemBackgroundBorderless"
-                android:src="@drawable/ic_rewind"
                 android:clickable="false"
-                app:tint="@android:color/white"
-                android:visibility="invisible"/>
+                android:src="@drawable/ic_rewind"
+                android:visibility="invisible"
+                app:tint="@android:color/white" />
 
         </FrameLayout>