diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index 33bcb0603..a5d04550a 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -47,8 +47,8 @@
     <dimen name="config_key_preview_offset_lxx">50.0dp</dimen>
     <dimen name="config_key_preview_height_lxx">122dp</dimen>
     <fraction name="config_key_preview_text_ratio">82%</fraction>
-    <fraction name="config_key_letter_ratio_holo">55%</fraction>
-    <fraction name="config_key_letter_ratio_lxx">55%</fraction>
+    <fraction name="config_key_letter_ratio_holo">66%</fraction>
+    <fraction name="config_key_letter_ratio_lxx">66%</fraction>
     <fraction name="config_key_large_letter_ratio_holo">65%</fraction>
     <fraction name="config_key_large_letter_ratio_lxx">90%</fraction>
     <fraction name="config_key_label_ratio_holo">34%</fraction>
@@ -65,7 +65,7 @@
 
     <!-- For 5-row keyboard -->
     <fraction name="config_key_vertical_gap_5row">3.20%p</fraction>
-    <fraction name="config_key_letter_ratio_5row">55%</fraction>
+    <fraction name="config_key_letter_ratio_5row">66%</fraction>
     <fraction name="config_key_shifted_letter_hint_ratio_5row">41%</fraction>
 
     <dimen name="config_suggestions_strip_height">40dp</dimen>
diff --git a/java/src/org/futo/inputmethod/keyboard/MainKeyboardView.java b/java/src/org/futo/inputmethod/keyboard/MainKeyboardView.java
index fb6fef8f9..82febfd47 100644
--- a/java/src/org/futo/inputmethod/keyboard/MainKeyboardView.java
+++ b/java/src/org/futo/inputmethod/keyboard/MainKeyboardView.java
@@ -399,7 +399,7 @@ public final class MainKeyboardView extends KeyboardView implements DrawingProxy
 
         mSpaceKey = keyboard.getKey(Constants.CODE_SPACE);
         final int keyHeight = keyboard.mMostCommonKeyHeight - keyboard.mVerticalGap;
-        mLanguageOnSpacebarTextSize = keyHeight * mLanguageOnSpacebarTextRatio;
+        mLanguageOnSpacebarTextSize = Math.min(keyHeight, keyboard.mMostCommonKeyWidth) * mLanguageOnSpacebarTextRatio;
 
         if (AccessibilityUtils.getInstance().isAccessibilityEnabled()) {
             if (mAccessibilityDelegate == null) {
diff --git a/java/src/org/futo/inputmethod/latin/uix/theme/selector/ThemePicker.kt b/java/src/org/futo/inputmethod/latin/uix/theme/selector/ThemePicker.kt
index a84746f84..6d78776c9 100644
--- a/java/src/org/futo/inputmethod/latin/uix/theme/selector/ThemePicker.kt
+++ b/java/src/org/futo/inputmethod/latin/uix/theme/selector/ThemePicker.kt
@@ -226,7 +226,7 @@ fun ThemePicker(onSelected: (ThemeOption) -> Unit) {
                 SettingSlider(
                     title = "Keyboard Height",
                     setting = KeyboardHeightMultiplierSetting,
-                    range = 0.1f .. 2.0f, transform = { it },
+                    range = 0.33f .. 1.75f, transform = { it },
                     indicator = { "${(it * 100.0f).roundToInt()}%" }
                 )
             }