diff --git a/app/src/main/kotlin/org/fossify/phone/activities/DialpadActivity.kt b/app/src/main/kotlin/org/fossify/phone/activities/DialpadActivity.kt
index 21c5beff..f89928eb 100644
--- a/app/src/main/kotlin/org/fossify/phone/activities/DialpadActivity.kt
+++ b/app/src/main/kotlin/org/fossify/phone/activities/DialpadActivity.kt
@@ -8,7 +8,6 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.provider.Telephony.Sms.Intents.SECRET_CODE_ACTION
-import android.telephony.PhoneNumberUtils
 import android.telephony.TelephonyManager
 import android.util.TypedValue
 import android.view.KeyEvent
@@ -268,7 +267,7 @@ class DialpadActivity : SimpleActivity() {
         (binding.dialpadList.adapter as? ContactsAdapter)?.finishActMode()
 
         val filtered = allContacts.filter { contact ->
-            var convertedName = PhoneNumberUtils.convertKeypadLettersToDigits(
+            var convertedName = KeypadHelper.convertKeypadLettersToDigits(
                 contact.name.normalizeString()
             ).filterNot { it.isWhitespace() }
 
diff --git a/app/src/main/kotlin/org/fossify/phone/adapters/ContactsAdapter.kt b/app/src/main/kotlin/org/fossify/phone/adapters/ContactsAdapter.kt
index 2f2f8e7c..37a6e1d8 100644
--- a/app/src/main/kotlin/org/fossify/phone/adapters/ContactsAdapter.kt
+++ b/app/src/main/kotlin/org/fossify/phone/adapters/ContactsAdapter.kt
@@ -5,7 +5,6 @@ import android.content.Intent
 import android.content.pm.ShortcutInfo
 import android.graphics.drawable.Icon
 import android.net.Uri
-import android.telephony.PhoneNumberUtils
 import android.text.TextUtils
 import android.util.TypedValue
 import android.view.*
@@ -377,7 +376,7 @@ class ContactsAdapter(
                     } else {
                         var spacedTextToHighlight = textToHighlight
                         val strippedName = name.filterNot { it.isWhitespace() }
-                        val strippedDigits = PhoneNumberUtils.convertKeypadLettersToDigits(strippedName)
+                        val strippedDigits = KeypadHelper.convertKeypadLettersToDigits(strippedName)
                         val startIndex = strippedDigits.indexOf(textToHighlight)
 
                         if (strippedDigits.contains(textToHighlight)) {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bd7c0cfb..d9b57570 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -7,7 +7,7 @@ detekt = "1.23.3"
 #Eventbus
 eventbus = "3.3.1"
 #Fossify
-commons = "30b338e429"
+commons = "4f91781981"
 #Gradle
 gradlePlugins-agp = "8.7.3"
 #Other