diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index d8d31e3..5c00510 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -63,10 +63,8 @@
 
         <!-- Layout resource for key press feedback.-->
         <attr name="keyPreviewLayout" format="reference" />
-
         <!-- Vertical offset of the key press feedback from the key. -->
         <attr name="keyPreviewOffset" format="dimension" />
-
         <!-- Height of the key press feedback popup. -->
         <attr name="keyPreviewHeight" format="dimension" />
 
@@ -113,6 +111,9 @@
         <!-- Minimum keyboard height represented in pixels, percentage of display height if fraction
              is positive, or percentage of display width if fraction is negative. -->
         <attr name="minKeyboardHeight" format="dimension|fraction" />
+        <!-- Keyboard top and bottom paddings. -->
+        <attr name="keyboardTopPadding" format="dimension" />
+        <attr name="keyboardBottomPadding" format="dimension" />
         <!-- Default width of a key, in pixels or percentage of display width.
              If the value is zero, the actual key width will be determined to fill out the area up
              to the right edge of the keyboard.
@@ -155,9 +156,6 @@
         <attr name="iconNum8Key" format="reference" />
         <attr name="iconNum9Key" format="reference" />
         <attr name="iconNum0Key" format="reference" />
-        <attr name="iconNumStarKey" format="reference" />
-        <attr name="iconNumPoundKey" format="reference" />
-        <attr name="iconNumAltKey" format="reference" />
         <attr name="iconShiftedShiftKey" format="reference" />
         <attr name="iconPreviewSpaceKey" format="reference" />
         <attr name="iconPreviewTabKey" format="reference" />
@@ -198,8 +196,10 @@
             <flag name="alignRight" value="0x02" />
             <flag name="alignBottom" value="0x08" />
             <flag name="fontNormal" value="0x10" />
-            <flag name="popupHint" value="0x20" />
-            <flag name="hasUppercaseLetter" value="0x40" />
+            <flag name="fontFixedWidth" value="0x20" />
+            <flag name="followKeyLetterRatio" value="0x40" />
+            <flag name="popupHint" value="0x80" />
+            <flag name="hasUppercaseLetter" value="0x100" />
         </attr>
         <!-- The icon to display on the key instead of the label. -->
         <attr name="keyIcon" format="enum">
@@ -224,22 +224,19 @@
             <enum name="iconNum8Key" value="18" />
             <enum name="iconNum9Key" value="19" />
             <enum name="iconNum0Key" value="20" />
-            <enum name="iconNumStarKey" value="21" />
-            <enum name="iconNumPoundKey" value="22" />
-            <enum name="iconNumAltKey" value="23" />
         </attr>
         <!-- Shift key icon for shifted state -->
         <attr name="keyIconShifted" format="enum">
             <!-- This should be aligned with KeyboardIcons.ICON_SHIFTED_* -->
-            <enum name="iconShiftedShiftKey" value="24" />
+            <enum name="iconShiftedShiftKey" value="21" />
         </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="25" />
-            <enum name="iconPreviewTabKey" value="26" />
-            <enum name="iconPreviewSettingsKey" value="27" />
-            <enum name="iconPreviewShortcutKey" value="28" />
+            <enum name="iconPreviewSpaceKey" value="22" />
+            <enum name="iconPreviewTabKey" value="23" />
+            <enum name="iconPreviewSettingsKey" value="24" />
+            <enum name="iconPreviewShortcutKey" value="25" />
         </attr>
         <!-- The key style to specify a set of key attributes defined by <key_style/> -->
         <attr name="keyStyle" format="string" />
@@ -304,6 +301,7 @@
     </declare-styleable>
 
     <declare-styleable name="LatinKeyboard">
+        <attr name="autoCorrectionSpacebarLedEnabled" format="boolean" />
         <attr name="autoCorrectionSpacebarLedIcon" format="reference" />
         <attr name="disabledShortcutIcon" format="reference" />
         <attr name="spacebarTextColor" format="color" />
diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
deleted file mode 100644
index d786918..0000000
--- a/java/res/values/colors.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* 
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-    <color name="latinkeyboard_bar_language_shadow_white">#80000000</color>
-    <color name="latinkeyboard_bar_language_shadow_black">#80FFFFFF</color>
-    <color name="latinkeyboard_bar_language_text">#FFC0C0C0</color>
-    <color name="latinkeyboard_feedback_language_text">#FFFFFFFF</color>
-    <color name="latinkeyboard_key_color_white">#FFFFFFFF</color>
-    <color name="latinkeyboard_key_color_black">#FF000000</color>
-</resources>
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index a08e2ae..ad580cc 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -42,6 +42,7 @@
     <bool name="config_default_bigram_prediction">false</bool>
     <bool name="config_default_recorrection_enabled">true</bool>
     <bool name="config_default_sound_enabled">false</bool>
+    <bool name="config_auto_correction_spacebar_led_enabled">true</bool>
     <bool name="config_use_spacebar_language_switcher">true</bool>
     <!-- Showing mini keyboard, just above the touched point if true, aligned to the key if false -->
     <bool name="config_show_mini_keyboard_at_touched_point">false</bool>
@@ -66,7 +67,7 @@
     <integer name="config_double_spaces_turn_into_period_timeout">1100</integer>
     <dimen name="config_touch_noise_threshold_distance">2.0mm</dimen>
     <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. -->
-    <string name="config_default_keyboard_theme_id" translatable="false">4</string>
+    <string name="config_default_keyboard_theme_id" translatable="false">5</string>
     <string name="config_text_size_of_language_on_spacebar" translatable="false">small</string>
     <integer name="config_max_popup_keyboard_column">5</integer>
     <string-array name="auto_correction_threshold_values" translatable="false">
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index a76c78a..665245c 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -30,9 +30,15 @@
     <dimen name="popup_key_height">0.330in</dimen>
     <dimen name="keyboard_top_padding">0.00in</dimen>
     <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="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">32dip</dimen>
+    <dimen name="mini_keyboard_horizontal_padding_holo">38dip</dimen>
     <dimen name="mini_keyboard_key_horizontal_padding">8dip</dimen>
     <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
     <!-- popup_key_height x 1.2 -->
@@ -52,8 +58,7 @@
     <dimen name="key_preview_height">80sp</dimen>
     <dimen name="key_preview_offset">0.1in</dimen>
     <fraction name="key_preview_text_ratio">82%</fraction>
-    <dimen name="key_preview_height_holo">130sp</dimen>
-    <dimen name="key_preview_offset_holo">0.193in</dimen>
+    <dimen name="key_preview_offset_ics">0.05in</dimen>
 
     <dimen name="candidate_strip_height">42dip</dimen>
     <!-- candidate_strip_minimum_height =
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml
index 2dbfe92..1c198d9 100644
--- a/java/res/values/donottranslate.xml
+++ b/java/res/values/donottranslate.xml
@@ -38,8 +38,10 @@
     <string name="label_tab_key">Tab</string>
     <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
     <string name="label_to_symbol_key">\?123</string>
-    <!-- Label for "switch to numeric" key.  Must be short to fit on key! -->
-    <string name="label_to_numeric_key">123</string>
+    <!-- Label for "switch to phone numeric" key.  Must be short to fit on key! -->
+    <string name="label_to_phone_numeric_key">123</string>
+    <!-- Label for "switch to phone symbols" key.  Must be short to fit on key! -->
+    <string name="label_to_phone_symbols_key">\uff0a\uff03\uff08</string>
 
     <!-- Option values to show/hide the settings key in onscreen keyboard -->
     <!-- Automatically decide to show or hide the settings key -->
@@ -126,7 +128,7 @@
     <string name="layout_stone_bold">Stone (bold)</string>
     <string name="layout_stone_normal">Stone (normal)</string>
     <string name="layout_gingerbread">Gingerbread</string>
-    <string name="layout_honeycomb">Honeycomb</string>
+    <string name="layout_ics">IceCreamSandwich</string>
 
     <!-- For keyboard theme switcher dialog -->
     <string-array name="keyboard_layout_modes">
@@ -135,7 +137,7 @@
         <item>@string/layout_stone_normal</item>
         <item>@string/layout_stone_bold</item>
         <item>@string/layout_gingerbread</item>
-        <item>@string/layout_honeycomb</item>
+        <item>@string/layout_ics</item>
     </string-array>
     <string-array name="keyboard_layout_modes_values">
         <item>0</item>
diff --git a/java/res/values/keyboard-icons-black.xml b/java/res/values/keyboard-icons-black.xml
index f11a9c4..3ba3455 100644
--- a/java/res/values/keyboard-icons-black.xml
+++ b/java/res/values/keyboard-icons-black.xml
@@ -16,6 +16,7 @@
 
 <resources>
     <style name="KeyboardIcons.Black" parent="android:Theme.Light">
+        <!-- Keyboard icons -->
         <item name="iconShiftKey">@drawable/sym_bkeyboard_shift</item>
         <item name="iconToSymbolKeyWithShortcut">@drawable/sym_bkeyboard_123_mic</item>
         <item name="iconDeleteKey">@drawable/sym_bkeyboard_delete</item>
@@ -35,13 +36,17 @@
         <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="iconNumStarKey">@drawable/sym_bkeyboard_numstar</item>
-        <item name="iconNumPoundKey">@drawable/sym_bkeyboard_numpound</item>
-        <item name="iconNumAltKey">@drawable/sym_bkeyboard_numalt</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>
         <item name="iconPreviewSettingsKey">@drawable/sym_keyboard_feedback_settings</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>
     </style>
 </resources>
diff --git a/java/res/values/keyboard-icons-holo.xml b/java/res/values/keyboard-icons-holo.xml
deleted file mode 100644
index 5f396ca..0000000
--- a/java/res/values/keyboard-icons-holo.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <style name="KeyboardIcons.Holo" parent="android:Theme.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_holo</item> -->
-        <item name="iconTabKey">@drawable/sym_keyboard_tab_holo</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="iconShiftedShiftKey">@drawable/sym_keyboard_shift_locked_holo</item>
-        <item name="iconPreviewSpaceKey">@drawable/sym_keyboard_space_holo</item>
-        <item name="iconPreviewTabKey">@drawable/sym_keyboard_tab_holo</item>
-        <item name="iconPreviewSettingsKey">@drawable/sym_keyboard_settings_holo</item>
-<!--         <item name="iconPreviewShortcutKey">@drawable/sym_keyboard_feedback_voice_holo</item> -->
-    </style>
-</resources>
diff --git a/java/res/values/keyboard-icons-ics.xml b/java/res/values/keyboard-icons-ics.xml
new file mode 100644
index 0000000..3029695
--- /dev/null
+++ b/java/res/values/keyboard-icons-ics.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<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> -->
+        <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="iconPreviewSpaceKey">@drawable/sym_keyboard_space_holo</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="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>
+    </style>
+</resources>
diff --git a/java/res/values/keyboard-icons-white.xml b/java/res/values/keyboard-icons-white.xml
index f25f7d4..9f5fb5a 100644
--- a/java/res/values/keyboard-icons-white.xml
+++ b/java/res/values/keyboard-icons-white.xml
@@ -16,6 +16,7 @@
 
 <resources>
     <style name="KeyboardIcons" parent="android:Theme">
+        <!-- Keyboard icons -->
         <item name="iconShiftKey">@drawable/sym_keyboard_shift</item>
         <item name="iconToSymbolKeyWithShortcut">@drawable/sym_keyboard_123_mic</item>
         <item name="iconDeleteKey">@drawable/sym_keyboard_delete</item>
@@ -35,13 +36,17 @@
         <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="iconNumStarKey">@drawable/sym_keyboard_numstar</item>
-        <item name="iconNumPoundKey">@drawable/sym_keyboard_numpound</item>
-        <item name="iconNumAltKey">@drawable/sym_keyboard_numalt</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>
         <item name="iconPreviewSettingsKey">@drawable/sym_keyboard_feedback_settings</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>
     </style>
 </resources>
diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml
index 1363f64..05defcb 100644
--- a/java/res/values/styles.xml
+++ b/java/res/values/styles.xml
@@ -22,19 +22,16 @@
         <item name="maxKeyboardHeight">@fraction/maxKeyboardHeight</item>
         <item name="minKeyboardHeight">@fraction/minKeyboardHeight</item>
         <item name="popupKeyboardTemplate">@xml/kbd_popup_template</item>
+        <item name="keyboardTopPadding">@dimen/keyboard_top_padding</item>
+        <item name="keyboardBottomPadding">@dimen/keyboard_bottom_padding</item>
         <item name="horizontalGap">@dimen/key_horizontal_gap</item>
         <item name="verticalGap">@dimen/key_bottom_gap</item>
         <item name="maxPopupKeyboardColumn">@integer/config_max_popup_keyboard_column</item>
     </style>
     <style name="LatinKeyboard">
-        <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item>
-        <item name="disabledShortcutIcon">@drawable/sym_keyboard_voice_off_holo</item>
-        <item name="spacebarTextColor">@color/latinkeyboard_bar_language_text</item>
-        <item name="spacebarTextShadowColor">@color/latinkeyboard_bar_language_shadow_white</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="autoCorrectionSpacebarLedEnabled">@bool/config_auto_correction_spacebar_led_enabled</item>
+        <item name="spacebarTextColor">#FFC0C0C0</item>
+        <item name="spacebarTextShadowColor">#80000000</item>
     </style>
     <style name="KeyboardView">
         <item name="android:background">@drawable/keyboard_background</item>
@@ -62,6 +59,7 @@
     </style>
     <style name="KeyPreviewStyle">
         <item name="android:background">@drawable/keyboard_key_feedback</item>
+        <item name="android:textColor">#FFFFFFFF</item>
     </style>
     <style name="PopupMiniKeyboardView" parent="KeyboardView">
         <item name="keyBackground">@drawable/btn_keyboard_key_popup</item>
@@ -96,21 +94,24 @@
         <item name="keyBackground">@drawable/btn_keyboard_key3</item>
     </style>
     <!-- Theme "Stone" -->
-    <style name="LatinKeyboard.Stone" patent="LatinKeyboard">
+    <style name="Keyboard.Stone" parent="Keyboard">
+        <item name="horizontalGap">@dimen/key_horizontal_gap_stone</item>
+        <item name="verticalGap">@dimen/key_bottom_gap_stone</item>
+    </style>
+    <style name="LatinKeyboard.Stone" parent="LatinKeyboard">
         <item name="spacebarTextColor">#FF444444</item>
-        <item name="spacebarTextShadowColor">@color/latinkeyboard_bar_language_shadow_black</item>
-        <item name="disabledShortcutIcon">@drawable/sym_bkeyboard_voice_off</item>
+        <item name="spacebarTextShadowColor">#80FFFFFF</item>
     </style>
     <style name="KeyboardView.Stone" parent="KeyboardView">
         <item name="keyBackground">@drawable/btn_keyboard_key_stone</item>
-        <item name="keyTextColor">@color/latinkeyboard_key_color_black</item>
+        <item name="keyTextColor">#FF000000</item>
         <item name="keyTextInactivatedColor">#FF808080</item>
-        <item name="shadowColor">@color/latinkeyboard_key_color_white</item>
+        <item name="shadowColor">#FFFFFFFF</item>
     </style>
     <style name="PopupMiniKeyboardView.Stone" parent="PopupMiniKeyboardView">
         <item name="keyBackground">@drawable/btn_keyboard_key_stone</item>
-        <item name="keyTextColor">@color/latinkeyboard_key_color_black</item>
-        <item name="shadowColor">@color/latinkeyboard_key_color_white</item>
+        <item name="keyTextColor">#FF000000</item>
+        <item name="shadowColor">#FFFFFFFF</item>
     </style>
     <!-- Theme "Stone bold" -->
     <style name="KeyboardView.Stone.Bold" parent="KeyboardView.Stone">
@@ -125,49 +126,52 @@
     <style name="PopupMiniKeyboardView.Gingerbread" parent="PopupMiniKeyboardView">
         <item name="android:background">@null</item>
     </style>
-    <!-- Theme "Honeycomb" -->
-    <style name="Keyboard.Honeycomb" parent="Keyboard" >
+    <!-- Theme "IceCreamSandwich" -->
+    <style name="Keyboard.IceCreamSandwich" parent="Keyboard" >
+        <item name="keyboardTopPadding">@dimen/keyboard_top_padding_ics</item>
+        <item name="keyboardBottomPadding">@dimen/keyboard_bottom_padding_ics</item>
+        <item name="horizontalGap">@dimen/key_horizontal_gap_ics</item>
+        <item name="verticalGap">@dimen/key_bottom_gap_ics</item>
     </style>
-    <style name="LatinKeyboard.Honeycomb" parent="LatinKeyboard">
-        <item name="autoCorrectionSpacebarLedIcon">@null</item>
+    <style name="LatinKeyboard.IceCreamSandwich" parent="LatinKeyboard">
         <item name="disabledShortcutIcon">@drawable/sym_keyboard_voice_off_holo</item>
     </style>
-    <style name="KeyboardView.Honeycomb" parent="KeyboardView">
+    <style name="KeyboardView.IceCreamSandwich" parent="KeyboardView">
         <item name="android:background">@drawable/keyboard_background_holo</item>
-        <item name="keyBackground">@drawable/btn_keyboard_key_honeycomb</item>
+        <item name="keyBackground">@drawable/btn_keyboard_key_ics</item>
         <item name="keyTextStyle">bold</item>
         <item name="keyTextInactivatedColor">#66E0E4E5</item>
         <item name="keyHintLetterColor">#80000000</item>
         <item name="keyUppercaseLetterInactivatedColor">#66E0E4E5</item>
         <item name="keyUppercaseLetterActivatedColor">#FFFFFFFF</item>
-        <item name="keyPopupHintIcon">@drawable/hint_popup_holo</item>
-        <item name="keyPreviewHeight">@dimen/key_preview_height_holo</item>
-        <item name="keyPreviewOffset">@dimen/key_preview_offset_holo</item>
+        <item name="keyPopupHintIcon">@drawable/hint_popup</item>
+        <item name="keyPreviewHeight">@dimen/key_preview_height</item>
+        <item name="keyPreviewOffset">@dimen/key_preview_offset_ics</item>
         <item name="shadowColor">#00000000</item>
         <item name="shadowRadius">0.0</item>
     </style>
-    <style name="KeyPreviewStyle.Honeycomb">
-        <item name="android:background">@drawable/keyboard_key_feedback_honeycomb</item>
+    <style name="KeyPreviewStyle.IceCreamSandwich">
+        <item name="android:background">@drawable/keyboard_key_feedback_ics</item>
     </style>
-    <style name="PopupMiniKeyboardView.Honeycomb" parent="PopupMiniKeyboardView">
+    <style name="PopupMiniKeyboardView.IceCreamSandwich" parent="PopupMiniKeyboardView">
         <item name="android:background">@null</item>
-        <item name="keyBackground">@drawable/btn_keyboard_key_popup_honeycomb</item>
+        <item name="keyBackground">@drawable/btn_keyboard_key_popup_ics</item>
     </style>
-    <style name="PopupMiniKeyboardPanelStyle.Honeycomb">
+    <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>
     </style>
-    <style name="SuggestionsStripBackgroundStyle.Honeycomb">
+    <style name="SuggestionsStripBackgroundStyle.IceCreamSandwich">
         <item name="android:background">@drawable/keyboard_suggest_strip_holo</item>
     </style>
-    <style name="SuggestionBackgroundStyle.Honeycomb">
-        <item name="android:background">@drawable/btn_candidate_holo</item>
+    <style name="SuggestionBackgroundStyle.IceCreamSandwich">
+        <item name="android:background">@drawable/btn_candidate_ics</item>
     </style>
-    <style name="SuggestionPreviewBackgroundStyle.Honeycomb">
+    <style name="SuggestionPreviewBackgroundStyle.IceCreamSandwich">
         <item name="android:background">@drawable/keyboard_popup_panel_background_holo</item>
     </style>
-    <style name="CandidateViewStyle.Honeycomb" parent="SuggestionsStripBackgroundStyle.Honeycomb">
+    <style name="CandidateViewStyle.IceCreamSandwich" parent="SuggestionsStripBackgroundStyle.IceCreamSandwich">
         <item name="autoCorrectHighlight">autoCorrectUnderline|autoCorrectInvert</item>
         <item name="colorTypedWord">#FFFFFFFF</item>
         <item name="colorAutoCorrect">#FFFFFFFF</item>
diff --git a/java/res/values/themes-honeycomb.xml b/java/res/values/themes-ics.xml
similarity index 61%
rename from java/res/values/themes-honeycomb.xml
rename to java/res/values/themes-ics.xml
index 07f5b83..33c4081 100644
--- a/java/res/values/themes-honeycomb.xml
+++ b/java/res/values/themes-ics.xml
@@ -15,16 +15,16 @@
 -->
 
 <resources>
-    <style name="KeyboardTheme.Honeycomb" parent="KeyboardIcons.Holo">
-        <item name="keyboardStyle">@style/Keyboard.Honeycomb</item>
-        <item name="latinKeyboardStyle">@style/LatinKeyboard.Honeycomb</item>
-        <item name="keyboardViewStyle">@style/KeyboardView.Honeycomb</item>
-        <item name="keyPreviewStyle">@style/KeyPreviewStyle.Honeycomb</item>
-        <item name="popupMiniKeyboardViewStyle">@style/PopupMiniKeyboardView.Honeycomb</item>
-        <item name="popupMiniKeyboardPanelStyle">@style/PopupMiniKeyboardPanelStyle.Honeycomb</item>
-        <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle.Honeycomb</item>
-        <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle.Honeycomb</item>
-        <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle.Honeycomb</item>
-        <item name="candidateViewStyle">@style/CandidateViewStyle.Honeycomb</item>
+    <style name="KeyboardTheme.IceCreamSandwich" parent="KeyboardIcons.IceCreamSandwich">
+        <item name="keyboardStyle">@style/Keyboard.IceCreamSandwich</item>
+        <item name="latinKeyboardStyle">@style/LatinKeyboard.IceCreamSandwich</item>
+        <item name="keyboardViewStyle">@style/KeyboardView.IceCreamSandwich</item>
+        <item name="keyPreviewStyle">@style/KeyPreviewStyle.IceCreamSandwich</item>
+        <item name="popupMiniKeyboardViewStyle">@style/PopupMiniKeyboardView.IceCreamSandwich</item>
+        <item name="popupMiniKeyboardPanelStyle">@style/PopupMiniKeyboardPanelStyle.IceCreamSandwich</item>
+        <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle.IceCreamSandwich</item>
+        <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle.IceCreamSandwich</item>
+        <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle.IceCreamSandwich</item>
+        <item name="candidateViewStyle">@style/CandidateViewStyle.IceCreamSandwich</item>
     </style>
 </resources>
diff --git a/java/res/values/themes-stone-bold.xml b/java/res/values/themes-stone-bold.xml
index 4955f22..6589807 100644
--- a/java/res/values/themes-stone-bold.xml
+++ b/java/res/values/themes-stone-bold.xml
@@ -16,7 +16,7 @@
 
 <resources>
     <style name="KeyboardTheme.Stone.Bold" parent="KeyboardIcons.Black">
-        <item name="keyboardStyle">@style/Keyboard</item>
+        <item name="keyboardStyle">@style/Keyboard.Stone</item>
         <item name="latinKeyboardStyle">@style/LatinKeyboard.Stone</item>
         <item name="keyboardViewStyle">@style/KeyboardView.Stone.Bold</item>
         <item name="keyPreviewStyle">@style/KeyPreviewStyle</item>
diff --git a/java/res/values/themes-stone.xml b/java/res/values/themes-stone.xml
index 39a011b..a8608f6 100644
--- a/java/res/values/themes-stone.xml
+++ b/java/res/values/themes-stone.xml
@@ -16,7 +16,7 @@
 
 <resources>
     <style name="KeyboardTheme.Stone" parent="KeyboardIcons.Black">
-        <item name="keyboardStyle">@style/Keyboard</item>
+        <item name="keyboardStyle">@style/Keyboard.Stone</item>
         <item name="latinKeyboardStyle">@style/LatinKeyboard.Stone</item>
         <item name="keyboardViewStyle">@style/KeyboardView.Stone</item>
         <item name="keyPreviewStyle">@style/KeyPreviewStyle</item>