diff --git a/.gitignore b/.gitignore
index f6e554c09..42caadb93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /captures
 /app/app.iml
 /.idea
+/*.iml
diff --git a/app/src/main/res/drawable/durationback.xml b/app/src/main/res/drawable/durationback.xml
deleted file mode 100644
index 5acfec6c6..000000000
--- a/app/src/main/res/drawable/durationback.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-    <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-        <solid android:color="#000000" />
-        <stroke android:width="1dip" android:color="#888"/>
-    </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_videoitem_detail.xml b/app/src/main/res/layout-land/fragment_videoitem_detail.xml
index c0c4938d1..0ff3bfe19 100644
--- a/app/src/main/res/layout-land/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout-land/fragment_videoitem_detail.xml
@@ -3,8 +3,9 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    style="?android:attr/textAppearanceLarge"
     tools:context=".VideoItemDetailFragment"
+    android:textIsSelectable="true"
+    style="?android:attr/textAppearanceLarge"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/videoitem_detail">
@@ -19,125 +20,131 @@
         android:id="@+id/detailMainContent"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:textIsSelectable="true"
         android:visibility="invisible">
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="16dp">
+            android:layout_height="wrap_content">
 
-            <ImageView android:id="@+id/detailThumbnailView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentTop="true"
-                android:adjustViewBounds="true"
-                android:src="@drawable/dummy_thumbnail"/>
+            <RelativeLayout android:id="@+id/detailVideoInfo"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
-            <TextView android:id="@+id/detailVideoTitleView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/detailThumbnailView"
-                android:layout_alignParentLeft="true"
-                android:paddingLeft="6dp"
-                android:paddingRight="6dp"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="Bla blabla !!!"/>
+                <ImageView android:id="@+id/detailThumbnailView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:scaleType="centerInside"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentTop="true"
+                    android:adjustViewBounds="true"
+                    android:src="@drawable/dummy_thumbnail"/>
 
-            <ImageView android:id="@+id/detailUploaderThumbnailView"
-                android:layout_width="80dp"
-                android:layout_height="100dp"
-                android:paddingTop="25dp"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
-                android:layout_below="@id/detailVideoTitleView"
-                android:layout_alignParentLeft="true"
-                android:src="@drawable/buddy" />
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailThumbnailView"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp"
+                    android:paddingRight="10dp"
+                    android:paddingLeft="10dp">
 
-            <TextView android:id="@+id/detailUploaderView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/detailUploaderThumbnailView"
-                android:layout_alignParentLeft="true"
-                android:paddingLeft="6dp"
-                android:paddingRight="6dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="Herr von Gurken" />
+                    <TextView android:id="@+id/detailVideoTitleView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:textStyle="bold"
+                        android:paddingBottom="5dp"
+                        android:textSize="@dimen/text_video_title_land_size"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="Video title placeholder"/>
 
-            <View android:id="@+id/textSeperationLine"
-                android:layout_width="fill_parent"
-                android:layout_height="1dp"
-                android:background="@android:color/darker_gray"
-                android:layout_below="@id/detailUploaderView"
-                android:paddingTop="20dp"
-                android:layout_alignParentLeft="true" />
+                    <ImageView android:id="@+id/detailUploaderThumbnailView"
+                        android:layout_width="100dp"
+                        android:layout_height="100dp"
+                        android:layout_below="@id/detailVideoTitleView"
+                        android:layout_alignParentLeft="true"
+                        android:src="@drawable/buddy" />
 
-            <TextView android:id="@+id/detailViewCountView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/detailVideoTitleView"
-                android:layout_alignParentRight="true"
-                android:paddingTop="70dp"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="1.000.115 views" />
+                    <TextView android:id="@+id/detailUploaderView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/detailUploaderThumbnailView"
+                        android:layout_alignParentLeft="true"
+                        android:textStyle="bold"
+                        android:textSize="@dimen/text_video_uploader_land_size"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="username" />
 
-            <TextView android:id="@+id/detailThumbsDownCountView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/detailViewCountView"
-                android:layout_alignParentRight="true"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="5.000" />
+                    <TextView android:id="@+id/detailViewCountView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingBottom="5dp"
+                        android:layout_below="@id/detailVideoTitleView"
+                        android:layout_alignParentRight="true"
+                        android:textSize="@dimen/text_video_views_land_size"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="81,754 views" />
 
-            <ImageView android:id="@+id/detailThumbsDownImgView"
-                android:layout_width="40dp"
-                android:layout_height="20dp"
-                android:layout_below="@id/detailViewCountView"
-                android:layout_toLeftOf="@id/detailThumbsDownCountView"
-                android:src="@drawable/thumbs_down" />
+                    <TextView android:id="@+id/detailThumbsDownCountView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/detailViewCountView"
+                        android:layout_alignParentRight="true"
+                        android:textSize="@dimen/text_video_like_land_size"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:text="1,000" />
 
-            <TextView android:id="@+id/detailThumbsUpCountView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/detailViewCountView"
-                android:layout_toLeftOf="@id/detailThumbsDownImgView"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="111.111" />
+                    <ImageView android:id="@+id/detailThumbsDownImgView"
+                        android:layout_width="40dp"
+                        android:layout_height="20dp"
+                        android:layout_below="@id/detailViewCountView"
+                        android:layout_toLeftOf="@id/detailThumbsDownCountView"
+                        android:paddingRight="10dp"
+                        android:src="@drawable/thumbs_down" />
 
-            <ImageView android:id="@+id/detailThumbsUpImgView"
-                android:layout_width="40dp"
-                android:layout_height="20dp"
-                android:layout_below="@id/detailViewCountView"
-                android:layout_toLeftOf="@id/detailThumbsUpCountView"
-                android:src="@drawable/thumbs_up" />
+                    <TextView android:id="@+id/detailThumbsUpCountView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/detailViewCountView"
+                        android:layout_toLeftOf="@id/detailThumbsDownImgView"
+                        android:paddingRight="10dp"
+                        android:textSize="@dimen/text_video_like_land_size"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:text="200" />
 
-            <TextView android:id="@+id/detailUploadDateView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/detailUploaderView"
-                android:layout_alignParentLeft="true"
-                android:paddingLeft="6dp"
-                android:paddingRight="6dp"
-                android:paddingTop="20dp"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="Uploaded at: 45.64.1285" />
+                    <ImageView android:id="@+id/detailThumbsUpImgView"
+                        android:layout_width="40dp"
+                        android:layout_height="20dp"
+                        android:layout_below="@id/detailViewCountView"
+                        android:paddingRight="10dp"
+                        android:layout_toLeftOf="@id/detailThumbsUpCountView"
+                        android:src="@drawable/thumbs_up" />
 
-            <TextView android:id="@+id/detailDescriptionView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/detailUploadDateView"
-                android:layout_alignParentLeft="true"
-                android:paddingLeft="6dp"
-                android:paddingRight="6dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmodtempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. "
-                />
+                    <TextView android:id="@+id/detailUploadDateView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/detailUploaderView"
+                        android:layout_alignParentLeft="true"
+                        android:textSize="@dimen/text_video_upload_date_land_size"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="Uploaded at Jan 01 1975" />
 
+                    <TextView android:id="@+id/detailDescriptionView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/detailUploadDateView"
+                        android:layout_alignParentLeft="true"
+                        android:textSize="@dimen/text_video_description_land_size"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmodtempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. "
+                        />
+
+                </RelativeLayout>
+            </RelativeLayout>
             <RelativeLayout android:id="@+id/detailNextVideoRootLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/detailDescriptionView" >
+                android:layout_below="@id/detailVideoInfo" >
 
                 <TextView android:id="@+id/detailNextVideoTitle"
                     android:layout_width="wrap_content"
@@ -152,19 +159,10 @@
                     android:text="@string/nextVideoTitle"
                     />
 
-                <View android:id="@+id/detailNextVideoSeperationLine"
-                    android:layout_width="fill_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginLeft="6dp"
-                    android:layout_marginRight="6dp"
-                    android:background="@android:color/darker_gray"
-                    android:layout_below="@id/detailNextVideoTitle"
-                    android:layout_alignParentLeft="true" />
-
                 <RelativeLayout android:id="@+id/detailNextVidButtonAndContantLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_below="@id/detailNextVideoSeperationLine">
+                    android:layout_below="@id/detailNextVideoTitle">
                     <FrameLayout
                         android:id="@+id/detailNextVideoFrame"
                         android:layout_width="match_parent"
@@ -178,14 +176,6 @@
                         android:background="?attr/selectableItemBackground"/>
                 </RelativeLayout>
 
-                <View android:id="@+id/detailNextVideoSeperationLineEnd"
-                    android:layout_width="fill_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginLeft="6dp"
-                    android:layout_marginRight="6dp"
-                    android:background="@android:color/darker_gray"
-                    android:layout_below="@id/detailNextVidButtonAndContantLayout"
-                    android:layout_alignParentLeft="true" />
             </RelativeLayout>
 
             <Button android:id="@+id/detailShowSimilarButton"
@@ -195,12 +185,6 @@
                 android:layout_marginRight="6dp"
                 android:layout_below="@id/detailNextVideoRootLayout"
                 android:text="@string/showSimilarVideosButtonText"/>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="90dp"
-                android:layout_below="@id/detailShowSimilarButton"/>
-
         </RelativeLayout>
     </ScrollView>
 
diff --git a/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml b/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml
index c0c4938d1..33edf8ab9 100644
--- a/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml
@@ -3,8 +3,9 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    style="?android:attr/textAppearanceLarge"
     tools:context=".VideoItemDetailFragment"
+    android:textIsSelectable="true"
+    style="?android:attr/textAppearanceLarge"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/videoitem_detail">
@@ -19,125 +20,131 @@
         android:id="@+id/detailMainContent"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:textIsSelectable="true"
         android:visibility="invisible">
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="16dp">
+            android:layout_height="wrap_content">
 
-            <ImageView android:id="@+id/detailThumbnailView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentTop="true"
-                android:adjustViewBounds="true"
-                android:src="@drawable/dummy_thumbnail"/>
+            <RelativeLayout android:id="@+id/detailVideoInfo"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
-            <TextView android:id="@+id/detailVideoTitleView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/detailThumbnailView"
-                android:layout_alignParentLeft="true"
-                android:paddingLeft="6dp"
-                android:paddingRight="6dp"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="Bla blabla !!!"/>
+                <ImageView android:id="@+id/detailThumbnailView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:scaleType="centerInside"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentTop="true"
+                    android:adjustViewBounds="true"
+                    android:src="@drawable/dummy_thumbnail"/>
 
-            <ImageView android:id="@+id/detailUploaderThumbnailView"
-                android:layout_width="80dp"
-                android:layout_height="100dp"
-                android:paddingTop="25dp"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
-                android:layout_below="@id/detailVideoTitleView"
-                android:layout_alignParentLeft="true"
-                android:src="@drawable/buddy" />
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailThumbnailView"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp"
+                    android:paddingRight="10dp"
+                    android:paddingLeft="10dp">
 
-            <TextView android:id="@+id/detailUploaderView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/detailUploaderThumbnailView"
-                android:layout_alignParentLeft="true"
-                android:paddingLeft="6dp"
-                android:paddingRight="6dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="Herr von Gurken" />
+                    <TextView android:id="@+id/detailVideoTitleView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:textStyle="bold"
+                        android:paddingBottom="5dp"
+                        android:textSize="@dimen/text_video_title_sw600dp_size"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="Video title placeholder"/>
 
-            <View android:id="@+id/textSeperationLine"
-                android:layout_width="fill_parent"
-                android:layout_height="1dp"
-                android:background="@android:color/darker_gray"
-                android:layout_below="@id/detailUploaderView"
-                android:paddingTop="20dp"
-                android:layout_alignParentLeft="true" />
+                    <ImageView android:id="@+id/detailUploaderThumbnailView"
+                        android:layout_width="100dp"
+                        android:layout_height="100dp"
+                        android:layout_below="@id/detailVideoTitleView"
+                        android:layout_alignParentLeft="true"
+                        android:src="@drawable/buddy" />
 
-            <TextView android:id="@+id/detailViewCountView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/detailVideoTitleView"
-                android:layout_alignParentRight="true"
-                android:paddingTop="70dp"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="1.000.115 views" />
+                    <TextView android:id="@+id/detailUploaderView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/detailUploaderThumbnailView"
+                        android:layout_alignParentLeft="true"
+                        android:textStyle="bold"
+                        android:textSize="@dimen/text_video_uploader_sw600dp_size"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="username" />
 
-            <TextView android:id="@+id/detailThumbsDownCountView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/detailViewCountView"
-                android:layout_alignParentRight="true"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="5.000" />
+                    <TextView android:id="@+id/detailViewCountView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingBottom="5dp"
+                        android:layout_below="@id/detailVideoTitleView"
+                        android:layout_alignParentRight="true"
+                        android:textSize="@dimen/text_video_views_sw600dp_size"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="81,754 views" />
 
-            <ImageView android:id="@+id/detailThumbsDownImgView"
-                android:layout_width="40dp"
-                android:layout_height="20dp"
-                android:layout_below="@id/detailViewCountView"
-                android:layout_toLeftOf="@id/detailThumbsDownCountView"
-                android:src="@drawable/thumbs_down" />
+                    <TextView android:id="@+id/detailThumbsDownCountView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/detailViewCountView"
+                        android:layout_alignParentRight="true"
+                        android:textSize="@dimen/text_video_like_sw600dp_size"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:text="1,000" />
 
-            <TextView android:id="@+id/detailThumbsUpCountView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/detailViewCountView"
-                android:layout_toLeftOf="@id/detailThumbsDownImgView"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="111.111" />
+                    <ImageView android:id="@+id/detailThumbsDownImgView"
+                        android:layout_width="40dp"
+                        android:layout_height="20dp"
+                        android:layout_below="@id/detailViewCountView"
+                        android:layout_toLeftOf="@id/detailThumbsDownCountView"
+                        android:paddingRight="10dp"
+                        android:src="@drawable/thumbs_down" />
 
-            <ImageView android:id="@+id/detailThumbsUpImgView"
-                android:layout_width="40dp"
-                android:layout_height="20dp"
-                android:layout_below="@id/detailViewCountView"
-                android:layout_toLeftOf="@id/detailThumbsUpCountView"
-                android:src="@drawable/thumbs_up" />
+                    <TextView android:id="@+id/detailThumbsUpCountView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/detailViewCountView"
+                        android:layout_toLeftOf="@id/detailThumbsDownImgView"
+                        android:paddingRight="10dp"
+                        android:textSize="@dimen/text_video_like_sw600dp_size"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:text="200" />
 
-            <TextView android:id="@+id/detailUploadDateView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/detailUploaderView"
-                android:layout_alignParentLeft="true"
-                android:paddingLeft="6dp"
-                android:paddingRight="6dp"
-                android:paddingTop="20dp"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="Uploaded at: 45.64.1285" />
+                    <ImageView android:id="@+id/detailThumbsUpImgView"
+                        android:layout_width="40dp"
+                        android:layout_height="20dp"
+                        android:layout_below="@id/detailViewCountView"
+                        android:paddingRight="10dp"
+                        android:layout_toLeftOf="@id/detailThumbsUpCountView"
+                        android:src="@drawable/thumbs_up" />
 
-            <TextView android:id="@+id/detailDescriptionView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/detailUploadDateView"
-                android:layout_alignParentLeft="true"
-                android:paddingLeft="6dp"
-                android:paddingRight="6dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmodtempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. "
-                />
+                    <TextView android:id="@+id/detailUploadDateView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/detailUploaderView"
+                        android:layout_alignParentLeft="true"
+                        android:textSize="@dimen/text_video_upload_date_sw600dp_size"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="Uploaded at Jan 01 1975" />
 
+                    <TextView android:id="@+id/detailDescriptionView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/detailUploadDateView"
+                        android:layout_alignParentLeft="true"
+                        android:textSize="@dimen/text_video_description_sw600dp_size"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmodtempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. "
+                        />
+
+                </RelativeLayout>
+            </RelativeLayout>
             <RelativeLayout android:id="@+id/detailNextVideoRootLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/detailDescriptionView" >
+                android:layout_below="@id/detailVideoInfo" >
 
                 <TextView android:id="@+id/detailNextVideoTitle"
                     android:layout_width="wrap_content"
@@ -152,19 +159,10 @@
                     android:text="@string/nextVideoTitle"
                     />
 
-                <View android:id="@+id/detailNextVideoSeperationLine"
-                    android:layout_width="fill_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginLeft="6dp"
-                    android:layout_marginRight="6dp"
-                    android:background="@android:color/darker_gray"
-                    android:layout_below="@id/detailNextVideoTitle"
-                    android:layout_alignParentLeft="true" />
-
                 <RelativeLayout android:id="@+id/detailNextVidButtonAndContantLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_below="@id/detailNextVideoSeperationLine">
+                    android:layout_below="@id/detailNextVideoTitle">
                     <FrameLayout
                         android:id="@+id/detailNextVideoFrame"
                         android:layout_width="match_parent"
@@ -178,16 +176,7 @@
                         android:background="?attr/selectableItemBackground"/>
                 </RelativeLayout>
 
-                <View android:id="@+id/detailNextVideoSeperationLineEnd"
-                    android:layout_width="fill_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginLeft="6dp"
-                    android:layout_marginRight="6dp"
-                    android:background="@android:color/darker_gray"
-                    android:layout_below="@id/detailNextVidButtonAndContantLayout"
-                    android:layout_alignParentLeft="true" />
             </RelativeLayout>
-
             <Button android:id="@+id/detailShowSimilarButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -195,12 +184,6 @@
                 android:layout_marginRight="6dp"
                 android:layout_below="@id/detailNextVideoRootLayout"
                 android:text="@string/showSimilarVideosButtonText"/>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="90dp"
-                android:layout_below="@id/detailShowSimilarButton"/>
-
         </RelativeLayout>
     </ScrollView>
 
diff --git a/app/src/main/res/layout/fragment_videoitem_detail.xml b/app/src/main/res/layout/fragment_videoitem_detail.xml
index 698883608..f8e3224c0 100644
--- a/app/src/main/res/layout/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout/fragment_videoitem_detail.xml
@@ -26,152 +26,145 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <ImageView android:id="@+id/detailThumbnailView"
+            <RelativeLayout android:id="@+id/detailVideoInfo"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:scaleType="centerInside"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentTop="true"
-                android:adjustViewBounds="true"
-                android:src="@drawable/dummy_thumbnail"/>
+                android:layout_height="wrap_content">
 
-            <TextView android:id="@+id/detailVideoTitleView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/detailThumbnailView"
-                android:layout_alignParentLeft="true"
-                android:paddingLeft="6dp"
-                android:paddingRight="6dp"
-                android:paddingBottom="0dp"
-                android:paddingTop="3dp"
-                android:textStyle="bold"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="Video title placeholder"/>
+                <ImageView android:id="@+id/detailThumbnailView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:scaleType="centerInside"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentTop="true"
+                    android:adjustViewBounds="true"
+                    android:src="@drawable/dummy_thumbnail"/>
 
-            <ImageView android:id="@+id/detailUploaderThumbnailView"
-                android:layout_width="85dp"
-                android:layout_height="100dp"
-                android:paddingTop="0dp"
-                android:paddingLeft="2dp"
-                android:paddingRight="2dp"
-                android:layout_below="@id/detailVideoTitleView"
-                android:layout_alignParentLeft="true"
-                android:src="@drawable/buddy" />
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detailThumbnailView"
+                    android:paddingTop="5dp"
+                    android:paddingBottom="5dp"
+                    android:paddingRight="5dp"
+                    android:paddingLeft="5dp">
 
-            <TextView android:id="@+id/detailUploaderView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/detailUploaderThumbnailView"
-                android:layout_alignParentLeft="true"
-                android:paddingLeft="6dp"
-                android:paddingRight="6dp"
-                android:textStyle="bold"
-                android:textSize="@dimen/text_video_uploader_size"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="username" />
+                    <TextView android:id="@+id/detailVideoTitleView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:textStyle="bold"
+                        android:paddingBottom="3dp"
+                        android:textSize="@dimen/text_video_title_size"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="Video title placeholder"/>
 
-            <TextView android:id="@+id/detailViewCountView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingTop="6dp"
-                android:layout_below="@id/detailVideoTitleView"
-                android:layout_alignParentRight="true"
-                android:paddingRight="16dp"
-                android:paddingLeft="16dp"
-                android:textSize="@dimen/text_video_visits_size"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="81,754 views" />
+                    <ImageView android:id="@+id/detailUploaderThumbnailView"
+                        android:layout_width="80dp"
+                        android:layout_height="80dp"
+                        android:layout_below="@id/detailVideoTitleView"
+                        android:layout_alignParentLeft="true"
+                        android:src="@drawable/buddy" />
 
-            <TextView android:id="@+id/detailThumbsDownCountView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/detailViewCountView"
-                android:layout_alignParentRight="true"
-                android:paddingRight="16dp"
-                android:paddingLeft="16dp"
-                android:textSize="@dimen/text_video_like_size"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="100" />
+                    <TextView android:id="@+id/detailUploaderView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/detailUploaderThumbnailView"
+                        android:layout_alignParentLeft="true"
+                        android:textStyle="bold"
+                        android:textSize="@dimen/text_video_uploader_size"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="username" />
 
-            <ImageView android:id="@+id/detailThumbsDownImgView"
-                android:layout_width="40dp"
-                android:layout_height="20dp"
-                android:layout_below="@id/detailViewCountView"
-                android:layout_toLeftOf="@id/detailThumbsDownCountView"
-                android:src="@drawable/thumbs_down" />
+                    <TextView android:id="@+id/detailViewCountView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingBottom="3dp"
+                        android:layout_below="@id/detailVideoTitleView"
+                        android:layout_alignParentRight="true"
+                        android:textSize="@dimen/text_video_views_size"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="81,754 views" />
 
-            <TextView android:id="@+id/detailThumbsUpCountView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/detailViewCountView"
-                android:layout_toLeftOf="@id/detailThumbsDownImgView"
-                android:textSize="@dimen/text_video_like_size"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="20" />
+                    <TextView android:id="@+id/detailThumbsDownCountView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/detailViewCountView"
+                        android:layout_alignParentRight="true"
+                        android:textSize="@dimen/text_video_like_size"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:text="1,000" />
 
-            <ImageView android:id="@+id/detailThumbsUpImgView"
-                android:layout_width="40dp"
-                android:layout_height="20dp"
-                android:layout_below="@id/detailViewCountView"
-                android:layout_toLeftOf="@id/detailThumbsUpCountView"
-                android:src="@drawable/thumbs_up" />
+                    <ImageView android:id="@+id/detailThumbsDownImgView"
+                        android:layout_width="30dp"
+                        android:layout_height="15dp"
+                        android:layout_below="@id/detailViewCountView"
+                        android:layout_toLeftOf="@id/detailThumbsDownCountView"
+                        android:paddingRight="5dp"
+                        android:src="@drawable/thumbs_down" />
 
-            <TextView android:id="@+id/detailUploadDateView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/detailUploaderView"
-                android:layout_alignParentLeft="true"
-                android:paddingLeft="6dp"
-                android:paddingRight="6dp"
-                android:paddingTop="0dp"
-                android:textSize="@dimen/text_video_uploadtime_size"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="Published on Jan 01 1975" />
+                    <TextView android:id="@+id/detailThumbsUpCountView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/detailViewCountView"
+                        android:layout_toLeftOf="@id/detailThumbsDownImgView"
+                        android:paddingRight="5dp"
+                        android:textSize="@dimen/text_video_like_size"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:text="200" />
 
-            <TextView android:id="@+id/detailDescriptionView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/detailUploadDateView"
-                android:layout_alignParentLeft="true"
-                android:paddingTop="3dp"
-                android:paddingLeft="6dp"
-                android:paddingRight="6dp"
-                android:textSize="@dimen/text_video_description_size"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmodtempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. "
-                />
+                    <ImageView android:id="@+id/detailThumbsUpImgView"
+                        android:layout_width="30dp"
+                        android:layout_height="15dp"
+                        android:layout_below="@id/detailViewCountView"
+                        android:layout_toLeftOf="@id/detailThumbsUpCountView"
+                        android:paddingRight="5dp"
+                        android:src="@drawable/thumbs_up" />
+
+                    <TextView android:id="@+id/detailUploadDateView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/detailUploaderView"
+                        android:layout_alignParentLeft="true"
+                        android:textSize="@dimen/text_video_upload_date_size"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:text="Uploaded at Jan 01 1975" />
+
+                    <TextView android:id="@+id/detailDescriptionView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/detailUploadDateView"
+                        android:layout_alignParentLeft="true"
+                        android:textSize="@dimen/text_video_description_size"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmodtempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. "
+                        />
+
+                </RelativeLayout>
+            </RelativeLayout>
 
             <RelativeLayout android:id="@+id/detailNextVideoRootLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/detailDescriptionView" >
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
+                android:layout_below="@id/detailVideoInfo" >
 
                 <TextView android:id="@+id/detailNextVideoTitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
-                    android:paddingLeft="6dp"
-                    android:paddingRight="6dp"
-                    android:paddingTop="20dp"
-                    android:paddingBottom="6dp"
+                    android:textSize="@dimen/text_video_upload_date_size"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:textColor="@android:color/black"
                     android:text="@string/nextVideoTitle"
                     />
 
-                <View android:id="@+id/detailNextVideoSeperationLine"
-                    android:layout_width="fill_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginLeft="6dp"
-                    android:layout_marginRight="6dp"
-                    android:background="@android:color/darker_gray"
-                    android:layout_below="@id/detailNextVideoTitle"
-                    android:layout_alignParentLeft="true" />
-
                 <RelativeLayout android:id="@+id/detailNextVidButtonAndContantLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_below="@id/detailNextVideoSeperationLine">
+                    android:layout_below="@id/detailNextVideoTitle">
                     <FrameLayout
                         android:id="@+id/detailNextVideoFrame"
                         android:layout_width="match_parent"
@@ -184,15 +177,6 @@
                         android:layout_alignBottom="@id/detailNextVideoFrame"
                         android:background="?attr/selectableItemBackground"/>
                 </RelativeLayout>
-
-                <View android:id="@+id/detailNextVideoSeperationLineEnd"
-                    android:layout_width="fill_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginLeft="6dp"
-                    android:layout_marginRight="6dp"
-                    android:background="@android:color/darker_gray"
-                    android:layout_below="@id/detailNextVidButtonAndContantLayout"
-                    android:layout_alignParentLeft="true" />
             </RelativeLayout>
 
             <Button android:id="@+id/detailShowSimilarButton"
@@ -202,12 +186,6 @@
                 android:layout_marginRight="6dp"
                 android:layout_below="@id/detailNextVideoRootLayout"
                 android:text="@string/showSimilarVideosButtonText"/>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="90dp"
-                android:layout_below="@id/detailShowSimilarButton"/>
-
         </RelativeLayout>
     </ScrollView>
 
diff --git a/app/src/main/res/layout/video_item.xml b/app/src/main/res/layout/video_item.xml
index e20e38ce2..eb376c53f 100644
--- a/app/src/main/res/layout/video_item.xml
+++ b/app/src/main/res/layout/video_item.xml
@@ -3,12 +3,13 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="92dp"
     android:padding="6dp">
 
     <ImageView android:id="@+id/itemThumbnailView"
         android:layout_width="142dp"
         android:layout_height="80dp"
+        android:layout_marginRight="6dp"
         android:scaleType="centerCrop"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
@@ -16,11 +17,9 @@
 
     <TextView android:id="@+id/itemVideoTitleView"
         android:layout_width="wrap_content"
-        android:layout_height="40dp"
+        android:layout_height="36dp"
         android:layout_toRightOf="@id/itemThumbnailView"
         android:layout_alignParentTop="true"
-        android:paddingLeft="6dp"
-        android:paddingTop="4dp"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textSize="@dimen/text_search_title_size"
         android:text="title"
@@ -28,10 +27,9 @@
 
     <TextView android:id="@+id/itemUploaderView"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="18dp"
         android:layout_toRightOf="@id/itemThumbnailView"
         android:layout_below="@id/itemVideoTitleView"
-        android:paddingLeft="6dp"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textSize="@dimen/text_search_uploader_size"
         android:text="uploader"/>
@@ -42,7 +40,6 @@
         android:layout_height="wrap_content"
         android:layout_toRightOf="@id/itemThumbnailView"
         android:layout_below="@id/itemUploaderView"
-        android:paddingLeft="6dp"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textSize="@dimen/text_search_uploadtime_size"
         />
@@ -52,16 +49,16 @@
         android:layout_height="wrap_content"
         android:layout_alignBottom="@id/itemThumbnailView"
         android:layout_alignRight="@id/itemThumbnailView"
-        android:layout_marginRight="6dp"
-        android:layout_marginBottom="12dp"
-        android:paddingLeft="3dp"
-        android:paddingRight="3dp"
+        android:layout_marginRight="2dp"
+        android:layout_marginBottom="2dp"
         android:paddingTop="1dp"
         android:paddingBottom="1dp"
+        android:paddingRight="5dp"
+        android:paddingLeft="5dp"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textSize="@dimen/text_search_duration_size"
-        android:background="@drawable/durationback"
-        android:textColor="#f7f7f7"
+        android:background="@color/durationBackground"
+        android:textColor="@color/durationText"
         android:text="duration"
         />
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5b03f7217..748fe6157 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -4,7 +4,7 @@
     <string name="title_videoitem_detail">NewPipe</string>
     <string name="nothingFound">Nichts gefunden</string>
     <string name="viewSufix">Aufrufe</string>
-    <string name="uploadDatePrefix">"Hochgeladen am "</string>
+    <string name="uploadDatePrefix">Hochgeladen am </string>
     <string name="noPlayerFound">Keinen Streamplayer gefunden. Vielleicht möchtest du einen installieren.</string>
     <string name="installStreamPlayer">Jetzt installieren</string>
     <string name="cancel">Abbrechen</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 3836214ef..9bed1ea7b 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -4,7 +4,7 @@
     <string name="title_videoitem_detail">NewPipe</string>
     <string name="nothingFound">No se ha encontrado nada</string>
     <string name="viewSufix">visitas</string>
-    <string name="uploadDatePrefix">"Subido el "</string>
+    <string name="uploadDatePrefix">Subido el </string>
     <string name="noPlayerFound">No se ha encontrado ningún reproductor de vídeo. Quizás quieras instalar alguno.</string>
     <string name="installStreamPlayer">Instalarlo</string>
     <string name="cancel">Cancelar</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 41b952f56..922935be9 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -32,7 +32,7 @@
     <string name="showPlayWithKodiTitle">Afficher l\'option \"Lire avec Kodi\"</string>
     <string name="title_activity_settings">Paramètres</string>
     <string name="title_videoitem_detail">NewPipe</string>
-    <string name="uploadDatePrefix">"Mise en ligne le "</string>
+    <string name="uploadDatePrefix">Mise en ligne le </string>
     <string name="useExternalPlayerTitle">Utiliser un lecteur externe</string>
     <string name="viewSufix">vues</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 1629deb9b..feefdf4fa 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -4,7 +4,7 @@
     <string name="title_videoitem_detail">NewPipe</string>
     <string name="nothingFound">Geen resultaten</string>
     <string name="viewSufix">keer bekeken</string>
-    <string name="uploadDatePrefix">"Geüpload op "</string>
+    <string name="uploadDatePrefix">Geüpload op </string>
     <string name="noPlayerFound">Geen speler met streaming ondersteuning gevonden. Misschien wil je er een installeren.</string>
     <string name="installStreamPlayer">Installeer speler</string>
     <string name="cancel">Annuleer</string>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 93a3a82d1..610d00f89 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,5 +3,7 @@
     <color name="primaryColorYoutube">#cd322e</color>
     <color name="primaryColorDarkYoutube">#bc211d</color>
     <color name="accentColorYoutube">#000000</color>
+    <color name="durationBackground">#aa000000</color>
+    <color name="durationText">#eeffffff</color>
     <color name="black_overlay">#66000000</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimentxt.xml b/app/src/main/res/values/dimentxt.xml
index 135a0e1cd..7d9242073 100644
--- a/app/src/main/res/values/dimentxt.xml
+++ b/app/src/main/res/values/dimentxt.xml
@@ -4,10 +4,26 @@
     <dimen name="text_search_duration_size">11sp</dimen>
     <dimen name="text_search_uploader_size">12sp</dimen>
     <dimen name="text_search_uploadtime_size">12sp</dimen>
-    <dimen name="text_video_title_size">14sp</dimen>
-    <dimen name="text_video_visits_size">14sp</dimen>
+
+    <dimen name="text_video_title_size">18sp</dimen>
+    <dimen name="text_video_views_size">14sp</dimen>
     <dimen name="text_video_like_size">12sp</dimen>
     <dimen name="text_video_uploader_size">14sp</dimen>
-    <dimen name="text_video_uploadtime_size">14sp</dimen>
+    <dimen name="text_video_upload_date_size">14sp</dimen>
     <dimen name="text_video_description_size">14sp</dimen>
+
+
+    <dimen name="text_video_title_sw600dp_size">20sp</dimen>
+    <dimen name="text_video_views_sw600dp_size">16sp</dimen>
+    <dimen name="text_video_like_sw600dp_size">14sp</dimen>
+    <dimen name="text_video_uploader_sw600dp_size">16sp</dimen>
+    <dimen name="text_video_upload_date_sw600dp_size">16sp</dimen>
+    <dimen name="text_video_description_sw600dp_size">16sp</dimen>
+
+    <dimen name="text_video_title_land_size">24sp</dimen>
+    <dimen name="text_video_views_land_size">18sp</dimen>
+    <dimen name="text_video_like_land_size">16sp</dimen>
+    <dimen name="text_video_uploader_land_size">18sp</dimen>
+    <dimen name="text_video_upload_date_land_size">18sp</dimen>
+    <dimen name="text_video_description_land_size">18sp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 46f14a672..a3529fc25 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,7 +4,7 @@
     <string name="title_videoitem_detail">NewPipe</string>
     <string name="nothingFound">Nothing found</string>
     <string name="viewSufix">views</string>
-    <string name="uploadDatePrefix">"Uploaded on "</string>
+    <string name="uploadDatePrefix">Uploaded on </string>
     <string name="noPlayerFound">No stream player found. You may want to install one.</string>
     <string name="installStreamPlayer">Install</string>
     <string name="cancel">Cancel</string>