diff --git a/java/res/values-night/themes-you-colors.xml b/java/res/values-night/themes-you-colors.xml
index 48606bc7e4269cfe355fc8929084220a656d2941..ca55a3fea6a065e757dd20d9c9d7dfc5b2d3b803 100644
--- a/java/res/values-night/themes-you-colors.xml
+++ b/java/res/values-night/themes-you-colors.xml
@@ -6,9 +6,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <color name="key_hint_letter_color_you">@android:color/system_neutral1_400</color>
     <!-- Suggestion bar -->
-    <color name="typed_word_color_you">@android:color/system_on_background_dark</color>
-    <color name="auto_correct_color_you">@android:color/system_on_background_dark</color>
-    <color name="suggested_word_color_you">@android:color/system_on_background_dark</color>
+    <color name="typed_word_color_you">#E3E2E9</color>
+    <color name="auto_correct_color_you">#E3E2E9</color>
+    <color name="suggested_word_color_you">#E3E2E9</color>
     <!-- Gesture input -->
     <color name="gesture_trail_color_you">@android:color/system_accent1_300</color>
     <color name="gesture_floating_preview_text_color_you">@android:color/system_neutral1_50</color>
diff --git a/java/res/xml/prefs_screen_preferences.xml b/java/res/xml/prefs_screen_preferences.xml
index 461a996c076aaf35759058978a0069e47ae1adb1..8036ca415583f9e1044894639ceaf2c31c74e184 100644
--- a/java/res/xml/prefs_screen_preferences.xml
+++ b/java/res/xml/prefs_screen_preferences.xml
@@ -40,7 +40,7 @@
         android:key="pref_show_emoji_key"
         android:title="@string/show_emoji_key"
         android:summary="@string/show_emoji_key_summary"
-        android:defaultValue="false"
+        android:defaultValue="true"
         android:persistent="true" />
     <CheckBoxPreference
         android:key="pref_show_longpress_hints"
diff --git a/java/src/com/android/inputmethod/latin/settings/Settings.java b/java/src/com/android/inputmethod/latin/settings/Settings.java
index 60eb8a78a6ef8aa373b4c16119a6fc9977c61dd6..478a039e8f90ccba299d057759e6d9e892e044a2 100644
--- a/java/src/com/android/inputmethod/latin/settings/Settings.java
+++ b/java/src/com/android/inputmethod/latin/settings/Settings.java
@@ -82,6 +82,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
     public static final String PREF_SHOW_LANGUAGE_SWITCH_KEY =
             "pref_show_language_switch_key";
     public static final String PREF_SHOW_EMOJI_KEY = "pref_show_emoji_key";
+    private static final String PREF_SHOW_EMOJI_KEY_MIGRATED = "pref_show_emoji_key_migrated";
     public static final String PREF_INCLUDE_OTHER_IMES_IN_LANGUAGE_SWITCH_LIST =
             "pref_include_other_imes_in_language_switch_list";
     public static final String PREF_CUSTOM_INPUT_STYLES = "custom_input_styles";
@@ -164,6 +165,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
         mPrefs = PreferenceManager.getDefaultSharedPreferences(context);
         mPrefs.registerOnSharedPreferenceChangeListener(this);
         upgradeAutocorrectionSettings(mPrefs, mRes);
+        upgradeShowEmojiKeySettings(mPrefs);
     }
 
     public void onDestroy() {
@@ -472,6 +474,16 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
         return prefs.getInt(PREF_LAST_SHOWN_EMOJI_CATEGORY_ID, defValue);
     }
 
+    private void upgradeShowEmojiKeySettings(final SharedPreferences prefs) {
+        if (!prefs.getBoolean(PREF_SHOW_EMOJI_KEY_MIGRATED, false)) {
+            final SharedPreferences.Editor editor = prefs.edit();
+            if (!prefs.getBoolean(PREF_SHOW_EMOJI_KEY, false)) {
+                editor.putBoolean(PREF_SHOW_EMOJI_KEY, true);
+            }
+            editor.putBoolean(PREF_SHOW_EMOJI_KEY_MIGRATED, true).apply();
+        }
+    }
+
     private void upgradeAutocorrectionSettings(final SharedPreferences prefs, final Resources res) {
         final String thresholdSetting =
                 prefs.getString(PREF_AUTO_CORRECTION_THRESHOLD_OBSOLETE, null);
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java
index d07ce67242813259c24ee32c448d5f5cbc6238fc..a2c526928345e4e621b544486d713290b241d438 100644
--- a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java
+++ b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java
@@ -153,7 +153,7 @@ public class SettingsValues {
                 : true /* forcibly */;
         mShowsLanguageSwitchKey = Settings.ENABLE_SHOW_LANGUAGE_SWITCH_KEY_SETTINGS
                 ? Settings.readShowsLanguageSwitchKey(prefs) : true /* forcibly */;
-        mShowsEmojiKey = prefs.getBoolean(Settings.PREF_SHOW_EMOJI_KEY, false);
+        mShowsEmojiKey = prefs.getBoolean(Settings.PREF_SHOW_EMOJI_KEY, true);
         mUseContactsDict = prefs.getBoolean(Settings.PREF_KEY_USE_CONTACTS_DICT, true);
         mUsePersonalizedDicts = prefs.getBoolean(Settings.PREF_KEY_USE_PERSONALIZED_DICTS, true);
         mUseDoubleSpacePeriod = prefs.getBoolean(Settings.PREF_KEY_USE_DOUBLE_SPACE_PERIOD, true)