diff --git a/.editorconfig b/.editorconfig
index ab724a305..e52454a9d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,7 +5,7 @@ charset = utf-8
 end_of_line = lf
 indent_size = 4
 indent_style = tab
-insert_final_newline = true
+insert_final_newline = false
 max_line_length = 120
 tab_width = 4
 
diff --git a/app/src/main/res/drawable/thumb.xml b/app/src/main/res/drawable/thumb.xml
index 8d1b235a1..3aef507f4 100644
--- a/app/src/main/res/drawable/thumb.xml
+++ b/app/src/main/res/drawable/thumb.xml
@@ -3,12 +3,14 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:shape="rectangle">
 
-	<corners android:radius="50dp" />
+	<corners android:radius="10dp" />
 
 	<padding
-		android:paddingLeft="22dp"
-		android:paddingRight="22dp" />
+		android:bottom="10dp"
+		android:left="10dp"
+		android:right="10dp"
+		android:top="10dp" />
 
-	<solid android:color="?colorPrimary" />
+	<solid android:color="@color/scrollbar" />
 
 </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
index ebffeab9b..00bd82d2e 100644
--- a/app/src/main/res/drawable/track.xml
+++ b/app/src/main/res/drawable/track.xml
@@ -1,13 +1,4 @@
 <?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
+	android:shape="rectangle" />
\ 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 cc60564d7..38ca57381 100644
--- a/app/src/main/res/layout-w600dp/fragment_list.xml
+++ b/app/src/main/res/layout-w600dp/fragment_list.xml
@@ -20,13 +20,8 @@
 			android:layout_height="match_parent"
 			android:orientation="vertical"
 			android:padding="@dimen/grid_spacing_outer"
-			android:scrollbarStyle="outsideOverlay"
 			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" />
 
diff --git a/app/src/main/res/layout/fragment_chapters.xml b/app/src/main/res/layout/fragment_chapters.xml
index 72b02995e..33508fba8 100644
--- a/app/src/main/res/layout/fragment_chapters.xml
+++ b/app/src/main/res/layout/fragment_chapters.xml
@@ -28,12 +28,7 @@
 		android:layout_alignParentBottom="true"
 		android:clipToPadding="false"
 		android:orientation="vertical"
-		android:scrollbarStyle="outsideOverlay"
 		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 2cc769f1a..e74dc8654 100644
--- a/app/src/main/res/layout/fragment_list.xml
+++ b/app/src/main/res/layout/fragment_list.xml
@@ -18,13 +18,8 @@
 			android:clipToPadding="false"
 			android:orientation="vertical"
 			android:padding="@dimen/grid_spacing_outer"
-			android:scrollbarStyle="outsideOverlay"
 			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" />
 
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 57976b76a..da4b44148 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -8,5 +8,6 @@
 	<color name="errorContainer">#930006</color>
 	<color name="onError">#680003</color>
 	<color name="onErrorContainer">#FFDAD4</color>
+	<color name="scrollbar">#66FFFFFF</color>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c68f94bc0..0ff097af8 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -22,5 +22,6 @@
 	<color name="grey_dark">#212121</color>
 	<color name="dim">#99000000</color>
 	<color name="shadow">#99000000</color>
+	<color name="scrollbar">#66000000</color>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2ae182b95..f090d4012 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -174,11 +174,12 @@
     <string name="black_dark_theme">Black</string>
     <string name="black_dark_theme_summary">Uses less power on AMOLED screens</string>
     <string name="restart_required">Restart required</string>
-    <string name="backup_restore"><![CDATA[Backup and restore]]></string>
+    <string name="backup_restore">Backup and restore</string>
     <string name="create_backup">Create data backup</string>
     <string name="restore_backup">Restore from backup</string>
     <string name="data_restored">Restored</string>
     <string name="preparing_">Preparing…</string>
+	<string name="report_github">Create issue on GitHub</string>
     <string name="file_not_found">File not found</string>
     <string name="data_restored_success">All data was restored</string>
     <string name="data_restored_with_errors">The data was restored, but there are errors</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index fd4d5d283..a7593b677 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -84,6 +84,14 @@
 		<item name="rippleColor">@null</item>
 	</style>
 
+	<style name="Widget.Kotatsu.RecyclerView" parent="">
+		<item name="fastScrollHorizontalThumbDrawable">@drawable/list_thumb</item>
+		<item name="fastScrollVerticalThumbDrawable">@drawable/list_thumb</item>
+		<item name="fastScrollHorizontalTrackDrawable">@drawable/list_track</item>
+		<item name="fastScrollVerticalTrackDrawable">@drawable/list_track</item>
+		<item name="android:scrollbarStyle">outsideOverlay</item>
+	</style>
+
 	<style name="ThemeOverlay.Kotatsu.Switch" parent="">
 		<item name="elevationOverlayEnabled">@bool/elevation_overlay_enabled</item>
 	</style>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 46ad0e12f..ac59adba4 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -67,6 +67,7 @@
 		<item name="tabStyle">@style/Widget.Kotatsu.Tabs</item>
 		<item name="switchStyle">@style/Widget.Kotatsu.Switch</item>
 		<item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
+		<item name="recyclerViewStyle">@style/Widget.Kotatsu.RecyclerView</item>
 
 		<!-- Preference text appearance -->
 		<item name="android:textAppearanceListItem">?attr/textAppearanceBodyLarge</item>