diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt
index 9288544558..7a0403920d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt
@@ -239,7 +239,6 @@ class LibraryFragment : BaseRxFragment<LibraryPresenter>(), ActionMode.Callback
         adapter.notifyDataSetChanged()
         adapter.refreshRegisteredAdapters()
         activity.supportInvalidateOptionsMenu();
-        ToastUtil.showShort(context, getString(R.string.library_filter_change))
     }
 
     /**
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
index 6bc038d238..7e0bf1bf60 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
@@ -166,9 +166,12 @@ class LibraryPresenter : BasePresenter<LibraryFragment>() {
 
             // Does it have downloaded chapters.
             var hasDownloaded = false
+            var hasUnread = false
 
-            // Does it have unread chapters.
-            val hasUnread = manga.unread > 0
+            if (prefFilterUnread) {
+                // Does it have unread chapters.
+                hasUnread = manga.unread > 0
+            }
 
             if (prefFilterDownloaded) {
                 val mangaDir = downloadManager.getAbsoluteMangaDirectory(sourceManager.get(manga.source), manga)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaActivity.java b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaActivity.java
index a488a4cb2e..d357b0503b 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaActivity.java
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaActivity.java
@@ -77,6 +77,13 @@ public class MangaActivity extends BaseRxActivity<MangaPresenter> {
         adapter = new MangaDetailAdapter(getSupportFragmentManager(), this);
 
         viewPager.setAdapter(adapter);
+
+        // Workaround to prevent: Tab belongs to a different TabLayout.
+        // Internal bug in Support library v23.2.0.
+        // See https://code.google.com/p/android/issues/detail?id=201827
+        for (int j = 0; j < 17; j++)
+            tabs.newTab();
+
         tabs.setupWithViewPager(viewPager);
 
         if (!isOnline)
diff --git a/app/src/main/res/drawable-hdpi/ic_filter_list_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_filter_list_white_24dp.png
deleted file mode 100644
index 7e8a6b536b..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_filter_list_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_filter_list_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_filter_list_white_24dp.png
deleted file mode 100644
index 59a2ec755e..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_filter_list_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_filter_list_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_filter_list_white_24dp.png
deleted file mode 100644
index 9416c70ec0..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_filter_list_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_filter_list_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_filter_list_white_24dp.png
deleted file mode 100644
index 1263ae82e7..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_filter_list_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_filter_list_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_filter_list_white_24dp.png
deleted file mode 100644
index cb2207f11f..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_filter_list_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_filter_list.xml b/app/src/main/res/drawable/ic_filter_list.xml
new file mode 100644
index 0000000000..7d435fa2b8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_filter_list.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
+</vector>
diff --git a/app/src/main/res/menu/library.xml b/app/src/main/res/menu/library.xml
index 02037e0026..474a8f9128 100644
--- a/app/src/main/res/menu/library.xml
+++ b/app/src/main/res/menu/library.xml
@@ -5,7 +5,7 @@
     <item
         android:id="@+id/action_filter"
         android:title="@string/action_filter"
-        android:icon="@drawable/ic_filter_list_white_24dp"
+        android:icon="@drawable/ic_filter_list"
         app:showAsAction="ifRoom">
         <menu>
             <item
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cd3d342f3f..fb62107288 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -162,7 +162,6 @@
     <!-- Library fragment -->
     <string name="library_search_hint">Title or author…</string>
     <string name="library_selection_title">Selected</string>
-    <string name="library_filter_change">Filtering…</string>
 
     <!-- Catalogue fragment -->
     <string name="source_requires_login">This source requires you to log in</string>