diff --git a/app/src/main/java/org/schabi/newpipe/ChannelActivity.java b/app/src/main/java/org/schabi/newpipe/ChannelActivity.java
index c8beb31f1..71e02c197 100644
--- a/app/src/main/java/org/schabi/newpipe/ChannelActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ChannelActivity.java
@@ -74,7 +74,7 @@ public class ChannelActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         if (Objects.equals(PreferenceManager.getDefaultSharedPreferences(this)
-                .getString("theme", "1"), "0")) {
+                .getString("theme", getResources().getString(R.string.light_theme_title)), getResources().getString(R.string.dark_theme_title))) {
             setTheme(R.style.DarkTheme_NoActionBar);
         }
         super.onCreate(savedInstanceState);
diff --git a/app/src/main/res/drawable-hdpi/Thumbs.db b/app/src/main/res/drawable-hdpi/Thumbs.db
new file mode 100644
index 000000000..aa501b862
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/Thumbs.db differ
diff --git a/app/src/main/res/drawable-hdpi/ic_cast_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_cast_black_24dp.png
new file mode 100644
index 000000000..a35e1c672
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_cast_black_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_cast_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_cast_white_24dp.png
new file mode 100644
index 000000000..60d3915ed
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_cast_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_file_download_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_file_download_black_24dp.png
new file mode 100644
index 000000000..d9aacea4c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_file_download_black_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png
new file mode 100644
index 000000000..c8a2039c5
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_headset_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_headset_white_24dp.png
new file mode 100644
index 000000000..d25d3888e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_headset_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_share_white_24dp.png
new file mode 100644
index 000000000..b09a6926d
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_share_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_thumb_down_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_thumb_down_black_24dp.png
new file mode 100644
index 000000000..c7807e4d6
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_thumb_down_black_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_thumb_down_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_thumb_down_white_24dp.png
new file mode 100644
index 000000000..3be775a52
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_thumb_down_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_thumb_up_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_thumb_up_black_24dp.png
new file mode 100644
index 000000000..7ffe4fa78
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_thumb_up_black_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_thumb_up_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_thumb_up_white_24dp.png
new file mode 100644
index 000000000..c21a4643d
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_thumb_up_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/Thumbs.db b/app/src/main/res/drawable-mdpi/Thumbs.db
new file mode 100644
index 000000000..8c7eab939
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/Thumbs.db differ
diff --git a/app/src/main/res/drawable-mdpi/ic_cast_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_cast_black_24dp.png
new file mode 100644
index 000000000..aa5d6cd2a
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_cast_black_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_cast_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_cast_white_24dp.png
new file mode 100644
index 000000000..d62923f16
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_cast_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_file_download_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_file_download_black_24dp.png
new file mode 100644
index 000000000..c2c845e84
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_file_download_black_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png
new file mode 100644
index 000000000..d400472fd
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_headset_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_headset_black_24dp.png
new file mode 100644
index 000000000..d872b05d5
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_headset_black_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_headset_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_headset_white_24dp.png
new file mode 100644
index 000000000..df063799d
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_headset_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_share_white_24dp.png
new file mode 100644
index 000000000..e944fd70c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_share_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_thumb_down_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_thumb_down_black_24dp.png
new file mode 100644
index 000000000..fa4d6ff7e
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_thumb_down_black_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_thumb_down_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_thumb_down_white_24dp.png
new file mode 100644
index 000000000..ccb7bb76b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_thumb_down_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_thumb_up_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_thumb_up_black_24dp.png
new file mode 100644
index 000000000..04162adc8
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_thumb_up_black_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_thumb_up_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_thumb_up_white_24dp.png
new file mode 100644
index 000000000..10a6de71f
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_thumb_up_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_cast_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_cast_black_24dp.png
new file mode 100644
index 000000000..1fe4879df
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_cast_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_cast_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_cast_white_24dp.png
new file mode 100644
index 000000000..f5f7c14b3
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_cast_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_file_download_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_file_download_black_24dp.png
new file mode 100644
index 000000000..f5afb24dc
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_file_download_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png
new file mode 100644
index 000000000..f53cc0c62
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_headset_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_headset_black_24dp.png
new file mode 100644
index 000000000..f2664dcde
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_headset_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_headset_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_headset_white_24dp.png
new file mode 100644
index 000000000..d7a741b61
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_headset_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_share_white_24dp.png
new file mode 100644
index 000000000..22a8783e7
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_share_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_thumb_down_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_thumb_down_black_24dp.png
new file mode 100644
index 000000000..a5679f360
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_thumb_down_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_thumb_down_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_thumb_down_white_24dp.png
new file mode 100644
index 000000000..709b89291
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_thumb_down_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_thumb_up_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_thumb_up_black_24dp.png
new file mode 100644
index 000000000..76ccf695a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_thumb_up_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_thumb_up_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_thumb_up_white_24dp.png
new file mode 100644
index 000000000..75ae1f5f1
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_thumb_up_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_cast_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_cast_black_24dp.png
new file mode 100644
index 000000000..454b66b62
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_cast_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_cast_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_cast_white_24dp.png
new file mode 100644
index 000000000..7a7673fb9
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_cast_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_file_download_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_file_download_black_24dp.png
new file mode 100644
index 000000000..ce97c85df
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_file_download_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png
new file mode 100644
index 000000000..78aa59166
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_headset_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_headset_black_24dp.png
new file mode 100644
index 000000000..baf3ee295
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_headset_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_headset_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_headset_white_24dp.png
new file mode 100644
index 000000000..82db5427b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_headset_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png
new file mode 100644
index 000000000..a35b3cd14
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_thumb_down_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_thumb_down_black_24dp.png
new file mode 100644
index 000000000..37ce6c909
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_thumb_down_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_thumb_down_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_thumb_down_white_24dp.png
new file mode 100644
index 000000000..a6e0b10c6
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_thumb_down_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_thumb_up_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_thumb_up_black_24dp.png
new file mode 100644
index 000000000..d7004fe5b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_thumb_up_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_thumb_up_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_thumb_up_white_24dp.png
new file mode 100644
index 000000000..cedf001de
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_thumb_up_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/Thumbs.db b/app/src/main/res/drawable-xxxhdpi/Thumbs.db
new file mode 100644
index 000000000..72fff2fb4
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/Thumbs.db differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_cast_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_cast_black_24dp.png
new file mode 100644
index 000000000..9dbfcd941
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_cast_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_cast_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_cast_white_24dp.png
new file mode 100644
index 000000000..bb3539c64
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_cast_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_file_download_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_file_download_black_24dp.png
new file mode 100644
index 000000000..8c83bffa7
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_file_download_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png
new file mode 100644
index 000000000..ded5652e4
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_headset_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_headset_black_24dp.png
new file mode 100644
index 000000000..974457ee1
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_headset_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_headset_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_headset_white_24dp.png
new file mode 100644
index 000000000..0f0b2e154
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_headset_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png
new file mode 100644
index 000000000..e351c7beb
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_thumb_down_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_thumb_down_black_24dp.png
new file mode 100644
index 000000000..cea7381b5
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_thumb_down_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_thumb_down_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_thumb_down_white_24dp.png
new file mode 100644
index 000000000..afecc66b7
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_thumb_down_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_thumb_up_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_thumb_up_black_24dp.png
new file mode 100644
index 000000000..8d9682036
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_thumb_up_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_thumb_up_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_thumb_up_white_24dp.png
new file mode 100644
index 000000000..f43cef8ec
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_thumb_up_white_24dp.png differ