diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_holo_dark.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_holo_dark.9.png
deleted file mode 100644
index fa2cb8542..000000000
Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_holo_dark.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_holo_dark.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_holo_dark.9.png
deleted file mode 100644
index 8e9a34957..000000000
Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_holo_dark.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_holo_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_holo_dark.9.png
deleted file mode 100644
index a2f6ac0e2..000000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_holo_dark.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_holo_dark.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_holo_dark.9.png
deleted file mode 100644
index 17f0a7a58..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_holo_dark.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_base_border.xml b/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_base_border.xml
deleted file mode 100644
index 40230b164..000000000
--- a/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_base_border.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item >
-        <shape android:shape="rectangle">
-            <solid android:color="@color/key_bottom_bevel_lxx_base" />
-            <corners android:radius="5dp"/>
-        </shape>
-    </item>
-    <item android:bottom="1dp">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/action_key_background_lxx_base" />
-            <corners android:radius="5dp" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_base.xml b/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_base.xml
index af89955da..abee41da5 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_base.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_base.xml
@@ -4,7 +4,7 @@
     android:shape="oval">
 
     <solid
-        android:color="@color/action_key_background_pressed_lxx_base"/>
+        android:color="@color/key_background_lxx_base"/>
 
     <size
         android:width="35dp"
diff --git a/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_base_border.xml b/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_base_border.xml
deleted file mode 100644
index 1e3980505..000000000
--- a/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_base_border.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/action_key_background_pressed_lxx_base" />
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_keyboard_key_functional_holo_white.xml b/app/src/main/res/drawable/btn_keyboard_key_functional_holo_white.xml
deleted file mode 100644
index 7b444f7c5..000000000
--- a/app/src/main/res/drawable/btn_keyboard_key_functional_holo_white.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Functional keys. -->
-    <item android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_klp_dark" />
-    <item android:drawable="@drawable/btn_keyboard_key_normal_holo_dark" />
-</selector>
diff --git a/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_base.xml b/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_base.xml
deleted file mode 100644
index 9d8240d72..000000000
--- a/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_base.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Functional keys. -->
-    <item android:state_pressed="true"
-          android:drawable="@color/key_background_pressed_lxx_base" />
-    <item android:drawable="@color/key_background_lxx_base" />
-</selector>
diff --git a/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_base_border.xml b/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_base_border.xml
deleted file mode 100644
index 0dadb22ba..000000000
--- a/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_base_border.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Functional keys. -->
-    <item android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_lxx_base_border" />
-    <item android:drawable="@drawable/btn_keyboard_key_functional_normal_lxx_base_border" />
-</selector>
diff --git a/app/src/main/res/drawable/btn_keyboard_key_functional_normal_lxx_base_border.xml b/app/src/main/res/drawable/btn_keyboard_key_functional_normal_lxx_base_border.xml
deleted file mode 100644
index c696d9382..000000000
--- a/app/src/main/res/drawable/btn_keyboard_key_functional_normal_lxx_base_border.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item >
-        <shape android:shape="rectangle">
-            <solid android:color="@color/key_bottom_bevel_lxx_base" />
-            <corners android:radius="5dp"/>
-        </shape>
-    </item>
-    <item android:bottom="1dp">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/key_background_functional_lxx_base_border" />
-            <corners android:radius="5dp" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_keyboard_key_lxx_base.xml b/app/src/main/res/drawable/btn_keyboard_key_lxx_base.xml
index c331f32fa..b0678be5d 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_lxx_base.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_lxx_base.xml
@@ -23,22 +23,22 @@
 
     <!-- Toggle keys. Use checkable/checked state. -->
     <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
-          android:drawable="@color/key_background_pressed_lxx_base" />
+          android:drawable="@color/key_background_lxx_base" />
     <item android:state_checkable="true" android:state_pressed="true"
           android:drawable="@color/key_background_lxx_base" />
     <item android:state_checkable="true" android:state_checked="true"
-          android:drawable="@color/key_background_pressed_lxx_base" />
+          android:drawable="@color/key_background_lxx_base" />
     <item android:state_checkable="true"
           android:drawable="@color/key_background_lxx_base" />
 
         <!-- Empty background keys. -->
     <item android:state_empty="true" android:state_pressed="true"
-          android:drawable="@color/key_background_pressed_lxx_base" />
+          android:drawable="@color/key_background_lxx_base" />
     <item android:state_empty="true"
           android:drawable="@android:color/transparent" />
 
     <!-- Normal keys. -->
     <item android:state_pressed="true"
-          android:drawable="@color/key_background_pressed_lxx_base" />
+          android:drawable="@color/key_background_lxx_base" />
     <item android:drawable="@color/key_background_lxx_base" />
 </selector>
diff --git a/app/src/main/res/drawable/btn_keyboard_key_lxx_base_border.xml b/app/src/main/res/drawable/btn_keyboard_key_lxx_base_border.xml
index fa24b65f0..941b01b3f 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_lxx_base_border.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_lxx_base_border.xml
@@ -17,19 +17,19 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Action keys. -->
     <item android:state_active="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_action_pressed_lxx_base_border" />
+          android:drawable="@drawable/btn_keyboard_key_pressed_lxx_base_border" />
     <item android:state_active="true"
-          android:drawable="@drawable/btn_keyboard_key_action_normal_lxx_base_border" />
+          android:drawable="@drawable/btn_keyboard_key_normal_lxx_base_border" />
 
     <!-- Toggle keys. Use checkable/checked state. -->
     <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_functional_normal_lxx_base_border" />
+          android:drawable="@drawable/btn_keyboard_key_pressed_lxx_base_border" />
     <item android:state_checkable="true" android:state_pressed="true"
           android:drawable="@drawable/btn_keyboard_key_pressed_lxx_base_border" />
     <item android:state_checkable="true" android:state_checked="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_lxx_base_border" />
+          android:drawable="@drawable/btn_keyboard_key_normal_lxx_base_border" />
     <item android:state_checkable="true"
-          android:drawable="@drawable/btn_keyboard_key_functional_normal_lxx_base_border" />
+          android:drawable="@drawable/btn_keyboard_key_normal_lxx_base_border" />
 
     <!-- Empty background keys. -->
     <item android:state_empty="true" android:state_pressed="true"
diff --git a/app/src/main/res/drawable/btn_keyboard_key_pressed_lxx_base_border.xml b/app/src/main/res/drawable/btn_keyboard_key_pressed_lxx_base_border.xml
index 92cb663b4..f21805683 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_pressed_lxx_base_border.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_pressed_lxx_base_border.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/key_background_pressed_lxx_base_border" />
+    <solid android:color="@color/key_background_normal_lxx_base_border" />
     <corners android:radius="5dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_keyboard_spacebar_lxx_base.xml b/app/src/main/res/drawable/btn_keyboard_spacebar_lxx_base.xml
index 26cb6c7a2..02dce9d85 100644
--- a/app/src/main/res/drawable/btn_keyboard_spacebar_lxx_base.xml
+++ b/app/src/main/res/drawable/btn_keyboard_spacebar_lxx_base.xml
@@ -3,7 +3,7 @@
     <item android:state_pressed="true">
         <inset android:insetTop="25%p" android:insetBottom="25%p">
             <shape android:shape="rectangle">
-                <solid android:color="@color/key_background_pressed_lxx_base" />
+                <solid android:color="@color/key_background_lxx_base" />
                 <corners android:radius="5dp" />
             </shape>
         </inset>
diff --git a/app/src/main/res/values/themes-lxx-base-border.xml b/app/src/main/res/values/themes-lxx-base-border.xml
index f7edd5272..1996859b5 100644
--- a/app/src/main/res/values/themes-lxx-base-border.xml
+++ b/app/src/main/res/values/themes-lxx-base-border.xml
@@ -23,7 +23,7 @@
         parent="KeyboardView.LXX_Base">
         <item name="android:background">@drawable/keyboard_background_lxx_base_border</item>
         <item name="keyBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
-        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx_base_border</item>
+        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
         <item name="spacebarBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
     </style>
 
@@ -32,7 +32,7 @@
         parent="MainKeyboardView.LXX_Base">
         <item name="android:background">@drawable/keyboard_background_lxx_base_border</item>
         <item name="keyBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
-        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx_base_border</item>
+        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
         <item name="spacebarBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
     </style>
 
@@ -42,7 +42,7 @@
         <item name="categoryPageIndicatorBackground">@color/emoji_tab_page_indicator_background_lxx_base_border</item>
         <item name="android:background">@drawable/keyboard_background_lxx_base_border</item>
         <item name="keyBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
-        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx_base_border</item>
+        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
         <item name="spacebarBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
     </style>
 
@@ -51,7 +51,7 @@
         parent="ClipboardHistoryView.LXX_Base">
         <item name="android:background">@drawable/keyboard_background_lxx_base_border</item>
         <item name="keyBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
-        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx_base_border</item>
+        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_lxx_base_border</item>
     </style>
 
     <style
diff --git a/app/src/main/res/values/themes-lxx-base.xml b/app/src/main/res/values/themes-lxx-base.xml
index 861764a0b..cb9fbdd42 100644
--- a/app/src/main/res/values/themes-lxx-base.xml
+++ b/app/src/main/res/values/themes-lxx-base.xml
@@ -25,9 +25,9 @@
         name="KeyboardView.LXX_Base"
         parent="KeyboardView.LXX"
         >
-        <item name="android:background">@drawable/keyboard_background_lxx_base</item>
+        <item name="android:background">@color/keyboard_background_lxx_base</item>
         <item name="keyBackground">@drawable/btn_keyboard_key_lxx_base</item>
-        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx_base</item>
+        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_lxx_base</item>
         <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_lxx_base</item>
         <item name="keyTextColor">@color/key_text_color_lxx_light</item>
         <item name="keyTextInactivatedColor">@color/key_text_inactive_color_lxx_light</item>