diff --git a/java/res/drawable-hdpi/sym_keyboard_spacebar_lxx_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png
similarity index 100%
rename from java/res/drawable-hdpi/sym_keyboard_spacebar_lxx_dark.9.png
rename to java/res/drawable-hdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png
diff --git a/java/res/drawable-hdpi/sym_keyboard_spacebar_lxx_light.9.png b/java/res/drawable-hdpi/btn_keyboard_spacebar_normal_lxx_light.9.png
similarity index 100%
rename from java/res/drawable-hdpi/sym_keyboard_spacebar_lxx_light.9.png
rename to java/res/drawable-hdpi/btn_keyboard_spacebar_normal_lxx_light.9.png
diff --git a/java/res/drawable-hdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd0d884c68a72fc1246400a4abc5a440714c5007
Binary files /dev/null and b/java/res/drawable-hdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png b/java/res/drawable-hdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..c05605fbf700f09300088a361a29431ac898a1fa
Binary files /dev/null and b/java/res/drawable-hdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_spacebar_lxx_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png
similarity index 100%
rename from java/res/drawable-mdpi/sym_keyboard_spacebar_lxx_dark.9.png
rename to java/res/drawable-mdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png
diff --git a/java/res/drawable-mdpi/sym_keyboard_spacebar_lxx_light.9.png b/java/res/drawable-mdpi/btn_keyboard_spacebar_normal_lxx_light.9.png
similarity index 100%
rename from java/res/drawable-mdpi/sym_keyboard_spacebar_lxx_light.9.png
rename to java/res/drawable-mdpi/btn_keyboard_spacebar_normal_lxx_light.9.png
diff --git a/java/res/drawable-mdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb2ca06d32a0b39b2b03a22c8a44e3ed6f928403
Binary files /dev/null and b/java/res/drawable-mdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png b/java/res/drawable-mdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..653da974ca2418996d1440814ca08679d1ebaf84
Binary files /dev/null and b/java/res/drawable-mdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_spacebar_lxx_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png
similarity index 100%
rename from java/res/drawable-xhdpi/sym_keyboard_spacebar_lxx_dark.9.png
rename to java/res/drawable-xhdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png
diff --git a/java/res/drawable-xhdpi/sym_keyboard_spacebar_lxx_light.9.png b/java/res/drawable-xhdpi/btn_keyboard_spacebar_normal_lxx_light.9.png
similarity index 100%
rename from java/res/drawable-xhdpi/sym_keyboard_spacebar_lxx_light.9.png
rename to java/res/drawable-xhdpi/btn_keyboard_spacebar_normal_lxx_light.9.png
diff --git a/java/res/drawable-xhdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3428bede67325517d3e6dea625124a17adf3bdf
Binary files /dev/null and b/java/res/drawable-xhdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png b/java/res/drawable-xhdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..f795ee9afd191d292f01440d5439fd06c05511ab
Binary files /dev/null and b/java/res/drawable-xhdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_spacebar_lxx_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png
similarity index 100%
rename from java/res/drawable-xxhdpi/sym_keyboard_spacebar_lxx_dark.9.png
rename to java/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_spacebar_lxx_light.9.png b/java/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_lxx_light.9.png
similarity index 100%
rename from java/res/drawable-xxhdpi/sym_keyboard_spacebar_lxx_light.9.png
rename to java/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_lxx_light.9.png
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e74c6723b5eb00b5507bb7949eb1c1500847bfc
Binary files /dev/null and b/java/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png b/java/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ca1ae3e9cb87b2b23e3b8a39afe14ca832cea8e
Binary files /dev/null and b/java/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png differ
diff --git a/java/res/drawable/btn_keyboard_spacebar_lxx_dark.xml b/java/res/drawable/btn_keyboard_spacebar_lxx_dark.xml
index 5c595d9ed4893f4367a6333499601f50db43d88b..e930e40e4a1386e7b683cb0d78afca908d4fd45b 100644
--- a/java/res/drawable/btn_keyboard_spacebar_lxx_dark.xml
+++ b/java/res/drawable/btn_keyboard_spacebar_lxx_dark.xml
@@ -16,6 +16,6 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true"
-          android:drawable="@color/key_background_pressed_lxx_dark" />
-    <item android:drawable="@color/key_background_lxx_dark" />
+          android:drawable="@drawable/btn_keyboard_spacebar_pressed_lxx_dark" />
+    <item android:drawable="@drawable/btn_keyboard_spacebar_normal_lxx_dark" />
 </selector>
diff --git a/java/res/drawable/btn_keyboard_spacebar_lxx_light.xml b/java/res/drawable/btn_keyboard_spacebar_lxx_light.xml
index acd19fda4ad22e234ad6a3339edb5166396aa720..2b059938d64298e3be1b2ed368c38c99312f92eb 100644
--- a/java/res/drawable/btn_keyboard_spacebar_lxx_light.xml
+++ b/java/res/drawable/btn_keyboard_spacebar_lxx_light.xml
@@ -16,6 +16,6 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true"
-          android:drawable="@color/key_background_pressed_lxx_light" />
-    <item android:drawable="@color/key_background_lxx_light" />
+          android:drawable="@drawable/btn_keyboard_spacebar_pressed_lxx_light" />
+    <item android:drawable="@drawable/btn_keyboard_spacebar_normal_lxx_light" />
 </selector>
diff --git a/java/res/values/keyboard-icons-lxx-dark.xml b/java/res/values/keyboard-icons-lxx-dark.xml
index 305df02cd6a197303fa1c8f64d84de7f501bf3c8..2e2fd0abbc29c451fa6661869e356671734fa309 100644
--- a/java/res/values/keyboard-icons-lxx-dark.xml
+++ b/java/res/values/keyboard-icons-lxx-dark.xml
@@ -24,7 +24,7 @@
         <item name="iconShiftKey">@drawable/sym_keyboard_shift_lxx_dark</item>
         <item name="iconDeleteKey">@drawable/sym_keyboard_delete_lxx_dark</item>
         <item name="iconSettingsKey">@drawable/sym_keyboard_settings_lxx_dark</item>
-        <item name="iconSpaceKey">@drawable/sym_keyboard_spacebar_lxx_dark</item>
+        <item name="iconSpaceKey">@null</item>
         <item name="iconEnterKey">@drawable/sym_keyboard_return_lxx_dark</item>
         <item name="iconGoKey">@drawable/sym_keyboard_go_lxx_dark</item>
         <item name="iconSearchKey">@drawable/sym_keyboard_search_lxx_dark</item>
diff --git a/java/res/values/keyboard-icons-lxx-light.xml b/java/res/values/keyboard-icons-lxx-light.xml
index 866dc682f45cb531e9a9d6cdc0e735688b4dab0f..099a706fedbcca4a43637fa7e2b8702dece2157c 100644
--- a/java/res/values/keyboard-icons-lxx-light.xml
+++ b/java/res/values/keyboard-icons-lxx-light.xml
@@ -24,7 +24,7 @@
         <item name="iconShiftKey">@drawable/sym_keyboard_shift_lxx_light</item>
         <item name="iconDeleteKey">@drawable/sym_keyboard_delete_lxx_light</item>
         <item name="iconSettingsKey">@drawable/sym_keyboard_settings_lxx_light</item>
-        <item name="iconSpaceKey">@drawable/sym_keyboard_spacebar_lxx_light</item>
+        <item name="iconSpaceKey">@null</item>
         <item name="iconEnterKey">@drawable/sym_keyboard_return_lxx_light</item>
         <item name="iconGoKey">@drawable/sym_keyboard_go_lxx_light</item>
         <item name="iconSearchKey">@drawable/sym_keyboard_search_lxx_light</item>