diff --git a/app/src/main/res/drawable-hdpi/ic_close_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_close_black_24dp.png
new file mode 100644
index 000000000..1a9cd75a0
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_close_black_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png
new file mode 100644
index 000000000..ceb1a1eeb
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_expand_less_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_expand_less_black_24dp.png
new file mode 100644
index 000000000..57139a78a
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_expand_less_black_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_expand_less_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_expand_less_white_24dp.png
new file mode 100644
index 000000000..dea898838
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_expand_less_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_expand_more_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_expand_more_black_24dp.png
new file mode 100644
index 000000000..9625f148f
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_expand_more_black_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_expand_more_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_expand_more_white_24dp.png
new file mode 100644
index 000000000..022e05799
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_expand_more_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_filter_list_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_filter_list_black_24dp.png
new file mode 100644
index 000000000..a966cb9bd
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_filter_list_black_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_filter_list_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_filter_list_white_24dp.png
new file mode 100644
index 000000000..7e8a6b536
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_filter_list_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_picture_in_picture_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_picture_in_picture_black_24dp.png
new file mode 100644
index 000000000..54f824410
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_picture_in_picture_black_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_picture_in_picture_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_picture_in_picture_white_24dp.png
new file mode 100644
index 000000000..b4ec6bb70
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_picture_in_picture_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_search_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_search_black_24dp.png
new file mode 100644
index 000000000..c593e7ad8
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_search_black_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_search_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_search_white_24dp.png
new file mode 100644
index 000000000..bbfbc96cb
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_search_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_close_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_close_black_24dp.png
new file mode 100644
index 000000000..40a1a84e3
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_close_black_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png
new file mode 100644
index 000000000..af7f8288d
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_expand_less_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_expand_less_black_24dp.png
new file mode 100644
index 000000000..08c16a328
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_expand_less_black_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_expand_less_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_expand_less_white_24dp.png
new file mode 100644
index 000000000..a2e4baad0
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_expand_less_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_expand_more_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_expand_more_black_24dp.png
new file mode 100644
index 000000000..feb85a775
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_expand_more_black_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_expand_more_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_expand_more_white_24dp.png
new file mode 100644
index 000000000..910bb2a0a
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_expand_more_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_filter_list_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_filter_list_black_24dp.png
new file mode 100644
index 000000000..d86492b42
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_filter_list_black_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_filter_list_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_filter_list_white_24dp.png
new file mode 100644
index 000000000..59a2ec755
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_filter_list_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_picture_in_picture_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_picture_in_picture_black_24dp.png
new file mode 100644
index 000000000..e7a9be944
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_picture_in_picture_black_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_picture_in_picture_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_picture_in_picture_white_24dp.png
new file mode 100644
index 000000000..96b5ed3f4
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_picture_in_picture_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_search_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_search_black_24dp.png
new file mode 100644
index 000000000..6b1634323
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_search_black_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_search_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_search_white_24dp.png
new file mode 100644
index 000000000..faefc59c8
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_search_white_24dp.png differ
diff --git a/app/src/main/res/drawable-nodpi/ic_play_arrow_black.png b/app/src/main/res/drawable-nodpi/ic_play_arrow_black.png
deleted file mode 100644
index d12d49562..000000000
Binary files a/app/src/main/res/drawable-nodpi/ic_play_arrow_black.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_close_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_close_black_24dp.png
new file mode 100644
index 000000000..6bc437298
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_close_black_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_close_white.png b/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_close_white.png
rename to app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_expand_less_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_expand_less_black_24dp.png
new file mode 100644
index 000000000..323360ead
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_expand_less_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_expand_less_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_expand_less_white_24dp.png
new file mode 100644
index 000000000..ae36d91e1
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_expand_less_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_expand_more_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_expand_more_black_24dp.png
new file mode 100644
index 000000000..d3ee65e9a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_expand_more_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_expand_more_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_expand_more_white_24dp.png
new file mode 100644
index 000000000..c42e2a049
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_expand_more_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_filter_list_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_filter_list_black_24dp.png
new file mode 100644
index 000000000..b64df3612
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_filter_list_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_filter_list_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_filter_list_white_24dp.png
new file mode 100644
index 000000000..9416c70ec
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_filter_list_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_picture_in_picture_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_picture_in_picture_black_24dp.png
new file mode 100644
index 000000000..d85b80f84
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_picture_in_picture_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_picture_in_picture_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_picture_in_picture_white_24dp.png
new file mode 100644
index 000000000..8039bebcf
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_picture_in_picture_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_search_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_search_black_24dp.png
new file mode 100644
index 000000000..638190268
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_search_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_search_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_search_white_24dp.png
new file mode 100644
index 000000000..bfc3e3939
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_search_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png
new file mode 100644
index 000000000..51b4401ca
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_close_white.png b/app/src/main/res/drawable-xxhdpi/ic_close_white.png
deleted file mode 100644
index 4927bc242..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_close_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_close_white.png b/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_close_white.png
rename to app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_expand_less_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_expand_less_black_24dp.png
new file mode 100644
index 000000000..ee92f4ecd
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_expand_less_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_expand_less_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_expand_less_white_24dp.png
new file mode 100644
index 000000000..62fc386c1
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_expand_less_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_expand_more_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_expand_more_black_24dp.png
new file mode 100644
index 000000000..5cd142c1d
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_expand_more_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_expand_more_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_expand_more_white_24dp.png
new file mode 100644
index 000000000..dbc0b2032
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_expand_more_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_filter_list_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_filter_list_black_24dp.png
new file mode 100644
index 000000000..2314642f9
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_filter_list_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_filter_list_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_filter_list_white_24dp.png
new file mode 100644
index 000000000..1263ae82e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_filter_list_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_picture_in_picture_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_picture_in_picture_black_24dp.png
new file mode 100644
index 000000000..c3892ff23
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_picture_in_picture_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_picture_in_picture_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_picture_in_picture_white_24dp.png
new file mode 100644
index 000000000..719a3fef8
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_picture_in_picture_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_search_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_search_black_24dp.png
new file mode 100644
index 000000000..3ae490ef9
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_search_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png
new file mode 100644
index 000000000..abbb98951
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_close_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_close_black_24dp.png
new file mode 100644
index 000000000..df42feecb
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_close_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_close_white.png b/app/src/main/res/drawable-xxxhdpi/ic_close_white.png
deleted file mode 100644
index 1ab231275..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_close_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_close_white.png b/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_close_white.png
rename to app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png
new file mode 100644
index 000000000..99c6e3e1c
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_expand_less_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_expand_less_white_24dp.png
new file mode 100644
index 000000000..42615516b
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_expand_less_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png
new file mode 100644
index 000000000..ad852e3e6
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_expand_more_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_expand_more_white_24dp.png
new file mode 100644
index 000000000..2859a6fec
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_expand_more_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_filter_list_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_filter_list_black_24dp.png
new file mode 100644
index 000000000..9319c4bb4
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_filter_list_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_filter_list_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_filter_list_white_24dp.png
new file mode 100644
index 000000000..cb2207f11
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_filter_list_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_picture_in_picture_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_picture_in_picture_black_24dp.png
new file mode 100644
index 000000000..bb43aa64a
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_picture_in_picture_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_picture_in_picture_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_picture_in_picture_white_24dp.png
new file mode 100644
index 000000000..b9d101119
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_picture_in_picture_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_search_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_search_black_24dp.png
new file mode 100644
index 000000000..21be57299
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_search_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_search_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_search_white_24dp.png
new file mode 100644
index 000000000..dd5adfc7f
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_search_white_24dp.png differ
diff --git a/app/src/main/res/drawable/action_shadow.xml b/app/src/main/res/drawable/toolbar_shadow.xml
similarity index 87%
rename from app/src/main/res/drawable/action_shadow.xml
rename to app/src/main/res/drawable/toolbar_shadow.xml
index e76c1566f..f924df533 100644
--- a/app/src/main/res/drawable/action_shadow.xml
+++ b/app/src/main/res/drawable/toolbar_shadow.xml
@@ -4,7 +4,7 @@
 	android:shape="rectangle">
 
 	<gradient
-		android:startColor="#44000000"
+		android:startColor="#5a000000"
 		android:endColor="#00000000"
 		android:angle="270"
 		android:type="linear"/>
diff --git a/app/src/main/res/layout-land/channel_header.xml b/app/src/main/res/layout-land/channel_header.xml
index 17c2623e3..653379832 100644
--- a/app/src/main/res/layout-land/channel_header.xml
+++ b/app/src/main/res/layout-land/channel_header.xml
@@ -1,79 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
-    android:id="@+id/channel_header_layout"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/channel_header_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:layout_marginBottom="16dp">
 
     <ImageView
         android:id="@+id/channel_banner_image"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        android:scaleType="center"
-        android:src="@drawable/channel_banner"
+        android:layout_height="90dp"
         android:background="@android:color/black"
-        android:adjustViewBounds="true"/>
+        android:fitsSystemWindows="true"
+        android:scaleType="centerCrop"
+        android:src="@drawable/channel_banner"
+        tools:ignore="ContentDescription"/>
 
     <RelativeLayout
         android:id="@+id/channel_avatar_layout"
-        android:layout_alignTop="@id/channel_banner_image"
         android:layout_width="@dimen/channel_avatar_halo_size"
         android:layout_height="@dimen/channel_avatar_halo_size"
-        android:layout_marginLeft="20dp"
-        android:layout_marginStart="20dp"
-        android:layout_marginTop="60dp">
+        android:layout_alignTop="@id/channel_banner_image"
+        android:layout_marginLeft="12dp"
+        android:layout_marginTop="60dp"
+        tools:ignore="RtlHardcoded">
 
         <ImageView
             android:id="@+id/channel_avatar_halo"
             android:layout_width="@dimen/channel_avatar_halo_size"
             android:layout_height="@dimen/channel_avatar_halo_size"
             android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:src="@drawable/white_circle" />
+            android:src="@drawable/white_circle"
+            tools:ignore="ContentDescription,RtlHardcoded"/>
 
         <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/channel_avatar_view"
             android:layout_width="@dimen/channel_avatar_size"
             android:layout_height="@dimen/channel_avatar_size"
-            android:src="@drawable/buddy"
-            android:layout_centerInParent="true"/>
+            android:layout_centerInParent="true"
+            android:src="@drawable/buddy"/>
     </RelativeLayout>
 
     <TextView
         android:id="@+id/channel_title_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_below="@id/channel_banner_image"
-        android:layout_toEndOf="@id/channel_avatar_layout"
+        android:layout_marginLeft="12dp"
+        android:layout_marginTop="6dp"
         android:layout_toRightOf="@id/channel_avatar_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="4dp"
-        android:layout_marginStart="4dp"
+        android:textAppearance="?android:attr/textAppearanceLarge"
         android:textSize="@dimen/video_item_detail_title_text_size"
-        android:textAppearance="?android:attr/textAppearanceLarge"/>
+        tools:ignore="RtlHardcoded"
+        tools:text="Testing Title"/>
 
-    <LinearLayout
-        android:id="@+id/channel_subscriber_layout"
-        android:layout_below="@id/channel_banner_image"
-        android:layout_toEndOf="@id/channel_title_view"
-        android:layout_toRightOf="@id/channel_title_view"
+    <TextView
+        android:id="@+id/channel_subscriber_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
-        <Button
-            android:id="@+id/channel_subscribe_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/subscribe"
-            android:layout_marginLeft="4dp"
-            android:layout_marginStart="4dp"/>
+        android:layout_alignLeft="@+id/channel_title_view"
+        android:layout_below="@+id/channel_title_view"
+        android:gravity="center"
+        android:visibility="gone"
+        tools:ignore="RtlHardcoded"
+        tools:text="123,141,411 subscribers"
+        tools:visibility="visible"/>
 
-        <TextView
-            android:id="@+id/channel_subscriber_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"/>
-    </LinearLayout>
+    <Button
+        android:id="@+id/channel_rss_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/channel_banner_image"
+        android:layout_gravity="center_vertical|right"
+        android:layout_marginRight="4dp"
+        android:layout_marginTop="2dp"
+        android:drawableLeft="@drawable/ic_rss_feed_white_24dp"
+        android:text="@string/rss_button_title"
+        android:textSize="@dimen/channel_rss_title_size"
+        android:theme="@style/RedButton"
+        android:visibility="gone"
+        tools:ignore="RtlHardcoded"
+        tools:visibility="visible"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_downloader.xml b/app/src/main/res/layout/activity_downloader.xml
index 05af4e47d..0c37f6813 100644
--- a/app/src/main/res/layout/activity_downloader.xml
+++ b/app/src/main/res/layout/activity_downloader.xml
@@ -1,7 +1,10 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-android:layout_width="match_parent"
-android:layout_height="match_parent"
-android:orientation="vertical">
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <include layout="@layout/toolbar_layout"/>
 
     <FrameLayout
         android:id="@+id/frame"
diff --git a/app/src/main/res/layout/activity_error.xml b/app/src/main/res/layout/activity_error.xml
index 891dfe548..7752dc7cb 100644
--- a/app/src/main/res/layout/activity_error.xml
+++ b/app/src/main/res/layout/activity_error.xml
@@ -5,10 +5,13 @@
     android:layout_height="match_parent"
     tools:context=".report.ErrorActivity">
 
+    <include layout="@layout/toolbar_layout"/>
+
     <ScrollView
         android:id="@+id/scrollView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_marginTop="?attr/actionBarSize">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 67292ab7d..1e56b5ce8 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -9,8 +9,10 @@
 
     <FrameLayout
         android:id="@+id/fragment_holder"
-        android:name="org.schabi.newpipe.search_fragment.SearchInfoItemFragment"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent"
+        android:layout_marginTop="?attr/actionBarSize"/>
+
+    <include layout="@layout/toolbar_layout"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_exo_player.xml b/app/src/main/res/layout/activity_main_player.xml
similarity index 99%
rename from app/src/main/res/layout/activity_exo_player.xml
rename to app/src/main/res/layout/activity_main_player.xml
index b0e80b584..cd76d2f07 100644
--- a/app/src/main/res/layout/activity_exo_player.xml
+++ b/app/src/main/res/layout/activity_main_player.xml
@@ -236,7 +236,7 @@
 
 
     <RelativeLayout
-        android:id="@+id/loadingPanel"
+        android:id="@+id/loading_panel"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@android:color/black"
diff --git a/app/src/main/res/layout/activity_recaptcha.xml b/app/src/main/res/layout/activity_recaptcha.xml
index 0a3b03010..7a4971cd9 100644
--- a/app/src/main/res/layout/activity_recaptcha.xml
+++ b/app/src/main/res/layout/activity_recaptcha.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <WebView
+        android:id="@+id/reCaptchaWebView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:id="@+id/reCaptchaWebView" />
-</LinearLayout>
\ No newline at end of file
+        android:layout_marginTop="?attr/actionBarSize"/>
+
+    <include layout="@layout/toolbar_layout"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/channel_header.xml b/app/src/main/res/layout/channel_header.xml
index 87a05c13c..3aa4e0634 100644
--- a/app/src/main/res/layout/channel_header.xml
+++ b/app/src/main/res/layout/channel_header.xml
@@ -1,78 +1,88 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
-    android:id="@+id/channel_header_layout"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/channel_header_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:layout_marginBottom="12dp">
 
     <ImageView
         android:id="@+id/channel_banner_image"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        android:scaleType="center"
-        android:src="@drawable/channel_banner"
+        android:layout_height="70dp"
         android:background="@android:color/black"
-        android:adjustViewBounds="true"/>
+        android:fitsSystemWindows="true"
+        android:scaleType="centerCrop"
+        android:src="@drawable/channel_banner"
+        tools:ignore="ContentDescription"/>
 
     <RelativeLayout
         android:id="@+id/channel_avatar_layout"
-        android:layout_alignTop="@id/channel_banner_image"
         android:layout_width="@dimen/channel_avatar_halo_size"
         android:layout_height="@dimen/channel_avatar_halo_size"
-        android:layout_marginLeft="20dp"
-        android:layout_marginStart="20dp"
-        android:layout_marginTop="30dp">
+        android:layout_alignTop="@id/channel_banner_image"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="50dp"
+        tools:ignore="RtlHardcoded">
 
         <ImageView
             android:id="@+id/channel_avatar_halo"
             android:layout_width="@dimen/channel_avatar_halo_size"
             android:layout_height="@dimen/channel_avatar_halo_size"
             android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:src="@drawable/white_circle" />
+            android:src="@drawable/white_circle"
+            tools:ignore="ContentDescription"/>
 
         <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/channel_avatar_view"
             android:layout_width="@dimen/channel_avatar_size"
             android:layout_height="@dimen/channel_avatar_size"
-            android:src="@drawable/buddy"
-            android:layout_centerInParent="true"/>
+            android:layout_centerInParent="true"
+            android:src="@drawable/buddy"/>
     </RelativeLayout>
 
     <TextView
         android:id="@+id/channel_title_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_below="@id/channel_banner_image"
-        android:layout_toEndOf="@id/channel_avatar_layout"
-        android:layout_toRightOf="@id/channel_avatar_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="4dp"
-        android:layout_marginStart="4dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="6dp"
+        android:layout_toLeftOf="@+id/channel_rss_button"
+        android:layout_toRightOf="@+id/channel_avatar_layout"
+        android:textAppearance="?android:attr/textAppearanceLarge"
         android:textSize="@dimen/video_item_detail_title_text_size"
-        android:textAppearance="?android:attr/textAppearanceLarge"/>
+        tools:ignore="RtlHardcoded"
+        tools:text="Testing Title"/>
 
-    <LinearLayout
-        android:id="@+id/channel_subscriber_layout"
-        android:visibility="gone"
-        android:layout_below="@id/channel_avatar_layout"
-        android:layout_width="match_parent"
+    <TextView
+        android:id="@+id/channel_subscriber_view"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
-        <Button
-            android:id="@+id/channel_subscribe_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/subscribe"
-            android:layout_marginLeft="4dp"
-            android:layout_marginStart="4dp"/>
+        android:layout_alignLeft="@+id/channel_title_view"
+        android:layout_below="@+id/channel_title_view"
+        android:gravity="center"
+        android:textSize="@dimen/channel_subscribers_text_size"
+        android:visibility="gone"
+        tools:ignore="RtlHardcoded"
+        tools:text="123,141,411 subscribers"
+        tools:visibility="visible"/>
 
-        <TextView
-            android:id="@+id/channel_subscriber_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"/>
-    </LinearLayout>
+    <Button
+        android:id="@+id/channel_rss_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/channel_banner_image"
+        android:layout_gravity="center_vertical|right"
+        android:layout_marginRight="2dp"
+        android:drawableLeft="@drawable/ic_rss_feed_white_24dp"
+        android:text="@string/rss_button_title"
+        android:textSize="@dimen/channel_rss_title_size"
+        android:theme="@style/RedButton"
+        android:visibility="gone"
+        tools:ignore="RtlHardcoded"
+        tools:visibility="visible"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/channel_item.xml b/app/src/main/res/layout/channel_item.xml
index 3c74c9493..bbdf6779b 100644
--- a/app/src/main/res/layout/channel_item.xml
+++ b/app/src/main/res/layout/channel_item.xml
@@ -1,94 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<FrameLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/itemRoot"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    android:clickable="true"
+    android:orientation="vertical"
+    android:padding="12dp">
+
+    <de.hdodenhof.circleimageview.CircleImageView
+        android:id="@+id/itemThumbnailView"
+        android:layout_width="@dimen/video_item_search_thumbnail_image_width"
+        android:layout_height="@dimen/video_item_search_thumbnail_image_height"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginRight="@dimen/video_item_search_image_right_margin"
+        android:contentDescription="@string/list_thumbnail_view_description"
+        android:src="@drawable/buddy_channel_item"
+        tools:ignore="RtlHardcoded"/>
 
     <RelativeLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="12dp"
-        android:orientation="vertical">
+        android:layout_height="@dimen/video_item_search_thumbnail_image_height"
+        android:layout_toRightOf="@id/itemThumbnailView"
+        android:orientation="vertical"
+        tools:ignore="RtlHardcoded">
 
-        <RelativeLayout
-            android:id="@+id/itemThumbnailViewContainer"
+        <TextView
+            android:id="@+id/itemChannelTitleView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textSize="@dimen/channel_item_detail_title_text_size"
+            tools:text="Channel Title, Lorem ipsum"/>
+
+        <TextView
+            android:id="@+id/itemChannelDescriptionView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_above="@+id/itemSubscriberCountView"
+            android:layout_below="@+id/itemChannelTitleView"
+            android:ellipsize="end"
+            android:maxLines="2"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textSize="@dimen/video_item_search_uploader_text_size"
+            tools:text="Channel description, Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blandit"/>
+
+        <TextView
+            android:id="@+id/itemSubscriberCountView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="@dimen/video_item_search_image_right_margin"
-            tools:ignore="RtlHardcoded">
+            android:layout_alignParentBottom="true"
+            android:maxLines="1"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textSize="@dimen/video_item_search_upload_date_text_size"
+            tools:text="10M subscribers • "/>
 
-            <de.hdodenhof.circleimageview.CircleImageView
-                android:id="@+id/itemThumbnailView"
-                android:layout_width="@dimen/video_item_search_thumbnail_image_width"
-                android:layout_height="@dimen/video_item_search_thumbnail_image_height"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentTop="true"
-                android:contentDescription="@string/list_thumbnail_view_description"
-                android:src="@drawable/buddy_channel_item"/>
-
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/video_item_search_thumbnail_image_height"
-            android:layout_toRightOf="@id/itemThumbnailViewContainer"
-            android:orientation="vertical"
-            tools:ignore="RtlHardcoded">
-
-            <TextView
-                android:id="@+id/itemChannelTitleView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:textSize="@dimen/channel_item_detail_title_text_size"
-                tools:text="Channel Title, Lorem ipsum"/>
-
-            <TextView
-                android:id="@+id/itemChannelDescriptionView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_above="@+id/itemSubscriberCountView"
-                android:layout_below="@+id/itemChannelTitleView"
-                android:ellipsize="end"
-                android:maxLines="2"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textSize="@dimen/video_item_search_uploader_text_size"
-                tools:text="Channel description, Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blandit"/>
-
-            <TextView
-                android:id="@+id/itemSubscriberCountView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:maxLines="1"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textSize="@dimen/video_item_search_upload_date_text_size"
-                tools:text="10M subscribers • "/>
-
-            <TextView
-                android:id="@+id/itemVideoCountView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_toRightOf="@+id/itemSubscriberCountView"
-                android:maxLines="1"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textSize="@dimen/video_item_search_upload_date_text_size"
-                tools:text="1000 videos"/>
-        </RelativeLayout>
+        <TextView
+            android:id="@+id/itemVideoCountView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_toRightOf="@+id/itemSubscriberCountView"
+            android:maxLines="1"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textSize="@dimen/video_item_search_upload_date_text_size"
+            tools:text="1000 videos"/>
     </RelativeLayout>
-
-    <Button
-        android:id="@+id/item_button"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/selectableItemBackground"
-        tools:visibility="gone"/>
-</FrameLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/dialog_url.xml b/app/src/main/res/layout/dialog_url.xml
index 33df882be..bb3fad414 100644
--- a/app/src/main/res/layout/dialog_url.xml
+++ b/app/src/main/res/layout/dialog_url.xml
@@ -1,115 +1,94 @@
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical">
+<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="match_parent">
 
-	<android.support.v7.widget.Toolbar
-		android:id="@+id/toolbar"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:theme="@style/NewPipeActionbarTheme" />
+    <include
+        android:id="@+id/toolbar_layout"
+        layout="@layout/toolbar_layout"/>
 
-	<View
-		android:layout_width="match_parent"
-		android:layout_height="4dp"
-		android:background="@drawable/action_shadow"/>
+    <TextView
+        android:id="@+id/file_name_text_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/toolbar_layout"
+        android:layout_marginBottom="6dp"
+        android:layout_marginLeft="24dp"
+        android:layout_marginRight="24dp"
+        android:layout_marginTop="12dp"
+        android:text="@string/msg_name"/>
 
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginLeft="24dp"
-		android:layout_marginRight="24dp"
-		android:layout_marginTop="9dp"
-		android:layout_marginBottom="24dp"
-		android:gravity="center_vertical"
-		android:orientation="vertical">
+    <EditText
+        android:id="@+id/file_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/file_name_text_view"
+        android:layout_marginBottom="6dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:inputType="text"
+        android:maxLines="1"/>
 
-	</LinearLayout>
+    <RadioGroup
+        android:id="@+id/video_audio_group"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/file_name"
+        android:layout_marginBottom="12dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:gravity="left"
+        android:orientation="horizontal"
+        tools:ignore="RtlHardcoded">
 
+        <RadioButton
+            android:id="@+id/video_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="true"
+            android:text="@string/video"/>
 
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginLeft="24dp"
-		android:layout_marginRight="24dp"
-		android:layout_marginBottom="24dp"
-		android:gravity="center_vertical"
-		android:orientation="vertical">
-		
-		<TextView
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="@string/msg_name"/>
+        <RadioButton
+            android:id="@+id/audio_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/audio"/>
+    </RadioGroup>
 
-		<EditText
-			android:id="@+id/file_name"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:singleLine="true"/>
+    <TextView
+        android:id="@+id/threads_text_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/video_audio_group"
+        android:layout_marginBottom="6dp"
+        android:layout_marginLeft="24dp"
+        android:layout_marginRight="24dp"
+        android:text="@string/msg_threads"/>
 
-	</LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/threads_text_view"
+        android:layout_marginLeft="24dp"
+        android:layout_marginRight="24dp"
+        android:paddingBottom="12dp"
+        android:orientation="horizontal">
 
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginLeft="24dp"
-		android:layout_marginRight="24dp"
-		android:layout_marginBottom="24dp"
-		android:gravity="left"
-		android:orientation="horizontal">
-		<RadioGroup
-			android:id="@+id/video_audio_group"
-			android:layout_height="wrap_content"
-			android:layout_width="wrap_content"
-			android:orientation="horizontal">
-			<RadioButton android:id="@+id/video_button"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="@string/video"
-				android:checked="true"/>
-			<RadioButton android:id="@+id/audio_button"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="@string/audio" />
-		</RadioGroup>
-	</LinearLayout>
-	
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginLeft="24dp"
-		android:layout_marginRight="24dp"
-		android:layout_marginBottom="24dp"
-		android:gravity="center_vertical"
-		android:orientation="vertical">
-	
-		<TextView
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="@string/msg_threads"/>
-		
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:gravity="center_vertical"
-			android:orientation="horizontal">
-		
-			<TextView
-				android:id="@+id/threads_count"
-				android:layout_width="20dp"
-				android:layout_height="wrap_content"
-				android:text="0"/>
-		
-			<SeekBar
-				android:id="@+id/threads"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:max="31"
-				android:progress="3"/>
-		
-		</LinearLayout>
-		
-	</LinearLayout>
-	
-</LinearLayout>
+        <TextView
+            android:id="@+id/threads_count"
+            android:layout_width="25dp"
+            android:layout_height="match_parent"
+            android:gravity="center_vertical"
+            android:paddingLeft="2dp"
+            tools:ignore="RtlHardcoded,RtlSymmetry"
+            tools:text="3"/>
+
+        <SeekBar
+            android:id="@+id/threads"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:max="31"
+            android:progress="3"/>
+    </LinearLayout>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/error_retry.xml b/app/src/main/res/layout/error_retry.xml
new file mode 100644
index 000000000..edd576e1c
--- /dev/null
+++ b/app/src/main/res/layout/error_retry.xml
@@ -0,0 +1,35 @@
+<?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:padding="16dp"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/error_message_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:text="@string/general_error"
+        android:gravity="center"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        tools:text="Network error"/>
+
+    <Button
+        android:id="@+id/error_button_retry"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/error_message_view"
+        android:layout_centerHorizontal="true"
+        android:layout_margin="8dp"
+        android:text="@string/retry"
+        android:textAlignment="center"
+        android:textAllCaps="true"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+        android:textSize="16sp"
+        android:theme="@style/RedButton"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_channel.xml b/app/src/main/res/layout/fragment_channel.xml
index 78388ee76..807a5ac4c 100644
--- a/app/src/main/res/layout/fragment_channel.xml
+++ b/app/src/main/res/layout/fragment_channel.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:title="@string/channel">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/channel_streams_view"
@@ -20,5 +18,19 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:indeterminate="true"/>
+        android:indeterminate="true"
+        android:visibility="gone"
+        tools:visibility="visible"/>
+
+    <!--ERROR PANEL-->
+    <include
+        android:id="@+id/error_panel"
+        layout="@layout/error_retry"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:layout_marginTop="50dp"
+        android:visibility="gone"
+        tools:visibility="visible"/>
+
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
new file mode 100644
index 000000000..cd5846b56
--- /dev/null
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent">
+
+    <include layout="@layout/main_bg" />
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 2ed0ea0f7..80aa1ab4c 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -1,27 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_height="match_parent"
     android:layout_width="match_parent"
-    android:name="org.schabi.newpipe.SearchInfoItemFragment"
-    tools:context=".fragments.search.SearchFragment">
-
-    <include layout="@layout/main_bg" />
+    android:layout_height="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true">
 
     <android.support.v7.widget.RecyclerView
-        android:id="@+id/list"
+        android:id="@+id/result_list_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:scrollbars="vertical"
         app:layoutManager="LinearLayoutManager"
-        tools:listitem="@layout/stream_item"
-        android:scrollbars="vertical"/>
+        tools:listitem="@layout/stream_item"/>
 
-    <ProgressBar android:id="@+id/loading_progress_bar"
+    <ProgressBar
+        android:id="@+id/loading_progress_bar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:indeterminate="true"
         android:visibility="gone"
         tools:visibility="visible"/>
+
+    <!--ERROR PANEL-->
+    <include
+        android:id="@+id/error_panel"
+        layout="@layout/error_retry"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="50dp"
+        android:visibility="gone"
+        tools:visibility="visible"/>
+
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_video_detail.xml b/app/src/main/res/layout/fragment_video_detail.xml
index 4b34bcb49..aa29b822c 100644
--- a/app/src/main/res/layout/fragment_video_detail.xml
+++ b/app/src/main/res/layout/fragment_video_detail.xml
@@ -1,10 +1,12 @@
 <?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"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:id="@+id/video_item_detail"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/video_item_detail"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:focusableInTouchMode="true">
 
     <com.nirhart.parallaxscroll.views.ParallaxScrollView
         android:id="@+id/detail_main_content"
@@ -13,6 +15,7 @@
         android:visibility="visible"
         app:parallax_factor="1.9">
 
+        <!--WRAPPER-->
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
@@ -24,7 +27,6 @@
                 android:layout_height="wrap_content"
                 android:background="@android:color/black">
 
-
                 <ImageView
                     android:id="@+id/detail_thumbnail_image_view"
                     android:layout_width="match_parent"
@@ -51,21 +53,22 @@
                     tools:visibility="visible"/>
 
                 <Button
-                    android:id="@+id/detail_stream_thumbnail_background_button"
+                    android:id="@+id/detail_thumbnail_background_button"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:background="?attr/selectableItemBackground"/>
 
             </RelativeLayout>
 
-            <!-- TITLE -->
+            <!-- CONTENT -->
             <RelativeLayout
-                android:id="@+id/detail_title_background"
+                android:id="@+id/detail_content_root_layout"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_below="@+id/detail_thumbnail_root_layout"
                 android:background="?android:windowBackground">
 
+                <!-- TITLE -->
                 <RelativeLayout
                     android:id="@+id/detail_title_root_layout"
                     android:layout_width="match_parent"
@@ -106,233 +109,344 @@
 
                 </RelativeLayout>
 
-            </RelativeLayout>
-
-            <!-- CONTENT -->
-            <RelativeLayout
-                android:id="@+id/detail_content_root_layout"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_below="@+id/detail_title_background"
-                android:background="?android:windowBackground"
-                android:visibility="gone"
-                tools:visibility="visible">
-
-
-                <TextView
-                    android:id="@+id/detail_view_count_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_marginLeft="12dp"
-                    android:layout_marginRight="12dp"
-                    android:layout_marginTop="5dp"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textSize="@dimen/video_item_detail_views_text_size"
-                    tools:ignore="RtlHardcoded"
-                    tools:text="10,069,948 views"/>
-
+                <!--HIDING ROOT-->
                 <RelativeLayout
-                    android:id="@+id/detail_description_root_layout"
+                    android:id="@+id/detail_content_root_hiding"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/detail_view_count_view"
-                    android:layout_marginLeft="12dp"
-                    android:layout_marginRight="12dp"
-                    android:layout_marginTop="5dp"
+                    android:layout_height="match_parent"
+                    android:layout_below="@+id/detail_title_root_layout"
                     android:visibility="gone"
                     tools:visibility="visible">
 
-                    <TextView
-                        android:id="@+id/detail_upload_date_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:textSize="@dimen/video_item_detail_upload_date_text_size"
-                        android:textStyle="bold"
-                        tools:text="Upload date"/>
-
-                    <TextView
-                        android:id="@+id/detail_description_view"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@+id/detail_upload_date_view"
-                        android:layout_marginTop="3dp"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:textSize="@dimen/video_item_detail_description_text_size"
-                        tools:text="Description Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum."/>
-                </RelativeLayout>
-
-                <LinearLayout
-                    android:id="@+id/detail_thumbs_root_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignParentRight="true"
-                    android:layout_below="@id/detail_description_root_layout"
-                    android:layout_marginLeft="12dp"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginTop="5dp"
-                    android:gravity="center_vertical"
-                    android:minHeight="30dp">
-
-                    <ImageView
-                        android:id="@+id/detail_thumbs_up_img_view"
-                        android:layout_width="@dimen/video_item_detail_like_image_width"
-                        android:layout_height="@dimen/video_item_detail_like_image_height"
-                        android:contentDescription="@string/detail_likes_img_view_description"
-                        android:src="?attr/thumbs_up"/>
-
-                    <TextView
-                        android:id="@+id/detail_thumbs_up_count_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:layout_marginLeft="5dp"
-                        android:gravity="left|center_vertical"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:textSize="@dimen/video_item_detail_likes_text_size"
-                        tools:ignore="RtlHardcoded"
-                        tools:text="200"/>
-
-                    <ImageView
-                        android:id="@+id/detail_thumbs_down_img_view"
-                        android:layout_width="@dimen/video_item_detail_like_image_width"
-                        android:layout_height="@dimen/video_item_detail_like_image_height"
-                        android:layout_marginLeft="15dp"
-                        android:contentDescription="@string/detail_dislikes_img_view_description"
-                        android:src="?attr/thumbs_down"
-                        tools:ignore="RtlHardcoded"/>
-
-                    <TextView
-                        android:id="@+id/detail_thumbs_down_count_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:layout_marginLeft="5dp"
-                        android:gravity="left|center_vertical"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:textSize="@dimen/video_item_detail_likes_text_size"
-                        tools:ignore="RtlHardcoded"
-                        tools:text="100"/>
-
-                    <TextView
-                        android:id="@+id/detail_thumbs_disabled_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:layout_marginLeft="15dp"
-                        android:gravity="left|center_vertical"
-                        android:text="@string/disabled"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:textSize="@dimen/video_item_detail_likes_text_size"
-                        android:textStyle="bold"
-                        android:visibility="gone"
-                        tools:ignore="RtlHardcoded"
-                        tools:visibility="visible"/>
-                </LinearLayout>
-
-                <FrameLayout
-                    android:id="@+id/detail_uploader_root_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/detail_thumbs_root_layout">
-
+                    <!--DETAIL-->
                     <RelativeLayout
-                        android:id="@+id/detail_uploader_layout"
+                        android:id="@+id/detail_root"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginBottom="8dp"
                         android:layout_marginLeft="12dp"
                         android:layout_marginRight="12dp"
-                        android:layout_marginTop="8dp">
+                        android:baselineAligned="false"
+                        android:orientation="horizontal"
+                        android:paddingTop="6dp">
 
-
-                        <de.hdodenhof.circleimageview.CircleImageView
-                            android:id="@+id/detail_uploader_thumbnail_view"
-                            android:layout_width="@dimen/video_item_detail_uploader_image_size"
-                            android:layout_height="@dimen/video_item_detail_uploader_image_size"
-                            android:layout_alignParentLeft="true"
-                            android:contentDescription="@string/detail_uploader_thumbnail_view_description"
-                            android:src="@drawable/buddy"
-                            tools:ignore="RtlHardcoded"/>
-
-                        <TextView
-                            android:id="@+id/detail_uploader_text_view"
+                        <!-- VIEW & THUMBS -->
+                        <LinearLayout
+                            android:id="@+id/detail_views_thumbs_root"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_centerVertical="true"
-                            android:layout_marginLeft="15dp"
-                            android:layout_toEndOf="@+id/detail_uploader_thumbnail_view"
-                            android:layout_toRightOf="@+id/detail_uploader_thumbnail_view"
-                            android:textAppearance="?android:attr/textAppearanceLarge"
-                            android:textSize="@dimen/video_item_detail_uploader_text_size"
-                            android:textStyle="bold"
-                            tools:ignore="RtlHardcoded"
-                            tools:text="Uploader"/>
+                            android:layout_alignParentLeft="true"
+                            android:layout_centerHorizontal="true"
+                            android:orientation="vertical"
+                            android:paddingTop="6dp"
+                            tools:ignore="RtlHardcoded">
+
+                            <TextView
+                                android:id="@+id/detail_view_count_view"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="left"
+                                android:textAppearance="?android:attr/textAppearanceLarge"
+                                android:textSize="@dimen/video_item_detail_views_text_size"
+                                tools:ignore="RtlHardcoded"
+                                tools:text="2,816,821,505 views"/>
+
+                            <LinearLayout
+                                android:id="@+id/detail_thumbs_root_layout"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="left"
+                                android:gravity="center_vertical"
+                                android:minHeight="30dp"
+                                android:orientation="horizontal">
+
+                                <ImageView
+                                    android:id="@+id/detail_thumbs_up_img_view"
+                                    android:layout_width="@dimen/video_item_detail_like_image_width"
+                                    android:layout_height="@dimen/video_item_detail_like_image_height"
+                                    android:contentDescription="@string/detail_likes_img_view_description"
+                                    android:src="?attr/thumbs_up"/>
+
+                                <TextView
+                                    android:id="@+id/detail_thumbs_up_count_view"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="match_parent"
+                                    android:layout_marginLeft="@dimen/video_item_detail_like_margin"
+                                    android:gravity="left|center_vertical"
+                                    android:textAppearance="?android:attr/textAppearanceMedium"
+                                    android:textSize="@dimen/video_item_detail_likes_text_size"
+                                    tools:ignore="RtlHardcoded"
+                                    tools:text="12M"/>
+
+                                <ImageView
+                                    android:id="@+id/detail_thumbs_down_img_view"
+                                    android:layout_width="@dimen/video_item_detail_like_image_width"
+                                    android:layout_height="@dimen/video_item_detail_like_image_height"
+                                    android:layout_marginLeft="15dp"
+                                    android:contentDescription="@string/detail_dislikes_img_view_description"
+                                    android:src="?attr/thumbs_down"
+                                    tools:ignore="RtlHardcoded"/>
+
+                                <TextView
+                                    android:id="@+id/detail_thumbs_down_count_view"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="match_parent"
+                                    android:layout_marginLeft="@dimen/video_item_detail_like_margin"
+                                    android:gravity="left|center_vertical"
+                                    android:textAppearance="?android:attr/textAppearanceMedium"
+                                    android:textSize="@dimen/video_item_detail_likes_text_size"
+                                    tools:ignore="RtlHardcoded"
+                                    tools:text="10K"/>
+
+                                <TextView
+                                    android:id="@+id/detail_thumbs_disabled_view"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="match_parent"
+                                    android:layout_marginLeft="15dp"
+                                    android:gravity="left|center_vertical"
+                                    android:text="@string/disabled"
+                                    android:textAppearance="?android:attr/textAppearanceLarge"
+                                    android:textSize="@dimen/video_item_detail_likes_text_size"
+                                    android:textStyle="bold"
+                                    android:visibility="gone"
+                                    tools:ignore="RtlHardcoded"/>
+                            </LinearLayout>
+                        </LinearLayout>
+
+                        <!-- CONTROLS -->
+                        <LinearLayout
+                            android:id="@+id/detail_controls_root"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerHorizontal="true"
+                            android:orientation="horizontal"
+                            tools:ignore="RtlHardcoded">
+
+                            <TextView
+                                android:id="@+id/detail_controls_background"
+                                android:layout_width="80dp"
+                                android:layout_height="55dp"
+                                android:layout_gravity="center_vertical"
+                                android:background="?attr/selectableItemBackgroundBorderless"
+                                android:clickable="true"
+                                android:contentDescription="@string/play_audio"
+                                android:drawableTop="?attr/audio"
+                                android:gravity="center"
+                                android:paddingBottom="6dp"
+                                android:paddingTop="6dp"
+                                android:text="@string/controls_background_title"
+                                android:textSize="12sp"/>
+
+                            <TextView
+                                android:id="@+id/detail_controls_popup"
+                                android:layout_width="80dp"
+                                android:layout_height="55dp"
+                                android:layout_gravity="center_vertical"
+                                android:background="?attr/selectableItemBackgroundBorderless"
+                                android:clickable="true"
+                                android:contentDescription="@string/open_in_popup_mode"
+                                android:drawableTop="?attr/popup"
+                                android:gravity="center"
+                                android:paddingBottom="6dp"
+                                android:paddingTop="6dp"
+                                android:text="@string/controls_popup_title"
+                                android:textSize="12sp"/>
+
+                        </LinearLayout>
 
                     </RelativeLayout>
 
-                    <View
+                    <!--UPLOADER-->
+                    <FrameLayout
+                        android:id="@+id/detail_uploader_root_layout"
                         android:layout_width="match_parent"
-                        android:layout_height="1px"
-                        android:layout_gravity="bottom"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginRight="8dp"
-                        android:background="?attr/separatorColor"/>
-
-                    <Button
-                        android:id="@+id/detail_uploader_button"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:background="?attr/selectableItemBackground"
-                        tools:visibility="gone"/>
-                </FrameLayout>
-
-                <RelativeLayout
-                    android:id="@+id/detail_related_streams_root_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_below="@+id/detail_uploader_root_layout"
-                    android:layout_centerHorizontal="true"
-                    android:layout_gravity="center_horizontal|bottom"
-                    android:layout_marginTop="14dp">
-
-                    <TextView
-                        android:id="@+id/detail_next_stream_title"
-                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
-                        android:layout_marginLeft="12dp"
-                        android:text="@string/next_video_title"
-                        android:textAllCaps="true"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:textSize="@dimen/video_item_detail_next_text_size"
-                        tools:ignore="RtlHardcoded"/>
+                        android:layout_below="@+id/detail_root">
 
-                    <LinearLayout
-                        android:id="@+id/detail_related_streams_view"
+                        <RelativeLayout
+                            android:id="@+id/detail_uploader_layout"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="8dp"
+                            android:layout_marginLeft="12dp"
+                            android:layout_marginRight="12dp"
+                            android:layout_marginTop="8dp">
+
+
+                            <de.hdodenhof.circleimageview.CircleImageView
+                                android:id="@+id/detail_uploader_thumbnail_view"
+                                android:layout_width="@dimen/video_item_detail_uploader_image_size"
+                                android:layout_height="@dimen/video_item_detail_uploader_image_size"
+                                android:layout_alignParentLeft="true"
+                                android:contentDescription="@string/detail_uploader_thumbnail_view_description"
+                                android:src="@drawable/buddy"
+                                tools:ignore="RtlHardcoded"/>
+
+                            <TextView
+                                android:id="@+id/detail_uploader_text_view"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_centerVertical="true"
+                                android:layout_marginLeft="15dp"
+                                android:layout_toEndOf="@+id/detail_uploader_thumbnail_view"
+                                android:layout_toRightOf="@+id/detail_uploader_thumbnail_view"
+                                android:textAppearance="?android:attr/textAppearanceLarge"
+                                android:textSize="@dimen/video_item_detail_uploader_text_size"
+                                android:textStyle="bold"
+                                tools:ignore="RtlHardcoded"
+                                tools:text="Uploader"/>
+
+
+                        </RelativeLayout>
+
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="1px"
+                            android:layout_gravity="bottom"
+                            android:layout_marginLeft="8dp"
+                            android:layout_marginRight="8dp"
+                            android:background="?attr/separatorColor"/>
+
+                        <Button
+                            android:id="@+id/detail_uploader_button"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:background="?attr/selectableItemBackground"
+                            tools:visibility="gone"/>
+
+                        <!--<Button
+                            android:id="@+id/detail_uploader_subscribe"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical|right"
+                            android:layout_marginRight="12dp"
+                            android:text="@string/rss_button_title"
+                            android:textSize="12sp"
+                            android:theme="@style/RedButton"
+                            android:drawableLeft="@drawable/ic_rss_feed_white_24dp"
+                            tools:ignore="RtlHardcoded"
+                            android:visibility="gone"/>-->
+                    </FrameLayout>
+
+                    <!--DESCRIPTIONS-->
+                    <RelativeLayout
+                        android:id="@+id/detail_description_root_layout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/detail_uploader_root_layout"
+                        android:layout_marginTop="5dp"
+                        android:visibility="gone"
+                        tools:visibility="visible">
+
+                        <TextView
+                            android:id="@+id/detail_upload_date_view"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="12dp"
+                            android:layout_marginRight="12dp"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:textSize="@dimen/video_item_detail_upload_date_text_size"
+                            android:textStyle="bold"
+                            tools:text="Upload date"/>
+
+                        <TextView
+                            android:id="@+id/detail_description_view"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@+id/detail_upload_date_view"
+                            android:layout_marginBottom="8dp"
+                            android:layout_marginLeft="12dp"
+                            android:layout_marginRight="12dp"
+                            android:layout_marginTop="3dp"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:textSize="@dimen/video_item_detail_description_text_size"
+                            tools:text="Description Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum."/>
+
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="1px"
+                            android:layout_alignParentBottom="true"
+                            android:layout_marginLeft="8dp"
+                            android:layout_marginRight="8dp"
+                            android:background="?attr/separatorColor"/>
+
+                    </RelativeLayout>
+
+                    <!--NEXT AND RELATED VIDEOS-->
+                    <RelativeLayout
+                        android:id="@+id/detail_related_streams_root_layout"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:layout_below="@id/detail_next_stream_title"
-                        android:layout_marginTop="2dp"
-                        android:orientation="vertical"
-                        tools:minHeight="100dp">
-                    </LinearLayout>
+                        android:layout_below="@+id/detail_description_root_layout"
+                        android:layout_centerHorizontal="true"
+                        android:layout_gravity="center_horizontal|bottom"
+                        android:layout_marginTop="14dp">
+
+                        <TextView
+                            android:id="@+id/detail_next_stream_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentLeft="true"
+                            android:layout_marginLeft="12dp"
+                            android:text="@string/next_video_title"
+                            android:textAllCaps="true"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:textSize="@dimen/video_item_detail_next_text_size"
+                            tools:ignore="RtlHardcoded"/>
+
+                        <LinearLayout
+                            android:id="@+id/detail_related_streams_view"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_below="@id/detail_next_stream_title"
+                            android:layout_marginTop="2dp"
+                            android:orientation="vertical"
+                            tools:minHeight="50dp"/>
+
+                        <ImageButton
+                            android:id="@+id/detail_related_streams_expand"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@id/detail_related_streams_view"
+                            android:background="?attr/selectableItemBackground"
+                            android:paddingBottom="10dp"
+                            android:paddingTop="4dp"
+                            android:src="?attr/expand"
+                            android:textAlignment="center"
+                            android:textAllCaps="true"
+                            tools:ignore="ContentDescription"/>
+
+
+                    </RelativeLayout>
+
                 </RelativeLayout>
 
+                <!-- LOADING BAR -->
+                <ProgressBar
+                    android:id="@+id/loading_progress_bar"
+                    style="@style/Widget.AppCompat.ProgressBar"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/detail_title_root_layout"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="15dp"
+                    android:indeterminate="true"
+                    android:visibility="gone"
+                    tools:visibility="visible"/>
+
+                <!--ERROR PANEL-->
+                <include
+                    android:id="@+id/error_panel"
+                    layout="@layout/error_retry"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/detail_title_root_layout"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="@dimen/video_item_detail_error_panel_margin"
+                    android:visibility="gone"
+                    tools:visibility="visible"/>
+
             </RelativeLayout>
-
-            <!-- LOADING BAR -->
-            <ProgressBar
-                android:id="@+id/detail_loading_progress_bar"
-                style="@style/Widget.AppCompat.ProgressBar"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/detail_title_background"
-                android:layout_centerHorizontal="true"
-                android:layout_marginTop="20dp"
-                android:indeterminate="true"/>
-
         </RelativeLayout>
     </com.nirhart.parallaxscroll.views.ParallaxScrollView>
-
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/play_list_item.xml b/app/src/main/res/layout/play_list_item.xml
deleted file mode 100644
index d83591720..000000000
--- a/app/src/main/res/layout/play_list_item.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<FrameLayout
-    android:id="@+id/item_main_layout"
-    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">
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
-
-        <RelativeLayout
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="12dp">
-
-            <RelativeLayout android:id="@+id/itemThumbnailViewContainer"
-                android:layout_marginRight="@dimen/video_item_search_image_right_margin"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                tools:ignore="RtlHardcoded">
-
-                <ImageView
-                    android:id="@+id/itemThumbnailView"
-                    android:contentDescription="@string/list_thumbnail_view_description"
-                    android:layout_width="@dimen/video_item_search_thumbnail_image_width"
-                    android:layout_height="@dimen/video_item_search_thumbnail_image_height"
-                    android:scaleType="centerCrop"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_alignParentTop="true"
-                    android:src="@drawable/dummi_thumbnail_playlist"/>
-
-            </RelativeLayout>
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="fill_parent"
-                android:layout_height="@dimen/video_item_search_thumbnail_image_height"
-                android:layout_toRightOf="@id/itemThumbnailViewContainer"
-                tools:ignore="RtlHardcoded">
-
-                <TextView android:id="@+id/itemTitleView"
-                    android:layout_weight="1"
-                    android:layout_width="fill_parent"
-                    android:layout_height="0dp"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textSize="@dimen/video_item_search_title_text_size"/>
-
-                <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                </LinearLayout>
-
-
-            </LinearLayout>
-
-        </RelativeLayout>
-    </LinearLayout>
-
-    <Button
-        android:id="@+id/item_button"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/selectableItemBackground"/>
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/player_notification.xml b/app/src/main/res/layout/player_notification.xml
index c7b70fb56..958b9bf3d 100644
--- a/app/src/main/res/layout/player_notification.xml
+++ b/app/src/main/res/layout/player_notification.xml
@@ -103,7 +103,7 @@
             android:clickable="true"
             android:padding="5dp"
             android:scaleType="fitCenter"
-            android:src="@drawable/ic_close_white"
+            android:src="@drawable/ic_close_white_24dp"
             tools:ignore="ContentDescription,RtlHardcoded"/>
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/player_notification_expanded.xml b/app/src/main/res/layout/player_notification_expanded.xml
index 46c22a451..22b0fd153 100644
--- a/app/src/main/res/layout/player_notification_expanded.xml
+++ b/app/src/main/res/layout/player_notification_expanded.xml
@@ -28,7 +28,7 @@
         android:clickable="true"
         android:padding="8dp"
         android:scaleType="fitCenter"
-        android:src="@drawable/ic_close_white"
+        android:src="@drawable/ic_close_white_24dp"
         tools:ignore="ContentDescription,RtlHardcoded"/>
 
 
diff --git a/app/src/main/res/layout/player_popup.xml b/app/src/main/res/layout/player_popup.xml
index a3b2b80b6..a3be1511c 100644
--- a/app/src/main/res/layout/player_popup.xml
+++ b/app/src/main/res/layout/player_popup.xml
@@ -173,7 +173,7 @@
         tools:visibility="visible"/>
 
     <RelativeLayout
-        android:id="@+id/loadingPanel"
+        android:id="@+id/loading_panel"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/player_popup_notification.xml b/app/src/main/res/layout/player_popup_notification.xml
index efe46f609..4010064d9 100644
--- a/app/src/main/res/layout/player_popup_notification.xml
+++ b/app/src/main/res/layout/player_popup_notification.xml
@@ -77,6 +77,6 @@
         android:clickable="true"
         android:padding="5dp"
         android:scaleType="fitCenter"
-        android:src="@drawable/ic_close_white"
+        android:src="@drawable/ic_close_white_24dp"
         tools:ignore="ContentDescription,RtlHardcoded"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_layout.xml b/app/src/main/res/layout/settings_layout.xml
new file mode 100644
index 000000000..1e56b5ce8
--- /dev/null
+++ b/app/src/main/res/layout/settings_layout.xml
@@ -0,0 +1,18 @@
+<?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="match_parent"
+    android:orientation="vertical"
+    tools:context="org.schabi.newpipe.MainActivity">
+
+    <FrameLayout
+        android:id="@+id/fragment_holder"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="?attr/actionBarSize"/>
+
+    <include layout="@layout/toolbar_layout"/>
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/stream_item.xml b/app/src/main/res/layout/stream_item.xml
index 0fa478752..4c3c410d8 100644
--- a/app/src/main/res/layout/stream_item.xml
+++ b/app/src/main/res/layout/stream_item.xml
@@ -1,117 +1,96 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<FrameLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/item_main_layout"
+    android:id="@+id/itemRoot"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    android:clickable="true"
+    android:orientation="vertical"
+    android:padding="12dp">
+
+    <ImageView
+        android:id="@+id/itemThumbnailView"
+        android:layout_width="@dimen/video_item_search_thumbnail_image_width"
+        android:layout_height="@dimen/video_item_search_thumbnail_image_height"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginRight="@dimen/video_item_search_image_right_margin"
+        android:contentDescription="@string/list_thumbnail_view_description"
+        android:scaleType="centerCrop"
+        android:src="@drawable/dummy_thumbnail"
+        tools:ignore="RtlHardcoded"/>
+
+    <TextView
+        android:id="@+id/itemDurationView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@id/itemThumbnailView"
+        android:layout_alignRight="@id/itemThumbnailView"
+        android:layout_marginBottom="@dimen/video_item_search_duration_margin"
+        android:layout_marginRight="@dimen/video_item_search_duration_margin"
+        android:background="@color/duration_background_color"
+        android:paddingBottom="@dimen/video_item_search_duration_vertical_padding"
+        android:paddingLeft="@dimen/video_item_search_duration_horizontal_padding"
+        android:paddingRight="@dimen/video_item_search_duration_horizontal_padding"
+        android:paddingTop="@dimen/video_item_search_duration_vertical_padding"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="@color/duration_text_color"
+        android:textSize="@dimen/video_item_search_duration_text_size"
+        tools:ignore="RtlHardcoded"
+        tools:text="1:09:10"/>
 
     <RelativeLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="12dp"
-        android:orientation="vertical">
+        android:layout_height="@dimen/video_item_search_thumbnail_image_height"
+        android:layout_toRightOf="@id/itemThumbnailView"
+        android:orientation="vertical"
+        tools:ignore="RtlHardcoded">
 
-        <RelativeLayout
-            android:id="@+id/itemThumbnailViewContainer"
+        <TextView
+            android:id="@+id/itemVideoTitleView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_above="@+id/itemUploaderView"
+            android:layout_alignParentTop="true"
+            android:ellipsize="end"
+            android:maxLines="2"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textSize="@dimen/video_item_search_title_text_size"
+            tools:text="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/itemUploaderView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_above="@+id/itemUploadDateView"
+            android:maxLines="1"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textSize="@dimen/video_item_search_uploader_text_size"
+            tools:text="Uploader"/>
+
+
+        <TextView
+            android:id="@+id/itemUploadDateView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="@dimen/video_item_search_image_right_margin"
-            tools:ignore="RtlHardcoded">
-
-            <ImageView
-                android:id="@+id/itemThumbnailView"
-                android:layout_width="@dimen/video_item_search_thumbnail_image_width"
-                android:layout_height="@dimen/video_item_search_thumbnail_image_height"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentTop="true"
-                android:contentDescription="@string/list_thumbnail_view_description"
-                android:scaleType="centerCrop"
-                android:src="@drawable/dummy_thumbnail"/>
-
-            <TextView
-                android:id="@+id/itemDurationView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignBottom="@id/itemThumbnailView"
-                android:layout_alignRight="@id/itemThumbnailView"
-                android:layout_marginBottom="@dimen/video_item_search_duration_margin"
-                android:layout_marginRight="@dimen/video_item_search_duration_margin"
-                android:background="@color/duration_background_color"
-                android:paddingBottom="@dimen/video_item_search_duration_vertical_padding"
-                android:paddingLeft="@dimen/video_item_search_duration_horizontal_padding"
-                android:paddingRight="@dimen/video_item_search_duration_horizontal_padding"
-                android:paddingTop="@dimen/video_item_search_duration_vertical_padding"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="@color/duration_text_color"
-                android:textSize="@dimen/video_item_search_duration_text_size"
-                tools:text="1:09:10"/>
-
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/video_item_search_thumbnail_image_height"
-            android:layout_toRightOf="@id/itemThumbnailViewContainer"
-            android:orientation="vertical"
-            tools:ignore="RtlHardcoded">
-
-            <TextView
-                android:id="@+id/itemVideoTitleView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_above="@+id/itemUploaderView"
-                android:layout_alignParentTop="true"
-                android:ellipsize="end"
-                android:maxLines="2"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:textSize="@dimen/video_item_search_title_text_size"
-                tools:text="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/itemUploaderView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_above="@+id/itemUploadDateView"
-                android:maxLines="1"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textSize="@dimen/video_item_search_uploader_text_size"
-                tools:text="Uploader"/>
-
-
-            <TextView
-                android:id="@+id/itemUploadDateView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:maxLines="1"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textSize="@dimen/video_item_search_upload_date_text_size"
-                tools:text="2 years ago • "/>
-
-            <TextView
-                android:id="@+id/itemViewCountView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_toRightOf="@+id/itemUploadDateView"
-                android:maxLines="1"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textSize="@dimen/video_item_search_upload_date_text_size"
-                tools:text="10M views"/>
-
-
-        </RelativeLayout>
+            android:layout_alignParentBottom="true"
+            android:maxLines="1"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textSize="@dimen/video_item_search_upload_date_text_size"
+            tools:text="2 years ago • "/>
 
+        <TextView
+            android:id="@+id/itemViewCountView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_toRightOf="@+id/itemUploadDateView"
+            android:maxLines="1"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textSize="@dimen/video_item_search_upload_date_text_size"
+            tools:text="10M views"/>
     </RelativeLayout>
-
-    <Button
-        android:id="@+id/item_button"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/selectableItemBackground"
-        tools:visibility="gone"/>
-</FrameLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/toolbar_layout.xml b/app/src/main/res/layout/toolbar_layout.xml
new file mode 100644
index 000000000..8fef728fd
--- /dev/null
+++ b/app/src/main/res/layout/toolbar_layout.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/toolbar_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        android:gravity="center_vertical"
+        android:minHeight="?attr/actionBarSize"
+        android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.ActionBar">
+
+        <Spinner
+            android:id="@+id/toolbar_spinner"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical|left"
+            android:visibility="gone"
+            tools:ignore="RtlHardcoded"
+            tools:visibility="visible"/>
+
+        <include
+            android:id="@+id/toolbar_search_container"
+            layout="@layout/toolbar_search_layout"
+            android:visibility="gone"
+            tools:visibility="visible"/>
+
+    </android.support.v7.widget.Toolbar>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="4dp"
+        android:background="@drawable/toolbar_shadow"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/toolbar_search_layout.xml b/app/src/main/res/layout/toolbar_search_layout.xml
new file mode 100644
index 000000000..ceebcc427
--- /dev/null
+++ b/app/src/main/res/layout/toolbar_search_layout.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/actionBarSize"
+    android:background="?attr/colorPrimary">
+
+    <View
+        android:id="@+id/dropdown_anchor"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <AutoCompleteTextView
+        android:id="@+id/toolbar_search_edit_text"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_vertical"
+        android:layout_marginBottom="4dp"
+        android:layout_marginRight="48dp"
+        android:layout_marginTop="4dp"
+        android:background="?attr/colorPrimary"
+        android:drawableLeft="?attr/search"
+        android:drawablePadding="8dp"
+        android:dropDownAnchor="@+id/dropdown_anchor"
+        android:focusable="true"
+        android:imeOptions="actionSearch|flagNoFullscreen"
+        android:inputType="textFilter|textNoSuggestions"
+        android:maxLines="1"
+        tools:hint="Search..."
+        tools:ignore="RtlHardcoded"/>
+
+    <FrameLayout
+        android:id="@+id/toolbar_search_clear"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_gravity="right|center_vertical"
+        tools:ignore="RtlHardcoded">
+
+        <FrameLayout
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            android:layout_gravity="center"
+            android:background="?attr/selectableItemBackgroundBorderless"/>
+
+        <ImageView
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="center"
+            android:contentDescription="@string/search"
+            android:scaleType="fitCenter"
+            android:src="?attr/close"
+            tools:ignore="RtlHardcoded"/>
+    </FrameLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/main_fragment_menu.xml b/app/src/main/res/menu/main_fragment_menu.xml
new file mode 100644
index 000000000..8327e936d
--- /dev/null
+++ b/app/src/main/res/menu/main_fragment_menu.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_search"
+        android:icon="?attr/search"
+        android:title="@string/search"
+        app:showAsAction="always"/>
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/search_menu.xml b/app/src/main/res/menu/search_menu.xml
index d3df69b25..19d76a57b 100644
--- a/app/src/main/res/menu/search_menu.xml
+++ b/app/src/main/res/menu/search_menu.xml
@@ -1,21 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@+id/action_search"
-        android:icon="@android:drawable/ic_menu_search"
-        app:showAsAction="ifRoom"
-        android:title="@string/search"
-        app:actionViewClass="android.support.v7.widget.SearchView" />
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/filter"
+        android:icon="?attr/filter"
+        android:title="@string/filter"
+        app:showAsAction="always">
+        <menu>
+            <group
+                android:id="@+id/search_filter_group"
+                android:checkableBehavior="single">
+                <item
+                    android:id="@+id/menu_filter_all"
+                    android:checked="true"
+                    android:title="@string/all"/>
+                <item
+                    android:id="@+id/menu_filter_video"
+                    android:title="@string/video"/>
+                <item
+                    android:id="@+id/menu_filter_channel"
+                    android:title="@string/channel"/>
+            </group>
+        </menu>
+    </item>
+
 
-    <group android:id="@+id/search_filter_group"
-        android:checkableBehavior="single"
-        android:orderInCategory="999">
-        <item android:id="@+id/menu_filter_all"
-            android:title = "@string/all"
-            android:checked = "true"/>
-        <item android:id="@+id/menu_filter_video"
-            android:title = "@string/video"/>
-        <item android:id="@+id/menu_filter_channel"
-            android:title = "@string/channel"/>
-    </group>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/video_detail_menu.xml b/app/src/main/res/menu/video_detail_menu.xml
new file mode 100644
index 000000000..9ac1ce65c
--- /dev/null
+++ b/app/src/main/res/menu/video_detail_menu.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_item_download"
+        android:icon="?attr/download"
+        android:title="@string/download"
+        app:showAsAction="always"/>
+
+    <item
+        android:id="@+id/menu_item_share"
+        android:icon="?attr/share"
+        android:title="@string/share"
+        app:showAsAction="ifRoom"/>
+
+    <item
+        android:id="@+id/action_play_with_kodi"
+        android:icon="?attr/cast"
+        android:title="@string/play_with_kodi_title"
+        app:showAsAction="ifRoom"/>
+
+    <item
+        android:id="@+id/menu_item_openInBrowser"
+        android:title="@string/open_in_browser"
+        app:showAsAction="never"/>
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/videoitem_detail.xml b/app/src/main/res/menu/videoitem_detail.xml
deleted file mode 100644
index 6143ee974..000000000
--- a/app/src/main/res/menu/videoitem_detail.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item android:id="@+id/menu_item_play_audio"
-        android:title="@string/play_audio"
-        app:showAsAction="ifRoom"
-        android:icon="?attr/audio" />
-
-    <item android:id="@+id/menu_item_download"
-        app:showAsAction="ifRoom"
-        android:title="@string/download"
-        android:icon="?attr/download"/>
-
-    <item android:id="@+id/menu_item_share"
-        android:title="@string/share"
-        app:showAsAction="ifRoom"
-        android:icon="?attr/share"/>
-
-    <item android:id="@+id/action_play_with_kodi"
-        android:title="@string/play_with_kodi_title"
-        app:showAsAction="ifRoom"
-        android:icon="?attr/cast"/>
-
-    <item android:id="@+id/menu_item_popup"
-          app:showAsAction="never"
-          android:title="@string/open_in_popup_mode"/>
-
-    <item android:id="@+id/menu_item_openInBrowser"
-        app:showAsAction="never"
-        android:title="@string/open_in_browser" />
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/videoitem_two_pannel.xml b/app/src/main/res/menu/videoitem_two_pannel.xml
deleted file mode 100644
index 8b96a99d4..000000000
--- a/app/src/main/res/menu/videoitem_two_pannel.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item android:id="@+id/action_settings"
-        app:showAsAction="never"
-        android:title="@string/settings"/>
-
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
index 840a366bf..befa12970 100644
--- a/app/src/main/res/values-land/dimens.xml
+++ b/app/src/main/res/values-land/dimens.xml
@@ -13,15 +13,10 @@
     <dimen name="video_item_search_thumbnail_image_width">142dp</dimen>
     <dimen name="video_item_search_thumbnail_image_height">80dp</dimen>
     <!-- Paddings & Margins -->
-    <dimen name="video_item_search_card_vertical_margin">5dp</dimen>
-    <dimen name="video_item_search_card_horizontal_margin">10dp</dimen>
-    <dimen name="video_item_search_card_padding">10dp</dimen>
     <dimen name="video_item_search_image_right_margin">10dp</dimen>
     <dimen name="video_item_search_duration_vertical_padding">1sp</dimen>
     <dimen name="video_item_search_duration_horizontal_padding">7sp</dimen>
     <dimen name="video_item_search_duration_margin">5sp</dimen>
-    <!-- Miscellaneous -->
-    <dimen name="video_item_search_card_radius">4dp</dimen>
 
     <!-- Video Item Detail View Dimensions-->
     <!-- Text Size -->
@@ -32,13 +27,16 @@
     <dimen name="video_item_detail_upload_date_text_size">14sp</dimen>
     <dimen name="video_item_detail_description_text_size">14sp</dimen>
     <dimen name="video_item_detail_next_text_size">17sp</dimen>
+    <dimen name="channel_subscribers_text_size">14sp</dimen>
+    <dimen name="channel_rss_title_size">14sp</dimen>
     <!-- Elements Size -->
     <dimen name="video_item_detail_uploader_image_size">70dp</dimen>
     <dimen name="video_item_detail_like_image_height">20sp</dimen>
     <dimen name="video_item_detail_like_image_width">20sp</dimen>
+    <dimen name="channel_avatar_size">90dp</dimen>
+    <dimen name="channel_avatar_halo_size">94dp</dimen>
     <!-- Paddings & Margins -->
-    <dimen name="video_item_detail_info_text_padding">10sp</dimen>
-    <dimen name="video_item_detail_like_margin">10sp</dimen>
-    <dimen name="video_item_detail_play_fab_margin">20dp</dimen>
+    <dimen name="video_item_detail_like_margin">8dp</dimen>
+    <dimen name="video_item_detail_error_panel_margin">4dp</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index 105263e24..ed40aa04b 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -3,21 +3,19 @@
 
     <!-- Video Item Detail View Dimensions-->
     <!-- Text Size -->
-    <dimen name="channel_item_detail_title_text_size">21sp</dimen>
-    <dimen name="video_item_detail_title_text_size">20sp</dimen>
+    <dimen name="channel_item_detail_title_text_size">18sp</dimen>
+    <dimen name="video_item_detail_title_text_size">16sp</dimen>
     <dimen name="video_item_detail_views_text_size">16sp</dimen>
     <dimen name="video_item_detail_likes_text_size">14sp</dimen>
     <dimen name="video_item_detail_uploader_text_size">16sp</dimen>
     <dimen name="video_item_detail_upload_date_text_size">16sp</dimen>
     <dimen name="video_item_detail_description_text_size">16sp</dimen>
     <dimen name="video_item_detail_next_text_size">18sp</dimen>
-    <dimen name="video_item_detail_similar_text_size">18sp</dimen>
     <!-- Elements Size -->
     <dimen name="video_item_detail_uploader_image_size">100dp</dimen>
     <dimen name="video_item_detail_like_image_height">18sp</dimen>
     <dimen name="video_item_detail_like_image_width">18sp</dimen>
     <!-- Paddings & Margins -->
-    <dimen name="video_item_detail_info_text_padding">10sp</dimen>
-    <dimen name="video_item_detail_like_margin">10sp</dimen>
+    <dimen name="video_item_detail_like_margin">10dp</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 6460beaf6..29396ccfd 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -7,5 +7,11 @@
     <attr name="share" format="reference"/>
     <attr name="cast" format="reference"/>
     <attr name="rss" format="reference"/>
+    <attr name="search" format="reference"/>
+    <attr name="close" format="reference"/>
+    <attr name="filter" format="reference"/>
+    <attr name="popup" format="reference"/>
+    <attr name="expand" format="reference"/>
+    <attr name="collapse" format="reference"/>
     <attr name="separatorColor" format="color"/>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 01155e064..4e1e0e22c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <!-- Light Theme -->
     <color name="light_background_color">#EEEEEE</color>
-    <color name="light_youtube_primary_color">#CD322E</color>
-    <color name="light_youtube_dark_color">#BC211D</color>
+    <color name="light_youtube_primary_color">#e53935</color>
+    <color name="light_youtube_dark_color">#c62828</color>
     <color name="light_youtube_accent_color">#000000</color>
     <color name="light_separator_color">#32000000</color>
+    <color name="light_ripple_color">#48868686</color>
 
     <!-- Dark Theme -->
     <color name="dark_background_color">#222222</color>
@@ -13,6 +15,7 @@
     <color name="dark_youtube_dark_color">#BC211D</color>
     <color name="dark_youtube_accent_color">#FFFFFF</color>
     <color name="dark_separator_color">#0affffff</color>
+    <color name="dark_ripple_color">#48ffffff</color>
 
     <!-- Black Theme -->
     <color name="black_separator_color">#1effffff</color>
diff --git a/app/src/main/res/values/constants.xml b/app/src/main/res/values/constants.xml
deleted file mode 100644
index e13926f59..000000000
--- a/app/src/main/res/values/constants.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- The minimum subtitle font size. -->
-  <dimen name="subtitle_minimum_font_size">13sp</dimen>
-
-</resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 7505a84d2..b39348290 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -20,13 +20,15 @@
 
     <!-- Video Item Detail View Dimensions-->
     <!-- Text Size -->
-    <dimen name="video_item_detail_title_text_size">18sp</dimen>
+    <dimen name="video_item_detail_title_text_size">16sp</dimen>
     <dimen name="video_item_detail_views_text_size">13sp</dimen>
     <dimen name="video_item_detail_likes_text_size">12sp</dimen>
     <dimen name="video_item_detail_uploader_text_size">14sp</dimen>
     <dimen name="video_item_detail_upload_date_text_size">13sp</dimen>
     <dimen name="video_item_detail_description_text_size">13sp</dimen>
     <dimen name="video_item_detail_next_text_size">15sp</dimen>
+    <dimen name="channel_subscribers_text_size">12sp</dimen>
+    <dimen name="channel_rss_title_size">12sp</dimen>
     <!-- Elements Size -->
     <dimen name="video_item_detail_uploader_image_size">50dp</dimen>
     <dimen name="video_item_detail_like_image_height">18sp</dimen>
@@ -34,12 +36,10 @@
     <dimen name="channel_avatar_size">70dp</dimen>
     <dimen name="channel_avatar_halo_size">74dp</dimen>
     <!-- Paddings & Margins -->
-    <dimen name="video_item_detail_like_margin">6sp</dimen>
+    <dimen name="video_item_detail_like_margin">5dp</dimen>
+    <dimen name="video_item_detail_error_panel_margin">50dp</dimen>
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
-    <dimen name="app_bar_height">180dp</dimen>
-    <dimen name="fab_margin">16dp</dimen>
-    <dimen name="text_margin">16dp</dimen>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 05f45e93c..bcfa65ed2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,6 +26,10 @@
     <string name="use_external_video_player_title">Use external video player</string>
     <string name="use_external_audio_player_title">Use external audio player</string>
     <string name="popup_mode_share_menu_title">NewPipe Popup mode</string>
+    <string name="rss_button_title" translatable="false">RSS</string>
+
+    <string name="controls_background_title">Background</string>
+    <string name="controls_popup_title">Popup</string>
 
     <string name="download_path_title">Video download path</string>
     <string name="download_path_summary">Path to store downloaded videos in.</string>
@@ -102,6 +106,9 @@
     <string name="yes">Yes</string>
     <string name="later">Later</string>
     <string name="disabled">Disabled</string>
+    <string name="filter">Filter</string>
+    <string name="refresh">Refresh</string>
+    <string name="clear">Clear</string>
 
     <!-- error strings -->
     <string name="general_error">Error</string>
@@ -173,7 +180,6 @@
     <string name="short_thousand">K</string>
     <string name="short_million">M</string>
     <string name="short_billion">B</string>
-    <string name="restart_title">Restart</string>
 
     <!-- Missions -->
     <string name="start">Start</string>
@@ -202,7 +208,6 @@
     <string name="msg_wait">Please wait…</string>
     <string name="msg_copied">Copied to clipboard.</string>
     <string name="no_available_dir">Please select an available download directory.</string>
-    <string name="msg_restart">You have to restart the application to apply the theme.\n\nDo you want to restart now?</string>
     <string name="msg_popup_permission">This permission is needed to\nopen in popup mode</string>
 
     <!-- Checksum types -->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 14ec77d89..3ef41885f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -8,9 +8,7 @@
     </style>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light">
-        <item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
-        <item name="actionBarStyle">@style/NewPipeActionbarTheme</item>
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorPrimary">@color/light_youtube_primary_color</item>
         <item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
         <item name="colorAccent">@color/light_youtube_accent_color</item>
@@ -21,17 +19,22 @@
         <item name="download">@drawable/ic_file_download_black_24dp</item>
         <item name="share">@drawable/ic_share_black_24dp</item>
         <item name="cast">@drawable/ic_cast_black_24dp</item>
-        <item name="rss">@drawable/ic_rss_feed_white_24dp</item>
+        <item name="rss">@drawable/ic_rss_feed_black_24dp</item>
+        <item name="search">@drawable/ic_search_black_24dp</item>
+        <item name="close">@drawable/ic_close_black_24dp</item>
+        <item name="filter">@drawable/ic_filter_list_black_24dp</item>
+        <item name="popup">@drawable/ic_picture_in_picture_black_24dp</item>
+        <item name="expand">@drawable/ic_expand_more_black_24dp</item>
+        <item name="collapse">@drawable/ic_expand_less_black_24dp</item>
         <item name="separatorColor">@color/light_separator_color</item>
+        <item name="colorControlHighlight">@color/light_ripple_color</item>
     </style>
 
 
     <!-- Dark Theme-->
-    <style name="DarkTheme" parent="Theme.AppCompat">
-        <item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
-        <item name="actionBarStyle">@style/NewPipeActionbarTheme</item>
+    <style name="DarkTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="colorPrimary">@color/dark_youtube_primary_color</item>
-        <item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
+        <item name="colorPrimaryDark">@color/dark_youtube_dark_color</item>
         <item name="colorAccent">@color/dark_youtube_accent_color</item>
         <item name="android:windowBackground">@color/dark_background_color</item>
         <item name="thumbs_up">@drawable/ic_thumb_up_white_24dp</item>
@@ -41,7 +44,14 @@
         <item name="share">@drawable/ic_share_white_24dp</item>
         <item name="cast">@drawable/ic_cast_white_24dp</item>
         <item name="rss">@drawable/ic_rss_feed_black_24dp</item>
+        <item name="search">@drawable/ic_search_white_24dp</item>
+        <item name="close">@drawable/ic_close_white_24dp</item>
+        <item name="filter">@drawable/ic_filter_list_white_24dp</item>
+        <item name="popup">@drawable/ic_picture_in_picture_white_24dp</item>
+        <item name="expand">@drawable/ic_expand_more_white_24dp</item>
+        <item name="collapse">@drawable/ic_expand_less_white_24dp</item>
         <item name="separatorColor">@color/dark_separator_color</item>
+        <item name="colorControlHighlight">@color/dark_ripple_color</item>
     </style>
 
     <style name="BlackTheme" parent="DarkTheme">
@@ -49,11 +59,9 @@
         <item name="separatorColor">@color/black_separator_color</item>
     </style>
 
-    <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid">
-        <item name="android:displayOptions">showHome</item>
-        <item name="displayOptions">showHome</item>
-        <item name="android:background">@color/light_youtube_primary_color</item>
-        <item name="background">@color/light_youtube_primary_color</item>
+    <style name="RedButton" parent="Widget.AppCompat.Button.Colored">
+        <item name="android:textColor">@color/white</item>
+        <item name="colorButtonNormal">@color/light_youtube_primary_color</item>
     </style>
 
     <style name="VideoPlayerTheme" parent="Theme.AppCompat.Light.DarkActionBar">
@@ -97,23 +105,8 @@
         <item name="colorAccent">@color/light_youtube_accent_color</item>
     </style>
 
-    <style name="AppTheme.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
 
-    <style name="DarkTheme.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
-    <style name="BlackTheme.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
 
 </resources>
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index ba4a40b6d..55b0c8196 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -24,6 +24,7 @@
             android:title="@string/default_resolution_title"
             android:entries="@array/resolution_list"
             android:entryValues="@array/resolution_list"
+            android:summary="%s"
             android:defaultValue="@string/default_resolution_value"/>
 
         <ListPreference
@@ -31,6 +32,7 @@
             android:title="@string/default_popup_resolution_title"
             android:entries="@array/resolution_list"
             android:entryValues="@array/resolution_list"
+            android:summary="%s"
             android:defaultValue="@string/default_popup_resolution_value"/>
 
         <CheckBoxPreference
@@ -45,6 +47,7 @@
             android:entries="@array/video_format_list"
             android:entryValues="@array/video_format_list"
             android:defaultValue="@string/preferred_video_format_default"
+            android:summary="%s"
             tools:summary="MPEG-4"/>
 
         <ListPreference