diff --git a/app/build.gradle b/app/build.gradle
index 91574ad6..e709fe43 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -62,7 +62,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:6fd3d454ae'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:10c7cf2917'
     implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61'
     implementation 'me.grantland:autofittextview:0.2.1'
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/ManageSpeedDialActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/ManageSpeedDialActivity.kt
index ab864cbf..0d272a02 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/ManageSpeedDialActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/ManageSpeedDialActivity.kt
@@ -19,9 +19,13 @@ class ManageSpeedDialActivity : SimpleActivity(), RemoveSpeedDialListener {
     private var speedDialValues = ArrayList<SpeedDial>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        isMaterialActivity = true
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_manage_speed_dial)
 
+        updateMaterialActivityViews(manage_speed_dial_coordinator, manage_speed_dial_holder, true)
+        setupMaterialScrollListener(manage_speed_dial_scrollview, manage_speed_dial_toolbar)
+
         speedDialValues = config.getSpeedDialValues()
         updateAdapter()
         SimpleContactsHelper(this).getAvailableContacts(false) { contacts ->
diff --git a/app/src/main/res/layout/activity_manage_speed_dial.xml b/app/src/main/res/layout/activity_manage_speed_dial.xml
index ae6d04e7..9516aec0 100644
--- a/app/src/main/res/layout/activity_manage_speed_dial.xml
+++ b/app/src/main/res/layout/activity_manage_speed_dial.xml
@@ -6,29 +6,24 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/manage_speed_dial_app_bar_layout"
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/manage_speed_dial_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="?attr/actionBarSize"
+        android:background="@color/color_primary"
+        app:title="@string/manage_speed_dial"
+        app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
 
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/manage_speed_dial_toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="@color/color_primary"
-            app:title="@string/manage_speed_dial"
-            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <ScrollView
+    <androidx.core.widget.NestedScrollView
         android:id="@+id/manage_speed_dial_scrollview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+        android:layout_marginTop="?attr/actionBarSize"
+        android:fillViewport="true"
+        android:scrollbars="none">
 
         <LinearLayout
-            android:id="@+id/manage_speed_dial_wrapper"
+            android:id="@+id/manage_speed_dial_holder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
@@ -51,5 +46,5 @@
                 app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager" />
 
         </LinearLayout>
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>