diff --git a/java/res/xml-sw600dp/keys_exclamation_question.xml b/java/res/xml-sw600dp/keys_exclamation_question.xml
index 97bd95d..cf2c61e 100644
--- a/java/res/xml-sw600dp/keys_exclamation_question.xml
+++ b/java/res/xml-sw600dp/keys_exclamation_question.xml
@@ -23,8 +23,10 @@
 >
     <Key
         latin:keySpec="!"
-        latin:moreKeys="!text/morekeys_exclamation" />
+        latin:moreKeys="!text/morekeys_exclamation"
+        latin:keyLabelFlags="fontDefault" />
     <Key
         latin:keySpec="\?"
-        latin:moreKeys="!text/morekeys_question" />
+        latin:moreKeys="!text/morekeys_question"
+        latin:keyLabelFlags="fontDefault" />
 </merge>
diff --git a/java/res/xml-sw600dp/rows_sinhala.xml b/java/res/xml-sw600dp/rows_sinhala.xml
index 23c3f3a..d3a5ca5 100644
--- a/java/res/xml-sw600dp/rows_sinhala.xml
+++ b/java/res/xml-sw600dp/rows_sinhala.xml
@@ -25,6 +25,7 @@
         latin:keyboardLayout="@xml/key_styles_common" />
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
         <include
             latin:keyboardLayout="@xml/rowkeys_sinhala1" />
@@ -34,6 +35,7 @@
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
         <include
             latin:keyboardLayout="@xml/rowkeys_sinhala2" />
@@ -43,6 +45,7 @@
     </Row>
     <Row
         latin:keyWidth="8.182%p"
+        latin:keyLabelFlags="fontNormal|autoXScale"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"