diff --git a/app/src/main/res/drawable/list_thumb.xml b/app/src/main/res/drawable/list_thumb.xml
new file mode 100644
index 000000000..06674b69d
--- /dev/null
+++ b/app/src/main/res/drawable/list_thumb.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:drawable="@drawable/thumb" android:state_pressed="true" />
+
+	<item android:drawable="@drawable/thumb" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/list_track.xml b/app/src/main/res/drawable/list_track.xml
new file mode 100644
index 000000000..532264d4e
--- /dev/null
+++ b/app/src/main/res/drawable/list_track.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:drawable="@drawable/track" android:state_pressed="true" />
+
+	<item android:drawable="@drawable/track" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/thumb.xml b/app/src/main/res/drawable/thumb.xml
new file mode 100644
index 000000000..71e0a8113
--- /dev/null
+++ b/app/src/main/res/drawable/thumb.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+
+	<corners android:radius="50dp" />
+
+	<padding
+		android:paddingLeft="22dp"
+		android:paddingRight="22dp" />
+
+	<solid android:color="?colorPrimaryDark" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/track.xml b/app/src/main/res/drawable/track.xml
new file mode 100644
index 000000000..ebffeab9b
--- /dev/null
+++ b/app/src/main/res/drawable/track.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+
+	<solid android:color="@android:color/darker_gray" />
+
+	<padding
+		android:bottom="10dp"
+		android:left="10dp"
+		android:right="10dp"
+		android:top="10dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout-w600dp/fragment_list.xml b/app/src/main/res/layout-w600dp/fragment_list.xml
index 2672a6cd6..c0c281ce0 100644
--- a/app/src/main/res/layout-w600dp/fragment_list.xml
+++ b/app/src/main/res/layout-w600dp/fragment_list.xml
@@ -3,15 +3,15 @@
 	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:orientation="horizontal"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:animateLayoutChanges="true">
+	android:animateLayoutChanges="true"
+	android:orientation="horizontal">
 
 	<FrameLayout
 		android:layout_width="0dp"
-		android:layout_weight="1"
-		android:layout_height="match_parent">
+		android:layout_height="match_parent"
+		android:layout_weight="1">
 
 		<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 			android:id="@+id/swipeRefreshLayout"
@@ -24,6 +24,11 @@
 				android:layout_height="match_parent"
 				android:orientation="vertical"
 				android:scrollbars="vertical"
+				app:fastScrollEnabled="true"
+				app:fastScrollHorizontalThumbDrawable="@drawable/list_thumb"
+				app:fastScrollHorizontalTrackDrawable="@drawable/list_track"
+				app:fastScrollVerticalThumbDrawable="@drawable/list_thumb"
+				app:fastScrollVerticalTrackDrawable="@drawable/list_track"
 				app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
 				tools:listitem="@layout/item_manga_list" />
 
@@ -45,8 +50,8 @@
 				android:layout_height="wrap_content"
 				android:layout_gravity="center"
 				android:gravity="center"
-				android:textColor="?android:textColorSecondary"
 				android:textAppearance="?android:textAppearanceMedium"
+				android:textColor="?android:textColorSecondary"
 				tools:text="@tools:sample/lorem[3]" />
 
 		</LinearLayout>
@@ -61,21 +66,21 @@
 	</FrameLayout>
 
 	<View
-		android:layout_width="1dp"
 		android:id="@+id/divider_filter"
-		android:visibility="gone"
+		android:layout_width="1dp"
 		android:layout_height="match_parent"
-		android:background="?dividerVertical" />
+		android:background="?dividerVertical"
+		android:visibility="gone" />
 
 	<androidx.recyclerview.widget.RecyclerView
 		android:id="@+id/recyclerView_filter"
 		android:layout_width="240dp"
 		android:layout_height="match_parent"
 		android:layout_gravity="end"
-		android:visibility="gone"
 		android:background="?android:windowBackground"
 		android:orientation="vertical"
 		android:scrollbars="vertical"
+		android:visibility="gone"
 		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
 		tools:listitem="@layout/item_category_checkable" />
 
diff --git a/app/src/main/res/layout/fragment_chapters.xml b/app/src/main/res/layout/fragment_chapters.xml
index 98874732e..c4671d8c2 100644
--- a/app/src/main/res/layout/fragment_chapters.xml
+++ b/app/src/main/res/layout/fragment_chapters.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
@@ -11,6 +12,11 @@
 		android:layout_height="match_parent"
 		android:orientation="vertical"
 		android:scrollbars="vertical"
+		app:fastScrollEnabled="true"
+		app:fastScrollHorizontalThumbDrawable="@drawable/list_thumb"
+		app:fastScrollHorizontalTrackDrawable="@drawable/list_track"
+		app:fastScrollVerticalThumbDrawable="@drawable/list_thumb"
+		app:fastScrollVerticalTrackDrawable="@drawable/list_track"
 		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
 		tools:listitem="@layout/item_chapter" />
 
diff --git a/app/src/main/res/layout/fragment_list.xml b/app/src/main/res/layout/fragment_list.xml
index 30f7d4e5b..51caa6c05 100644
--- a/app/src/main/res/layout/fragment_list.xml
+++ b/app/src/main/res/layout/fragment_list.xml
@@ -1,72 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout
+<LinearLayout
 	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:id="@+id/drawer"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:orientation="vertical">
 
-	<FrameLayout
+	<androidx.drawerlayout.widget.DrawerLayout
+		android:id="@+id/drawer"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent">
 
-		<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-			android:id="@+id/swipeRefreshLayout"
+		<FrameLayout
 			android:layout_width="match_parent"
 			android:layout_height="match_parent">
 
-			<androidx.recyclerview.widget.RecyclerView
-				android:id="@+id/recyclerView"
+			<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+				android:id="@+id/swipeRefreshLayout"
 				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:orientation="vertical"
-				android:scrollbars="vertical"
-				app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-				tools:listitem="@layout/item_manga_list" />
+				android:layout_height="match_parent">
 
-		</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+				<androidx.recyclerview.widget.RecyclerView
+					android:id="@+id/recyclerView"
+					android:layout_width="match_parent"
+					android:layout_height="match_parent"
+					android:orientation="vertical"
+					android:scrollbars="vertical"
+					app:fastScrollEnabled="true"
+					app:fastScrollHorizontalThumbDrawable="@drawable/list_thumb"
+					app:fastScrollHorizontalTrackDrawable="@drawable/list_track"
+					app:fastScrollVerticalThumbDrawable="@drawable/list_thumb"
+					app:fastScrollVerticalTrackDrawable="@drawable/list_track"
+					app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+					tools:listitem="@layout/item_manga_list" />
 
-		<LinearLayout
-			android:id="@+id/layout_holder"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center"
-			android:layout_marginStart="20dp"
-			android:layout_marginEnd="20dp"
-			android:gravity="center_horizontal"
-			android:orientation="vertical">
+			</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-			<TextView
-				android:id="@+id/textView_holder"
+			<LinearLayout
+				android:id="@+id/layout_holder"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_gravity="center"
-				android:gravity="center"
-				android:textAppearance="?android:textAppearanceMedium"
-				android:textColor="?android:textColorSecondary"
-				tools:text="@tools:sample/lorem[3]" />
+				android:layout_marginStart="20dp"
+				android:layout_marginEnd="20dp"
+				android:gravity="center_horizontal"
+				android:orientation="vertical">
 
-		</LinearLayout>
+				<TextView
+					android:id="@+id/textView_holder"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center"
+					android:gravity="center"
+					android:textAppearance="?android:textAppearanceMedium"
+					android:textColor="?android:textColorSecondary"
+					tools:text="@tools:sample/lorem[3]" />
 
-		<ProgressBar
-			android:id="@+id/progressBar"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center"
-			android:indeterminate="true" />
+			</LinearLayout>
 
-	</FrameLayout>
+			<ProgressBar
+				android:id="@+id/progressBar"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:indeterminate="true" />
 
-	<androidx.recyclerview.widget.RecyclerView
-		android:id="@+id/recyclerView_filter"
-		android:layout_width="240dp"
-		android:layout_height="match_parent"
-		android:layout_gravity="end"
-		android:background="?android:windowBackground"
-		android:orientation="vertical"
-		android:scrollbars="vertical"
-		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-		tools:listitem="@layout/item_category_checkable" />
+		</FrameLayout>
 
-</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
+		<androidx.recyclerview.widget.RecyclerView
+			android:id="@+id/recyclerView_filter"
+			android:layout_width="240dp"
+			android:layout_height="match_parent"
+			android:layout_gravity="end"
+			android:background="?android:windowBackground"
+			android:orientation="vertical"
+			android:scrollbars="vertical"
+			app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+			tools:listitem="@layout/item_category_checkable" />
+
+	</androidx.drawerlayout.widget.DrawerLayout>
+</LinearLayout>
\ No newline at end of file