diff --git a/README.md b/README.md
index b154fad58..a171823d5 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
 <p align="center"><a href="#screenshots">Screenshots</a> &bull; <a href="#description">Description</a> &bull; <a href="#features">Features</a> &bull; <a href="#contribution">Contribution</a> &bull; <a href="#donate">Donate</a> &bull; <a href="#license">License</a></p>
 <p align="center"><a href="https://newpipe.schabi.org">Website</a> &bull; <a href="https://newpipe.schabi.org/blog/">Blog</a>  &bull; <a href="https://newpipe.schabi.org/press/">Press</a></p>
 <hr />
-WARNING: PUTTING NEWPIPE OR ANY FORK OF IT INTO GOOGLE PLAYSTORE VIOLATES THEIR TERMS OF CONDITIONS.
+**WARNING: PUTTING NEWPIPE OR ANY FORK OF IT INTO GOOGLE PLAYSTORE VIOLATES THEIR TERMS OF CONDITIONS.**
 
 ## Screenshots
 
@@ -29,6 +29,8 @@ WARNING: PUTTING NEWPIPE OR ANY FORK OF IT INTO GOOGLE PLAYSTORE VIOLATES THEIR
 [<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_8.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_8.png)
 [<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_9.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_9.png)
 [<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_10.png" width=160>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_10.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_11.png" width=405>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_11.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/shot_12.png" width=405>](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_12.png)
 
 ## Description
 
@@ -61,11 +63,11 @@ NewPipe does not use any Google framework libraries, or the YouTube API. It only
 * Queuing videos
 * Local playlists
 * Subtitles
-* Multi-service support (eg. SoundCloud in NewPipe Beta)
+* Multi-service support (eg. SoundCloud \[beta\])
+* Livestream support
 
 ### Coming Features
 
-* Livestream support
 * Cast to UPnP and Cast
 * Show comments
 * ... and many more
diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java
index f436a26b8..dfce8f100 100644
--- a/app/src/main/java/org/schabi/newpipe/App.java
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -106,7 +106,7 @@ public class App extends Application {
         // https://github.com/ReactiveX/RxJava/wiki/What's-different-in-2.0#error-handling
         RxJavaPlugins.setErrorHandler(new Consumer<Throwable>() {
             @Override
-            public void accept(@NonNull Throwable throwable) throws Exception {
+            public void accept(@NonNull Throwable throwable) {
                 Log.e(TAG, "RxJavaPlugins.ErrorHandler called with -> : " +
                         "throwable = [" + throwable.getClass().getName() + "]");
 
diff --git a/app/src/main/java/org/schabi/newpipe/BaseFragment.java b/app/src/main/java/org/schabi/newpipe/BaseFragment.java
index b125ab02f..4e4cdcc0d 100644
--- a/app/src/main/java/org/schabi/newpipe/BaseFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/BaseFragment.java
@@ -12,14 +12,12 @@ import android.view.View;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.squareup.leakcanary.RefWatcher;
 
-import org.schabi.newpipe.report.UserAction;
-
 import icepick.Icepick;
 import icepick.State;
 
 public abstract class BaseFragment extends Fragment {
     protected final String TAG = getClass().getSimpleName() + "@" + Integer.toHexString(hashCode());
-    protected boolean DEBUG = MainActivity.DEBUG;
+    protected final boolean DEBUG = MainActivity.DEBUG;
 
     protected AppCompatActivity activity;
     public static final ImageLoader imageLoader = ImageLoader.getInstance();
diff --git a/app/src/main/java/org/schabi/newpipe/Downloader.java b/app/src/main/java/org/schabi/newpipe/Downloader.java
index 17dc5859d..68f7e080f 100644
--- a/app/src/main/java/org/schabi/newpipe/Downloader.java
+++ b/app/src/main/java/org/schabi/newpipe/Downloader.java
@@ -43,7 +43,7 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
 
     private static Downloader instance;
     private String mCookies;
-    private OkHttpClient client;
+    private final OkHttpClient client;
 
     private Downloader(OkHttpClient.Builder builder) {
         this.client = builder
diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index 7c77bff3d..a9f2e9622 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -23,7 +23,6 @@ package org.schabi.newpipe;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -66,8 +65,6 @@ import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.StateSaver;
 import org.schabi.newpipe.util.ThemeHelper;
 
-import static org.schabi.newpipe.extractor.InfoItem.InfoType.PLAYLIST;
-
 public class MainActivity extends AppCompatActivity {
     private static final String TAG = "MainActivity";
     public static final boolean DEBUG = !BuildConfig.BUILD_TYPE.equals("release");
diff --git a/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java b/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
index a4e6730da..74c818bf9 100644
--- a/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java
@@ -85,7 +85,7 @@ public class ReCaptchaActivity extends AppCompatActivity {
     }
 
     private class ReCaptchaWebViewClient extends WebViewClient {
-        private Activity context;
+        private final Activity context;
         private String mCookies;
 
         ReCaptchaWebViewClient(Activity ctx) {
diff --git a/app/src/main/java/org/schabi/newpipe/RouterActivity.java b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
index 4f1fdeab2..e22e2f474 100644
--- a/app/src/main/java/org/schabi/newpipe/RouterActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
@@ -1,7 +1,6 @@
 package org.schabi.newpipe;
 
 import android.annotation.SuppressLint;
-import android.app.FragmentManager;
 import android.app.IntentService;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -13,7 +12,6 @@ import android.preference.PreferenceManager;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
 import android.support.v4.app.NotificationCompat;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
@@ -38,7 +36,6 @@ import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.VideoStream;
-import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
 import org.schabi.newpipe.player.helper.PlayerHelper;
 import org.schabi.newpipe.player.playqueue.ChannelPlayQueue;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
@@ -51,14 +48,12 @@ import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.ThemeHelper;
 
-import java.io.IOException;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Observer;
 
 import icepick.Icepick;
 import icepick.State;
@@ -86,7 +81,7 @@ public class RouterActivity extends AppCompatActivity {
     protected int selectedPreviously = -1;
 
     protected String currentUrl;
-    protected CompositeDisposable disposables = new CompositeDisposable();
+    protected final CompositeDisposable disposables = new CompositeDisposable();
 
     private boolean selectionIsDownload = false;
 
@@ -184,12 +179,16 @@ public class RouterActivity extends AppCompatActivity {
         if (selectedChoiceKey.equals(alwaysAskKey)) {
             final List<AdapterChoiceItem> choices = getChoicesForService(currentService, currentLinkType);
 
-            if (choices.size() == 1) {
-                handleChoice(choices.get(0).key);
-            } else if (choices.size() == 0) {
-                handleChoice(showInfoKey);
-            } else {
-                showDialog(choices);
+            switch (choices.size()) {
+                case 1:
+                    handleChoice(choices.get(0).key);
+                    break;
+                case 0:
+                    handleChoice(showInfoKey);
+                    break;
+                default:
+                    showDialog(choices);
+                    break;
             }
         } else if (selectedChoiceKey.equals(showInfoKey)) {
             handleChoice(showInfoKey);
diff --git a/app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.java b/app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.java
index 701e18cbf..09d33bd8a 100644
--- a/app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.java
@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AlertDialog;
 import android.webkit.WebView;
@@ -17,7 +16,7 @@ import java.lang.ref.WeakReference;
 
 public class LicenseFragmentHelper extends AsyncTask<Object, Void, Integer> {
 
-    WeakReference<Activity> weakReference;
+    final WeakReference<Activity> weakReference;
     private License license;
 
     public LicenseFragmentHelper(@Nullable Activity activity) {
@@ -78,18 +77,18 @@ public class LicenseFragmentHelper extends AsyncTask<Object, Void, Integer> {
             throw new NullPointerException("license is null");
         }
 
-        String licenseContent = "";
+        StringBuilder licenseContent = new StringBuilder();
         String webViewData;
         try {
             BufferedReader in = new BufferedReader(new InputStreamReader(context.getAssets().open(license.getFilename()), "UTF-8"));
             String str;
             while ((str = in.readLine()) != null) {
-                licenseContent += str;
+                licenseContent.append(str);
             }
             in.close();
 
             // split the HTML file and insert the stylesheet into the HEAD of the file
-            String[] insert = licenseContent.split("</head>");
+            String[] insert = licenseContent.toString().split("</head>");
             webViewData = insert[0] + "<style type=\"text/css\">"
                     + getLicenseStylesheet(context) + "</style></head>"
                     + insert[1];
diff --git a/app/src/main/java/org/schabi/newpipe/database/BasicDAO.java b/app/src/main/java/org/schabi/newpipe/database/BasicDAO.java
index 425c122ca..13117145a 100644
--- a/app/src/main/java/org/schabi/newpipe/database/BasicDAO.java
+++ b/app/src/main/java/org/schabi/newpipe/database/BasicDAO.java
@@ -30,7 +30,7 @@ public interface BasicDAO<Entity> {
 
     /* Deletes */
     @Delete
-    int delete(final Entity entity);
+    void delete(final Entity entity);
 
     @Delete
     int delete(final Collection<Entity> entities);
@@ -42,5 +42,5 @@ public interface BasicDAO<Entity> {
     int update(final Entity entity);
 
     @Update
-    int update(final Collection<Entity> entities);
+    void update(final Collection<Entity> entities);
 }
diff --git a/app/src/main/java/org/schabi/newpipe/database/history/dao/SearchHistoryDAO.java b/app/src/main/java/org/schabi/newpipe/database/history/dao/SearchHistoryDAO.java
index b0a3c3a3c..83e629e48 100644
--- a/app/src/main/java/org/schabi/newpipe/database/history/dao/SearchHistoryDAO.java
+++ b/app/src/main/java/org/schabi/newpipe/database/history/dao/SearchHistoryDAO.java
@@ -4,7 +4,6 @@ import android.arch.persistence.room.Dao;
 import android.arch.persistence.room.Query;
 import android.support.annotation.Nullable;
 
-import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.history.model.SearchHistoryEntry;
 
 import java.util.List;
diff --git a/app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.java b/app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.java
index fd7a1b96f..847153e12 100644
--- a/app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.java
+++ b/app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.java
@@ -5,7 +5,6 @@ import android.arch.persistence.room.Dao;
 import android.arch.persistence.room.Query;
 import android.support.annotation.Nullable;
 
-import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.history.model.StreamHistoryEntry;
 import org.schabi.newpipe.database.stream.StreamStatisticsEntry;
 import org.schabi.newpipe.database.history.model.StreamHistoryEntity;
diff --git a/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistDAO.java b/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistDAO.java
index 88d5645af..7a6282f96 100644
--- a/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistDAO.java
+++ b/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistDAO.java
@@ -2,7 +2,6 @@ package org.schabi.newpipe.database.playlist.dao;
 
 import android.arch.persistence.room.Dao;
 import android.arch.persistence.room.Query;
-import android.arch.persistence.room.Transaction;
 
 import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.playlist.model.PlaylistEntity;
@@ -12,7 +11,6 @@ import java.util.List;
 import io.reactivex.Flowable;
 
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_ID;
-import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_NAME;
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_TABLE;
 
 @Dao
diff --git a/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistStreamDAO.java b/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistStreamDAO.java
index 8bf1ea696..8b6d62ca4 100644
--- a/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistStreamDAO.java
+++ b/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistStreamDAO.java
@@ -8,7 +8,6 @@ import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
 import org.schabi.newpipe.database.playlist.PlaylistStreamEntry;
 import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity;
-import org.schabi.newpipe.database.stream.model.StreamEntity;
 
 import java.util.List;
 
diff --git a/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistEntity.java b/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistEntity.java
index a3ec1b5f2..bfda8eeec 100644
--- a/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistEntity.java
+++ b/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistEntity.java
@@ -5,8 +5,6 @@ import android.arch.persistence.room.Entity;
 import android.arch.persistence.room.Index;
 import android.arch.persistence.room.PrimaryKey;
 
-import java.util.Date;
-
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_NAME;
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_TABLE;
 
diff --git a/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistRemoteEntity.java b/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistRemoteEntity.java
index e2f2c8b08..ab917a22b 100644
--- a/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistRemoteEntity.java
+++ b/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistRemoteEntity.java
@@ -6,7 +6,6 @@ import android.arch.persistence.room.Ignore;
 import android.arch.persistence.room.Index;
 import android.arch.persistence.room.PrimaryKey;
 
-import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.playlist.PlaylistLocalItem;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
 import org.schabi.newpipe.util.Constants;
diff --git a/app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.java b/app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.java
index 63f9e5940..396a29fca 100644
--- a/app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.java
+++ b/app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.java
@@ -10,7 +10,6 @@ import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity;
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.database.history.model.StreamHistoryEntity;
-import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,7 +22,6 @@ import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_SERVI
 import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_TABLE;
 import static org.schabi.newpipe.database.stream.model.StreamEntity.STREAM_URL;
 import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.STREAM_HISTORY_TABLE;
-import static org.schabi.newpipe.database.stream.model.StreamStateEntity.STREAM_STATE_TABLE;
 
 @Dao
 public abstract class StreamDAO implements BasicDAO<StreamEntity> {
diff --git a/app/src/main/java/org/schabi/newpipe/download/DeleteDownloadManager.java b/app/src/main/java/org/schabi/newpipe/download/DeleteDownloadManager.java
index f2912a6fa..5a2d4a486 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DeleteDownloadManager.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DeleteDownloadManager.java
@@ -28,11 +28,11 @@ public class DeleteDownloadManager {
 
     private static final String KEY_STATE = "delete_manager_state";
 
-    private View mView;
-    private HashSet<String> mPendingMap;
-    private List<Disposable> mDisposableList;
+    private final View mView;
+    private final HashSet<String> mPendingMap;
+    private final List<Disposable> mDisposableList;
     private DownloadManager mDownloadManager;
-    private PublishSubject<DownloadMission> publishSubject = PublishSubject.create();
+    private final PublishSubject<DownloadMission> publishSubject = PublishSubject.create();
 
     DeleteDownloadManager(Activity activity) {
         mPendingMap = new HashSet<>();
diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
index 75f05cd16..9bbda6032 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
@@ -55,7 +55,7 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
     private StreamItemAdapter<AudioStream> audioStreamsAdapter;
     private StreamItemAdapter<VideoStream> videoStreamsAdapter;
 
-    private CompositeDisposable disposables = new CompositeDisposable();
+    private final CompositeDisposable disposables = new CompositeDisposable();
 
     private EditText nameEditText;
     private Spinner streamsSpinner;
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java
index 589d15bd4..acee1f111 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java
@@ -32,7 +32,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import icepick.State;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.functions.Consumer;
 
 import static org.schabi.newpipe.util.AnimationUtils.animateView;
 
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/BlankFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/BlankFragment.java
index 4ee90f083..948e9377d 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/BlankFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/BlankFragment.java
@@ -2,7 +2,6 @@ package org.schabi.newpipe.fragments;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/StackItem.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/StackItem.java
index b8957f33c..f7f8ad702 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/StackItem.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/StackItem.java
@@ -3,9 +3,9 @@ package org.schabi.newpipe.fragments.detail;
 import java.io.Serializable;
 
 class StackItem implements Serializable {
-    private int serviceId;
+    private final int serviceId;
     private String title;
-    private String url;
+    private final String url;
 
     StackItem(int serviceId, String url, String title) {
         this.serviceId = serviceId;
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index c726f8cee..9ab40e81c 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -33,12 +33,14 @@ import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.widget.AdapterView;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
+import android.widget.ScrollView;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -64,19 +66,17 @@ import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.fragments.BackPressable;
 import org.schabi.newpipe.fragments.BaseStateFragment;
-import org.schabi.newpipe.local.history.HistoryRecordManager;
-import org.schabi.newpipe.report.ErrorActivity;
-import org.schabi.newpipe.util.StreamItemAdapter;
-import org.schabi.newpipe.util.StreamItemAdapter.StreamSizeWrapper;
-import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
 import org.schabi.newpipe.info_list.InfoItemDialog;
+import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
+import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.player.MainVideoPlayer;
 import org.schabi.newpipe.player.PopupVideoPlayer;
 import org.schabi.newpipe.player.helper.PlayerHelper;
 import org.schabi.newpipe.player.old.PlayVideoActivity;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.ExtractorHelper;
@@ -87,6 +87,8 @@ import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.OnClickGesture;
 import org.schabi.newpipe.util.PermissionHelper;
+import org.schabi.newpipe.util.StreamItemAdapter;
+import org.schabi.newpipe.util.StreamItemAdapter.StreamSizeWrapper;
 import org.schabi.newpipe.util.ThemeHelper;
 
 import java.io.Serializable;
@@ -154,6 +156,7 @@ public class VideoDetailFragment
 
     private View videoTitleRoot;
     private TextView videoTitleTextView;
+    @Nullable
     private ImageView videoTitleToggleArrow;
     private TextView videoCountView;
 
@@ -415,14 +418,16 @@ public class VideoDetailFragment
     }
 
     private void toggleTitleAndDescription() {
-        if (videoDescriptionRootLayout.getVisibility() == View.VISIBLE) {
-            videoTitleTextView.setMaxLines(1);
-            videoDescriptionRootLayout.setVisibility(View.GONE);
-            videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
-        } else {
-            videoTitleTextView.setMaxLines(10);
-            videoDescriptionRootLayout.setVisibility(View.VISIBLE);
-            videoTitleToggleArrow.setImageResource(R.drawable.arrow_up);
+        if (videoTitleToggleArrow != null) {    //it is null for tablets
+            if (videoDescriptionRootLayout.getVisibility() == View.VISIBLE) {
+                videoTitleTextView.setMaxLines(1);
+                videoDescriptionRootLayout.setVisibility(View.GONE);
+                videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
+            } else {
+                videoTitleTextView.setMaxLines(10);
+                videoDescriptionRootLayout.setVisibility(View.VISIBLE);
+                videoTitleToggleArrow.setImageResource(R.drawable.arrow_up);
+            }
         }
     }
 
@@ -622,8 +627,11 @@ public class VideoDetailFragment
             relatedStreamsView.addView(
                     infoItemBuilder.buildView(relatedStreamsView, info.getNextVideo()));
             relatedStreamsView.addView(getSeparatorView());
-            relatedStreamRootLayout.setVisibility(View.VISIBLE);
-        } else nextStreamTitle.setVisibility(View.GONE);
+            setRelatedStreamsVisibility(View.VISIBLE);
+        } else {
+            nextStreamTitle.setVisibility(View.GONE);
+            setRelatedStreamsVisibility(View.GONE);
+        }
 
         if (info.getRelatedStreams() != null
                 && !info.getRelatedStreams().isEmpty() && showRelatedStreams) {
@@ -639,13 +647,13 @@ public class VideoDetailFragment
             }
             //if (DEBUG) Log.d(TAG, "Total time " + ((System.nanoTime() - first) / 1000000L) + "ms");
 
-            relatedStreamRootLayout.setVisibility(View.VISIBLE);
+            setRelatedStreamsVisibility(View.VISIBLE);
             relatedStreamExpandButton.setVisibility(View.VISIBLE);
 
             relatedStreamExpandButton.setImageDrawable(ContextCompat.getDrawable(
                     activity, ThemeHelper.resolveResourceIdFromAttr(activity, R.attr.expand)));
         } else {
-            if (info.getNextVideo() == null) relatedStreamRootLayout.setVisibility(View.GONE);
+            if (info.getNextVideo() == null) setRelatedStreamsVisibility(View.GONE);
             relatedStreamExpandButton.setVisibility(View.GONE);
         }
     }
@@ -760,7 +768,7 @@ public class VideoDetailFragment
      * Stack that contains the "navigation history".<br>
      * The peek is the current video.
      */
-    protected LinkedList<StackItem> stack = new LinkedList<>();
+    protected final LinkedList<StackItem> stack = new LinkedList<>();
 
     public void clearHistory() {
         stack.clear();
@@ -1114,8 +1122,16 @@ public class VideoDetailFragment
         animateView(videoTitleTextView, true, 0);
 
         videoDescriptionRootLayout.setVisibility(View.GONE);
-        videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
-        videoTitleToggleArrow.setVisibility(View.GONE);
+        if (videoTitleToggleArrow != null) {    //phone
+            videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
+            videoTitleToggleArrow.setVisibility(View.GONE);
+        } else {    //tablet
+            final View related = (View) relatedStreamRootLayout.getParent();
+            //don`t need to hide it if related streams are disabled
+            if (related.getVisibility() == View.VISIBLE) {
+                related.setVisibility(View.INVISIBLE);
+            }
+        }
         videoTitleRoot.setClickable(false);
 
         imageLoader.cancelDisplayTask(thumbnailImageView);
@@ -1190,11 +1206,15 @@ public class VideoDetailFragment
             detailDurationView.setVisibility(View.GONE);
         }
 
-        videoTitleRoot.setClickable(true);
-        videoTitleToggleArrow.setVisibility(View.VISIBLE);
-        videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
         videoDescriptionView.setVisibility(View.GONE);
-        videoDescriptionRootLayout.setVisibility(View.GONE);
+        if (videoTitleToggleArrow != null) {
+            videoTitleRoot.setClickable(true);
+            videoTitleToggleArrow.setVisibility(View.VISIBLE);
+            videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
+            videoDescriptionRootLayout.setVisibility(View.GONE);
+        } else {
+            videoDescriptionRootLayout.setVisibility(View.VISIBLE);
+        }
         if (!TextUtils.isEmpty(info.getUploadDate())) {
             videoUploadDateView.setText(Localization.localizeDate(activity, info.getUploadDate()));
         }
@@ -1242,6 +1262,11 @@ public class VideoDetailFragment
             // Only auto play in the first open
             autoPlayEnabled = false;
         }
+
+        final ViewParent related = relatedStreamRootLayout.getParent();
+        if (related instanceof ScrollView) {
+            ((ScrollView) related).scrollTo(0, 0);
+        }
     }
 
 
@@ -1299,4 +1324,13 @@ public class VideoDetailFragment
 
         showError(getString(R.string.blocked_by_gema), false, R.drawable.gruese_die_gema);
     }
+
+    private void setRelatedStreamsVisibility(int visibility) {
+        final ViewParent parent = relatedStreamRootLayout.getParent();
+        if (parent instanceof ScrollView) {
+            ((ScrollView) parent).setVisibility(visibility);
+        } else {
+            relatedStreamRootLayout.setVisibility(visibility);
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
index c70ea2b19..0816334ea 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
@@ -3,10 +3,15 @@ package org.schabi.newpipe.fragments.list;
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
@@ -21,9 +26,9 @@ import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.fragments.BaseStateFragment;
 import org.schabi.newpipe.fragments.OnScrollBelowItemsListener;
-import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
 import org.schabi.newpipe.info_list.InfoItemDialog;
 import org.schabi.newpipe.info_list.InfoListAdapter;
+import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
 import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.util.NavigationHelper;
@@ -36,7 +41,7 @@ import java.util.Queue;
 
 import static org.schabi.newpipe.util.AnimationUtils.animateView;
 
-public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implements ListViewContract<I, N>, StateSaver.WriteRead {
+public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implements ListViewContract<I, N>, StateSaver.WriteRead, SharedPreferences.OnSharedPreferenceChangeListener {
 
     /*//////////////////////////////////////////////////////////////////////////
     // Views
@@ -44,6 +49,9 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
 
     protected InfoListAdapter infoListAdapter;
     protected RecyclerView itemsList;
+    private int updateFlags = 0;
+
+    private static final int LIST_MODE_UPDATE_FLAG = 0x32;
 
     /*//////////////////////////////////////////////////////////////////////////
     // LifeCycle
@@ -59,12 +67,31 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .registerOnSharedPreferenceChangeListener(this);
     }
 
     @Override
     public void onDestroy() {
         super.onDestroy();
         StateSaver.onDestroy(savedState);
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .unregisterOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        if (updateFlags != 0) {
+            if ((updateFlags & LIST_MODE_UPDATE_FLAG) != 0) {
+                final boolean useGrid = isGridLayout();
+                itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
+                infoListAdapter.setGridItemVariants(useGrid);
+                infoListAdapter.notifyDataSetChanged();
+            }
+            updateFlags = 0;
+        }
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -119,13 +146,25 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
         return new LinearLayoutManager(activity);
     }
 
+    protected RecyclerView.LayoutManager getGridLayoutManager() {
+        final Resources resources = activity.getResources();
+        int width = resources.getDimensionPixelSize(R.dimen.video_item_grid_thumbnail_image_width);
+        width += (24 * resources.getDisplayMetrics().density);
+        final int spanCount = (int) Math.floor(resources.getDisplayMetrics().widthPixels / (double)width);
+        final GridLayoutManager lm = new GridLayoutManager(activity, spanCount);
+        lm.setSpanSizeLookup(infoListAdapter.getSpanSizeLookup(spanCount));
+        return lm;
+    }
+
     @Override
     protected void initViews(View rootView, Bundle savedInstanceState) {
         super.initViews(rootView, savedInstanceState);
 
+        final boolean useGrid = isGridLayout();
         itemsList = rootView.findViewById(R.id.items_list);
-        itemsList.setLayoutManager(getListLayoutManager());
+        itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
 
+        infoListAdapter.setGridItemVariants(useGrid);
         infoListAdapter.setFooter(getListFooter());
         infoListAdapter.setHeader(getListHeader());
 
@@ -308,4 +347,22 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
     public void handleNextItems(N result) {
         isLoading.set(false);
     }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        if (key.equals(getString(R.string.list_view_mode_key))) {
+            updateFlags |= LIST_MODE_UPDATE_FLAG;
+        }
+    }
+
+    protected boolean isGridLayout() {
+        final String list_mode = PreferenceManager.getDefaultSharedPreferences(activity).getString(getString(R.string.list_view_mode_key), getString(R.string.list_view_mode_value));
+        if ("auto".equals(list_mode)) {
+            final Configuration configuration = getResources().getConfiguration();
+            return configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+                    && configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
+        } else {
+            return "grid".equals(list_mode);
+        }
+    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java
index e702c602f..5d042c949 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java
@@ -8,9 +8,6 @@ import android.view.View;
 
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.ListInfo;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
-import org.schabi.newpipe.extractor.linkhandler.LinkHandler;
 import org.schabi.newpipe.util.Constants;
 
 import java.util.Queue;
@@ -19,7 +16,6 @@ import icepick.State;
 import io.reactivex.Single;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;
 
 public abstract class BaseListInfoFragment<I extends ListInfo>
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
index 9a52b8d12..6a3b3eb50 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
@@ -68,7 +68,7 @@ import static org.schabi.newpipe.util.AnimationUtils.animateView;
 
 public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
 
-    private CompositeDisposable disposables = new CompositeDisposable();
+    private final CompositeDisposable disposables = new CompositeDisposable();
     private Disposable subscribeButtonMonitor;
     private SubscriptionService subscriptionService;
 
@@ -90,8 +90,6 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
 
     private MenuItem menuRssButton;
 
-    private boolean mIsVisibleToUser = false;
-
     public static ChannelFragment getInstance(int serviceId, String url, String name) {
         ChannelFragment instance = new ChannelFragment();
         instance.setInitialData(serviceId, url, name);
@@ -105,7 +103,6 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
     @Override
     public void setUserVisibleHint(boolean isVisibleToUser) {
         super.setUserVisibleHint(isVisibleToUser);
-        mIsVisibleToUser = isVisibleToUser;
         if(activity != null
                 && useAsFrontPage
                 && isVisibleToUser) {
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java
index 833d0f55e..92138f7db 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java
@@ -5,7 +5,6 @@ import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -19,8 +18,6 @@ import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.kiosk.KioskInfo;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
-import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
-import org.schabi.newpipe.extractor.linkhandler.LinkHandlerFactory;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.ExtractorHelper;
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
index b7a42791c..0019a3819 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java
@@ -20,7 +20,6 @@ import android.widget.TextView;
 
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
-import org.schabi.newpipe.App;
 import org.schabi.newpipe.NewPipeDatabase;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
@@ -30,7 +29,6 @@ import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
-import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
 import org.schabi.newpipe.info_list.InfoItemDialog;
 import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
index a699e28bc..19c7d463e 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
@@ -122,12 +122,11 @@ public class SearchFragment
     private String nextPageUrl;
     private String contentCountry;
     private boolean isSuggestionsEnabled = true;
-    private boolean isSearchHistoryEnabled = true;
 
-    private PublishSubject<String> suggestionPublisher = PublishSubject.create();
+    private final PublishSubject<String> suggestionPublisher = PublishSubject.create();
     private Disposable searchDisposable;
     private Disposable suggestionDisposable;
-    private CompositeDisposable disposables = new CompositeDisposable();
+    private final CompositeDisposable disposables = new CompositeDisposable();
 
     private SuggestionListAdapter suggestionListAdapter;
     private HistoryRecordManager historyRecordManager;
@@ -173,7 +172,7 @@ public class SearchFragment
 
         suggestionListAdapter = new SuggestionListAdapter(activity);
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
-        isSearchHistoryEnabled = preferences.getBoolean(getString(R.string.enable_search_history_key), true);
+        boolean isSearchHistoryEnabled = preferences.getBoolean(getString(R.string.enable_search_history_key), true);
         suggestionListAdapter.setShowSuggestionHistory(isSearchHistoryEnabled);
 
         historyRecordManager = new HistoryRecordManager(context);
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java
index 78867c81f..f473e5d08 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java
@@ -45,7 +45,7 @@ public class InfoItemBuilder {
     private static final String TAG = InfoItemBuilder.class.toString();
 
     private final Context context;
-    private ImageLoader imageLoader = ImageLoader.getInstance();
+    private final ImageLoader imageLoader = ImageLoader.getInstance();
 
     private OnClickGesture<StreamInfoItem> onStreamSelectedListener;
     private OnClickGesture<ChannelInfoItem> onChannelSelectedListener;
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemDialog.java b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemDialog.java
index 88aa76887..fd0e9f528 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemDialog.java
@@ -5,7 +5,6 @@ import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
 
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
index cf12deb6f..15fdcad05 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
@@ -1,6 +1,7 @@
 package org.schabi.newpipe.info_list;
 
 import android.app.Activity;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
@@ -12,9 +13,12 @@ import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.info_list.holder.ChannelInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.ChannelMiniInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.ChannelGridInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.InfoItemHolder;
+import org.schabi.newpipe.info_list.holder.PlaylistGridInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.PlaylistInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.PlaylistMiniInfoItemHolder;
+import org.schabi.newpipe.info_list.holder.StreamGridInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.StreamInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.StreamMiniInfoItemHolder;
 import org.schabi.newpipe.util.FallbackViewHolder;
@@ -52,14 +56,18 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 
     private static final int MINI_STREAM_HOLDER_TYPE = 0x100;
     private static final int STREAM_HOLDER_TYPE = 0x101;
+    private static final int GRID_STREAM_HOLDER_TYPE = 0x102;
     private static final int MINI_CHANNEL_HOLDER_TYPE = 0x200;
     private static final int CHANNEL_HOLDER_TYPE = 0x201;
+    private static final int GRID_CHANNEL_HOLDER_TYPE = 0x202;
     private static final int MINI_PLAYLIST_HOLDER_TYPE = 0x300;
     private static final int PLAYLIST_HOLDER_TYPE = 0x301;
+    private static final int GRID_PLAYLIST_HOLDER_TYPE = 0x302;
 
     private final InfoItemBuilder infoItemBuilder;
     private final ArrayList<InfoItem> infoItemList;
     private boolean useMiniVariant = false;
+    private boolean useGridVariant = false;
     private boolean showFooter = false;
     private View header = null;
     private View footer = null;
@@ -94,6 +102,10 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         this.useMiniVariant = useMiniVariant;
     }
 
+    public void setGridItemVariants(boolean useGridVariant) {
+        this.useGridVariant = useGridVariant;
+    }
+
     public void addInfoItemList(List<InfoItem> data) {
         if (data != null) {
             if (DEBUG) {
@@ -206,11 +218,11 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         final InfoItem item = infoItemList.get(position);
         switch (item.getInfoType()) {
             case STREAM:
-                return useMiniVariant ? MINI_STREAM_HOLDER_TYPE : STREAM_HOLDER_TYPE;
+                return useGridVariant ? GRID_STREAM_HOLDER_TYPE : useMiniVariant ? MINI_STREAM_HOLDER_TYPE : STREAM_HOLDER_TYPE;
             case CHANNEL:
-                return useMiniVariant ? MINI_CHANNEL_HOLDER_TYPE : CHANNEL_HOLDER_TYPE;
+                return useGridVariant ? GRID_CHANNEL_HOLDER_TYPE : useMiniVariant ? MINI_CHANNEL_HOLDER_TYPE : CHANNEL_HOLDER_TYPE;
             case PLAYLIST:
-                return useMiniVariant ? MINI_PLAYLIST_HOLDER_TYPE : PLAYLIST_HOLDER_TYPE;
+                return useGridVariant ? GRID_PLAYLIST_HOLDER_TYPE : useMiniVariant ? MINI_PLAYLIST_HOLDER_TYPE : PLAYLIST_HOLDER_TYPE;
             default:
                 Log.e(TAG, "Trollolo");
                 return -1;
@@ -229,14 +241,20 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                 return new StreamMiniInfoItemHolder(infoItemBuilder, parent);
             case STREAM_HOLDER_TYPE:
                 return new StreamInfoItemHolder(infoItemBuilder, parent);
+            case GRID_STREAM_HOLDER_TYPE:
+                return new StreamGridInfoItemHolder(infoItemBuilder, parent);
             case MINI_CHANNEL_HOLDER_TYPE:
                 return new ChannelMiniInfoItemHolder(infoItemBuilder, parent);
             case CHANNEL_HOLDER_TYPE:
                 return new ChannelInfoItemHolder(infoItemBuilder, parent);
+            case GRID_CHANNEL_HOLDER_TYPE:
+                return new ChannelGridInfoItemHolder(infoItemBuilder, parent);
             case MINI_PLAYLIST_HOLDER_TYPE:
                 return new PlaylistMiniInfoItemHolder(infoItemBuilder, parent);
             case PLAYLIST_HOLDER_TYPE:
                 return new PlaylistInfoItemHolder(infoItemBuilder, parent);
+            case GRID_PLAYLIST_HOLDER_TYPE:
+                return new PlaylistGridInfoItemHolder(infoItemBuilder, parent);
             default:
                 Log.e(TAG, "Trollolo");
                 return new FallbackViewHolder(new View(parent.getContext()));
@@ -257,4 +275,14 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
             ((HFHolder) holder).view = footer;
         }
     }
+
+    public GridLayoutManager.SpanSizeLookup getSpanSizeLookup(final int spanCount) {
+        return new GridLayoutManager.SpanSizeLookup() {
+            @Override
+            public int getSpanSize(int position) {
+                final int type = getItemViewType(position);
+                return type == HEADER_TYPE || type == FOOTER_TYPE ? spanCount : 1;
+            }
+        };
+    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelGridInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelGridInfoItemHolder.java
new file mode 100644
index 000000000..2cc575e41
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelGridInfoItemHolder.java
@@ -0,0 +1,13 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+
+public class ChannelGridInfoItemHolder extends ChannelMiniInfoItemHolder {
+
+	public ChannelGridInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_channel_grid_item, parent);
+	}
+}
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java
index 643886da8..ca783833a 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java
@@ -47,6 +47,13 @@ public class ChannelMiniInfoItemHolder extends InfoItemHolder {
                 itemBuilder.getOnChannelSelectedListener().selected(item);
             }
         });
+
+        itemView.setOnLongClickListener(view -> {
+            if (itemBuilder.getOnChannelSelectedListener() != null) {
+                itemBuilder.getOnChannelSelectedListener().held(item);
+            }
+            return true;
+        });
     }
 
     protected String getDetailLine(final ChannelInfoItem item) {
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistGridInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistGridInfoItemHolder.java
new file mode 100644
index 000000000..96b9c90a7
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistGridInfoItemHolder.java
@@ -0,0 +1,13 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+
+public class PlaylistGridInfoItemHolder extends PlaylistMiniInfoItemHolder {
+
+	public PlaylistGridInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_playlist_grid_item, parent);
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamGridInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamGridInfoItemHolder.java
new file mode 100644
index 000000000..a2e585857
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamGridInfoItemHolder.java
@@ -0,0 +1,13 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+
+public class StreamGridInfoItemHolder extends StreamMiniInfoItemHolder {
+
+	public StreamGridInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_stream_grid_item, parent);
+	}
+}
diff --git a/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java b/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
index 5192aa2ab..abdf82353 100644
--- a/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
@@ -1,8 +1,13 @@
 package org.schabi.newpipe.local;
 
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.ActionBar;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
@@ -25,7 +30,7 @@ import static org.schabi.newpipe.util.AnimationUtils.animateView;
  * called and is memory efficient when in backstack.
  * */
 public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
-        implements ListViewContract<I, N> {
+        implements ListViewContract<I, N>, SharedPreferences.OnSharedPreferenceChangeListener {
 
     /*//////////////////////////////////////////////////////////////////////////
     // Views
@@ -36,6 +41,9 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
 
     protected LocalItemListAdapter itemListAdapter;
     protected RecyclerView itemsList;
+    private int updateFlags = 0;
+
+    private static final int LIST_MODE_UPDATE_FLAG = 0x32;
 
     /*//////////////////////////////////////////////////////////////////////////
     // Lifecycle - Creation
@@ -45,6 +53,29 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .registerOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .unregisterOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (updateFlags != 0) {
+            if ((updateFlags & LIST_MODE_UPDATE_FLAG) != 0) {
+                final boolean useGrid = isGridLayout();
+                itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
+                itemListAdapter.setGridItemVariants(useGrid);
+                itemListAdapter.notifyDataSetChanged();
+            }
+            updateFlags = 0;
+        }
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -59,6 +90,16 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
         return activity.getLayoutInflater().inflate(R.layout.pignate_footer, itemsList, false);
     }
 
+    protected RecyclerView.LayoutManager getGridLayoutManager() {
+        final Resources resources = activity.getResources();
+        int width = resources.getDimensionPixelSize(R.dimen.video_item_grid_thumbnail_image_width);
+        width += (24 * resources.getDisplayMetrics().density);
+        final int spanCount = (int) Math.floor(resources.getDisplayMetrics().widthPixels / (double)width);
+        final GridLayoutManager lm = new GridLayoutManager(activity, spanCount);
+        lm.setSpanSizeLookup(itemListAdapter.getSpanSizeLookup(spanCount));
+        return lm;
+    }
+
     protected RecyclerView.LayoutManager getListLayoutManager() {
         return new LinearLayoutManager(activity);
     }
@@ -67,10 +108,13 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
     protected void initViews(View rootView, Bundle savedInstanceState) {
         super.initViews(rootView, savedInstanceState);
 
-        itemsList = rootView.findViewById(R.id.items_list);
-        itemsList.setLayoutManager(getListLayoutManager());
-
         itemListAdapter = new LocalItemListAdapter(activity);
+
+        final boolean useGrid = isGridLayout();
+        itemsList = rootView.findViewById(R.id.items_list);
+        itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
+
+        itemListAdapter.setGridItemVariants(useGrid);
         itemListAdapter.setHeader(headerRootView = getListHeader());
         itemListAdapter.setFooter(footerRootView = getListFooter());
 
@@ -174,4 +218,22 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
         resetFragment();
         return super.onError(exception);
     }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        if (key.equals(getString(R.string.list_view_mode_key))) {
+            updateFlags |= LIST_MODE_UPDATE_FLAG;
+        }
+    }
+
+    protected boolean isGridLayout() {
+        final String list_mode = PreferenceManager.getDefaultSharedPreferences(activity).getString(getString(R.string.list_view_mode_key), getString(R.string.list_view_mode_value));
+        if ("auto".equals(list_mode)) {
+            final Configuration configuration = getResources().getConfiguration();
+            return configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+                    && configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
+        } else {
+            return "grid".equals(list_mode);
+        }
+    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/local/LocalItemBuilder.java b/app/src/main/java/org/schabi/newpipe/local/LocalItemBuilder.java
index 148f93075..0fbab0398 100644
--- a/app/src/main/java/org/schabi/newpipe/local/LocalItemBuilder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/LocalItemBuilder.java
@@ -33,7 +33,7 @@ public class LocalItemBuilder {
     private static final String TAG = LocalItemBuilder.class.toString();
 
     private final Context context;
-    private ImageLoader imageLoader = ImageLoader.getInstance();
+    private final ImageLoader imageLoader = ImageLoader.getInstance();
 
     private OnClickGesture<LocalItem> onSelectedListener;
 
diff --git a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java b/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
index 99937b58c..e298dedd3 100644
--- a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
@@ -1,18 +1,21 @@
 package org.schabi.newpipe.local;
 
 import android.app.Activity;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 
 import org.schabi.newpipe.database.LocalItem;
-import org.schabi.newpipe.local.HeaderFooterHolder;
-import org.schabi.newpipe.local.LocalItemBuilder;
 import org.schabi.newpipe.local.holder.LocalItemHolder;
+import org.schabi.newpipe.local.holder.LocalPlaylistGridItemHolder;
 import org.schabi.newpipe.local.holder.LocalPlaylistItemHolder;
+import org.schabi.newpipe.local.holder.LocalPlaylistStreamGridItemHolder;
 import org.schabi.newpipe.local.holder.LocalPlaylistStreamItemHolder;
+import org.schabi.newpipe.local.holder.LocalStatisticStreamGridItemHolder;
 import org.schabi.newpipe.local.holder.LocalStatisticStreamItemHolder;
+import org.schabi.newpipe.local.holder.RemotePlaylistGridItemHolder;
 import org.schabi.newpipe.local.holder.RemotePlaylistItemHolder;
 import org.schabi.newpipe.util.FallbackViewHolder;
 import org.schabi.newpipe.util.Localization;
@@ -52,14 +55,19 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
 
     private static final int STREAM_STATISTICS_HOLDER_TYPE = 0x1000;
     private static final int STREAM_PLAYLIST_HOLDER_TYPE = 0x1001;
+    private static final int STREAM_STATISTICS_GRID_HOLDER_TYPE = 0x1002;
+    private static final int STREAM_PLAYLIST_GRID_HOLDER_TYPE = 0x1004;
     private static final int LOCAL_PLAYLIST_HOLDER_TYPE = 0x2000;
     private static final int REMOTE_PLAYLIST_HOLDER_TYPE = 0x2001;
+	private static final int LOCAL_PLAYLIST_GRID_HOLDER_TYPE = 0x2002;
+	private static final int REMOTE_PLAYLIST_GRID_HOLDER_TYPE = 0x2004;
 
     private final LocalItemBuilder localItemBuilder;
     private final ArrayList<LocalItem> localItems;
     private final DateFormat dateFormat;
 
     private boolean showFooter = false;
+    private boolean useGridVariant = false;
     private View header = null;
     private View footer = null;
 
@@ -134,6 +142,10 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
         notifyDataSetChanged();
     }
 
+    public void setGridItemVariants(boolean useGridVariant) {
+        this.useGridVariant = useGridVariant;
+    }
+
     public void setHeader(View header) {
         boolean changed = header != this.header;
         this.header = header;
@@ -195,11 +207,11 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
         final LocalItem item = localItems.get(position);
 
         switch (item.getLocalItemType()) {
-            case PLAYLIST_LOCAL_ITEM: return LOCAL_PLAYLIST_HOLDER_TYPE;
-            case PLAYLIST_REMOTE_ITEM: return REMOTE_PLAYLIST_HOLDER_TYPE;
+            case PLAYLIST_LOCAL_ITEM: return useGridVariant ? LOCAL_PLAYLIST_GRID_HOLDER_TYPE : LOCAL_PLAYLIST_HOLDER_TYPE;
+            case PLAYLIST_REMOTE_ITEM: return useGridVariant ? REMOTE_PLAYLIST_GRID_HOLDER_TYPE : REMOTE_PLAYLIST_HOLDER_TYPE;
 
-            case PLAYLIST_STREAM_ITEM: return STREAM_PLAYLIST_HOLDER_TYPE;
-            case STATISTIC_STREAM_ITEM: return STREAM_STATISTICS_HOLDER_TYPE;
+            case PLAYLIST_STREAM_ITEM: return useGridVariant ? STREAM_PLAYLIST_GRID_HOLDER_TYPE : STREAM_PLAYLIST_HOLDER_TYPE;
+            case STATISTIC_STREAM_ITEM: return useGridVariant ? STREAM_STATISTICS_GRID_HOLDER_TYPE : STREAM_STATISTICS_HOLDER_TYPE;
             default:
                 Log.e(TAG, "No holder type has been considered for item: [" +
                         item.getLocalItemType() + "]");
@@ -218,12 +230,20 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
                 return new HeaderFooterHolder(footer);
             case LOCAL_PLAYLIST_HOLDER_TYPE:
                 return new LocalPlaylistItemHolder(localItemBuilder, parent);
+            case LOCAL_PLAYLIST_GRID_HOLDER_TYPE:
+                return new LocalPlaylistGridItemHolder(localItemBuilder, parent);
             case REMOTE_PLAYLIST_HOLDER_TYPE:
                 return new RemotePlaylistItemHolder(localItemBuilder, parent);
+            case REMOTE_PLAYLIST_GRID_HOLDER_TYPE:
+                return new RemotePlaylistGridItemHolder(localItemBuilder, parent);
             case STREAM_PLAYLIST_HOLDER_TYPE:
                 return new LocalPlaylistStreamItemHolder(localItemBuilder, parent);
+            case STREAM_PLAYLIST_GRID_HOLDER_TYPE:
+                return new LocalPlaylistStreamGridItemHolder(localItemBuilder, parent);
             case STREAM_STATISTICS_HOLDER_TYPE:
                 return new LocalStatisticStreamItemHolder(localItemBuilder, parent);
+            case STREAM_STATISTICS_GRID_HOLDER_TYPE:
+                return new LocalStatisticStreamGridItemHolder(localItemBuilder, parent);
             default:
                 Log.e(TAG, "No view type has been considered for holder: [" + type + "]");
                 return new FallbackViewHolder(new View(parent.getContext()));
@@ -247,4 +267,14 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
             ((HeaderFooterHolder) holder).view = footer;
         }
     }
+
+    public GridLayoutManager.SpanSizeLookup getSpanSizeLookup(final int spanCount) {
+        return new GridLayoutManager.SpanSizeLookup() {
+            @Override
+            public int getSpanSize(int position) {
+                final int type = getItemViewType(position);
+                return type == HEADER_TYPE || type == FOOTER_TYPE ? spanCount : 1;
+            }
+        };
+    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistDialog.java b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistDialog.java
index 4b8e391c7..df98fb3eb 100644
--- a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistDialog.java
@@ -1,9 +1,11 @@
 package org.schabi.newpipe.local.dialog;
 
+import android.app.Dialog;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.DialogFragment;
+import android.view.Window;
 
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.util.StateSaver;
@@ -41,6 +43,18 @@ public abstract class PlaylistDialog extends DialogFragment implements StateSave
         StateSaver.onDestroy(savedState);
     }
 
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        final Dialog dialog = super.onCreateDialog(savedInstanceState);
+        //remove title
+        final Window window = dialog.getWindow();
+        if (window != null) {
+            window.requestFeature(Window.FEATURE_NO_TITLE);
+        }
+        return dialog;
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // State Saving
     //////////////////////////////////////////////////////////////////////////*/
@@ -58,7 +72,7 @@ public abstract class PlaylistDialog extends DialogFragment implements StateSave
 
     @Override
     @SuppressWarnings("unchecked")
-    public void readFrom(@NonNull Queue<Object> savedObjects) throws Exception {
+    public void readFrom(@NonNull Queue<Object> savedObjects) {
         streamEntities = (List<StreamEntity>) savedObjects.poll();
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.java b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.java
index 634bea62b..f1bb01734 100644
--- a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.java
@@ -36,8 +36,6 @@ import io.reactivex.MaybeObserver;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
-import io.reactivex.functions.Predicate;
 
 public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Void> {
 
diff --git a/app/src/main/java/org/schabi/newpipe/local/history/HistoryEntryAdapter.java b/app/src/main/java/org/schabi/newpipe/local/history/HistoryEntryAdapter.java
index 2cb1add5d..09549346b 100644
--- a/app/src/main/java/org/schabi/newpipe/local/history/HistoryEntryAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/local/history/HistoryEntryAdapter.java
@@ -1,7 +1,6 @@
 package org.schabi.newpipe.local.history;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
diff --git a/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java b/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java
index d3d824103..56453773a 100644
--- a/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java
+++ b/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java
@@ -45,7 +45,6 @@ import java.util.List;
 
 import io.reactivex.Flowable;
 import io.reactivex.Maybe;
-import io.reactivex.Scheduler;
 import io.reactivex.Single;
 import io.reactivex.schedulers.Schedulers;
 
diff --git a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
index 95aeb09d7..32083fd42 100644
--- a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
@@ -21,7 +21,6 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.stream.StreamStatisticsEntry;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
-import org.schabi.newpipe.fragments.list.BaseListFragment;
 import org.schabi.newpipe.local.BaseLocalListFragment;
 import org.schabi.newpipe.info_list.InfoItemDialog;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
@@ -57,7 +56,7 @@ public class StatisticsPlaylistFragment
     /* Used for independent events */
     private Subscription databaseSubscription;
     private HistoryRecordManager recordManager;
-    private CompositeDisposable disposables = new CompositeDisposable();
+    private final CompositeDisposable disposables = new CompositeDisposable();
 
     private enum StatisticSortMode {
         LAST_PLAYED,
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistGridItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistGridItemHolder.java
new file mode 100644
index 000000000..4276cf721
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistGridItemHolder.java
@@ -0,0 +1,13 @@
+package org.schabi.newpipe.local.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.local.LocalItemBuilder;
+
+public class LocalPlaylistGridItemHolder extends LocalPlaylistItemHolder {
+
+	public LocalPlaylistGridItemHolder(LocalItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_playlist_grid_item, parent);
+	}
+}
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistItemHolder.java
index 1a5ec63bf..8743684ee 100644
--- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistItemHolder.java
@@ -16,6 +16,10 @@ public class LocalPlaylistItemHolder extends PlaylistItemHolder {
         super(infoItemBuilder, parent);
     }
 
+    LocalPlaylistItemHolder(LocalItemBuilder infoItemBuilder, int layoutId, ViewGroup parent) {
+        super(infoItemBuilder, layoutId, parent);
+    }
+
     @Override
     public void updateFromItem(final LocalItem localItem, final DateFormat dateFormat) {
         if (!(localItem instanceof PlaylistMetadataEntry)) return;
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamGridItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamGridItemHolder.java
new file mode 100644
index 000000000..6986713bb
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamGridItemHolder.java
@@ -0,0 +1,13 @@
+package org.schabi.newpipe.local.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.local.LocalItemBuilder;
+
+public class LocalPlaylistStreamGridItemHolder extends LocalPlaylistStreamItemHolder {
+
+	public LocalPlaylistStreamGridItemHolder(LocalItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_stream_playlist_grid_item, parent); //TODO
+	}
+}
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamGridItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamGridItemHolder.java
new file mode 100644
index 000000000..792ad92f0
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamGridItemHolder.java
@@ -0,0 +1,13 @@
+package org.schabi.newpipe.local.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.local.LocalItemBuilder;
+
+public class LocalStatisticStreamGridItemHolder extends LocalStatisticStreamItemHolder {
+
+	public LocalStatisticStreamGridItemHolder(LocalItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_stream_grid_item, parent);
+	}
+}
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java
index b2a04ca9c..57a5794e3 100644
--- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java
@@ -1,5 +1,6 @@
 package org.schabi.newpipe.local.holder;
 
+import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
 import android.view.View;
 import android.view.ViewGroup;
@@ -42,10 +43,15 @@ public class LocalStatisticStreamItemHolder extends LocalItemHolder {
     public final TextView itemVideoTitleView;
     public final TextView itemUploaderView;
     public final TextView itemDurationView;
+    @Nullable
     public final TextView itemAdditionalDetails;
 
-    public LocalStatisticStreamItemHolder(LocalItemBuilder infoItemBuilder, ViewGroup parent) {
-        super(infoItemBuilder, R.layout.list_stream_item, parent);
+    public LocalStatisticStreamItemHolder(LocalItemBuilder itemBuilder, ViewGroup parent) {
+        this(itemBuilder, R.layout.list_stream_item, parent);
+    }
+
+    LocalStatisticStreamItemHolder(LocalItemBuilder infoItemBuilder, int layoutId, ViewGroup parent) {
+        super(infoItemBuilder, layoutId, parent);
 
         itemThumbnailView = itemView.findViewById(R.id.itemThumbnailView);
         itemVideoTitleView = itemView.findViewById(R.id.itemVideoTitleView);
@@ -80,7 +86,9 @@ public class LocalStatisticStreamItemHolder extends LocalItemHolder {
             itemDurationView.setVisibility(View.GONE);
         }
 
-        itemAdditionalDetails.setText(getStreamInfoDetailLine(item, dateFormat));
+        if (itemAdditionalDetails != null) {
+            itemAdditionalDetails.setText(getStreamInfoDetailLine(item, dateFormat));
+        }
 
         // Default thumbnail is shown on error, while loading and if the url is empty
         itemBuilder.displayImage(item.thumbnailUrl, itemThumbnailView,
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistGridItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistGridItemHolder.java
new file mode 100644
index 000000000..5ac18fccb
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistGridItemHolder.java
@@ -0,0 +1,13 @@
+package org.schabi.newpipe.local.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.local.LocalItemBuilder;
+
+public class RemotePlaylistGridItemHolder extends RemotePlaylistItemHolder {
+
+	public RemotePlaylistGridItemHolder(LocalItemBuilder infoItemBuilder, ViewGroup parent) {
+		super(infoItemBuilder, R.layout.list_playlist_grid_item, parent);
+	}
+}
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java
index 12d3063b0..5b2a88d38 100644
--- a/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java
@@ -16,6 +16,10 @@ public class RemotePlaylistItemHolder extends PlaylistItemHolder {
         super(infoItemBuilder, parent);
     }
 
+    RemotePlaylistItemHolder(LocalItemBuilder infoItemBuilder, int layoutId, ViewGroup parent) {
+        super(infoItemBuilder, layoutId, parent);
+    }
+
     @Override
     public void updateFromItem(final LocalItem localItem, final DateFormat dateFormat) {
         if (!(localItem instanceof PlaylistRemoteEntity)) return;
diff --git a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
index 35a1530c9..f400061e1 100644
--- a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
@@ -459,7 +459,11 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
 
 
     private ItemTouchHelper.SimpleCallback getItemTouchCallback() {
-        return new ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP | ItemTouchHelper.DOWN,
+        int directions = ItemTouchHelper.UP | ItemTouchHelper.DOWN;
+        if (isGridLayout()) {
+            directions |= ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT;
+        }
+        return new ItemTouchHelper.SimpleCallback(directions,
                 ItemTouchHelper.ACTION_STATE_IDLE) {
             @Override
             public int interpolateOutOfBoundsScroll(RecyclerView recyclerView, int viewSize,
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java
index d8a26f0eb..a304c2f0c 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java
@@ -1,15 +1,22 @@
 package org.schabi.newpipe.local.subscription;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Parcelable;
+import android.preference.PreferenceManager;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -17,6 +24,7 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -40,10 +48,11 @@ import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
 import org.schabi.newpipe.fragments.BaseStateFragment;
 import org.schabi.newpipe.info_list.InfoListAdapter;
-import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.local.subscription.services.SubscriptionsExportService;
 import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService;
+import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.FilePickerActivityHelper;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.OnClickGesture;
@@ -72,7 +81,7 @@ import static org.schabi.newpipe.local.subscription.services.SubscriptionsImport
 import static org.schabi.newpipe.util.AnimationUtils.animateRotation;
 import static org.schabi.newpipe.util.AnimationUtils.animateView;
 
-public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEntity>> {
+public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEntity>> implements SharedPreferences.OnSharedPreferenceChangeListener {
     private static final int REQUEST_EXPORT_CODE = 666;
     private static final int REQUEST_IMPORT_CODE = 667;
 
@@ -80,8 +89,10 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
     @State
     protected Parcelable itemsListState;
     private InfoListAdapter infoListAdapter;
+    private int updateFlags = 0;
+
+    private static final int LIST_MODE_UPDATE_FLAG = 0x32;
 
-    private View headerRootLayout;
     private View whatsNewItemListHeader;
     private View importExportListHeader;
 
@@ -100,6 +111,8 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .registerOnSharedPreferenceChangeListener(this);
     }
 
     @Override
@@ -127,6 +140,15 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
     public void onResume() {
         super.onResume();
         setupBroadcastReceiver();
+        if (updateFlags != 0) {
+            if ((updateFlags & LIST_MODE_UPDATE_FLAG) != 0) {
+                final boolean useGrid = isGridLayout();
+                itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
+                infoListAdapter.setGridItemVariants(useGrid);
+                infoListAdapter.notifyDataSetChanged();
+            }
+            updateFlags = 0;
+        }
     }
 
     @Override
@@ -153,9 +175,25 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
         disposables = null;
         subscriptionService = null;
 
+        PreferenceManager.getDefaultSharedPreferences(activity)
+                .unregisterOnSharedPreferenceChangeListener(this);
         super.onDestroy();
     }
 
+    protected RecyclerView.LayoutManager getListLayoutManager() {
+        return new LinearLayoutManager(activity);
+    }
+
+    protected RecyclerView.LayoutManager getGridLayoutManager() {
+        final Resources resources = activity.getResources();
+        int width = resources.getDimensionPixelSize(R.dimen.video_item_grid_thumbnail_image_width);
+        width += (24 * resources.getDisplayMetrics().density);
+        final int spanCount = (int) Math.floor(resources.getDisplayMetrics().widthPixels / (double)width);
+        final GridLayoutManager lm = new GridLayoutManager(activity, spanCount);
+        lm.setSpanSizeLookup(infoListAdapter.getSpanSizeLookup(spanCount));
+        return lm;
+    }
+
     /*/////////////////////////////////////////////////////////////////////////
     // Menu
     /////////////////////////////////////////////////////////////////////////*/
@@ -287,16 +325,19 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
     protected void initViews(View rootView, Bundle savedInstanceState) {
         super.initViews(rootView, savedInstanceState);
 
+        final boolean useGrid = isGridLayout();
         infoListAdapter = new InfoListAdapter(getActivity());
         itemsList = rootView.findViewById(R.id.items_list);
-        itemsList.setLayoutManager(new LinearLayoutManager(activity));
+        itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
 
+        View headerRootLayout;
         infoListAdapter.setHeader(headerRootLayout = activity.getLayoutInflater().inflate(R.layout.subscription_header, itemsList, false));
         whatsNewItemListHeader = headerRootLayout.findViewById(R.id.whats_new);
         importExportListHeader = headerRootLayout.findViewById(R.id.import_export);
         importExportOptions = headerRootLayout.findViewById(R.id.import_export_options);
 
         infoListAdapter.useMiniItemVariants(true);
+        infoListAdapter.setGridItemVariants(useGrid);
         itemsList.setAdapter(infoListAdapter);
 
         setupImportFromItems(headerRootLayout.findViewById(R.id.import_from_options));
@@ -320,7 +361,7 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
         super.initListeners();
 
         infoListAdapter.setOnChannelSelectedListener(new OnClickGesture<ChannelInfoItem>() {
-            @Override
+
             public void selected(ChannelInfoItem selectedItem) {
                 final FragmentManager fragmentManager = getFM();
                 NavigationHelper.openChannelFragment(fragmentManager,
@@ -328,6 +369,11 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
                         selectedItem.getUrl(),
                         selectedItem.getName());
             }
+
+            public void held(ChannelInfoItem selectedItem) {
+                showLongTapDialog(selectedItem);
+            }
+
         });
 
         //noinspection ConstantConditions
@@ -338,6 +384,85 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
         importExportListHeader.setOnClickListener(v -> importExportOptions.switchState());
     }
 
+    private void showLongTapDialog(ChannelInfoItem selectedItem) {
+        final Context context = getContext();
+        final Activity activity = getActivity();
+        if (context == null || context.getResources() == null || getActivity() == null) return;
+
+        final String[] commands = new String[]{
+                context.getResources().getString(R.string.share),
+                context.getResources().getString(R.string.unsubscribe)
+        };
+
+        final DialogInterface.OnClickListener actions = (dialogInterface, i) -> {
+            switch (i) {
+                case 0:
+                    shareChannel(selectedItem);
+                    break;
+                case 1:
+                    deleteChannel(selectedItem);
+                    break;
+                default:
+                    break;
+            }
+        };
+
+        final View bannerView = View.inflate(activity, R.layout.dialog_title, null);
+        bannerView.setSelected(true);
+
+        TextView titleView = bannerView.findViewById(R.id.itemTitleView);
+        titleView.setText(selectedItem.getName());
+
+        TextView detailsView = bannerView.findViewById(R.id.itemAdditionalDetails);
+        detailsView.setVisibility(View.GONE);
+
+        new AlertDialog.Builder(activity)
+                .setCustomTitle(bannerView)
+                .setItems(commands, actions)
+                .create()
+                .show();
+
+    }
+
+    private void shareChannel (ChannelInfoItem selectedItem) {
+        shareUrl(selectedItem.getName(), selectedItem.getUrl());
+    }
+
+    @SuppressLint("CheckResult")
+    private void deleteChannel (ChannelInfoItem selectedItem) {
+        subscriptionService.subscriptionTable()
+                .getSubscription(selectedItem.getServiceId(), selectedItem.getUrl())
+                .toObservable()
+                .observeOn(Schedulers.io())
+                .subscribe(getDeleteObserver());
+
+        Toast.makeText(activity, getString(R.string.channel_unsubscribed), Toast.LENGTH_SHORT).show();
+    }
+
+
+
+    private Observer<List<SubscriptionEntity>> getDeleteObserver(){
+        return new Observer<List<SubscriptionEntity>>() {
+            @Override
+            public void onSubscribe(Disposable d) {
+                disposables.add(d);
+            }
+
+            @Override
+            public void onNext(List<SubscriptionEntity> subscriptionEntities) {
+                subscriptionService.subscriptionTable().delete(subscriptionEntities);
+            }
+
+            @Override
+            public void onError(Throwable exception) {
+                SubscriptionFragment.this.onError(exception);
+            }
+
+            @Override
+            public void onComplete() {  }
+        };
+    }
+
     private void resetFragment() {
         if (disposables != null) disposables.clear();
         if (infoListAdapter != null) infoListAdapter.clearStreamItemList();
@@ -447,4 +572,22 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
                 R.string.general_error);
         return true;
     }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        if (key.equals(getString(R.string.list_view_mode_key))) {
+            updateFlags |= LIST_MODE_UPDATE_FLAG;
+        }
+    }
+
+    protected boolean isGridLayout() {
+        final String list_mode = PreferenceManager.getDefaultSharedPreferences(activity).getString(getString(R.string.list_view_mode_key), getString(R.string.list_view_mode_value));
+        if ("auto".equals(list_mode)) {
+            final Configuration configuration = getResources().getConfiguration();
+            return configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+                    && configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
+        } else {
+            return "grid".equals(list_mode);
+        }
+    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionService.java b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionService.java
index fc4230711..f9e2d9583 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionService.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionService.java
@@ -55,10 +55,10 @@ public class SubscriptionService {
     private static final int SUBSCRIPTION_DEBOUNCE_INTERVAL = 500;
     private static final int SUBSCRIPTION_THREAD_POOL_SIZE = 4;
 
-    private AppDatabase db;
-    private Flowable<List<SubscriptionEntity>> subscription;
+    private final AppDatabase db;
+    private final Flowable<List<SubscriptionEntity>> subscription;
 
-    private Scheduler subscriptionScheduler;
+    private final Scheduler subscriptionScheduler;
 
     private SubscriptionService(Context context) {
         db = NewPipeDatabase.getInstance(context.getApplicationContext());
@@ -116,7 +116,7 @@ public class SubscriptionService {
     public Completable updateChannelInfo(final ChannelInfo info) {
         final Function<List<SubscriptionEntity>, CompletableSource> update = new Function<List<SubscriptionEntity>, CompletableSource>() {
             @Override
-            public CompletableSource apply(@NonNull List<SubscriptionEntity> subscriptionEntities) throws Exception {
+            public CompletableSource apply(@NonNull List<SubscriptionEntity> subscriptionEntities) {
                 if (DEBUG) Log.d(TAG, "updateChannelInfo() called with: subscriptionEntities = [" + subscriptionEntities + "]");
                 if (subscriptionEntities.size() == 1) {
                     SubscriptionEntity subscription = subscriptionEntities.get(0);
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/services/BaseImportExportService.java b/app/src/main/java/org/schabi/newpipe/local/subscription/services/BaseImportExportService.java
index 9d055b82a..e3db6e12c 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/services/BaseImportExportService.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/services/BaseImportExportService.java
@@ -58,8 +58,8 @@ public abstract class BaseImportExportService extends Service {
     protected NotificationCompat.Builder notificationBuilder;
 
     protected SubscriptionService subscriptionService;
-    protected CompositeDisposable disposables = new CompositeDisposable();
-    protected PublishProcessor<String> notificationUpdater = PublishProcessor.create();
+    protected final CompositeDisposable disposables = new CompositeDisposable();
+    protected final PublishProcessor<String> notificationUpdater = PublishProcessor.create();
 
     @Nullable
     @Override
@@ -90,9 +90,9 @@ public abstract class BaseImportExportService extends Service {
 
     private static final int NOTIFICATION_SAMPLING_PERIOD = 2500;
 
-    protected AtomicInteger currentProgress = new AtomicInteger(-1);
-    protected AtomicInteger maxProgress = new AtomicInteger(-1);
-    protected ImportExportEventListener eventListener = new ImportExportEventListener() {
+    protected final AtomicInteger currentProgress = new AtomicInteger(-1);
+    protected final AtomicInteger maxProgress = new AtomicInteger(-1);
+    protected final ImportExportEventListener eventListener = new ImportExportEventListener() {
         @Override
         public void onSizeReceived(int size) {
             maxProgress.set(size);
@@ -187,13 +187,13 @@ public abstract class BaseImportExportService extends Service {
     protected Toast toast;
 
     protected void showToast(@StringRes int message) {
-        showToast(getString(message), Toast.LENGTH_SHORT);
+        showToast(getString(message));
     }
 
-    protected void showToast(String message, int duration) {
+    protected void showToast(String message) {
         if (toast != null) toast.cancel();
 
-        toast = Toast.makeText(this, message, duration);
+        toast = Toast.makeText(this, message, Toast.LENGTH_SHORT);
         toast.show();
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java b/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java
index 3fdc91358..48410205a 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java
@@ -144,12 +144,16 @@ public class SubscriptionsImportService extends BaseImportExportService {
         showToast(R.string.import_ongoing);
 
         Flowable<List<SubscriptionItem>> flowable = null;
-        if (currentMode == CHANNEL_URL_MODE) {
-            flowable = importFromChannelUrl();
-        } else if (currentMode == INPUT_STREAM_MODE) {
-            flowable = importFromInputStream();
-        } else if (currentMode == PREVIOUS_EXPORT_MODE) {
-            flowable = importFromPreviousExport();
+        switch (currentMode) {
+            case CHANNEL_URL_MODE:
+                flowable = importFromChannelUrl();
+                break;
+            case INPUT_STREAM_MODE:
+                flowable = importFromInputStream();
+                break;
+            case PREVIOUS_EXPORT_MODE:
+                flowable = importFromPreviousExport();
+                break;
         }
 
         if (flowable == null) {
diff --git a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
index 01a0614fa..f5f843caa 100644
--- a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
@@ -230,7 +230,8 @@ public abstract class BasePlayer implements
             int sizeBeforeAppend = playQueue.size();
             playQueue.append(queue.getStreams());
 
-            if (intent.getBooleanExtra(SELECT_ON_APPEND, false) &&
+            if ((intent.getBooleanExtra(SELECT_ON_APPEND, false) ||
+                    getCurrentState() == STATE_COMPLETED) &&
                     queue.getStreams().size() > 0) {
                 playQueue.setIndex(sizeBeforeAppend);
             }
diff --git a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
index de7960a0d..71b724228 100644
--- a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
@@ -175,6 +175,10 @@ public final class MainVideoPlayer extends AppCompatActivity
             setLandscape(lastOrientationWasLandscape);
         }
 
+        final int lastResizeMode = defaultPreferences.getInt(
+                getString(R.string.last_resize_mode), AspectRatioFrameLayout.RESIZE_MODE_FIT);
+        playerImpl.setResizeMode(lastResizeMode);
+
         // Upon going in or out of multiwindow mode, isInMultiWindow will always be false,
         // since the first onResume needs to restore the player.
         // Subsequent onResume calls while multiwindow mode remains the same and the player is
@@ -705,14 +709,27 @@ public final class MainVideoPlayer extends AppCompatActivity
 
         @Override
         protected int nextResizeMode(int currentResizeMode) {
+            final int newResizeMode;
             switch (currentResizeMode) {
                 case AspectRatioFrameLayout.RESIZE_MODE_FIT:
-                    return AspectRatioFrameLayout.RESIZE_MODE_FILL;
+                    newResizeMode = AspectRatioFrameLayout.RESIZE_MODE_FILL;
+                    break;
                 case AspectRatioFrameLayout.RESIZE_MODE_FILL:
-                    return AspectRatioFrameLayout.RESIZE_MODE_ZOOM;
+                    newResizeMode = AspectRatioFrameLayout.RESIZE_MODE_ZOOM;
+                    break;
                 default:
-                    return AspectRatioFrameLayout.RESIZE_MODE_FIT;
+                    newResizeMode = AspectRatioFrameLayout.RESIZE_MODE_FIT;
+                    break;
             }
+
+            storeResizeMode(newResizeMode);
+            return newResizeMode;
+        }
+
+        private void storeResizeMode(@AspectRatioFrameLayout.ResizeMode int resizeMode) {
+            defaultPreferences.edit()
+                    .putInt(getString(R.string.last_resize_mode), resizeMode)
+                    .apply();
         }
 
         @Override
diff --git a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
index 0e7328020..a36a0576c 100644
--- a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
@@ -114,7 +114,6 @@ public final class PopupVideoPlayer extends Service {
 
     private View closeOverlayView;
     private FloatingActionButton closeOverlayButton;
-    private WindowManager.LayoutParams closeOverlayLayoutParams;
 
     private int tossFlingVelocity;
 
@@ -248,7 +247,7 @@ public final class PopupVideoPlayer extends Service {
         final int flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE
                 | WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
 
-        closeOverlayLayoutParams = new WindowManager.LayoutParams(
+        WindowManager.LayoutParams closeOverlayLayoutParams = new WindowManager.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT,
                 layoutParamType,
                 flags,
diff --git a/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java
index 679fc6645..d30d9b8be 100644
--- a/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java
@@ -137,16 +137,16 @@ public abstract class VideoPlayer extends BasePlayer
     private TextView captionTextView;
 
     private ValueAnimator controlViewAnimator;
-    private Handler controlsVisibilityHandler = new Handler();
+    private final Handler controlsVisibilityHandler = new Handler();
 
     boolean isSomePopupMenuVisible = false;
-    private int qualityPopupMenuGroupId = 69;
+    private final int qualityPopupMenuGroupId = 69;
     private PopupMenu qualityPopupMenu;
 
-    private int playbackSpeedPopupMenuGroupId = 79;
+    private final int playbackSpeedPopupMenuGroupId = 79;
     private PopupMenu playbackSpeedPopupMenu;
 
-    private int captionPopupMenuGroupId = 89;
+    private final int captionPopupMenuGroupId = 89;
     private PopupMenu captionPopupMenu;
 
     ///////////////////////////////////////////////////////////////////////////
@@ -683,12 +683,17 @@ public abstract class VideoPlayer extends BasePlayer
         if (getAspectRatioFrameLayout() != null) {
             final int currentResizeMode = getAspectRatioFrameLayout().getResizeMode();
             final int newResizeMode = nextResizeMode(currentResizeMode);
-            getAspectRatioFrameLayout().setResizeMode(newResizeMode);
-            getResizeView().setText(PlayerHelper.resizeTypeOf(context, newResizeMode));
+            setResizeMode(newResizeMode);
         }
     }
 
+    protected void setResizeMode(@AspectRatioFrameLayout.ResizeMode final int resizeMode) {
+        getAspectRatioFrameLayout().setResizeMode(resizeMode);
+        getResizeView().setText(PlayerHelper.resizeTypeOf(context, resizeMode));
+    }
+
     protected abstract int nextResizeMode(@AspectRatioFrameLayout.ResizeMode final int resizeMode);
+
     /*//////////////////////////////////////////////////////////////////////////
     // SeekBar Listener
     //////////////////////////////////////////////////////////////////////////*/
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java b/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java
index 5b9cce947..46d20c7e1 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java
@@ -116,7 +116,7 @@ public class AudioReactor implements AudioManager.OnAudioFocusChangeListener,
     private void onAudioFocusGain() {
         Log.d(TAG, "onAudioFocusGain() called");
         player.setVolume(DUCK_AUDIO_TO);
-        animateAudio(DUCK_AUDIO_TO, 1f, DUCK_DURATION);
+        animateAudio(DUCK_AUDIO_TO, 1f);
 
         if (PlayerHelper.isResumeAfterAudioFocusGain(context)) {
             player.setPlayWhenReady(true);
@@ -131,13 +131,13 @@ public class AudioReactor implements AudioManager.OnAudioFocusChangeListener,
     private void onAudioFocusLossCanDuck() {
         Log.d(TAG, "onAudioFocusLossCanDuck() called");
         // Set the volume to 1/10 on ducking
-        animateAudio(player.getVolume(), DUCK_AUDIO_TO, DUCK_DURATION);
+        animateAudio(player.getVolume(), DUCK_AUDIO_TO);
     }
 
-    private void animateAudio(final float from, final float to, int duration) {
+    private void animateAudio(final float from, final float to) {
         ValueAnimator valueAnimator = new ValueAnimator();
         valueAnimator.setFloatValues(from, to);
-        valueAnimator.setDuration(duration);
+        valueAnimator.setDuration(AudioReactor.DUCK_DURATION);
         valueAnimator.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationStart(Animator animation) {
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/CacheFactory.java b/app/src/main/java/org/schabi/newpipe/player/helper/CacheFactory.java
index ec7813056..b8d8dc12f 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/CacheFactory.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/CacheFactory.java
@@ -4,12 +4,9 @@ import android.content.Context;
 import android.support.annotation.NonNull;
 import android.util.Log;
 
-import com.google.android.exoplayer2.upstream.BandwidthMeter;
 import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
 import com.google.android.exoplayer2.upstream.DefaultDataSource;
 import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
-import com.google.android.exoplayer2.upstream.DefaultHttpDataSource;
 import com.google.android.exoplayer2.upstream.FileDataSource;
 import com.google.android.exoplayer2.upstream.TransferListener;
 import com.google.android.exoplayer2.upstream.cache.CacheDataSink;
@@ -17,8 +14,6 @@ import com.google.android.exoplayer2.upstream.cache.CacheDataSource;
 import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor;
 import com.google.android.exoplayer2.upstream.cache.SimpleCache;
 
-import org.schabi.newpipe.Downloader;
-
 import java.io.File;
 
 /* package-private */ class CacheFactory implements DataSource.Factory {
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
index d6453f579..f49ca3330 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
@@ -66,25 +66,15 @@ public class PlaybackParameterDialog extends DialogFragment {
     private double stepSize = DEFAULT_STEP;
 
     @Nullable private SeekBar tempoSlider;
-    @Nullable private TextView tempoMinimumText;
-    @Nullable private TextView tempoMaximumText;
     @Nullable private TextView tempoCurrentText;
     @Nullable private TextView tempoStepDownText;
     @Nullable private TextView tempoStepUpText;
 
     @Nullable private SeekBar pitchSlider;
-    @Nullable private TextView pitchMinimumText;
-    @Nullable private TextView pitchMaximumText;
     @Nullable private TextView pitchCurrentText;
     @Nullable private TextView pitchStepDownText;
     @Nullable private TextView pitchStepUpText;
 
-    @Nullable private TextView stepSizeOnePercentText;
-    @Nullable private TextView stepSizeFivePercentText;
-    @Nullable private TextView stepSizeTenPercentText;
-    @Nullable private TextView stepSizeTwentyFivePercentText;
-    @Nullable private TextView stepSizeOneHundredPercentText;
-
     @Nullable private CheckBox unhookingCheckbox;
     @Nullable private CheckBox skipSilenceCheckbox;
 
@@ -181,8 +171,8 @@ public class PlaybackParameterDialog extends DialogFragment {
 
     private void setupTempoControl(@NonNull View rootView) {
         tempoSlider = rootView.findViewById(R.id.tempoSeekbar);
-        tempoMinimumText = rootView.findViewById(R.id.tempoMinimumText);
-        tempoMaximumText = rootView.findViewById(R.id.tempoMaximumText);
+        TextView tempoMinimumText = rootView.findViewById(R.id.tempoMinimumText);
+        TextView tempoMaximumText = rootView.findViewById(R.id.tempoMaximumText);
         tempoCurrentText = rootView.findViewById(R.id.tempoCurrentText);
         tempoStepUpText = rootView.findViewById(R.id.tempoStepUp);
         tempoStepDownText = rootView.findViewById(R.id.tempoStepDown);
@@ -203,8 +193,8 @@ public class PlaybackParameterDialog extends DialogFragment {
 
     private void setupPitchControl(@NonNull View rootView) {
         pitchSlider = rootView.findViewById(R.id.pitchSeekbar);
-        pitchMinimumText = rootView.findViewById(R.id.pitchMinimumText);
-        pitchMaximumText = rootView.findViewById(R.id.pitchMaximumText);
+        TextView pitchMinimumText = rootView.findViewById(R.id.pitchMinimumText);
+        TextView pitchMaximumText = rootView.findViewById(R.id.pitchMaximumText);
         pitchCurrentText = rootView.findViewById(R.id.pitchCurrentText);
         pitchStepDownText = rootView.findViewById(R.id.pitchStepDown);
         pitchStepUpText = rootView.findViewById(R.id.pitchStepUp);
@@ -247,11 +237,11 @@ public class PlaybackParameterDialog extends DialogFragment {
     }
 
     private void setupStepSizeSelector(@NonNull final View rootView) {
-        stepSizeOnePercentText = rootView.findViewById(R.id.stepSizeOnePercent);
-        stepSizeFivePercentText = rootView.findViewById(R.id.stepSizeFivePercent);
-        stepSizeTenPercentText = rootView.findViewById(R.id.stepSizeTenPercent);
-        stepSizeTwentyFivePercentText = rootView.findViewById(R.id.stepSizeTwentyFivePercent);
-        stepSizeOneHundredPercentText = rootView.findViewById(R.id.stepSizeOneHundredPercent);
+        TextView stepSizeOnePercentText = rootView.findViewById(R.id.stepSizeOnePercent);
+        TextView stepSizeFivePercentText = rootView.findViewById(R.id.stepSizeFivePercent);
+        TextView stepSizeTenPercentText = rootView.findViewById(R.id.stepSizeTenPercent);
+        TextView stepSizeTwentyFivePercentText = rootView.findViewById(R.id.stepSizeTwentyFivePercent);
+        TextView stepSizeOneHundredPercentText = rootView.findViewById(R.id.stepSizeOneHundredPercent);
 
         if (stepSizeOnePercentText != null) {
             stepSizeOnePercentText.setText(getPercentString(STEP_ONE_PERCENT_VALUE));
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
index 52e268b24..16dffc3de 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
@@ -207,7 +207,7 @@ public class PlayerHelper {
 
     @NonNull
     public static SeekParameters getSeekParameters(@NonNull final Context context) {
-        return isUsingInexactSeek(context, false) ?
+        return isUsingInexactSeek(context) ?
                 SeekParameters.CLOSEST_SYNC : SeekParameters.EXACT;
     }
 
@@ -326,8 +326,8 @@ public class PlayerHelper {
         return getPreferences(context).getBoolean(context.getString(R.string.popup_remember_size_pos_key), b);
     }
 
-    private static boolean isUsingInexactSeek(@NonNull final Context context, final boolean b) {
-        return getPreferences(context).getBoolean(context.getString(R.string.use_inexact_seek_key), b);
+    private static boolean isUsingInexactSeek(@NonNull final Context context) {
+        return getPreferences(context).getBoolean(context.getString(R.string.use_inexact_seek_key), false);
     }
 
     private static boolean isAutoQueueEnabled(@NonNull final Context context, final boolean b) {
diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueueNavigator.java b/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueueNavigator.java
index 429c26fd9..3d1fd171f 100644
--- a/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueueNavigator.java
+++ b/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueueNavigator.java
@@ -79,7 +79,7 @@ public class PlayQueueNavigator implements MediaSessionConnector.QueueNavigator
 
     private void publishFloatingQueueWindow() {
         if (callback.getQueueSize() == 0) {
-            mediaSession.setQueue(Collections.<MediaSessionCompat.QueueItem>emptyList());
+            mediaSession.setQueue(Collections.emptyList());
             activeQueueItemId = MediaSessionCompat.QueueItem.UNKNOWN_ID;
             return;
         }
diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/BasePlayerMediaSession.java b/app/src/main/java/org/schabi/newpipe/player/playback/BasePlayerMediaSession.java
index 3365828d1..00604b236 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playback/BasePlayerMediaSession.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playback/BasePlayerMediaSession.java
@@ -8,7 +8,7 @@ import org.schabi.newpipe.player.mediasession.MediaSessionCallback;
 import org.schabi.newpipe.player.playqueue.PlayQueueItem;
 
 public class BasePlayerMediaSession implements MediaSessionCallback {
-    private BasePlayer player;
+    private final BasePlayer player;
 
     public BasePlayerMediaSession(final BasePlayer player) {
         this.player = player;
diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/CustomTrackSelector.java b/app/src/main/java/org/schabi/newpipe/player/playback/CustomTrackSelector.java
index d80ea5bae..efe6f3a58 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playback/CustomTrackSelector.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playback/CustomTrackSelector.java
@@ -4,7 +4,6 @@ import android.support.annotation.NonNull;
 import android.text.TextUtils;
 
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
@@ -12,7 +11,6 @@ import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.FixedTrackSelection;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.util.Assertions;
-import com.google.android.exoplayer2.util.Util;
 
 /**
  * This class allows irregular text language labels for use when selecting text captions and
@@ -55,7 +53,7 @@ public class CustomTrackSelector extends DefaultTrackSelector {
     /** @see DefaultTrackSelector#selectTextTrack(TrackGroupArray, int[][], Parameters) */
     @Override
     protected TrackSelection selectTextTrack(TrackGroupArray groups, int[][] formatSupport,
-                                             Parameters params) throws ExoPlaybackException {
+                                             Parameters params) {
         TrackGroup selectedGroup = null;
         int selectedTrackIndex = 0;
         int selectedTrackScore = 0;
diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java b/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java
index b27dc3dd6..3c5642d51 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java
@@ -335,7 +335,7 @@ public class MediaSourceManager {
 
     private void loadImmediate() {
         if (DEBUG) Log.d(TAG, "MediaSource - loadImmediate() called");
-        final ItemsToLoad itemsToLoad = getItemsToLoad(playQueue, WINDOW_SIZE);
+        final ItemsToLoad itemsToLoad = getItemsToLoad(playQueue);
         if (itemsToLoad == null) return;
 
         // Evict the previous items being loaded to free up memory, before start loading new ones
@@ -472,8 +472,7 @@ public class MediaSourceManager {
     // Manager Helpers
     //////////////////////////////////////////////////////////////////////////*/
     @Nullable
-    private static ItemsToLoad getItemsToLoad(@NonNull final PlayQueue playQueue,
-                                              final int windowSize) {
+    private static ItemsToLoad getItemsToLoad(@NonNull final PlayQueue playQueue) {
         // The current item has higher priority
         final int currentIndex = playQueue.getIndex();
         final PlayQueueItem currentItem = playQueue.getItem(currentIndex);
@@ -482,8 +481,8 @@ public class MediaSourceManager {
         // The rest are just for seamless playback
         // Although timeline is not updated prior to the current index, these sources are still
         // loaded into the cache for faster retrieval at a potentially later time.
-        final int leftBound = Math.max(0, currentIndex - windowSize);
-        final int rightLimit = currentIndex + windowSize + 1;
+        final int leftBound = Math.max(0, currentIndex - MediaSourceManager.WINDOW_SIZE);
+        final int rightLimit = currentIndex + MediaSourceManager.WINDOW_SIZE + 1;
         final int rightBound = Math.min(playQueue.size(), rightLimit);
         final Set<PlayQueueItem> neighbors = new ArraySet<>(
                 playQueue.getStreams().subList(leftBound,rightBound));
diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/PlaybackListener.java b/app/src/main/java/org/schabi/newpipe/player/playback/PlaybackListener.java
index 238bdfcd0..4e79c6d75 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playback/PlaybackListener.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playback/PlaybackListener.java
@@ -8,8 +8,6 @@ import com.google.android.exoplayer2.source.MediaSource;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.player.playqueue.PlayQueueItem;
 
-import java.util.List;
-
 public interface PlaybackListener {
 
     /**
diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java
index 2c08f4f92..676c0ca72 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/AbstractInfoPlayQueue.java
@@ -19,14 +19,14 @@ abstract class AbstractInfoPlayQueue<T extends ListInfo, U extends InfoItem> ext
     boolean isInitial;
     boolean isComplete;
 
-    int serviceId;
-    String baseUrl;
+    final int serviceId;
+    final String baseUrl;
     String nextUrl;
 
     transient Disposable fetchReactor;
 
     AbstractInfoPlayQueue(final U item) {
-        this(item.getServiceId(), item.getUrl(), null, Collections.<StreamInfoItem>emptyList(), 0);
+        this(item.getServiceId(), item.getUrl(), null, Collections.emptyList(), 0);
     }
 
     AbstractInfoPlayQueue(final int serviceId,
diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemBuilder.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemBuilder.java
index 996d3ace3..c24eff81a 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemBuilder.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemBuilder.java
@@ -5,10 +5,8 @@ import android.text.TextUtils;
 import android.view.MotionEvent;
 import android.view.View;
 
-import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
 
-import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.util.ImageDisplayConstants;
 import org.schabi.newpipe.util.Localization;
diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemHolder.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemHolder.java
index 2483e4473..effb9aae9 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemHolder.java
@@ -6,8 +6,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.InfoItem;
-import org.schabi.newpipe.info_list.holder.InfoItemHolder;
 
 /**
  * Created by Christian Schabesberger on 01.08.16.
diff --git a/app/src/main/java/org/schabi/newpipe/report/AcraReportSender.java b/app/src/main/java/org/schabi/newpipe/report/AcraReportSender.java
index 2d3226ab6..a6a81474f 100644
--- a/app/src/main/java/org/schabi/newpipe/report/AcraReportSender.java
+++ b/app/src/main/java/org/schabi/newpipe/report/AcraReportSender.java
@@ -5,7 +5,6 @@ import android.support.annotation.NonNull;
 
 import org.acra.collector.CrashReportData;
 import org.acra.sender.ReportSender;
-import org.acra.sender.ReportSenderException;
 import org.schabi.newpipe.R;
 
 /*
@@ -31,7 +30,7 @@ import org.schabi.newpipe.R;
 public class AcraReportSender implements ReportSender {
 
     @Override
-    public void send(@NonNull Context context, @NonNull CrashReportData report) throws ReportSenderException {
+    public void send(@NonNull Context context, @NonNull CrashReportData report) {
         ErrorActivity.reportError(context, report,
                 ErrorActivity.ErrorInfo.make(UserAction.UI_ERROR,"none",
                         "App crash, UI failure", R.string.app_ui_crash));
diff --git a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
index 3ad08c3ec..f852e0134 100644
--- a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
@@ -3,7 +3,6 @@ package org.schabi.newpipe.report;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Color;
 import android.net.Uri;
@@ -46,7 +45,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
 import java.util.Vector;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 /*
  * Created by Christian Schabesberger on 24.10.15.
@@ -81,12 +79,7 @@ public class ErrorActivity extends AppCompatActivity {
     private ErrorInfo errorInfo;
     private Class returnActivity;
     private String currentTimeStamp;
-    // views
-    private TextView errorView;
     private EditText userCommentBox;
-    private Button reportButton;
-    private TextView infoView;
-    private TextView errorMessageView;
 
     public static void reportUiError(final AppCompatActivity activity, final Throwable el) {
         reportError(activity, el, activity.getClass(), null,
@@ -194,11 +187,11 @@ public class ErrorActivity extends AppCompatActivity {
             actionBar.setDisplayShowTitleEnabled(true);
         }
 
-        reportButton = findViewById(R.id.errorReportButton);
+        Button reportButton = findViewById(R.id.errorReportButton);
         userCommentBox = findViewById(R.id.errorCommentBox);
-        errorView = findViewById(R.id.errorView);
-        infoView = findViewById(R.id.errorInfosView);
-        errorMessageView = findViewById(R.id.errorMessageView);
+        TextView errorView = findViewById(R.id.errorView);
+        TextView infoView = findViewById(R.id.errorInfosView);
+        TextView errorMessageView = findViewById(R.id.errorMessageView);
 
         ActivityCommunicator ac = ActivityCommunicator.getCommunicator();
         returnActivity = ac.returnActivity;
@@ -281,15 +274,14 @@ public class ErrorActivity extends AppCompatActivity {
     }
 
     private String formErrorText(String[] el) {
-        String text = "";
+        StringBuilder text = new StringBuilder();
         if (el != null) {
             for (String e : el) {
-                text += "-------------------------------------\n"
-                        + e;
+                text.append("-------------------------------------\n").append(e);
             }
         }
-        text += "-------------------------------------";
-        return text;
+        text.append("-------------------------------------");
+        return text.toString();
     }
 
     /**
diff --git a/app/src/main/java/org/schabi/newpipe/settings/AppearanceSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/AppearanceSettingsFragment.java
index 806b30a5b..821636ee5 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/AppearanceSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/AppearanceSettingsFragment.java
@@ -6,7 +6,6 @@ import android.os.Bundle;
 import android.provider.Settings;
 import android.support.annotation.Nullable;
 import android.support.v7.preference.Preference;
-import android.util.Log;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.Constants;
@@ -49,7 +48,7 @@ public class AppearanceSettingsFragment extends BasePreferenceFragment {
         return super.onPreferenceTreeClick(preference);
     }
 
-    private Preference.OnPreferenceChangeListener themePreferenceChange = new Preference.OnPreferenceChangeListener() {
+    private final Preference.OnPreferenceChangeListener themePreferenceChange = new Preference.OnPreferenceChangeListener() {
         @Override
         public boolean onPreferenceChange(Preference preference, Object newValue) {
             defaultPreferences.edit().putBoolean(Constants.KEY_THEME_CHANGE, true).apply();
diff --git a/app/src/main/java/org/schabi/newpipe/settings/BasePreferenceFragment.java b/app/src/main/java/org/schabi/newpipe/settings/BasePreferenceFragment.java
index e3c52cdad..e4fae3e1f 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/BasePreferenceFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/BasePreferenceFragment.java
@@ -13,7 +13,7 @@ import org.schabi.newpipe.MainActivity;
 
 public abstract class BasePreferenceFragment extends PreferenceFragmentCompat {
     protected final String TAG = getClass().getSimpleName() + "@" + Integer.toHexString(hashCode());
-    protected boolean DEBUG = MainActivity.DEBUG;
+    protected final boolean DEBUG = MainActivity.DEBUG;
 
     protected SharedPreferences defaultPreferences;
 
diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
index 0ca78b34a..5c54fa735 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
@@ -9,8 +9,6 @@ import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
 import android.util.Log;
 import android.widget.Toast;
@@ -19,12 +17,9 @@ import com.nononsenseapps.filepicker.Utils;
 import com.nostra13.universalimageloader.core.ImageLoader;
 
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.FilePickerActivityHelper;
-import org.schabi.newpipe.util.KioskTranslator;
 import org.schabi.newpipe.util.ZipHelper;
 
 import java.io.BufferedOutputStream;
@@ -47,7 +42,6 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
     private static final int REQUEST_IMPORT_PATH = 8945;
     private static final int REQUEST_EXPORT_PATH = 30945;
 
-    private String homeDir;
     private File databasesDir;
     private File newpipe_db;
     private File newpipe_db_journal;
@@ -81,7 +75,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
 
-        homeDir = getActivity().getApplicationInfo().dataDir;
+        String homeDir = getActivity().getApplicationInfo().dataDir;
         databasesDir = new File(homeDir + "/databases");
         newpipe_db = new File(homeDir + "/databases/newpipe.db");
         newpipe_db_journal = new File(homeDir + "/databases/newpipe.db-journal");
@@ -193,7 +187,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
         } finally {
             try {
                 zipFile.close();
-            } catch (Exception e){}
+            } catch (Exception ignored){}
         }
 
         try {
@@ -254,17 +248,17 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
                 String key = entry.getKey();
 
                 if (v instanceof Boolean)
-                    prefEdit.putBoolean(key, ((Boolean) v).booleanValue());
+                    prefEdit.putBoolean(key, (Boolean) v);
                 else if (v instanceof Float)
-                    prefEdit.putFloat(key, ((Float) v).floatValue());
+                    prefEdit.putFloat(key, (Float) v);
                 else if (v instanceof Integer)
-                    prefEdit.putInt(key, ((Integer) v).intValue());
+                    prefEdit.putInt(key, (Integer) v);
                 else if (v instanceof Long)
-                    prefEdit.putLong(key, ((Long) v).longValue());
+                    prefEdit.putLong(key, (Long) v);
                 else if (v instanceof String)
                     prefEdit.putString(key, ((String) v));
             }
-            prefEdit.commit();
+            prefEdit.apply();
         } catch (FileNotFoundException e) {
             e.printStackTrace();
         } catch (IOException e) {
@@ -286,13 +280,12 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
     // Error
     //////////////////////////////////////////////////////////////////////////*/
 
-    protected boolean onError(Throwable e) {
+    protected void onError(Throwable e) {
         final Activity activity = getActivity();
         ErrorActivity.reportError(activity, e,
                 activity.getClass(),
                 null,
                 ErrorActivity.ErrorInfo.make(UserAction.UI_ERROR,
                         "none", "", R.string.app_ui_crash));
-        return true;
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/settings/HistorySettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/HistorySettingsFragment.java
index cc1f408b7..d28c3179c 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/HistorySettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/HistorySettingsFragment.java
@@ -1,29 +1,20 @@
 package org.schabi.newpipe.settings;
 
-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.preference.Preference;
-import android.util.Log;
 import android.widget.Toast;
 
-import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.InfoCache;
 
-import java.util.ArrayList;
-import java.util.Collection;
-
-import io.reactivex.Single;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.disposables.Disposable;
-import io.reactivex.disposables.Disposables;
 
 public class HistorySettingsFragment extends BasePreferenceFragment {
     private String cacheWipeKey;
diff --git a/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java b/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java
index 0ebdbefe0..61bd4077e 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java
@@ -51,9 +51,7 @@ import io.reactivex.schedulers.Schedulers;
  */
 
 public class SelectChannelFragment extends DialogFragment {
-    private SelectChannelAdapter channelAdapter;
-    private SubscriptionService subscriptionService;
-    private ImageLoader imageLoader = ImageLoader.getInstance();
+    private final ImageLoader imageLoader = ImageLoader.getInstance();
 
     private ProgressBar progressBar;
     private TextView emptyView;
@@ -89,9 +87,9 @@ public class SelectChannelFragment extends DialogFragment {
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View v = inflater.inflate(R.layout.select_channel_fragment, container, false);
-        recyclerView = (RecyclerView) v.findViewById(R.id.items_list);
+        recyclerView = v.findViewById(R.id.items_list);
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-        channelAdapter = new SelectChannelAdapter();
+        SelectChannelAdapter channelAdapter = new SelectChannelAdapter();
         recyclerView.setAdapter(channelAdapter);
 
         progressBar = v.findViewById(R.id.progressBar);
@@ -101,7 +99,7 @@ public class SelectChannelFragment extends DialogFragment {
         emptyView.setVisibility(View.GONE);
 
 
-        subscriptionService = SubscriptionService.getInstance(getContext());
+        SubscriptionService subscriptionService = SubscriptionService.getInstance(getContext());
         subscriptionService.getSubscription().toObservable()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -203,9 +201,9 @@ public class SelectChannelFragment extends DialogFragment {
                 thumbnailView = v.findViewById(R.id.itemThumbnailView);
                 titleView = v.findViewById(R.id.itemTitleView);
             }
-            public View view;
-            public CircleImageView thumbnailView;
-            public TextView titleView;
+            public final View view;
+            public final CircleImageView thumbnailView;
+            public final TextView titleView;
         }
     }
 
@@ -213,14 +211,13 @@ public class SelectChannelFragment extends DialogFragment {
     // Error
     //////////////////////////////////////////////////////////////////////////*/
 
-    protected boolean onError(Throwable e) {
+    protected void onError(Throwable e) {
         final Activity activity = getActivity();
         ErrorActivity.reportError(activity, e,
                 activity.getClass(),
                 null,
                 ErrorActivity.ErrorInfo.make(UserAction.UI_ERROR,
                         "none", "", R.string.app_ui_crash));
-        return true;
     }
 
 
diff --git a/app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java b/app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java
index 44cb16682..8c3bd56e7 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java
@@ -75,7 +75,7 @@ public class SelectKioskFragment extends DialogFragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View v = inflater.inflate(R.layout.select_kiosk_fragment, container, false);
-        recyclerView = (RecyclerView) v.findViewById(R.id.items_list);
+        recyclerView = v.findViewById(R.id.items_list);
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         try {
             selectKioskAdapter = new SelectKioskAdapter();
@@ -112,13 +112,13 @@ public class SelectKioskFragment extends DialogFragment {
             public Entry (int i, int si, String ki, String kn){
                 icon = i; serviceId=si; kioskId=ki; kioskName = kn;
             }
-            int icon;
-            int serviceId;
-            String kioskId;
-            String kioskName;
+            final int icon;
+            final int serviceId;
+            final String kioskId;
+            final String kioskName;
         }
 
-        private List<Entry> kioskList = new Vector<>();
+        private final List<Entry> kioskList = new Vector<>();
 
         public SelectKioskAdapter()
                 throws Exception {
@@ -157,9 +157,9 @@ public class SelectKioskFragment extends DialogFragment {
                 thumbnailView = v.findViewById(R.id.itemThumbnailView);
                 titleView = v.findViewById(R.id.itemTitleView);
             }
-            public View view;
-            public ImageView thumbnailView;
-            public TextView titleView;
+            public final View view;
+            public final ImageView thumbnailView;
+            public final TextView titleView;
         }
 
         public void onBindViewHolder(SelectKioskItemHolder holder, final int position) {
@@ -179,13 +179,12 @@ public class SelectKioskFragment extends DialogFragment {
     // Error
     //////////////////////////////////////////////////////////////////////////*/
 
-    protected boolean onError(Throwable e) {
+    protected void onError(Throwable e) {
         final Activity activity = getActivity();
         ErrorActivity.reportError(activity, e,
                 activity.getClass(),
                 null,
                 ErrorActivity.ErrorInfo.make(UserAction.UI_ERROR,
                         "none", "", R.string.app_ui_crash));
-        return true;
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
index e445233c3..31ab1a845 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
@@ -32,6 +32,7 @@ import org.schabi.newpipe.extractor.Info;
 import org.schabi.newpipe.extractor.ListExtractor.InfoItemsPage;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.channel.ChannelInfo;
+import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
 import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
@@ -183,7 +184,7 @@ public final class ExtractorHelper {
             cache.removeInfo(serviceId, url);
             load = loadFromNetwork;
         } else {
-            load = Maybe.concat(ExtractorHelper.<I>loadFromCache(serviceId, url),
+            load = Maybe.concat(ExtractorHelper.loadFromCache(serviceId, url),
                     loadFromNetwork.toMaybe())
                     .firstElement() //Take the first valid
                     .toSingle();
diff --git a/app/src/main/java/org/schabi/newpipe/util/InfoCache.java b/app/src/main/java/org/schabi/newpipe/util/InfoCache.java
index ecc66bb40..318db37a1 100644
--- a/app/src/main/java/org/schabi/newpipe/util/InfoCache.java
+++ b/app/src/main/java/org/schabi/newpipe/util/InfoCache.java
@@ -28,9 +28,6 @@ import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.extractor.Info;
 
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
 
 
 public final class InfoCache {
@@ -58,7 +55,7 @@ public final class InfoCache {
     public Info getFromKey(int serviceId, @NonNull String url) {
         if (DEBUG) Log.d(TAG, "getFromKey() called with: serviceId = [" + serviceId + "], url = [" + url + "]");
         synchronized (lruCache) {
-            return getInfo(lruCache, keyOf(serviceId, url));
+            return getInfo(keyOf(serviceId, url));
         }
     }
 
@@ -89,7 +86,7 @@ public final class InfoCache {
     public void trimCache() {
         if (DEBUG) Log.d(TAG, "trimCache() called");
         synchronized (lruCache) {
-            removeStaleCache(lruCache);
+            removeStaleCache();
             lruCache.trimToSize(TRIM_CACHE_TO);
         }
     }
@@ -105,23 +102,22 @@ public final class InfoCache {
         return serviceId + url;
     }
 
-    private static void removeStaleCache(@NonNull final LruCache<String, CacheData> cache) {
-        for (Map.Entry<String, CacheData> entry : cache.snapshot().entrySet()) {
+    private static void removeStaleCache() {
+        for (Map.Entry<String, CacheData> entry : InfoCache.lruCache.snapshot().entrySet()) {
             final CacheData data = entry.getValue();
             if (data != null && data.isExpired()) {
-                cache.remove(entry.getKey());
+                InfoCache.lruCache.remove(entry.getKey());
             }
         }
     }
 
     @Nullable
-    private static Info getInfo(@NonNull final LruCache<String, CacheData> cache,
-                                @NonNull final String key) {
-        final CacheData data = cache.get(key);
+    private static Info getInfo(@NonNull final String key) {
+        final CacheData data = InfoCache.lruCache.get(key);
         if (data == null) return null;
 
         if (data.isExpired()) {
-            cache.remove(key);
+            InfoCache.lruCache.remove(key);
             return null;
         }
 
diff --git a/app/src/main/java/org/schabi/newpipe/util/ListHelper.java b/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
index 1a5bf14f7..871d0578f 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
@@ -204,7 +204,7 @@ public final class ListHelper {
      */
     private static void sortStreamList(List<VideoStream> videoStreams, final boolean ascendingOrder) {
         Collections.sort(videoStreams, (o1, o2) -> {
-            int result = compareVideoStreamResolution(o1, o2, VIDEO_FORMAT_QUALITY_RANKING);
+            int result = compareVideoStreamResolution(o1, o2);
             return result == 0 ? 0 : (ascendingOrder ? result : -result);
         });
     }
@@ -399,8 +399,7 @@ public final class ListHelper {
     }
 
     // Compares the quality of two video streams.
-    private static int compareVideoStreamResolution(VideoStream streamA, VideoStream streamB,
-                                                    List<MediaFormat> formatRanking) {
+    private static int compareVideoStreamResolution(VideoStream streamA, VideoStream streamB) {
         if (streamA == null) {
             return -1;
         }
@@ -414,7 +413,7 @@ public final class ListHelper {
         }
 
         // Same bitrate and format
-        return formatRanking.indexOf(streamA.getFormat()) - formatRanking.indexOf(streamB.getFormat());
+        return ListHelper.VIDEO_FORMAT_QUALITY_RANKING.indexOf(streamA.getFormat()) - ListHelper.VIDEO_FORMAT_QUALITY_RANKING.indexOf(streamB.getFormat());
     }
 
 
diff --git a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
index 13767125d..5b953697d 100644
--- a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
@@ -26,7 +26,6 @@ import org.schabi.newpipe.download.DownloadActivity;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.search.SearchExtractor;
 import org.schabi.newpipe.extractor.stream.AudioStream;
 import org.schabi.newpipe.extractor.stream.Stream;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
diff --git a/app/src/main/java/org/schabi/newpipe/util/StateSaver.java b/app/src/main/java/org/schabi/newpipe/util/StateSaver.java
index 51dceddf3..3115862e0 100644
--- a/app/src/main/java/org/schabi/newpipe/util/StateSaver.java
+++ b/app/src/main/java/org/schabi/newpipe/util/StateSaver.java
@@ -21,7 +21,6 @@ package org.schabi.newpipe.util;
 
 
 import android.content.Context;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/app/src/main/java/org/schabi/newpipe/util/StreamItemAdapter.java b/app/src/main/java/org/schabi/newpipe/util/StreamItemAdapter.java
index e3fe4a679..e100a447b 100644
--- a/app/src/main/java/org/schabi/newpipe/util/StreamItemAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/util/StreamItemAdapter.java
@@ -31,7 +31,7 @@ import us.shandian.giga.util.Utility;
 public class StreamItemAdapter<T extends Stream> extends BaseAdapter {
     private final Context context;
 
-    private StreamSizeWrapper<T> streamsWrapper;
+    private final StreamSizeWrapper<T> streamsWrapper;
     private final boolean showIconNoAudio;
 
     public StreamItemAdapter(Context context, StreamSizeWrapper<T> streamsWrapper, boolean showIconNoAudio) {
@@ -124,7 +124,7 @@ public class StreamItemAdapter<T extends Stream> extends BaseAdapter {
     public static class StreamSizeWrapper<T extends Stream> implements Serializable {
         private static final StreamSizeWrapper<Stream> EMPTY = new StreamSizeWrapper<>(Collections.emptyList());
         private final List<T> streamsList;
-        private long[] streamSizes;
+        private final long[] streamSizes;
 
         public StreamSizeWrapper(List<T> streamsList) {
             this.streamsList = streamsList;
diff --git a/app/src/main/java/org/schabi/newpipe/util/ZipHelper.java b/app/src/main/java/org/schabi/newpipe/util/ZipHelper.java
index 3578f34ac..3142ad8dc 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ZipHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ZipHelper.java
@@ -56,7 +56,6 @@ public class ZipHelper {
     /**
      * This will extract data from Zipfiles.
      * Caution this will override the original file.
-     * @param inZip The ZipOutputStream where the data is stored in
      * @param file The path of the file on the disk where the data should be extracted to.
      * @param name The path of the file inside the zip.
      * @return will return true if the file was found within the zip file
diff --git a/app/src/main/java/org/schabi/newpipe/views/CollapsibleView.java b/app/src/main/java/org/schabi/newpipe/views/CollapsibleView.java
index adef7e76f..88d525625 100644
--- a/app/src/main/java/org/schabi/newpipe/views/CollapsibleView.java
+++ b/app/src/main/java/org/schabi/newpipe/views/CollapsibleView.java
@@ -81,7 +81,7 @@ public class CollapsibleView extends LinearLayout {
 
     private int targetHeight = -1;
     private ValueAnimator currentAnimator;
-    private List<StateListener> listeners = new ArrayList<>();
+    private final List<StateListener> listeners = new ArrayList<>();
 
     /**
      * This method recalculates the height of this view so it <b>must</b> be called when
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadManagerImpl.java b/app/src/main/java/us/shandian/giga/get/DownloadManagerImpl.java
index 3294f5164..a377d861c 100755
--- a/app/src/main/java/us/shandian/giga/get/DownloadManagerImpl.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadManagerImpl.java
@@ -123,7 +123,7 @@ public class DownloadManagerImpl implements DownloadManager {
         Collections.sort(missions, new Comparator<DownloadMission>() {
             @Override
             public int compare(DownloadMission o1, DownloadMission o2) {
-                return Long.valueOf(o1.timestamp).compareTo(o2.timestamp);
+                return Long.compare(o1.timestamp, o2.timestamp);
             }
         });
     }
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadMission.java b/app/src/main/java/us/shandian/giga/get/DownloadMission.java
index f02eaae28..79c4baf05 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadMission.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadMission.java
@@ -67,8 +67,8 @@ public class DownloadMission implements Serializable {
     public long done;
     public int threadCount = 3;
     public int finishCount;
-    private List<Long> threadPositions = new ArrayList<Long>();
-    public final Map<Long, Boolean> blockState = new HashMap<Long, Boolean>();
+    private final List<Long> threadPositions = new ArrayList<>();
+    public final Map<Long, Boolean> blockState = new HashMap<>();
     public boolean running;
     public boolean finished;
     public boolean fallback;
@@ -77,7 +77,7 @@ public class DownloadMission implements Serializable {
 
     public transient boolean recovered;
 
-    private transient ArrayList<WeakReference<MissionListener>> mListeners = new ArrayList<WeakReference<MissionListener>>();
+    private transient ArrayList<WeakReference<MissionListener>> mListeners = new ArrayList<>();
     private transient boolean mWritingToFile;
 
     private static final int NO_IDENTIFIER = -1;
@@ -232,7 +232,7 @@ public class DownloadMission implements Serializable {
     public synchronized void addListener(MissionListener listener) {
         Handler handler = new Handler(Looper.getMainLooper());
         MissionListener.handlerStore.put(listener, handler);
-        mListeners.add(new WeakReference<MissionListener>(listener));
+        mListeners.add(new WeakReference<>(listener));
     }
 
     public synchronized void removeListener(MissionListener listener) {
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java b/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
index b53f8aea9..6ad8626c3 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
@@ -92,7 +92,7 @@ public class DownloadRunnable implements Runnable {
                 // A server may be ignoring the range request
                 if (conn.getResponseCode() != 206) {
                     mMission.errCode = DownloadMission.ERROR_SERVER_UNSUPPORTED;
-                    notifyError(DownloadMission.ERROR_SERVER_UNSUPPORTED);
+                    notifyError();
 
                     if (DEBUG) {
                         Log.e(TAG, mId + ":Unsupported " + conn.getResponseCode());
@@ -161,9 +161,9 @@ public class DownloadRunnable implements Runnable {
         }
     }
 
-    private void notifyError(final int err) {
+    private void notifyError() {
         synchronized (mMission) {
-            mMission.notifyError(err);
+            mMission.notifyError(DownloadMission.ERROR_SERVER_UNSUPPORTED);
             mMission.pause();
         }
     }
diff --git a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
index 59f5e2225..ff410a79a 100755
--- a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
+++ b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
@@ -56,7 +56,7 @@ public class DownloadManagerService extends Service {
     private DownloadDataSource mDataSource;
 
 
-    private MissionListener missionListener = new MissionListener();
+    private final MissionListener missionListener = new MissionListener();
 
 
     private void notifyMediaScanner(DownloadMission mission) {
diff --git a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
index 8127c3467..d5555c2be 100644
--- a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
+++ b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
@@ -306,12 +306,12 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
         public DownloadMission mission;
         public int position;
 
-        public TextView status;
-        public ImageView icon;
-        public TextView name;
-        public TextView size;
-        public View bkg;
-        public ImageView menu;
+        public final TextView status;
+        public final ImageView icon;
+        public final TextView name;
+        public final TextView size;
+        public final View bkg;
+        public final ImageView menu;
         public ProgressDrawable progress;
         public MissionObserver observer;
 
@@ -332,8 +332,8 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
     }
 
     static class MissionObserver implements DownloadMission.MissionListener {
-        private MissionAdapter mAdapter;
-        private ViewHolder mHolder;
+        private final MissionAdapter mAdapter;
+        private final ViewHolder mHolder;
 
         public MissionObserver(MissionAdapter adapter, ViewHolder holder) {
             mAdapter = adapter;
@@ -365,7 +365,7 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
 
     private static class ChecksumTask extends AsyncTask<String, Void, String> {
         ProgressDialog prog;
-        WeakReference<Activity> weakReference;
+        final WeakReference<Activity> weakReference;
 
         ChecksumTask(@NonNull Activity activity) {
             weakReference = new WeakReference<>(activity);
diff --git a/app/src/main/java/us/shandian/giga/ui/common/ProgressDrawable.java b/app/src/main/java/us/shandian/giga/ui/common/ProgressDrawable.java
index 6a0e35cff..955ce4c65 100644
--- a/app/src/main/java/us/shandian/giga/ui/common/ProgressDrawable.java
+++ b/app/src/main/java/us/shandian/giga/ui/common/ProgressDrawable.java
@@ -12,7 +12,8 @@ import android.support.v4.content.ContextCompat;
 
 public class ProgressDrawable extends Drawable {
     private float mProgress;
-    private int mBackgroundColor, mForegroundColor;
+    private final int mBackgroundColor;
+    private final int mForegroundColor;
 
     public ProgressDrawable(Context context, @ColorRes int background, @ColorRes int foreground) {
         this(ContextCompat.getColor(context, background), ContextCompat.getColor(context, foreground));
diff --git a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
index 14439f6c8..5241415b2 100644
--- a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
+++ b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
@@ -16,6 +16,8 @@ import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
@@ -44,7 +46,7 @@ public abstract class MissionsFragment extends Fragment {
     private DeleteDownloadManager mDeleteDownloadManager;
     private Disposable mDeleteDisposable;
 
-    private ServiceConnection mConnection = new ServiceConnection() {
+    private final ServiceConnection mConnection = new ServiceConnection() {
 
         @Override
         public void onServiceConnected(ComponentName name, IBinder binder) {
@@ -144,17 +146,21 @@ public abstract class MissionsFragment extends Fragment {
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        return super.onOptionsItemSelected(item);
+    public void onPrepareOptionsMenu(Menu menu) {
+        mSwitch = menu.findItem(R.id.switch_mode);
+        super.onPrepareOptionsMenu(menu);
+    }
 
-		/*switch (item.getItemId()) {
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
             case R.id.switch_mode:
 				mLinear = !mLinear;
 				updateList();
 				return true;
 			default:
 				return super.onOptionsItemSelected(item);
-		}*/
+		}
     }
 
     public void notifyChange() {
diff --git a/app/src/main/java/us/shandian/giga/util/Utility.java b/app/src/main/java/us/shandian/giga/util/Utility.java
index de9a16a1b..163ac2b14 100644
--- a/app/src/main/java/us/shandian/giga/util/Utility.java
+++ b/app/src/main/java/us/shandian/giga/util/Utility.java
@@ -11,9 +11,7 @@ import android.widget.Toast;
 
 import org.schabi.newpipe.R;
 
-import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
-import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -198,7 +196,7 @@ public class Utility {
             while ((len = i.read(buf)) != -1) {
                 md.update(buf, 0, len);
             }
-        } catch (IOException e) {
+        } catch (IOException ignored) {
 
         }
 
diff --git a/app/src/main/res/layout-large-land/activity_main_player.xml b/app/src/main/res/layout-large-land/activity_main_player.xml
new file mode 100644
index 000000000..7d7e1230e
--- /dev/null
+++ b/app/src/main/res/layout-large-land/activity_main_player.xml
@@ -0,0 +1,581 @@
+<?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"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:gravity="center">
+
+    <com.google.android.exoplayer2.ui.AspectRatioFrameLayout
+        android:id="@+id/aspectRatioLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerInParent="true"
+        android:layout_gravity="center">
+
+        <SurfaceView
+            android:id="@+id/surfaceView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"/>
+
+
+        <View
+            android:id="@+id/surfaceForeground"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@android:color/black"/>
+
+    </com.google.android.exoplayer2.ui.AspectRatioFrameLayout>
+
+    <com.google.android.exoplayer2.ui.SubtitleView
+        android:id="@+id/subtitleView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerInParent="true"
+        android:layout_gravity="center"/>
+
+    <ImageView
+        android:id="@+id/endScreen"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:visibility="gone"
+        tools:background="@android:color/white"
+        tools:ignore="ContentDescription"
+        tools:visibility="visible"/>
+
+    <RelativeLayout
+        android:id="@+id/playQueuePanel"
+        android:layout_width="380dp"
+        android:layout_height="match_parent"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:visibility="invisible"
+        android:background="?attr/queue_background_color"
+        tools:visibility="visible">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:id="@+id/playQueueControl">
+
+            <ImageButton
+                android:id="@+id/playQueueClose"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_centerVertical="true"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
+                android:layout_marginRight="40dp"
+                android:layout_marginEnd="40dp"
+                android:padding="10dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:scaleType="fitXY"
+                android:tint="?attr/colorAccent"
+                android:src="@drawable/ic_close_white_24dp"
+                android:background="?android:selectableItemBackground"
+                tools:ignore="ContentDescription"/>
+
+            <ImageButton
+                android:id="@+id/repeatButton"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_centerVertical="true"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_marginLeft="40dp"
+                android:layout_marginStart="40dp"
+                android:padding="10dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:scaleType="fitXY"
+                android:tint="?attr/colorAccent"
+                android:src="@drawable/exo_controls_repeat_off"
+                android:background="?android:selectableItemBackground"
+                tools:ignore="ContentDescription,RtlHardcoded"/>
+
+            <ImageButton
+                android:id="@+id/shuffleButton"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_centerVertical="true"
+                android:layout_toRightOf="@id/repeatButton"
+                android:padding="10dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:scaleType="fitXY"
+                android:tint="?attr/colorAccent"
+                android:src="@drawable/ic_shuffle_white_24dp"
+                android:background="?android:selectableItemBackground"
+                tools:ignore="ContentDescription,RtlHardcoded"/>
+        </RelativeLayout>
+
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/playQueue"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/playQueueControl"
+            android:scrollbars="vertical"
+            app:layoutManager="LinearLayoutManager"
+            tools:listitem="@layout/play_queue_item"/>
+
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/playbackControlRoot"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/video_overlay_color"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <RelativeLayout
+            android:id="@+id/playbackWindowRoot"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fitsSystemWindows="true">
+
+            <RelativeLayout
+                android:id="@+id/topControls"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:background="@drawable/player_top_controls_bg"
+                android:gravity="top"
+                android:paddingTop="10dp"
+                android:paddingBottom="10dp"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
+                tools:ignore="RtlHardcoded">
+
+                <LinearLayout
+                    android:id="@+id/metadataView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentTop="true"
+                    android:layout_toLeftOf="@+id/qualityTextView"
+                    android:gravity="top"
+                    android:orientation="vertical"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    tools:ignore="RtlHardcoded">
+
+                    <TextView
+                        android:id="@+id/titleTextView"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="marquee"
+                        android:fadingEdge="horizontal"
+                        android:marqueeRepeatLimit="marquee_forever"
+                        android:scrollHorizontally="true"
+                        android:singleLine="true"
+                        android:textColor="@android:color/white"
+                        android:textSize="15sp"
+                        android:textStyle="bold"
+                        android:clickable="true"
+                        android:focusable="true"
+                        tools:ignore="RtlHardcoded"
+                        tools:text="The Video Title LONG very LONG"/>
+
+                    <TextView
+                        android:id="@+id/channelTextView"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="marquee"
+                        android:fadingEdge="horizontal"
+                        android:marqueeRepeatLimit="marquee_forever"
+                        android:scrollHorizontally="true"
+                        android:singleLine="true"
+                        android:textColor="@android:color/white"
+                        android:textSize="12sp"
+                        android:clickable="true"
+                        android:focusable="true"
+                        tools:text="The Video Artist  LONG very LONG very Long"/>
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/qualityTextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="35dp"
+                    android:layout_marginLeft="2dp"
+                    android:layout_marginRight="2dp"
+                    android:layout_toLeftOf="@+id/playbackSpeed"
+                    android:gravity="center"
+                    android:minWidth="50dp"
+                    android:text="720p"
+                    android:textColor="@android:color/white"
+                    android:textStyle="bold"
+                    android:background="?attr/selectableItemBackground"
+                    tools:ignore="HardcodedText,RtlHardcoded"/>
+
+                <TextView
+                    android:id="@+id/playbackSpeed"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="2dp"
+                    android:layout_toLeftOf="@+id/queueButton"
+                    android:gravity="center"
+                    android:minHeight="35dp"
+                    android:minWidth="40dp"
+                    android:textColor="@android:color/white"
+                    android:textStyle="bold"
+                    android:background="?attr/selectableItemBackground"
+                    tools:ignore="RtlHardcoded,RtlSymmetry"
+                    tools:text="1x" />
+
+                <ImageButton
+                    android:id="@+id/queueButton"
+                    android:layout_width="30dp"
+                    android:layout_height="35dp"
+                    android:layout_marginLeft="2dp"
+                    android:layout_marginRight="2dp"
+                    android:layout_toLeftOf="@+id/moreOptionsButton"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:padding="5dp"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/list"
+                    android:background="?attr/selectableItemBackground"
+                    tools:ignore="ContentDescription,RtlHardcoded"/>
+
+                <ImageButton
+                    android:id="@+id/moreOptionsButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginLeft="2dp"
+					android:padding="5dp"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/ic_expand_more_white_24dp"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    tools:ignore="ContentDescription,RtlHardcoded"/>
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/secondaryControls"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/topControls"
+                android:gravity="top"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
+                android:visibility="invisible"
+                tools:ignore="RtlHardcoded"
+                tools:visibility="visible">
+
+                <TextView
+                    android:id="@+id/resizeTextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="35dp"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    android:layout_alignParentLeft="true"
+                    android:gravity="center"
+                    android:minWidth="50dp"
+                    android:textColor="@android:color/white"
+                    android:textStyle="bold"
+                    android:background="?attr/selectableItemBackground"
+                    tools:ignore="HardcodedText,RtlHardcoded"
+                    tools:text="FIT"/>
+
+                <TextView
+                    android:id="@+id/captionTextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    android:layout_toLeftOf="@id/switchBackground"
+                    android:layout_toRightOf="@id/resizeTextView"
+                    android:gravity="center|left"
+                    android:minHeight="35dp"
+                    android:minWidth="40dp"
+                    android:paddingLeft="2dp"
+                    android:paddingRight="2dp"
+                    android:textColor="@android:color/white"
+                    android:textStyle="bold"
+                    android:background="?attr/selectableItemBackground"
+                    tools:ignore="RelativeOverlap,RtlHardcoded"
+                    tools:text="English" />
+
+                <ImageButton
+                    android:id="@+id/toggleOrientation"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="2dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:padding="5dp"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/ic_screen_rotation_white"
+                    android:background="?attr/selectableItemBackground"
+                    android:contentDescription="@string/toggle_orientation"
+                    tools:ignore="RtlHardcoded"/>
+
+                <ImageButton
+                    android:id="@+id/switchPopup"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:layout_toLeftOf="@id/toggleOrientation"
+                    android:layout_centerVertical="true"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/ic_fullscreen_exit_white"
+                    android:background="?attr/selectableItemBackground"
+                    android:contentDescription="@string/switch_to_popup"
+                    tools:ignore="RtlHardcoded"/>
+
+                <ImageButton
+                    android:id="@+id/switchBackground"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:layout_toLeftOf="@id/switchPopup"
+                    android:layout_centerVertical="true"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:padding="5dp"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/ic_headset_white_24dp"
+                    android:background="?attr/selectableItemBackground"
+                    android:contentDescription="@string/switch_to_background"
+                    tools:ignore="RtlHardcoded"/>
+            </RelativeLayout>
+
+            <LinearLayout
+                android:id="@+id/bottomControls"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:background="@drawable/player_controls_bg"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp">
+
+                <TextView
+                    android:id="@+id/playbackCurrentTime"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:minHeight="40dp"
+                    android:text="-:--:--"
+                    android:textColor="@android:color/white"
+                    tools:ignore="HardcodedText"
+                    tools:text="1:06:29"/>
+
+
+                <android.support.v7.widget.AppCompatSeekBar
+                    android:id="@+id/playbackSeekBar"
+                    style="@style/Widget.AppCompat.SeekBar"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:paddingBottom="4dp"
+                    android:paddingTop="8dp"
+                    tools:progress="25"
+                    tools:secondaryProgress="50"/>
+
+                <TextView
+                    android:id="@+id/playbackEndTime"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="-:--:--"
+                    android:textColor="@android:color/white"
+                    tools:ignore="HardcodedText"
+                    tools:text="1:23:49"/>
+
+                <TextView
+                    android:id="@+id/playbackLiveSync"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:paddingLeft="4dp"
+                    android:paddingRight="4dp"
+                    android:gravity="center"
+                    android:text="@string/duration_live_button"
+                    android:textAllCaps="true"
+                    android:textColor="@android:color/white"
+                    android:maxLength="4"
+                    android:visibility="gone"
+                    android:background="?attr/selectableItemBackground"
+                    tools:ignore="HardcodedText,RtlHardcoded,RtlSymmetry" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <ImageButton
+            android:id="@+id/playPauseButton"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_centerInParent="true"
+            android:clickable="true"
+            android:focusable="true"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:scaleType="fitXY"
+            android:src="@drawable/ic_pause_white"
+            tools:ignore="ContentDescription"/>
+
+        <ImageButton
+            android:id="@+id/playPreviousButton"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_marginRight="30dp"
+            android:layout_marginEnd="30dp"
+            android:layout_centerInParent="true"
+            android:layout_toLeftOf="@id/playPauseButton"
+            android:layout_toStartOf="@id/playPauseButton"
+            android:clickable="true"
+            android:focusable="true"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:scaleType="fitXY"
+            android:src="@drawable/exo_controls_previous"
+            tools:ignore="ContentDescription"/>
+
+        <ImageButton
+            android:id="@+id/playNextButton"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_marginLeft="30dp"
+            android:layout_marginStart="30dp"
+            android:layout_centerInParent="true"
+            android:layout_toRightOf="@id/playPauseButton"
+            android:layout_toEndOf="@id/playPauseButton"
+            android:clickable="true"
+            android:focusable="true"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:scaleType="fitXY"
+            android:src="@drawable/exo_controls_next"
+            tools:ignore="ContentDescription"/>
+
+    </RelativeLayout>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/controlAnimationView"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:background="@drawable/background_oval_black_transparent"
+            android:visibility="gone"
+            tools:ignore="ContentDescription"
+            tools:src="@drawable/ic_action_av_fast_rewind"
+            tools:visibility="visible" />
+    </LinearLayout>
+
+
+    <RelativeLayout
+        android:id="@+id/loading_panel"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@android:color/black"
+        tools:visibility="gone">
+
+        <ProgressBar
+            android:id="@+id/progressBarLoadingPanel"
+            style="?android:attr/progressBarStyleLargeInverse"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:indeterminate="true"/>
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentTop="true"
+        android:layout_gravity="center"
+        android:layout_toEndOf="@+id/loading_panel"
+        android:layout_toRightOf="@+id/loading_panel"
+        tools:ignore="RtlHardcoded">
+
+        <RelativeLayout
+            android:id="@+id/volumeRelativeLayout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:background="@drawable/background_oval_black_transparent"
+            android:visibility="gone"
+            tools:visibility="visible">
+
+            <ProgressBar
+                android:id="@+id/volumeProgressBar"
+                style="?android:progressBarStyleHorizontal"
+                android:layout_width="128dp"
+                android:layout_height="128dp"
+                android:indeterminate="false"
+                android:progressDrawable="@drawable/progress_circular_white" />
+
+            <ImageView
+                android:id="@+id/volumeImageView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                tools:ignore="ContentDescription"
+                tools:src="@drawable/ic_volume_up_white_72dp" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/brightnessRelativeLayout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:background="@drawable/background_oval_black_transparent"
+            android:visibility="gone"
+            tools:visibility="visible">
+
+            <ProgressBar
+                android:id="@+id/brightnessProgressBar"
+                style="?android:progressBarStyleHorizontal"
+                android:layout_width="128dp"
+                android:layout_height="128dp"
+                android:indeterminate="false"
+                android:progressDrawable="@drawable/progress_circular_white" />
+
+            <ImageView
+                android:id="@+id/brightnessImageView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                tools:ignore="ContentDescription"
+                tools:src="@drawable/ic_brightness_high_white_72dp" />
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/currentDisplaySeek"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_marginBottom="58dp"
+            android:background="#64000000"
+            android:paddingBottom="10dp"
+            android:paddingLeft="30dp"
+            android:paddingRight="30dp"
+            android:paddingTop="10dp"
+            android:textColor="@android:color/white"
+            android:textSize="26sp"
+            android:textStyle="bold"
+            android:visibility="gone"
+            tools:ignore="RtlHardcoded"
+            tools:text="1:06:29"
+            tools:visibility="visible" />
+    </RelativeLayout>
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout-large-land/fragment_video_detail.xml b/app/src/main/res/layout-large-land/fragment_video_detail.xml
new file mode 100644
index 000000000..73939d60a
--- /dev/null
+++ b/app/src/main/res/layout-large-land/fragment_video_detail.xml
@@ -0,0 +1,491 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:id="@+id/video_item_detail"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:focusableInTouchMode="true"
+	android:orientation="horizontal">
+
+	<com.nirhart.parallaxscroll.views.ParallaxScrollView
+		android:id="@+id/detail_main_content"
+		app:parallax_factor="1.9"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_weight="5">
+
+		<!--WRAPPER-->
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical">
+
+			<!-- THUMBNAIL -->
+			<FrameLayout
+				android:id="@+id/detail_thumbnail_root_layout"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:background="@android:color/black"
+				android:clickable="true"
+				android:focusable="true"
+				android:foreground="?attr/selectableItemBackground">
+
+				<ImageView
+					android:id="@+id/detail_thumbnail_image_view"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@android:color/transparent"
+					android:contentDescription="@string/detail_thumbnail_view_description"
+					android:scaleType="fitCenter"
+					tools:ignore="RtlHardcoded"
+					tools:layout_height="200dp"
+					tools:src="@drawable/dummy_thumbnail" />
+
+				<ImageView
+					android:id="@+id/detail_thumbnail_play_button"
+					android:layout_width="64dp"
+					android:layout_height="64dp"
+					android:layout_gravity="center"
+					android:background="@android:color/transparent"
+					android:src="@drawable/new_play_arrow"
+					android:visibility="invisible"
+					tools:ignore="ContentDescription"
+					tools:visibility="visible" />
+
+				<TextView
+					android:id="@+id/touch_append_detail"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center"
+					android:background="#64000000"
+					android:paddingBottom="10dp"
+					android:paddingLeft="30dp"
+					android:paddingRight="30dp"
+					android:paddingTop="10dp"
+					android:text="@string/hold_to_append"
+					android:textColor="@android:color/white"
+					android:textSize="20sp"
+					android:textStyle="bold"
+					android:visibility="gone"
+					tools:ignore="RtlHardcoded"
+					tools:visibility="visible" />
+
+				<TextView
+					android:id="@+id/detail_duration_view"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="bottom|right"
+					android:layout_marginBottom="8dp"
+					android:layout_marginLeft="12dp"
+					android:layout_marginRight="12dp"
+					android:layout_marginTop="8dp"
+					android:alpha=".6"
+					android:background="#23000000"
+					android:gravity="center"
+					android:paddingBottom="2dp"
+					android:paddingLeft="6dp"
+					android:paddingRight="6dp"
+					android:paddingTop="2dp"
+					android:textAllCaps="true"
+					android:textColor="@android:color/white"
+					android:textSize="12sp"
+					android:textStyle="bold"
+					android:visibility="gone"
+					tools:ignore="RtlHardcoded"
+					tools:text="12:38"
+					tools:visibility="visible" />
+			</FrameLayout>
+
+			<!-- CONTENT -->
+			<RelativeLayout
+				android:id="@+id/detail_content_root_layout"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:background="?android:windowBackground">
+
+				<!-- TITLE -->
+				<FrameLayout
+					android:id="@+id/detail_title_root_layout"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:paddingLeft="12dp"
+					android:paddingRight="12dp">
+
+					<TextView
+						android:id="@+id/detail_video_title_view"
+						android:layout_width="match_parent"
+						android:layout_height="match_parent"
+						android:layout_marginRight="20dp"
+						android:ellipsize="end"
+						android:maxLines="1"
+						android:paddingBottom="8dp"
+						android:paddingTop="12dp"
+						android:textAppearance="?android:attr/textAppearanceLarge"
+						android:textSize="@dimen/video_item_detail_title_text_size"
+						tools:ignore="RtlHardcoded"
+						tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum. Nunc eleifend est quis ipsum porttitor egestas. Sed facilisis, nisl quis eleifend pellentesque, orci metus egestas dolor, at accumsan eros metus quis libero." />
+
+				</FrameLayout>
+
+				<!-- LOADING INDICATOR-->
+				<ProgressBar
+					android:id="@+id/loading_progress_bar"
+					style="@style/Widget.AppCompat.ProgressBar"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_below="@id/detail_title_root_layout"
+					android:layout_marginTop="@dimen/video_item_detail_error_panel_margin"
+					android:indeterminate="true"
+					android:visibility="gone"
+					tools:visibility="visible" />
+
+				<!--ERROR PANEL-->
+				<include
+					android:id="@+id/error_panel"
+					layout="@layout/error_retry"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_below="@id/detail_title_root_layout"
+					android:layout_marginTop="@dimen/video_item_detail_error_panel_margin"
+					android:visibility="gone"
+					tools:visibility="visible" />
+
+				<!--HIDING ROOT-->
+				<LinearLayout
+					android:id="@+id/detail_content_root_hiding"
+					android:layout_width="match_parent"
+					android:layout_height="match_parent"
+					android:layout_below="@+id/detail_title_root_layout"
+					android:orientation="vertical"
+					android:visibility="gone"
+					tools:visibility="visible">
+
+					<!--DETAIL-->
+					<RelativeLayout
+						android:id="@+id/detail_root"
+						android:layout_width="match_parent"
+						android:layout_height="55dp"
+						android:layout_marginLeft="12dp"
+						android:layout_marginRight="12dp"
+						android:layout_marginTop="6dp"
+						android:baselineAligned="false"
+						android:orientation="horizontal">
+
+						<!--UPLOADER-->
+						<LinearLayout
+							android:id="@+id/detail_uploader_root_layout"
+							android:layout_width="match_parent"
+							android:layout_height="match_parent"
+							android:layout_toLeftOf="@id/details_panel"
+							android:layout_toStartOf="@id/details_panel"
+							android:background="?attr/selectableItemBackground"
+							android:gravity="center_vertical"
+							android:orientation="horizontal"
+							android:padding="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: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="match_parent"
+								android:layout_height="wrap_content"
+								android:layout_marginLeft="15dp"
+								android:ellipsize="marquee"
+								android:fadingEdge="horizontal"
+								android:marqueeRepeatLimit="marquee_forever"
+								android:scrollHorizontally="true"
+								android:singleLine="true"
+								android:textAppearance="?android:attr/textAppearanceLarge"
+								android:textSize="@dimen/video_item_detail_uploader_text_size"
+								android:textStyle="bold"
+								tools:ignore="RtlHardcoded"
+								tools:text="Uploader" />
+
+							<!--<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"/>-->
+						</LinearLayout>
+
+						<!-- VIEW & THUMBS -->
+						<RelativeLayout
+							android:id="@+id/details_panel"
+							android:layout_width="wrap_content"
+							android:layout_height="match_parent"
+							android:layout_alignParentEnd="true"
+							android:layout_alignParentRight="true"
+							android:paddingLeft="6dp"
+							android:paddingRight="6dp">
+
+							<TextView
+								android:id="@+id/detail_view_count_view"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:layout_centerHorizontal="true"
+								android:layout_marginBottom="6dp"
+								android:layout_marginTop="6dp"
+								android:lines="1"
+								android:textAppearance="?android:attr/textAppearanceLarge"
+								android:textSize="@dimen/video_item_detail_views_text_size"
+								tools:ignore="RtlHardcoded"
+								tools:text="2,816,821,505 views" />
+
+							<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:layout_below="@id/detail_view_count_view"
+								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="@dimen/video_item_detail_like_image_height"
+								android:layout_below="@id/detail_view_count_view"
+								android:layout_marginLeft="@dimen/video_item_detail_like_margin"
+								android:layout_toRightOf="@id/detail_thumbs_up_img_view"
+								android:gravity="center_vertical"
+								android:lines="1"
+								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_below="@id/detail_view_count_view"
+								android:layout_marginLeft="12dp"
+								android:layout_toRightOf="@id/detail_thumbs_up_count_view"
+								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="@dimen/video_item_detail_like_image_height"
+								android:layout_below="@id/detail_view_count_view"
+								android:layout_marginLeft="@dimen/video_item_detail_like_margin"
+								android:layout_toRightOf="@id/detail_thumbs_down_img_view"
+								android:gravity="center_vertical"
+								android:lines="1"
+								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="@dimen/video_item_detail_like_image_height"
+								android:layout_below="@id/detail_view_count_view"
+								android:layout_marginLeft="12dp"
+								android:layout_toRightOf="@id/detail_thumbs_down_img_view"
+								android:gravity="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" />
+						</RelativeLayout>
+					</RelativeLayout>
+
+					<LinearLayout
+						android:id="@+id/detail_control_panel"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:orientation="horizontal"
+						android:padding="6dp">
+
+						<!-- CONTROLS -->
+						<TextView
+							android:id="@+id/detail_controls_playlist_append"
+							android:layout_width="80dp"
+							android:layout_height="55dp"
+							android:layout_gravity="center_vertical"
+							android:layout_weight="1"
+							android:background="?attr/selectableItemBackgroundBorderless"
+							android:clickable="true"
+							android:contentDescription="@string/append_playlist"
+							android:drawableTop="?attr/ic_playlist_add"
+							android:focusable="true"
+							android:gravity="center"
+							android:paddingBottom="6dp"
+							android:paddingTop="6dp"
+							android:text="@string/controls_add_to_playlist_title"
+							android:textSize="12sp" />
+
+						<TextView
+							android:id="@+id/detail_controls_background"
+							android:layout_width="80dp"
+							android:layout_height="55dp"
+							android:layout_gravity="center_vertical"
+							android:layout_weight="1"
+							android:background="?attr/selectableItemBackgroundBorderless"
+							android:clickable="true"
+							android:contentDescription="@string/play_audio"
+							android:drawableTop="?attr/audio"
+							android:focusable="true"
+							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:layout_weight="1"
+							android:background="?attr/selectableItemBackgroundBorderless"
+							android:clickable="true"
+							android:contentDescription="@string/open_in_popup_mode"
+							android:drawableTop="?attr/popup"
+							android:focusable="true"
+							android:gravity="center"
+							android:paddingBottom="6dp"
+							android:paddingTop="6dp"
+							android:text="@string/controls_popup_title"
+							android:textSize="12sp" />
+
+						<TextView
+							android:id="@+id/detail_controls_download"
+							android:layout_width="80dp"
+							android:layout_height="55dp"
+							android:layout_gravity="center_vertical"
+							android:layout_weight="1"
+							android:background="?attr/selectableItemBackgroundBorderless"
+							android:clickable="true"
+							android:contentDescription="@string/controls_download_desc"
+							android:drawableTop="?attr/download"
+							android:focusable="true"
+							android:gravity="center"
+							android:paddingBottom="6dp"
+							android:paddingTop="6dp"
+							android:text="@string/download"
+							android:textSize="12sp" />
+
+					</LinearLayout>
+
+					<View
+						android:layout_width="match_parent"
+						android:layout_height="1px"
+						android:layout_marginLeft="8dp"
+						android:layout_marginRight="8dp"
+						android:background="?attr/separator_color" />
+
+					<!--DESCRIPTIONS-->
+					<LinearLayout
+						android:id="@+id/detail_description_root_layout"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_marginTop="5dp"
+						android:orientation="vertical">
+
+						<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="Published on Oct 2, 2009" />
+
+						<TextView
+							android:id="@+id/detail_description_view"
+							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="3dp"
+							android:textAppearance="?android:attr/textAppearanceMedium"
+							android:textIsSelectable="true"
+							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_marginLeft="8dp"
+							android:layout_marginRight="8dp"
+							android:background="?attr/separator_color" />
+
+					</LinearLayout>
+				</LinearLayout>
+			</RelativeLayout>
+		</LinearLayout>
+
+	</com.nirhart.parallaxscroll.views.ParallaxScrollView>
+
+	<ScrollView
+		android:layout_width="0dp"
+		android:layout_height="match_parent"
+		android:layout_weight="3">
+
+		<!--NEXT AND RELATED VIDEOS-->
+		<LinearLayout
+			android:id="@+id/detail_related_streams_root_layout"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_horizontal"
+			android:paddingTop="14dp"
+			android:paddingBottom="8dp"
+			android:orientation="vertical">
+
+			<TextView
+				android:id="@+id/detail_next_stream_title"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				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_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:background="?attr/selectableItemBackground"
+				android:paddingBottom="10dp"
+				android:paddingTop="4dp"
+				android:src="?attr/expand"
+				android:textAlignment="center"
+				android:textAllCaps="true"
+				tools:ignore="ContentDescription" />
+		</LinearLayout>
+	</ScrollView>
+</LinearLayout>
diff --git a/app/src/main/res/layout-v21/drawer_header.xml b/app/src/main/res/layout-v21/drawer_header.xml
index 4cdc2b30e..4474ee4ed 100644
--- a/app/src/main/res/layout-v21/drawer_header.xml
+++ b/app/src/main/res/layout-v21/drawer_header.xml
@@ -16,7 +16,8 @@
         android:layout_height="match_parent"
         android:background="?attr/colorPrimary"
         android:scaleType="centerCrop"
-        android:src="@drawable/background_header" />
+        android:src="@drawable/background_header"
+        android:contentDescription="TODO" />
 
     <ImageView
         android:id="@+id/drawer_header_np_nude_view"
@@ -26,7 +27,8 @@
 
         android:layout_marginStart="30dp"
         android:layout_marginTop="30dp"
-        android:src="@drawable/np_logo_nude_shadow" />
+        android:src="@drawable/np_logo_nude_shadow"
+        android:contentDescription="TODO" />
 
     <TextView
         android:id="@+id/drawer_header_np_text_view"
@@ -38,7 +40,7 @@
         android:layout_toRightOf="@id/drawer_header_np_nude_view"
         android:gravity="center"
         android:text="@string/app_name"
-        android:textSize="30dp"
+        android:textSize="30sp"
         android:textColor="@color/drawer_header_font_color"
         android:textStyle="bold|italic" />
 
@@ -50,7 +52,7 @@
         android:layout_alignStart="@id/drawer_header_np_text_view"
         android:layout_below="@id/drawer_header_np_text_view"
         android:text="YouTube"
-        android:textSize="18dp"
+        android:textSize="18sp"
         android:textColor="@color/drawer_header_font_color"
         android:textStyle="italic" />
 
@@ -66,6 +68,7 @@
         android:paddingBottom="20dp"
         android:paddingEnd="20dp"
         android:paddingRight="20dp"
-        android:src="@drawable/ic_arrow_down_white" />
+        android:src="@drawable/ic_arrow_down_white"
+        android:contentDescription="TODO" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_error.xml b/app/src/main/res/layout/activity_error.xml
index 7752dc7cb..c47077c73 100644
--- a/app/src/main/res/layout/activity_error.xml
+++ b/app/src/main/res/layout/activity_error.xml
@@ -114,7 +114,8 @@
             <EditText
                 android:id="@+id/errorCommentBox"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content"
+                android:inputType="" />
 
             <Button
                 android:id="@+id/errorReportButton"
diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
index c119c302a..0458773d7 100644
--- a/app/src/main/res/layout/drawer_header.xml
+++ b/app/src/main/res/layout/drawer_header.xml
@@ -16,7 +16,8 @@ android:focusable="true">
         android:layout_height="match_parent"
         android:background="?attr/colorPrimary"
         android:src="@drawable/background_header"
-        android:scaleType="centerCrop"/>
+        android:scaleType="centerCrop"
+        android:contentDescription="TODO" />
 
     <ImageView
         android:id="@+id/drawer_header_np_nude_view"
@@ -26,7 +27,8 @@ android:focusable="true">
 
         android:layout_width="70dp"
         android:layout_height="70dp"
-        android:src="@drawable/np_logo_nude_shadow"/>
+        android:src="@drawable/np_logo_nude_shadow"
+        android:contentDescription="TODO" />
 
     <TextView
         android:id="@+id/drawer_header_np_text_view"
@@ -38,7 +40,7 @@ android:focusable="true">
         android:layout_alignTop="@id/drawer_header_np_nude_view"
         android:layout_alignBottom="@id/drawer_header_np_nude_view"
         android:gravity="center"
-        android:textSize="30dp"
+        android:textSize="30sp"
         android:textColor="@color/drawer_header_font_color"
         android:textStyle="bold|italic"/>
 
@@ -50,7 +52,7 @@ android:focusable="true">
         android:layout_below="@id/drawer_header_np_text_view"
         android:layout_alignLeft="@id/drawer_header_np_text_view"
         android:layout_alignStart="@id/drawer_header_np_text_view"
-        android:textSize="18dp"
+        android:textSize="18sp"
         android:textColor="@color/drawer_header_font_color"
         android:textStyle="italic"/>
 
@@ -66,6 +68,7 @@ android:focusable="true">
         android:paddingBottom="20dp"
         android:paddingRight="20dp"
         android:src="@drawable/ic_arrow_down_white"
-        android:paddingEnd="20dp" />
+        android:paddingEnd="20dp"
+        android:contentDescription="TODO" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 320f72ab9..e8537cad3 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -21,7 +21,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="8dp"
-            app:srcCompat="@mipmap/ic_launcher" />
+            app:srcCompat="@mipmap/ic_launcher"
+            android:contentDescription="TODO" />
 
         <TextView
             android:id="@+id/app_name"
diff --git a/app/src/main/res/layout/fragment_subscription.xml b/app/src/main/res/layout/fragment_subscription.xml
index a40059455..f2137074e 100644
--- a/app/src/main/res/layout/fragment_subscription.xml
+++ b/app/src/main/res/layout/fragment_subscription.xml
@@ -11,7 +11,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:scrollbars="vertical"
-        app:layoutManager="LinearLayoutManager"
         android:visibility="gone"
         tools:listitem="@layout/list_channel_item"
         tools:visibility="visible"/>
diff --git a/app/src/main/res/layout/item_search_history.xml b/app/src/main/res/layout/item_search_history.xml
index 2c40ca1d1..d6cfeec99 100644
--- a/app/src/main/res/layout/item_search_history.xml
+++ b/app/src/main/res/layout/item_search_history.xml
@@ -10,7 +10,8 @@
     android:paddingBottom="8dp"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="8dp">
+    android:paddingTop="8dp"
+    android:focusable="true">
 
     <TextView
         android:id="@+id/info"
diff --git a/app/src/main/res/layout/item_software_component.xml b/app/src/main/res/layout/item_software_component.xml
index 19ee92913..acf511b63 100644
--- a/app/src/main/res/layout/item_software_component.xml
+++ b/app/src/main/res/layout/item_software_component.xml
@@ -7,7 +7,8 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:orientation="vertical"
     android:background="?attr/selectableItemBackground"
-    android:clickable="true">
+    android:clickable="true"
+    android:focusable="true">
 
     <TextView
         android:id="@+id/name"
diff --git a/app/src/main/res/layout/list_channel_grid_item.xml b/app/src/main/res/layout/list_channel_grid_item.xml
new file mode 100644
index 000000000..3fe642974
--- /dev/null
+++ b/app/src/main/res/layout/list_channel_grid_item.xml
@@ -0,0 +1,48 @@
+<?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:id="@+id/itemRoot"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/selectableItemBackground"
+	android:clickable="true"
+	android:focusable="true"
+	android:padding="@dimen/video_item_search_padding">
+
+	<de.hdodenhof.circleimageview.CircleImageView
+		android:id="@+id/itemThumbnailView"
+		android:layout_width="@dimen/video_item_grid_thumbnail_image_height"
+		android:layout_height="@dimen/video_item_grid_thumbnail_image_height"
+		android:layout_centerHorizontal="true"
+		android:padding="2dp"
+		android:contentDescription="@string/list_thumbnail_view_description"
+		android:src="@drawable/buddy_channel_item"
+		tools:ignore="RtlHardcoded"/>
+
+	<TextView
+		android:id="@+id/itemTitleView"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_below="@id/itemThumbnailView"
+		android:ellipsize="end"
+		android:lines="1"
+		android:gravity="center_horizontal"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:textSize="@dimen/video_item_search_title_text_size"
+		tools:ignore="RtlHardcoded"
+		tools:text="Channel Title, Lorem ipsum"/>
+
+	<TextView
+		android:id="@+id/itemAdditionalDetails"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/itemTitleView"
+		android:layout_centerHorizontal="true"
+		android:lines="1"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:textSize="@dimen/video_item_search_upload_date_text_size"
+		tools:ignore="RtlHardcoded"
+		tools:text="10M subscribers"/>
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/list_playlist_grid_item.xml b/app/src/main/res/layout/list_playlist_grid_item.xml
new file mode 100644
index 000000000..949b1159b
--- /dev/null
+++ b/app/src/main/res/layout/list_playlist_grid_item.xml
@@ -0,0 +1,72 @@
+<?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:id="@+id/itemRoot"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/selectableItemBackground"
+	android:clickable="true"
+	android:focusable="true"
+	android:padding="@dimen/video_item_search_padding">
+
+	<ImageView
+		android:id="@+id/itemThumbnailView"
+		android:layout_width="@dimen/video_item_grid_thumbnail_image_width"
+		android:layout_height="@dimen/video_item_grid_thumbnail_image_height"
+		android:layout_centerHorizontal="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_playlist"
+		tools:ignore="RtlHardcoded"/>
+
+	<TextView
+		android:id="@+id/itemStreamCountView"
+		android:layout_width="@dimen/playlist_item_thumbnail_stream_count_width"
+		android:layout_height="match_parent"
+		android:layout_alignBottom="@id/itemThumbnailView"
+		android:layout_alignRight="@id/itemThumbnailView"
+		android:layout_alignTop="@id/itemThumbnailView"
+		android:background="@color/playlist_stream_count_background_color"
+		android:drawableTop="@drawable/ic_playlist_play_white_24dp"
+		android:gravity="center"
+		android:paddingBottom="14dp"
+		android:paddingTop="16dp"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:textColor="@color/duration_text_color"
+		android:textSize="@dimen/video_item_search_duration_text_size"
+		android:textStyle="bold"
+		tools:ignore="RtlHardcoded"
+		tools:text="314159"/>
+
+	<TextView
+		android:id="@+id/itemTitleView"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_below="@id/itemThumbnailView"
+		android:layout_alignLeft="@id/itemThumbnailView"
+		android:layout_alignRight="@id/itemThumbnailView"
+		android:layout_marginTop="2dp"
+		android:ellipsize="end"
+		android:maxLines="2"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:textSize="@dimen/video_item_search_title_text_size"
+		tools:ignore="RtlHardcoded"
+		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_below="@+id/itemTitleView"
+		android:layout_alignLeft="@id/itemThumbnailView"
+		android:layout_alignRight="@id/itemThumbnailView"
+		android:lines="1"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:textSize="@dimen/video_item_search_uploader_text_size"
+		tools:ignore="RtlHardcoded"
+		tools:text="Uploader"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_stream_grid_item.xml b/app/src/main/res/layout/list_stream_grid_item.xml
new file mode 100644
index 000000000..cf73bf9b1
--- /dev/null
+++ b/app/src/main/res/layout/list_stream_grid_item.xml
@@ -0,0 +1,69 @@
+<?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:id="@+id/itemRoot"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/selectableItemBackground"
+	android:clickable="true"
+	android:focusable="true"
+	android:padding="@dimen/video_item_search_padding">
+
+	<ImageView
+		android:id="@+id/itemThumbnailView"
+		android:layout_centerHorizontal="true"
+		android:layout_width="@dimen/video_item_grid_thumbnail_image_width"
+		android:layout_height="@dimen/video_item_grid_thumbnail_image_height"
+		android:layout_alignParentTop="true"
+		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:textAllCaps="true"
+		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"/>
+
+	<TextView
+		android:id="@+id/itemVideoTitleView"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_below="@id/itemThumbnailView"
+		android:layout_alignLeft="@id/itemThumbnailView"
+		android:layout_alignRight="@id/itemThumbnailView"
+		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"
+		android:layout_alignEnd="@id/itemThumbnailView" />
+
+	<TextView
+		android:id="@+id/itemUploaderView"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/itemVideoTitleView"
+		android:layout_alignLeft="@id/itemVideoTitleView"
+		android:layout_alignRight="@id/itemVideoTitleView"
+		android:lines="1"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:textSize="@dimen/video_item_search_uploader_text_size"
+		tools:text="Uploader"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_stream_playlist_grid_item.xml b/app/src/main/res/layout/list_stream_playlist_grid_item.xml
new file mode 100644
index 000000000..4b31a452e
--- /dev/null
+++ b/app/src/main/res/layout/list_stream_playlist_grid_item.xml
@@ -0,0 +1,84 @@
+<?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:id="@+id/itemRoot"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/selectableItemBackground"
+	android:clickable="true"
+	android:focusable="true"
+	android:padding="@dimen/video_item_search_padding">
+
+	<ImageView
+		android:id="@+id/itemThumbnailView"
+		android:layout_width="@dimen/video_item_grid_thumbnail_image_width"
+		android:layout_height="@dimen/video_item_grid_thumbnail_image_height"
+		android:layout_alignParentTop="true"
+		android:layout_centerHorizontal="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" />
+
+	<ImageView
+		android:id="@+id/itemHandle"
+		android:layout_width="wrap_content"
+		android:layout_height="55dp"
+		android:layout_alignParentRight="true"
+		android:layout_alignParentBottom="true"
+		android:contentDescription="@string/detail_drag_description"
+		android:paddingLeft="@dimen/video_item_search_image_right_margin"
+		android:scaleType="center"
+		android:src="?attr/drag_handle"
+		tools:ignore="RtlHardcoded,RtlSymmetry" />
+
+	<TextView
+		android:id="@+id/itemVideoTitleView"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_alignEnd="@id/itemThumbnailView"
+		android:layout_alignLeft="@id/itemThumbnailView"
+		android:layout_alignRight="@id/itemThumbnailView"
+		android:layout_alignStart="@id/itemThumbnailView"
+		android:layout_below="@id/itemThumbnailView"
+		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..." />
+
+	<TextView
+		android:id="@+id/itemAdditionalDetails"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_alignEnd="@id/itemThumbnailView"
+		android:layout_alignLeft="@id/itemThumbnailView"
+		android:layout_alignRight="@id/itemThumbnailView"
+		android:layout_alignStart="@id/itemThumbnailView"
+		android:layout_below="@+id/itemVideoTitleView"
+		android:lines="1"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:textSize="@dimen/video_item_search_uploader_text_size"
+		tools:text="Uploader" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/mission_item.xml b/app/src/main/res/layout/mission_item.xml
index 054ebb4eb..05e099103 100644
--- a/app/src/main/res/layout/mission_item.xml
+++ b/app/src/main/res/layout/mission_item.xml
@@ -38,7 +38,8 @@
 				android:layout_centerVertical="true"
 				android:layout_marginRight="1dp"
 				android:src="@drawable/ic_menu_more"
-				android:scaleType="centerInside"/>
+				android:scaleType="centerInside"
+                android:contentDescription="TODO" />
 			
 		</RelativeLayout>
 		
@@ -50,7 +51,8 @@
 			android:layout_centerHorizontal="true"
 			android:scaleType="fitXY"
 			android:gravity="center"
-			android:padding="10dp"/>
+			android:padding="10dp"
+            android:contentDescription="TODO" />
 		
 		<TextView
 			android:id="@+id/item_name"
diff --git a/app/src/main/res/layout/mission_item_linear.xml b/app/src/main/res/layout/mission_item_linear.xml
index 7bbdeecb4..0133d0c3f 100644
--- a/app/src/main/res/layout/mission_item_linear.xml
+++ b/app/src/main/res/layout/mission_item_linear.xml
@@ -9,7 +9,7 @@
 		android:layout_width="match_parent"
 		android:layout_margin="2dp"
 		android:background="@color/bluegray">
-		
+
 		<ImageView
 			android:id="@+id/item_icon"
 			android:layout_width="72dp"
@@ -17,66 +17,60 @@
 			android:layout_centerVertical="true"
 			android:scaleType="fitXY"
 			android:gravity="center"
-			android:padding="15dp"/>
-		
-		<LinearLayout
-			android:id="@+id/item_name_and_size"
+			android:padding="15dp"
+            android:contentDescription="TODO" />
+
+		<TextView
+			android:id="@+id/item_name"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
+			android:layout_toLeftOf="@+id/item_more"
 			android:layout_toRightOf="@id/item_icon"
-			android:layout_toLeftOf="@+id/item_status"
-			android:layout_centerVertical="true"
-			android:orientation="vertical">
+			android:ellipsize="end"
+			android:padding="6dp"
+			android:text="XXX.xx"
+			android:textColor="@color/white"
+			android:textSize="16sp"
+			android:textStyle="bold" />
 
-			<TextView
-				android:id="@+id/item_name"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:padding="6dp"
-				android:singleLine="true"
-				android:ellipsize="end"
-				android:text="XXX.xx"
-				android:textSize="16sp"
-				android:textStyle="bold"
-				android:textColor="@color/white"/>
-
-			<TextView
-				android:id="@+id/item_size"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_below="@id/item_name"
-				android:padding="6dp"
-				android:singleLine="true"
-				android:text="100.00MB"
-				android:textSize="12sp"
-				android:textColor="@color/white"/>
-		
-		</LinearLayout>
-		
+		<TextView
+			android:id="@+id/item_size"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_toRightOf="@id/item_icon"
+			android:layout_below="@+id/item_name"
+			android:padding="6dp"
+			android:singleLine="true"
+			android:text="100.00MB"
+			android:textSize="12sp"
+			android:textColor="@color/white"/>
 
 		<TextView
 			android:id="@+id/item_status"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_toLeftOf="@+id/item_more"
-			android:layout_centerVertical="true"
+			android:layout_below="@+id/item_name"
 			android:layout_marginLeft="6dp"
-			android:layout_marginRight="6dp"
+			android:layout_marginRight="5dp"
+			android:layout_toLeftOf="@+id/item_more"
+			android:layout_toRightOf="@id/item_size"
+			android:padding="6dp"
 			android:singleLine="true"
 			android:text="0%"
-			android:textSize="20sp"
-			android:textColor="@color/white"/>
+			android:textColor="@color/white"
+			android:textSize="12sp" />
 
 		<ImageView
 			style="?attr/buttonBarButtonStyle"
 			android:id="@+id/item_more"
-			android:layout_width="36dp"
-			android:layout_height="36dp"
+			android:layout_width="49dp"
+			android:layout_height="49dp"
 			android:layout_alignParentRight="true"
 			android:layout_centerVertical="true"
 			android:layout_marginRight="4dp"
 			android:src="@drawable/ic_menu_more"
-			android:scaleType="centerInside"/>
+			android:scaleType="centerInside"
+            android:contentDescription="TODO" />
 
 	</RelativeLayout>
 
diff --git a/app/src/main/res/layout/select_channel_item.xml b/app/src/main/res/layout/select_channel_item.xml
index 09602a371..5d00c1b01 100644
--- a/app/src/main/res/layout/select_channel_item.xml
+++ b/app/src/main/res/layout/select_channel_item.xml
@@ -6,7 +6,8 @@
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
     android:clickable="true"
-    android:padding="5dp">
+    android:padding="5dp"
+    android:focusable="true">
 
     <de.hdodenhof.circleimageview.CircleImageView
         android:id="@+id/itemThumbnailView"
diff --git a/app/src/main/res/layout/select_kiosk_item.xml b/app/src/main/res/layout/select_kiosk_item.xml
index 2efadca79..de2685afe 100644
--- a/app/src/main/res/layout/select_kiosk_item.xml
+++ b/app/src/main/res/layout/select_kiosk_item.xml
@@ -6,7 +6,8 @@
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
     android:clickable="true"
-    android:padding="5dp">
+    android:padding="5dp"
+    android:focusable="true">
 
     <ImageView
         android:id="@+id/itemThumbnailView"
@@ -17,7 +18,8 @@
         android:layout_alignParentTop="true"
         android:layout_marginRight="5dp"
         android:src="@drawable/service"
-        tools:ignore="RtlHardcoded"/>
+        tools:ignore="RtlHardcoded"
+        android:contentDescription="TODO" />
 
     <TextView
         android:id="@+id/itemTitleView"
diff --git a/app/src/main/res/menu/download_menu.xml b/app/src/main/res/menu/download_menu.xml
index 4cbb845ea..e71eaf152 100644
--- a/app/src/main/res/menu/download_menu.xml
+++ b/app/src/main/res/menu/download_menu.xml
@@ -5,4 +5,7 @@
     <item android:id="@+id/action_settings"
         app:showAsAction="never"
         android:title="@string/settings"/>
+    <item android:id="@+id/switch_mode"
+        app:showAsAction="ifRoom"
+        android:title="@string/switch_view"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_videooptions.xml b/app/src/main/res/menu/menu_videooptions.xml
index ce69ba9c1..9a3262148 100644
--- a/app/src/main/res/menu/menu_videooptions.xml
+++ b/app/src/main/res/menu/menu_videooptions.xml
@@ -7,16 +7,16 @@
         android:id="@+id/toggleOrientation"
         android:icon="@drawable/ic_screen_rotation_white"
         android:title="@string/toggle_orientation"
-        app:showAsAction="always|withText" />
+        app:showAsAction="ifRoom|withText" />
     <item
         android:id="@+id/switchPopup"
         android:icon="@drawable/ic_fullscreen_exit_white"
         android:title="@string/switch_to_popup"
-        app:showAsAction="always|withText" />
+        app:showAsAction="ifRoom|withText" />
     <item
         android:id="@+id/switchBackground"
         android:icon="?audio"
         android:title="@string/switch_to_background"
-        app:showAsAction="always|withText" />
+        app:showAsAction="ifRoom|withText" />
 </menu>
 
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 1f925eb39..f4687149a 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -111,7 +111,7 @@
     <string name="msg_url_malform">Hibás URL vagy nincs internet</string>
     <string name="msg_running">NewPipe letöltés folyamatban</string>
     <string name="msg_running_detail">Katt a részletekért</string>
-    <string name="msg_wait">Kérlek várj...</string>
+    <string name="msg_wait">Kérlek várj…</string>
     <string name="msg_copied">Vágólapra másolva.</string>
     <string name="no_available_dir">Kérlek válassz egy létező könyvtárat a letöltésekhez.</string>
 
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 2eee6b809..d00ee12ea 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -414,7 +414,7 @@
 \n
 \n만약 모르신다면, 다음을 참고하세요:
 \n
-\n1. 모바일 환경이시면 브라우저 설정에서 데스크탑 모드를 활성화해주세요. Chrome 모바일에서는 오른쪽 ... 클릭시 아래쪽에 있습니다.
+\n1. 모바일 환경이시면 브라우저 설정에서 데스크탑 모드를 활성화해주세요. Chrome 모바일에서는 오른쪽 … 클릭시 아래쪽에 있습니다.
 \n2. 이 주소로 가세요: %1$s 
 \n3. 로그인이 필요하면 하세요.
 \n4. 리디렉트된 곳의 URL을 복사하세요. (이 URL이 당신의 프로필 URL 입니다)</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 12de382ea..0f8005f32 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -490,6 +490,7 @@
     <string name="limit_mobile_data_usage_title">Предел разрешения в мобильной сети</string>
     <string name="channels">Каналы</string>
     <string name="playlists">Плейлисты</string>
+    <string name="videos">Видео</string>
     <string name="tracks">Дорожки</string>
     <string name="users">Пользователи</string>
     <string name="skip_silence_checkbox">Проматывать тишину</string>
@@ -502,4 +503,9 @@
     <string name="minimize_on_exit_background_description">Фоновый плеер</string>
     <string name="minimize_on_exit_popup_description">Плеер в окне</string>
 
+    <string name="list_view_mode">Вид списка</string>
+    <string name="list">Список</string>
+    <string name="grid">Сетка</string>
+	<string name="auto">Автоматически</string>
+
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 084c85920..5ef497b17 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -483,8 +483,12 @@
     <string name="minimize_on_exit_background_description">До тлового програвача</string>
     <string name="minimize_on_exit_popup_description">Зменшити до віконного програвачу</string>
 
-<string name="channels">Канали</string>
+    <string name="channels">Канали</string>
     <string name="playlists">Плейлисти</string>
     <string name="tracks">Стежки</string>
     <string name="users">Користувачі</string>
-    </resources>
+
+    <string name="list_view_mode">Вигляд списку</string>
+    <string name="list">Список</string>
+    <string name="grid">Сiтка</string>
+</resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e7af3231e..229c00533 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -12,6 +12,8 @@
     <!-- 16 / 9 ratio-->
     <dimen name="video_item_search_thumbnail_image_width">124dp</dimen>
     <dimen name="video_item_search_thumbnail_image_height">70dp</dimen>
+    <dimen name="video_item_grid_thumbnail_image_width">164dp</dimen>
+    <dimen name="video_item_grid_thumbnail_image_height">92dp</dimen>
     <!-- Calculated: 2*video_item_search_padding + video_item_search_thumbnail_image_height -->
     <dimen name="video_item_search_height">94dp</dimen>
     <!-- Paddings & Margins -->
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index b4102f084..636d13b01 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -106,6 +106,8 @@
 
     <string name="last_orientation_landscape_key" translatable="false">last_orientation_landscape_key</string>
 
+    <string name="last_resize_mode" translatable="false">last_resize_mode</string>
+
     <!-- DEBUG ONLY -->
     <string name="debug_pref_screen_key" translatable="false">debug_pref_screen_key</string>
     <string name="allow_heap_dumping_key" translatable="false">allow_heap_dumping_key</string>
@@ -879,5 +881,18 @@
         <item>144p</item>
     </string-array>
 
+    <string name="list_view_mode_key" translatable="false">list_view_mode</string>
+    <string name="list_view_mode_value" translatable="false">auto</string>
+
+    <string-array name="list_view_mode_values" translatable="false">
+        <item>auto</item>
+        <item>list</item>
+        <item>grid</item>
+    </string-array>
+    <string-array name="list_view_mode_description" translatable="false">
+        <item>@string/auto</item>
+        <item>@string/list</item>
+        <item>@string/grid</item>
+    </string-array>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dd1faa3d6..92d35a48c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,7 +5,7 @@
     <string name="view_count_text">%1$s views</string>
     <string name="upload_date_text">Published on %1$s</string>
     <string name="no_player_found">No stream player found. Do you want to install VLC?</string>
-    <string name="no_player_found_toast">No stream player found (you can install VLC to play it)</string>
+    <string name="no_player_found_toast">No stream player found (you can install VLC to play it).</string>
     <string name="install">Install</string>
     <string name="cancel">Cancel</string>
     <string name="fdroid_vlc_url" translatable="false">https://f-droid.org/repository/browse/?fdfilter=vlc&amp;fdid=org.videolan.vlc</string>
@@ -13,28 +13,29 @@
     <string name="open_in_popup_mode">Open in popup mode</string>
     <string name="share">Share</string>
     <string name="download">Download</string>
-    <string name="controls_download_desc">Download stream file.</string>
+    <string name="controls_download_desc">Download stream file</string>
     <string name="search">Search</string>
     <string name="settings">Settings</string>
-    <string name="did_you_mean">Did you mean: %1$s ?</string>
+    <string name="did_you_mean">Did you mean: %1$s?</string>
     <string name="share_dialog_title">Share with</string>
     <string name="choose_browser">Choose browser</string>
     <string name="screen_rotation">rotation</string>
     <string name="use_external_video_player_title">Use external video player</string>
-    <string name="use_external_video_player_summary">Some resolutions will NOT have audio when this option is enabled</string>
+    <string name="use_external_video_player_summary">Removes audio at SOME resolutions</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="subscribe_button_title">Subscribe</string>
     <string name="subscribed_button_title">Subscribed</string>
+    <string name="unsubscribe">Unsubscribe</string>
     <string name="channel_unsubscribed">Channel unsubscribed</string>
-    <string name="subscription_change_failed">Unable to change subscription</string>
-    <string name="subscription_update_failed">Unable to update subscription</string>
+    <string name="subscription_change_failed">Could not change subscription</string>
+    <string name="subscription_update_failed">Could not update subscription</string>
     <string name="show_info">Show info</string>
 
     <string name="tab_main">Main</string>
     <string name="tab_subscriptions">Subscriptions</string>
-    <string name="tab_bookmarks">Bookmarks</string>
+    <string name="tab_bookmarks">Bookmarked Playlists</string>
     <string name="tab_new">New Tab</string>
     <string name="tab_choose">Choose Tab</string>
 
@@ -48,8 +49,8 @@
     <string name="download_path_summary">Path to store downloaded videos in</string>
     <string name="download_path_dialog_title">Enter download path for videos</string>
 
-    <string name="download_path_audio_title">Audio download path</string>
-    <string name="download_path_audio_summary">Path to store downloaded audio in</string>
+    <string name="download_path_audio_title">Audio download folder</string>
+    <string name="download_path_audio_summary">Downloaded audio is stored here</string>
     <string name="download_path_audio_dialog_title">Enter download path for audio files</string>
 
     <string name="autoplay_by_calling_app_title">Autoplay</string>
@@ -75,7 +76,7 @@
     <string name="use_inexact_seek_title">Use fast inexact seek</string>
     <string name="use_inexact_seek_summary">Inexact seek allows the player to seek to positions faster with reduced precision</string>
     <string name="download_thumbnail_title">Load thumbnails</string>
-    <string name="download_thumbnail_summary">Disable to stop all thumbnails from loading and save on data and memory usage. Changing this will clear both in-memory and on-disk image cache.</string>
+    <string name="download_thumbnail_summary">When off no thumbnails load, saving data and memory usage. Changes clear both in-memory and on-disk image cache.</string>
     <string name="thumbnail_cache_wipe_complete_notice">Image cache wiped</string>
     <string name="metadata_cache_wipe_title">Wipe cached metadata</string>
     <string name="metadata_cache_wipe_summary">Remove all cached webpage data</string>
@@ -95,18 +96,18 @@
     <string name="resume_on_audio_focus_gain_title">Resume on focus gain</string>
     <string name="resume_on_audio_focus_gain_summary">Continue playing after interruptions (e.g. phone calls)</string>
     <string name="download_dialog_title">Download</string>
-    <string name="next_video_title">Next video</string>
-    <string name="show_next_and_similar_title">Show \'next\' and \'similar\' videos</string>
-    <string name="show_hold_to_append_title">Show \"hold to append\" tip</string>
+    <string name="next_video_title">Next</string>
+    <string name="show_next_and_similar_title">Show \'Next\' and \'Similar\' videos</string>
+    <string name="show_hold_to_append_title">Show \"Hold to append\" tip</string>
     <string name="show_hold_to_append_summary">Show tip when background or popup button is pressed on video details page</string>
-    <string name="url_not_supported_toast">URL not supported</string>
+    <string name="url_not_supported_toast">Unsupported URL</string>
     <string name="default_content_country_title">Default content country</string>
     <string name="service_title">Service</string>
     <string name="search_language_title">Default content language</string>
     <string name="settings_category_player_title">Player</string>
     <string name="settings_category_player_behavior_title">Behavior</string>
-    <string name="settings_category_video_audio_title">Video &amp; Audio</string>
-    <string name="settings_category_history_title">History &amp; Cache</string>
+    <string name="settings_category_video_audio_title">Video &amp; audio</string>
+    <string name="settings_category_history_title">History &amp; cache</string>
     <string name="settings_category_popup_title">Popup</string>
     <string name="settings_category_appearance_title">Appearance</string>
     <string name="settings_category_other_title">Other</string>
@@ -118,8 +119,8 @@
     <string name="c3s_url" translatable="false">https://www.c3s.cc/</string>
     <string name="play_btn_text">Play</string>
     <string name="content">Content</string>
-    <string name="show_age_restricted_content_title">Show age restricted content</string>
-    <string name="video_is_age_restricted">Age Restricted Video. Allowing such material is possible from Settings.</string>
+    <string name="show_age_restricted_content_title">Age restricted content</string>
+    <string name="video_is_age_restricted">Show age Restricted Video. Allowing such material is possible from \"Settings\".</string>
     <string name="duration_live">live</string>
     <string name="duration_live_button" translatable="false">LIVE</string>
     <string name="downloads">Downloads</string>
@@ -149,7 +150,7 @@
 
     <string name="notification_channel_id" translatable="false">newpipe</string>
     <string name="notification_channel_name">NewPipe Notification</string>
-    <string name="notification_channel_description">Notifications for NewPipe Background and Popup Players</string>
+    <string name="notification_channel_description">Notifications for NewPipe background and popup players</string>
 
     <string name="unknown_content">[Unknown]</string>
 
@@ -160,29 +161,29 @@
 
     <string name="import_data_title">Import database</string>
     <string name="export_data_title">Export database</string>
-    <string name="import_data_summary">Will override your current history and subscriptions</string>
-    <string name="export_data_summary">Export history, subscriptions and playlists.</string>
+    <string name="import_data_summary">Overrides your current history and subscriptions</string>
+    <string name="export_data_summary">Export history, subscriptions and playlists</string>
     <string name="clear_views_history_title">Clear watch history</string>
-    <string name="clear_views_history_summary">Deletes the history of played streams.</string>
-    <string name="delete_view_history_alert">Delete whole watch history.</string>
+    <string name="clear_views_history_summary">Deletes the history of played streams</string>
+    <string name="delete_view_history_alert">Delete entire watch history?</string>
     <string name="view_history_deleted">Watch history deleted.</string>
     <string name="clear_search_history_title">Clear search history</string>
-    <string name="clear_search_history_summary">Deletes history of search keywords.</string>
-    <string name="delete_search_history_alert">Delete whole search history.</string>
+    <string name="clear_search_history_summary">Deletes history of search keywords</string>
+    <string name="delete_search_history_alert">Delete entire search history?</string>
     <string name="search_history_deleted">Search history deleted.</string>
     <!-- error strings -->
     <string name="general_error">Error</string>
-    <string name="download_to_sdcard_error_title">External storage not available.</string>
-    <string name="download_to_sdcard_error_message">Download to external SD Card is not possible yet. Should the download place be reset?</string>
+    <string name="download_to_sdcard_error_title">External storage unavailable</string>
+    <string name="download_to_sdcard_error_message">Download to external SD card is not possible yet. Reset download folder location?</string>
     <string name="network_error">Network error</string>
     <string name="could_not_load_thumbnails">Could not load all thumbnails</string>
     <string name="youtube_signature_decryption_error">Could not decrypt video URL signature</string>
     <string name="parsing_error">Could not parse website</string>
     <string name="light_parsing_error">Could not parse website completely</string>
-    <string name="content_not_available">Content not available</string>
+    <string name="content_not_available">Content unavailable</string>
     <string name="blocked_by_gema">Blocked by GEMA</string>
     <string name="could_not_setup_download_menu">Could not set up download menu</string>
-    <string name="live_streams_not_supported">This is a LIVE STREAM, which is not yet supported.</string>
+    <string name="live_streams_not_supported">Live streams are not supported yet</string>
     <string name="could_not_get_stream">Could not get any stream</string>
     <string name="could_not_load_image">Could not load image</string>
     <string name="app_ui_crash">App/UI crashed</string>
@@ -193,10 +194,10 @@
     <string name="invalid_url_toast">Invalid URL</string>
     <string name="video_streams_empty">No video streams found</string>
     <string name="audio_streams_empty">No audio streams found</string>
-    <string name="invalid_directory">Invalid directory</string>
-    <string name="invalid_source">Invalid file/content source</string>
-    <string name="invalid_file">File doesn\'t exist or insufficient permission to read or write to it</string>
-    <string name="file_name_empty_error">File name cannot be empty</string>
+    <string name="invalid_directory">No such folder</string>
+    <string name="invalid_source">No such file/content source</string>
+    <string name="invalid_file">The file doesn\'t exist or permission to read or write to it is lacking</string>
+    <string name="file_name_empty_error">Filename cannot be empty</string>
     <string name="error_occurred_detail">An error occurred: %1$s</string>
     <string name="no_streams_available_download">No streams available to download</string>
     <string name="saved_tabs_invalid_json">Using default tabs, error while reading saved tabs</string>
@@ -228,7 +229,7 @@
     <string name="user_report">User report</string>
     <string name="search_no_results">No results</string>
     <string name="empty_view_no_videos" translatable="false">@string/no_videos</string>
-    <string name="empty_subscription_feed_subtitle">Nothing Here But Crickets</string>
+    <string name="empty_subscription_feed_subtitle">Nothing here but crickets</string>
     <string name="detail_drag_description">Drag to reorder</string>
 
     <string name="err_dir_create">Cannot create download directory \'%1$s\'</string>
@@ -285,7 +286,7 @@
     <string name="msg_name">Filename</string>
     <string name="msg_threads">Threads</string>
     <string name="msg_error">Error</string>
-    <string name="msg_server_unsupported">Server unsupported</string>
+    <string name="msg_server_unsupported">Unsupported server</string>
     <string name="msg_exists">File already exists</string>
     <string name="msg_url_malform">Malformed URL or Internet not available</string>
     <string name="msg_running">NewPipe Downloading</string>
@@ -300,8 +301,8 @@
     <string name="md5" translatable="false">MD5</string>
     <string name="sha1" translatable="false">SHA-1</string>
     <string name="reCaptchaActivity">reCAPTCHA</string>
-    <string name="reCaptcha_title">reCAPTCHA Challenge</string>
-    <string name="recaptcha_request_toast">reCAPTCHA Challenge requested</string>
+    <string name="reCaptcha_title">reCAPTCHA challenge</string>
+    <string name="recaptcha_request_toast">reCAPTCHA challenge requested</string>
 
     <!-- End of GigaGet's Strings -->
 
@@ -346,7 +347,7 @@
     <string name="privacy_policy_url" translatable="false">https://newpipe.schabi.org/legal/privacy/</string>
     <string name="read_privacy_policy">Read privacy policy</string>
     <string name="app_license_title">NewPipe\'s License</string>
-    <string name="app_license">NewPipe is copyleft libre software: You can use, study share and improve it at your will. Specifically you can redistribute and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</string>
+    <string name="app_license">NewPipe is copyleft libre software: You can use, study share and improve it at will. Specifically you can redistribute and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</string>
     <string name="read_full_license">Read license</string>
 
 
@@ -354,7 +355,7 @@
     <string name="title_activity_history">History</string>
     <string name="title_history_search">Searched</string>
     <string name="title_history_view">Watched</string>
-    <string name="history_disabled">History is disabled</string>
+    <string name="history_disabled">History is turned off</string>
     <string name="action_history">History</string>
     <string name="history_empty">The history is empty</string>
     <string name="history_cleared">History cleared</string>
@@ -375,10 +376,10 @@
     <string name="feed_page_summary">Feed Page</string>
     <string name="channel_page_summary">Channel Page</string>
     <string name="select_a_channel">Select a channel</string>
-    <string name="no_channel_subscribed_yet">No channel subscribed yet</string>
+    <string name="no_channel_subscribed_yet">No channel subscriptions yet</string>
     <string name="select_a_kiosk">Select a kiosk</string>
-    <string name="export_complete_toast">Export complete</string>
-    <string name="import_complete_toast">Import complete</string>
+    <string name="export_complete_toast">Exported</string>
+    <string name="import_complete_toast">Imported</string>
     <string name="no_valid_zip_file">No valid ZIP file</string>
     <string name="could_not_import_all_files">Warning: Could not import all files.</string>
     <string name="override_current_data">This will override your current setup.</string>
@@ -392,17 +393,17 @@
     <string name="service_kiosk_string" translatable="false">%1$s/%2$s</string>
 
     <!-- Play Queue -->
-    <string name="title_activity_background_player">Background Player</string>
-    <string name="title_activity_popup_player">Popup Player</string>
+    <string name="title_activity_background_player">Background player</string>
+    <string name="title_activity_popup_player">Popup player</string>
     <string name="play_queue_remove">Remove</string>
     <string name="play_queue_stream_detail">Details</string>
     <string name="play_queue_audio_settings">Audio Settings</string>
-    <string name="hold_to_append">Hold To Enqueue</string>
-    <string name="enqueue_on_background">Enqueue on Background</string>
-    <string name="enqueue_on_popup">Enqueue on Popup</string>
-    <string name="start_here_on_main">Start Playing Here</string>
-    <string name="start_here_on_background">Start Here on Background</string>
-    <string name="start_here_on_popup">Start Here on Popup</string>
+    <string name="hold_to_append">Hold To enqueue</string>
+    <string name="enqueue_on_background">Enqueue when backgrounded</string>
+    <string name="enqueue_on_popup">Enqueue on new popup</string>
+    <string name="start_here_on_main">Start playing here</string>
+    <string name="start_here_on_background">Start here when backgrounded</string>
+    <string name="start_here_on_popup">Start here on new popup</string>
 
     <!-- Drawer -->
     <string name="drawer_open">Open Drawer</string>
@@ -426,9 +427,9 @@
     <string name="preferred_player_fetcher_notification_message">"Loading requested content"</string>
 
     <!-- Local Playlist -->
-    <string name="create_playlist">Create New Playlist</string>
-    <string name="delete_playlist">Delete Playlist</string>
-    <string name="rename_playlist">Rename Playlist</string>
+    <string name="create_playlist">New Playlist</string>
+    <string name="delete_playlist">Delete</string>
+    <string name="rename_playlist">Rename</string>
     <string name="playlist_name_input">Name</string>
     <string name="append_playlist">Add To Playlist</string>
     <string name="set_as_playlist_thumbnail">Set as Playlist Thumbnail</string>
@@ -436,11 +437,11 @@
     <string name="bookmark_playlist">Bookmark Playlist</string>
     <string name="unbookmark_playlist">Remove Bookmark</string>
 
-    <string name="delete_playlist_prompt">Do you want to delete this playlist?</string>
+    <string name="delete_playlist_prompt">Delete this playlist?</string>
     <string name="playlist_creation_success">Playlist created</string>
-    <string name="playlist_add_stream_success">Added to playlist</string>
-    <string name="playlist_thumbnail_change_success">Playlist thumbnail changed</string>
-    <string name="playlist_delete_failure">Could not delete playlist</string>
+    <string name="playlist_add_stream_success">Playlisted</string>
+    <string name="playlist_thumbnail_change_success">Playlist thumbnail changed.</string>
+    <string name="playlist_delete_failure">Could not delete playlist.</string>
 
     <!-- Players -->
     <string name="caption_none">No Captions</string>
@@ -459,11 +460,11 @@
     <string name="enable_leak_canary_title">Enable LeakCanary</string>
     <string name="enable_leak_canary_summary">Memory leak monitoring may cause the app to become unresponsive when heap dumping</string>
 
-    <string name="enable_disposed_exceptions_title">Report Out-of-lifecycle Errors</string>
+    <string name="enable_disposed_exceptions_title">Report out-of-lifecycle errors</string>
     <string name="enable_disposed_exceptions_summary">Force reporting of undeliverable Rx exceptions outside of fragment or activity lifecycle after disposal</string>
 
     <!-- Subscriptions import/export -->
-    <string name="import_export_title">Import/Export</string>
+    <string name="import_export_title">Import/export</string>
     <string name="import_title">Import</string>
     <string name="import_from">Import from</string>
     <string name="export_to">Export to</string>
@@ -514,10 +515,14 @@
     </string-array>
 
     <!-- Minimize to exit action -->
-    <string name="minimize_on_exit_title">Minimize on application switch</string>
-    <string name="minimize_on_exit_summary">Action when switching to other application from main video player — %s</string>
+    <string name="minimize_on_exit_title">Minimize on app switch</string>
+    <string name="minimize_on_exit_summary">Action when switching to other app from main video player — %s</string>
     <string name="minimize_on_exit_none_description">None</string>
     <string name="minimize_on_exit_background_description">Minimize to background player</string>
     <string name="minimize_on_exit_popup_description">Minimize to popup player</string>
-
+	  <string name="list_view_mode">List view mode</string>
+    <string name="list">List</string>
+    <string name="grid">Grid</string>
+	  <string name="auto">Auto</string>
+    <string name="switch_view">Switch View</string>
 </resources>
diff --git a/app/src/main/res/xml/appearance_settings.xml b/app/src/main/res/xml/appearance_settings.xml
index 1f711b510..437736ab0 100644
--- a/app/src/main/res/xml/appearance_settings.xml
+++ b/app/src/main/res/xml/appearance_settings.xml
@@ -22,6 +22,14 @@
         android:title="@string/show_hold_to_append_title"
         android:summary="@string/show_hold_to_append_summary"/>
 
+    <ListPreference
+        android:defaultValue="@string/list_view_mode_value"
+        android:entries="@array/list_view_mode_description"
+        android:entryValues="@array/list_view_mode_values"
+        android:key="@string/list_view_mode_key"
+        android:summary="%s"
+        android:title="@string/list_view_mode"/>
+
     <Preference
         android:key="@string/caption_settings_key"
         android:title="@string/caption_setting_title"
diff --git a/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml
index 7c55d5a29..598a1b1c7 100644
--- a/app/src/main/res/xml/provider_paths.xml
+++ b/app/src/main/res/xml/provider_paths.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<paths xmlns:android="http://schemas.android.com/apk/res/android">
+<paths>
     <external-path name="external_files" path="."/>
     <root-path name="external_files" path="/storage/" />
 </paths>
\ No newline at end of file
diff --git a/app/src/test/java/org/schabi/newpipe/local/subscription/services/ImportExportJsonHelperTest.java b/app/src/test/java/org/schabi/newpipe/local/subscription/services/ImportExportJsonHelperTest.java
index 4a8b3d8c8..7f5f818be 100644
--- a/app/src/test/java/org/schabi/newpipe/local/subscription/services/ImportExportJsonHelperTest.java
+++ b/app/src/test/java/org/schabi/newpipe/local/subscription/services/ImportExportJsonHelperTest.java
@@ -27,7 +27,7 @@ public class ImportExportJsonHelperTest {
     }
 
     @Test
-    public void testInvalidSource() throws Exception {
+    public void testInvalidSource() {
         List<String> invalidList = Arrays.asList(
                 "{}",
                 "",
diff --git a/app/src/test/java/org/schabi/newpipe/report/ErrorActivityTest.java b/app/src/test/java/org/schabi/newpipe/report/ErrorActivityTest.java
index 44a2f7cd0..ca6c76ff3 100644
--- a/app/src/test/java/org/schabi/newpipe/report/ErrorActivityTest.java
+++ b/app/src/test/java/org/schabi/newpipe/report/ErrorActivityTest.java
@@ -15,7 +15,7 @@ import static org.junit.Assert.assertNull;
  */
 public class ErrorActivityTest {
     @Test
-    public void getReturnActivity() throws Exception {
+    public void getReturnActivity() {
         Class<? extends Activity> returnActivity;
         returnActivity = ErrorActivity.getReturnActivity(MainActivity.class);
         assertEquals(MainActivity.class, returnActivity);
diff --git a/app/src/test/java/org/schabi/newpipe/util/ListHelperTest.java b/app/src/test/java/org/schabi/newpipe/util/ListHelperTest.java
index 278ea81e1..a6e7fc2c0 100644
--- a/app/src/test/java/org/schabi/newpipe/util/ListHelperTest.java
+++ b/app/src/test/java/org/schabi/newpipe/util/ListHelperTest.java
@@ -45,7 +45,7 @@ public class ListHelperTest {
             new VideoStream("", MediaFormat.MPEG_4,   /**/ "1080p60", true));
 
     @Test
-    public void getSortedStreamVideosListTest() throws Exception {
+    public void getSortedStreamVideosListTest() {
         List<VideoStream> result = ListHelper.getSortedStreamVideosList(MediaFormat.MPEG_4, true, videoStreamsTestList, videoOnlyStreamsTestList, true);
 
         List<String> expected = Arrays.asList("144p", "240p", "360p", "480p", "720p", "720p60", "1080p", "1080p60", "1440p60", "2160p", "2160p60");
@@ -67,7 +67,7 @@ public class ListHelperTest {
     }
 
     @Test
-    public void getSortedStreamVideosExceptHighResolutionsTest() throws Exception {
+    public void getSortedStreamVideosExceptHighResolutionsTest() {
         ////////////////////////////////////
         // Don't show Higher resolutions //
         //////////////////////////////////
@@ -79,7 +79,7 @@ public class ListHelperTest {
     }
 
     @Test
-    public void getDefaultResolutionTest() throws Exception {
+    public void getDefaultResolutionTest() {
         List<VideoStream> testList = Arrays.asList(
                 new VideoStream("", MediaFormat.MPEG_4,   /**/ "720p"),
                 new VideoStream("", MediaFormat.v3GPP,    /**/ "240p"),
@@ -130,7 +130,7 @@ public class ListHelperTest {
     }
 
     @Test
-    public void getHighestQualityAudioFormatTest() throws Exception {
+    public void getHighestQualityAudioFormatTest() {
         AudioStream stream = audioStreamsTestList.get(ListHelper.getHighestQualityAudioIndex(MediaFormat.M4A, audioStreamsTestList));
         assertEquals(320, stream.average_bitrate);
         assertEquals(MediaFormat.M4A, stream.getFormat());
@@ -145,7 +145,7 @@ public class ListHelperTest {
     }
 
     @Test
-    public void getHighestQualityAudioFormatPreferredAbsent() throws Exception {
+    public void getHighestQualityAudioFormatPreferredAbsent() {
 
         //////////////////////////////////////////
         // Doesn't contain the preferred format //
@@ -186,13 +186,13 @@ public class ListHelperTest {
     }
 
     @Test
-    public void getHighestQualityAudioNull() throws Exception {
+    public void getHighestQualityAudioNull() {
         assertEquals(-1, ListHelper.getHighestQualityAudioIndex(null, null));
-        assertEquals(-1, ListHelper.getHighestQualityAudioIndex(null, new ArrayList<AudioStream>()));
+        assertEquals(-1, ListHelper.getHighestQualityAudioIndex(null, new ArrayList<>()));
     }
 
     @Test
-    public void getLowestQualityAudioFormatTest() throws Exception {
+    public void getLowestQualityAudioFormatTest() {
         AudioStream stream = audioStreamsTestList.get(ListHelper.getMostCompactAudioIndex(MediaFormat.M4A, audioStreamsTestList));
         assertEquals(128, stream.average_bitrate);
         assertEquals(MediaFormat.M4A, stream.getFormat());
@@ -207,7 +207,7 @@ public class ListHelperTest {
     }
 
     @Test
-    public void getLowestQualityAudioFormatPreferredAbsent() throws Exception {
+    public void getLowestQualityAudioFormatPreferredAbsent() {
 
         //////////////////////////////////////////
         // Doesn't contain the preferred format //
@@ -250,13 +250,13 @@ public class ListHelperTest {
     }
 
     @Test
-    public void getLowestQualityAudioNull() throws Exception {
+    public void getLowestQualityAudioNull() {
         assertEquals(-1, ListHelper.getMostCompactAudioIndex(null, null));
-        assertEquals(-1, ListHelper.getMostCompactAudioIndex(null, new ArrayList<AudioStream>()));
+        assertEquals(-1, ListHelper.getMostCompactAudioIndex(null, new ArrayList<>()));
     }
 
     @Test
-    public void getVideoDefaultStreamIndexCombinations() throws Exception {
+    public void getVideoDefaultStreamIndexCombinations() {
         List<VideoStream> testList = Arrays.asList(
                 new VideoStream("", MediaFormat.MPEG_4,   /**/ "1080p"),
                 new VideoStream("", MediaFormat.MPEG_4,   /**/ "720p60"),
diff --git a/app/src/test/java/org/schabi/newpipe/util/QuadraticSliderStrategyTest.java b/app/src/test/java/org/schabi/newpipe/util/QuadraticSliderStrategyTest.java
index 8c8d52043..c652472d1 100644
--- a/app/src/test/java/org/schabi/newpipe/util/QuadraticSliderStrategyTest.java
+++ b/app/src/test/java/org/schabi/newpipe/util/QuadraticSliderStrategyTest.java
@@ -11,25 +11,25 @@ public class QuadraticSliderStrategyTest {
     private final SliderStrategy.Quadratic standard =
             new SliderStrategy.Quadratic(0f, 100f, 50f, STEP);
     @Test
-    public void testLeftBound() throws Exception {
+    public void testLeftBound() {
         assertEquals(standard.progressOf(0), 0);
         assertEquals(standard.valueOf(0), 0f, DELTA);
     }
 
     @Test
-    public void testCenter() throws Exception {
+    public void testCenter() {
         assertEquals(standard.progressOf(50), 50);
         assertEquals(standard.valueOf(50), 50f, DELTA);
     }
 
     @Test
-    public void testRightBound() throws Exception {
+    public void testRightBound() {
         assertEquals(standard.progressOf(100), 100);
         assertEquals(standard.valueOf(100), 100f, DELTA);
     }
 
     @Test
-    public void testLeftRegion() throws Exception {
+    public void testLeftRegion() {
         final int leftProgress = standard.progressOf(25);
         final double leftValue = standard.valueOf(25);
         assertTrue(leftProgress > 0 && leftProgress < 50);
@@ -37,7 +37,7 @@ public class QuadraticSliderStrategyTest {
     }
 
     @Test
-    public void testRightRegion() throws Exception {
+    public void testRightRegion() {
         final int leftProgress = standard.progressOf(75);
         final double leftValue = standard.valueOf(75);
         assertTrue(leftProgress > 50 && leftProgress < 100);
@@ -45,7 +45,7 @@ public class QuadraticSliderStrategyTest {
     }
 
     @Test
-    public void testConversion() throws Exception {
+    public void testConversion() {
         assertEquals(standard.progressOf(standard.valueOf(0)), 0);
         assertEquals(standard.progressOf(standard.valueOf(25)), 25);
         assertEquals(standard.progressOf(standard.valueOf(50)), 50);
@@ -54,7 +54,7 @@ public class QuadraticSliderStrategyTest {
     }
 
     @Test
-    public void testReverseConversion() throws Exception {
+    public void testReverseConversion() {
         // Need a larger delta since step size / granularity is too small and causes
         // floating point round-off errors during conversion
         final float largeDelta = 1f;
@@ -67,7 +67,7 @@ public class QuadraticSliderStrategyTest {
     }
 
     @Test
-    public void testQuadraticPropertyLeftRegion() throws Exception {
+    public void testQuadraticPropertyLeftRegion() {
         final double differenceCloserToCenter =
                 Math.abs(standard.valueOf(40) - standard.valueOf(45));
         final double differenceFurtherFromCenter =
@@ -76,7 +76,7 @@ public class QuadraticSliderStrategyTest {
     }
 
     @Test
-    public void testQuadraticPropertyRightRegion() throws Exception {
+    public void testQuadraticPropertyRightRegion() {
         final double differenceCloserToCenter =
                 Math.abs(standard.valueOf(75) - standard.valueOf(70));
         final double differenceFurtherFromCenter =
diff --git a/app/src/test/java/us/shandian/giga/get/DownloadManagerImplTest.java b/app/src/test/java/us/shandian/giga/get/DownloadManagerImplTest.java
index 6ff702273..c755ba2e9 100644
--- a/app/src/test/java/us/shandian/giga/get/DownloadManagerImplTest.java
+++ b/app/src/test/java/us/shandian/giga/get/DownloadManagerImplTest.java
@@ -42,12 +42,12 @@ public class DownloadManagerImplTest {
             missions.add(generateFinishedDownloadMission());
         }
         when(downloadDataSource.loadMissions()).thenReturn(new ArrayList<>(missions));
-        downloadManager = new DownloadManagerImpl(new ArrayList<String>(), downloadDataSource);
+        downloadManager = new DownloadManagerImpl(new ArrayList<>(), downloadDataSource);
     }
 
     @Test(expected = NullPointerException.class)
     public void testConstructorWithNullAsDownloadDataSource() {
-        new DownloadManagerImpl(new ArrayList<String>(), null);
+        new DownloadManagerImpl(new ArrayList<>(), null);
     }
 
 
@@ -84,7 +84,7 @@ public class DownloadManagerImplTest {
 
         downloadDataSource = mock(DownloadDataSource.class);
         when(downloadDataSource.loadMissions()).thenReturn(new ArrayList<>(missions));
-        downloadManager = new DownloadManagerImpl(new ArrayList<String>(), downloadDataSource);
+        downloadManager = new DownloadManagerImpl(new ArrayList<>(), downloadDataSource);
         verify(downloadDataSource, times(1)).loadMissions();
 
         assertEquals(50, downloadManager.getCount());
@@ -110,7 +110,7 @@ public class DownloadManagerImplTest {
     }
 
     @Test
-    public void resumeMission() throws Exception {
+    public void resumeMission() {
         DownloadMission mission = missions.get(0);
         mission.running = true;
         verify(mission, never()).start();
@@ -122,7 +122,7 @@ public class DownloadManagerImplTest {
     }
 
     @Test
-    public void pauseMission() throws Exception {
+    public void pauseMission() {
         DownloadMission mission = missions.get(0);
         mission.running = false;
         downloadManager.pauseMission(0);
@@ -133,7 +133,7 @@ public class DownloadManagerImplTest {
     }
 
     @Test
-    public void deleteMission() throws Exception {
+    public void deleteMission() {
         DownloadMission mission = missions.get(0);
         assertEquals(mission, downloadManager.getMission(0));
         downloadManager.deleteMission(0);
@@ -143,18 +143,18 @@ public class DownloadManagerImplTest {
     }
 
     @Test(expected = RuntimeException.class)
-    public void getMissionWithNegativeIndex() throws Exception {
+    public void getMissionWithNegativeIndex() {
         downloadManager.getMission(-1);
     }
 
     @Test
-    public void getMission() throws Exception {
+    public void getMission() {
         assertSame(missions.get(0), downloadManager.getMission(0));
         assertSame(missions.get(1), downloadManager.getMission(1));
     }
 
     @Test
-    public void sortByTimestamp() throws Exception {
+    public void sortByTimestamp() {
         ArrayList<DownloadMission> downloadMissions = new ArrayList<>();
         DownloadMission mission = new DownloadMission();
         mission.timestamp = 0;
diff --git a/assets/BETA_new_pipe_icon_5.svg b/assets/BETA_new_pipe_icon_5.svg
index 9406f2469..4fee29b3e 100644
--- a/assets/BETA_new_pipe_icon_5.svg
+++ b/assets/BETA_new_pipe_icon_5.svg
@@ -1,23 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   viewBox="0 0 192 192"
-   height="204.8"
-   width="204.8"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="BETA_new_pipe_icon_5.svg"
-   inkscape:export-filename="/home/the-scrabi/Projects/NewPipe/assets/new_pipe_icon_5.png"
-   inkscape:export-xdpi="120"
-   inkscape:export-ydpi="120">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" id="svg2" viewBox="0 0 192 192"
+    height="204.8" width="204.8" inkscape:version="0.91 r13725" sodipodi:docname="BETA_new_pipe_icon_5.svg"
+    inkscape:export-filename="/home/the-scrabi/Projects/NewPipe/assets/new_pipe_icon_5.png"
+    inkscape:export-xdpi="120" inkscape:export-ydpi="120">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
diff --git a/assets/NP logo v2.svg b/assets/NP logo v2.svg
index 642c6c928..3332f4dd9 100644
--- a/assets/NP logo v2.svg	
+++ b/assets/NP logo v2.svg	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg"  x="0px" y="0px"
 	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill:#CD201F;}
diff --git a/assets/buddy_channel_item.svg b/assets/buddy_channel_item.svg
index 6e3f71b5b..4dec41f9d 100644
--- a/assets/buddy_channel_item.svg
+++ b/assets/buddy_channel_item.svg
@@ -1,24 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="200"
-   height="200"
-   viewBox="0 0 187.5 187.5"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.0 r"
-   sodipodi:docname="buddy_channel_item.svg"
-   inkscape:export-filename="/home/the-scrabi/Projects/NewPipe/app/src/main/res/drawable-nodpi/buddy_channel_item.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="200" height="200" viewBox="0 0 187.5 187.5"
+    id="svg2" version="1.1" inkscape:version="0.92.0 r" sodipodi:docname="buddy_channel_item.svg"
+    inkscape:export-filename="/home/the-scrabi/Projects/NewPipe/app/src/main/res/drawable-nodpi/buddy_channel_item.png"
+    inkscape:export-xdpi="96" inkscape:export-ydpi="96">
   <defs
      id="defs4" />
   <sodipodi:namedview
diff --git a/assets/budy.svg b/assets/budy.svg
index 0def3f71f..c59a9e590 100644
--- a/assets/budy.svg
+++ b/assets/budy.svg
@@ -1,21 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="200"
-   height="200"
-   viewBox="0 0 200 200"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="budy.svg">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="200" height="200" viewBox="0 0 200 200"
+    id="svg2" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="budy.svg">
   <defs
      id="defs4" />
   <sodipodi:namedview
@@ -45,7 +34,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+          <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/assets/channel_banner_desktop.svg b/assets/channel_banner_desktop.svg
index 4d1b0d7ca..ecb572d6e 100644
--- a/assets/channel_banner_desktop.svg
+++ b/assets/channel_banner_desktop.svg
@@ -1,24 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="2550"
-   height="427"
-   viewBox="0 0 674.68749 112.97708"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.1 r"
-   sodipodi:docname="channel_banner_desktop.svg"
-   inkscape:export-filename="/home/the-scrabi/channel_banner.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="2550" height="427" viewBox="0 0 674.68749 112.97708"
+    version="1.1" id="svg8" inkscape:version="0.92.1 r" sodipodi:docname="channel_banner_desktop.svg"
+    inkscape:export-filename="/home/the-scrabi/channel_banner.png" inkscape:export-xdpi="96"
+    inkscape:export-ydpi="96">
   <defs
      id="defs2" />
   <sodipodi:namedview
@@ -48,7 +36,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+          <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/assets/channel_banner_mobild.svg b/assets/channel_banner_mobild.svg
index 785becc0d..122e4455f 100644
--- a/assets/channel_banner_mobild.svg
+++ b/assets/channel_banner_mobild.svg
@@ -1,24 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1540"
-   height="427"
-   viewBox="0 0 407.45833 112.97708"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.1 r"
-   sodipodi:docname="channel_banner.svg"
-   inkscape:export-filename="/home/the-scrabi/channel_banner.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="1540" height="427" viewBox="0 0 407.45833 112.97708"
+    version="1.1" id="svg8" inkscape:version="0.92.1 r" sodipodi:docname="channel_banner.svg"
+    inkscape:export-filename="/home/the-scrabi/channel_banner.png" inkscape:export-xdpi="96"
+    inkscape:export-ydpi="96">
   <defs
      id="defs2" />
   <sodipodi:namedview
@@ -48,7 +36,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+          <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/assets/dummi_thumbnail.svg b/assets/dummi_thumbnail.svg
index 1183d9875..b33164557 100644
--- a/assets/dummi_thumbnail.svg
+++ b/assets/dummi_thumbnail.svg
@@ -1,21 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="454.39999"
-   height="256"
-   viewBox="0 0 426.00001 240"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.0 r"
-   sodipodi:docname="dummi_thumbnail.svg">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="454.39999" height="256"
+    viewBox="0 0 426.00001 240" id="svg2" version="1.1" inkscape:version="0.92.0 r" sodipodi:docname="dummi_thumbnail.svg">
   <defs
      id="defs4" />
   <sodipodi:namedview
diff --git a/assets/dummi_thumbnail_backup.svg b/assets/dummi_thumbnail_backup.svg
index 775e33031..56c4c0e71 100644
--- a/assets/dummi_thumbnail_backup.svg
+++ b/assets/dummi_thumbnail_backup.svg
@@ -1,21 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="426"
-   height="240"
-   viewBox="0 0 426.00001 240"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="dummi_thumbnail.svg">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="426" height="240" viewBox="0 0 426.00001 240"
+    id="svg2" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="dummi_thumbnail.svg">
   <defs
      id="defs4" />
   <sodipodi:namedview
@@ -45,7 +34,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+          <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/assets/dummi_thumbnail_playlist.svg b/assets/dummi_thumbnail_playlist.svg
index f73ec3782..2e3a305a1 100644
--- a/assets/dummi_thumbnail_playlist.svg
+++ b/assets/dummi_thumbnail_playlist.svg
@@ -1,21 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="454.39999"
-   height="256"
-   viewBox="0 0 426.00001 240"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.0 r"
-   sodipodi:docname="dummi_thumbnail_playlist.svg">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="454.39999" height="256"
+    viewBox="0 0 426.00001 240" id="svg2" version="1.1" inkscape:version="0.92.0 r" sodipodi:docname="dummi_thumbnail_playlist.svg">
   <defs
      id="defs4" />
   <sodipodi:namedview
@@ -45,7 +34,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+          <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/assets/dummi_thumbnail_playlist_background.svg b/assets/dummi_thumbnail_playlist_background.svg
index 58a878bf2..d7d28fc27 100644
--- a/assets/dummi_thumbnail_playlist_background.svg
+++ b/assets/dummi_thumbnail_playlist_background.svg
@@ -1,21 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="534.39996"
-   height="336"
-   viewBox="0 0 500.99998 315"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.0 r"
-   sodipodi:docname="dummi_thumbnail_playlist_background.svg">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="534.39996" height="336"
+    viewBox="0 0 500.99998 315" id="svg2" version="1.1" inkscape:version="0.92.0 r" sodipodi:docname="dummi_thumbnail_playlist_background.svg">
   <defs
      id="defs4" />
   <sodipodi:namedview
@@ -45,7 +34,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+          <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/assets/gruese_die_gema.svg b/assets/gruese_die_gema.svg
index eace7bf44..067879b34 100644
--- a/assets/gruese_die_gema.svg
+++ b/assets/gruese_die_gema.svg
@@ -1,24 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="426"
-   height="240"
-   viewBox="0 0 426.00001 240"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="gruese_die_gema.svg"
-   inkscape:export-filename="/home/the-scrabi/Projects/NewPipe/assets/gruese_die_gema.png"
-   inkscape:export-xdpi="216.33803"
-   inkscape:export-ydpi="216.33803">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="426" height="240" viewBox="0 0 426.00001 240"
+    id="svg2" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="gruese_die_gema.svg"
+    inkscape:export-filename="/home/the-scrabi/Projects/NewPipe/assets/gruese_die_gema.png"
+    inkscape:export-xdpi="216.33803" inkscape:export-ydpi="216.33803">
   <defs
      id="defs4" />
   <sodipodi:namedview
diff --git a/assets/ic_play_circle_transparent.svg b/assets/ic_play_circle_transparent.svg
index 805475dc7..bbd20f40d 100644
--- a/assets/ic_play_circle_transparent.svg
+++ b/assets/ic_play_circle_transparent.svg
@@ -1,20 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="80"
-   viewBox="0 0 80 80"
-   width="80"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ic_play_circle_transparent.svg"
-   style="fill:#000000">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" height="80" viewBox="0 0 80 80"
+    width="80" id="svg2" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="ic_play_circle_transparent.svg"
+    style="fill:#000000">
   <metadata
      id="metadata12">
     <rdf:RDF>
@@ -23,7 +12,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+          <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/assets/ic_play_circle_transparent_80px.svg b/assets/ic_play_circle_transparent_80px.svg
index 091e75605..b14b48ee2 100644
--- a/assets/ic_play_circle_transparent_80px.svg
+++ b/assets/ic_play_circle_transparent_80px.svg
@@ -1,23 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="80"
-   viewBox="0 0 80 80"
-   width="80"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ic_play_circle_transparent_80px.svg"
-   style="fill:#000000"
-   inkscape:export-filename="/home/the-scrabi/Desktop/ic_play_circle_transparent.png"
-   inkscape:export-xdpi="360"
-   inkscape:export-ydpi="360">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" height="80" viewBox="0 0 80 80"
+    width="80" id="svg2" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="ic_play_circle_transparent_80px.svg"
+    style="fill:#000000" inkscape:export-filename="/home/the-scrabi/Desktop/ic_play_circle_transparent.png"
+    inkscape:export-xdpi="360" inkscape:export-ydpi="360">
   <metadata
      id="metadata12">
     <rdf:RDF>
diff --git a/assets/new_pipe_icon_4.svg b/assets/new_pipe_icon_4.svg
index 2edf35724..7c4952fa7 100644
--- a/assets/new_pipe_icon_4.svg
+++ b/assets/new_pipe_icon_4.svg
@@ -1,23 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   viewBox="0 0 192 192"
-   height="192"
-   width="192"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="new_pipe_icon_4.svg"
-   inkscape:export-filename="/home/the-scrabi/Projects/NewPipe/app/src/main/res/mipmap-xxhdpi/ic_launcher.png"
-   inkscape:export-xdpi="67.5"
-   inkscape:export-ydpi="67.5">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" id="svg2" viewBox="0 0 192 192"
+    height="192" width="192" inkscape:version="0.91 r13725" sodipodi:docname="new_pipe_icon_4.svg"
+    inkscape:export-filename="/home/the-scrabi/Projects/NewPipe/app/src/main/res/mipmap-xxhdpi/ic_launcher.png"
+    inkscape:export-xdpi="67.5" inkscape:export-ydpi="67.5">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -463,7 +450,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+          <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/assets/new_pipe_icon_5.svg b/assets/new_pipe_icon_5.svg
index c4b21bbd8..9f4e41632 100644
--- a/assets/new_pipe_icon_5.svg
+++ b/assets/new_pipe_icon_5.svg
@@ -1,23 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   viewBox="0 0 192 192"
-   height="204.8"
-   width="204.8"
-   inkscape:version="0.92.1 r"
-   sodipodi:docname="new_pipe_icon_5.svg"
-   inkscape:export-filename="/home/the-scrabi/Projects/NewPipe/assets/new_pipe_icon_5.png"
-   inkscape:export-xdpi="120"
-   inkscape:export-ydpi="120">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" id="svg2" viewBox="0 0 192 192"
+    height="204.8" width="204.8" inkscape:version="0.92.1 r" sodipodi:docname="new_pipe_icon_5.svg"
+    inkscape:export-filename="/home/the-scrabi/Projects/NewPipe/assets/new_pipe_icon_5.png"
+    inkscape:export-xdpi="120" inkscape:export-ydpi="120">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
diff --git a/assets/new_pipe_icon_5_beta2.svg b/assets/new_pipe_icon_5_beta2.svg
index d74fd8722..1ee3e9917 100644
--- a/assets/new_pipe_icon_5_beta2.svg
+++ b/assets/new_pipe_icon_5_beta2.svg
@@ -1,23 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   viewBox="0 0 192 192"
-   height="204.8"
-   width="204.8"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="new_pipe_icon_5_beta2.svg"
-   inkscape:export-filename="/home/the-scrabi/Projects/NewPipe/assets/new_pipe_icon_5.png"
-   inkscape:export-xdpi="120"
-   inkscape:export-ydpi="120">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" id="svg2" viewBox="0 0 192 192"
+    height="204.8" width="204.8" inkscape:version="0.91 r13725" sodipodi:docname="new_pipe_icon_5_beta2.svg"
+    inkscape:export-filename="/home/the-scrabi/Projects/NewPipe/assets/new_pipe_icon_5.png"
+    inkscape:export-xdpi="120" inkscape:export-ydpi="120">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -495,7 +482,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+          <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/assets/new_play_arrow.svg b/assets/new_play_arrow.svg
index 26ba667b7..b76a088ac 100644
--- a/assets/new_play_arrow.svg
+++ b/assets/new_play_arrow.svg
@@ -1,20 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="80"
-   viewBox="0 0 80 80"
-   width="80"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="new_play_arrow.svg"
-   style="fill:#000000">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" height="80" viewBox="0 0 80 80"
+    width="80" id="svg2" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="new_play_arrow.svg"
+    style="fill:#000000">
   <metadata
      id="metadata12">
     <rdf:RDF>
diff --git a/assets/not_available_monkey.svg b/assets/not_available_monkey.svg
index 7acf6964d..f1940cb70 100644
--- a/assets/not_available_monkey.svg
+++ b/assets/not_available_monkey.svg
@@ -1,21 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="426"
-   height="240"
-   viewBox="0 0 426.00001 240"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="dummi_thumbnail.svg">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="426" height="240" viewBox="0 0 426.00001 240"
+    id="svg2" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="dummi_thumbnail.svg">
   <defs
      id="defs4" />
   <sodipodi:namedview
diff --git a/assets/service.svg b/assets/service.svg
index 172cc106f..fc923af57 100644
--- a/assets/service.svg
+++ b/assets/service.svg
@@ -1,21 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="200"
-   height="200"
-   viewBox="0 0 200 200"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="service.svg">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="200" height="200" viewBox="0 0 200 200"
+    id="svg2" version="1.1" inkscape:version="0.91 r" sodipodi:docname="service.svg">
   <defs
      id="defs4" />
   <sodipodi:namedview
@@ -45,7 +34,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+          <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_11.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_11.png
new file mode 100644
index 000000000..91af82879
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_11.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_12.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_12.png
new file mode 100644
index 000000000..e362a1975
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_12.png differ