diff --git a/app/src/main/res/layout/all_episodes_fragment.xml b/app/src/main/res/layout/all_episodes_fragment.xml
index 2159f64c6..53636c2b6 100644
--- a/app/src/main/res/layout/all_episodes_fragment.xml
+++ b/app/src/main/res/layout/all_episodes_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    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="vertical"
     android:layout_width="match_parent"
@@ -26,7 +27,11 @@
         android:clipToPadding="false"
         android:paddingTop="@dimen/list_vertical_padding"
         android:paddingBottom="@dimen/list_vertical_padding"
-        android:scrollbarStyle="outsideOverlay"
+        app:fastScrollEnabled="true"
+        app:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"
+        app:fastScrollHorizontalTrackDrawable="@drawable/line_drawable"
+        app:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable"
+        app:fastScrollVerticalTrackDrawable="@drawable/line_drawable"
         tools:itemCount="13"
         tools:listitem="@layout/new_episodes_listitem" />
 
diff --git a/core/src/main/res/drawable/line.xml b/core/src/main/res/drawable/line.xml
new file mode 100644
index 000000000..1d5362840
--- /dev/null
+++ b/core/src/main/res/drawable/line.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+
+    <solid android:color="#33666666"/>
+
+    <padding
+            android:top="10dp"
+            android:left="10dp"
+            android:right="10dp"
+            android:bottom="10dp"/>
+</shape>
diff --git a/core/src/main/res/drawable/line_drawable.xml b/core/src/main/res/drawable/line_drawable.xml
new file mode 100644
index 000000000..503179b12
--- /dev/null
+++ b/core/src/main/res/drawable/line_drawable.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+            android:state_pressed="true"
+            android:drawable="@drawable/line"/>
+
+    <item
+            android:drawable="@drawable/line"/>
+</selector>
diff --git a/core/src/main/res/drawable/thumb.xml b/core/src/main/res/drawable/thumb.xml
new file mode 100644
index 000000000..0416c8be9
--- /dev/null
+++ b/core/src/main/res/drawable/thumb.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+
+    <padding
+            android:paddingLeft="22dp"
+            android:paddingRight="22dp" />
+
+    <solid android:color="#99666666" />
+
+</shape>
diff --git a/core/src/main/res/drawable/thumb_drawable.xml b/core/src/main/res/drawable/thumb_drawable.xml
new file mode 100644
index 000000000..37e7c4896
--- /dev/null
+++ b/core/src/main/res/drawable/thumb_drawable.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+            android:state_pressed="true"
+            android:drawable="@drawable/thumb"/>
+
+    <item
+            android:drawable="@drawable/thumb"/>
+</selector>