diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 816322011e..61196b7000 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -195,6 +195,7 @@ dependencies {
     implementation("me.zhanghai.android.systemuihelper:library:1.0.0")
     implementation("com.nightlynexus.viewstatepageradapter:viewstatepageradapter:1.1.0")
     implementation("com.github.mthli:Slice:v1.2")
+    implementation("com.reddit:indicator-fast-scroll:1.2.1")
 
     implementation("com.github.kizitonwose:AndroidTagGroup:1.6.0")
     implementation("com.github.chrisbanes:PhotoView:2.3.0")
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHolder.kt
index e04b4795dc..e3c9c13d92 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHolder.kt
@@ -7,6 +7,7 @@ import eu.kanade.tachiyomi.data.download.model.Download
 import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
 import eu.kanade.tachiyomi.util.system.getResourceColor
 import eu.kanade.tachiyomi.util.view.setVectorCompat
+import eu.kanade.tachiyomi.util.view.visibleIf
 import kotlinx.android.synthetic.main.download_item.*
 
 /**
@@ -51,6 +52,7 @@ class DownloadHolder(private val view: View, val adapter: DownloadAdapter) :
             notifyDownloadedPages()
         }
 
+        migration_menu.visibleIf(adapterPosition != 0 || adapterPosition != adapter.itemCount - 1)
         migration_menu.setVectorCompat(
             R.drawable.ic_more_vert_black_24dp, view.context
             .getResourceColor(R.attr.icon_color))
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
index da6845dd12..fe9b438fdf 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
@@ -47,7 +47,7 @@ class LibraryItem(
         val parent = adapter.recyclerView
         return if (parent is AutofitRecyclerView) {
             val libraryLayout = libraryLayout.getOrDefault()
-            val isFixedSize = true // fixedSize.getOrDefault()
+            val isFixedSize = fixedSize.getOrDefault()
             if (libraryLayout == 0 || manga.isBlank()) {
                 LibraryListHolder(view, adapter as LibraryCategoryAdapter)
             } else {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaHolder.kt
index b8df783533..89c86e41ae 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentMangaHolder.kt
@@ -37,9 +37,9 @@ class RecentMangaHolder(
 
     fun bind(item: RecentMangaItem) {
         download_button.visibleIf(item.mch.manga.source != LocalSource.ID)
-        title.text = item.mch.manga.title
+        subtitle.text = item.mch.manga.title
         val isSearch = adapter.delegate.isSearching()
-        subtitle.text = item.chapter.name
+        title.text = item.chapter.name
         val notValidNum = item.mch.chapter.chapter_number <= 0
         body.text = when {
             item.mch.chapter.id == null -> body.context.getString(
diff --git a/app/src/main/res/layout/catalogue_list_item.xml b/app/src/main/res/layout/catalogue_list_item.xml
index 0cbfa71008..7d764b1068 100644
--- a/app/src/main/res/layout/catalogue_list_item.xml
+++ b/app/src/main/res/layout/catalogue_list_item.xml
@@ -37,29 +37,6 @@
             tools:ignore="ContentDescription"
             tools:src="@mipmap/ic_launcher" />
 
-        <FrameLayout
-            android:id="@+id/play_layout"
-            android:layout_width="55dp"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:clickable="true"
-            android:focusable="true"
-            android:visibility="gone"
-            tools:visibility="visible">
-
-            <ImageView
-                android:id="@+id/play_button"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:layout_gravity="center"
-                android:background="@drawable/round_play_background"
-                android:contentDescription="@string/start_reading"
-                android:padding="6dp"
-                android:src="@drawable/ic_start_reading_white_24dp"
-                android:tint="@android:color/white" />
-
-        </FrameLayout>
-
         <ProgressBar
             android:id="@+id/progress"
             style="?android:attr/progressBarStyleSmall"
@@ -87,7 +64,7 @@
         android:textColor="?android:attr/textColorPrimary"
         android:textSize="16sp"
         app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toStartOf="@+id/badge_view"
+        app:layout_constraintEnd_toStartOf="@+id/play_layout"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@+id/card"
         app:layout_constraintTop_toTopOf="parent"
@@ -106,13 +83,41 @@
         android:textColor="?android:attr/textColorSecondary"
         android:textSize="14sp"
         app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toStartOf="@+id/badge_view"
+        app:layout_constraintEnd_toStartOf="@+id/play_layout"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="@+id/title"
         app:layout_constraintTop_toBottomOf="@+id/title"
         app:layout_constraintVertical_bias="0.0"
         tools:text="Manga artist" />
 
+    <FrameLayout
+        android:id="@+id/play_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="55dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="6dp"
+        android:layout_gravity="center"
+        app:layout_constraintEnd_toStartOf="@id/badge_view"
+        app:layout_constraintTop_toTopOf="@id/badge_view"
+        app:layout_constraintBottom_toBottomOf="@id/badge_view"
+        android:layout_marginEnd="8dp"
+        android:clickable="true"
+        android:focusable="true"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <ImageView
+            android:id="@+id/play_button"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_gravity="center"
+            android:background="@drawable/round_play_background"
+            android:contentDescription="@string/start_reading"
+            android:padding="6dp"
+            android:src="@drawable/ic_start_reading_white_24dp"
+            android:tint="@android:color/white" />
+
+    </FrameLayout>
 
     <include layout="@layout/unread_download_badge"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/display_bottom_sheet.xml b/app/src/main/res/layout/display_bottom_sheet.xml
index 5706bf2090..2797cd3922 100644
--- a/app/src/main/res/layout/display_bottom_sheet.xml
+++ b/app/src/main/res/layout/display_bottom_sheet.xml
@@ -92,7 +92,6 @@
             <com.google.android.material.checkbox.MaterialCheckBox
                 android:id="@+id/uniform_grid"
                 android:layout_width="match_parent"
-                android:visibility="gone"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="12dp"
                 android:layout_marginEnd="12dp"
diff --git a/app/src/main/res/layout/download_item.xml b/app/src/main/res/layout/download_item.xml
index 3091f2f8b6..343aea35f8 100644
--- a/app/src/main/res/layout/download_item.xml
+++ b/app/src/main/res/layout/download_item.xml
@@ -18,6 +18,7 @@
             android:layout_height="24dp"
             android:tint="@color/md_white_1000"
             android:layout_gravity="end|center"
+            android:contentDescription="@string/action_cancel"
             android:layout_marginEnd="21dp"
             android:src="@drawable/ic_close_white_24dp" />
     </FrameLayout>
@@ -33,6 +34,7 @@
             android:id="@+id/close_left"
             android:layout_width="24dp"
             android:layout_height="24dp"
+            android:contentDescription="@string/action_cancel"
             android:layout_gravity="start|center"
             android:layout_marginStart="21dp"
             android:tint="@color/md_white_1000"
@@ -57,7 +59,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_drag_handle_black_24dp" />
+            app:srcCompat="@drawable/ic_reorder_grey_24dp" />
 
         <TextView
             android:id="@+id/manga_full_title"
@@ -83,6 +85,7 @@
             android:maxLines="1"
             android:textAppearance="@style/TextAppearance.Regular.Caption"
             app:layout_constraintEnd_toStartOf="@+id/migration_menu"
+            android:layout_marginEnd="16dp"
             app:layout_constraintStart_toStartOf="@+id/manga_full_title"
             app:layout_constraintTop_toBottomOf="@+id/manga_full_title"
             tools:text="Chapter Title" />
@@ -96,6 +99,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/migration_menu"
             app:layout_constraintStart_toEndOf="@+id/reorder"
+            android:layout_marginEnd="16dp"
             app:layout_constraintTop_toBottomOf="@+id/chapter_title" />
 
         <TextView
@@ -106,6 +110,7 @@
             android:maxLines="1"
             android:textAppearance="@style/TextAppearance.Regular.Caption.Hint"
             app:layout_constraintBottom_toBottomOf="@+id/manga_full_title"
+            android:layout_marginEnd="16dp"
             app:layout_constraintEnd_toStartOf="@+id/migration_menu"
             app:layout_constraintTop_toTopOf="@+id/manga_full_title"
             tools:text="(0/10)" />