diff --git a/app/build.gradle b/app/build.gradle
index 79ceea7c..b3f0d8c0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,10 +56,9 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:307941253d'
-    implementation 'joda-time:joda-time:2.10.3'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:ea74adfbfd'
     implementation 'com.googlecode.ez-vcard:ez-vcard:0.11.3'
-    implementation 'com.github.tibbi:IndicatorFastScroll:c3de1d040a'
+    implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 
     kapt "androidx.room:room-compiler:2.3.0"
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/GroupContactsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/GroupContactsActivity.kt
index 481888b6..8b023941 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/GroupContactsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/GroupContactsActivity.kt
@@ -66,7 +66,7 @@ class GroupContactsActivity : SimpleActivity(), RemoveFromGroupListener, Refresh
         }
 
         val adjustedPrimaryColor = getAdjustedPrimaryColor()
-        group_contacts_fastscroller?.updateColors(adjustedPrimaryColor, adjustedPrimaryColor.getContrastColor())
+        group_contacts_fastscroller?.updateColors(adjustedPrimaryColor)
         group_contacts_placeholder_2.underlineText()
         group_contacts_placeholder_2.setTextColor(adjustedPrimaryColor)
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt
index 207cd67a..78a88acd 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/ContactsAdapter.kt
@@ -42,7 +42,7 @@ class ContactsAdapter(
     activity: SimpleActivity, var contactItems: ArrayList<Contact>, private val refreshListener: RefreshContactsListener?,
     private val location: Int, private val removeListener: RemoveFromGroupListener?, recyclerView: MyRecyclerView,
     highlightText: String = "", itemClick: (Any) -> Unit
-) : MyRecyclerViewAdapter(activity, recyclerView, null, itemClick), RecyclerViewFastScroller.OnPopupTextUpdate {
+) : MyRecyclerViewAdapter(activity, recyclerView, itemClick), RecyclerViewFastScroller.OnPopupTextUpdate {
     private val NEW_GROUP_ID = -1
 
     private var config = activity.config
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt
index 06bcb3a1..a8335bdb 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/GroupsAdapter.kt
@@ -28,7 +28,7 @@ import java.util.*
 class GroupsAdapter(
     activity: SimpleActivity, var groups: ArrayList<Group>, val refreshListener: RefreshContactsListener?, recyclerView: MyRecyclerView,
     itemClick: (Any) -> Unit
-) : MyRecyclerViewAdapter(activity, recyclerView, null, itemClick), RecyclerViewFastScroller.OnPopupTextUpdate {
+) : MyRecyclerViewAdapter(activity, recyclerView, itemClick), RecyclerViewFastScroller.OnPopupTextUpdate {
 
     private var textToHighlight = ""
     var showContactThumbnails = activity.config.showContactThumbnails
@@ -94,7 +94,6 @@ class GroupsAdapter(
             textToHighlight = highlightText
             notifyDataSetChanged()
         }
-        fastScroller?.measureRecyclerView()
     }
 
     private fun renameGroup() {
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt
index 6818d3eb..9733c252 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/MyViewPagerFragment.kt
@@ -84,7 +84,7 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
         }
 
         context.updateTextColors(fragment_wrapper.parent as ViewGroup)
-        fragment_fastscroller?.updateColors(adjustedPrimaryColor, adjustedPrimaryColor.getContrastColor())
+        fragment_fastscroller?.updateColors(adjustedPrimaryColor)
         fragment_placeholder_2?.setTextColor(adjustedPrimaryColor)
 
         letter_fastscroller?.textColor = textColor.getColorStateList()