diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt
index c1ac6ef60..b9ceb7643 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt
@@ -64,17 +64,17 @@ open class ExtensionController :
     override fun onViewCreated(view: View) {
         super.onViewCreated(view)
 
-        binding.extSwipeRefresh.isRefreshing = true
-        binding.extSwipeRefresh.refreshes()
+        binding.swipeRefresh.isRefreshing = true
+        binding.swipeRefresh.refreshes()
             .onEach { presenter.findAvailableExtensions() }
             .launchIn(scope)
 
         // Initialize adapter, scroll listener and recycler views
         adapter = ExtensionAdapter(this)
         // Create recycler and set adapter.
-        binding.extRecycler.layoutManager = LinearLayoutManager(view.context)
-        binding.extRecycler.adapter = adapter
-        binding.extRecycler.addItemDecoration(ExtensionDividerItemDecoration(view.context))
+        binding.recycler.layoutManager = LinearLayoutManager(view.context)
+        binding.recycler.adapter = adapter
+        binding.recycler.addItemDecoration(ExtensionDividerItemDecoration(view.context))
         adapter?.fastScroller = binding.fastScroller
     }
 
@@ -176,7 +176,7 @@ open class ExtensionController :
     }
 
     fun setExtensions(extensions: List<ExtensionItem>) {
-        binding.extSwipeRefresh.isRefreshing = false
+        binding.swipeRefresh.isRefreshing = false
         this.extensions = extensions
         drawExtensions()
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryController.kt
index fa7d248b2..7dfd592c3 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryController.kt
@@ -64,6 +64,7 @@ class HistoryController :
         adapter = HistoryAdapter(this@HistoryController)
         binding.recycler.setHasFixedSize(true)
         binding.recycler.adapter = adapter
+        adapter?.fastScroller = binding.fastScroller
     }
 
     override fun onDestroyView(view: View) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesController.kt
index c4e7ad350..0b113f134 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesController.kt
@@ -93,6 +93,7 @@ class UpdatesController :
         binding.recycler.setHasFixedSize(true)
         adapter = UpdatesAdapter(this@UpdatesController)
         binding.recycler.adapter = adapter
+        adapter?.fastScroller = binding.fastScroller
 
         binding.recycler.scrollStateChanges()
             .onEach {
diff --git a/app/src/main/res/layout/extension_controller.xml b/app/src/main/res/layout/extension_controller.xml
index 80aaf9c5d..a88b50c94 100644
--- a/app/src/main/res/layout/extension_controller.xml
+++ b/app/src/main/res/layout/extension_controller.xml
@@ -6,12 +6,12 @@
     android:layout_height="match_parent">
 
     <eu.kanade.tachiyomi.widget.ThemedSwipeRefreshLayout
-        android:id="@+id/ext_swipe_refresh"
+        android:id="@+id/swipe_refresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
         <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/ext_recycler"
+            android:id="@+id/recycler"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:listitem="@layout/source_main_controller_card_header" />
diff --git a/app/src/main/res/layout/history_controller.xml b/app/src/main/res/layout/history_controller.xml
index afe7ebfba..fd78bd0a6 100644
--- a/app/src/main/res/layout/history_controller.xml
+++ b/app/src/main/res/layout/history_controller.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -12,6 +13,14 @@
         android:clipToPadding="false"
         tools:listitem="@layout/history_item" />
 
+    <eu.kanade.tachiyomi.ui.library.MaterialFastScroll
+        android:id="@+id/fast_scroller"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="end"
+        app:fastScrollerBubbleEnabled="false"
+        tools:visibility="visible" />
+
     <eu.kanade.tachiyomi.widget.EmptyView
         android:id="@+id/empty_view"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/updates_controller.xml b/app/src/main/res/layout/updates_controller.xml
index f29c740b9..4a53d0cc3 100644
--- a/app/src/main/res/layout/updates_controller.xml
+++ b/app/src/main/res/layout/updates_controller.xml
@@ -19,6 +19,14 @@
             android:paddingBottom="@dimen/action_toolbar_list_padding"
             tools:listitem="@layout/updates_item" />
 
+        <eu.kanade.tachiyomi.ui.library.MaterialFastScroll
+            android:id="@+id/fast_scroller"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="end"
+            app:fastScrollerBubbleEnabled="false"
+            tools:visibility="visible" />
+
         <eu.kanade.tachiyomi.widget.ActionToolbar
             android:id="@+id/action_toolbar"
             android:layout_width="match_parent"