diff --git a/java/res/layout/input_gingerbread.xml b/java/res/layout/input_gingerbread.xml
index 73cf0a3fa..1991083ab 100644
--- a/java/res/layout/input_gingerbread.xml
+++ b/java/res/layout/input_gingerbread.xml
@@ -25,6 +25,7 @@
         android:layout_alignParentBottom="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingTop="@dimen/keyboard_top_padding"
         android:paddingBottom="@dimen/keyboard_bottom_padding"
         android:background="@drawable/keyboard_dark_background"
         android:textStyle="bold"
diff --git a/java/res/values-land/dimens.xml b/java/res/values-land/dimens.xml
index 15f356db9..f7fc4b107 100644
--- a/java/res/values-land/dimens.xml
+++ b/java/res/values-land/dimens.xml
@@ -23,6 +23,7 @@
     <dimen name="key_height">0.250in</dimen>
     <dimen name="key_bottom_gap">0.020in</dimen>
     <dimen name="popup_key_height">0.270in</dimen>
+    <dimen name="keyboard_top_padding">0.0in</dimen>
     <dimen name="keyboard_bottom_padding">0.0in</dimen>
     <dimen name="candidate_strip_height">38dip</dimen>
     <dimen name="candidate_strip_fading_edge_length">63dip</dimen>
@@ -30,6 +31,6 @@
     <!-- 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.324in</dimen>
-    <!-- popup_key_height x 1.0 -->
+    <!-- popup_key_height x -1.0 -->
     <dimen name="mini_keyboard_vertical_correction">-0.270in</dimen>
 </resources>
diff --git a/java/res/values-xlarge/dimens.xml b/java/res/values-xlarge/dimens.xml
index 29838e846..a53e45a32 100644
--- a/java/res/values-xlarge/dimens.xml
+++ b/java/res/values-xlarge/dimens.xml
@@ -20,18 +20,19 @@
 
 <resources>
     <!-- key_height + key_bottom_gap = popup_key_height -->
-    <dimen name="key_height">14.00mm</dimen>
+    <dimen name="key_height">13.0mm</dimen>
     <dimen name="key_bottom_gap">2.0mm</dimen>
     <dimen name="key_horizontal_gap">2.0mm</dimen>
-    <dimen name="popup_key_height">0.450in</dimen>
-    <dimen name="keyboard_bottom_padding">0.10in</dimen>
+    <dimen name="popup_key_height">15.0mm</dimen>
+    <dimen name="keyboard_top_padding">1.0mm</dimen>
+    <dimen name="keyboard_bottom_padding">1.0mm</dimen>
     <!-- key_height x 1.6 -->
-    <dimen name="key_preview_height">0.720in</dimen>
+    <dimen name="key_preview_height">20.8mm</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.540in</dimen>
-    <!-- popup_key_height x 1.0 -->
-    <dimen name="mini_keyboard_vertical_correction">-0.450in</dimen>
+    <dimen name="mini_keyboard_slide_allowance">15.6mm</dimen>
+    <!-- popup_key_height x -1.0 -->
+    <dimen name="mini_keyboard_vertical_correction">-13.0mm</dimen>
 
     <dimen name="key_text_size">0.175in</dimen>
     <dimen name="key_label_text_size">0.100in</dimen>
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index 5267f3b40..0073835fd 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -24,13 +24,14 @@
     <dimen name="key_bottom_gap">0.035in</dimen>
     <dimen name="key_horizontal_gap">0.000in</dimen>
     <dimen name="popup_key_height">0.325in</dimen>
+    <dimen name="keyboard_top_padding">0.00in</dimen>
     <dimen name="keyboard_bottom_padding">0.06in</dimen>
     <!-- key_preview_text_size_large x 2 -->
     <dimen name="key_preview_height">80sp</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.390in</dimen>
-    <!-- popup_key_height x 1.0 -->
+    <!-- popup_key_height x -1.0 -->
     <dimen name="mini_keyboard_vertical_correction">-0.325in</dimen>
 
     <dimen name="key_text_size">0.13in</dimen>