diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardView.java b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardView.java
index 49db5520b..6065d54dd 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardView.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardView.java
@@ -304,7 +304,7 @@ public class KeyboardView extends View {
 
         mShowsHints = Settings.getInstance().getCurrent().mShowsHints;
         final float scale = Settings.getInstance().getCurrent().mKeyboardHeightScale;
-        mIconScaleFactor = scale < 0.8f ? scale + 0.2f : scale;
+        mIconScaleFactor = scale < 0.8f ? scale + 0.2f : 1f;
         final Paint paint = mPaint;
         final Drawable background = getBackground();
         // Calculate clip region and set.
diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/KeyboardWrapperView.kt b/app/src/main/java/org/dslul/openboard/inputmethod/latin/KeyboardWrapperView.kt
index 74cab47cb..a8d3bc99d 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/KeyboardWrapperView.kt
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/KeyboardWrapperView.kt
@@ -113,7 +113,7 @@ class KeyboardWrapperView @JvmOverloads constructor(
         val scale = Settings.getInstance().current.mKeyboardHeightScale
         // scale one-handed mode button height if keyboard height scale is < 80%
         // more relevant: also change the distance, so the buttons are actually visible
-        val heightScale = scale + 0.2f
+        val heightScale = if (scale < 0.8f) scale + 0.2f else 1f
         val buttonsLeft = if (isLeftGravity) keyboardView.measuredWidth else 0
         stopOneHandedModeBtn.layout(
                 buttonsLeft + (spareWidth - stopOneHandedModeBtn.measuredWidth) / 2,