diff --git a/app/build.gradle b/app/build.gradle
index 0ce8c6997..5148e061c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,7 +43,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:3.1.2'
+    implementation 'com.simplemobiletools:commons:3.1.3'
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.8.0'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.4.0'
     implementation 'com.android.support:multidex:1.0.2'
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
index 68e9da258..44f01058e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
@@ -319,8 +319,8 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
     private fun checkIfColorChanged() {
         if (directories_grid.adapter != null && getRecyclerAdapter().primaryColor != config.primaryColor) {
             getRecyclerAdapter().primaryColor = config.primaryColor
-            directories_vertical_fastscroller.updateHandleColor()
-            directories_horizontal_fastscroller.updateHandleColor()
+            directories_vertical_fastscroller.updatePrimaryColor()
+            directories_horizontal_fastscroller.updatePrimaryColor()
         }
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
index 0b5622186..25e32a347 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
@@ -165,8 +165,8 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
     private fun checkIfColorChanged() {
         if (media_grid.adapter != null && getRecyclerAdapter().primaryColor != config.primaryColor) {
             getRecyclerAdapter().primaryColor = config.primaryColor
-            media_horizontal_fastscroller.updateHandleColor()
-            media_vertical_fastscroller.updateHandleColor()
+            media_horizontal_fastscroller.updatePrimaryColor()
+            media_vertical_fastscroller.updatePrimaryColor()
         }
     }
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 073f3fd19..828d2689b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -50,13 +50,7 @@
             android:paddingLeft="@dimen/normal_margin"
             android:paddingStart="@dimen/normal_margin">
 
-            <ImageView
-                android:id="@+id/fastscroller_handle_vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:alpha="0"
-                android:background="@drawable/fastscroller_handle_vertical"/>
+            <include layout="@layout/fastscroller_handle_vertical"/>
 
         </com.simplemobiletools.commons.views.FastScroller>
 
diff --git a/app/src/main/res/layout/activity_media.xml b/app/src/main/res/layout/activity_media.xml
index 95bc05417..6741e00fe 100644
--- a/app/src/main/res/layout/activity_media.xml
+++ b/app/src/main/res/layout/activity_media.xml
@@ -50,13 +50,7 @@
             android:paddingLeft="@dimen/normal_margin"
             android:paddingStart="@dimen/normal_margin">
 
-            <ImageView
-                android:id="@+id/fastscroller_handle_vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:alpha="0"
-                android:background="@drawable/fastscroller_handle_vertical"/>
+            <include layout="@layout/fastscroller_handle_vertical"/>
 
         </com.simplemobiletools.commons.views.FastScroller>
 
diff --git a/app/src/main/res/layout/dialog_directory_picker.xml b/app/src/main/res/layout/dialog_directory_picker.xml
index 6265d6d8b..824e8db82 100644
--- a/app/src/main/res/layout/dialog_directory_picker.xml
+++ b/app/src/main/res/layout/dialog_directory_picker.xml
@@ -24,13 +24,7 @@
         android:paddingLeft="@dimen/normal_margin"
         android:paddingStart="@dimen/normal_margin">
 
-        <ImageView
-            android:id="@+id/fastscroller_handle_vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:alpha="0"
-            android:background="@drawable/fastscroller_handle_vertical"/>
+        <include layout="@layout/fastscroller_handle_vertical"/>
 
     </com.simplemobiletools.commons.views.FastScroller>
 
diff --git a/app/src/main/res/layout/dialog_medium_picker.xml b/app/src/main/res/layout/dialog_medium_picker.xml
index 07e7f7678..01b630a1d 100644
--- a/app/src/main/res/layout/dialog_medium_picker.xml
+++ b/app/src/main/res/layout/dialog_medium_picker.xml
@@ -23,13 +23,7 @@
         android:paddingLeft="@dimen/normal_margin"
         android:paddingStart="@dimen/normal_margin">
 
-        <ImageView
-            android:id="@+id/fastscroller_handle_vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:alpha="0"
-            android:background="@drawable/fastscroller_handle_vertical"/>
+        <include layout="@layout/fastscroller_handle_vertical"/>
 
     </com.simplemobiletools.commons.views.FastScroller>