diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/common/Colors.kt b/app/src/main/java/org/dslul/openboard/inputmethod/latin/common/Colors.kt
index 9dd4390b..320c9e12 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/common/Colors.kt
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/common/Colors.kt
@@ -441,7 +441,7 @@ class DefaultColors (
         } else {
             // need to set color to background if key borders are disabled, or there will be ugly keys
             backgroundStateList = stateList(brightenOrDarken(background, true), background)
-            keyStateList = stateList(brightenOrDarken(background, true), Color.TRANSPARENT)
+            keyStateList = stateList(keyBackground, Color.TRANSPARENT)
             functionalKeyStateList = keyStateList
             actionKeyStateList = if (themeStyle == STYLE_HOLO) functionalKeyStateList
                 else stateList(brightenOrDarken(accent, true), accent)
diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/ColorsSettingsFragment.kt b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/ColorsSettingsFragment.kt
index 06744042..b50846b3 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/ColorsSettingsFragment.kt
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/ColorsSettingsFragment.kt
@@ -52,7 +52,7 @@ open class ColorsSettingsFragment : Fragment(R.layout.color_settings), MenuProvi
     private val colorPrefsToHideInitially by lazy {
         listOf(Settings.PREF_COLOR_SUGGESTION_TEXT_SUFFIX,Settings.PREF_COLOR_SPACEBAR_TEXT_SUFFIX, Settings.PREF_COLOR_GESTURE_SUFFIX) +
             if (prefs.getBoolean(Settings.PREF_THEME_KEY_BORDERS, false)) listOf(Settings.PREF_COLOR_SPACEBAR_SUFFIX)
-            else listOf(Settings.PREF_COLOR_KEYS_SUFFIX, Settings.PREF_COLOR_FUNCTIONAL_KEYS_SUFFIX)
+            else listOf(Settings.PREF_COLOR_FUNCTIONAL_KEYS_SUFFIX)
     }
 
     override fun onResume() {