diff --git a/app/build.gradle b/app/build.gradle
index 4013443c..bcd3e77b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -78,6 +78,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-perf:19.0.8'
     implementation 'com.github.arimorty:floatingsearchview:2.1.1'
     implementation 'com.github.clans:fab:1.6.4'
+    //implementation 'com.quiph.ui:recyclerviewfastscroller:0.2.1'
     //noinspection GradleDependency
     implementation 'com.squareup.okhttp3:okhttp:3.12.12'
     implementation 'com.github.bumptech.glide:glide:4.11.0'
diff --git a/app/libs/recyclerviewfastscroller-release.aar b/app/libs/recyclerviewfastscroller-release.aar
new file mode 100644
index 00000000..4484c737
Binary files /dev/null and b/app/libs/recyclerviewfastscroller-release.aar differ
diff --git a/app/src/main/res/layout-v23/activity_main_content.xml b/app/src/main/res/layout-v23/activity_main_content.xml
index ae65fe45..29dbc53d 100644
--- a/app/src/main/res/layout-v23/activity_main_content.xml
+++ b/app/src/main/res/layout-v23/activity_main_content.xml
@@ -63,18 +63,22 @@
             android:text="@string/main_no_result"
             android:visibility="invisible"/>
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/main_recyclerview"
+        <com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingTop="64dp"
-            android:clipToPadding="false"
-            app:fastScrollEnabled="true"
-            app:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"
-            app:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable"
-            app:fastScrollHorizontalTrackDrawable="@drawable/track_drawable"
-            app:fastScrollVerticalTrackDrawable="@drawable/track_drawable"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
+            app:handleHeight="100dp"
+            app:addLastItemPadding="true"
+            app:popupDrawable="@color/transparent">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/main_recyclerview"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingTop="64dp"
+                android:clipToPadding="false"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
+
+        </com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller>
 
         <com.github.clans.fab.FloatingActionMenu
             android:id="@+id/main_fab"
diff --git a/app/src/main/res/layout/activity_main_content.xml b/app/src/main/res/layout/activity_main_content.xml
index ef5c80b2..8b9d2733 100644
--- a/app/src/main/res/layout/activity_main_content.xml
+++ b/app/src/main/res/layout/activity_main_content.xml
@@ -63,18 +63,22 @@
             android:text="@string/main_no_result"
             android:visibility="invisible"/>
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/main_recyclerview"
+        <com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingTop="64dp"
-            android:clipToPadding="false"
-            app:fastScrollEnabled="true"
-            app:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"
-            app:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable"
-            app:fastScrollHorizontalTrackDrawable="@drawable/track_drawable"
-            app:fastScrollVerticalTrackDrawable="@drawable/track_drawable"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
+            app:handleHeight="100dp"
+            app:addLastItemPadding="true"
+            app:popupDrawable="@color/transparent">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/main_recyclerview"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingTop="64dp"
+                android:clipToPadding="false"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
+
+        </com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller>
 
         <com.github.clans.fab.FloatingActionMenu
                 android:id="@+id/main_fab"
diff --git a/app/src/main/res/layout/activity_reader.xml b/app/src/main/res/layout/activity_reader.xml
index 5bf25441..b8ad0d56 100644
--- a/app/src/main/res/layout/activity_reader.xml
+++ b/app/src/main/res/layout/activity_reader.xml
@@ -26,16 +26,20 @@
     android:background="@color/dark_gray"
     tools:context=".ui.ReaderActivity">
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/reader_recyclerview"
+    <com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:fastScrollEnabled="true"
-        app:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"
-        app:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable"
-        app:fastScrollHorizontalTrackDrawable="@drawable/track_drawable"
-        app:fastScrollVerticalTrackDrawable="@drawable/track_drawable"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
+        app:handleHeight="100dp"
+        app:addLastItemPadding="true"
+        app:popupDrawable="@color/transparent">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/reader_recyclerview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
+
+    </com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller>
 
     <LinearLayout
         android:layout_width="match_parent"