diff --git a/app/build.gradle b/app/build.gradle
index 6870b205f..f0f70f55e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,7 +43,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:3.1.7'
+    implementation 'com.simplemobiletools:commons:3.1.9'
     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 89f8e1fbf..97d94af1e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
@@ -583,7 +583,10 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
         directories_horizontal_fastscroller.beVisibleIf(allowHorizontalScroll)
 
         if (allowHorizontalScroll) {
-            directories_horizontal_fastscroller.setViews(directories_grid, directories_refresh_layout)
+            directories_horizontal_fastscroller.allowBubbleDisplay = config.showInfoBubble
+            directories_horizontal_fastscroller.setViews(directories_grid, directories_refresh_layout) {
+                directories_horizontal_fastscroller.updateBubbleText(mDirs[it].getBubbleText())
+            }
         } else {
             directories_vertical_fastscroller.allowBubbleDisplay = config.showInfoBubble
             directories_vertical_fastscroller.setViews(directories_grid, directories_refresh_layout) {
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 9da4e2278..5561de9bb 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
@@ -203,7 +203,10 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
         media_horizontal_fastscroller.beVisibleIf(allowHorizontalScroll)
 
         if (allowHorizontalScroll) {
-            media_horizontal_fastscroller.setViews(media_grid, media_refresh_layout)
+            media_horizontal_fastscroller.allowBubbleDisplay = config.showInfoBubble
+            media_horizontal_fastscroller.setViews(media_grid, media_refresh_layout) {
+                media_horizontal_fastscroller.updateBubbleText(mMedia[it].getBubbleText())
+            }
         } else {
             media_vertical_fastscroller.allowBubbleDisplay = config.showInfoBubble
             media_vertical_fastscroller.setViews(media_grid, media_refresh_layout) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickDirectoryDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickDirectoryDialog.kt
index 97c04955c..de25c42e2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickDirectoryDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickDirectoryDialog.kt
@@ -84,7 +84,10 @@ class PickDirectoryDialog(val activity: BaseSimpleActivity, val sourcePath: Stri
             directories_horizontal_fastscroller.beVisibleIf(scrollHorizontally)
 
             if (scrollHorizontally) {
-                directories_horizontal_fastscroller.setViews(directories_grid)
+                directories_horizontal_fastscroller.allowBubbleDisplay = activity.config.showInfoBubble
+                directories_horizontal_fastscroller.setViews(directories_grid) {
+                    directories_horizontal_fastscroller.updateBubbleText(dirs[it].getBubbleText())
+                }
             } else {
                 directories_vertical_fastscroller.allowBubbleDisplay = activity.config.showInfoBubble
                 directories_vertical_fastscroller.setViews(directories_grid) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickMediumDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickMediumDialog.kt
index 0a80c0316..b24fbc62c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickMediumDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickMediumDialog.kt
@@ -74,7 +74,10 @@ class PickMediumDialog(val activity: BaseSimpleActivity, val path: String, val c
             media_horizontal_fastscroller.beVisibleIf(scrollHorizontally)
 
             if (scrollHorizontally) {
-                media_horizontal_fastscroller.setViews(media_grid)
+                media_horizontal_fastscroller.allowBubbleDisplay = activity.config.showInfoBubble
+                media_horizontal_fastscroller.setViews(media_grid) {
+                    media_horizontal_fastscroller.updateBubbleText(media[it].getBubbleText())
+                }
             } else {
                 media_vertical_fastscroller.allowBubbleDisplay = activity.config.showInfoBubble
                 media_vertical_fastscroller.setViews(media_grid) {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 828d2689b..a01449b1a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -63,13 +63,7 @@
             android:layout_alignParentStart="true"
             android:paddingTop="@dimen/normal_margin">
 
-            <ImageView
-                android:id="@+id/fastscroller_handle_horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:alpha="0"
-                android:background="@drawable/fastscroller_handle_horizontal"/>
+            <include layout="@layout/fastscroller_handle_horizontal"/>
 
         </com.simplemobiletools.commons.views.FastScroller>
     </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_media.xml b/app/src/main/res/layout/activity_media.xml
index 6741e00fe..918e39428 100644
--- a/app/src/main/res/layout/activity_media.xml
+++ b/app/src/main/res/layout/activity_media.xml
@@ -63,13 +63,7 @@
             android:layout_alignParentStart="true"
             android:paddingTop="@dimen/normal_margin">
 
-            <ImageView
-                android:id="@+id/fastscroller_handle_horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:alpha="0"
-                android:background="@drawable/fastscroller_handle_horizontal"/>
+            <include layout="@layout/fastscroller_handle_horizontal"/>
 
         </com.simplemobiletools.commons.views.FastScroller>
     </RelativeLayout>
diff --git a/app/src/main/res/layout/dialog_directory_picker.xml b/app/src/main/res/layout/dialog_directory_picker.xml
index 824e8db82..a86f68c21 100644
--- a/app/src/main/res/layout/dialog_directory_picker.xml
+++ b/app/src/main/res/layout/dialog_directory_picker.xml
@@ -37,13 +37,7 @@
         android:layout_alignParentStart="true"
         android:paddingTop="@dimen/normal_margin">
 
-        <ImageView
-            android:id="@+id/fastscroller_handle_horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:alpha="0"
-            android:background="@drawable/fastscroller_handle_horizontal"/>
+        <include layout="@layout/fastscroller_handle_horizontal"/>
 
     </com.simplemobiletools.commons.views.FastScroller>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/dialog_medium_picker.xml b/app/src/main/res/layout/dialog_medium_picker.xml
index 01b630a1d..e854a7e60 100644
--- a/app/src/main/res/layout/dialog_medium_picker.xml
+++ b/app/src/main/res/layout/dialog_medium_picker.xml
@@ -36,13 +36,7 @@
         android:layout_alignParentStart="true"
         android:paddingTop="@dimen/normal_margin">
 
-        <ImageView
-            android:id="@+id/fastscroller_handle_horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:alpha="0"
-            android:background="@drawable/fastscroller_handle_horizontal"/>
+        <include layout="@layout/fastscroller_handle_horizontal"/>
 
     </com.simplemobiletools.commons.views.FastScroller>
 </RelativeLayout>