diff --git a/java/res/xml-sw600dp/rows_symbols_shift.xml b/java/res/xml-sw600dp/rows_symbols_shift.xml
index aad047ff6b6acbddc001665090dc3337ceacc0ab..92299f65d738db315f44a483162b52082817c6eb 100644
--- a/java/res/xml-sw600dp/rows_symbols_shift.xml
+++ b/java/res/xml-sw600dp/rows_symbols_shift.xml
@@ -70,5 +70,7 @@
             latin:keyWidth="10%p" />
         <include
             latin:keyboardLayout="@xml/row_symbols_shift4" />
+        <include
+            latin:keyboardLayout="@xml/key_f2" />
     </Row>
 </merge>
diff --git a/java/res/xml/key_styles_enter.xml b/java/res/xml/key_styles_enter.xml
index 568c60270dde80eba3579e16f45c95ad7e5ee8b8..083e6a67d63056c7f1c7fba2d2598f181e50dc68 100644
--- a/java/res/xml/key_styles_enter.xml
+++ b/java/res/xml/key_styles_enter.xml
@@ -190,6 +190,7 @@
         >
             <key-style
                 latin:styleName="navigateMoreKeysStyle"
+                latin:keyLabelFlags="hasPopupHint|preserveCase"
                 latin:moreKeys="!text/emoji_key_as_more_key" />
         </case>
         <case
@@ -207,6 +208,7 @@
         >
             <key-style
                 latin:styleName="navigateMoreKeysStyle"
+                latin:keyLabelFlags="hasPopupHint|preserveCase"
                 latin:moreKeys="!text/emoji_key_as_more_key" />
         </case>
         <case
@@ -242,6 +244,7 @@
         >
             <key-style
                 latin:styleName="navigateMoreKeysStyle"
+                latin:keyLabelFlags="hasPopupHint|preserveCase"
                 latin:moreKeys="!text/emoji_key_as_more_key" />
         </case>
         <default>
diff --git a/java/res/xml/row_symbols_shift4.xml b/java/res/xml/row_symbols_shift4.xml
index 72d24a3213975d591f249f38ac82f5544d67692e..0909374f444437d5a7c68591324a57acfabcada6 100644
--- a/java/res/xml/row_symbols_shift4.xml
+++ b/java/res/xml/row_symbols_shift4.xml
@@ -23,8 +23,4 @@
     <include
         latin:keyboardLayout="@xml/key_space_symbols" />
     <include latin:keyboardLayout="@xml/keys_comma_period" />
-
-    <include
-        latin:keyboardLayout="@xml/key_f2" />
-
 </merge>
diff --git a/java/res/xml/rows_symbols_shift.xml b/java/res/xml/rows_symbols_shift.xml
index 45ada2a61789091ca0abb4b912520041045f818f..c4bdb9f380f0ea53dbbd4ba538fc9ede2b9ccf0f 100644
--- a/java/res/xml/rows_symbols_shift.xml
+++ b/java/res/xml/rows_symbols_shift.xml
@@ -60,5 +60,8 @@
             latin:keyWidth="15%p" />
         <include
             latin:keyboardLayout="@xml/row_symbols_shift4" />
+        <Key
+            latin:keyStyle="enterKeyStyle"
+            latin:keyWidth="fillRight" />
     </Row>
 </merge>