diff --git a/app/src/main/res/drawable/btn_keyboard_key.xml b/app/src/main/res/drawable/btn_keyboard_key.xml
index 8e3c212..2a74309 100644
--- a/app/src/main/res/drawable/btn_keyboard_key.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/btn_keyboard_key_pressed_on" android:state_checkable="true" android:state_checked="true" android:state_pressed="true" />
-    <item android:drawable="@drawable/btn_keyboard_key_pressed_off" android:state_checkable="true" android:state_pressed="true" />
-    <item android:drawable="@drawable/btn_keyboard_key_normal_on" android:state_checkable="true" android:state_checked="true" />
-    <item android:drawable="@drawable/btn_keyboard_key_normal_off" android:state_checkable="true" />
-    <!-- Normal keys -->
     <item android:drawable="@drawable/btn_keyboard_key_pressed" android:state_pressed="true" />
     <item android:drawable="@drawable/btn_keyboard_key_normal" />
-
 </selector>
diff --git a/app/src/main/res/drawable/btn_keyboard_key_normal_off.9.png b/app/src/main/res/drawable/btn_keyboard_key_normal_off.9.png
deleted file mode 100644
index 01e2506..0000000
Binary files a/app/src/main/res/drawable/btn_keyboard_key_normal_off.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable/btn_keyboard_key_normal_on.9.png b/app/src/main/res/drawable/btn_keyboard_key_normal_on.9.png
deleted file mode 100644
index 83c6eb3..0000000
Binary files a/app/src/main/res/drawable/btn_keyboard_key_normal_on.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable/btn_keyboard_key_pressed_off.9.png b/app/src/main/res/drawable/btn_keyboard_key_pressed_off.9.png
deleted file mode 100644
index 218a2d2..0000000
Binary files a/app/src/main/res/drawable/btn_keyboard_key_pressed_off.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable/btn_keyboard_key_pressed_on.9.png b/app/src/main/res/drawable/btn_keyboard_key_pressed_on.9.png
deleted file mode 100644
index afe4951..0000000
Binary files a/app/src/main/res/drawable/btn_keyboard_key_pressed_on.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable/keyboard_enter_background.xml b/app/src/main/res/drawable/keyboard_enter_background.xml
new file mode 100644
index 0000000..3006236
--- /dev/null
+++ b/app/src/main/res/drawable/keyboard_enter_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/button_background_shape">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/md_grey_800_dark" />
+            <corners android:radius="4dp" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/drawable/keyboard_space_background.xml b/app/src/main/res/drawable/keyboard_space_background.xml
new file mode 100644
index 0000000..3006236
--- /dev/null
+++ b/app/src/main/res/drawable/keyboard_space_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/button_background_shape">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/md_grey_800_dark" />
+            <corners android:radius="4dp" />
+        </shape>
+    </item>
+</layer-list>