diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueFragment.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueFragment.kt
index 55b8c4b29..388d93f09 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueFragment.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueFragment.kt
@@ -19,6 +19,7 @@ import eu.kanade.tachiyomi.ui.base.adapter.FlexibleViewHolder
 import eu.kanade.tachiyomi.ui.base.fragment.BaseRxFragment
 import eu.kanade.tachiyomi.ui.main.MainActivity
 import eu.kanade.tachiyomi.ui.manga.MangaActivity
+import eu.kanade.tachiyomi.util.connectivityManager
 import eu.kanade.tachiyomi.util.inflate
 import eu.kanade.tachiyomi.util.snack
 import eu.kanade.tachiyomi.util.toast
@@ -420,8 +421,8 @@ open class CatalogueFragment : BaseRxFragment<CataloguePresenter>(), FlexibleVie
         val isListMode = presenter.isListMode
         activity.invalidateOptionsMenu()
         switcher.showNext()
-        if (!isListMode) {
-            // Initialize mangas if going to grid view
+        if (!isListMode || !context.connectivityManager.isActiveNetworkMetered) {
+            // Initialize mangas if going to grid view or if over wifi when going to list view
             presenter.initializeMangas(adapter.items)
         }
     }
@@ -444,8 +445,10 @@ open class CatalogueFragment : BaseRxFragment<CataloguePresenter>(), FlexibleVie
      * @param manga the manga to find.
      * @return the holder of the manga or null if it's not bound.
      */
-    private fun getHolder(manga: Manga): CatalogueGridHolder? {
-        return catalogue_grid.findViewHolderForItemId(manga.id!!) as? CatalogueGridHolder
+    private fun getHolder(manga: Manga): CatalogueHolder? {
+        return (catalogue_grid.findViewHolderForItemId(manga.id!!) ?:
+                catalogue_list.findViewHolderForItemId(manga.id!!))
+                as? CatalogueHolder
     }
 
     /**
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueGridHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueGridHolder.kt
index 0dcd4e182..f057164e8 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueGridHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueGridHolder.kt
@@ -34,13 +34,7 @@ class CatalogueGridHolder(private val view: View, private val adapter: Catalogue
         setImage(manga)
     }
 
-    /**
-     * Updates the image for this holder. Useful to update the image when the manga is initialized
-     * and the url is now known.
-     *
-     * @param manga the manga to bind.
-     */
-    fun setImage(manga: Manga) {
+    override fun setImage(manga: Manga) {
         Glide.clear(view.thumbnail)
         if (!manga.thumbnail_url.isNullOrEmpty()) {
             Glide.with(view.context)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueHolder.kt
index 1280a0be8..e6a1c63e7 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueHolder.kt
@@ -21,4 +21,13 @@ abstract class CatalogueHolder(view: View, adapter: CatalogueAdapter, listener:
      * @param manga the manga to bind.
      */
     abstract fun onSetValues(manga: Manga)
+
+
+    /**
+     * Updates the image for this holder. Useful to update the image when the manga is initialized
+     * and the url is now known.
+     *
+     * @param manga the manga to bind.
+     */
+    abstract fun setImage(manga: Manga)
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueListHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueListHolder.kt
index 262311cc2..10d9e6bed 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueListHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueListHolder.kt
@@ -1,6 +1,8 @@
 package eu.kanade.tachiyomi.ui.catalogue
 
 import android.view.View
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.engine.DiskCacheStrategy
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.util.getResourceColor
 import kotlinx.android.synthetic.main.item_catalogue_list.view.*
@@ -29,5 +31,22 @@ class CatalogueListHolder(private val view: View, adapter: CatalogueAdapter, lis
     override fun onSetValues(manga: Manga) {
         view.title.text = manga.title
         view.title.setTextColor(if (manga.favorite) favoriteColor else unfavoriteColor)
+
+        setImage(manga)
     }
+
+    override fun setImage(manga: Manga) {
+        Glide.clear(view.thumbnail)
+        if (!manga.thumbnail_url.isNullOrEmpty()) {
+            Glide.with(view.context)
+                    .load(manga)
+                    .diskCacheStrategy(DiskCacheStrategy.SOURCE)
+                    .centerCrop()
+                    .dontAnimate()
+                    .skipMemoryCache(true)
+                    .placeholder(android.R.color.transparent)
+                    .into(view.thumbnail)
+        }
+    }
+
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CataloguePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CataloguePresenter.kt
index 03adb70e6..b6cb0bfa6 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CataloguePresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CataloguePresenter.kt
@@ -140,9 +140,7 @@ open class CataloguePresenter : BasePresenter<CatalogueFragment>() {
         this.query = query
         this.appliedFilters = filters
 
-        if (!isListMode) {
-            subscribeToMangaInitializer()
-        }
+        subscribeToMangaInitializer()
 
         // Create a new pager.
         pager = createPager(query, filters)
@@ -200,11 +198,7 @@ open class CataloguePresenter : BasePresenter<CatalogueFragment>() {
      */
     private fun setDisplayMode(asList: Boolean) {
         isListMode = asList
-        if (asList) {
-            initializerSubscription?.let { remove(it) }
-        } else {
-            subscribeToMangaInitializer()
-        }
+        subscribeToMangaInitializer()
     }
 
     /**
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
index c5bc50303..2d7e8a75b 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
@@ -91,7 +91,7 @@ class LibraryCategoryAdapter(val fragment: LibraryCategoryView) :
             }
             return LibraryGridHolder(view, this, fragment)
         } else {
-            val view = parent.inflate(R.layout.item_library_list)
+            val view = parent.inflate(R.layout.item_catalogue_list)
             return LibraryListHolder(view, this, fragment)
         }
     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt
index d0928262b..22dd444c9 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt
@@ -5,7 +5,7 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.ui.base.adapter.FlexibleViewHolder
-import kotlinx.android.synthetic.main.item_library_list.view.*
+import kotlinx.android.synthetic.main.item_catalogue_list.view.*
 
 /**
  * Class used to hold the displayed data of a manga in the library, like the cover or the title.
diff --git a/app/src/main/res/layout/item_catalogue_list.xml b/app/src/main/res/layout/item_catalogue_list.xml
index f9d1b20f8..dac38717a 100644
--- a/app/src/main/res/layout/item_catalogue_list.xml
+++ b/app/src/main/res/layout/item_catalogue_list.xml
@@ -1,17 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="?android:listPreferredItemHeightSmall"
+    android:layout_height="@dimen/material_component_lists_single_line_with_avatar_height"
     android:background="?attr/selectable_list_drawable">
 
-    <TextView
-        android:id="@+id/title"
-        style="@style/TextAppearance.Regular.Body1"
+    <de.hdodenhof.circleimageview.CircleImageView
+        android:id="@+id/thumbnail"
+        android:layout_width="@dimen/material_component_lists_single_line_with_avatar_height"
+        android:layout_height="@dimen/material_component_lists_single_line_with_avatar_height"
+        android:layout_gravity="center_vertical"
+        android:paddingEnd="0dp"
+        android:paddingLeft="@dimen/material_component_lists_icon_left_padding"
+        android:paddingRight="0dp"
+        android:paddingStart="@dimen/material_component_lists_icon_left_padding"
+        tools:src="@drawable/icon"/>
+
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:paddingLeft="?android:listPreferredItemPaddingLeft"
-        android:paddingRight="?android:listPreferredItemPaddingLeft"/>
+        android:paddingLeft="@dimen/material_component_lists_text_left_padding"
+        android:paddingStart="@dimen/material_component_lists_text_left_padding"
+        android:paddingRight="@dimen/material_component_lists_right_padding"
+        android:paddingEnd="@dimen/material_component_lists_right_padding">
+
+        <TextView
+            android:id="@+id/unread_text"
+            style="@style/TextAppearance.Regular.Caption.Hint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:paddingStart="4dp"
+            android:paddingLeft="4dp"
+            android:maxLines="1"
+            android:textAppearance="@style/TextAppearance.Regular.Caption.Hint"
+            android:visibility="gone"
+            tools:text="22"/>
+
+        <TextView
+            android:id="@+id/title"
+            style="@style/TextAppearance.Regular.SubHeading"
+            android:layout_toLeftOf="@id/unread_text"
+            android:layout_toStartOf="@id/unread_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:ellipsize="end"
+            tools:text="Manga title"/>
+
+    </RelativeLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_library_list.xml b/app/src/main/res/layout/item_library_list.xml
deleted file mode 100644
index d846ab9d0..000000000
--- a/app/src/main/res/layout/item_library_list.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/material_component_lists_single_line_with_avatar_height"
-    android:background="?attr/selectable_list_drawable">
-
-    <de.hdodenhof.circleimageview.CircleImageView
-        android:id="@+id/thumbnail"
-        android:layout_width="@dimen/material_component_lists_single_line_with_avatar_height"
-        android:layout_height="@dimen/material_component_lists_single_line_with_avatar_height"
-        android:layout_gravity="center_vertical"
-        android:paddingEnd="0dp"
-        android:paddingLeft="@dimen/material_component_lists_icon_left_padding"
-        android:paddingRight="0dp"
-        android:paddingStart="@dimen/material_component_lists_icon_left_padding"
-        tools:src="@drawable/icon"/>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:paddingLeft="@dimen/material_component_lists_text_left_padding"
-        android:paddingStart="@dimen/material_component_lists_text_left_padding"
-        android:paddingRight="@dimen/material_component_lists_right_padding"
-        android:paddingEnd="@dimen/material_component_lists_right_padding">
-
-        <TextView
-            android:id="@+id/unread_text"
-            style="@style/TextAppearance.Regular.Caption.Hint"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:paddingStart="4dp"
-            android:paddingLeft="4dp"
-            android:maxLines="1"
-            android:textAppearance="@style/TextAppearance.Regular.Caption.Hint"
-            tools:text="22"/>
-
-        <TextView
-            android:id="@+id/title"
-            style="@style/TextAppearance.Regular.SubHeading"
-            android:layout_toLeftOf="@id/unread_text"
-            android:layout_toStartOf="@id/unread_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:maxLines="1"
-            android:ellipsize="end"
-            tools:text="Manga title"/>
-
-    </RelativeLayout>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/library_list_recycler.xml b/app/src/main/res/layout/library_list_recycler.xml
index 8f5dc91b3..07f543f3d 100644
--- a/app/src/main/res/layout/library_list_recycler.xml
+++ b/app/src/main/res/layout/library_list_recycler.xml
@@ -5,5 +5,4 @@
     android:id="@+id/library_list"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:listitem="@layout/item_library_list" />
-
+    tools:listitem="@layout/item_catalogue_list" />