diff --git a/java/res/xml-sw600dp/kbd_number.xml b/java/res/xml-sw600dp/kbd_number.xml
index 9b8d4b31d..c8641ed3f 100644
--- a/java/res/xml-sw600dp/kbd_number.xml
+++ b/java/res/xml-sw600dp/kbd_number.xml
@@ -33,62 +33,121 @@
         latin:keyboardLayout="@xml/kbd_key_styles" />
     <include
         latin:keyboardLayout="@xml/kbd_numkey_styles" />
-    <Row
-        latin:rowEdgeFlags="top"
-    >
-        <Key
-            latin:keyLabel="1"
-            latin:keyEdgeFlags="left" />
-        <Key
-            latin:keyLabel="2" />
-        <Key
-            latin:keyLabel="3" />
-        <Key
-            latin:keyLabel="-"
-            latin:keyStyle="functionalKeyStyle"
-            latin:keyWidth="20%p"
-            latin:keyEdgeFlags="right" />
-    </Row>
-    <Row>
-        <Key
-            latin:keyLabel="4"
-            latin:keyEdgeFlags="left" />
-        <Key
-            latin:keyLabel="5" />
-        <Key
-            latin:keyLabel="6" />
-        <Key
-            latin:keyLabel=","
-            latin:keyStyle="functionalKeyStyle"
-            latin:keyWidth="20%p"
-            latin:keyEdgeFlags="right" />
-    </Row>
-    <Row>
-        <Key
-            latin:keyLabel="7"
-            latin:keyEdgeFlags="left" />
-        <Key
-            latin:keyLabel="8" />
-        <Key
-            latin:keyLabel="9" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="20%p"
-            latin:keyEdgeFlags="right" />
-    </Row>
-    <Row
-        latin:rowEdgeFlags="bottom"
-    >
-        <Key
-            latin:keyStyle="numSpaceKeyStyle"
-            latin:keyEdgeFlags="left" />
-        <Key
-            latin:keyLabel="0" />
-        <Key
-            latin:keyLabel="." />
-        <Key
-            latin:keyStyle="returnKeyStyle"
-            latin:keyWidth="20%p"
-            latin:keyEdgeFlags="right" />
-    </Row>
+    <switch>
+        <case
+            latin:passwordInput="true"
+        >
+            <Row
+                latin:rowEdgeFlags="top"
+            >
+                <Key
+                    latin:keyStyle="num1KeyStyle"
+                    latin:keyEdgeFlags="left" />
+                <Key
+                    latin:keyStyle="num2KeyStyle" />
+                <Key
+                    latin:keyStyle="num3KeyStyle" />
+                <Spacer
+                    latin:horizontalGap="20%p" />
+            </Row>
+            <Row>
+                <Key
+                    latin:keyStyle="num4KeyStyle"
+                    latin:keyEdgeFlags="left" />
+                <Key
+                    latin:keyStyle="num5KeyStyle" />
+                <Key
+                    latin:keyStyle="num6KeyStyle" />
+                <Spacer
+                    latin:horizontalGap="20%p" />
+            </Row>
+            <Row>
+                <Key
+                    latin:keyStyle="num7KeyStyle"
+                    latin:keyEdgeFlags="left" />
+                <Key
+                    latin:keyStyle="num8KeyStyle" />
+                <Key
+                    latin:keyStyle="num9KeyStyle" />
+                <Key
+                    latin:keyStyle="deleteKeyStyle"
+                    latin:keyWidth="20%p"
+                    latin:keyEdgeFlags="right" />
+            </Row>
+            <Row
+                latin:rowEdgeFlags="bottom"
+            >
+                <Spacer
+                    latin:horizontalGap="26.67%p" />
+                <Key
+                    latin:keyStyle="num0KeyStyle" />
+                <Spacer
+                    latin:horizontalGap="26.67%p" />
+                <Key
+                    latin:keyStyle="returnKeyStyle"
+                    latin:keyWidth="20%p"
+                    latin:keyEdgeFlags="right" />
+            </Row>
+        </case>
+        <default>
+            <Row
+                latin:rowEdgeFlags="top"
+            >
+                <Key
+                    latin:keyLabel="1"
+                    latin:keyEdgeFlags="left" />
+                <Key
+                    latin:keyLabel="2" />
+                <Key
+                    latin:keyLabel="3" />
+                <Key
+                    latin:keyLabel="-"
+                    latin:keyStyle="functionalKeyStyle"
+                    latin:keyWidth="20%p"
+                    latin:keyEdgeFlags="right" />
+            </Row>
+            <Row>
+                <Key
+                    latin:keyLabel="4"
+                    latin:keyEdgeFlags="left" />
+                <Key
+                    latin:keyLabel="5" />
+                <Key
+                    latin:keyLabel="6" />
+                <Key
+                    latin:keyLabel=","
+                    latin:keyStyle="functionalKeyStyle"
+                    latin:keyWidth="20%p"
+                    latin:keyEdgeFlags="right" />
+            </Row>
+            <Row>
+                <Key
+                    latin:keyLabel="7"
+                    latin:keyEdgeFlags="left" />
+                <Key
+                    latin:keyLabel="8" />
+                <Key
+                    latin:keyLabel="9" />
+                <Key
+                    latin:keyStyle="deleteKeyStyle"
+                    latin:keyWidth="20%p"
+                    latin:keyEdgeFlags="right" />
+            </Row>
+            <Row
+                latin:rowEdgeFlags="bottom"
+            >
+                <Key
+                    latin:keyStyle="numSpaceKeyStyle"
+                    latin:keyEdgeFlags="left" />
+                <Key
+                    latin:keyLabel="0" />
+                <Key
+                    latin:keyLabel="." />
+                <Key
+                    latin:keyStyle="returnKeyStyle"
+                    latin:keyWidth="20%p"
+                    latin:keyEdgeFlags="right" />
+            </Row>
+        </default>
+    </switch>
 </Keyboard>
diff --git a/java/res/xml-sw600dp/kbd_numkey_styles.xml b/java/res/xml-sw600dp/kbd_numkey_styles.xml
index 72efbbcba..b10dc9333 100644
--- a/java/res/xml-sw600dp/kbd_numkey_styles.xml
+++ b/java/res/xml-sw600dp/kbd_numkey_styles.xml
@@ -81,8 +81,8 @@
             <key-style
                 latin:styleName="numSpaceKeyStyle"
                 latin:code="@integer/key_space"
-                latin:iconPreview="@drawable/sym_keyboard_feedback_space"
-                latin:keyIcon="@drawable/sym_keyboard_space" />
+                latin:keyIcon="@drawable/sym_keyboard_space"
+                latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
         </case>
         <case
             latin:colorScheme="black"
@@ -143,8 +143,8 @@
             <key-style
                 latin:styleName="numSpaceKeyStyle"
                 latin:code="@integer/key_space"
-                latin:iconPreview="@drawable/sym_keyboard_feedback_space"
-                latin:keyIcon="@drawable/sym_keyboard_space" />
+                latin:keyIcon="@drawable/sym_bkeyboard_space"
+                latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
         </case>
     </switch>
 </merge>
diff --git a/java/res/xml/kbd_number.xml b/java/res/xml/kbd_number.xml
index 7bd679bce..033f802b7 100644
--- a/java/res/xml/kbd_number.xml
+++ b/java/res/xml/kbd_number.xml
@@ -31,83 +31,123 @@
 >
     <include
         latin:keyboardLayout="@xml/kbd_key_styles" />
-    <!-- TODO: Should add number password layout just like the xlarge layout does. -->
+    <include
+        latin:keyboardLayout="@xml/kbd_numkey_styles" />
     <switch>
         <case
-            latin:colorScheme="white"
+            latin:passwordInput="true"
         >
-            <key-style
-                latin:styleName="numSpaceKeyStyle"
-                latin:code="@integer/key_space"
-                latin:keyIcon="@drawable/sym_keyboard_space"
-                latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
-        </case>
-        <case
-            latin:colorScheme="black"
-        >
-            <key-style
-                latin:styleName="numSpaceKeyStyle"
-                latin:code="@integer/key_space"
-                latin:keyIcon="@drawable/sym_bkeyboard_space"
-                latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
+            <Row
+                latin:rowEdgeFlags="top"
+            >
+                <Key
+                    latin:keyStyle="num1KeyStyle"
+                    latin:keyEdgeFlags="left" />
+                <Key
+                    latin:keyStyle="num2KeyStyle" />
+                <Key
+                    latin:keyStyle="num3KeyStyle" />
+                <Spacer
+                    latin:horizontalGap="20%p" />
+            </Row>
+            <Row>
+                <Key
+                    latin:keyStyle="num4KeyStyle"
+                    latin:keyEdgeFlags="left" />
+                <Key
+                    latin:keyStyle="num5KeyStyle" />
+                <Key
+                    latin:keyStyle="num6KeyStyle" />
+                <Spacer
+                    latin:horizontalGap="20%p" />
+            </Row>
+            <Row>
+                <Key
+                    latin:keyStyle="num7KeyStyle"
+                    latin:keyEdgeFlags="left" />
+                <Key
+                    latin:keyStyle="num8KeyStyle" />
+                <Key
+                    latin:keyStyle="num9KeyStyle" />
+                <Key
+                    latin:keyStyle="deleteKeyStyle"
+                    latin:keyWidth="20%p"
+                    latin:keyEdgeFlags="right" />
+            </Row>
+            <Row
+                latin:rowEdgeFlags="bottom"
+            >
+                <Spacer
+                    latin:horizontalGap="26.67%p" />
+                <Key
+                    latin:keyStyle="num0KeyStyle" />
+                <Spacer
+                    latin:horizontalGap="26.67%p" />
+                <Key
+                    latin:keyStyle="returnKeyStyle"
+                    latin:keyWidth="20%p"
+                    latin:keyEdgeFlags="right" />
+            </Row>
         </case>
+        <default>
+            <Row
+                latin:rowEdgeFlags="top"
+            >
+                <Key
+                    latin:keyLabel="1"
+                    latin:keyEdgeFlags="left" />
+                <Key
+                    latin:keyLabel="2" />
+                <Key
+                    latin:keyLabel="3" />
+                <Key
+                    latin:keyLabel="-"
+                    latin:keyStyle="functionalKeyStyle"
+                    latin:keyWidth="20%p"
+                    latin:keyEdgeFlags="right" />
+            </Row>
+            <Row>
+                <Key
+                    latin:keyLabel="4"
+                    latin:keyEdgeFlags="left" />
+                <Key
+                    latin:keyLabel="5" />
+                <Key
+                    latin:keyLabel="6" />
+                <Key
+                    latin:keyLabel=","
+                    latin:keyStyle="functionalKeyStyle"
+                    latin:keyWidth="20%p"
+                    latin:keyEdgeFlags="right" />
+            </Row>
+            <Row>
+                <Key
+                    latin:keyLabel="7"
+                    latin:keyEdgeFlags="left" />
+                <Key
+                    latin:keyLabel="8" />
+                <Key
+                    latin:keyLabel="9" />
+                <Key
+                    latin:keyStyle="deleteKeyStyle"
+                    latin:keyWidth="20%p"
+                    latin:keyEdgeFlags="right" />
+            </Row>
+            <Row
+                latin:rowEdgeFlags="bottom"
+            >
+                <Key
+                    latin:keyStyle="numSpaceKeyStyle"
+                    latin:keyEdgeFlags="left" />
+                <Key
+                    latin:keyLabel="0" />
+                <Key
+                    latin:keyLabel="." />
+                <Key
+                    latin:keyStyle="returnKeyStyle"
+                    latin:keyWidth="20%p"
+                    latin:keyEdgeFlags="right" />
+            </Row>
+        </default>
     </switch>
-    <Row
-        latin:rowEdgeFlags="top"
-    >
-        <Key
-            latin:keyLabel="1"
-            latin:keyEdgeFlags="left" />
-        <Key
-            latin:keyLabel="2" />
-        <Key
-            latin:keyLabel="3" />
-        <Key
-            latin:keyLabel="-"
-            latin:keyStyle="functionalKeyStyle"
-            latin:keyWidth="20%p"
-            latin:keyEdgeFlags="right" />
-    </Row>
-    <Row>
-        <Key
-            latin:keyLabel="4"
-            latin:keyEdgeFlags="left" />
-        <Key
-            latin:keyLabel="5" />
-        <Key
-            latin:keyLabel="6" />
-        <Key
-            latin:keyLabel=","
-            latin:keyStyle="functionalKeyStyle"
-            latin:keyWidth="20%p"
-            latin:keyEdgeFlags="right" />
-    </Row>
-    <Row>
-        <Key
-            latin:keyLabel="7"
-            latin:keyEdgeFlags="left" />
-        <Key
-            latin:keyLabel="8" />
-        <Key
-            latin:keyLabel="9" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="20%p"
-            latin:keyEdgeFlags="right" />
-    </Row>
-    <Row
-        latin:rowEdgeFlags="bottom"
-    >
-        <Key
-            latin:keyStyle="numSpaceKeyStyle"
-            latin:keyEdgeFlags="left" />
-        <Key
-            latin:keyLabel="0" />
-        <Key
-            latin:keyLabel="." />
-        <Key
-            latin:keyStyle="returnKeyStyle"
-            latin:keyWidth="20%p"
-            latin:keyEdgeFlags="right" />
-    </Row>
 </Keyboard>