diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
index 309abb79..8c4199bb 100644
--- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
+++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
@@ -1144,6 +1144,7 @@ class VideoDetailView : ConstraintLayout {
        if(videoDetail is VideoLocal) {
             videoLocal = videoDetail;
             video = videoDetail;
+            this.video = video;
             val videoTask = StatePlatform.instance.getContentDetails(videoDetail.url);
             videoTask.invokeOnCompletion { ex ->
                 if(ex != null) {
diff --git a/app/src/main/res/drawable/ic_queue.xml b/app/src/main/res/drawable/ic_queue.xml
new file mode 100644
index 00000000..32e0b619
--- /dev/null
+++ b/app/src/main/res/drawable/ic_queue.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M120,640L120,560L440,560L440,640L120,640ZM120,480L120,400L600,400L600,480L120,480ZM120,320L120,240L600,240L600,320L120,320ZM640,840L640,520L880,680L640,840Z"/>
+</vector>
diff --git a/app/src/main/res/layout/list_video_preview.xml b/app/src/main/res/layout/list_video_preview.xml
index ac93a071..1f661dd9 100644
--- a/app/src/main/res/layout/list_video_preview.xml
+++ b/app/src/main/res/layout/list_video_preview.xml
@@ -128,7 +128,7 @@
                 android:layout_marginTop="2dp"
                 android:gravity="top"
                 android:orientation="horizontal"
-                android:paddingBottom="5dp">
+                android:paddingBottom="0dp">
 
                 <com.futo.platformplayer.views.others.CreatorThumbnail
                     android:id="@+id/creator_thumbnail"
@@ -179,6 +179,7 @@
                         android:gravity="center_vertical"
                         android:maxLines="1"
                         android:textColor="@color/gray_e0"
+                        android:layout_marginBottom="5dp"
                         android:textSize="12dp"
                         tools:text="57K views • 1 day ago" />
                 </LinearLayout>
diff --git a/app/src/main/res/layout/list_video_thumbnail.xml b/app/src/main/res/layout/list_video_thumbnail.xml
index bc69e9da..531f2034 100644
--- a/app/src/main/res/layout/list_video_thumbnail.xml
+++ b/app/src/main/res/layout/list_video_thumbnail.xml
@@ -140,37 +140,22 @@
             android:layout_marginStart="6dp"
             android:layout_marginEnd="6dp">
 
-            <ImageButton
-                android:id="@+id/button_add_to_queue"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="1dp"
-                android:paddingTop="7dp"
-                android:paddingStart="6dp"
-                android:paddingEnd="5dp"
-                android:paddingBottom="3dp"
-                app:srcCompat="@drawable/ic_queue_16dp"
-                android:background="@drawable/edit_text_background"
-                android:contentDescription="@string/add_to_queue"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent" />
-
             <LinearLayout
                 android:id="@+id/button_add_to"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="27dp"
                 android:orientation="horizontal"
                 android:background="@drawable/edit_text_background"
-                android:layout_marginStart="4dp"
                 android:gravity="center_vertical"
-                android:padding="4dp"
-                app:layout_constraintLeft_toRightOf="@id/button_add_to_queue"
+                android:padding="5dp"
+                app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent">
                 <ImageButton
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="4dp"
                     app:srcCompat="@drawable/ic_add_white_8dp"
+                    android:background="@color/transparent"
                     android:layout_marginStart="4dp"
                     android:contentDescription="@string/options" />
 
@@ -185,6 +170,23 @@
                     android:layout_marginEnd="4dp"/>
             </LinearLayout>
 
+
+            <ImageButton
+                android:id="@+id/button_add_to_queue"
+                android:layout_width="wrap_content"
+                android:layout_height="27dp"
+                android:src="@drawable/ic_queue"
+                android:paddingTop="4dp"
+                android:paddingBottom="2dp"
+                android:paddingLeft="10dp"
+                android:paddingRight="7dp"
+                android:layout_marginLeft="7dp"
+                android:scaleType="fitCenter"
+                android:background="@drawable/edit_text_background"
+                android:contentDescription="@string/add_to_queue"
+                app:layout_constraintLeft_toRightOf="@id/button_add_to"
+                app:layout_constraintBottom_toBottomOf="parent" />
+
             <TextView
                 android:id="@+id/text_video_name"
                 android:layout_width="fill_parent"
@@ -195,8 +197,9 @@
                 android:textSize="13dp"
                 android:textColor="@color/white"
                 android:fontFamily="@font/inter_light"
-                tools:text="Legendary grant recipient: Marvin Wißfeld of MicroG Very loong title"
+                tools:text="Legendary grant recipient: Marvin Wißfeld of MicroG Very loong title fff"
                 android:maxLines="2"
+                android:ellipsize="end"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintRight_toRightOf="parent" />
diff --git a/app/src/main/res/layout/list_video_thumbnail_nested.xml b/app/src/main/res/layout/list_video_thumbnail_nested.xml
index cd2afb51..facd6960 100644
--- a/app/src/main/res/layout/list_video_thumbnail_nested.xml
+++ b/app/src/main/res/layout/list_video_thumbnail_nested.xml
@@ -174,37 +174,23 @@
             android:layout_marginStart="6dp"
             android:layout_marginEnd="6dp">
 
-            <ImageButton
-                android:id="@+id/button_add_to_queue"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="1dp"
-                android:paddingTop="7dp"
-                android:paddingStart="6dp"
-                android:paddingEnd="5dp"
-                android:paddingBottom="3dp"
-                app:srcCompat="@drawable/ic_queue_16dp"
-                android:background="@drawable/edit_text_background"
-                android:contentDescription="@string/add_to_queue"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent" />
 
             <LinearLayout
                 android:id="@+id/button_add_to"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="27dp"
                 android:orientation="horizontal"
                 android:background="@drawable/edit_text_background"
-                android:layout_marginStart="4dp"
                 android:gravity="center_vertical"
-                android:padding="4dp"
-                app:layout_constraintLeft_toRightOf="@id/button_add_to_queue"
+                android:padding="5dp"
+                app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent">
                 <ImageButton
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="4dp"
                     app:srcCompat="@drawable/ic_add_white_8dp"
+                    android:background="@color/transparent"
                     android:layout_marginStart="4dp"
                     android:contentDescription="@string/options" />
 
@@ -219,6 +205,23 @@
                     android:layout_marginEnd="4dp"/>
             </LinearLayout>
 
+
+            <ImageButton
+                android:id="@+id/button_add_to_queue"
+                android:layout_width="wrap_content"
+                android:layout_height="27dp"
+                android:src="@drawable/ic_queue"
+                android:paddingTop="4dp"
+                android:paddingBottom="2dp"
+                android:paddingLeft="10dp"
+                android:paddingRight="7dp"
+                android:layout_marginLeft="7dp"
+                android:scaleType="fitCenter"
+                android:background="@drawable/edit_text_background"
+                android:contentDescription="@string/add_to_queue"
+                app:layout_constraintLeft_toRightOf="@id/button_add_to"
+                app:layout_constraintBottom_toBottomOf="parent" />
+
             <TextView
                 android:id="@+id/text_video_name"
                 android:layout_width="fill_parent"
diff --git a/app/src/stable/assets/sources/youtube b/app/src/stable/assets/sources/youtube
index 13551ab6..058e3752 160000
--- a/app/src/stable/assets/sources/youtube
+++ b/app/src/stable/assets/sources/youtube
@@ -1 +1 @@
-Subproject commit 13551ab67fc8fb1899b5bcbfdec750855b154790
+Subproject commit 058e37525756c285848f0774e4e3eb6f65282280
diff --git a/app/src/unstable/assets/sources/youtube b/app/src/unstable/assets/sources/youtube
index 13551ab6..058e3752 160000
--- a/app/src/unstable/assets/sources/youtube
+++ b/app/src/unstable/assets/sources/youtube
@@ -1 +1 @@
-Subproject commit 13551ab67fc8fb1899b5bcbfdec750855b154790
+Subproject commit 058e37525756c285848f0774e4e3eb6f65282280