diff --git a/app/build.gradle b/app/build.gradle
index f7f3a348b..81b672ac2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -69,7 +69,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.21.0'
+    implementation 'com.simplemobiletools:commons:5.21.7'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'it.sephiroth.android.exif:library:1.0.1'
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt
index bda8a154f..4a9adb5ee 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/NewEditActivity.kt
@@ -223,6 +223,14 @@ class NewEditActivity : SimpleActivity() {
             it.name!!.isEmpty()
         }.toMutableList() as ArrayList<ToolItem>
 
+        // move Focus to the end, as it is the least used
+        // on some devices it is not obvious that the toolbar can be scrolled horizontally, so move the best ones to the start to make them visible
+        val focus = newTools.firstOrNull { it.name == getString(R.string.pesdk_focus_title_name) }
+        if (focus != null) {
+            newTools.remove(focus)
+            newTools.add(focus)
+        }
+
         settingsList.getSettingsModel(UiConfigMainMenu::class.java).setToolList(newTools)
 
         settingsList.getSettingsModel(UiConfigTheme::class.java).theme = R.style.Imgly_Theme_NoFullscreen