diff --git a/app/src/main/res/layout/local_playlist_header.xml b/app/src/main/res/layout/local_playlist_header.xml
index 04fe32ab0..95da81447 100644
--- a/app/src/main/res/layout/local_playlist_header.xml
+++ b/app/src/main/res/layout/local_playlist_header.xml
@@ -1,34 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="6dp"
     android:background="?attr/contrast_background_color">
 
     <TextView
         android:id="@+id/playlist_title_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="6dp"
-        android:layout_marginRight="6dp"
-        android:padding="6dp"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
+        android:paddingHorizontal="@dimen/video_item_search_padding"
+        android:paddingTop="@dimen/video_item_search_padding"
+        android:paddingBottom="6dp"
         android:background="?attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
-        android:ellipsize="marquee"
-        android:fadingEdge="horizontal"
-        android:marqueeRepeatLimit="marquee_forever"
-        android:scrollHorizontally="true"
-        android:singleLine="true"
+        android:ellipsize="end"
+        android:maxLines="2"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textSize="@dimen/playlist_detail_title_text_size"
-        tools:text="Mix musics #23 title Lorem ipsum dolor sit amet, consectetur..."/>
+        tools:text="Mix musics #23 title Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsum"/>
 
     <TextView
         android:id="@+id/playlist_stream_count"
@@ -36,8 +28,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/playlist_title_view"
         android:layout_alignParentLeft="true"
-        android:paddingLeft="12dp"
-        android:paddingRight="12dp"
+        android:paddingHorizontal="@dimen/video_item_search_padding"
         android:ellipsize="end"
         android:gravity="right|center_vertical"
         android:maxLines="1"
diff --git a/app/src/main/res/layout/playlist_header.xml b/app/src/main/res/layout/playlist_header.xml
index f49ca295d..281325211 100644
--- a/app/src/main/res/layout/playlist_header.xml
+++ b/app/src/main/res/layout/playlist_header.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -12,9 +11,8 @@
         android:id="@+id/playlist_title_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginTop="6dp"
+        android:paddingHorizontal="@dimen/video_item_search_padding"
+        android:paddingTop="@dimen/video_item_search_padding"
         android:ellipsize="end"
         android:maxLines="2"
         android:textAppearance="?android:attr/textAppearanceLarge"
@@ -25,19 +23,17 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/playlist_title_view"
+        android:paddingHorizontal="@dimen/video_item_search_padding"
+        android:paddingTop="6dp"
         android:id="@+id/playlist_meta">
         <RelativeLayout
             android:id="@+id/uploader_layout"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/playlist_detail_uploader_layout_height"
-            android:layout_marginLeft="4dp"
-            android:layout_marginRight="6dp"
-            android:layout_marginTop="6dp"
             android:layout_toLeftOf="@+id/playlist_stream_count"
             android:layout_toStartOf="@+id/playlist_stream_count"
             android:background="?attr/selectableItemBackground"
             android:gravity="left|center_vertical"
-            android:padding="2dp"
             android:visibility="gone"
             tools:ignore="RtlHardcoded"
             tools:visibility="visible">
@@ -46,8 +42,8 @@
                 android:id="@+id/uploader_avatar_view"
                 android:layout_width="@dimen/playlist_detail_uploader_image_size"
                 android:layout_height="@dimen/playlist_detail_uploader_image_size"
+                android:layout_centerVertical="true"
                 android:layout_alignParentLeft="true"
-                android:layout_margin="1dp"
                 android:src="@drawable/buddy"
                 app:civ_border_color="#ffffff"
                 app:civ_border_width="1dp"/>
@@ -56,7 +52,7 @@
                 android:id="@+id/uploader_name"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginLeft="4dp"
+                android:paddingHorizontal="6dp"
                 android:layout_toRightOf="@+id/uploader_avatar_view"
                 android:ellipsize="end"
                 android:gravity="left|center_vertical"
@@ -73,7 +69,7 @@
             android:layout_alignBottom="@+id/uploader_layout"
             android:layout_alignTop="@+id/uploader_layout"
             android:layout_alignParentRight="true"
-            android:layout_marginRight="6dp"
+            android:layout_marginLeft="6dp"
             android:ellipsize="end"
             android:gravity="right|center_vertical"
             android:maxLines="1"