diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index e9b6354..6dabb0c 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -41,10 +41,15 @@
 
         <!-- Size of the text for one letter keys, in the proportion of key height. -->
         <attr name="keyLetterRatio" format="float" />
+        <!-- Large size of the text for one letter keys, in the proportion of key height. -->
+        <attr name="keyLargeLetterRatio" format="float" />
         <!-- Size of the text for keys with some text, in the proportion of key height. -->
         <attr name="keyLabelRatio" format="float" />
-        <!-- Size of the text for hint letter, in the proportion of key height. -->
+        <!-- Size of the text for hint letter (= one character hint label), in the proportion of
+             key height. -->
         <attr name="keyHintLetterRatio" format="float" />
+        <!-- Size of the text for hint label, in the proportion of key height. -->
+        <attr name="keyHintLabelRatio" format="float" />
         <!-- Size of the text for upper case letter, in the proportion of key height. -->
         <attr name="keyUppercaseLetterRatio" format="float" />
 
@@ -52,8 +57,10 @@
         <attr name="keyTextColor" format="color" />
         <!-- Color to use for the label in a key when in inactivated state. -->
         <attr name="keyTextInactivatedColor" format="color" />
-        <!-- Key hint letter color -->
+        <!-- Key hint letter (= one character hint label) color -->
         <attr name="keyHintLetterColor" format="color" />
+        <!-- Key hint label color -->
+        <attr name="keyHintLabelColor" format="color" />
         <!-- Upper case letter colors -->
         <attr name="keyUppercaseLetterInactivatedColor" format="color" />
         <attr name="keyUppercaseLetterActivatedColor" format="color" />
@@ -67,6 +74,8 @@
         <attr name="keyPreviewOffset" format="dimension" />
         <!-- Height of the key press feedback popup. -->
         <attr name="keyPreviewHeight" format="dimension" />
+        <!-- Size of the text for key press feedback popup, int the proportion of key height -->
+        <attr name="keyPreviewTextRatio" format="float" />
 
         <!-- Hysteresis distance for key debouncing -->
         <attr name="keyHysteresisDistance" format="dimension" />
@@ -146,16 +155,6 @@
         <attr name="iconReturnKey" format="reference" />
         <attr name="iconSearchKey" format="reference" />
         <attr name="iconTabKey" format="reference" />
-        <attr name="iconNum1Key" format="reference" />
-        <attr name="iconNum2Key" format="reference" />
-        <attr name="iconNum3Key" format="reference" />
-        <attr name="iconNum4Key" format="reference" />
-        <attr name="iconNum5Key" format="reference" />
-        <attr name="iconNum6Key" format="reference" />
-        <attr name="iconNum7Key" format="reference" />
-        <attr name="iconNum8Key" format="reference" />
-        <attr name="iconNum9Key" format="reference" />
-        <attr name="iconNum0Key" format="reference" />
         <attr name="iconShiftedShiftKey" format="reference" />
         <attr name="iconPreviewSpaceKey" format="reference" />
         <attr name="iconPreviewTabKey" format="reference" />
@@ -187,19 +186,23 @@
         <attr name="keyOutputText" format="string" />
         <!-- The label to display on the key. -->
         <attr name="keyLabel" format="string" />
-        <!-- The hint letter to display on the key in conjunction with the label. -->
-        <attr name="keyHintLetter" format="string" />
+        <!-- The hint label to display on the key in conjunction with the label. -->
+        <attr name="keyHintLabel" format="string" />
         <!-- The key label option. -->
         <attr name="keyLabelOption" format="integer">
             <!-- This should be aligned with Key.LABEL_OPTION_* -->
             <flag name="alignLeft" value="0x01" />
             <flag name="alignRight" value="0x02" />
-            <flag name="alignBottom" value="0x08" />
-            <flag name="fontNormal" value="0x10" />
-            <flag name="fontFixedWidth" value="0x20" />
-            <flag name="followKeyLetterRatio" value="0x40" />
-            <flag name="popupHint" value="0x80" />
-            <flag name="hasUppercaseLetter" value="0x100" />
+            <flag name="alignBottom" value="0x04" />
+            <flag name="alignLeftOfCenter" value="0x08" />
+            <flag name="largeLetter" value="0x10" />
+            <flag name="fontNormal" value="0x20" />
+            <flag name="fontMonoSpace" value="0x40" />
+            <flag name="followKeyLetterRatio" value="0x80" />
+            <flag name="followKeyHintLabelRatio" value="0x100" />
+            <flag name="hasPopupHint" value="0x200" />
+            <flag name="hasUppercaseLetter" value="0x400" />
+            <flag name="hasHintLabel" value="0x800" />
         </attr>
         <!-- The icon to display on the key instead of the label. -->
         <attr name="keyIcon" format="enum">
@@ -214,29 +217,19 @@
             <enum name="iconReturnKey" value="8" />
             <enum name="iconSearchKey" value="9" />
             <enum name="iconTabKey" value="10" />
-            <enum name="iconNum1Key" value="11" />
-            <enum name="iconNum2Key" value="12" />
-            <enum name="iconNum3Key" value="13" />
-            <enum name="iconNum4Key" value="14" />
-            <enum name="iconNum5Key" value="15" />
-            <enum name="iconNum6Key" value="16" />
-            <enum name="iconNum7Key" value="17" />
-            <enum name="iconNum8Key" value="18" />
-            <enum name="iconNum9Key" value="19" />
-            <enum name="iconNum0Key" value="20" />
         </attr>
         <!-- Shift key icon for shifted state -->
         <attr name="keyIconShifted" format="enum">
             <!-- This should be aligned with KeyboardIcons.ICON_SHIFTED_* -->
-            <enum name="iconShiftedShiftKey" value="21" />
+            <enum name="iconShiftedShiftKey" value="11" />
         </attr>
         <!-- The icon to show in the popup preview. -->
         <attr name="keyIconPreview" format="enum">
             <!-- This should be aligned with KeyboardIcons.ICON_PREVIEW_* -->
-            <enum name="iconPreviewSpaceKey" value="22" />
-            <enum name="iconPreviewTabKey" value="23" />
-            <enum name="iconPreviewSettingsKey" value="24" />
-            <enum name="iconPreviewShortcutKey" value="25" />
+            <enum name="iconPreviewSpaceKey" value="12" />
+            <enum name="iconPreviewTabKey" value="13" />
+            <enum name="iconPreviewSettingsKey" value="14" />
+            <enum name="iconPreviewShortcutKey" value="15" />
         </attr>
         <!-- The key style to specify a set of key attributes defined by <key_style/> -->
         <attr name="keyStyle" format="string" />
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index 54256de..7627ea0 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -32,14 +32,16 @@
     <dimen name="keyboard_bottom_padding">0.06in</dimen>
     <dimen name="key_bottom_gap_stone">0.00in</dimen>
     <dimen name="key_horizontal_gap_stone">0.00in</dimen>
+    <dimen name="keyboard_horizontal_edges_padding">0.0in</dimen>
+    <dimen name="mini_keyboard_horizontal_padding">16dip</dimen>
+    <dimen name="mini_keyboard_key_horizontal_padding">8dip</dimen>
+
     <dimen name="key_bottom_gap_ics">0.06in</dimen>
     <dimen name="key_horizontal_gap_ics">0.01in</dimen>
     <dimen name="keyboard_top_padding_ics">0.03in</dimen>
     <dimen name="keyboard_bottom_padding_ics">0.06in</dimen>
-    <dimen name="keyboard_horizontal_edges_padding">0.0in</dimen>
-    <dimen name="mini_keyboard_horizontal_padding">16dip</dimen>
-    <dimen name="mini_keyboard_horizontal_padding_holo">38dip</dimen>
-    <dimen name="mini_keyboard_key_horizontal_padding">8dip</dimen>
+    <dimen name="mini_keyboard_horizontal_padding_ics">38dip</dimen>
+
     <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
     <!-- popup_key_height x 1.2 -->
     <dimen name="mini_keyboard_slide_allowance">0.396in</dimen>
@@ -49,15 +51,20 @@
          to user's finger. -->
     <dimen name="keyboard_vertical_correction">-0.05in</dimen>
 
+    <!-- left or right padding of label alignment -->
+    <dimen name="key_label_horizontal_alignment_padding">4dip</dimen>
+
     <fraction name="key_letter_ratio">45%</fraction>
+    <fraction name="key_large_letter_ratio">55%</fraction>
     <fraction name="key_label_ratio">29%</fraction>
     <fraction name="key_hint_letter_ratio">23%</fraction>
+    <fraction name="key_hint_label_ratio">36%</fraction>
     <fraction name="key_uppercase_letter_ratio">35%</fraction>
-    <!-- left or right padding of label alignment -->
-    <dimen name="key_label_horizontal_alignment_padding">21dip</dimen>
     <fraction name="key_preview_text_ratio">82%</fraction>
     <dimen name="key_preview_height">80sp</dimen>
     <dimen name="key_preview_offset">0.1in</dimen>
+
+    <dimen name="key_preview_height_ics">80sp</dimen>
     <dimen name="key_preview_offset_ics">0.05in</dimen>
 
     <dimen name="candidate_strip_height">42dip</dimen>
diff --git a/java/res/values/keyboard-icons-black.xml b/java/res/values/keyboard-icons-black.xml
index 3ba3455..89631bb 100644
--- a/java/res/values/keyboard-icons-black.xml
+++ b/java/res/values/keyboard-icons-black.xml
@@ -26,16 +26,6 @@
         <item name="iconReturnKey">@drawable/sym_bkeyboard_return</item>
         <item name="iconSearchKey">@drawable/sym_bkeyboard_search</item>
         <item name="iconTabKey">@drawable/sym_bkeyboard_tab</item>
-        <item name="iconNum1Key">@drawable/sym_bkeyboard_num1</item>
-        <item name="iconNum2Key">@drawable/sym_bkeyboard_num2</item>
-        <item name="iconNum3Key">@drawable/sym_bkeyboard_num3</item>
-        <item name="iconNum4Key">@drawable/sym_bkeyboard_num4</item>
-        <item name="iconNum5Key">@drawable/sym_bkeyboard_num5</item>
-        <item name="iconNum6Key">@drawable/sym_bkeyboard_num6</item>
-        <item name="iconNum7Key">@drawable/sym_bkeyboard_num7</item>
-        <item name="iconNum8Key">@drawable/sym_bkeyboard_num8</item>
-        <item name="iconNum9Key">@drawable/sym_bkeyboard_num9</item>
-        <item name="iconNum0Key">@drawable/sym_bkeyboard_num0</item>
         <item name="iconShiftedShiftKey">@drawable/sym_bkeyboard_shift_locked</item>
         <item name="iconPreviewSpaceKey">@drawable/sym_keyboard_feedback_space</item>
         <item name="iconPreviewTabKey">@drawable/sym_keyboard_feedback_tab</item>
diff --git a/java/res/values/keyboard-icons-ics.xml b/java/res/values/keyboard-icons-ics.xml
index 1dfbdf9..feb95f8 100644
--- a/java/res/values/keyboard-icons-ics.xml
+++ b/java/res/values/keyboard-icons-ics.xml
@@ -17,62 +17,44 @@
 <resources>
     <style name="KeyboardIcons.IceCreamSandwich" parent="android:Theme.Holo">
         <!-- Keyboard icons -->
-<!--         <item name="iconShiftKey">@drawable/sym_keyboard_shift_holo</item> -->
-        <item name="iconShiftKey">@drawable/sym_keyboard_shift</item>
-<!--         <item name="iconToSymbolKeyWithShortcut">@drawable/sym_keyboard_123_voice_holo</item> -->
-        <item name="iconToSymbolKeyWithShortcut">@drawable/sym_keyboard_123_mic</item>
-<!--         <item name="iconDeleteKey">@drawable/sym_keyboard_delete_holo</item> -->
-        <item name="iconDeleteKey">@drawable/sym_keyboard_delete</item>
-<!--         <item name="iconSettingsKey">@drawable/sym_keyboard_settings_holo</item> -->
-        <item name="iconSettingsKey">@drawable/sym_keyboard_settings</item>
-<!--         <item name="iconShortcutKey">@drawable/sym_keyboard_voice_holo</item> -->
-        <item name="iconShortcutKey">@drawable/sym_keyboard_mic</item>
-<!--         <item name="iconSpaceKey">@drawable/sym_keyboard_space_holo</item> -->
-        <item name="iconSpaceKey">@drawable/sym_keyboard_space</item>
-<!--         <item name="iconReturnKey">@drawable/sym_keyboard_return_holo</item> -->
-        <item name="iconReturnKey">@drawable/sym_keyboard_return</item>
-<!--         <item name="iconSearchKey">@drawable/sym_keyboard_search_holo</item> -->
+        <!-- TODO: The following holo icon for phone (drawable-hdpi and drawable-xhdpi) are too
+             large for phone.
+             sym_keyboard_shift_holo
+             sym_keyboard_shift_locked_holo
+             sym_keyboard_delete_holo,
+             sym_keyboard_settings_holo
+             sym_keyboard_voice_holo
+             sym_keyboard_voice_holo_off
+             sym_keyboard_space_holo
+             sym_keyboard_return_holo
+             sym_keyboard_tab_holo
+             -->
+        <!-- TODO: The following holo icon for phone (drawable-hdpi and drawable-xhdpi) are missing.
+             sym_keyboard_123_mic_holo
+             sym_keyboard_search_holo
+             sym_keyboard_feedback_tab_holo
+             sym_keyboard_feedback_voice_holo
+             -->
+        <item name="iconShiftKey">@drawable/sym_keyboard_shift_holo</item>
+        <item name="iconToSymbolKeyWithShortcut">@drawable/sym_keyboard_123_mic_holo</item>
+        <item name="iconDeleteKey">@drawable/sym_keyboard_delete_holo</item>
+        <item name="iconSettingsKey">@drawable/sym_keyboard_settings_holo</item>
+        <item name="iconShortcutKey">@drawable/sym_keyboard_voice_holo</item>
+        <item name="iconSpaceKey">@drawable/sym_keyboard_space_holo</item>
+        <item name="iconReturnKey">@drawable/sym_keyboard_return_holo</item>
         <item name="iconSearchKey">@drawable/sym_keyboard_search</item>
-<!--         <item name="iconTabKey">@drawable/sym_keyboard_tab_holo</item> -->
-        <item name="iconTabKey">@drawable/sym_keyboard_tab</item>
-<!--         <item name="iconNum1Key">@drawable/sym_keyboard_num1_holo</item> -->
-<!--         <item name="iconNum2Key">@drawable/sym_keyboard_num2_holo</item> -->
-<!--         <item name="iconNum3Key">@drawable/sym_keyboard_num3_holo</item> -->
-<!--         <item name="iconNum4Key">@drawable/sym_keyboard_num4_holo</item> -->
-<!--         <item name="iconNum5Key">@drawable/sym_keyboard_num5_holo</item> -->
-<!--         <item name="iconNum6Key">@drawable/sym_keyboard_num6_holo</item> -->
-<!--         <item name="iconNum7Key">@drawable/sym_keyboard_num7_holo</item> -->
-<!--         <item name="iconNum8Key">@drawable/sym_keyboard_num8_holo</item> -->
-<!--         <item name="iconNum9Key">@drawable/sym_keyboard_num9_holo</item> -->
-<!--         <item name="iconNum0Key">@drawable/sym_keyboard_num0_holo</item> -->
-<!--         <item name="iconNumStarKey">@drawable/sym_keyboard_numbstar_holo</item> -->
-<!--         <item name="iconNumPoundKey">@drawable/sym_keyboard_numbpound_holo</item> -->
-<!--         <item name="iconNumAltKey">@drawable/sym_keyboard_numalt_holo</item> -->
-        <item name="iconNum1Key">@drawable/sym_keyboard_num1</item>
-        <item name="iconNum2Key">@drawable/sym_keyboard_num2</item>
-        <item name="iconNum3Key">@drawable/sym_keyboard_num3</item>
-        <item name="iconNum4Key">@drawable/sym_keyboard_num4</item>
-        <item name="iconNum5Key">@drawable/sym_keyboard_num5</item>
-        <item name="iconNum6Key">@drawable/sym_keyboard_num6</item>
-        <item name="iconNum7Key">@drawable/sym_keyboard_num7</item>
-        <item name="iconNum8Key">@drawable/sym_keyboard_num8</item>
-        <item name="iconNum9Key">@drawable/sym_keyboard_num9</item>
-        <item name="iconNum0Key">@drawable/sym_keyboard_num0</item>
-<!--         <item name="iconShiftedShiftKey">@drawable/sym_keyboard_shift_locked_holo</item> -->
-        <item name="iconShiftedShiftKey">@drawable/sym_keyboard_shift_locked</item>
+        <item name="iconTabKey">@drawable/sym_keyboard_tab_holo</item>
+        <item name="iconShiftedShiftKey">@drawable/sym_keyboard_shift_locked_holo</item>
         <item name="iconPreviewSpaceKey">@drawable/transparent</item>
-<!--         <item name="iconPreviewTabKey">@drawable/sym_keyboard_tab_holo</item> -->
         <item name="iconPreviewTabKey">@drawable/sym_keyboard_feedback_tab</item>
-<!--         <item name="iconPreviewSettingsKey">@drawable/sym_keyboard_settings_holo</item> -->
-        <item name="iconPreviewSettingsKey">@drawable/sym_keyboard_settings</item>
-<!--         <item name="iconPreviewShortcutKey">@drawable/sym_keyboard_feedback_voice_holo</item> -->
+        <item name="iconPreviewSettingsKey">@drawable/sym_keyboard_settings_holo</item>
         <item name="iconPreviewShortcutKey">@drawable/sym_keyboard_feedback_mic</item>
         <!-- LatinKeyboard icons -->
         <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item>
         <item name="disabledShortcutIcon">@drawable/sym_keyboard_voice_off_holo</item>
         <item name="spacebarArrowLeftIcon">@drawable/sym_keyboard_language_arrows_left</item>
         <item name="spacebarArrowRightIcon">@drawable/sym_keyboard_language_arrows_right</item>
-<!--         <item name="spacebarArrowPreviewLeftIcon">@drawable/sym_keyboard_feedback_language_arrows_left</item> -->
-<!--         <item name="spacebarArrowPreviewRightIcon">@drawable/sym_keyboard_feedback_language_arrows_right</item> -->
+        <item name="spacebarArrowPreviewLeftIcon">@null</item>
+        <item name="spacebarArrowPreviewRightIcon">@null</item>
     </style>
 </resources>
diff --git a/java/res/values/keyboard-icons-white.xml b/java/res/values/keyboard-icons-white.xml
index 9f5fb5a..f9726d1 100644
--- a/java/res/values/keyboard-icons-white.xml
+++ b/java/res/values/keyboard-icons-white.xml
@@ -26,16 +26,6 @@
         <item name="iconReturnKey">@drawable/sym_keyboard_return</item>
         <item name="iconSearchKey">@drawable/sym_keyboard_search</item>
         <item name="iconTabKey">@drawable/sym_keyboard_tab</item>
-        <item name="iconNum1Key">@drawable/sym_keyboard_num1</item>
-        <item name="iconNum2Key">@drawable/sym_keyboard_num2</item>
-        <item name="iconNum3Key">@drawable/sym_keyboard_num3</item>
-        <item name="iconNum4Key">@drawable/sym_keyboard_num4</item>
-        <item name="iconNum5Key">@drawable/sym_keyboard_num5</item>
-        <item name="iconNum6Key">@drawable/sym_keyboard_num6</item>
-        <item name="iconNum7Key">@drawable/sym_keyboard_num7</item>
-        <item name="iconNum8Key">@drawable/sym_keyboard_num8</item>
-        <item name="iconNum9Key">@drawable/sym_keyboard_num9</item>
-        <item name="iconNum0Key">@drawable/sym_keyboard_num0</item>
         <item name="iconShiftedShiftKey">@drawable/sym_keyboard_shift_locked</item>
         <item name="iconPreviewSpaceKey">@drawable/sym_keyboard_feedback_space</item>
         <item name="iconPreviewTabKey">@drawable/sym_keyboard_feedback_tab</item>
diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml
index 05defcb..ff91e9e 100644
--- a/java/res/values/styles.xml
+++ b/java/res/values/styles.xml
@@ -37,19 +37,23 @@
         <item name="android:background">@drawable/keyboard_background</item>
         <item name="keyBackground">@drawable/btn_keyboard_key</item>
         <item name="keyLetterRatio">@fraction/key_letter_ratio</item>
+        <item name="keyLargeLetterRatio">@fraction/key_large_letter_ratio</item>
         <item name="keyLabelRatio">@fraction/key_label_ratio</item>
         <item name="keyHintLetterRatio">@fraction/key_hint_letter_ratio</item>
+        <item name="keyHintLabelRatio">@fraction/key_hint_label_ratio</item>
         <item name="keyUppercaseLetterRatio">@fraction/key_uppercase_letter_ratio</item>
         <item name="keyTextStyle">normal</item>
         <item name="keyTextColor">#FFFFFFFF</item>
         <item name="keyTextInactivatedColor">#FFFFFFFF</item>
         <item name="keyHintLetterColor">#80000000</item>
+        <item name="keyHintLabelColor">#E0E0E4E5</item>
         <item name="keyUppercaseLetterInactivatedColor">#66E0E4E5</item>
         <item name="keyUppercaseLetterActivatedColor">#CCE0E4E5</item>
         <item name="keyPopupHintIcon">@drawable/hint_popup</item>
         <item name="keyPreviewLayout">@layout/key_preview</item>
         <item name="keyPreviewOffset">@dimen/key_preview_offset</item>
         <item name="keyPreviewHeight">@dimen/key_preview_height</item>
+        <item name="keyPreviewTextRatio">@fraction/key_preview_text_ratio</item>
         <item name="popupLayout">@layout/keyboard_popup</item>
         <item name="keyHysteresisDistance">@dimen/key_hysteresis_distance</item>
         <item name="verticalCorrection">@dimen/keyboard_vertical_correction</item>
@@ -106,6 +110,10 @@
         <item name="keyBackground">@drawable/btn_keyboard_key_stone</item>
         <item name="keyTextColor">#FF000000</item>
         <item name="keyTextInactivatedColor">#FF808080</item>
+        <item name="keyHintLetterColor">#80FFFFFF</item>
+        <item name="keyHintLabelColor">#E0000000</item>
+        <item name="keyUppercaseLetterInactivatedColor">#66000000</item>
+        <item name="keyUppercaseLetterActivatedColor">#CC000000</item>
         <item name="shadowColor">#FFFFFFFF</item>
     </style>
     <style name="PopupMiniKeyboardView.Stone" parent="PopupMiniKeyboardView">
@@ -142,10 +150,10 @@
         <item name="keyTextStyle">bold</item>
         <item name="keyTextInactivatedColor">#66E0E4E5</item>
         <item name="keyHintLetterColor">#80000000</item>
+        <item name="keyHintLabelColor">#A0FFFFFF</item>
         <item name="keyUppercaseLetterInactivatedColor">#66E0E4E5</item>
         <item name="keyUppercaseLetterActivatedColor">#FFFFFFFF</item>
-        <item name="keyPopupHintIcon">@drawable/hint_popup</item>
-        <item name="keyPreviewHeight">@dimen/key_preview_height</item>
+        <item name="keyPreviewHeight">@dimen/key_preview_height_ics</item>
         <item name="keyPreviewOffset">@dimen/key_preview_offset_ics</item>
         <item name="shadowColor">#00000000</item>
         <item name="shadowRadius">0.0</item>
@@ -159,8 +167,8 @@
     </style>
     <style name="PopupMiniKeyboardPanelStyle.IceCreamSandwich">
         <item name="android:background">@drawable/keyboard_popup_panel_background_holo</item>
-        <item name="android:paddingLeft">@dimen/mini_keyboard_horizontal_padding_holo</item>
-        <item name="android:paddingRight">@dimen/mini_keyboard_horizontal_padding_holo</item>
+        <item name="android:paddingLeft">@dimen/mini_keyboard_horizontal_padding_ics</item>
+        <item name="android:paddingRight">@dimen/mini_keyboard_horizontal_padding_ics</item>
     </style>
     <style name="SuggestionsStripBackgroundStyle.IceCreamSandwich">
         <item name="android:background">@drawable/keyboard_suggest_strip_holo</item>