diff --git a/app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/KeyboardParser.kt b/app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/KeyboardParser.kt
index 015db6284..ef457f0b7 100644
--- a/app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/KeyboardParser.kt
+++ b/app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/KeyboardParser.kt
@@ -27,6 +27,8 @@ import helium314.keyboard.latin.utils.CUSTOM_LAYOUT_PREFIX
 import helium314.keyboard.latin.utils.InputTypeUtils
 import helium314.keyboard.latin.utils.POPUP_KEYS_LAYOUT
 import helium314.keyboard.latin.utils.POPUP_KEYS_NUMBER
+import helium314.keyboard.latin.utils.ScriptUtils
+import helium314.keyboard.latin.utils.ScriptUtils.script
 import helium314.keyboard.latin.utils.getLayoutFile
 import helium314.keyboard.latin.utils.runInLocale
 import helium314.keyboard.latin.utils.sumOf
@@ -185,7 +187,7 @@ abstract class KeyboardParser(private val params: KeyboardParams, private val co
     }
 
     private fun addSymbolPopupKeys(baseKeys: MutableList<List<KeyData>>) {
-        val layoutName = Settings.readSymbolsLayoutName(context, params.mId.locale)
+        val layoutName = getLayoutFileName(params, context, overrideElementId = KeyboardId.ELEMENT_SYMBOLS)
         val layout = if (layoutName.startsWith(CUSTOM_LAYOUT_PREFIX)) {
             val parser = if (layoutName.endsWith("json")) JsonKeyboardParser(params, context)
                 else SimpleKeyboardParser(params, context, false)
@@ -766,17 +768,25 @@ abstract class KeyboardParser(private val params: KeyboardParams, private val co
 
         private fun Context.readAssetsFile(name: String) = assets.open(name).reader().readText()
 
-        private fun getLayoutFileName(params: KeyboardParams, context: Context) = when (params.mId.mElementId) {
-            KeyboardId.ELEMENT_SYMBOLS -> Settings.readSymbolsLayoutName(context, params.mId.locale)
-            KeyboardId.ELEMENT_SYMBOLS_SHIFTED -> Settings.readShiftedSymbolsLayoutName(context)
-            KeyboardId.ELEMENT_NUMPAD -> if (context.resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE)
-                    "numpad_landscape"
+        private fun getLayoutFileName(params: KeyboardParams, context: Context, overrideElementId: Int? = null): String {
+            var checkForCustom = true
+            val layoutName = when (overrideElementId ?: params.mId.mElementId) {
+                KeyboardId.ELEMENT_SYMBOLS -> if (params.mId.locale.script() == ScriptUtils.SCRIPT_ARABIC) LAYOUT_SYMBOLS_ARABIC else LAYOUT_SYMBOLS
+                KeyboardId.ELEMENT_SYMBOLS_SHIFTED -> LAYOUT_SYMBOLS_SHIFTED
+                KeyboardId.ELEMENT_NUMPAD -> if (context.resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE)
+                    LAYOUT_NUMPAD_LANDSCAPE
                 else
-                    "numpad"
-            KeyboardId.ELEMENT_NUMBER -> "number"
-            KeyboardId.ELEMENT_PHONE -> "phone"
-            KeyboardId.ELEMENT_PHONE_SYMBOLS -> "phone_symbols"
-            else -> params.mId.mSubtype.keyboardLayoutSetName.substringBeforeLast("+")
+                    LAYOUT_NUMPAD
+                KeyboardId.ELEMENT_NUMBER -> LAYOUT_NUMBER
+                KeyboardId.ELEMENT_PHONE -> LAYOUT_PHONE
+                KeyboardId.ELEMENT_PHONE_SYMBOLS -> LAYOUT_PHONE_SYMBOLS
+                else -> {
+                    checkForCustom = false // "custom" is already in keyboardLayoutSetName
+                    params.mId.mSubtype.keyboardLayoutSetName.substringBeforeLast("+")
+                }
+            }
+            return if (checkForCustom) Settings.readLayoutName(layoutName, context)
+            else layoutName
         }
 
         // todo:
@@ -862,3 +872,12 @@ private const val POPUP_EYS_NAVIGATE_EMOJI_PREVIOUS = "!fixedColumnOrder!3,!need
 private const val POPUP_EYS_NAVIGATE_EMOJI = "!icon/clipboard_action_key|!code/key_clipboard,!icon/emoji_action_key|!code/key_emoji"
 private const val POPUP_EYS_NAVIGATE_EMOJI_NEXT = "!fixedColumnOrder!3,!needsDividers!,!icon/clipboard_action_key|!code/key_clipboard,!icon/emoji_action_key|!code/key_emoji,!icon/next_key|!code/key_action_next"
 private const val POPUP_EYS_NAVIGATE_EMOJI_PREVIOUS_NEXT = "!fixedColumnOrder!4,!needsDividers!,!icon/previous_key|!code/key_action_previous,!icon/clipboard_action_key|!code/key_clipboard,!icon/emoji_action_key|!code/key_emoji,!icon/next_key|!code/key_action_next"
+
+const val LAYOUT_SYMBOLS = "symbols"
+const val LAYOUT_SYMBOLS_SHIFTED = "symbols_shifted"
+const val LAYOUT_SYMBOLS_ARABIC = "symbols_arabic"
+const val LAYOUT_NUMPAD = "numpad"
+const val LAYOUT_NUMPAD_LANDSCAPE = "numpad_landscape"
+const val LAYOUT_NUMBER = "number"
+const val LAYOUT_PHONE = "phone"
+const val LAYOUT_PHONE_SYMBOLS = "phone_symbols"
diff --git a/app/src/main/java/helium314/keyboard/latin/App.kt b/app/src/main/java/helium314/keyboard/latin/App.kt
index e9af21340..819863aa9 100644
--- a/app/src/main/java/helium314/keyboard/latin/App.kt
+++ b/app/src/main/java/helium314/keyboard/latin/App.kt
@@ -8,6 +8,7 @@ import androidx.preference.PreferenceManager
 import helium314.keyboard.latin.common.LocaleUtils.constructLocale
 import helium314.keyboard.latin.settings.Settings
 import helium314.keyboard.latin.settings.USER_DICTIONARY_SUFFIX
+import helium314.keyboard.latin.utils.CUSTOM_LAYOUT_PREFIX
 import helium314.keyboard.latin.utils.DeviceProtectedUtils
 import helium314.keyboard.latin.utils.DictionaryInfoUtils
 import helium314.keyboard.latin.utils.upgradeToolbarPref
@@ -48,6 +49,13 @@ fun checkVersionUpgrade(context: Context) {
     }
     if (oldVersion == 0) // new install or restoring settings from old app name
         upgradesWhenComingFromOldAppName(context)
+    if (oldVersion == 1000) { // upgrade old custom layouts name
+        val layoutsDir = Settings.getLayoutsDir(context)
+        val oldShiftSymbolsFile = File(layoutsDir, "${CUSTOM_LAYOUT_PREFIX}shift_symbols")
+        if (oldShiftSymbolsFile.exists()) {
+            oldShiftSymbolsFile.renameTo(File(layoutsDir, "${CUSTOM_LAYOUT_PREFIX}symbols_shifted"))
+        }
+    }
     prefs.edit { putInt(Settings.PREF_VERSION_CODE, BuildConfig.VERSION_CODE) }
 }
 
diff --git a/app/src/main/java/helium314/keyboard/latin/settings/AdvancedSettingsFragment.kt b/app/src/main/java/helium314/keyboard/latin/settings/AdvancedSettingsFragment.kt
index 3eca1462b..a95f836cf 100644
--- a/app/src/main/java/helium314/keyboard/latin/settings/AdvancedSettingsFragment.kt
+++ b/app/src/main/java/helium314/keyboard/latin/settings/AdvancedSettingsFragment.kt
@@ -20,11 +20,18 @@ import androidx.preference.Preference
 import androidx.preference.PreferenceManager
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import helium314.keyboard.compat.locale
 import helium314.keyboard.dictionarypack.DictionaryPackConstants
 import helium314.keyboard.latin.utils.ChecksumCalculator
 import helium314.keyboard.keyboard.KeyboardLayoutSet
 import helium314.keyboard.keyboard.KeyboardSwitcher
+import helium314.keyboard.keyboard.internal.keyboard_parser.LAYOUT_NUMBER
+import helium314.keyboard.keyboard.internal.keyboard_parser.LAYOUT_NUMPAD
+import helium314.keyboard.keyboard.internal.keyboard_parser.LAYOUT_NUMPAD_LANDSCAPE
+import helium314.keyboard.keyboard.internal.keyboard_parser.LAYOUT_PHONE
+import helium314.keyboard.keyboard.internal.keyboard_parser.LAYOUT_PHONE_SYMBOLS
+import helium314.keyboard.keyboard.internal.keyboard_parser.LAYOUT_SYMBOLS
+import helium314.keyboard.keyboard.internal.keyboard_parser.LAYOUT_SYMBOLS_ARABIC
+import helium314.keyboard.keyboard.internal.keyboard_parser.LAYOUT_SYMBOLS_SHIFTED
 import helium314.keyboard.latin.AudioAndHapticFeedbackManager
 import helium314.keyboard.latin.BuildConfig
 import helium314.keyboard.latin.R
@@ -38,6 +45,7 @@ import helium314.keyboard.latin.utils.CUSTOM_LAYOUT_PREFIX
 import helium314.keyboard.latin.utils.DeviceProtectedUtils
 import helium314.keyboard.latin.utils.JniUtils
 import helium314.keyboard.latin.utils.editCustomLayout
+import helium314.keyboard.latin.utils.getStringResourceOrName
 import helium314.keyboard.latin.utils.infoDialog
 import helium314.keyboard.latin.utils.reloadEnabledSubtypes
 import helium314.keyboard.latin.utils.updateAdditionalSubtypes
@@ -127,18 +135,8 @@ class AdvancedSettingsFragment : SubScreenFragment() {
         findPreference<Preference>("backup_restore")?.setOnPreferenceClickListener { showBackupRestoreDialog() }
         findPreference<Preference>("custom_background_image")?.setOnPreferenceClickListener { onClickLoadImage() }
 
-        findPreference<Preference>("custom_symbols_layout")?.setOnPreferenceClickListener {
-            val layoutName = Settings.readSymbolsLayoutName(context, context.resources.configuration.locale()).takeIf { it.startsWith(CUSTOM_LAYOUT_PREFIX) }
-            val oldLayout = if (layoutName != null) null
-                else context.assets.open("layouts${File.separator}symbols.txt").reader().readText()
-            editCustomLayout(layoutName ?: "${CUSTOM_LAYOUT_PREFIX}symbols.txt", context, oldLayout, true)
-            true
-        }
-        findPreference<Preference>("custom_shift_symbols_layout")?.setOnPreferenceClickListener {
-            val layoutName = Settings.readShiftedSymbolsLayoutName(context).takeIf { it.startsWith(CUSTOM_LAYOUT_PREFIX) }
-            val oldLayout = if (layoutName != null) null
-                else context.assets.open("layouts${File.separator}symbols_shifted.txt").reader().readText()
-            editCustomLayout(layoutName ?: "${CUSTOM_LAYOUT_PREFIX}shift_symbols.txt", context, oldLayout, true)
+        findPreference<Preference>("custom_symbols_number_layouts")?.setOnPreferenceClickListener {
+            showCustomizeLayoutsDialog()
             true
         }
     }
@@ -156,6 +154,30 @@ class AdvancedSettingsFragment : SubScreenFragment() {
         }
     }
 
+    private fun showCustomizeLayoutsDialog() {
+        val layouts = listOf(LAYOUT_SYMBOLS, LAYOUT_SYMBOLS_SHIFTED, LAYOUT_SYMBOLS_ARABIC, LAYOUT_NUMBER, LAYOUT_NUMPAD, LAYOUT_NUMPAD_LANDSCAPE, LAYOUT_PHONE, LAYOUT_PHONE_SYMBOLS)
+        val layoutNames = layouts.map { it.getStringResourceOrName("layout_", requireContext()) }.toTypedArray()
+        AlertDialog.Builder(requireContext())
+            .setTitle(R.string.customize_symbols_number_layouts)
+            .setItems(layoutNames) { di, i ->
+                di.dismiss()
+                customizeLayout(layouts[i])
+            }
+            .setNegativeButton(android.R.string.cancel, null)
+            .show()
+    }
+
+    private fun customizeLayout(layout: String) {
+        val customLayoutName = Settings.readLayoutName(layout, context).takeIf { it.startsWith(CUSTOM_LAYOUT_PREFIX) }
+        val originalLayout = if (customLayoutName != null) null
+            else {
+                requireContext().assets.list("layouts")?.firstOrNull { it.startsWith("$layout.") }
+                    ?.let { requireContext().assets.open("layouts" + File.separator + it).reader().readText() }
+            }
+        val displayName = layout.getStringResourceOrName("layout", requireContext())
+        editCustomLayout(customLayoutName ?: "$CUSTOM_LAYOUT_PREFIX$layout.txt", requireContext(), originalLayout, displayName)
+    }
+
     @SuppressLint("ApplySharedPref")
     private fun onClickLoadLibrary(): Boolean {
         // get architecture for telling user which file to use
diff --git a/app/src/main/java/helium314/keyboard/latin/settings/AppearanceSettingsFragment.kt b/app/src/main/java/helium314/keyboard/latin/settings/AppearanceSettingsFragment.kt
index c6c3155f8..1e8ef22e5 100644
--- a/app/src/main/java/helium314/keyboard/latin/settings/AppearanceSettingsFragment.kt
+++ b/app/src/main/java/helium314/keyboard/latin/settings/AppearanceSettingsFragment.kt
@@ -12,6 +12,7 @@ import androidx.preference.TwoStatePreference
 import helium314.keyboard.keyboard.KeyboardSwitcher
 import helium314.keyboard.keyboard.KeyboardTheme
 import helium314.keyboard.latin.R
+import helium314.keyboard.latin.utils.getStringResourceOrName
 import java.lang.Float.max
 import java.lang.Float.min
 import java.util.*
@@ -166,9 +167,7 @@ class AppearanceSettingsFragment : SubScreenFragment() {
     }
 
     private fun Array<CharSequence>.getNamesFromResourcesIfAvailable(prefix: String) =
-        map { val resId = resources.getIdentifier("$prefix$it", "string", requireContext().packageName)
-            if (resId == 0) it else getString(resId)
-        }.toTypedArray()
+        map { it.getStringResourceOrName(prefix, requireContext()) }.toTypedArray()
 
     companion object {
         private const val PERCENTAGE_FLOAT = 100.0f
diff --git a/app/src/main/java/helium314/keyboard/latin/settings/Settings.java b/app/src/main/java/helium314/keyboard/latin/settings/Settings.java
index d0bc8a5d7..340aa66d4 100644
--- a/app/src/main/java/helium314/keyboard/latin/settings/Settings.java
+++ b/app/src/main/java/helium314/keyboard/latin/settings/Settings.java
@@ -528,26 +528,16 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
         };
     }
 
-    public static String readSymbolsLayoutName(final Context context, final Locale locale) {
+    /** @return custom layout name if there is one for the given layout, else returns "layout" */
+    public static String readLayoutName(final String layout, final Context context) {
         String[] layouts = getLayoutsDir(context).list();
         if (layouts != null) {
             for (String name : layouts) {
-                if (name.startsWith(CustomLayoutUtilsKt.CUSTOM_LAYOUT_PREFIX + "symbols"))
+                if (name.startsWith(CustomLayoutUtilsKt.CUSTOM_LAYOUT_PREFIX + layout + "."))
                     return name;
             }
         }
-        return ScriptUtils.script(locale).equals(ScriptUtils.SCRIPT_ARABIC) ? "symbols_arabic" : "symbols";
-    }
-
-    public static String readShiftedSymbolsLayoutName(final Context context) {
-        String[] layouts = getLayoutsDir(context).list();
-        if (layouts != null) {
-            for (String name : layouts) {
-                if (name.startsWith(CustomLayoutUtilsKt.CUSTOM_LAYOUT_PREFIX + "shift_symbols"))
-                    return name;
-            }
-        }
-        return "symbols_shifted";
+        return layout;
     }
 
     public static File getLayoutsDir(final Context context) {
diff --git a/app/src/main/java/helium314/keyboard/latin/utils/CustomLayoutUtils.kt b/app/src/main/java/helium314/keyboard/latin/utils/CustomLayoutUtils.kt
index c7a636241..b3b367a97 100644
--- a/app/src/main/java/helium314/keyboard/latin/utils/CustomLayoutUtils.kt
+++ b/app/src/main/java/helium314/keyboard/latin/utils/CustomLayoutUtils.kt
@@ -135,7 +135,7 @@ fun removeCustomLayoutFile(layoutName: String, context: Context) {
     getLayoutFile(layoutName, context).delete()
 }
 
-fun editCustomLayout(layoutName: String, context: Context, startContent: String? = null, isSymbols: Boolean = false) {
+fun editCustomLayout(layoutName: String, context: Context, startContent: String? = null, displayName: CharSequence? = null) {
     val file = getLayoutFile(layoutName, context)
     val editText = EditText(context).apply {
         setText(startContent ?: file.readText())
@@ -149,6 +149,7 @@ fun editCustomLayout(layoutName: String, context: Context, startContent: String?
             if (isJson == null) {
                 editCustomLayout(layoutName, context, content)
                 // todo: this actually always returns the "simple layout" error, even on a json layout with a single small error
+                //  -> check in inverse expected order (set depending in current file name)
                 infoDialog(context, context.getString(R.string.layout_error, Log.getLog(10).lastOrNull { it.tag == TAG }?.message))
             } else {
                 val wasJson = file.name.substringAfterLast(".") == "json"
@@ -160,17 +161,16 @@ fun editCustomLayout(layoutName: String, context: Context, startContent: String?
             }
         }
         .setNegativeButton(android.R.string.cancel, null)
-    if (isSymbols) {
-        val name = if (layoutName.contains("shift")) context.getString(R.string.shift_symbols) else context.getString(R.string.popup_keys_symbols)
+    if (displayName != null) {
         if (file.exists()) {
             builder.setNeutralButton(R.string.delete) { _, _ ->
-                confirmDialog(context, context.getString(R.string.delete_layout, name), context.getString(R.string.delete)) {
+                confirmDialog(context, context.getString(R.string.delete_layout, displayName), context.getString(R.string.delete)) {
                     file.delete()
                     KeyboardSwitcher.getInstance().forceUpdateKeyboardTheme(context)
                 }
             }
         }
-        builder.setTitle(name)
+        builder.setTitle(displayName)
     }
     builder.show()
 }
diff --git a/app/src/main/java/helium314/keyboard/latin/utils/Ktx.kt b/app/src/main/java/helium314/keyboard/latin/utils/Ktx.kt
index 7da0aee43..01467e0d6 100644
--- a/app/src/main/java/helium314/keyboard/latin/utils/Ktx.kt
+++ b/app/src/main/java/helium314/keyboard/latin/utils/Ktx.kt
@@ -1,5 +1,7 @@
 package helium314.keyboard.latin.utils
 
+import android.content.Context
+
 // generic extension functions
 
 // adapted from Kotlin source: https://github.com/JetBrains/kotlin/blob/7a7d392b3470b38d42f80c896b7270678d0f95c3/libraries/stdlib/common/src/generated/_Collections.kt#L3004
@@ -10,3 +12,8 @@ inline fun <T> Iterable<T>.sumOf(selector: (T) -> Float): Float {
     }
     return sum
 }
+
+fun CharSequence.getStringResourceOrName(prefix: String, context: Context): CharSequence {
+    val resId = context.resources.getIdentifier(prefix + this, "string", context.packageName)
+    return if (resId == 0) this else context.getString(resId)
+}
diff --git a/app/src/main/java/helium314/keyboard/latin/utils/PopupKeysUtils.kt b/app/src/main/java/helium314/keyboard/latin/utils/PopupKeysUtils.kt
index b524c0b32..123d4c3dd 100644
--- a/app/src/main/java/helium314/keyboard/latin/utils/PopupKeysUtils.kt
+++ b/app/src/main/java/helium314/keyboard/latin/utils/PopupKeysUtils.kt
@@ -133,29 +133,28 @@ fun reorderPopupKeysDialog(context: Context, key: String, defaultSetting: String
         }
         override fun onBindViewHolder(viewHolder: RecyclerView.ViewHolder, position: Int) {
             val (text, wasChecked) = orderedItems[position]
-            val displayTextId = context.resources.getIdentifier(text.lowercase(), "string", context.packageName)
-            val displayText = if (displayTextId == 0) text else context.getString(displayTextId)
+            val displayText = text.lowercase().getStringResourceOrName("", context)
             viewHolder.itemView.findViewById<TextView>(R.id.popup_keys_type)?.text = displayText
             val switch = viewHolder.itemView.findViewById<Switch>(R.id.popup_keys_switch)
             switch?.setOnCheckedChangeListener(null)
             switch?.isChecked = wasChecked
             switch?.isEnabled = !(key.contains(Settings.PREF_POPUP_KEYS_ORDER) && text == POPUP_KEYS_LAYOUT) // layout can't be disabled
             switch?.setOnCheckedChangeListener { _, isChecked ->
-                val position = orderedItems.indexOfFirst { it.first == text }
-                orderedItems[position] = text to isChecked
+                val pos = orderedItems.indexOfFirst { it.first == text }
+                orderedItems[pos] = text to isChecked
             }
         }
     }
     rv.adapter = adapter
     ItemTouchHelper(object : ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP or ItemTouchHelper.DOWN, 0) {
-        override fun onMove(p0: RecyclerView, p1: RecyclerView.ViewHolder, p2: RecyclerView.ViewHolder): Boolean {
-            val pos1 = p1.absoluteAdapterPosition
-            val pos2 = p2.absoluteAdapterPosition
+        override fun onMove(rv: RecyclerView, viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean {
+            val pos1 = viewHolder.absoluteAdapterPosition
+            val pos2 = target.absoluteAdapterPosition
             Collections.swap(orderedItems, pos1, pos2)
             adapter.notifyItemMoved(pos1, pos2)
             return true
         }
-        override fun onSwiped(p0: RecyclerView.ViewHolder, p1: Int) { }
+        override fun onSwiped(rv: RecyclerView.ViewHolder, direction: Int) { }
     }).attachToRecyclerView(rv)
     adapter.submitList(orderedItems)
     AlertDialog.Builder(context)
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index c0f248f51..22a265f25 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Woordeboek beskikbaar"</string>
     <string name="cannot_connect_to_dict_service">"Kan nie aan woordeboekdiens koppel nie"</string>
     <string name="no_dictionaries_available">"Geen woordeboeke beskikbaar nie"</string>
-    <string name="check_for_updates_now">"Verfris"</string>
     <string name="last_update">"Laas opgedateer"</string>
     <string name="main_dict_description">"Hoofwoordeboek"</string>
     <string name="settings">"Instellings"</string>
diff --git a/app/src/main/res/values-am/strings.xml b/app/src/main/res/values-am/strings.xml
index 437af0aee..5b7bef05f 100644
--- a/app/src/main/res/values-am/strings.xml
+++ b/app/src/main/res/values-am/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"መዝገበ-ቃላት ይገኛል"</string>
     <string name="cannot_connect_to_dict_service">"ወደ መዝገበ-ቃላት አገልገሎት ማገናኘት ላይ ችግር"</string>
     <string name="no_dictionaries_available">"ምንም መዝገበ-ቃላት የሉም"</string>
-    <string name="check_for_updates_now">"አድስ"</string>
     <string name="last_update">"ለመጨረሻ ጊዜ የተዘመነው"</string>
     <string name="main_dict_description">"ዋና መዝገበ-ቃላት"</string>
     <string name="settings">"ቅንብሮች"</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 1c494f849..155354342 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -101,7 +101,6 @@
     <string name="dictionary_available">"القاموس متاح"</string>
     <string name="cannot_connect_to_dict_service">"مشكلة في الاتصال بخدمة القاموس"</string>
     <string name="no_dictionaries_available">"لا تتوفر أي قواميس"</string>
-    <string name="check_for_updates_now">"تحديث"</string>
     <string name="last_update">"تاريخ آخر تحديث"</string>
     <string name="main_dict_description">"القاموس الرئيسي"</string>
     <string name="settings">"إعدادات"</string>
@@ -226,10 +225,9 @@
     <string name="one_handed" tools:keep="@string/one_handed">وضع اليد الواحدة</string>
     <string name="prefs_narrow_key_gaps">تقليص المسافة ما بين الأزرار</string>
     <string name="button_load_custom">تحميل ملف</string>
-    <string name="shift_symbols">المزيد من الرموز</string>
+    <string name="layout_symbols_shifted">المزيد من الرموز</string>
     <string name="button_title_add_custom_layout">إضافة تخطيط مخصص</string>
     <string name="file_read_error">تعذرت قراءة الملف</string>
-    <string name="customize_symbols">تخصيص تخطيط الرموز</string>
     <string name="dictionary_settings_category">القواميس</string>
     <string name="setup_step3_action">إعداد لوحة المفاتيح</string>
     <string name="internal_dictionary_summary">القواميس المدمَجَة</string>
diff --git a/app/src/main/res/values-as/strings.xml b/app/src/main/res/values-as/strings.xml
index 022ded004..a71cf5c05 100644
--- a/app/src/main/res/values-as/strings.xml
+++ b/app/src/main/res/values-as/strings.xml
@@ -71,7 +71,6 @@
     <string name="dictionary_available">"অভিধান উপলব্ধ"</string>
     <string name="cannot_connect_to_dict_service">"অভিধান সেৱাৰ লগত সংযোগ কৰোঁতে সমস্যাৰ সৃষ্টি হৈছে"</string>
     <string name="no_dictionaries_available">"কোনো অভিধান নাই"</string>
-    <string name="check_for_updates_now">"ৰিফ্ৰেশ্ব কৰক"</string>
     <string name="last_update">"অন্তিমবাৰ আপডে’ট কৰা হৈছিল"</string>
     <string name="main_dict_description">"মুখ্য অভিধান"</string>
     <string name="settings">"ছেটিংসমূহ"</string>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 4768980a8..fb22fff0b 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Lüğət mövcuddur"</string>
     <string name="cannot_connect_to_dict_service">"Lüğət xidmətinə bağlantı problemi"</string>
     <string name="no_dictionaries_available">"Lüğət mövcud deyil"</string>
-    <string name="check_for_updates_now">"Təzələ"</string>
     <string name="last_update">"Son yeniləmə"</string>
     <string name="main_dict_description">"Əsas lüğət"</string>
     <string name="settings">"Ayarlar"</string>
diff --git a/app/src/main/res/values-b+sr+Latn/strings.xml b/app/src/main/res/values-b+sr+Latn/strings.xml
index 7bc2d0463..933379074 100644
--- a/app/src/main/res/values-b+sr+Latn/strings.xml
+++ b/app/src/main/res/values-b+sr+Latn/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Rečnik je dostupan"</string>
     <string name="cannot_connect_to_dict_service">"Problem pri povezivanju s uslugom rečnika"</string>
     <string name="no_dictionaries_available">"Nema dostupnih rečnika"</string>
-    <string name="check_for_updates_now">"Osveži"</string>
     <string name="last_update">"Poslednje ažuriranje"</string>
     <string name="main_dict_description">"Glavni rečnik"</string>
     <string name="settings">"Podešavanja"</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index ba31d97dc..86007d073 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Даступны слоўнік"</string>
     <string name="cannot_connect_to_dict_service">"Праблема падключэння да слоўніка"</string>
     <string name="no_dictionaries_available">"Слоўнікаў няма"</string>
-    <string name="check_for_updates_now">"Абнавіць"</string>
     <string name="last_update">"Апошняе абнаўленне"</string>
     <string name="main_dict_description">"Асноўны слоўнік"</string>
     <string name="settings">"Налады"</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index a23d0fb64..d00c91add 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Речникът е налице"</string>
     <string name="cannot_connect_to_dict_service">"Няма връзка с речниците"</string>
     <string name="no_dictionaries_available">"Няма налични речници"</string>
-    <string name="check_for_updates_now">"Опресняване"</string>
     <string name="last_update">"Последна актуализация:"</string>
     <string name="main_dict_description">"Основен речник"</string>
     <string name="settings">"Настройки"</string>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 45f733830..cdb212939 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -204,7 +204,6 @@
     <string name="dictionary_available">অভিধান উপলব্ধ</string>
     <string name="cannot_connect_to_dict_service">অভিধান পরিষেবার সাথে সংযুক্ত হতে সমস্যা হচ্ছে</string>
     <string name="no_dictionaries_available">কোনো অভিধান উপলব্ধ নয়</string>
-    <string name="check_for_updates_now">"রিফ্রেশ"</string>
     <string name="last_update">সর্বশেষ আপডেট</string>
     <string name="main_dict_description">মূল অভিধান</string>
     <string name="settings">সেটিংস</string>
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index c95caa32a..e750a1320 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -103,7 +103,6 @@
     <string name="dictionary_available">"Rječnik je dostupan"</string>
     <string name="cannot_connect_to_dict_service">"Problem prilikom povezivanja na uslugu rječnika"</string>
     <string name="no_dictionaries_available">"Nema dostupnih rječnika"</string>
-    <string name="check_for_updates_now">"Osvježi"</string>
     <string name="last_update">"Posljednji put ažurirano"</string>
     <string name="main_dict_description">"Glavni rječnik"</string>
     <string name="settings">"Postavke"</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 3e8809560..fba7d4d98 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Diccionari disponible"</string>
     <string name="cannot_connect_to_dict_service">"Error en connectar amb el diccionari"</string>
     <string name="no_dictionaries_available">"Cap diccion. dispon."</string>
-    <string name="check_for_updates_now">"Actualitza"</string>
     <string name="last_update">"Última actualització"</string>
     <string name="main_dict_description">"Diccionari principal"</string>
     <string name="settings">"Configuració"</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 8f8e1ab5f..af86638e8 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -103,7 +103,6 @@
     <string name="dictionary_available">"Slovník k dispozici"</string>
     <string name="cannot_connect_to_dict_service">"Chyba přip. k slovníku"</string>
     <string name="no_dictionaries_available">"Žádné slovníky"</string>
-    <string name="check_for_updates_now">"Aktualizovat"</string>
     <string name="last_update">"Poslední aktualizace"</string>
     <string name="main_dict_description">"Hlavní slovník"</string>
     <string name="settings">"Nastavení"</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 80ef0cf27..474578443 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Ordbog er tilgængelig"</string>
     <string name="cannot_connect_to_dict_service">"Ingen ordbogstjeneste"</string>
     <string name="no_dictionaries_available">"Ingen tilg. ordbøger"</string>
-    <string name="check_for_updates_now">"Opdater"</string>
     <string name="last_update">"Sidst opdateret"</string>
     <string name="main_dict_description">"Hovedordbog"</string>
     <string name="settings">"Indstillinger"</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5ba450120..301c39984 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -101,7 +101,6 @@
     <string name="dictionary_available">"Wörterbuch verfügbar"</string>
     <string name="cannot_connect_to_dict_service">"Kein Wörterbuchdienst"</string>
     <string name="no_dictionaries_available">"Keine Wörterbücher"</string>
-    <string name="check_for_updates_now">"Aktualisieren"</string>
     <string name="last_update">"Zuletzt aktualisiert"</string>
     <string name="main_dict_description">"Allgemeines Wörterbuch"</string>
     <string name="settings">"Einstellungen"</string>
@@ -231,7 +230,6 @@
     <string name="hint_show_keyboard">Für Vorschau klicken</string>
     <string name="show_popup_keys_normal">In den Tastatursprachen definierte Varianten anzeigen (Standard)</string>
     <string name="show_popup_keys_more">Gemeinsame Varianten hinzufügen</string>
-    <string name="customize_shift_symbols">Layout für weitere Symbole anpassen</string>
     <string name="theme_name_user" tools:keep="@string/theme_name_user">Benutzerdefiniert</string>
     <string name="replace_dictionary">Wörterbuch ersetzen</string>
     <string name="button_add_to_language">Hinzufügen zu %s</string>
@@ -243,12 +241,11 @@
     <string name="popup_keys_number" tools:keep="@string/popup_keys_number">Zahlenreihe</string>
     <string name="subtype_no_language_bepo">Alphabet (Bépo)</string>
     <string name="button_restore">Wiederherstellen</string>
-    <string name="customize_symbols">Symbollayout anpassen</string>
     <string name="popup_order">Popup-Tastenreihenfolge wählen</string>
     <string name="version">Version</string>
     <string name="hint_source">Hinweis-Quelle wählen</string>
     <string name="load_gesture_library_summary">Native Bibliothek bereitstellen um Gesteneingabe zu aktivieren</string>
-    <string name="shift_symbols">Mehr Symbole</string>
+    <string name="layout_symbols_shifted">Mehr Symbole</string>
     <string name="url_detection_summary">Versuche URLs und ähnliches als einzelnes Wort zu erkennen</string>
     <string name="button_select_language">Sprache auswählen</string>
     <string name="select_color_key">Tastenbeschriftung</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 1794f86db..6d2ca3c13 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Διαθέσιμο λεξικό"</string>
     <string name="cannot_connect_to_dict_service">"Πρόβλ. σύνδ. στο λεξικό."</string>
     <string name="no_dictionaries_available">"Δεν υπάρχουν λεξικά"</string>
-    <string name="check_for_updates_now">"Ανανέωση"</string>
     <string name="last_update">"Τελευταία ενημέρωση"</string>
     <string name="main_dict_description">"Κύριο λεξικό"</string>
     <string name="settings">"Ρυθμίσεις"</string>
diff --git a/app/src/main/res/values-en-rAU/strings.xml b/app/src/main/res/values-en-rAU/strings.xml
index c3f02c6f7..926bc0514 100644
--- a/app/src/main/res/values-en-rAU/strings.xml
+++ b/app/src/main/res/values-en-rAU/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Dictionary available"</string>
     <string name="cannot_connect_to_dict_service">"Problem connecting to dictionary service"</string>
     <string name="no_dictionaries_available">"No dictionaries available"</string>
-    <string name="check_for_updates_now">"Refresh"</string>
     <string name="last_update">"Last updated"</string>
     <string name="main_dict_description">"Main dictionary"</string>
     <string name="settings">"Settings"</string>
diff --git a/app/src/main/res/values-en-rCA/strings.xml b/app/src/main/res/values-en-rCA/strings.xml
index c3f02c6f7..926bc0514 100644
--- a/app/src/main/res/values-en-rCA/strings.xml
+++ b/app/src/main/res/values-en-rCA/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Dictionary available"</string>
     <string name="cannot_connect_to_dict_service">"Problem connecting to dictionary service"</string>
     <string name="no_dictionaries_available">"No dictionaries available"</string>
-    <string name="check_for_updates_now">"Refresh"</string>
     <string name="last_update">"Last updated"</string>
     <string name="main_dict_description">"Main dictionary"</string>
     <string name="settings">"Settings"</string>
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index 79c3658c7..309b97524 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Dictionary available"</string>
     <string name="cannot_connect_to_dict_service">"Problem connecting to dictionary service"</string>
     <string name="no_dictionaries_available">"No dictionaries available"</string>
-    <string name="check_for_updates_now">"Refresh"</string>
     <string name="last_update">"Last updated"</string>
     <string name="main_dict_description">"Main dictionary"</string>
     <string name="settings">"Settings"</string>
diff --git a/app/src/main/res/values-en-rIN/strings.xml b/app/src/main/res/values-en-rIN/strings.xml
index ce3cb6e9a..002cd7e90 100644
--- a/app/src/main/res/values-en-rIN/strings.xml
+++ b/app/src/main/res/values-en-rIN/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Dictionary available"</string>
     <string name="cannot_connect_to_dict_service">"Problem connecting to dictionary service"</string>
     <string name="no_dictionaries_available">"No dictionaries available"</string>
-    <string name="check_for_updates_now">"Refresh"</string>
     <string name="last_update">"Last updated"</string>
     <string name="main_dict_description">"Main dictionary"</string>
     <string name="settings">"Settings"</string>
diff --git a/app/src/main/res/values-en-rXC/strings.xml b/app/src/main/res/values-en-rXC/strings.xml
index d67c5f24e..549bb00e4 100644
--- a/app/src/main/res/values-en-rXC/strings.xml
+++ b/app/src/main/res/values-en-rXC/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‎‏‎‎‏‏‏‎‏‏‎‎‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‎‏‎‏‎Dictionary available‎‏‎‎‏‎"</string>
     <string name="cannot_connect_to_dict_service">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‏‏‎‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‎‎‎‎‎Problem connecting to dictionary service‎‏‎‎‏‎"</string>
     <string name="no_dictionaries_available">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‏‏‎‎‎‏‎‎‏‏‎‎‏‎‎‎‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‏‎‏‏‏‎‎No dictionaries available‎‏‎‎‏‎"</string>
-    <string name="check_for_updates_now">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‏‎‏‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‎‎Refresh‎‏‎‎‏‎"</string>
     <string name="last_update">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‎‏‎‎‏‏‏‏‏‎‎‎‎‎‎‏‎‎‏‏‎‎‎Last updated‎‏‎‎‏‎"</string>
     <string name="main_dict_description">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‏‏‎‎‎‏‎‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‎‎‎‎‎‏‎‏‏‎‏‏‎‎Main dictionary‎‏‎‎‏‎"</string>
     <string name="settings">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‎‏‏‎‎‏‏‎‏‏‏‎‎‎‏‏‏‎‏‏‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‎‎‎‎Settings‎‏‎‎‏‎"</string>
diff --git a/app/src/main/res/values-es-rUS/strings.xml b/app/src/main/res/values-es-rUS/strings.xml
index d7f598bc0..e6d789ed2 100644
--- a/app/src/main/res/values-es-rUS/strings.xml
+++ b/app/src/main/res/values-es-rUS/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Diccionario disponible"</string>
     <string name="cannot_connect_to_dict_service">"Err. conex. con dic."</string>
     <string name="no_dictionaries_available">"No hay diccionarios."</string>
-    <string name="check_for_updates_now">"Actualizar"</string>
     <string name="last_update">"Última actualización"</string>
     <string name="main_dict_description">"Diccionario principal"</string>
     <string name="settings">"Configuración"</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index be807d7bb..f6d3ee122 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Diccionario disponible"</string>
     <string name="cannot_connect_to_dict_service">"Error al conectar"</string>
     <string name="no_dictionaries_available">"No hay diccionarios"</string>
-    <string name="check_for_updates_now">"Actualizar"</string>
     <string name="last_update">"Última actualización"</string>
     <string name="main_dict_description">"Diccionario principal"</string>
     <string name="settings">"Ajustes"</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index df8b06ba9..91f3255e7 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Sõnastik on saadaval"</string>
     <string name="cannot_connect_to_dict_service">"Probleem sõnastikuga ühendumisel"</string>
     <string name="no_dictionaries_available">"Sõnastikke pole"</string>
-    <string name="check_for_updates_now">"Värskenda"</string>
     <string name="last_update">"Viimati värskendatud"</string>
     <string name="main_dict_description">"Peamine sõnastik"</string>
     <string name="settings">"Seaded"</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 90828b816..45acd065e 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Hiztegia erabilgarri"</string>
     <string name="cannot_connect_to_dict_service">"Arazoa gertatu da hiztegi-zerbitzuarekin konektatzean"</string>
     <string name="no_dictionaries_available">"Ez dago hiztegirik erabilgarri"</string>
-    <string name="check_for_updates_now">"Freskatu"</string>
     <string name="last_update">"Azken eguneratzea"</string>
     <string name="main_dict_description">"Hiztegi nagusia"</string>
     <string name="settings">"Ezarpenak"</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 80adb0a95..e46a5d4b3 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"واژه‌نامه موجود است"</string>
     <string name="cannot_connect_to_dict_service">"مشکل اتصال به سرویس واژه‌نامه"</string>
     <string name="no_dictionaries_available">"هیچ فرهنگ لغتی موجود نیست"</string>
-    <string name="check_for_updates_now">"بازخوانی"</string>
     <string name="last_update">"آخرین به‌روزرسانی"</string>
     <string name="main_dict_description">"واژه‌نامه اصلی"</string>
     <string name="settings">"تنظیمات"</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 429e51a11..65cdf22de 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Sanakirja saatavilla"</string>
     <string name="cannot_connect_to_dict_service">"Ei yhteyttä sanak."</string>
     <string name="no_dictionaries_available">"Ei sanak. saatavilla"</string>
-    <string name="check_for_updates_now">"Päivitä"</string>
     <string name="last_update">"Päivitetty viimeksi"</string>
     <string name="main_dict_description">"Pääsanakirja"</string>
     <string name="settings">"Asetukset"</string>
diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
index 99c81ad2c..905d93b16 100644
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Dictionnaire disponible"</string>
     <string name="cannot_connect_to_dict_service">"Pas de service dico."</string>
     <string name="no_dictionaries_available">"Aucun dictionnaire"</string>
-    <string name="check_for_updates_now">"Actualiser"</string>
     <string name="last_update">"Dernière mise à jour"</string>
     <string name="main_dict_description">"Dictionnaire principal"</string>
     <string name="settings">"Paramètres"</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 6a6a2005c..63f7b58f7 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -91,9 +91,7 @@
     <string name="delete_layout">Souhaitez-vous réellement supprimer la disposition personnalisée %s?</string>
     <string name="layout_error">Erreur de disposition : %s</string>
     <string name="edit_layout">Appuyez pour modifier la disposition d\'origine</string>
-    <string name="customize_symbols">Personnaliser la dispostion des symboles</string>
-    <string name="customize_shift_symbols">Personnaliser davantage la disposition des symboles</string>
-    <string name="shift_symbols">Plus de symboles</string>
+    <string name="layout_symbols_shifted">Plus de symboles</string>
     <string name="customize_background_image">Définir une image d\'arrière-plan</string>
     <string name="day_or_night_image">Définir l\'image pour le mode jour ou nuit ?</string>
     <string name="day_or_night_day">Jour</string>
@@ -150,7 +148,6 @@ Nouveau dictionnaire:
     <string name="dictionary_available">"Dictionnaire disponible"</string>
     <string name="cannot_connect_to_dict_service">"Pas de service dico."</string>
     <string name="no_dictionaries_available">"Aucun dictionnaire"</string>
-    <string name="check_for_updates_now">"Actualiser"</string>
     <string name="last_update">"Dernière mise à jour"</string>
     <string name="main_dict_description">"Dictionnaire principal"</string>
     <string name="delete">"Supprimer"</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 5c00cdde8..72d778f42 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -101,7 +101,6 @@
     <string name="dictionary_available">"Dicionario dispoñible"</string>
     <string name="cannot_connect_to_dict_service">"Erro ao conectar"</string>
     <string name="no_dictionaries_available">"Non hai dicionarios"</string>
-    <string name="check_for_updates_now">"Actualizar"</string>
     <string name="last_update">"Última actualización"</string>
     <string name="main_dict_description">"Dicionario principal"</string>
     <string name="settings">"Configuración"</string>
@@ -279,9 +278,7 @@
     <string name="delete_layout">Queres eliminar a disposición persoal %s?</string>
     <string name="layout_error">Erro na disposición: %s</string>
     <string name="edit_layout">Toca para editar a disposición</string>
-    <string name="customize_symbols">Personaliza os símbolos da disposición</string>
-    <string name="customize_shift_symbols">Personaliza máis símbolos na disposición</string>
-    <string name="shift_symbols">Máis símbolos</string>
+    <string name="layout_symbols_shifted">Máis símbolos</string>
     <string name="customize_background_image">Establece imaxe de fondo</string>
     <string name="day_or_night_image">Establecer para o modo diurno ou nocturno?</string>
     <string name="day_or_night_day">Día</string>
diff --git a/app/src/main/res/values-gu/strings.xml b/app/src/main/res/values-gu/strings.xml
index da806891d..bca265c8f 100644
--- a/app/src/main/res/values-gu/strings.xml
+++ b/app/src/main/res/values-gu/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"શબ્દકોશ ઉપલબ્ધ છે"</string>
     <string name="cannot_connect_to_dict_service">"શબ્દકોશ સેવા સાથે કનેક્ટ થવામાં સમસ્યા"</string>
     <string name="no_dictionaries_available">"કોઈ શબ્દકોશ ઉપલબ્ધ નથી"</string>
-    <string name="check_for_updates_now">"તાજું કરો"</string>
     <string name="last_update">"છેલ્લે અપડેટ કર્યું"</string>
     <string name="main_dict_description">"મુખ્ય શબ્દકોશ"</string>
     <string name="settings">"સેટિંગ્સ"</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 9da1c1ddc..e8ec9529a 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"शब्दकोश उपलब्‍ध"</string>
     <string name="cannot_connect_to_dict_service">"शब्दकोश सेवा से कनेक्ट करने में समस्या"</string>
     <string name="no_dictionaries_available">"डिक्‍शनरी अनुपलब्‍ध"</string>
-    <string name="check_for_updates_now">"रीफ़्रेश करें"</string>
     <string name="last_update">"आख़री बार अपडेट किया गया"</string>
     <string name="main_dict_description">"मुख्‍य डिक्‍शनरी"</string>
     <string name="settings">"सेटिंग"</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 1ddf2929b..6e152b7a5 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Dostupan je rječnik"</string>
     <string name="cannot_connect_to_dict_service">"Nema usluge rječnika"</string>
     <string name="no_dictionaries_available">"Rječnici nedostupni"</string>
-    <string name="check_for_updates_now">"Osvježavanje"</string>
     <string name="last_update">"Zadnje ažuriranje"</string>
     <string name="main_dict_description">"Glavni rječnik"</string>
     <string name="settings">"Postavke"</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 06c6e4081..62794a23d 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Van rendelkezésre álló szótár"</string>
     <string name="cannot_connect_to_dict_service">"Csatlakozási hiba"</string>
     <string name="no_dictionaries_available">"Nincs szótár"</string>
-    <string name="check_for_updates_now">"Frissítés"</string>
     <string name="last_update">"Legutóbb frissítve"</string>
     <string name="main_dict_description">"Fő szótár"</string>
     <string name="settings">"Beállítások"</string>
diff --git a/app/src/main/res/values-hy/strings.xml b/app/src/main/res/values-hy/strings.xml
index f8bad4c7b..68e699dcd 100644
--- a/app/src/main/res/values-hy/strings.xml
+++ b/app/src/main/res/values-hy/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Բառարանն առկա է"</string>
     <string name="cannot_connect_to_dict_service">"Բառարանային ծառայությանը միացման խնդիր կա"</string>
     <string name="no_dictionaries_available">"Բառարաններ չկան"</string>
-    <string name="check_for_updates_now">"Թարմացնել"</string>
     <string name="last_update">"Վերջին անգամ թարմացվել է"</string>
     <string name="main_dict_description">"Հիմնական բառարան"</string>
     <string name="settings">"Կարգավորումներ"</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index f233e9f5d..311530e88 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Kamus yang tersedia"</string>
     <string name="cannot_connect_to_dict_service">"Problem koneksi kamus"</string>
     <string name="no_dictionaries_available">"Tidak tersedia kamus"</string>
-    <string name="check_for_updates_now">"Segarkan"</string>
     <string name="last_update">"Terakhir diperbarui"</string>
     <string name="main_dict_description">"Kamus utama"</string>
     <string name="settings">"Setelan"</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 19573d906..a3af390c8 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Orðabók í boði"</string>
     <string name="cannot_connect_to_dict_service">"Vandamál við að tengjast orðabókarþjónustu"</string>
     <string name="no_dictionaries_available">"Engar orðabækur"</string>
-    <string name="check_for_updates_now">"Endurnýja"</string>
     <string name="last_update">"Síðast uppfært"</string>
     <string name="main_dict_description">"Aðalorðabók"</string>
     <string name="settings">"Stillingar"</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 84290029b..be3a589d2 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -101,7 +101,6 @@
     <string name="dictionary_available">"Dizionario disponibile"</string>
     <string name="cannot_connect_to_dict_service">"Conness. diz. imposs"</string>
     <string name="no_dictionaries_available">"Nessun dizionario"</string>
-    <string name="check_for_updates_now">"Aggiorna"</string>
     <string name="last_update">"Ultimo aggiornamento"</string>
     <string name="main_dict_description">"Dizionario principale"</string>
     <string name="settings">"Impostazioni"</string>
@@ -241,10 +240,8 @@
     <string name="subtype_generic_sebeolsik_final"><xliff:g id="LANGUAGE_NAME" example="Korean">%s</xliff:g> (Tipo tastiera Sebeolsik Final)</string>
     <string name="day_or_night_day">Diurna</string>
     <string name="customize_background_image">Imposta un\'immagine di sfondo</string>
-    <string name="customize_shift_symbols">Personalizza più simboli del layout</string>
     <string name="subtype_no_language_bepo">Alphabet (tipo tastiera Bépo)</string>
-    <string name="customize_symbols">Personalizza i simboli del layout</string>
-    <string name="shift_symbols">Più simboli</string>
+    <string name="layout_symbols_shifted">Più simboli</string>
     <string name="day_or_night_image">Imposta immagine per modalità diurna o notturna?</string>
     <string name="dictionary_settings_category">Dizionari</string>
     <string name="setup_step3_action">Configura la tastiera</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 7bc36fca9..ef2612bdc 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"מילון זמין"</string>
     <string name="cannot_connect_to_dict_service">"בעיה בהתחברות לשירות המילון"</string>
     <string name="no_dictionaries_available">"אין מילונים זמינים"</string>
-    <string name="check_for_updates_now">"רענן"</string>
     <string name="last_update">"עודכן לאחרונה"</string>
     <string name="main_dict_description">"מילון ראשי"</string>
     <string name="settings">"הגדרות"</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 311fed8b3..5f2721f6d 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"辞書を利用できます"</string>
     <string name="cannot_connect_to_dict_service">"辞書に接続できません"</string>
     <string name="no_dictionaries_available">"辞書はありません"</string>
-    <string name="check_for_updates_now">"更新"</string>
     <string name="last_update">"最終更新"</string>
     <string name="main_dict_description">"メイン辞書"</string>
     <string name="settings">"設定"</string>
diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml
index 72901b6d2..9a6e842c9 100644
--- a/app/src/main/res/values-ka/strings.xml
+++ b/app/src/main/res/values-ka/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"ხელმისაწვდომია ლექსიკონი"</string>
     <string name="cannot_connect_to_dict_service">"ლექსიკონის სერვისთან დაკავშირებით პრობლემა წარმოიშვა"</string>
     <string name="no_dictionaries_available">"ლექსიკონები მიუწვდომელია"</string>
-    <string name="check_for_updates_now">"განახლება"</string>
     <string name="last_update">"ბოლო განახლება"</string>
     <string name="main_dict_description">"მთავარი ლექსიკონი"</string>
     <string name="settings">"პარამეტრები"</string>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index fbaa1e3b2..3b5214d45 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -25,7 +25,6 @@
     <string name="user_dict_settings_add_shortcut_option_name">Anegzum:</string>
     <string name="user_dict_fast_scroll_alphabet">" ABCČDḌEƐFGǦƔHḤIJKLMNPQRṚSṢTṬUWXYZẒ"</string>
     <string name="theme_name_pink" tools:keep="@string/theme_name_pink">Axuxi</string>
-    <string name="check_for_updates_now">Smiren</string>
     <string name="theme_name_brown" tools:keep="@string/theme_name_brown">Aqehwi</string>
     <string name="theme_name_forest" tools:keep="@string/theme_name_forest">Lexla</string>
     <string name="version">Lqem</string>
diff --git a/app/src/main/res/values-kk/strings.xml b/app/src/main/res/values-kk/strings.xml
index 01a4fa220..5b64d0458 100644
--- a/app/src/main/res/values-kk/strings.xml
+++ b/app/src/main/res/values-kk/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Сөздік қолжетімді"</string>
     <string name="cannot_connect_to_dict_service">"Сөздік қызметіне қосылу мәселесі"</string>
     <string name="no_dictionaries_available">"Сөздіктер қолжетімсіз"</string>
-    <string name="check_for_updates_now">"Жаңарту"</string>
     <string name="last_update">"Соңғы жаңартылған"</string>
     <string name="main_dict_description">"Негізгі сөздік"</string>
     <string name="settings">"Параметрлер"</string>
diff --git a/app/src/main/res/values-km/strings.xml b/app/src/main/res/values-km/strings.xml
index e34a9a017..104fde57b 100644
--- a/app/src/main/res/values-km/strings.xml
+++ b/app/src/main/res/values-km/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"វចនានុក្រម​​​អាច​ប្រើ​បាន"</string>
     <string name="cannot_connect_to_dict_service">"មាន​បញ្ហា​ក្នុង​ការ​​ភ្ជាប់​ទៅ​​សេវា​កម្ម​វចនានុក្រម"</string>
     <string name="no_dictionaries_available">"គ្មាន​វចនានុក្រម"</string>
-    <string name="check_for_updates_now">"ផ្ទុក​ឡើងវិញ"</string>
     <string name="last_update">"បាន​ធ្វើ​បច្ចុប្បន្នភាព​ចុងក្រោយ"</string>
     <string name="main_dict_description">"វចនានុក្រម​ចម្បង"</string>
     <string name="settings">"ការ​កំណត់"</string>
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index 7fe1aa1c5..b11a78830 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"ನಿಘಂಟು ಲಭ್ಯವಿದೆ"</string>
     <string name="cannot_connect_to_dict_service">"ನಿಘಂಟು ಸೇವೆಗೆ ಸಂಪರ್ಕಗೊಳಿಸುವಾಗ ಸಮಸ್ಯೆ"</string>
     <string name="no_dictionaries_available">"ನಿಘಂಟುಗಳು ಲಭ್ಯವಿಲ್ಲ"</string>
-    <string name="check_for_updates_now">"ರಿಫ್ರೆಶ್ ಮಾಡಿ"</string>
     <string name="last_update">"ಕೊನೆಯದಾಗಿ ನವೀಕರಿಸಿರುವುದು"</string>
     <string name="main_dict_description">"ಮುಖ್ಯ ನಿಘಂಟು"</string>
     <string name="settings">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 0e76c9528..81b1a42d0 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"사전 사용 가능"</string>
     <string name="cannot_connect_to_dict_service">"사전 서비스에 연결하는 중에 문제가 발생했습니다."</string>
     <string name="no_dictionaries_available">"사용할 수 있는 사전이 없습니다."</string>
-    <string name="check_for_updates_now">"새로고침"</string>
     <string name="last_update">"최종 업데이트"</string>
     <string name="main_dict_description">"기본 사전"</string>
     <string name="settings">"설정"</string>
diff --git a/app/src/main/res/values-ky/strings.xml b/app/src/main/res/values-ky/strings.xml
index 5c1d1c97d..6e93b9b80 100644
--- a/app/src/main/res/values-ky/strings.xml
+++ b/app/src/main/res/values-ky/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Сөздүк бар"</string>
     <string name="cannot_connect_to_dict_service">"Сөздүк кызматына туташуу көйгөйү"</string>
     <string name="no_dictionaries_available">"Сөздүктөр жок"</string>
-    <string name="check_for_updates_now">"Жаңылоо"</string>
     <string name="last_update">"Акыркы жолу жаңыртылган"</string>
     <string name="main_dict_description">"Негизги сөздүк"</string>
     <string name="settings">"Жөндөөлөр"</string>
diff --git a/app/src/main/res/values-lo/strings.xml b/app/src/main/res/values-lo/strings.xml
index 9a1e96943..4e9766af6 100644
--- a/app/src/main/res/values-lo/strings.xml
+++ b/app/src/main/res/values-lo/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"ມີວັດຈະນານຸກົມ"</string>
     <string name="cannot_connect_to_dict_service">"ມີປັນຫາໃນການເຊື່ອມຕໍ່ກັບບໍລິການວັດຈະນານຸກົມ"</string>
     <string name="no_dictionaries_available">"ບໍ່ມີວັດຈະນານຸກົມ"</string>
-    <string name="check_for_updates_now">"ດຶງຂໍ້ມູນໃຫມ່"</string>
     <string name="last_update">"ອັບເດດຫຼ້າສຸດ"</string>
     <string name="main_dict_description">"ວັດຈະນານຸກົມຫຼັກ"</string>
     <string name="settings">"ການຕັ້ງຄ່າ"</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 6cae388d6..7da5235fa 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Galimas žodynas"</string>
     <string name="cannot_connect_to_dict_service">"Prisijung. problema"</string>
     <string name="no_dictionaries_available">"Nėra galimų žodynų"</string>
-    <string name="check_for_updates_now">"Atnaujinti"</string>
     <string name="last_update">"Paskutinį kartą atnaujinta"</string>
     <string name="main_dict_description">"Pagrindinis žodynas"</string>
     <string name="settings">"Nustatymai"</string>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index cd46f2464..1ac066eee 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Vārdnīca ir pieejama"</string>
     <string name="cannot_connect_to_dict_service">"Nevar savien. ar vārdnīcas pakalp."</string>
     <string name="no_dictionaries_available">"Vārdn. nav pieejamas"</string>
-    <string name="check_for_updates_now">"Atsvaidzināt"</string>
     <string name="last_update">"Pēdējo reizi atjaunināts"</string>
     <string name="main_dict_description">"Galvenā vārdnīca"</string>
     <string name="settings">"Iestatījumi"</string>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 4182bb503..86fa5154e 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Речникот е достапен"</string>
     <string name="cannot_connect_to_dict_service">"Проблем при поврзувањето со услугата речник"</string>
     <string name="no_dictionaries_available">"Нема достапен речник"</string>
-    <string name="check_for_updates_now">"Освежи"</string>
     <string name="last_update">"Последен пат ажурирано"</string>
     <string name="main_dict_description">"Главен речник"</string>
     <string name="settings">"Поставки"</string>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index d5913bf55..32b7bf8cb 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"നിഘണ്ടു ലഭ്യമാണ്"</string>
     <string name="cannot_connect_to_dict_service">"നിഘണ്ടു സേവനത്തിൽ കണക്റ്റുചെയ്യുന്നതിൽ പ്രശ്‌നം"</string>
     <string name="no_dictionaries_available">"നിഘണ്ടുക്കളൊന്നും ലഭ്യമല്ല"</string>
-    <string name="check_for_updates_now">"പുതുക്കുക"</string>
     <string name="last_update">"അവസാനം അപ്ഡേറ്റുചെയ്തത്"</string>
     <string name="main_dict_description">"പ്രധാന നിഘണ്ടു"</string>
     <string name="settings">"ക്രമീകരണം"</string>
diff --git a/app/src/main/res/values-mn/strings.xml b/app/src/main/res/values-mn/strings.xml
index 8181d5e22..3d7485355 100644
--- a/app/src/main/res/values-mn/strings.xml
+++ b/app/src/main/res/values-mn/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Толь бичиг байна"</string>
     <string name="cannot_connect_to_dict_service">"Толь бичгийн үйлчилгээнд холбогдоход алдаа гарлаа"</string>
     <string name="no_dictionaries_available">"Толь бичиг байхгүй"</string>
-    <string name="check_for_updates_now">"Дахин шинэчлэх"</string>
     <string name="last_update">"Сүүлд шинэчлэгдсэн"</string>
     <string name="main_dict_description">"Үндсэн толь бичиг"</string>
     <string name="settings">"Тохиргоо"</string>
diff --git a/app/src/main/res/values-mr/strings.xml b/app/src/main/res/values-mr/strings.xml
index 50d62a7d9..d5f2f7587 100644
--- a/app/src/main/res/values-mr/strings.xml
+++ b/app/src/main/res/values-mr/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"शब्दकोश उपलब्ध"</string>
     <string name="cannot_connect_to_dict_service">"शब्दकोश सेवेस कनेक्ट करताना समस्या"</string>
     <string name="no_dictionaries_available">"कोणतेही शब्दकोश उपलब्ध नाहीत"</string>
-    <string name="check_for_updates_now">"रिफ्रेश करा"</string>
     <string name="last_update">"अंतिम अपडेट"</string>
     <string name="main_dict_description">"मु्ख्य शब्दकोश"</string>
     <string name="settings">"सेटिंग्ज"</string>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index adec8bd55..84e9a5f60 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Kamus tersedia"</string>
     <string name="cannot_connect_to_dict_service">"Masalah menyambung kepada perkhidmatan kamus"</string>
     <string name="no_dictionaries_available">"Tiada kamus tersedia"</string>
-    <string name="check_for_updates_now">"Muatkan semula"</string>
     <string name="last_update">"Kali terakhir dikemas kini"</string>
     <string name="main_dict_description">"Kamus utama"</string>
     <string name="settings">"Tetapan"</string>
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
index 9d1d54833..8018e55d4 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"အဘိဓါန်ရရှိနိုင်"</string>
     <string name="cannot_connect_to_dict_service">"အဘိဓါန်ဝန်ဆောင်မှုသို့ ချိတ်ဆက်ရန် ပြဿနာရှိနေသည်"</string>
     <string name="no_dictionaries_available">"အဘိဓါန်မရှိ"</string>
-    <string name="check_for_updates_now">"ပြန်လည်ဆန်းသစ်ရန်"</string>
     <string name="last_update">"နောက်ဆုံး အသစ်မွမ်းမံမှု"</string>
     <string name="main_dict_description">"အဓိက အဘိဓါန်"</string>
     <string name="settings">"ဆက်တင်များ"</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index cd9d0ad0b..bb8cf9ac5 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Ordliste tilgjengelig"</string>
     <string name="cannot_connect_to_dict_service">"Kan ikke koble til ordlistetjenesten"</string>
     <string name="no_dictionaries_available">"Fant ingen ordlister"</string>
-    <string name="check_for_updates_now">"Last inn på nytt"</string>
     <string name="last_update">"Sist oppdatert"</string>
     <string name="main_dict_description">"Hovedordliste"</string>
     <string name="settings">"Innstillinger"</string>
diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml
index 4f644f72e..e3c408335 100644
--- a/app/src/main/res/values-ne/strings.xml
+++ b/app/src/main/res/values-ne/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"उपलब्ध शब्दकोश"</string>
     <string name="cannot_connect_to_dict_service">"शब्दकोश सेवासँग जोड्न समस्या"</string>
     <string name="no_dictionaries_available">"शब्दकोशहरू उपलब्ध छैनन्"</string>
-    <string name="check_for_updates_now">"पुनः ताजा गर्नुहोस्"</string>
     <string name="last_update">"पछिल्लो अद्यावधिक"</string>
     <string name="main_dict_description">"मुख्य शब्दकोश"</string>
     <string name="settings">"सेटिङहरू"</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 830262d09..2e850af9a 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Woordenboek beschikbaar"</string>
     <string name="cannot_connect_to_dict_service">"Verbindingsprobleem woordenboekservice"</string>
     <string name="no_dictionaries_available">"Geen woordenboeken"</string>
-    <string name="check_for_updates_now">"Vernieuwen"</string>
     <string name="last_update">"Laatst bijgewerkt"</string>
     <string name="main_dict_description">"Algemeen woordenboek"</string>
     <string name="settings">"Instellingen"</string>
diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml
index a5d67571a..01de26ef2 100644
--- a/app/src/main/res/values-pa-rPK/strings.xml
+++ b/app/src/main/res/values-pa-rPK/strings.xml
@@ -41,7 +41,6 @@
     <string name="setup_finish_action">پورا ہویا</string>
     <string name="subtype_locale">بولی</string>
     <string name="settings">سیٹنگاں</string>
-    <string name="check_for_updates_now">تازہ کرو</string>
     <string name="user_dict_settings_add_shortcut_option_name">شورٹکٹ:</string>
     <string name="use_double_space_period">دو خالی تھاں ڈنڈی</string>
     <string name="settings_screen_gesture">سنکیت نال اینپُٹ کرن</string>
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index 0af127490..4515157c7 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"ਸ਼ਬਦਕੋਸ਼ ਉਪਲਬਧ"</string>
     <string name="cannot_connect_to_dict_service">"ਸ਼ਬਦਕੋਸ਼ ਸੇਵਾ ਕਨੈਕਟ ਕਰਨ ਵਿੱਚ ਸਮੱਸਿਆ"</string>
     <string name="no_dictionaries_available">"ਕੋਈ ਸ਼ਬਦਕੋਸ਼ ਉਪਲਬਧ ਨਹੀਂ"</string>
-    <string name="check_for_updates_now">"ਤਾਜ਼ਾ"</string>
     <string name="last_update">"ਆਖਰੀ ਵਾਰ ਅੱਪਡੇਟ ਕੀਤਾ"</string>
     <string name="main_dict_description">"ਮੁੱਖ ਸ਼ਬਦਕੋਸ਼"</string>
     <string name="settings">"ਸੈਟਿੰਗਾਂ"</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 839db25f0..ef319d4a2 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Słownik dostępny"</string>
     <string name="cannot_connect_to_dict_service">"Problem z połączeniem z usługą słownika"</string>
     <string name="no_dictionaries_available">"Brak słowników"</string>
-    <string name="check_for_updates_now">"Odśwież"</string>
     <string name="last_update">"Ostatnia aktualizacja"</string>
     <string name="main_dict_description">"Słownik główny"</string>
     <string name="settings">"Ustawienia"</string>
@@ -233,7 +232,6 @@
     <string name="hint_show_keyboard">Dotknij, aby wyświetlić podgląd</string>
     <string name="show_popup_keys_normal">Pokaż warianty zdefiniowane w językach klawiatury (domyślnie)</string>
     <string name="show_popup_keys_more">Pokaż popularne warianty</string>
-    <string name="customize_shift_symbols">Dostosuj układ większej liczby symboli</string>
     <string name="theme_name_user" tools:keep="@string/theme_name_user">Własne</string>
     <string name="replace_dictionary">Zastąp słownik</string>
     <string name="button_add_to_language">Dodaj do %s</string>
@@ -245,12 +243,11 @@
     <string name="popup_keys_number" tools:keep="@string/popup_keys_number">Rząd numeryczny</string>
     <string name="subtype_no_language_bepo">Alfabet (Bépo)</string>
     <string name="button_restore">Przywracanie</string>
-    <string name="customize_symbols">Dostosuj układ symboli</string>
     <string name="popup_order">Wybierz kolejność klawiszy w wyskakującym okienku</string>
     <string name="version">Wersja</string>
     <string name="hint_source">Wybierz źródło wskazówek</string>
     <string name="load_gesture_library_summary">Dodaj natywną bibliotekę, aby umożliwić pisanie gestami</string>
-    <string name="shift_symbols">Więcej symboli</string>
+    <string name="layout_symbols_shifted">Więcej symboli</string>
     <string name="url_detection_summary">Próbuj wykrywać adresy URL i podobne jako pojedyncze słowo</string>
     <string name="button_select_language">Wybierz język</string>
     <string name="select_color_key">Tekst klawiszy</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index efe29b87f..c85bec13e 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -83,7 +83,6 @@
     <string name="dictionary_settings_title">Adicionar dicionários</string>
     <string name="cannot_connect_to_dict_service">Erro ao contatar o serviço de dicionário</string>
     <string name="no_dictionaries_available">Nenhum dicionário disponível</string>
-    <string name="check_for_updates_now">Atualizar</string>
     <string name="last_update">Última atualização</string>
     <string name="settings">Configurações</string>
     <string name="delete">Apagar</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 1aef1c485..6eed9f557 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -103,7 +103,6 @@
     <string name="dictionary_available">"Dicionário disponível"</string>
     <string name="cannot_connect_to_dict_service">"Problema ao ligar ao serviço de dicionário"</string>
     <string name="no_dictionaries_available">"Nenhum dicionário"</string>
-    <string name="check_for_updates_now">"Atualizar"</string>
     <string name="last_update">"Última atualização"</string>
     <string name="main_dict_description">"Dicionário principal"</string>
     <string name="settings">"Definições"</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index d972ac8a6..e48cfec4e 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Dicionário disponível"</string>
     <string name="cannot_connect_to_dict_service">"Prob. conexão dic."</string>
     <string name="no_dictionaries_available">"Nenhum dicionário disponível"</string>
-    <string name="check_for_updates_now">"Atualizar"</string>
     <string name="last_update">"Última atualização"</string>
     <string name="main_dict_description">"Dicionário principal"</string>
     <string name="settings">"Configurações"</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 9545d7a1b..9014c0cc3 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Dicționar disponibil"</string>
     <string name="cannot_connect_to_dict_service">"Eroare conectare la serviciu dicționar"</string>
     <string name="no_dictionaries_available">"Niciun dicționar"</string>
-    <string name="check_for_updates_now">"Actualizați"</string>
     <string name="last_update">"Data ultimei modificări"</string>
     <string name="main_dict_description">"Dicționar principal"</string>
     <string name="settings">"Setări"</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 8f9966f39..6f7d70647 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">Доступен словарь</string>
     <string name="cannot_connect_to_dict_service">Сбой подключения</string>
     <string name="no_dictionaries_available">Словарей нет</string>
-    <string name="check_for_updates_now">Обновить</string>
     <string name="last_update">Последнее обновление</string>
     <string name="main_dict_description">Основной словарь</string>
     <string name="settings">Настройки</string>
@@ -303,9 +302,7 @@
     <string name="add_dictionary">Выберите для добавления словаря. Словари в формате .dict можно скачать %s.</string>
     <string name="right" tools:keep="@string/right">Вправо</string>
     <string name="dictionary_load_error">Ошибка загрузки файла словаря</string>
-    <string name="customize_shift_symbols">Редактировать раскладку дополнительных символов</string>
-    <string name="customize_symbols">Редактировать раскладку символов</string>
-    <string name="shift_symbols">Больше символов</string>
+    <string name="layout_symbols_shifted">Больше символов</string>
     <string name="down" tools:keep="@string/down">Вниз</string>
     <string name="full_left" tools:keep="@string/full_left">В конец влево</string>
     <string name="left" tools:keep="@string/left">Влево</string>
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index 6c45cf9fd..da05f3801 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"ශබ්දකෝෂය ලබාගත හැක"</string>
     <string name="cannot_connect_to_dict_service">"ශබ්දකෝෂ සේවාව වෙත සම්බන්ධ වීමට ගැටලුවක්ද"</string>
     <string name="no_dictionaries_available">"ශබ්ද කෝෂ ලබාගත නොහැක"</string>
-    <string name="check_for_updates_now">"නැවුම් කරන්න"</string>
     <string name="last_update">"අවසන් වරට යාවත්කාලීන කළේ"</string>
     <string name="main_dict_description">"ප්‍රධාන ශබ්ද කෝෂය"</string>
     <string name="settings">"සැකසීම්"</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index ec9ae1019..07ec33690 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"K dispozícii je slovník"</string>
     <string name="cannot_connect_to_dict_service">"Probl. s prip. k sl."</string>
     <string name="no_dictionaries_available">"Slovníky sú nedostupné"</string>
-    <string name="check_for_updates_now">"Obnoviť"</string>
     <string name="last_update">"Posledná aktualizácia"</string>
     <string name="main_dict_description">"Hlavný slovník"</string>
     <string name="settings">"Nastavenia"</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index f04ad58a8..a8b80944c 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Slovar je na voljo"</string>
     <string name="cannot_connect_to_dict_service">"Težava s povezavo"</string>
     <string name="no_dictionaries_available">"Ni slovarjev"</string>
-    <string name="check_for_updates_now">"Osveži"</string>
     <string name="last_update">"Nazadnje posodobljeno"</string>
     <string name="main_dict_description">"Glavni slovar"</string>
     <string name="settings">"Nastavitve"</string>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 475b9002d..a07129fd8 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Fjalor i përdorshëm"</string>
     <string name="cannot_connect_to_dict_service">"Problem në lidhjen me shërbimin e fjalorit"</string>
     <string name="no_dictionaries_available">"Nuk mund të përdoret asnjë fjalor"</string>
-    <string name="check_for_updates_now">"Rifresko"</string>
     <string name="last_update">"Përditësimi i fundit"</string>
     <string name="main_dict_description">"Fjalori kryesor"</string>
     <string name="settings">"Cilësimet"</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index bd547a6d8..43a0024dd 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Речник је доступан"</string>
     <string name="cannot_connect_to_dict_service">"Проблем при повезивању с услугом речника"</string>
     <string name="no_dictionaries_available">"Нема доступних речника"</string>
-    <string name="check_for_updates_now">"Освежи"</string>
     <string name="last_update">"Последње ажурирање"</string>
     <string name="main_dict_description">"Главни речник"</string>
     <string name="settings">"Подешавања"</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 45aa75e1c..794a9de99 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"En ordlista är tillgänglig"</string>
     <string name="cannot_connect_to_dict_service">"Problem med att ansluta till ordlistetjänsten"</string>
     <string name="no_dictionaries_available">"Inga ordlistor finns"</string>
-    <string name="check_for_updates_now">"Uppdatera"</string>
     <string name="last_update">"Informationen uppdaterades senast"</string>
     <string name="main_dict_description">"Huvudordlista"</string>
     <string name="settings">"Inställningar"</string>
diff --git a/app/src/main/res/values-sw/strings.xml b/app/src/main/res/values-sw/strings.xml
index 17d5c8d7b..0e93b083e 100644
--- a/app/src/main/res/values-sw/strings.xml
+++ b/app/src/main/res/values-sw/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Kamusi inapatikana"</string>
     <string name="cannot_connect_to_dict_service">"Tatizo wakati wa kuunganisha kwenye huduma ya kamusi"</string>
     <string name="no_dictionaries_available">"Hakuna kamusi inayopatikana"</string>
-    <string name="check_for_updates_now">"Onyesha upya"</string>
     <string name="last_update">"Ilibadilishwa mwisho"</string>
     <string name="main_dict_description">"Kamusi kuu"</string>
     <string name="settings">"Mipangilio"</string>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 5ba357cb9..fe0fb6a3f 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"அகராதி கிடைக்கிறது"</string>
     <string name="cannot_connect_to_dict_service">"அகராதி சேவையில் இணைப்பதில் பிரச்சனை ஏற்பட்டது"</string>
     <string name="no_dictionaries_available">"அகராதிகள் எதுவும் இல்லை"</string>
-    <string name="check_for_updates_now">"புதுப்பி"</string>
     <string name="last_update">"இறுதியாகப் புதுப்பித்தது"</string>
     <string name="main_dict_description">"முதன்மை அகராதி"</string>
     <string name="settings">"அமைப்பு"</string>
diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml
index 52cf797f8..12d67d8c8 100644
--- a/app/src/main/res/values-te/strings.xml
+++ b/app/src/main/res/values-te/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"నిఘంటువు అందుబాటులో ఉంది"</string>
     <string name="cannot_connect_to_dict_service">"నిఘంటువు సేవకు కనెక్ట్ చేయడంలో సమస్య"</string>
     <string name="no_dictionaries_available">"నిఘంటువులు ఏవీ అందుబాటులో లేవు"</string>
-    <string name="check_for_updates_now">"రీఫ్రెష్ చేయండి"</string>
     <string name="last_update">"చివరిగా నవీకరించబడినది"</string>
     <string name="main_dict_description">"ప్రధాన నిఘంటువు"</string>
     <string name="settings">"సెట్టింగ్‌లు"</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 5ec9beb72..a7bbb6d06 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"มีพจนานุกรมให้ใช้งาน"</string>
     <string name="cannot_connect_to_dict_service">"พบปัญหาขณะเชื่อมต่อ"</string>
     <string name="no_dictionaries_available">"ไม่มีพจนานุกรม"</string>
-    <string name="check_for_updates_now">"รีเฟรช"</string>
     <string name="last_update">"ปรับปรุงแก้ไขครั้งล่าสุด"</string>
     <string name="main_dict_description">"พจนานุกรมหลัก"</string>
     <string name="settings">"การตั้งค่า"</string>
diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml
index b3ee96c7a..8bbebf17b 100644
--- a/app/src/main/res/values-tl/strings.xml
+++ b/app/src/main/res/values-tl/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Available ang diksyunaryo"</string>
     <string name="cannot_connect_to_dict_service">"Di makakonekta sa serbisyong diksyunaryo"</string>
     <string name="no_dictionaries_available">"Walang mga diksyunaryo"</string>
-    <string name="check_for_updates_now">"I-refresh"</string>
     <string name="last_update">"Huling na-update"</string>
     <string name="main_dict_description">"Pangunahing diksyunaryo"</string>
     <string name="settings">"Mga Setting"</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 80240f3ca..b747e36de 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Sözlük mevcut"</string>
     <string name="cannot_connect_to_dict_service">"Sözlük hizmetine bağlantı sorunu"</string>
     <string name="no_dictionaries_available">"Kullanılabilir sözlük yok"</string>
-    <string name="check_for_updates_now">"Yenile"</string>
     <string name="last_update">"Son güncelleme tarihi"</string>
     <string name="main_dict_description">"Ana sözlük"</string>
     <string name="settings">"Ayarlar"</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 65c85f36b..5dfc4b979 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">Словник доступний</string>
     <string name="cannot_connect_to_dict_service">"Нема з’єднання зі службою словника"</string>
     <string name="no_dictionaries_available">Словники недоступні</string>
-    <string name="check_for_updates_now">Оновити</string>
     <string name="last_update">Останнє оновлення</string>
     <string name="main_dict_description">Основний словник</string>
     <string name="settings">Налаштування</string>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index c18caf851..528cd40d7 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"لغت دستیاب ہے"</string>
     <string name="cannot_connect_to_dict_service">"لغت سروس سے مربوط ہونے میں مسئلہ"</string>
     <string name="no_dictionaries_available">"کوئی لغت دستیاب نہیں"</string>
-    <string name="check_for_updates_now">"ریفریش کریں"</string>
     <string name="last_update">"آخری بار اپ ڈیٹ کردہ"</string>
     <string name="main_dict_description">"مرکزی لغت"</string>
     <string name="settings">"ترتیبات"</string>
diff --git a/app/src/main/res/values-uz/strings.xml b/app/src/main/res/values-uz/strings.xml
index 9aafed9e3..8bb7a17b3 100644
--- a/app/src/main/res/values-uz/strings.xml
+++ b/app/src/main/res/values-uz/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Lug‘at mavjud"</string>
     <string name="cannot_connect_to_dict_service">"Ulanib bo‘lmadi"</string>
     <string name="no_dictionaries_available">"Lug‘at mavjud emas"</string>
-    <string name="check_for_updates_now">"Yangilash"</string>
     <string name="last_update">"So‘nggi marta yangilandi"</string>
     <string name="main_dict_description">"Asosiy lug‘at"</string>
     <string name="settings">"Sozlamalar"</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 728b64ccd..e5c123914 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Từ điển có sẵn"</string>
     <string name="cannot_connect_to_dict_service">"Lỗi kết nối DV từ điển"</string>
     <string name="no_dictionaries_available">"Không có từ điển nào"</string>
-    <string name="check_for_updates_now">"Làm mới"</string>
     <string name="last_update">"Cập nhật lần cuối"</string>
     <string name="main_dict_description">"Từ điển chính"</string>
     <string name="settings">"Cài đặt"</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index cb8b48dfa..7d133cecd 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"字典可供下载"</string>
     <string name="cannot_connect_to_dict_service">"连接到字典服务时发生问题"</string>
     <string name="no_dictionaries_available">"没有可供下载的字典"</string>
-    <string name="check_for_updates_now">"刷新"</string>
     <string name="last_update">"上次更新时间"</string>
     <string name="main_dict_description">"主字典"</string>
     <string name="settings">"设置"</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 154c0e399..c648ba2db 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"可使用字典"</string>
     <string name="cannot_connect_to_dict_service">"連線至字典服務時發生問題"</string>
     <string name="no_dictionaries_available">"沒有可用的字典"</string>
-    <string name="check_for_updates_now">"重新整理"</string>
     <string name="last_update">"上次更新日期"</string>
     <string name="main_dict_description">"主要字典"</string>
     <string name="settings">"設定"</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 42eee1915..7c21fccf7 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"可用的字典"</string>
     <string name="cannot_connect_to_dict_service">"連線至字典服務時發生問題"</string>
     <string name="no_dictionaries_available">"沒有可用的字典"</string>
-    <string name="check_for_updates_now">"重新整理"</string>
     <string name="last_update">"上次更新時間："</string>
     <string name="main_dict_description">"主要字典"</string>
     <string name="settings">"設定"</string>
diff --git a/app/src/main/res/values-zu/strings.xml b/app/src/main/res/values-zu/strings.xml
index 313593723..b0b4f738f 100644
--- a/app/src/main/res/values-zu/strings.xml
+++ b/app/src/main/res/values-zu/strings.xml
@@ -102,7 +102,6 @@
     <string name="dictionary_available">"Isichazamazwi siyatholakala"</string>
     <string name="cannot_connect_to_dict_service">"Inkinga yokuxhumanisa kusevisi yesichazamazwi"</string>
     <string name="no_dictionaries_available">"Azikho izachazimazwi ezitholakalayo"</string>
-    <string name="check_for_updates_now">"Qala kabusha"</string>
     <string name="last_update">"Igcine ukulungiswa"</string>
     <string name="main_dict_description">"Isichazamazwi sakho esisemqoka"</string>
     <string name="settings">"Izilungiselelo"</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1f02a9447..c3ded5980 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -442,12 +442,26 @@ disposition rather than other common dispositions for Latin languages. [CHAR LIM
     <string name="layout_error">Layout error: %s</string>
     <!-- Text hint for editing layout -->
     <string name="edit_layout">Tap to edit raw layout</string>
-    <!-- Title for customizing symbols layout -->
-    <string name="customize_symbols">Customize symbols layout</string>
-    <!-- Title for customizing shift symbols layout -->
-    <string name="customize_shift_symbols">Customize more symbols layout</string>
-    <!-- Name for more symbols layout -->
-    <string name="shift_symbols">More symbols</string>
+    <!-- Title for customizing symbols or number layouts -->
+    <string name="customize_symbols_number_layouts">Customize symbols and number layouts</string>
+    <!-- Summary for customizing symbols or number layouts -->
+    <string name="customize_symbols_number_layouts_summary">Layouts (except symbols) expose internal settings which may still change. If that happens, the custom layout may not work properly any more.</string>
+    <!-- Name for symbols layout -->
+    <string name="layout_symbols" tools:keep="@string/layout_symbols">Symbols</string>
+    <!-- Name for symbols layout for arabic language -->
+    <string name="layout_symbols_arabic" tools:keep="@string/layout_symbols_arabic">Symbols (Arabic)</string>
+    <!-- Name for more symbols layout (when pressing shift) -->
+    <string name="layout_symbols_shifted" tools:keep="@string/layout_symbols_shifted">More symbols</string>
+    <!-- Name for phone layout -->
+    <string name="layout_phone" tools:keep="@string/layout_phone">Phone</string>
+    <!-- Name for symbols on phone layout -->
+    <string name="layout_phone_symbols" tools:keep="@string/layout_phone_symbols">Phone symbols</string>
+    <!-- Name for number layout -->
+    <string name="layout_number" tools:keep="@string/layout_number">Numbers</string>
+    <!-- Name for numpad layout -->
+    <string name="layout_numpad" tools:keep="@string/layout_numpad">Numpad</string>
+    <!-- Name for numpad layout in landscape mode -->
+    <string name="layout_numpad_landscape" tools:keep="@string/layout_numpad_landscape">Numpad (landscape)</string>
     <!-- Title for customizing background image -->
     <string name="customize_background_image">Set background image</string>
     <!-- Message for selecting day or night background image -->
@@ -565,8 +579,6 @@ New dictionary:
     <string name="cannot_connect_to_dict_service">Problem connecting to dictionary service</string>
     <!-- Message to display in the dictionaries setting screen when we found that no dictionaries are available [CHAR LIMIT=20]-->
     <string name="no_dictionaries_available">No dictionaries available</string>
-    <!-- Title of the options to press to refresh the list (as in, check for updates now) [CHAR_LIMIT=50] -->
-    <string name="check_for_updates_now">Refresh</string>
     <!-- Hint to tell when the data was last updated. Usage : "Last updated [date]", may contain a : or so. [CHAR LIMIT=45] -->
     <string name="last_update">Last updated</string>
     <!-- String to explain this dictionary is the main dictionary for this language [CHAR_LIMIT=30] -->
@@ -576,40 +588,29 @@ New dictionary:
     <!-- Version text [CHAR LIMIT=30]-->
     <string name="version_text">Version <xliff:g id="VERSION_NUMBER" example="1.0.1864.643521">%1$s</xliff:g></string>
     <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
-    <!-- This resource is corresponding to  msgid="4056762757149923551" -->
     <string name="user_dict_settings_add_menu_title">Add</string>
     <!-- User dictionary settings. The title of the dialog to add a new word to the user dictionary. [CHAR LIMIT=25] -->
-    <!-- This resource is corresponding to msgid="4702613990174126482" -->
     <string name="user_dict_settings_add_dialog_title">Add to dictionary</string>
     <!-- User dictionary settings. Label to put before the shortcut field (once a shortcut is registered, the user can type the shortcut and get the word it points to in the suggestions). [CHAR LIMIT=20] -->
-    <!-- This resource is corresponding to msgid="660089258866063925" -->
     <string name="user_dict_settings_add_shortcut_option_name">Shortcut:</string>
     <!-- User dictionary settings. Label to put before the weight field -->
     <string name="user_dict_settings_add_weight_value">Weight:</string>
     <!-- User dictionary settings. Label to put before the language field. [CHAR LIMIT=20] -->
-    <!-- This resource is corresponding to msgid="5696358317061318532" -->
     <string name="user_dict_settings_add_locale_option_name">Language:</string>
     <!-- User dictionary settings. Hint for the text field to type the word to add to the user dictionary. [CHAR LIMIT=35] -->
-    <!-- This resource is corresponding to msgid="5725254076556821247" -->
     <string name="user_dict_settings_add_word_hint">Type a word</string>
     <!-- User dictionary settings. Hint for the text field to type the optional shortcut to add to the user dictionary. [CHAR LIMIT=35] -->
-    <!-- This resource is corresponding to msgid="7333763456561873445" -->
     <string name="user_dict_settings_add_shortcut_hint">Optional shortcut</string>
     <!-- User dictionary settings. The title of the dialog to edit an existing word in the user dictionary. -->
-    <!-- This resource is corresponding to msgid="8967476444840548674" -->
     <string name="user_dict_settings_edit_dialog_title">Edit word</string>
     <!-- User dictionary settings. The text to show when there are no user-defined words in the dictionary  [CHAR LIMIT=200] -->
-    <!-- This resource is corresponding to msgid="8165273379942105271" -->
     <string name="user_dict_settings_empty_text">You don\'t have any words in the user dictionary. To add a word, tap the Add (+) button.</string>
     <!-- User dictionary settings. The list item to choose to insert a word into the user dictionary for all languages -->
-    <!-- This resource is corresponding to msgid="6742000040975959247" -->
     <string name="user_dict_settings_all_languages">For all languages</string>
     <!-- User dictionary settings. The text to show for the option that shows the entire list of supported locales to choose one [CHAR LIMIT=30] -->
-    <!-- This resource is corresponding to msgid="7316375944684977910" -->
     <string name="user_dict_settings_more_languages">More languages…</string>
     <!-- User dictionary settings. Index of the user dictionary [CHAR LIMIT=30]
          This resource is copied from packages/apps/Settings/res/values/strings.xml -->
-    <!-- This resource is corresponding to msgid="5433275485499039199" -->
     <string name="user_dict_fast_scroll_alphabet">\u0020ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
     <!-- Message in user dictionary dialog -->
     <string name="user_dict_word_already_present">This word is already present in the %s user dictionary. Please type another one.</string>
diff --git a/app/src/main/res/xml/prefs_screen_advanced.xml b/app/src/main/res/xml/prefs_screen_advanced.xml
index 1d49e0cd5..48d43d811 100644
--- a/app/src/main/res/xml/prefs_screen_advanced.xml
+++ b/app/src/main/res/xml/prefs_screen_advanced.xml
@@ -96,12 +96,9 @@
             android:title="@string/customize_background_image" />
 
         <Preference
-            android:key="custom_symbols_layout"
-            android:title="@string/customize_symbols" />
-
-        <Preference
-            android:key="custom_shift_symbols_layout"
-            android:title="@string/customize_shift_symbols" />
+            android:key="custom_symbols_number_layouts"
+            android:title="@string/customize_symbols_number_layouts"
+            android:summary="@string/customize_symbols_number_layouts_summary" />
 
         <Preference
             android:key="load_gesture_library"