diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
index 354292108..0e3867035 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
@@ -84,10 +84,9 @@ public class VideoItemDetailFragment extends Fragment {
     private VideoInfo currentVideoInfo = null;
     private boolean showNextVideoItem = false;
 
-    private ImageView thumbnailView;
     private View thumbnailWindowLayout;
     private FloatingActionButton playVideoButton;
-    private Point initialThumbnailPos = new Point(0, 0);
+    private final Point initialThumbnailPos = new Point(0, 0);
 
     public interface OnInvokeCreateOptionsMenuListener {
         void createOptionsMenu();
@@ -425,7 +424,7 @@ public class VideoItemDetailFragment extends Fragment {
                 }
             });
 
-            thumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
+            ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
             thumbnailView.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
                 // This is used to synchronize the thumbnailWindowButton and the playVideoButton
                 // inside the ScrollView with the actual size of the thumbnail.
@@ -437,6 +436,7 @@ public class VideoItemDetailFragment extends Fragment {
                     thumbnailWindowLayout.setLayoutParams(newWindowLayoutParams);
 
 
+                    //noinspection SuspiciousNameCombination
                     initialThumbnailPos.set(top, left);
 
                 }
diff --git a/app/src/main/res/layout-v21/fragment_videoitem_detail.xml b/app/src/main/res/layout-v21/fragment_videoitem_detail.xml
index 04cb40c8c..82c67ad4b 100644
--- a/app/src/main/res/layout-v21/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout-v21/fragment_videoitem_detail.xml
@@ -8,8 +8,7 @@
     style="?android:attr/textAppearanceLarge"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/videoitem_detail"
-    android:background="@color/background_gray">
+    android:id="@+id/videoitem_detail">
 
     <ImageView android:id="@+id/detailThumbnailView"
         android:contentDescription="@string/detailThumbnailViewDescription"
@@ -17,7 +16,6 @@
         android:layout_height="wrap_content"
         android:scaleType="fitCenter"
         android:adjustViewBounds="true"
-        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
         android:background="@android:color/black"
@@ -80,7 +78,6 @@
                 <TextView android:id="@+id/detailVideoTitleView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
                     android:textStyle="bold"
                     android:paddingBottom="3dp"
@@ -92,7 +89,6 @@
                     android:layout_width="80dp"
                     android:layout_height="80dp"
                     android:layout_below="@id/detailVideoTitleView"
-                    android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
                     android:src="@drawable/buddy" />
 
@@ -100,7 +96,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/detailUploaderThumbnailView"
-                    android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
                     android:textStyle="bold"
                     android:textSize="@dimen/text_video_uploader_size"
@@ -111,7 +106,6 @@
                     android:layout_height="wrap_content"
                     android:paddingBottom="3dp"
                     android:layout_below="@id/detailVideoTitleView"
-                    android:layout_alignParentRight="true"
                     android:layout_alignParentEnd="true"
                     android:textSize="@dimen/text_video_views_size"
                     android:textAppearance="?android:attr/textAppearanceLarge" />
@@ -120,7 +114,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/detailViewCountView"
-                    android:layout_alignParentRight="true"
                     android:layout_alignParentEnd="true"
                     android:textSize="@dimen/text_video_like_size"
                     android:paddingRight="5dp"
@@ -132,7 +125,6 @@
                     android:layout_width="30dp"
                     android:layout_height="15dp"
                     android:layout_below="@id/detailViewCountView"
-                    android:layout_toLeftOf="@id/detailThumbsDownCountView"
                     android:layout_toStartOf="@id/detailThumbsDownCountView"
                     android:paddingRight="5dp"
                     android:paddingLeft="5dp"
@@ -142,7 +134,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/detailViewCountView"
-                    android:layout_toLeftOf="@id/detailThumbsDownImgView"
                     android:layout_toStartOf="@id/detailThumbsDownImgView"
                     android:paddingRight="5dp"
                     android:paddingLeft="5dp"
@@ -154,7 +145,6 @@
                     android:layout_width="30dp"
                     android:layout_height="15dp"
                     android:layout_below="@id/detailViewCountView"
-                    android:layout_toLeftOf="@id/detailThumbsUpCountView"
                     android:layout_toStartOf="@id/detailThumbsUpImgView"
                     android:paddingRight="5dp"
                     android:paddingLeft="5dp"
@@ -164,7 +154,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/detailUploaderView"
-                    android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
                     android:textSize="@dimen/text_video_upload_date_size"
                     android:textAppearance="?android:attr/textAppearanceLarge" />
@@ -173,7 +162,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/detailUploadDateView"
-                    android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
                     android:textSize="@dimen/text_video_description_size"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -192,7 +180,6 @@
                     <TextView android:id="@+id/detailNextVideoTitle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
                         android:textSize="@dimen/text_video_upload_date_size"
                         android:textAppearance="?android:attr/textAppearanceMedium"
diff --git a/app/src/main/res/layout/fragment_videoitem_detail.xml b/app/src/main/res/layout/fragment_videoitem_detail.xml
index 9d56b5340..31f2ae0a3 100644
--- a/app/src/main/res/layout/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout/fragment_videoitem_detail.xml
@@ -8,8 +8,7 @@
     style="?android:attr/textAppearanceLarge"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/videoitem_detail"
-    android:background="@color/background_gray">
+    android:id="@+id/videoitem_detail">
 
     <ImageView android:id="@+id/detailThumbnailView"
         android:contentDescription="@string/detailThumbnailViewDescription"
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 6c4c1939d..aeea78616 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -7,6 +7,7 @@
         <item name="android:colorPrimaryDark">@color/primaryColorDarkYoutube</item>
         <item name="colorAccent">@color/accentColorYoutube</item>
         <item name="android:colorAccent">@color/accentColorYoutube</item>
+        <item name="android:windowBackground">@color/background_gray</item>
     </style>
 
     <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid" >
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a6ca5f74d..3acc47140 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,6 +6,7 @@
         <item name="colorPrimary">@color/primaryColorYoutube</item>
         <item name="colorPrimaryDark">@color/primaryColorDarkYoutube</item>
         <item name="colorAccent">@color/accentColorYoutube</item>
+        <item name="android:windowBackground">@color/background_gray</item>
     </style>
 
     <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid" >