diff --git a/app/build.gradle b/app/build.gradle
index f877a9d..da38ec6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -64,7 +64,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:8f22f91a00'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:608dbb5ca9'
 
     kapt 'androidx.room:room-compiler:2.3.0'
     implementation 'androidx.room:room-runtime:2.3.0'
diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/adapters/ClipsActivityAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/adapters/ClipsActivityAdapter.kt
index 1f22a00..8f50d39 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/adapters/ClipsActivityAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/adapters/ClipsActivityAdapter.kt
@@ -1,5 +1,6 @@
 package com.simplemobiletools.keyboard.adapters
 
+import android.view.Menu
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
@@ -16,7 +17,6 @@ import com.simplemobiletools.commons.interfaces.ItemTouchHelperContract
 import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener
 import com.simplemobiletools.commons.interfaces.StartReorderDragListener
 import com.simplemobiletools.commons.views.MyRecyclerView
-import com.simplemobiletools.commons.views.bottomactionmenu.BottomActionMenuView
 import com.simplemobiletools.keyboard.R
 import com.simplemobiletools.keyboard.dialogs.AddOrEditClipDialog
 import com.simplemobiletools.keyboard.extensions.clipsDB
@@ -48,8 +48,10 @@ class ClipsActivityAdapter(
 
     override fun getActionMenuId() = R.menu.cab_clips
 
-    override fun onBottomActionMenuCreated(view: BottomActionMenuView) {
-        view.toggleItemVisibility(R.id.cab_edit, isOneItemSelected())
+    override fun prepareActionMode(menu: Menu) {
+        menu.apply {
+            findItem(R.id.cab_edit).isVisible = isOneItemSelected()
+        }
     }
 
     override fun actionItemPressed(id: Int) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt
index af30f6b..4f6a992 100644
--- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/Constants.kt
@@ -5,7 +5,7 @@ const val SHIFT_ON_ONE_CHAR = 1
 const val SHIFT_ON_PERMANENT = 2
 
 // limit the count of alternative characters that show up at long pressing a key
-const val MAX_KEYS_PER_MINI_ROW = 8
+const val MAX_KEYS_PER_MINI_ROW = 9
 
 // shared prefs
 const val VIBRATE_ON_KEYPRESS = "vibrate_on_keypress"
diff --git a/app/src/main/res/xml/keys_letters_english.xml b/app/src/main/res/xml/keys_letters_english.xml
index 21e94a7..80f5e23 100644
--- a/app/src/main/res/xml/keys_letters_english.xml
+++ b/app/src/main/res/xml/keys_letters_english.xml
@@ -14,7 +14,7 @@
             app:topSmallNumber="2" />
         <Key
             app:keyLabel="e"
-            app:popupCharacters="éè3êëē"
+            app:popupCharacters="éè3êëēę"
             app:popupKeyboard="@xml/keyboard_popup_template"
             app:topSmallNumber="3" />
         <Key
@@ -59,7 +59,7 @@
             app:horizontalGap="5%"
             app:keyEdgeFlags="left"
             app:keyLabel="a"
-            app:popupCharacters="áàâãäåāæ"
+            app:popupCharacters="áàâãäåāæą"
             app:popupKeyboard="@xml/keyboard_popup_template" />
         <Key
             app:keyLabel="s"
@@ -80,7 +80,7 @@
         <Key
             app:keyEdgeFlags="right"
             app:keyLabel="l"
-            app:popupCharacters="ĺľλ"
+            app:popupCharacters="ĺľł"
             app:popupKeyboard="@xml/keyboard_popup_template" />
     </Row>
     <Row>
@@ -91,7 +91,7 @@
             app:keyWidth="15%p" />
         <Key
             app:keyLabel="z"
-            app:popupCharacters="ž"
+            app:popupCharacters="źžż"
             app:popupKeyboard="@xml/keyboard_popup_template" />
         <Key app:keyLabel="x" />
         <Key