diff --git a/app/src/main/res/xml/key_styles_currency.xml b/app/src/main/res/xml/key_styles_currency.xml
index ae162a5be..9a7230ff7 100644
--- a/app/src/main/res/xml/key_styles_currency.xml
+++ b/app/src/main/res/xml/key_styles_currency.xml
@@ -158,6 +158,10 @@
             <key-style
                     latin:styleName="moreCurrency4KeyStyle"
                     latin:keySpec="&#x00A2;" />
+            <key-style
+                    latin:styleName="currencyHintStyle"
+                    latin:keyHintLabel="&#x20B9;"
+                    latin:additionalMoreKeys="&#x20B9;" />
         </case>
         <!-- GB: United Kingdom (Pound) -->
         <case latin:countryCode="GB">
@@ -183,6 +187,10 @@
             <key-style
                     latin:styleName="moreCurrency4KeyStyle"
                     latin:keySpec="&#x00A2;" />
+            <key-style
+                    latin:styleName="currencyHintStyle"
+                    latin:keyHintLabel="&#x00A3;"
+                    latin:additionalMoreKeys="&#x00A3;" />
         </case>
         <!-- ar: Arabic (Dollar and Rial) -->
         <default>
diff --git a/app/src/main/res/xml/key_styles_currency_dollar.xml b/app/src/main/res/xml/key_styles_currency_dollar.xml
index 9a2f1d005..14a3c2502 100644
--- a/app/src/main/res/xml/key_styles_currency_dollar.xml
+++ b/app/src/main/res/xml/key_styles_currency_dollar.xml
@@ -39,4 +39,8 @@
     <key-style
         latin:styleName="moreCurrency4KeyStyle"
         latin:keySpec="&#x00A5;" />
+    <key-style
+        latin:styleName="currencyHintStyle"
+        latin:keyHintLabel="$"
+        latin:additionalMoreKeys="$" />
 </merge>
diff --git a/app/src/main/res/xml/key_styles_currency_euro.xml b/app/src/main/res/xml/key_styles_currency_euro.xml
index dfae2017f..6c7bb4de0 100644
--- a/app/src/main/res/xml/key_styles_currency_euro.xml
+++ b/app/src/main/res/xml/key_styles_currency_euro.xml
@@ -41,4 +41,8 @@
     <key-style
         latin:styleName="moreCurrency4KeyStyle"
         latin:keySpec="&#x00A2;" />
+    <key-style
+        latin:styleName="currencyHintStyle"
+        latin:keyHintLabel="&#x20AC;"
+        latin:additionalMoreKeys="&#x20AC;" />
 </merge>
diff --git a/app/src/main/res/xml/key_styles_currency_generic.xml b/app/src/main/res/xml/key_styles_currency_generic.xml
index 26f4ea164..d3a398dd9 100644
--- a/app/src/main/res/xml/key_styles_currency_generic.xml
+++ b/app/src/main/res/xml/key_styles_currency_generic.xml
@@ -43,4 +43,8 @@
     <key-style
         latin:styleName="moreCurrency5KeyStyle"
         latin:keySpec="&#x20BA;"/>
+    <key-style
+        latin:styleName="currencyHintStyle"
+        latin:keyHintLabel="!text/keyspec_currency"
+        latin:additionalMoreKeys="!text/keyspec_currency" />
 </merge>
diff --git a/app/src/main/res/xml/rowkeys_azerty2_left5.xml b/app/src/main/res/xml/rowkeys_azerty2_left5.xml
index 5a44747a2..409fdc548 100644
--- a/app/src/main/res/xml/rowkeys_azerty2_left5.xml
+++ b/app/src/main/res/xml/rowkeys_azerty2_left5.xml
@@ -21,6 +21,8 @@
 <merge
     xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
+    <include
+        latin:keyboardLayout="@xml/key_styles_currency" />
     <Key
         latin:keySpec="q"
         latin:keyHintLabel="\@"
@@ -33,8 +35,7 @@
         latin:moreKeys="!text/morekeys_s" />
     <Key
         latin:keySpec="d"
-        latin:keyHintLabel="$"
-        latin:additionalMoreKeys="$"
+        latin:keyStyle="currencyHintStyle"
         latin:moreKeys="!text/morekeys_d" />
     <Key
         latin:keySpec="f"
diff --git a/app/src/main/res/xml/rowkeys_bepo2.xml b/app/src/main/res/xml/rowkeys_bepo2.xml
index 20141b064..7c50a6f84 100644
--- a/app/src/main/res/xml/rowkeys_bepo2.xml
+++ b/app/src/main/res/xml/rowkeys_bepo2.xml
@@ -16,6 +16,8 @@
 <merge
     xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
+    <include
+        latin:keyboardLayout="@xml/key_styles_currency" />
     <Key
         latin:keySpec="a"
         latin:keyHintLabel="\@"
@@ -28,8 +30,7 @@
         latin:moreKeys="!text/morekeys_u" />
     <Key
         latin:keySpec="i"
-        latin:keyHintLabel="$"
-        latin:additionalMoreKeys="$"
+        latin:keyStyle="currencyHintStyle"
         latin:moreKeys="!text/morekeys_i" />
     <Key
         latin:keySpec="e"
diff --git a/app/src/main/res/xml/rowkeys_colemak2.xml b/app/src/main/res/xml/rowkeys_colemak2.xml
index 7e4979b6a..ea722d60c 100644
--- a/app/src/main/res/xml/rowkeys_colemak2.xml
+++ b/app/src/main/res/xml/rowkeys_colemak2.xml
@@ -21,6 +21,8 @@
 <merge
     xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
+    <include
+        latin:keyboardLayout="@xml/key_styles_currency" />
     <Key
         latin:keySpec="a"
         latin:keyHintLabel="\@"
@@ -33,8 +35,7 @@
         latin:moreKeys="!text/morekeys_r" />
     <Key
         latin:keySpec="s"
-        latin:keyHintLabel="$"
-        latin:additionalMoreKeys="$"
+        latin:keyStyle="currencyHintStyle"
         latin:moreKeys="!text/morekeys_s" />
     <Key
         latin:keySpec="t"
diff --git a/app/src/main/res/xml/rowkeys_colemak_dh2.xml b/app/src/main/res/xml/rowkeys_colemak_dh2.xml
index d610d1e4c..29d5d345e 100644
--- a/app/src/main/res/xml/rowkeys_colemak_dh2.xml
+++ b/app/src/main/res/xml/rowkeys_colemak_dh2.xml
@@ -21,6 +21,8 @@
 <merge
     xmlns:latin="http://schemas.android.com/apk/res-auto"
     >
+    <include
+        latin:keyboardLayout="@xml/key_styles_currency" />
     <Key
         latin:keySpec="a"
         latin:keyHintLabel="\@"
@@ -33,8 +35,7 @@
         latin:moreKeys="!text/morekeys_r" />
     <Key
         latin:keySpec="s"
-        latin:keyHintLabel="$"
-        latin:additionalMoreKeys="$"
+        latin:keyStyle="currencyHintStyle"
         latin:moreKeys="!text/morekeys_s" />
     <Key
         latin:keySpec="t"
diff --git a/app/src/main/res/xml/rowkeys_east_slavic2.xml b/app/src/main/res/xml/rowkeys_east_slavic2.xml
index 478cc8ad9..e48c8f139 100644
--- a/app/src/main/res/xml/rowkeys_east_slavic2.xml
+++ b/app/src/main/res/xml/rowkeys_east_slavic2.xml
@@ -21,6 +21,8 @@
 <merge
     xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
+    <include
+        latin:keyboardLayout="@xml/key_styles_currency" />
     <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->
     <Key
         latin:keySpec="&#x0444;"
@@ -34,8 +36,7 @@
     <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->
     <Key
         latin:keySpec="&#x0432;"
-        latin:keyHintLabel="$"
-        latin:additionalMoreKeys="$" />
+        latin:keyStyle="currencyHintStyle" />
     <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->
     <Key
         latin:keySpec="&#x0430;"
diff --git a/app/src/main/res/xml/rowkeys_greek2.xml b/app/src/main/res/xml/rowkeys_greek2.xml
index a1d607a57..1a199e845 100644
--- a/app/src/main/res/xml/rowkeys_greek2.xml
+++ b/app/src/main/res/xml/rowkeys_greek2.xml
@@ -21,6 +21,8 @@
 <merge
     xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
+    <include
+        latin:keyboardLayout="@xml/key_styles_currency" />
     <!-- U+03B1: "α" GREEK SMALL LETTER ALPHA
          U+03AC: "ά" GREEK SMALL LETTER ALPHA WITH TONOS -->
     <Key
@@ -36,8 +38,7 @@
     <!-- U+03B4: "δ" GREEK SMALL LETTER DELTA -->
     <Key
         latin:keySpec="&#x03B4;"
-        latin:keyHintLabel="€"
-        latin:additionalMoreKeys="€" />
+        latin:keyStyle="currencyHintStyle" />
     <!-- U+03C6: "φ" GREEK SMALL LETTER PHI -->
     <Key
         latin:keySpec="&#x03C6;"
diff --git a/app/src/main/res/xml/rowkeys_qwerty2_left5.xml b/app/src/main/res/xml/rowkeys_qwerty2_left5.xml
index 7d4703065..bbe9af4cc 100644
--- a/app/src/main/res/xml/rowkeys_qwerty2_left5.xml
+++ b/app/src/main/res/xml/rowkeys_qwerty2_left5.xml
@@ -21,6 +21,8 @@
 <merge
     xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
+    <include
+        latin:keyboardLayout="@xml/key_styles_currency" />
     <Key
         latin:keySpec="a"
         latin:keyHintLabel="\@"
@@ -33,8 +35,7 @@
         latin:moreKeys="!text/morekeys_s" />
     <Key
         latin:keySpec="d"
-        latin:keyHintLabel="$"
-        latin:additionalMoreKeys="$"
+        latin:keyStyle="currencyHintStyle"
         latin:moreKeys="!text/morekeys_d" />
     <Key
         latin:keySpec="f"
diff --git a/app/src/main/res/xml/rowkeys_qwertz2_left5.xml b/app/src/main/res/xml/rowkeys_qwertz2_left5.xml
index d619baf1f..bbe9af4cc 100644
--- a/app/src/main/res/xml/rowkeys_qwertz2_left5.xml
+++ b/app/src/main/res/xml/rowkeys_qwertz2_left5.xml
@@ -21,6 +21,8 @@
 <merge
     xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
+    <include
+        latin:keyboardLayout="@xml/key_styles_currency" />
     <Key
         latin:keySpec="a"
         latin:keyHintLabel="\@"
@@ -33,8 +35,7 @@
         latin:moreKeys="!text/morekeys_s" />
     <Key
         latin:keySpec="d"
-        latin:keyHintLabel="€"
-        latin:additionalMoreKeys="€"
+        latin:keyStyle="currencyHintStyle"
         latin:moreKeys="!text/morekeys_d" />
     <Key
         latin:keySpec="f"
diff --git a/app/src/main/res/xml/rowkeys_workman2.xml b/app/src/main/res/xml/rowkeys_workman2.xml
index a836b419f..74190a4f7 100644
--- a/app/src/main/res/xml/rowkeys_workman2.xml
+++ b/app/src/main/res/xml/rowkeys_workman2.xml
@@ -21,6 +21,8 @@
 <merge
     xmlns:latin="http://schemas.android.com/apk/res-auto"
     >
+    <include
+        latin:keyboardLayout="@xml/key_styles_currency" />
     <Key
         latin:keySpec="a"
         latin:keyHintLabel="\@"
@@ -33,8 +35,7 @@
         latin:moreKeys="!text/morekeys_s" />
     <Key
         latin:keySpec="h"
-        latin:keyHintLabel="$"
-        latin:additionalMoreKeys="$"
+        latin:keyStyle="currencyHintStyle"
         latin:moreKeys="!text/morekeys_d" />
     <Key
         latin:keySpec="t"