diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index cf993ccbb..28a67173b 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -1550,22 +1550,16 @@ public class VideoDetailFragment
                     0);
         }
 
-        switch (info.getStreamType()) {
-            case LIVE_STREAM:
-            case AUDIO_LIVE_STREAM:
-                detailControlsDownload.setVisibility(View.GONE);
-                break;
-            default:
-                if (info.getAudioStreams().isEmpty()) {
-                    detailControlsBackground.setVisibility(View.GONE);
-                }
-                if (!info.getVideoStreams().isEmpty() || !info.getVideoOnlyStreams().isEmpty()) {
-                    break;
-                }
-                detailControlsPopup.setVisibility(View.GONE);
-                thumbnailPlayButton.setImageResource(R.drawable.ic_headset_shadow);
-                break;
-        }
+        detailControlsDownload.setVisibility(info.getStreamType() == StreamType.LIVE_STREAM
+                || info.getStreamType() == StreamType.AUDIO_LIVE_STREAM ? View.GONE : View.VISIBLE);
+        detailControlsBackground.setVisibility(info.getAudioStreams().isEmpty()
+                ? View.GONE : View.VISIBLE);
+
+        final boolean noVideoStreams =
+                info.getVideoStreams().isEmpty() && info.getVideoOnlyStreams().isEmpty();
+        detailControlsPopup.setVisibility(noVideoStreams ? View.GONE : View.VISIBLE);
+        thumbnailPlayButton.setImageResource(
+                noVideoStreams ? R.drawable.ic_headset_shadow : R.drawable.ic_play_arrow_shadow);
     }
 
     private void hideAgeRestrictedContent() {
diff --git a/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java b/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java
index 0aed3469f..c7fbb444b 100644
--- a/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java
@@ -103,6 +103,8 @@ public final class MainPlayer extends Service {
         playerImpl = new VideoPlayerImpl(this);
         playerImpl.setup(layout);
         playerImpl.shouldUpdateOnProgress = true;
+
+        NotificationUtil.getInstance().createNotificationAndStartForeground(playerImpl, this);
     }
 
     @Override
diff --git a/app/src/main/res/layout-large-land/fragment_video_detail.xml b/app/src/main/res/layout-large-land/fragment_video_detail.xml
index e2d18434d..9c0f03cb3 100644
--- a/app/src/main/res/layout-large-land/fragment_video_detail.xml
+++ b/app/src/main/res/layout-large-land/fragment_video_detail.xml
@@ -600,16 +600,16 @@
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:alpha="0.9"
-			android:paddingLeft="@dimen/video_item_search_padding"
-			android:paddingRight="@dimen/video_item_search_padding"
             android:descendantFocusability="blocksDescendants"
 			android:background="?attr/windowBackground" >
 
 		<ImageButton
 				android:id="@+id/overlay_thumbnail"
-				android:layout_width="50dp"
+				android:layout_width="85dp"
 				android:layout_height="60dp"
 				android:layout_alignParentStart="true"
+                android:paddingLeft="@dimen/video_item_search_padding"
+                android:paddingRight="@dimen/video_item_search_padding"
 				android:scaleType="fitCenter"
 				android:gravity="center_vertical"
 				android:contentDescription="@string/list_thumbnail_view_description"
@@ -622,8 +622,6 @@
 				android:layout_height="60dp"
 				android:gravity="center_vertical"
 				android:orientation="vertical"
-				android:paddingLeft="@dimen/video_item_search_padding"
-				android:paddingRight="@dimen/video_item_search_padding"
 				android:clickable="true"
 				android:focusable="true"
 				android:layout_toEndOf="@+id/overlay_thumbnail"
@@ -665,6 +663,7 @@
 				android:layout_height="60dp"
 				android:gravity="center_vertical"
 				android:paddingLeft="@dimen/video_item_search_padding"
+                android:paddingRight="@dimen/video_item_search_padding"
 				android:layout_alignParentEnd="true"
 				tools:ignore="RtlHardcoded">
 
diff --git a/app/src/main/res/layout-large-land/player.xml b/app/src/main/res/layout-large-land/player.xml
index c3f2e640c..23481f40b 100644
--- a/app/src/main/res/layout-large-land/player.xml
+++ b/app/src/main/res/layout-large-land/player.xml
@@ -101,7 +101,7 @@
                     android:clickable="true"
                     android:focusable="true"
                     android:scaleType="fitXY"
-                    app:srcCompat="?attr/ic_close"
+                    app:srcCompat="@drawable/ic_close_white_24dp"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     tools:ignore="ContentDescription,RtlHardcoded"
                     android:visibility="gone" />
@@ -483,7 +483,7 @@
                 android:focusable="true"
                 android:padding="10dp"
                 android:scaleType="fitXY"
-                app:srcCompat="@drawable/ic_close_white_24dp" />
+                app:srcCompat="?attr/ic_close" />
 
             <ImageButton
                 android:id="@+id/repeatButton"
diff --git a/app/src/main/res/layout/fragment_video_detail.xml b/app/src/main/res/layout/fragment_video_detail.xml
index e6c78585e..bf4f59a8c 100644
--- a/app/src/main/res/layout/fragment_video_detail.xml
+++ b/app/src/main/res/layout/fragment_video_detail.xml
@@ -574,11 +574,12 @@
 		android:background="?attr/windowBackground" >
 
 		<ImageButton
-			android:paddingLeft="@dimen/video_item_search_padding"
 			android:id="@+id/overlay_thumbnail"
-			android:layout_width="50dp"
+			android:layout_width="62dp"
 			android:layout_height="60dp"
 			android:layout_alignParentStart="true"
+            android:paddingLeft="@dimen/video_item_search_padding"
+            android:paddingRight="@dimen/video_item_search_padding"
 			android:scaleType="fitCenter"
 			android:gravity="center_vertical"
 			android:contentDescription="@string/list_thumbnail_view_description"
@@ -591,8 +592,6 @@
 			android:layout_height="60dp"
 			android:gravity="center_vertical"
 			android:orientation="vertical"
-			android:paddingLeft="@dimen/video_item_search_padding"
-			android:paddingRight="@dimen/video_item_search_padding"
 			android:clickable="true"
 			android:focusable="true"
 			android:layout_toEndOf="@+id/overlay_thumbnail"
diff --git a/app/src/main/res/layout/player.xml b/app/src/main/res/layout/player.xml
index a2886ef35..f257c207b 100644
--- a/app/src/main/res/layout/player.xml
+++ b/app/src/main/res/layout/player.xml
@@ -99,7 +99,7 @@
                         android:clickable="true"
                         android:focusable="true"
                         android:scaleType="fitXY"
-                        app:srcCompat="?attr/ic_close"
+                        app:srcCompat="@drawable/ic_close_white_24dp"
                         android:background="?attr/selectableItemBackgroundBorderless"
                         tools:ignore="ContentDescription,RtlHardcoded"
                         android:visibility="gone" />
@@ -479,7 +479,7 @@
                 android:focusable="true"
                 android:padding="10dp"
                 android:scaleType="fitXY"
-                app:srcCompat="@drawable/ic_close_white_24dp" />
+                app:srcCompat="?attr/ic_close" />
 
             <ImageButton
                 android:id="@+id/repeatButton"