diff --git a/README.md b/README.md
index 72997860a..1c3db3a0e 100644
--- a/README.md
+++ b/README.md
@@ -6,4 +6,4 @@ Eventual goals:
 * Improve upon various aspects of the keyboard, such as theming
 * Integrated voice input
 * Transformer language model instead of n-gram
-* On-device finetuning of language model(?)
\ No newline at end of file
+* On-device finetuning ofa language model(?)
\ No newline at end of file
diff --git a/java/res/anim/key_preview_dismiss_holo.xml b/java/res/anim/key_preview_dismiss_holo.xml
deleted file mode 100644
index 0bf725435..000000000
--- a/java/res/anim/key_preview_dismiss_holo.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 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.
-*/
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <objectAnimator
-        android:propertyName="scaleX"
-        android:duration="53"
-        android:valueFrom="1.00"
-        android:valueTo="0.94" />
-    <objectAnimator
-        android:propertyName="scaleY"
-        android:duration="53"
-        android:valueFrom="1.00"
-        android:valueTo="0.94" />
-</set>
diff --git a/java/res/anim/key_preview_show_up_holo.xml b/java/res/anim/key_preview_show_up_holo.xml
deleted file mode 100644
index ad2e413a1..000000000
--- a/java/res/anim/key_preview_show_up_holo.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 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.
-*/
--->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <objectAnimator
-        android:propertyName="scaleX"
-        android:duration="17"
-        android:valueFrom="0.98"
-        android:valueTo="1.00" />
-    <objectAnimator
-        android:propertyName="scaleY"
-        android:duration="17"
-        android:valueFrom="0.98"
-        android:valueTo="1.00" />
-</set>
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_active_ics_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_active_ics_dark.9.png
deleted file mode 100644
index 9aa8db60e..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_active_ics_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_active_klp_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_active_klp_dark.9.png
deleted file mode 100644
index fa2cb8542..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_active_klp_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_active_lxx_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_active_lxx_dark.9.png
deleted file mode 100644
index 55ef3e7f5..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_active_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_active_lxx_light.9.png b/java/res/drawable-hdpi/btn_keyboard_key_active_lxx_light.9.png
deleted file mode 100644
index 9f307dc7f..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_active_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png
deleted file mode 100644
index 17a77cccb..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_active_pressed_lxx_light.9.png b/java/res/drawable-hdpi/btn_keyboard_key_active_pressed_lxx_light.9.png
deleted file mode 100644
index 55ef3e7f5..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_active_pressed_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_holo_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_holo_dark.9.png
deleted file mode 100644
index fa2cb8542..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_holo_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_holo_light.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_holo_light.9.png
deleted file mode 100644
index 6da273b09..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_holo_light.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_off_holo_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_off_holo_dark.9.png
deleted file mode 100644
index b1af23b6c..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_off_holo_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_off_lxx_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_off_lxx_dark.9.png
deleted file mode 100644
index 5014c9472..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_off_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_off_lxx_light.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_off_lxx_light.9.png
deleted file mode 100644
index 79594c872..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_off_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_on_ics_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_on_ics_dark.9.png
deleted file mode 100644
index 9f4587b4a..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_on_ics_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_on_klp_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_on_klp_dark.9.png
deleted file mode 100644
index 814e40235..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_on_klp_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_on_lxx_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_on_lxx_dark.9.png
deleted file mode 100644
index b1f543548..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_on_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_on_lxx_light.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_on_lxx_light.9.png
deleted file mode 100644
index f0a89c524..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_on_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_ics.9.png b/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_ics.9.png
deleted file mode 100644
index c2e8b3779..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_klp.9.png b/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_klp.9.png
deleted file mode 100644
index 10f8e97e4..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png
deleted file mode 100644
index 31cd37925..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_light.9.png b/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_light.9.png
deleted file mode 100644
index b8717e668..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed_ics_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_ics_dark.9.png
deleted file mode 100644
index 7ec33dd20..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_pressed_ics_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed_ics_light.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_ics_light.9.png
deleted file mode 100644
index 5612c51a1..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_pressed_ics_light.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed_klp_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_klp_dark.9.png
deleted file mode 100644
index 90abe3940..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_pressed_klp_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed_klp_light.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_klp_light.9.png
deleted file mode 100644
index 6768241a7..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_pressed_klp_light.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed_off_ics_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_off_ics_dark.9.png
deleted file mode 100644
index 655bc01b1..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_pressed_off_ics_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed_off_klp_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_off_klp_dark.9.png
deleted file mode 100644
index 48eeb3f54..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_pressed_off_klp_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png
deleted file mode 100644
index be0812fdf..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed_off_lxx_light.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_off_lxx_light.9.png
deleted file mode 100644
index 4209ef92b..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_pressed_off_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed_on_ics_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_on_ics_dark.9.png
deleted file mode 100644
index 138e915d9..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_pressed_on_ics_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed_on_klp_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_on_klp_dark.9.png
deleted file mode 100644
index 71e0683cd..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_pressed_on_klp_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png
deleted file mode 100644
index a36ca323d..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed_on_lxx_light.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_on_lxx_light.9.png
deleted file mode 100644
index c6a474a8e..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_pressed_on_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png
deleted file mode 100644
index 32311666f..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_spacebar_normal_lxx_light.9.png b/java/res/drawable-hdpi/btn_keyboard_spacebar_normal_lxx_light.9.png
deleted file mode 100644
index 1256b8b21..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_spacebar_normal_lxx_light.9.png and /dev/null differ
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
deleted file mode 100644
index cd0d884c6..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png and /dev/null 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
deleted file mode 100644
index c05605fbf..000000000
Binary files a/java/res/drawable-hdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/emoji_category_tab_selected_ics.9.png b/java/res/drawable-hdpi/emoji_category_tab_selected_ics.9.png
deleted file mode 100644
index 9138cef9c..000000000
Binary files a/java/res/drawable-hdpi/emoji_category_tab_selected_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/emoji_category_tab_selected_klp.9.png b/java/res/drawable-hdpi/emoji_category_tab_selected_klp.9.png
deleted file mode 100644
index 345d05e9d..000000000
Binary files a/java/res/drawable-hdpi/emoji_category_tab_selected_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/emoji_category_tab_unselected_holo_dark.9.png b/java/res/drawable-hdpi/emoji_category_tab_unselected_holo_dark.9.png
deleted file mode 100644
index bbcfb2c64..000000000
Binary files a/java/res/drawable-hdpi/emoji_category_tab_unselected_holo_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_background_holo.9.png b/java/res/drawable-hdpi/keyboard_background_holo.9.png
deleted file mode 100644
index 73868751c..000000000
Binary files a/java/res/drawable-hdpi/keyboard_background_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_background_lxx_dark.9.png b/java/res/drawable-hdpi/keyboard_background_lxx_dark.9.png
deleted file mode 100644
index e34c5666b..000000000
Binary files a/java/res/drawable-hdpi/keyboard_background_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_background_lxx_light.9.png b/java/res/drawable-hdpi/keyboard_background_lxx_light.9.png
deleted file mode 100644
index bf5450cc7..000000000
Binary files a/java/res/drawable-hdpi/keyboard_background_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_background.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_background.9.png
deleted file mode 100644
index 21520178e..000000000
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_background.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_background_ics.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_background_ics.9.png
deleted file mode 100644
index 28b406a5c..000000000
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_background_klp.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_background_klp.9.png
deleted file mode 100644
index be394151a..000000000
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_dark.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_dark.9.png
deleted file mode 100644
index 93f300a13..000000000
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_light.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_light.9.png
deleted file mode 100644
index e7c516a0e..000000000
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_left_background_ics.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_left_background_ics.9.png
deleted file mode 100644
index e42cd88dc..000000000
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_left_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_left_background_klp.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_left_background_klp.9.png
deleted file mode 100644
index 9fa6d0003..000000000
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_left_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_ics.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_ics.9.png
deleted file mode 100644
index 160344073..000000000
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_klp.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_klp.9.png
deleted file mode 100644
index c73269b7e..000000000
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png
deleted file mode 100644
index 7ac82cffd..000000000
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_more_background_ics.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_more_background_ics.9.png
deleted file mode 100644
index a40d4277c..000000000
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_more_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_more_background_klp.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_more_background_klp.9.png
deleted file mode 100644
index fffd4021e..000000000
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_more_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_dark.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_dark.9.png
deleted file mode 100644
index b56fcf910..000000000
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_light.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_light.9.png
deleted file mode 100644
index 32005c37b..000000000
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_right_background_ics.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_right_background_ics.9.png
deleted file mode 100644
index 1f6807376..000000000
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_right_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_right_background_klp.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_right_background_klp.9.png
deleted file mode 100644
index 61c23c19b..000000000
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_right_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_ics.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_ics.9.png
deleted file mode 100644
index ec53593d9..000000000
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_klp.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_klp.9.png
deleted file mode 100644
index 827d74363..000000000
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_popup_panel_background_ics.9.png b/java/res/drawable-hdpi/keyboard_popup_panel_background_ics.9.png
deleted file mode 100644
index 53d7b6fb3..000000000
Binary files a/java/res/drawable-hdpi/keyboard_popup_panel_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_popup_panel_background_klp.9.png b/java/res/drawable-hdpi/keyboard_popup_panel_background_klp.9.png
deleted file mode 100644
index f9dd3b8b1..000000000
Binary files a/java/res/drawable-hdpi/keyboard_popup_panel_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_popup_panel_background_lxx_dark.9.png b/java/res/drawable-hdpi/keyboard_popup_panel_background_lxx_dark.9.png
deleted file mode 100644
index 33d80877d..000000000
Binary files a/java/res/drawable-hdpi/keyboard_popup_panel_background_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_popup_panel_background_lxx_light.9.png b/java/res/drawable-hdpi/keyboard_popup_panel_background_lxx_light.9.png
deleted file mode 100644
index 9b6f1bdce..000000000
Binary files a/java/res/drawable-hdpi/keyboard_popup_panel_background_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_suggest_strip_holo.9.png b/java/res/drawable-hdpi/keyboard_suggest_strip_holo.9.png
deleted file mode 100644
index 32f426402..000000000
Binary files a/java/res/drawable-hdpi/keyboard_suggest_strip_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_suggest_strip_lxx_dark.9.png b/java/res/drawable-hdpi/keyboard_suggest_strip_lxx_dark.9.png
deleted file mode 100644
index 3f6a943b2..000000000
Binary files a/java/res/drawable-hdpi/keyboard_suggest_strip_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_suggest_strip_lxx_light.9.png b/java/res/drawable-hdpi/keyboard_suggest_strip_lxx_light.9.png
deleted file mode 100644
index 107cfc77d..000000000
Binary files a/java/res/drawable-hdpi/keyboard_suggest_strip_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/more_keys_divider.png b/java/res/drawable-hdpi/more_keys_divider.png
deleted file mode 100644
index a5912f95c..000000000
Binary files a/java/res/drawable-hdpi/more_keys_divider.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/more_suggestions_divider.png b/java/res/drawable-hdpi/more_suggestions_divider.png
deleted file mode 100644
index a5912f95c..000000000
Binary files a/java/res/drawable-hdpi/more_suggestions_divider.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/suggestions_strip_divider_holo.png b/java/res/drawable-hdpi/suggestions_strip_divider_holo.png
deleted file mode 100644
index 5d44d9ce5..000000000
Binary files a/java/res/drawable-hdpi/suggestions_strip_divider_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/suggestions_strip_divider_lxx_dark.png b/java/res/drawable-hdpi/suggestions_strip_divider_lxx_dark.png
deleted file mode 100644
index e94f0b560..000000000
Binary files a/java/res/drawable-hdpi/suggestions_strip_divider_lxx_dark.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/suggestions_strip_divider_lxx_light.png b/java/res/drawable-hdpi/suggestions_strip_divider_lxx_light.png
deleted file mode 100644
index 9b0f20d62..000000000
Binary files a/java/res/drawable-hdpi/suggestions_strip_divider_lxx_light.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_active_ics_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_active_ics_dark.9.png
deleted file mode 100644
index e810c7789..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_active_ics_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_active_klp_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_active_klp_dark.9.png
deleted file mode 100644
index 8e9a34957..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_active_klp_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_active_lxx_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_active_lxx_dark.9.png
deleted file mode 100644
index 765191881..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_active_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_active_lxx_light.9.png b/java/res/drawable-mdpi/btn_keyboard_key_active_lxx_light.9.png
deleted file mode 100644
index 8131549e5..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_active_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png
deleted file mode 100644
index dcf814ada..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_active_pressed_lxx_light.9.png b/java/res/drawable-mdpi/btn_keyboard_key_active_pressed_lxx_light.9.png
deleted file mode 100644
index 765191881..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_active_pressed_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_holo_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_holo_dark.9.png
deleted file mode 100644
index 8e9a34957..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_normal_holo_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_holo_light.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_holo_light.9.png
deleted file mode 100644
index 2915588bf..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_normal_holo_light.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_off_holo_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_off_holo_dark.9.png
deleted file mode 100644
index 58a316fba..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_normal_off_holo_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_off_lxx_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_off_lxx_dark.9.png
deleted file mode 100644
index bdf2e49f1..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_normal_off_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_off_lxx_light.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_off_lxx_light.9.png
deleted file mode 100644
index 80cf6faba..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_normal_off_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_on_ics_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_on_ics_dark.9.png
deleted file mode 100644
index f3fc64114..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_normal_on_ics_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_on_klp_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_on_klp_dark.9.png
deleted file mode 100644
index b7b2dca43..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_normal_on_klp_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_on_lxx_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_on_lxx_dark.9.png
deleted file mode 100644
index 5b23e22b4..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_normal_on_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_on_lxx_light.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_on_lxx_light.9.png
deleted file mode 100644
index 3323d2c7d..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_normal_on_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_ics.9.png b/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_ics.9.png
deleted file mode 100644
index 93a6e7921..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_klp.9.png b/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_klp.9.png
deleted file mode 100644
index ee0aae28b..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png
deleted file mode 100644
index 81c1d71bf..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_light.9.png b/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_light.9.png
deleted file mode 100644
index 8fff67bf1..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_pressed_ics_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed_ics_dark.9.png
deleted file mode 100644
index 8f340d355..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_pressed_ics_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_pressed_ics_light.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed_ics_light.9.png
deleted file mode 100644
index c39dd4a94..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_pressed_ics_light.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_pressed_klp_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed_klp_dark.9.png
deleted file mode 100644
index 4a92b80dd..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_pressed_klp_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_pressed_klp_light.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed_klp_light.9.png
deleted file mode 100644
index 049385984..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_pressed_klp_light.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_pressed_off_ics_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed_off_ics_dark.9.png
deleted file mode 100644
index 53ea5f894..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_pressed_off_ics_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_pressed_off_klp_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed_off_klp_dark.9.png
deleted file mode 100644
index 72125a065..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_pressed_off_klp_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png
deleted file mode 100644
index ca17d52ed..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_pressed_off_lxx_light.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed_off_lxx_light.9.png
deleted file mode 100644
index 19aabf8a6..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_pressed_off_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_pressed_on_ics_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed_on_ics_dark.9.png
deleted file mode 100644
index 69c84e7ec..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_pressed_on_ics_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_pressed_on_klp_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed_on_klp_dark.9.png
deleted file mode 100644
index 82413d4cc..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_pressed_on_klp_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png
deleted file mode 100644
index 1c2c101e9..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_pressed_on_lxx_light.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed_on_lxx_light.9.png
deleted file mode 100644
index edbaa8373..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_pressed_on_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png
deleted file mode 100644
index b8e56dab4..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_spacebar_normal_lxx_light.9.png b/java/res/drawable-mdpi/btn_keyboard_spacebar_normal_lxx_light.9.png
deleted file mode 100644
index 281f83062..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_spacebar_normal_lxx_light.9.png and /dev/null differ
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
deleted file mode 100644
index cb2ca06d3..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png and /dev/null 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
deleted file mode 100644
index 653da974c..000000000
Binary files a/java/res/drawable-mdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/emoji_category_tab_selected_ics.9.png b/java/res/drawable-mdpi/emoji_category_tab_selected_ics.9.png
deleted file mode 100644
index 1731b46ad..000000000
Binary files a/java/res/drawable-mdpi/emoji_category_tab_selected_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/emoji_category_tab_selected_klp.9.png b/java/res/drawable-mdpi/emoji_category_tab_selected_klp.9.png
deleted file mode 100644
index 6354b997a..000000000
Binary files a/java/res/drawable-mdpi/emoji_category_tab_selected_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/emoji_category_tab_unselected_holo_dark.9.png b/java/res/drawable-mdpi/emoji_category_tab_unselected_holo_dark.9.png
deleted file mode 100644
index bb45ab960..000000000
Binary files a/java/res/drawable-mdpi/emoji_category_tab_unselected_holo_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_background_holo.9.png b/java/res/drawable-mdpi/keyboard_background_holo.9.png
deleted file mode 100644
index fbe97f7a2..000000000
Binary files a/java/res/drawable-mdpi/keyboard_background_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_background_lxx_dark.9.png b/java/res/drawable-mdpi/keyboard_background_lxx_dark.9.png
deleted file mode 100644
index 012d91455..000000000
Binary files a/java/res/drawable-mdpi/keyboard_background_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_background_lxx_light.9.png b/java/res/drawable-mdpi/keyboard_background_lxx_light.9.png
deleted file mode 100644
index 91adfac47..000000000
Binary files a/java/res/drawable-mdpi/keyboard_background_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_background.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_background.9.png
deleted file mode 100644
index 1745cecbe..000000000
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_background.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_background_ics.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_background_ics.9.png
deleted file mode 100644
index 7a9f640d1..000000000
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_background_klp.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_background_klp.9.png
deleted file mode 100644
index 625490b1f..000000000
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_dark.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_dark.9.png
deleted file mode 100644
index 1a7dd34ed..000000000
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_light.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_light.9.png
deleted file mode 100644
index 268863e68..000000000
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_left_background_ics.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_left_background_ics.9.png
deleted file mode 100644
index 5b06f09bb..000000000
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_left_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_left_background_klp.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_left_background_klp.9.png
deleted file mode 100644
index 427c87061..000000000
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_left_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_ics.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_ics.9.png
deleted file mode 100644
index fd992d6f4..000000000
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_klp.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_klp.9.png
deleted file mode 100644
index ea757296d..000000000
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_more_background.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_more_background.9.png
deleted file mode 100644
index cdfa6804b..000000000
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_more_background.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_more_background_ics.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_more_background_ics.9.png
deleted file mode 100644
index 128dcd6ad..000000000
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_more_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_more_background_klp.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_more_background_klp.9.png
deleted file mode 100644
index 1911c429f..000000000
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_more_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_dark.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_dark.9.png
deleted file mode 100644
index 08d67ef6a..000000000
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_light.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_light.9.png
deleted file mode 100644
index d0e46b14e..000000000
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_right_background_ics.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_right_background_ics.9.png
deleted file mode 100644
index 0b08d1747..000000000
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_right_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_right_background_klp.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_right_background_klp.9.png
deleted file mode 100644
index cdef116d2..000000000
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_right_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_ics.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_ics.9.png
deleted file mode 100644
index cf0b33c1d..000000000
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_klp.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_klp.9.png
deleted file mode 100644
index dea5d076c..000000000
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_popup_panel_background_ics.9.png b/java/res/drawable-mdpi/keyboard_popup_panel_background_ics.9.png
deleted file mode 100644
index 61988a8e1..000000000
Binary files a/java/res/drawable-mdpi/keyboard_popup_panel_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_popup_panel_background_klp.9.png b/java/res/drawable-mdpi/keyboard_popup_panel_background_klp.9.png
deleted file mode 100644
index 896505518..000000000
Binary files a/java/res/drawable-mdpi/keyboard_popup_panel_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_popup_panel_background_lxx_dark.9.png b/java/res/drawable-mdpi/keyboard_popup_panel_background_lxx_dark.9.png
deleted file mode 100644
index 71f16b035..000000000
Binary files a/java/res/drawable-mdpi/keyboard_popup_panel_background_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_popup_panel_background_lxx_light.9.png b/java/res/drawable-mdpi/keyboard_popup_panel_background_lxx_light.9.png
deleted file mode 100644
index 323aefb6f..000000000
Binary files a/java/res/drawable-mdpi/keyboard_popup_panel_background_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_suggest_strip_holo.9.png b/java/res/drawable-mdpi/keyboard_suggest_strip_holo.9.png
deleted file mode 100644
index b1c18b412..000000000
Binary files a/java/res/drawable-mdpi/keyboard_suggest_strip_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_suggest_strip_lxx_dark.9.png b/java/res/drawable-mdpi/keyboard_suggest_strip_lxx_dark.9.png
deleted file mode 100644
index d85ca712a..000000000
Binary files a/java/res/drawable-mdpi/keyboard_suggest_strip_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_suggest_strip_lxx_light.9.png b/java/res/drawable-mdpi/keyboard_suggest_strip_lxx_light.9.png
deleted file mode 100644
index 983a6956c..000000000
Binary files a/java/res/drawable-mdpi/keyboard_suggest_strip_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/more_keys_divider.png b/java/res/drawable-mdpi/more_keys_divider.png
deleted file mode 100644
index 0f71c6172..000000000
Binary files a/java/res/drawable-mdpi/more_keys_divider.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/more_suggestions_divider.png b/java/res/drawable-mdpi/more_suggestions_divider.png
deleted file mode 100644
index 0f71c6172..000000000
Binary files a/java/res/drawable-mdpi/more_suggestions_divider.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/suggestions_strip_divider_holo.png b/java/res/drawable-mdpi/suggestions_strip_divider_holo.png
deleted file mode 100644
index 21e904939..000000000
Binary files a/java/res/drawable-mdpi/suggestions_strip_divider_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/suggestions_strip_divider_lxx_dark.png b/java/res/drawable-mdpi/suggestions_strip_divider_lxx_dark.png
deleted file mode 100644
index c06e73ca1..000000000
Binary files a/java/res/drawable-mdpi/suggestions_strip_divider_lxx_dark.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/suggestions_strip_divider_lxx_light.png b/java/res/drawable-mdpi/suggestions_strip_divider_lxx_light.png
deleted file mode 100644
index cc9d8edc1..000000000
Binary files a/java/res/drawable-mdpi/suggestions_strip_divider_lxx_light.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_active_ics_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_active_ics_dark.9.png
deleted file mode 100644
index d990c0258..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_active_ics_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_active_klp_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_active_klp_dark.9.png
deleted file mode 100644
index a2f6ac0e2..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_active_klp_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_active_lxx_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_active_lxx_dark.9.png
deleted file mode 100644
index 0f3d3196b..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_active_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_active_lxx_light.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_active_lxx_light.9.png
deleted file mode 100644
index cef6d00c0..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_active_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png
deleted file mode 100644
index b5768e629..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png
deleted file mode 100644
index 0f3d3196b..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_holo_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_holo_dark.9.png
deleted file mode 100644
index a2f6ac0e2..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_normal_holo_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_holo_light.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_holo_light.9.png
deleted file mode 100644
index 0ef4a4b5f..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_normal_holo_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_holo_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_holo_dark.9.png
deleted file mode 100644
index 2f00fc623..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_holo_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_lxx_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_lxx_dark.9.png
deleted file mode 100644
index 8709e63b2..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_lxx_light.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_lxx_light.9.png
deleted file mode 100644
index 98edd3706..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_ics_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_ics_dark.9.png
deleted file mode 100644
index ab8fb2e86..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_ics_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_klp_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_klp_dark.9.png
deleted file mode 100644
index 20251a000..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_klp_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_lxx_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_lxx_dark.9.png
deleted file mode 100644
index ea002f53b..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_lxx_light.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_lxx_light.9.png
deleted file mode 100644
index 5a9507387..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_ics.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_ics.9.png
deleted file mode 100644
index 0c7bfdace..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_klp.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_klp.9.png
deleted file mode 100644
index 891d00024..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png
deleted file mode 100644
index b1c9006ad..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png
deleted file mode 100644
index 52a4ad059..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_ics_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_ics_dark.9.png
deleted file mode 100644
index 3871689ef..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_ics_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_ics_light.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_ics_light.9.png
deleted file mode 100644
index c23a4b225..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_ics_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_klp_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_klp_dark.9.png
deleted file mode 100644
index 84d173967..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_klp_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_klp_light.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_klp_light.9.png
deleted file mode 100644
index f770962c3..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_klp_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off_ics_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off_ics_dark.9.png
deleted file mode 100644
index 912506368..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off_ics_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off_klp_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off_klp_dark.9.png
deleted file mode 100644
index ee4490eac..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off_klp_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png
deleted file mode 100644
index 6ebc4e098..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png
deleted file mode 100644
index 6392f6e00..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on_ics_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on_ics_dark.9.png
deleted file mode 100644
index 35ce67fdc..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on_ics_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on_klp_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on_klp_dark.9.png
deleted file mode 100644
index e8124776c..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on_klp_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png
deleted file mode 100644
index f05f987ac..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png
deleted file mode 100644
index 3e8cac2c1..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png
deleted file mode 100644
index ab032dc17..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_spacebar_normal_lxx_light.9.png b/java/res/drawable-xhdpi/btn_keyboard_spacebar_normal_lxx_light.9.png
deleted file mode 100644
index c1ed863f8..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_spacebar_normal_lxx_light.9.png and /dev/null differ
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
deleted file mode 100644
index c3428bede..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png and /dev/null 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
deleted file mode 100644
index f795ee9af..000000000
Binary files a/java/res/drawable-xhdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/emoji_category_tab_selected_ics.9.png b/java/res/drawable-xhdpi/emoji_category_tab_selected_ics.9.png
deleted file mode 100644
index 11bc966b0..000000000
Binary files a/java/res/drawable-xhdpi/emoji_category_tab_selected_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/emoji_category_tab_selected_klp.9.png b/java/res/drawable-xhdpi/emoji_category_tab_selected_klp.9.png
deleted file mode 100644
index 5e8549bdd..000000000
Binary files a/java/res/drawable-xhdpi/emoji_category_tab_selected_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/emoji_category_tab_unselected_holo_dark.9.png b/java/res/drawable-xhdpi/emoji_category_tab_unselected_holo_dark.9.png
deleted file mode 100644
index 8cede8d5e..000000000
Binary files a/java/res/drawable-xhdpi/emoji_category_tab_unselected_holo_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_background_holo.9.png b/java/res/drawable-xhdpi/keyboard_background_holo.9.png
deleted file mode 100644
index f5c9df3e5..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_background_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_background_lxx_dark.9.png b/java/res/drawable-xhdpi/keyboard_background_lxx_dark.9.png
deleted file mode 100644
index 1c3a38e10..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_background_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_background_lxx_light.9.png b/java/res/drawable-xhdpi/keyboard_background_lxx_light.9.png
deleted file mode 100644
index a7f18b5c8..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_background_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_background.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_background.9.png
deleted file mode 100644
index 5ef12a776..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_background.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_background_ics.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_background_ics.9.png
deleted file mode 100644
index d999127f2..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_background_klp.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_background_klp.9.png
deleted file mode 100644
index c211d89c8..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_dark.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_dark.9.png
deleted file mode 100644
index f934e33bd..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_light.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_light.9.png
deleted file mode 100644
index f70599e99..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_left_background_ics.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_left_background_ics.9.png
deleted file mode 100644
index c4d694136..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_left_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_left_background_klp.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_left_background_klp.9.png
deleted file mode 100644
index 543bc763e..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_left_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_ics.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_ics.9.png
deleted file mode 100644
index 5429c1785..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_klp.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_klp.9.png
deleted file mode 100644
index ec42aadb6..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_more_background.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_more_background.9.png
deleted file mode 100644
index 70cef569b..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_more_background.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_ics.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_ics.9.png
deleted file mode 100644
index 5135a0869..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_klp.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_klp.9.png
deleted file mode 100644
index 319e9d7cf..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png
deleted file mode 100644
index fa5ddf2b6..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_light.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_light.9.png
deleted file mode 100644
index 0da8919b2..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_right_background_ics.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_right_background_ics.9.png
deleted file mode 100644
index 19a77a29f..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_right_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_right_background_klp.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_right_background_klp.9.png
deleted file mode 100644
index 052032be7..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_right_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_ics.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_ics.9.png
deleted file mode 100644
index ae2ffff8e..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_klp.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_klp.9.png
deleted file mode 100644
index c7e9d1c9e..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_popup_panel_background_ics.9.png b/java/res/drawable-xhdpi/keyboard_popup_panel_background_ics.9.png
deleted file mode 100644
index 1dee699f4..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_popup_panel_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_popup_panel_background_klp.9.png b/java/res/drawable-xhdpi/keyboard_popup_panel_background_klp.9.png
deleted file mode 100644
index 36df715b6..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_popup_panel_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_dark.9.png b/java/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_dark.9.png
deleted file mode 100644
index cf5b5d368..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_light.9.png b/java/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_light.9.png
deleted file mode 100644
index 324ee3a86..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_suggest_strip_holo.9.png b/java/res/drawable-xhdpi/keyboard_suggest_strip_holo.9.png
deleted file mode 100644
index 4c27072e9..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_suggest_strip_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_suggest_strip_lxx_dark.9.png b/java/res/drawable-xhdpi/keyboard_suggest_strip_lxx_dark.9.png
deleted file mode 100644
index ac20faf80..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_suggest_strip_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/keyboard_suggest_strip_lxx_light.9.png b/java/res/drawable-xhdpi/keyboard_suggest_strip_lxx_light.9.png
deleted file mode 100644
index 7ccd1ea9d..000000000
Binary files a/java/res/drawable-xhdpi/keyboard_suggest_strip_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/more_keys_divider.png b/java/res/drawable-xhdpi/more_keys_divider.png
deleted file mode 100644
index 178594bf0..000000000
Binary files a/java/res/drawable-xhdpi/more_keys_divider.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/more_suggestions_divider.png b/java/res/drawable-xhdpi/more_suggestions_divider.png
deleted file mode 100644
index 178594bf0..000000000
Binary files a/java/res/drawable-xhdpi/more_suggestions_divider.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/suggestions_strip_divider_holo.png b/java/res/drawable-xhdpi/suggestions_strip_divider_holo.png
deleted file mode 100644
index 4101ebc59..000000000
Binary files a/java/res/drawable-xhdpi/suggestions_strip_divider_holo.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/suggestions_strip_divider_lxx_dark.png b/java/res/drawable-xhdpi/suggestions_strip_divider_lxx_dark.png
deleted file mode 100644
index 275ec73a8..000000000
Binary files a/java/res/drawable-xhdpi/suggestions_strip_divider_lxx_dark.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/suggestions_strip_divider_lxx_light.png b/java/res/drawable-xhdpi/suggestions_strip_divider_lxx_light.png
deleted file mode 100644
index ee85744c5..000000000
Binary files a/java/res/drawable-xhdpi/suggestions_strip_divider_lxx_light.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_active_ics_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_active_ics_dark.9.png
deleted file mode 100644
index 680421eaf..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_active_ics_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_active_klp_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_active_klp_dark.9.png
deleted file mode 100644
index 17f0a7a58..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_active_klp_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_active_lxx_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_active_lxx_dark.9.png
deleted file mode 100644
index 927d87b58..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_active_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_active_lxx_light.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_active_lxx_light.9.png
deleted file mode 100644
index ce84bde4c..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_active_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png
deleted file mode 100644
index 5b0854e46..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png
deleted file mode 100644
index 927d87b58..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_normal_holo_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_normal_holo_dark.9.png
deleted file mode 100644
index 17f0a7a58..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_normal_holo_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_normal_holo_light.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_normal_holo_light.9.png
deleted file mode 100644
index 4ddfdcb6c..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_normal_holo_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_normal_off_holo_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_normal_off_holo_dark.9.png
deleted file mode 100644
index b0e815eb2..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_normal_off_holo_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_normal_off_lxx_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_normal_off_lxx_dark.9.png
deleted file mode 100644
index f2b5e4c0a..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_normal_off_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_normal_off_lxx_light.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_normal_off_lxx_light.9.png
deleted file mode 100644
index 265109d33..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_normal_off_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_normal_on_ics_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_normal_on_ics_dark.9.png
deleted file mode 100644
index 40f5011c0..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_normal_on_ics_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_normal_on_klp_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_normal_on_klp_dark.9.png
deleted file mode 100644
index 97f96258e..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_normal_on_klp_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_normal_on_lxx_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_normal_on_lxx_dark.9.png
deleted file mode 100644
index 2166f62ad..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_normal_on_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_normal_on_lxx_light.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_normal_on_lxx_light.9.png
deleted file mode 100644
index 70346218f..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_normal_on_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_ics.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_ics.9.png
deleted file mode 100644
index 6d2af5942..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_klp.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_klp.9.png
deleted file mode 100644
index 0cbb2ec84..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png
deleted file mode 100644
index d1efb6e18..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png
deleted file mode 100644
index 8a6583e7c..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_ics_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_ics_dark.9.png
deleted file mode 100644
index 6ff6319d3..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_ics_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_ics_light.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_ics_light.9.png
deleted file mode 100644
index 3c17c5eec..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_ics_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_klp_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_klp_dark.9.png
deleted file mode 100644
index dfb16a76b..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_klp_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_klp_light.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_klp_light.9.png
deleted file mode 100644
index 17144b673..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_klp_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_ics_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_ics_dark.9.png
deleted file mode 100644
index 818ea70fd..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_ics_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_klp_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_klp_dark.9.png
deleted file mode 100644
index bf1d34686..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_klp_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png
deleted file mode 100644
index b74d1ca83..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png
deleted file mode 100644
index 48ae93f53..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_ics_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_ics_dark.9.png
deleted file mode 100644
index a476d2a9e..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_ics_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_klp_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_klp_dark.9.png
deleted file mode 100644
index 962277165..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_klp_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png
deleted file mode 100644
index 0a6c2ea79..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png
deleted file mode 100644
index 65dc814f6..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png
deleted file mode 100644
index 0339de37d..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_lxx_light.9.png b/java/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_lxx_light.9.png
deleted file mode 100644
index b57cfb3d2..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_lxx_light.9.png and /dev/null differ
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
deleted file mode 100644
index 8e74c6723..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png and /dev/null 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
deleted file mode 100644
index 1ca1ae3e9..000000000
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/emoji_category_tab_selected_ics.9.png b/java/res/drawable-xxhdpi/emoji_category_tab_selected_ics.9.png
deleted file mode 100644
index b13ee2b6a..000000000
Binary files a/java/res/drawable-xxhdpi/emoji_category_tab_selected_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/emoji_category_tab_selected_klp.9.png b/java/res/drawable-xxhdpi/emoji_category_tab_selected_klp.9.png
deleted file mode 100644
index c81e651dd..000000000
Binary files a/java/res/drawable-xxhdpi/emoji_category_tab_selected_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/emoji_category_tab_unselected_holo_dark.9.png b/java/res/drawable-xxhdpi/emoji_category_tab_unselected_holo_dark.9.png
deleted file mode 100644
index 389188695..000000000
Binary files a/java/res/drawable-xxhdpi/emoji_category_tab_unselected_holo_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_background_holo.9.png b/java/res/drawable-xxhdpi/keyboard_background_holo.9.png
deleted file mode 100644
index bcef0f839..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_background_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_background_lxx_dark.9.png b/java/res/drawable-xxhdpi/keyboard_background_lxx_dark.9.png
deleted file mode 100644
index 8b8917012..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_background_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_background_lxx_light.9.png b/java/res/drawable-xxhdpi/keyboard_background_lxx_light.9.png
deleted file mode 100644
index 847df8a6e..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_background_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_background_ics.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_background_ics.9.png
deleted file mode 100644
index bd1ef3cd9..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_background_klp.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_background_klp.9.png
deleted file mode 100644
index fd2f9e514..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_dark.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_dark.9.png
deleted file mode 100644
index 1b92455e9..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_light.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_light.9.png
deleted file mode 100644
index 3effde383..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_ics.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_ics.9.png
deleted file mode 100644
index 65af4b569..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_klp.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_klp.9.png
deleted file mode 100644
index 3ab79007e..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_ics.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_ics.9.png
deleted file mode 100644
index ac6750dcb..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_klp.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_klp.9.png
deleted file mode 100644
index 99543a1e0..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_ics.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_ics.9.png
deleted file mode 100644
index cea7c05f6..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_klp.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_klp.9.png
deleted file mode 100644
index 121411a06..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png
deleted file mode 100644
index 55d633098..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_light.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_light.9.png
deleted file mode 100644
index 4523be965..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_ics.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_ics.9.png
deleted file mode 100644
index 520fa7c6b..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_klp.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_klp.9.png
deleted file mode 100644
index e9e379287..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_ics.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_ics.9.png
deleted file mode 100644
index eee221758..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_klp.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_klp.9.png
deleted file mode 100644
index 6c1143aeb..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_popup_panel_background_ics.9.png b/java/res/drawable-xxhdpi/keyboard_popup_panel_background_ics.9.png
deleted file mode 100644
index 721c24400..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_popup_panel_background_ics.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_popup_panel_background_klp.9.png b/java/res/drawable-xxhdpi/keyboard_popup_panel_background_klp.9.png
deleted file mode 100644
index 91d5d7f90..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_popup_panel_background_klp.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_dark.9.png b/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_dark.9.png
deleted file mode 100644
index 440b5bbb7..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_light.9.png b/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_light.9.png
deleted file mode 100644
index 15915f745..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_suggest_strip_holo.9.png b/java/res/drawable-xxhdpi/keyboard_suggest_strip_holo.9.png
deleted file mode 100644
index 08176fed0..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_suggest_strip_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_suggest_strip_lxx_dark.9.png b/java/res/drawable-xxhdpi/keyboard_suggest_strip_lxx_dark.9.png
deleted file mode 100644
index 2de0c9c42..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_suggest_strip_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/keyboard_suggest_strip_lxx_light.9.png b/java/res/drawable-xxhdpi/keyboard_suggest_strip_lxx_light.9.png
deleted file mode 100644
index 8b495f39b..000000000
Binary files a/java/res/drawable-xxhdpi/keyboard_suggest_strip_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/suggestions_strip_divider_holo.png b/java/res/drawable-xxhdpi/suggestions_strip_divider_holo.png
deleted file mode 100644
index d13ca42aa..000000000
Binary files a/java/res/drawable-xxhdpi/suggestions_strip_divider_holo.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/suggestions_strip_divider_lxx_dark.png b/java/res/drawable-xxhdpi/suggestions_strip_divider_lxx_dark.png
deleted file mode 100644
index 6b414b7a1..000000000
Binary files a/java/res/drawable-xxhdpi/suggestions_strip_divider_lxx_dark.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/suggestions_strip_divider_lxx_light.png b/java/res/drawable-xxhdpi/suggestions_strip_divider_lxx_light.png
deleted file mode 100644
index eccfff7b9..000000000
Binary files a/java/res/drawable-xxhdpi/suggestions_strip_divider_lxx_light.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/btn_keyboard_key_active_lxx_dark.9.png b/java/res/drawable-xxxhdpi/btn_keyboard_key_active_lxx_dark.9.png
deleted file mode 100644
index eac447583..000000000
Binary files a/java/res/drawable-xxxhdpi/btn_keyboard_key_active_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/btn_keyboard_key_active_lxx_light.9.png b/java/res/drawable-xxxhdpi/btn_keyboard_key_active_lxx_light.9.png
deleted file mode 100644
index 16d1f687f..000000000
Binary files a/java/res/drawable-xxxhdpi/btn_keyboard_key_active_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png b/java/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png
deleted file mode 100644
index 78923a887..000000000
Binary files a/java/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png b/java/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png
deleted file mode 100644
index e57e80d05..000000000
Binary files a/java/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/btn_keyboard_key_normal_off_lxx_dark.9.png b/java/res/drawable-xxxhdpi/btn_keyboard_key_normal_off_lxx_dark.9.png
deleted file mode 100644
index 0b3d796e4..000000000
Binary files a/java/res/drawable-xxxhdpi/btn_keyboard_key_normal_off_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/btn_keyboard_key_normal_off_lxx_light.9.png b/java/res/drawable-xxxhdpi/btn_keyboard_key_normal_off_lxx_light.9.png
deleted file mode 100644
index 6edd4e3d5..000000000
Binary files a/java/res/drawable-xxxhdpi/btn_keyboard_key_normal_off_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/btn_keyboard_key_normal_on_lxx_dark.9.png b/java/res/drawable-xxxhdpi/btn_keyboard_key_normal_on_lxx_dark.9.png
deleted file mode 100644
index 61a5efc2f..000000000
Binary files a/java/res/drawable-xxxhdpi/btn_keyboard_key_normal_on_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/btn_keyboard_key_normal_on_lxx_light.9.png b/java/res/drawable-xxxhdpi/btn_keyboard_key_normal_on_lxx_light.9.png
deleted file mode 100644
index c60a23547..000000000
Binary files a/java/res/drawable-xxxhdpi/btn_keyboard_key_normal_on_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png b/java/res/drawable-xxxhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png
deleted file mode 100644
index 842c6858d..000000000
Binary files a/java/res/drawable-xxxhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png b/java/res/drawable-xxxhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png
deleted file mode 100644
index 6b033067f..000000000
Binary files a/java/res/drawable-xxxhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png b/java/res/drawable-xxxhdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png
deleted file mode 100644
index 276065e3b..000000000
Binary files a/java/res/drawable-xxxhdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png b/java/res/drawable-xxxhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png
deleted file mode 100644
index e64147f4f..000000000
Binary files a/java/res/drawable-xxxhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png b/java/res/drawable-xxxhdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png
deleted file mode 100644
index c1300140c..000000000
Binary files a/java/res/drawable-xxxhdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png b/java/res/drawable-xxxhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png
deleted file mode 100644
index e433f5669..000000000
Binary files a/java/res/drawable-xxxhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png b/java/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png
deleted file mode 100644
index ee4d16b64..000000000
Binary files a/java/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_lxx_light.9.png b/java/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_lxx_light.9.png
deleted file mode 100644
index 14cba3c24..000000000
Binary files a/java/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png b/java/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png
deleted file mode 100644
index 671c31f08..000000000
Binary files a/java/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png b/java/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png
deleted file mode 100644
index 8a6f32afe..000000000
Binary files a/java/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/keyboard_background_lxx_dark.9.png b/java/res/drawable-xxxhdpi/keyboard_background_lxx_dark.9.png
deleted file mode 100644
index a7dd5378b..000000000
Binary files a/java/res/drawable-xxxhdpi/keyboard_background_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/keyboard_background_lxx_light.9.png b/java/res/drawable-xxxhdpi/keyboard_background_lxx_light.9.png
deleted file mode 100644
index ef7ab2097..000000000
Binary files a/java/res/drawable-xxxhdpi/keyboard_background_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/keyboard_key_feedback_background_lxx_dark.9.png b/java/res/drawable-xxxhdpi/keyboard_key_feedback_background_lxx_dark.9.png
deleted file mode 100644
index 0e08b6b95..000000000
Binary files a/java/res/drawable-xxxhdpi/keyboard_key_feedback_background_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/keyboard_key_feedback_background_lxx_light.9.png b/java/res/drawable-xxxhdpi/keyboard_key_feedback_background_lxx_light.9.png
deleted file mode 100644
index fb10523d2..000000000
Binary files a/java/res/drawable-xxxhdpi/keyboard_key_feedback_background_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png b/java/res/drawable-xxxhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png
deleted file mode 100644
index fd88668bb..000000000
Binary files a/java/res/drawable-xxxhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/keyboard_key_feedback_more_background_lxx_light.9.png b/java/res/drawable-xxxhdpi/keyboard_key_feedback_more_background_lxx_light.9.png
deleted file mode 100644
index ab1bfad7d..000000000
Binary files a/java/res/drawable-xxxhdpi/keyboard_key_feedback_more_background_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_dark.9.png b/java/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_dark.9.png
deleted file mode 100644
index 3489a9c4c..000000000
Binary files a/java/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_light.9.png b/java/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_light.9.png
deleted file mode 100644
index 2e3797263..000000000
Binary files a/java/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/keyboard_suggest_strip_lxx_dark.9.png b/java/res/drawable-xxxhdpi/keyboard_suggest_strip_lxx_dark.9.png
deleted file mode 100644
index 098fa0652..000000000
Binary files a/java/res/drawable-xxxhdpi/keyboard_suggest_strip_lxx_dark.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/keyboard_suggest_strip_lxx_light.9.png b/java/res/drawable-xxxhdpi/keyboard_suggest_strip_lxx_light.9.png
deleted file mode 100644
index c1c48c973..000000000
Binary files a/java/res/drawable-xxxhdpi/keyboard_suggest_strip_lxx_light.9.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/suggestions_strip_divider_lxx_dark.png b/java/res/drawable-xxxhdpi/suggestions_strip_divider_lxx_dark.png
deleted file mode 100644
index 0dc783d7c..000000000
Binary files a/java/res/drawable-xxxhdpi/suggestions_strip_divider_lxx_dark.png and /dev/null differ
diff --git a/java/res/drawable-xxxhdpi/suggestions_strip_divider_lxx_light.png b/java/res/drawable-xxxhdpi/suggestions_strip_divider_lxx_light.png
deleted file mode 100644
index f3162e422..000000000
Binary files a/java/res/drawable-xxxhdpi/suggestions_strip_divider_lxx_light.png and /dev/null differ
diff --git a/java/res/drawable/btn_keyboard_key_functional_ics.xml b/java/res/drawable/btn_keyboard_key_functional_ics.xml
deleted file mode 100644
index 846bccc49..000000000
--- a/java/res/drawable/btn_keyboard_key_functional_ics.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_ics_dark" />
-    <item android:drawable="@drawable/btn_keyboard_key_normal_holo_dark" />
-</selector>
diff --git a/java/res/drawable/btn_keyboard_key_functional_klp.xml b/java/res/drawable/btn_keyboard_key_functional_klp.xml
deleted file mode 100644
index 7b444f7c5..000000000
--- a/java/res/drawable/btn_keyboard_key_functional_klp.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/java/res/drawable/btn_keyboard_key_ics.xml b/java/res/drawable/btn_keyboard_key_ics.xml
deleted file mode 100644
index bacd5d78f..000000000
--- a/java/res/drawable/btn_keyboard_key_ics.xml
+++ /dev/null
@@ -1,44 +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">
-    <!-- Action keys. -->
-    <item android:state_active="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_ics_dark" />
-    <item android:state_active="true"
-          android:drawable="@drawable/btn_keyboard_key_active_ics_dark" />
-
-    <!-- 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_pressed_on_ics_dark" />
-    <item android:state_checkable="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_off_ics_dark" />
-    <item android:state_checkable="true" android:state_checked="true"
-          android:drawable="@drawable/btn_keyboard_key_normal_on_ics_dark" />
-    <item android:state_checkable="true"
-          android:drawable="@drawable/btn_keyboard_key_normal_off_holo_dark" />
-
-    <!-- Empty background keys. -->
-    <item android:state_empty="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_ics_light" />
-    <item android:state_empty="true"
-          android:drawable="@android:color/transparent" />
-
-    <!-- Normal keys. -->
-    <item android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_ics_light" />
-    <item android:drawable="@drawable/btn_keyboard_key_normal_holo_light" />
-</selector>
diff --git a/java/res/drawable/btn_keyboard_key_klp.xml b/java/res/drawable/btn_keyboard_key_klp.xml
deleted file mode 100644
index e2f208585..000000000
--- a/java/res/drawable/btn_keyboard_key_klp.xml
+++ /dev/null
@@ -1,44 +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">
-    <!-- Action keys. -->
-    <item android:state_active="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_klp_dark" />
-    <item android:state_active="true"
-          android:drawable="@drawable/btn_keyboard_key_active_klp_dark" />
-
-    <!-- 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_pressed_on_klp_dark" />
-    <item android:state_checkable="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_off_klp_dark" />
-    <item android:state_checkable="true" android:state_checked="true"
-          android:drawable="@drawable/btn_keyboard_key_normal_on_klp_dark" />
-    <item android:state_checkable="true"
-          android:drawable="@drawable/btn_keyboard_key_normal_off_holo_dark" />
-
-    <!-- Empty background keys. -->
-    <item android:state_empty="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_klp_light" />
-    <item android:state_empty="true"
-          android:drawable="@android:color/transparent" />
-
-    <!-- Normal keys. -->
-    <item android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_klp_light" />
-    <item android:drawable="@drawable/btn_keyboard_key_normal_holo_light" />
-</selector>
diff --git a/java/res/drawable/btn_keyboard_key_lxx_dark.xml b/java/res/drawable/btn_keyboard_key_lxx_dark.xml
index 161592d3d..23b513348 100644
--- a/java/res/drawable/btn_keyboard_key_lxx_dark.xml
+++ b/java/res/drawable/btn_keyboard_key_lxx_dark.xml
@@ -16,20 +16,38 @@
 
 <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_active_pressed_lxx_dark" />
-    <item android:state_active="true"
-          android:drawable="@drawable/btn_keyboard_key_active_lxx_dark" />
+    <item android:state_active="true" android:state_pressed="true">
+        <layer-list>
+            <item>
+                <shape android:shape="oval">
+                    <corners android:radius="999dp" />
+                    <solid android:color="@color/highlight_color_lxx_dark" />
+                </shape>
+            </item>
+            <item>
+                <shape android:shape="oval">
+                    <corners android:radius="999dp" />
+                    <solid android:color="@color/key_background_pressed_lxx_dark" />
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+    <item android:state_active="true">
+        <shape android:shape="oval">
+            <corners android:radius="999dp" />
+            <solid android:color="@color/highlight_color_lxx_dark" />
+        </shape>
+    </item>
 
     <!-- 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_pressed_on_lxx_dark" />
+          android:drawable="@color/key_background_pressed_lxx_dark" />
     <item android:state_checkable="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_off_lxx_dark" />
+          android:drawable="@color/key_background_pressed_lxx_dark" />
     <item android:state_checkable="true" android:state_checked="true"
-          android:drawable="@drawable/btn_keyboard_key_normal_on_lxx_dark" />
+          android:drawable="@color/key_background_pressed_lxx_dark" />
     <item android:state_checkable="true"
-          android:drawable="@drawable/btn_keyboard_key_normal_off_lxx_dark" />
+          android:drawable="@color/key_background_lxx_dark" />
 
     <!-- Empty background keys. -->
     <item android:state_empty="true" android:state_pressed="true"
diff --git a/java/res/drawable/btn_keyboard_key_lxx_light.xml b/java/res/drawable/btn_keyboard_key_lxx_light.xml
index 0154d75b4..91594ebae 100644
--- a/java/res/drawable/btn_keyboard_key_lxx_light.xml
+++ b/java/res/drawable/btn_keyboard_key_lxx_light.xml
@@ -16,29 +16,48 @@
 
 <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_active_pressed_lxx_light" />
-    <item android:state_active="true"
-          android:drawable="@drawable/btn_keyboard_key_active_lxx_light" />
+    <item android:state_active="true" android:state_pressed="true">
+        <layer-list>
+            <item>
+                <shape android:shape="oval">
+                    <corners android:radius="999dp" />
+                    <solid android:color="@color/highlight_color_lxx_light" />
+                </shape>
+            </item>
+            <item>
+                <shape android:shape="oval">
+                    <corners android:radius="999dp" />
+                    <solid android:color="@color/key_background_pressed_lxx_light" />
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+    <item android:state_active="true">
+        <shape android:shape="oval">
+            <corners android:radius="999dp" />
+            <solid android:color="@color/highlight_color_lxx_light" />
+        </shape>
+    </item>
+
 
     <!-- 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_pressed_on_lxx_light" />
+        android:drawable="@color/key_background_pressed_lxx_light" />
     <item android:state_checkable="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_off_lxx_light" />
+        android:drawable="@color/key_background_pressed_lxx_light" />
     <item android:state_checkable="true" android:state_checked="true"
-          android:drawable="@drawable/btn_keyboard_key_normal_on_lxx_light" />
+        android:drawable="@color/key_background_pressed_lxx_light" />
     <item android:state_checkable="true"
-          android:drawable="@drawable/btn_keyboard_key_normal_off_lxx_light" />
+        android:drawable="@color/key_background_lxx_light" />
 
     <!-- Empty background keys. -->
     <item android:state_empty="true" android:state_pressed="true"
-          android:drawable="@color/key_background_pressed_lxx_light" />
+        android:drawable="@color/key_background_pressed_lxx_light" />
     <item android:state_empty="true"
-          android:drawable="@android:color/transparent" />
+        android:drawable="@android:color/transparent" />
 
     <!-- Normal keys. -->
     <item android:state_pressed="true"
-          android:drawable="@color/key_background_pressed_lxx_light" />
+        android:drawable="@color/key_background_pressed_lxx_light" />
     <item android:drawable="@color/key_background_lxx_light" />
 </selector>
diff --git a/java/res/drawable/btn_keyboard_key_popup_action_lxx_dark.xml b/java/res/drawable/btn_keyboard_key_popup_action_lxx_dark.xml
index 8b637f204..5c595d9ed 100644
--- a/java/res/drawable/btn_keyboard_key_popup_action_lxx_dark.xml
+++ b/java/res/drawable/btn_keyboard_key_popup_action_lxx_dark.xml
@@ -16,6 +16,6 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_active_pressed_lxx_dark" />
-    <item android:drawable="@drawable/btn_keyboard_key_active_lxx_dark" />
+          android:drawable="@color/key_background_pressed_lxx_dark" />
+    <item android:drawable="@color/key_background_lxx_dark" />
 </selector>
diff --git a/java/res/drawable/btn_keyboard_key_popup_action_lxx_light.xml b/java/res/drawable/btn_keyboard_key_popup_action_lxx_light.xml
index 67fc52144..acd19fda4 100644
--- a/java/res/drawable/btn_keyboard_key_popup_action_lxx_light.xml
+++ b/java/res/drawable/btn_keyboard_key_popup_action_lxx_light.xml
@@ -16,6 +16,6 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_active_pressed_lxx_light" />
-    <item android:drawable="@drawable/btn_keyboard_key_active_lxx_light" />
+          android:drawable="@color/key_background_pressed_lxx_light" />
+    <item android:drawable="@color/key_background_lxx_light" />
 </selector>
diff --git a/java/res/drawable/btn_keyboard_key_popup_ics.xml b/java/res/drawable/btn_keyboard_key_popup_ics.xml
deleted file mode 100644
index 17d646b8f..000000000
--- a/java/res/drawable/btn_keyboard_key_popup_ics.xml
+++ /dev/null
@@ -1,21 +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">
-    <item android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_popup_selected_ics" />
-    <item android:drawable="@android:color/transparent" />
-</selector>
diff --git a/java/res/drawable/btn_keyboard_key_popup_klp.xml b/java/res/drawable/btn_keyboard_key_popup_klp.xml
deleted file mode 100644
index 9dfc93ae8..000000000
--- a/java/res/drawable/btn_keyboard_key_popup_klp.xml
+++ /dev/null
@@ -1,21 +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">
-    <item android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_popup_selected_klp" />
-    <item android:drawable="@android:color/transparent" />
-</selector>
diff --git a/java/res/drawable/btn_keyboard_key_popup_lxx_dark.xml b/java/res/drawable/btn_keyboard_key_popup_lxx_dark.xml
index dee645712..1c66b95ea 100644
--- a/java/res/drawable/btn_keyboard_key_popup_lxx_dark.xml
+++ b/java/res/drawable/btn_keyboard_key_popup_lxx_dark.xml
@@ -16,6 +16,6 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_popup_selected_lxx_dark" />
+          android:drawable="@color/key_background_pressed_lxx_dark" />
     <item android:drawable="@android:color/transparent" />
 </selector>
diff --git a/java/res/drawable/btn_keyboard_key_popup_lxx_light.xml b/java/res/drawable/btn_keyboard_key_popup_lxx_light.xml
index d6cd2b831..e9dd74fd4 100644
--- a/java/res/drawable/btn_keyboard_key_popup_lxx_light.xml
+++ b/java/res/drawable/btn_keyboard_key_popup_lxx_light.xml
@@ -16,6 +16,6 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_popup_selected_lxx_light" />
+          android:drawable="@color/key_background_pressed_lxx_light" />
     <item android:drawable="@android:color/transparent" />
 </selector>
diff --git a/java/res/drawable/btn_keyboard_spacebar_ics.xml b/java/res/drawable/btn_keyboard_spacebar_ics.xml
deleted file mode 100644
index 229f7a965..000000000
--- a/java/res/drawable/btn_keyboard_spacebar_ics.xml
+++ /dev/null
@@ -1,21 +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">
-    <item android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_ics_light" />
-    <item android:drawable="@drawable/btn_keyboard_key_normal_holo_light" />
-</selector>
diff --git a/java/res/drawable/btn_keyboard_spacebar_klp.xml b/java/res/drawable/btn_keyboard_spacebar_klp.xml
deleted file mode 100644
index 9882f9a74..000000000
--- a/java/res/drawable/btn_keyboard_spacebar_klp.xml
+++ /dev/null
@@ -1,21 +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">
-    <item android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_klp_light" />
-    <item android:drawable="@drawable/btn_keyboard_key_normal_holo_light" />
-</selector>
diff --git a/java/res/drawable/btn_keyboard_spacebar_lxx_dark.xml b/java/res/drawable/btn_keyboard_spacebar_lxx_dark.xml
index e930e40e4..62f567668 100644
--- a/java/res/drawable/btn_keyboard_spacebar_lxx_dark.xml
+++ b/java/res/drawable/btn_keyboard_spacebar_lxx_dark.xml
@@ -15,7 +15,34 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_spacebar_pressed_lxx_dark" />
-    <item android:drawable="@drawable/btn_keyboard_spacebar_normal_lxx_dark" />
+    <item android:state_pressed="true">
+        <layer-list>
+            <item>
+                <shape android:shape="rectangle">
+                    <solid android:color="@color/key_background_pressed_lxx_dark" />
+                </shape>
+            </item>
+            <item android:left="4dp" android:right="4dp" android:top="4dp" android:bottom="4dp">
+                <shape>
+                    <solid android:color="@color/key_background_pressed_lxx_dark" />
+                    <corners android:radius="32dp" />
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+    <item>
+        <layer-list>
+            <item>
+                <shape android:shape="rectangle">
+                    <solid android:color="@color/key_background_lxx_dark" />
+                </shape>
+            </item>
+            <item android:left="4dp" android:right="4dp" android:top="4dp" android:bottom="4dp">
+                <shape>
+                    <solid android:color="@color/key_background_pressed_lxx_dark" />
+                    <corners android:radius="32dp" />
+                </shape>
+            </item>
+        </layer-list>
+    </item>
 </selector>
diff --git a/java/res/drawable/btn_keyboard_spacebar_lxx_light.xml b/java/res/drawable/btn_keyboard_spacebar_lxx_light.xml
index 2b059938d..a3592270d 100644
--- a/java/res/drawable/btn_keyboard_spacebar_lxx_light.xml
+++ b/java/res/drawable/btn_keyboard_spacebar_lxx_light.xml
@@ -15,7 +15,34 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_spacebar_pressed_lxx_light" />
-    <item android:drawable="@drawable/btn_keyboard_spacebar_normal_lxx_light" />
+    <item android:state_pressed="true">
+        <layer-list>
+            <item>
+                <shape android:shape="rectangle">
+                    <solid android:color="@color/key_background_pressed_lxx_dark" />
+                </shape>
+            </item>
+            <item android:left="4dp" android:right="4dp" android:top="4dp" android:bottom="4dp">
+                <shape>
+                    <solid android:color="@color/key_background_pressed_lxx_dark" />
+                    <corners android:radius="32dp" />
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+    <item>
+        <layer-list>
+            <item>
+                <shape android:shape="rectangle">
+                    <solid android:color="@color/key_background_lxx_light" />
+                </shape>
+            </item>
+            <item android:left="4dp" android:right="4dp" android:top="4dp" android:bottom="4dp">
+                <shape>
+                    <solid android:color="@color/key_background_pressed_lxx_light" />
+                    <corners android:radius="32dp" />
+                </shape>
+            </item>
+        </layer-list>
+    </item>
 </selector>
diff --git a/java/res/drawable/btn_suggestion_ics.xml b/java/res/drawable/btn_suggestion_ics.xml
deleted file mode 100644
index 8f528ee4b..000000000
--- a/java/res/drawable/btn_suggestion_ics.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 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"
->
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/btn_keyboard_key_popup_selected_ics" />
-</selector>
diff --git a/java/res/drawable/btn_suggestion_klp.xml b/java/res/drawable/btn_suggestion_klp.xml
deleted file mode 100644
index 471165bdf..000000000
--- a/java/res/drawable/btn_suggestion_klp.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 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"
->
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/btn_keyboard_key_popup_selected_klp" />
-</selector>
diff --git a/java/res/drawable/ic_emoji_activity_holo_dark.xml b/java/res/drawable/ic_emoji_activity_holo_dark.xml
deleted file mode 100644
index 8eeb64019..000000000
--- a/java/res/drawable/ic_emoji_activity_holo_dark.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, 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">
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/ic_emoji_activity_activated_holo_dark" />
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/ic_emoji_activity_activated_holo_dark" />
-    <item
-        android:state_selected="true"
-        android:drawable="@drawable/ic_emoji_activity_activated_holo_dark" />
-    <item
-        android:drawable="@drawable/ic_emoji_activity_normal_holo_dark" />
-</selector>
diff --git a/java/res/drawable/ic_emoji_activity_lxx_dark.xml b/java/res/drawable/ic_emoji_activity_lxx_dark.xml
index b916d4f9e..cf720cce5 100644
--- a/java/res/drawable/ic_emoji_activity_lxx_dark.xml
+++ b/java/res/drawable/ic_emoji_activity_lxx_dark.xml
@@ -30,4 +30,5 @@
         android:drawable="@drawable/ic_emoji_activity_activated_lxx_dark" />
     <item
         android:drawable="@drawable/ic_emoji_activity_normal_lxx_dark" />
+    -->
 </selector>
diff --git a/java/res/drawable/ic_emoji_emoticons_holo_dark.xml b/java/res/drawable/ic_emoji_emoticons_holo_dark.xml
deleted file mode 100644
index 59e23499e..000000000
--- a/java/res/drawable/ic_emoji_emoticons_holo_dark.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 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">
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/ic_emoji_emoticons_activated_holo_dark" />
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/ic_emoji_emoticons_activated_holo_dark" />
-    <item
-        android:state_selected="true"
-        android:drawable="@drawable/ic_emoji_emoticons_activated_holo_dark" />
-    <item android:drawable="@drawable/ic_emoji_emoticons_normal_holo_dark" />
-</selector>
diff --git a/java/res/drawable/ic_emoji_flag_holo_dark.xml b/java/res/drawable/ic_emoji_flag_holo_dark.xml
deleted file mode 100644
index c9857fe2f..000000000
--- a/java/res/drawable/ic_emoji_flag_holo_dark.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, 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">
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/ic_emoji_flag_activated_holo_dark" />
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/ic_emoji_flag_activated_holo_dark" />
-    <item
-        android:state_selected="true"
-        android:drawable="@drawable/ic_emoji_flag_activated_holo_dark" />
-    <item
-        android:drawable="@drawable/ic_emoji_flag_normal_holo_dark" />
-</selector>
diff --git a/java/res/drawable/ic_emoji_food_holo_dark.xml b/java/res/drawable/ic_emoji_food_holo_dark.xml
deleted file mode 100644
index 2c6c0f2eb..000000000
--- a/java/res/drawable/ic_emoji_food_holo_dark.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, 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">
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/ic_emoji_food_activated_holo_dark" />
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/ic_emoji_food_activated_holo_dark" />
-    <item
-        android:state_selected="true"
-        android:drawable="@drawable/ic_emoji_food_activated_holo_dark" />
-    <item
-        android:drawable="@drawable/ic_emoji_food_normal_holo_dark" />
-</selector>
diff --git a/java/res/drawable/ic_emoji_nature_holo_dark.xml b/java/res/drawable/ic_emoji_nature_holo_dark.xml
deleted file mode 100644
index b94629580..000000000
--- a/java/res/drawable/ic_emoji_nature_holo_dark.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 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">
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/ic_emoji_nature_activated_holo_dark" />
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/ic_emoji_nature_activated_holo_dark" />
-    <item
-        android:state_selected="true"
-        android:drawable="@drawable/ic_emoji_nature_activated_holo_dark" />
-    <item
-        android:drawable="@drawable/ic_emoji_nature_normal_holo_dark" />
-</selector>
diff --git a/java/res/drawable/ic_emoji_objects_holo_dark.xml b/java/res/drawable/ic_emoji_objects_holo_dark.xml
deleted file mode 100644
index 266e81e0b..000000000
--- a/java/res/drawable/ic_emoji_objects_holo_dark.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 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">
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/ic_emoji_objects_activated_holo_dark" />
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/ic_emoji_objects_activated_holo_dark" />
-    <item
-        android:state_selected="true"
-        android:drawable="@drawable/ic_emoji_objects_activated_holo_dark" />
-    <item android:drawable="@drawable/ic_emoji_objects_normal_holo_dark" />
-</selector>
diff --git a/java/res/drawable/ic_emoji_people_holo_dark.xml b/java/res/drawable/ic_emoji_people_holo_dark.xml
deleted file mode 100644
index 15955d261..000000000
--- a/java/res/drawable/ic_emoji_people_holo_dark.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 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">
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/ic_emoji_people_activated_holo_dark" />
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/ic_emoji_people_activated_holo_dark" />
-    <item
-        android:state_selected="true"
-        android:drawable="@drawable/ic_emoji_people_activated_holo_dark" />
-    <item android:drawable="@drawable/ic_emoji_people_normal_holo_dark" />
-</selector>
diff --git a/java/res/drawable/ic_emoji_places_holo_dark.xml b/java/res/drawable/ic_emoji_places_holo_dark.xml
deleted file mode 100644
index 260bbd843..000000000
--- a/java/res/drawable/ic_emoji_places_holo_dark.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 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">
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/ic_emoji_places_activated_holo_dark" />
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/ic_emoji_places_activated_holo_dark" />
-    <item
-        android:state_selected="true"
-        android:drawable="@drawable/ic_emoji_places_activated_holo_dark" />
-    <item android:drawable="@drawable/ic_emoji_places_normal_holo_dark" />
-</selector>
diff --git a/java/res/drawable/ic_emoji_recents_holo_dark.xml b/java/res/drawable/ic_emoji_recents_holo_dark.xml
deleted file mode 100644
index f14349f34..000000000
--- a/java/res/drawable/ic_emoji_recents_holo_dark.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 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">
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/ic_emoji_recents_activated_holo_dark" />
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/ic_emoji_recents_activated_holo_dark" />
-    <item
-        android:state_selected="true"
-        android:drawable="@drawable/ic_emoji_recents_activated_holo_dark" />
-    <item android:drawable="@drawable/ic_emoji_recents_normal_holo_dark" />
-</selector>
diff --git a/java/res/drawable/ic_emoji_symbols_holo_dark.xml b/java/res/drawable/ic_emoji_symbols_holo_dark.xml
deleted file mode 100644
index 831d6594b..000000000
--- a/java/res/drawable/ic_emoji_symbols_holo_dark.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 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">
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/ic_emoji_symbols_activated_holo_dark" />
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/ic_emoji_symbols_activated_holo_dark" />
-    <item
-        android:state_selected="true"
-        android:drawable="@drawable/ic_emoji_symbols_activated_holo_dark" />
-    <item android:drawable="@drawable/ic_emoji_symbols_normal_holo_dark" />
-</selector>
diff --git a/java/res/drawable/keyboard_background_lxx_dark.xml b/java/res/drawable/keyboard_background_lxx_dark.xml
new file mode 100644
index 000000000..405bcc10e
--- /dev/null
+++ b/java/res/drawable/keyboard_background_lxx_dark.xml
@@ -0,0 +1,14 @@
+<?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/keyboard_separator_lxx_dark" />
+        </shape>
+    </item>
+    <item android:top="1dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/key_background_lxx_dark" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/java/res/drawable/keyboard_background_lxx_light.xml b/java/res/drawable/keyboard_background_lxx_light.xml
new file mode 100644
index 000000000..53e41a9b7
--- /dev/null
+++ b/java/res/drawable/keyboard_background_lxx_light.xml
@@ -0,0 +1,14 @@
+<?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/keyboard_separator_lxx_light" />
+        </shape>
+    </item>
+    <item android:top="1dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/key_background_lxx_light" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/java/res/drawable/keyboard_key_feedback_ics.xml b/java/res/drawable/keyboard_key_feedback_ics.xml
deleted file mode 100644
index 36efcff4a..000000000
--- a/java/res/drawable/keyboard_key_feedback_ics.xml
+++ /dev/null
@@ -1,36 +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"
-    xmlns:latin="http://schemas.android.com/apk/res/org.futo.inputmethod.latin"
->
-    <!-- Left edge -->
-    <item latin:state_left_edge="true" latin:state_has_morekeys="true"
-          android:drawable="@drawable/keyboard_key_feedback_left_more_background_ics" />
-    <item latin:state_left_edge="true"
-          android:drawable="@drawable/keyboard_key_feedback_left_background_ics" />
-
-    <!-- Right edge -->
-    <item latin:state_right_edge="true" latin:state_has_morekeys="true"
-          android:drawable="@drawable/keyboard_key_feedback_right_more_background_ics" />
-    <item latin:state_right_edge="true"
-          android:drawable="@drawable/keyboard_key_feedback_right_background_ics" />
-
-    <item latin:state_has_morekeys="true"
-          android:drawable="@drawable/keyboard_key_feedback_more_background_ics" />
-    <item android:drawable="@drawable/keyboard_key_feedback_background_ics" />
-</selector>
diff --git a/java/res/drawable/keyboard_key_feedback_klp.xml b/java/res/drawable/keyboard_key_feedback_klp.xml
deleted file mode 100644
index af534af85..000000000
--- a/java/res/drawable/keyboard_key_feedback_klp.xml
+++ /dev/null
@@ -1,36 +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"
-    xmlns:latin="http://schemas.android.com/apk/res/org.futo.inputmethod.latin"
->
-    <!-- Left edge -->
-    <item latin:state_left_edge="true" latin:state_has_morekeys="true"
-          android:drawable="@drawable/keyboard_key_feedback_left_more_background_klp" />
-    <item latin:state_left_edge="true"
-          android:drawable="@drawable/keyboard_key_feedback_left_background_klp" />
-
-    <!-- Right edge -->
-    <item latin:state_right_edge="true" latin:state_has_morekeys="true"
-          android:drawable="@drawable/keyboard_key_feedback_right_more_background_klp" />
-    <item latin:state_right_edge="true"
-          android:drawable="@drawable/keyboard_key_feedback_right_background_klp" />
-
-    <item latin:state_has_morekeys="true"
-          android:drawable="@drawable/keyboard_key_feedback_more_background_klp" />
-    <item android:drawable="@drawable/keyboard_key_feedback_background_klp" />
-</selector>
diff --git a/java/res/drawable/keyboard_key_feedback_lxx_dark.xml b/java/res/drawable/keyboard_key_feedback_lxx_dark.xml
index 4b38d4294..60fd86786 100644
--- a/java/res/drawable/keyboard_key_feedback_lxx_dark.xml
+++ b/java/res/drawable/keyboard_key_feedback_lxx_dark.xml
@@ -13,24 +13,16 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<selector
+<layer-list
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:latin="http://schemas.android.com/apk/res/org.futo.inputmethod.latin"
->
-    <!-- Left edge -->
-    <item latin:state_left_edge="true" latin:state_has_morekeys="true"
-          android:drawable="@drawable/keyboard_key_feedback_more_background_lxx_dark" />
-    <item latin:state_left_edge="true"
-          android:drawable="@drawable/keyboard_key_feedback_background_lxx_dark" />
-
-    <!-- Right edge -->
-    <item latin:state_right_edge="true" latin:state_has_morekeys="true"
-          android:drawable="@drawable/keyboard_key_feedback_more_background_lxx_dark" />
-    <item latin:state_right_edge="true"
-          android:drawable="@drawable/keyboard_key_feedback_background_lxx_dark" />
-
-    <item latin:state_has_morekeys="true"
-          android:drawable="@drawable/keyboard_key_feedback_more_background_lxx_dark" />
-    <item android:drawable="@drawable/keyboard_key_feedback_background_lxx_dark" />
-</selector>
+    >
+    <item android:top="50dp" android:bottom="0dp">
+        <shape
+            android:shape="rectangle"
+            >
+            <corners android:radius="8dp" />
+            <size android:width="48dp" android:height="24dp" />
+            <solid android:color="@color/key_feedback_color_lxx_dark" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/java/res/drawable/keyboard_key_feedback_lxx_light.xml b/java/res/drawable/keyboard_key_feedback_lxx_light.xml
index 6aff50977..5c26056e0 100644
--- a/java/res/drawable/keyboard_key_feedback_lxx_light.xml
+++ b/java/res/drawable/keyboard_key_feedback_lxx_light.xml
@@ -13,24 +13,16 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<selector
+<layer-list
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:latin="http://schemas.android.com/apk/res/org.futo.inputmethod.latin"
->
-    <!-- Left edge -->
-    <item latin:state_left_edge="true" latin:state_has_morekeys="true"
-          android:drawable="@drawable/keyboard_key_feedback_more_background_lxx_light" />
-    <item latin:state_left_edge="true"
-          android:drawable="@drawable/keyboard_key_feedback_background_lxx_light" />
-
-    <!-- Right edge -->
-    <item latin:state_right_edge="true" latin:state_has_morekeys="true"
-          android:drawable="@drawable/keyboard_key_feedback_more_background_lxx_light" />
-    <item latin:state_right_edge="true"
-          android:drawable="@drawable/keyboard_key_feedback_background_lxx_light" />
-
-    <item latin:state_has_morekeys="true"
-          android:drawable="@drawable/keyboard_key_feedback_more_background_lxx_light" />
-    <item android:drawable="@drawable/keyboard_key_feedback_background_lxx_light" />
-</selector>
+    >
+    <item android:top="32dp" android:bottom="0dp">
+        <shape
+            android:shape="rectangle"
+            >
+            <corners android:radius="8dp" />
+            <size android:width="48dp" android:height="24dp" />
+            <solid android:color="@color/key_feedback_color_lxx_light" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/java/res/drawable/keyboard_popup_panel_background_lxx_dark.xml b/java/res/drawable/keyboard_popup_panel_background_lxx_dark.xml
new file mode 100644
index 000000000..6207e48d2
--- /dev/null
+++ b/java/res/drawable/keyboard_popup_panel_background_lxx_dark.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape >
+            <solid android:color="@color/emoji_tab_page_indicator_background_lxx_dark" />
+            <corners android:radius="8dp" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/java/res/drawable/keyboard_popup_panel_background_lxx_light.xml b/java/res/drawable/keyboard_popup_panel_background_lxx_light.xml
new file mode 100644
index 000000000..1f6a3fc31
--- /dev/null
+++ b/java/res/drawable/keyboard_popup_panel_background_lxx_light.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/emoji_tab_page_indicator_background_lxx_light" />
+            <corners android:radius="8dp" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/java/res/drawable/more_keys_divider.xml b/java/res/drawable/more_keys_divider.xml
new file mode 100644
index 000000000..b0ffc0e7e
--- /dev/null
+++ b/java/res/drawable/more_keys_divider.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@android:color/transparent" />
+</selector>
\ No newline at end of file
diff --git a/java/res/drawable/more_suggestions_divider.xml b/java/res/drawable/more_suggestions_divider.xml
new file mode 100644
index 000000000..b0ffc0e7e
--- /dev/null
+++ b/java/res/drawable/more_suggestions_divider.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@android:color/transparent" />
+</selector>
\ No newline at end of file
diff --git a/java/res/drawable/suggestions_strip_divider_lxx_dark.xml b/java/res/drawable/suggestions_strip_divider_lxx_dark.xml
new file mode 100644
index 000000000..52ae4d890
--- /dev/null
+++ b/java/res/drawable/suggestions_strip_divider_lxx_dark.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/emoji_tab_page_indicator_background_lxx_dark" />
+</selector>
\ No newline at end of file
diff --git a/java/res/drawable/suggestions_strip_divider_lxx_light.xml b/java/res/drawable/suggestions_strip_divider_lxx_light.xml
new file mode 100644
index 000000000..a9bfbfdd7
--- /dev/null
+++ b/java/res/drawable/suggestions_strip_divider_lxx_light.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/emoji_tab_page_indicator_background_lxx_light" />
+</selector>
\ No newline at end of file
diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
index 5453d51c1..522f8ce07 100644
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@@ -19,27 +19,6 @@
 -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Color resources for IceCreamSandwich theme. Base color = 33B5E5 -->
-    <!-- android:color/holo_blue_light value is #FF33B5E5 -->
-    <color name="highlight_color_ics">#FF33B5E5</color>
-    <color name="typed_word_color_ics">#D833B5E5</color>
-    <color name="suggested_word_color_ics">#B233B5E5</color>
-    <color name="highlight_translucent_color_ics">#9933B5E5</color>
-    <color name="key_text_color_holo">@android:color/white</color>
-    <color name="key_text_inactivated_color_holo">#66E0E4E5</color>
-    <color name="key_hint_letter_color_holo">#80000000</color>
-    <color name="key_hint_label_color_holo">#A0FFFFFF</color>
-    <color name="key_shifted_letter_hint_inactivated_color_holo">#66E0E4E5</color>
-    <color name="key_shifted_letter_hint_activated_color_holo">@android:color/white</color>
-    <color name="spacebar_text_color_holo">#FFC0C0C0</color>
-    <color name="spacebar_text_shadow_color_holo">#80000000</color>
-    <color name="gesture_floating_preview_color_holo">#C0000000</color>
-    <color name="emoji_tab_page_indicator_background_holo">#111111</color>
-    <!-- Color resources for KLP theme. Base color = F0F0F0 -->
-    <color name="highlight_color_klp">#FFF0F0F0</color>
-    <color name="typed_word_color_klp">#D8F0F0F0</color>
-    <color name="suggested_word_color_klp">#B2F0F0F0</color>
-    <color name="highlight_translucent_color_klp">#99E0E0E0</color>
     <!-- Color resources for LXX_Light theme.
          15%:0x26 70%:0xB3 75%:0xC0 80%:0xCC 85%:0xD9 90%:0xE6 -->
     <color name="key_text_color_lxx_light">#37474F</color>
@@ -54,6 +33,7 @@
     <color name="gesture_trail_color_lxx_light">#4DB6AC</color>
     <color name="sliding_key_input_preview_color_lxx_light">#B34DB6AC</color>
     <color name="key_background_lxx_light">#ECEFF1</color>
+    <color name="keyboard_separator_lxx_light">#f6f7f8</color>
     <color name="key_background_pressed_lxx_light">#2637474F</color>
     <color name="suggested_word_background_selected_lxx_light">#2637474F</color>
     <color name="gesture_floating_preview_color_lxx_light">#E6ECEFF1</color>
@@ -72,6 +52,7 @@
     <color name="gesture_trail_color_lxx_dark">#80CBC4</color>
     <color name="sliding_key_input_preview_color_lxx_dark">#B380CBC4</color>
     <color name="key_background_lxx_dark">#263238</color>
+    <color name="keyboard_separator_lxx_dark">#3c474c</color>
     <color name="key_background_pressed_lxx_dark">#19FFFFFF</color>
     <color name="suggested_word_background_selected_lxx_dark">#19FFFFFF</color>
     <color name="gesture_floating_preview_color_lxx_dark">#E621272B</color>
@@ -84,4 +65,8 @@
     <color name="setup_welcome_video_margin_color">#FFCCCCCC</color>
     <!-- Accent color for the notification. We need to match this to the OS build -->
     <color name="notification_accent_color">#FF607D8B</color>
+
+
+    <color name="key_feedback_color_lxx_dark">#3d484d</color>
+    <color name="key_feedback_color_lxx_light">#d1d6d9</color>
 </resources>
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index 33bcb0603..6f4622add 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -45,7 +45,7 @@
     <dimen name="config_key_preview_offset_holo">8.0dp</dimen>
     <dimen name="config_key_preview_height_holo">80dp</dimen>
     <dimen name="config_key_preview_offset_lxx">50.0dp</dimen>
-    <dimen name="config_key_preview_height_lxx">122dp</dimen>
+    <dimen name="config_key_preview_height_lxx">160dp</dimen>
     <fraction name="config_key_preview_text_ratio">82%</fraction>
     <fraction name="config_key_letter_ratio_holo">55%</fraction>
     <fraction name="config_key_letter_ratio_lxx">55%</fraction>
diff --git a/java/res/values/keyboard-themes.xml b/java/res/values/keyboard-themes.xml
index 5bf30306e..31763219d 100644
--- a/java/res/values/keyboard-themes.xml
+++ b/java/res/values/keyboard-themes.xml
@@ -22,15 +22,11 @@
     <string-array name="keyboard_theme_names" translatable="false">
         <item>@string/keyboard_theme_material_light</item>
         <item>@string/keyboard_theme_material_dark</item>
-        <item>@string/keyboard_theme_holo_white</item>
-        <item>@string/keyboard_theme_holo_blue</item>
     </string-array>
     <!-- An element must be a keyboard theme id of
          {@link org.futo.inputmethod.keyboard.KeyboardTheme#THEME_ID_ICS} etc. -->
     <integer-array name="keyboard_theme_ids" translatable="false">
         <item>3</item>
         <item>4</item>
-        <item>2</item>
-        <item>0</item>
     </integer-array>
 </resources>
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 6b985cec9..e7b51e048 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -347,10 +347,6 @@ mobile devices. [CHAR LIMIT=25] -->
 
     <!-- Title of the preference settings for switching keyboard theme [CHAR LIMIT=35] -->
     <string name="keyboard_theme">Keyboard theme</string>
-    <!-- The keyboard theme name, Holo White. This is marked as translatable="false" because this is a proper name of system-wide UI Theme. -->
-    <string name="keyboard_theme_holo_white" translatable="false">Holo White</string>
-    <!-- The keyboard theme name, Holo Blue. This is marked as translatable="false" because this is a proper name of system-wide UI Theme.  -->
-    <string name="keyboard_theme_holo_blue" translatable="false">Holo Blue</string>
     <!-- The keyboard theme name, Material Dark. This is marked as translatable="false" because this is a proper name of system-wide UI Theme.  -->
     <string name="keyboard_theme_material_dark" translatable="false">Material Dark</string>
     <!-- The keyboard theme name, Material Light. This is marked as translatable="false" because this is a proper name of system-wide UI Theme.  -->
diff --git a/java/res/values/themes-common.xml b/java/res/values/themes-common.xml
index dc335547a..fd79e23f5 100644
--- a/java/res/values/themes-common.xml
+++ b/java/res/values/themes-common.xml
@@ -37,7 +37,7 @@
     <style name="KeyboardView">
         <!-- This keyBackground is needed to run unit tests based on {@link InputTestBase}. -->
         <!-- TODO: Apply default {@link KeyboardTheme} to {@link InputTestBase} and remove this. -->
-        <item name="keyBackground">@drawable/btn_keyboard_key_klp</item>
+        <item name="keyBackground">@drawable/btn_keyboard_key_lxx_light</item>
         <item name="keyTypeface">normal</item>
         <!-- A negative value to disable key text shadow layer. -->
         <item name="keyTextShadowRadius">-1.0</item>
diff --git a/java/res/values/themes-holo.xml b/java/res/values/themes-holo.xml
deleted file mode 100644
index efac65627..000000000
--- a/java/res/values/themes-holo.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 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.
-*/
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <style
-        name="InputView.Holo"
-        parent="InputView"
-    />
-    <!-- Holo KeyboardView theme (ICS and KLP) -->
-    <style
-        name="KeyboardView.Holo"
-        parent="KeyboardView"
-    >
-        <item name="keyTypeface">bold</item>
-        <item name="keyLetterSize">@fraction/config_key_letter_ratio_holo</item>
-        <item name="keyLabelSize">@fraction/config_key_label_ratio_holo</item>
-        <item name="keyHintLetterRatio">@fraction/config_key_hint_letter_ratio_holo</item>
-        <item name="keyShiftedLetterHintRatio">@fraction/config_key_shifted_letter_hint_ratio_holo</item>
-        <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio_holo</item>
-        <item name="keyLabelOffCenterRatio">-175%</item>
-        <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio_holo</item>
-        <item name="keyHintLabelOffCenterRatio">200%</item>
-        <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
-        <item name="keyPopupHintLetter">&#x2026;</item>
-    </style>
-</resources>
diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-ics.xml
deleted file mode 100644
index 357988e7e..000000000
--- a/java/res/values/themes-ics.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 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.
-*/
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <style name="KeyboardTheme.ICS" parent="KeyboardIcons.Holo">
-        <item name="inputViewStyle">@style/InputView.Holo</item>
-        <item name="keyboardStyle">@style/Keyboard.ICS</item>
-        <item name="keyboardViewStyle">@style/KeyboardView.ICS</item>
-        <item name="mainKeyboardViewStyle">@style/MainKeyboardView.ICS</item>
-        <item name="emojiPalettesViewStyle">@style/EmojiPalettesView.ICS</item>
-        <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.ICS</item>
-        <!-- Note: ICS theme uses the same style for both general more keys and action more keys. -->
-        <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.ICS</item>
-        <item name="moreKeysKeyboardViewForActionStyle">@style/MoreKeysKeyboardView.ICS</item>
-        <item name="suggestionStripViewStyle">@style/SuggestionStripView.ICS</item>
-        <item name="suggestionWordStyle">@style/SuggestionWord.ICS</item>
-    </style>
-    <style
-        name="Keyboard.ICS"
-        parent="Keyboard"
-    >
-        <!-- This should be aligned with KeyboardTheme.THEME_ID_* -->
-        <item name="themeId">ICS</item>
-    </style>
-    <style
-        name="KeyboardView.ICS"
-        parent="KeyboardView.Holo"
-    >
-        <item name="android:background">@drawable/keyboard_background_holo</item>
-        <item name="keyBackground">@drawable/btn_keyboard_key_ics</item>
-        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_ics</item>
-        <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_ics</item>
-        <item name="keyTextColor">@color/key_text_color_holo</item>
-        <item name="keyTextInactivatedColor">@color/key_text_inactivated_color_holo</item>
-        <item name="functionalTextColor">@color/key_text_color_holo</item>
-        <item name="keyHintLetterColor">@color/key_hint_letter_color_holo</item>
-        <item name="keyHintLabelColor">@color/key_hint_label_color_holo</item>
-        <item name="keyShiftedLetterHintInactivatedColor">@color/key_shifted_letter_hint_inactivated_color_holo</item>
-        <item name="keyShiftedLetterHintActivatedColor">@color/key_shifted_letter_hint_activated_color_holo</item>
-        <item name="keyPreviewTextColor">@color/key_text_color_holo</item>
-    </style>
-    <style
-        name="MainKeyboardView.ICS"
-        parent="KeyboardView.ICS"
-    >
-        <item name="keyPreviewBackground">@drawable/keyboard_key_feedback_ics</item>
-        <item name="keyPreviewHeight">@dimen/config_key_preview_height_holo</item>
-        <item name="keyPreviewOffset">@dimen/config_key_preview_offset_holo</item>
-        <item name="keyPreviewShowUpAnimator">@anim/key_preview_show_up_holo</item>
-        <item name="keyPreviewDismissAnimator">@anim/key_preview_dismiss_holo</item>
-        <item name="gestureFloatingPreviewTextColor">@color/highlight_color_ics</item>
-        <item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_holo</item>
-        <item name="gestureTrailColor">@color/highlight_color_ics</item>
-        <item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_ics</item>
-        <item name="languageOnSpacebarTextColor">@color/spacebar_text_color_holo</item>
-        <item name="languageOnSpacebarTextShadowRadius">1.0</item>
-        <item name="languageOnSpacebarTextShadowColor">@color/spacebar_text_shadow_color_holo</item>
-    </style>
-    <!-- Though {@link org.futo.inputmethod.keyboard.emoji.EmojiPalettesView} doesn't extend
-         {@link org.futo.inputmethod.keyboard.KeyboardView}, some views inside it, for instance
-         delete button, need themed {@link org.futo.inputmethod.keyboard.KeyboardView}
-         attributes. -->
-    <style
-        name="EmojiPalettesView.ICS"
-        parent="MainKeyboardView.ICS"
-    >
-        <item name="categoryIndicatorEnabled">true</item>
-        <item name="categoryIndicatorDrawable">@drawable/emoji_category_tab_selected_ics</item>
-        <item name="categoryIndicatorBackground">@drawable/emoji_category_tab_unselected_holo_dark</item>
-        <item name="categoryPageIndicatorColor">@color/highlight_color_ics</item>
-        <item name="categoryPageIndicatorBackground">@color/emoji_tab_page_indicator_background_holo</item>
-        <item name="iconEmojiRecentsTab">@drawable/ic_emoji_recents_holo_dark</item>
-        <item name="iconEmojiCategory1Tab">@drawable/ic_emoji_people_holo_dark</item>
-        <item name="iconEmojiCategory2Tab">@drawable/ic_emoji_objects_holo_dark</item>
-        <item name="iconEmojiCategory3Tab">@drawable/ic_emoji_nature_holo_dark</item>
-        <item name="iconEmojiCategory4Tab">@drawable/ic_emoji_places_holo_dark</item>
-        <item name="iconEmojiCategory5Tab">@drawable/ic_emoji_symbols_holo_dark</item>
-        <item name="iconEmojiCategory6Tab">@drawable/ic_emoji_emoticons_holo_dark</item>
-        <item name="iconEmojiCategory7Tab">@drawable/ic_emoji_flag_holo_dark</item>
-        <item name="iconEmojiCategory8Tab">@drawable/ic_emoji_people_holo_dark</item>
-        <item name="iconEmojiCategory9Tab">@drawable/ic_emoji_nature_holo_dark</item>
-        <item name="iconEmojiCategory10Tab">@drawable/ic_emoji_food_holo_dark</item>
-        <item name="iconEmojiCategory11Tab">@drawable/ic_emoji_places_holo_dark</item>
-        <item name="iconEmojiCategory12Tab">@drawable/ic_emoji_activity_holo_dark</item>
-        <item name="iconEmojiCategory13Tab">@drawable/ic_emoji_objects_holo_dark</item>
-        <item name="iconEmojiCategory14Tab">@drawable/ic_emoji_symbols_holo_dark</item>
-        <item name="iconEmojiCategory15Tab">@drawable/ic_emoji_flag_holo_dark</item>
-        <item name="iconEmojiCategory16Tab">@drawable/ic_emoji_people_holo_dark</item>
-    </style>
-    <style
-        name="MoreKeysKeyboard.ICS"
-        parent="Keyboard.ICS"
-    >
-        <item name="keyboardTopPadding">0%p</item>
-        <item name="keyboardBottomPadding">0%p</item>
-        <item name="horizontalGap">0%p</item>
-        <item name="touchPositionCorrectionData">@null</item>
-    </style>
-    <style
-        name="MoreKeysKeyboardView.ICS"
-        parent="KeyboardView.ICS"
-    >
-        <item name="android:background">@drawable/keyboard_popup_panel_background_ics</item>
-        <item name="keyBackground">@drawable/btn_keyboard_key_popup_ics</item>
-        <item name="divider">@drawable/more_keys_divider</item>
-        <item name="keyTypeface">normal</item>
-        <item name="verticalCorrection">@dimen/config_more_keys_keyboard_vertical_correction_holo</item>
-    </style>
-    <style
-        name="SuggestionStripView.ICS"
-        parent="KeyboardView.ICS"
-    >
-        <item name="suggestionsCountInStrip">@integer/config_suggestions_count_in_strip</item>
-        <item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item>
-        <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>
-        <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>
-        <item name="android:background">@drawable/keyboard_suggest_strip_holo</item>
-        <item name="android:src">@drawable/suggestions_strip_divider_holo</item>
-        <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
-        <item name="colorValidTypedWord">@color/typed_word_color_ics</item>
-        <item name="colorTypedWord">@color/typed_word_color_ics</item>
-        <item name="colorAutoCorrect">@color/highlight_color_ics</item>
-        <item name="colorSuggested">@color/suggested_word_color_ics</item>
-        <item name="alphaObsoleted">70%</item>
-    </style>
-    <style
-        name="SuggestionWord.ICS"
-        parent="SuggestionWord"
-    >
-        <item name="android:background">@drawable/btn_suggestion_ics</item>
-        <item name="android:textColor">@color/highlight_color_ics</item>
-    </style>
-</resources>
diff --git a/java/res/values/themes-klp.xml b/java/res/values/themes-klp.xml
deleted file mode 100644
index 64a9728a3..000000000
--- a/java/res/values/themes-klp.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, 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.
-*/
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <style name="KeyboardTheme.KLP" parent="KeyboardIcons.Holo">
-        <item name="inputViewStyle">@style/InputView.Holo</item>
-        <item name="keyboardStyle">@style/Keyboard.KLP</item>
-        <item name="keyboardViewStyle">@style/KeyboardView.KLP</item>
-        <item name="mainKeyboardViewStyle">@style/MainKeyboardView.KLP</item>
-        <item name="emojiPalettesViewStyle">@style/EmojiPalettesView.KLP</item>
-        <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard.KLP</item>
-        <!-- Note: KLP theme uses the same style for both general more keys and action more keys. -->
-        <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView.KLP</item>
-        <item name="moreKeysKeyboardViewForActionStyle">@style/MoreKeysKeyboardView.KLP</item>
-        <item name="suggestionStripViewStyle">@style/SuggestionStripView.KLP</item>
-        <item name="suggestionWordStyle">@style/SuggestionWord.KLP</item>
-    </style>
-    <style
-        name="Keyboard.KLP"
-        parent="Keyboard"
-    >
-        <!-- This should be aligned with KeyboardTheme.THEME_ID_* -->
-        <item name="themeId">KLP</item>
-    </style>
-    <style
-        name="KeyboardView.KLP"
-        parent="KeyboardView.Holo"
-    >
-        <item name="android:background">@drawable/keyboard_background_holo</item>
-        <item name="keyBackground">@drawable/btn_keyboard_key_klp</item>
-        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_klp</item>
-        <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_klp</item>
-        <item name="keyTextColor">@color/key_text_color_holo</item>
-        <item name="keyTextInactivatedColor">@color/key_text_inactivated_color_holo</item>
-        <item name="functionalTextColor">@color/key_text_color_holo</item>
-        <item name="keyHintLetterColor">@color/key_hint_letter_color_holo</item>
-        <item name="keyHintLabelColor">@color/key_hint_label_color_holo</item>
-        <item name="keyShiftedLetterHintInactivatedColor">@color/key_shifted_letter_hint_inactivated_color_holo</item>
-        <item name="keyShiftedLetterHintActivatedColor">@color/key_shifted_letter_hint_activated_color_holo</item>
-        <item name="keyPreviewTextColor">@color/key_text_color_holo</item>
-    </style>
-    <style
-        name="MainKeyboardView.KLP"
-        parent="KeyboardView.KLP"
-    >
-        <item name="keyPreviewBackground">@drawable/keyboard_key_feedback_klp</item>
-        <item name="keyPreviewHeight">@dimen/config_key_preview_height_holo</item>
-        <item name="keyPreviewOffset">@dimen/config_key_preview_offset_holo</item>
-        <item name="keyPreviewShowUpAnimator">@anim/key_preview_show_up_holo</item>
-        <item name="keyPreviewDismissAnimator">@anim/key_preview_dismiss_holo</item>
-        <item name="gestureFloatingPreviewTextColor">@color/highlight_color_klp</item>
-        <item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_holo</item>
-        <item name="gestureTrailColor">@color/highlight_color_klp</item>
-        <item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_klp</item>
-        <item name="languageOnSpacebarTextColor">@color/spacebar_text_color_holo</item>
-        <item name="languageOnSpacebarTextShadowRadius">1.0</item>
-        <item name="languageOnSpacebarTextShadowColor">@color/spacebar_text_shadow_color_holo</item>
-    </style>
-    <!-- Though {@link org.futo.inputmethod.keyboard.emoji.EmojiPalettesView} doesn't extend
-         {@link org.futo.inputmethod.keyboard.KeyboardView}, some views inside it, for instance
-         delete button, need themed {@link org.futo.inputmethod.keyboard.KeyboardView}
-         attributes. -->
-    <style
-        name="EmojiPalettesView.KLP"
-        parent="MainKeyboardView.KLP"
-    >
-        <item name="categoryIndicatorEnabled">true</item>
-        <item name="categoryIndicatorDrawable">@drawable/emoji_category_tab_selected_klp</item>
-        <item name="categoryIndicatorBackground">@drawable/emoji_category_tab_unselected_holo_dark</item>
-        <item name="categoryPageIndicatorColor">@color/highlight_color_klp</item>
-        <item name="categoryPageIndicatorBackground">@color/emoji_tab_page_indicator_background_holo</item>
-        <item name="iconEmojiRecentsTab">@drawable/ic_emoji_recents_holo_dark</item>
-        <item name="iconEmojiCategory1Tab">@drawable/ic_emoji_people_holo_dark</item>
-        <item name="iconEmojiCategory2Tab">@drawable/ic_emoji_objects_holo_dark</item>
-        <item name="iconEmojiCategory3Tab">@drawable/ic_emoji_nature_holo_dark</item>
-        <item name="iconEmojiCategory4Tab">@drawable/ic_emoji_places_holo_dark</item>
-        <item name="iconEmojiCategory5Tab">@drawable/ic_emoji_symbols_holo_dark</item>
-        <item name="iconEmojiCategory6Tab">@drawable/ic_emoji_emoticons_holo_dark</item>
-        <item name="iconEmojiCategory7Tab">@drawable/ic_emoji_flag_holo_dark</item>
-        <item name="iconEmojiCategory8Tab">@drawable/ic_emoji_people_holo_dark</item>
-        <item name="iconEmojiCategory9Tab">@drawable/ic_emoji_nature_holo_dark</item>
-        <item name="iconEmojiCategory10Tab">@drawable/ic_emoji_food_holo_dark</item>
-        <item name="iconEmojiCategory11Tab">@drawable/ic_emoji_places_holo_dark</item>
-        <item name="iconEmojiCategory12Tab">@drawable/ic_emoji_activity_holo_dark</item>
-        <item name="iconEmojiCategory13Tab">@drawable/ic_emoji_objects_holo_dark</item>
-        <item name="iconEmojiCategory14Tab">@drawable/ic_emoji_symbols_holo_dark</item>
-        <item name="iconEmojiCategory15Tab">@drawable/ic_emoji_flag_holo_dark</item>
-        <item name="iconEmojiCategory16Tab">@drawable/ic_emoji_people_holo_dark</item>
-    </style>
-    <style
-        name="MoreKeysKeyboard.KLP"
-        parent="Keyboard.KLP"
-    >
-        <item name="keyboardTopPadding">0%p</item>
-        <item name="keyboardBottomPadding">0%p</item>
-        <item name="horizontalGap">0%p</item>
-        <item name="touchPositionCorrectionData">@null</item>
-    </style>
-    <style
-        name="MoreKeysKeyboardView.KLP"
-        parent="KeyboardView.KLP"
-    >
-        <item name="android:background">@drawable/keyboard_popup_panel_background_klp</item>
-        <item name="keyBackground">@drawable/btn_keyboard_key_popup_klp</item>
-        <item name="divider">@drawable/more_keys_divider</item>
-        <item name="keyTypeface">normal</item>
-        <item name="verticalCorrection">@dimen/config_more_keys_keyboard_vertical_correction_holo</item>
-    </style>
-    <style
-        name="SuggestionStripView.KLP"
-        parent="KeyboardView.KLP"
-    >
-        <item name="suggestionsCountInStrip">@integer/config_suggestions_count_in_strip</item>
-        <item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item>
-        <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>
-        <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>
-        <item name="android:background">@drawable/keyboard_suggest_strip_holo</item>
-        <item name="android:src">@drawable/suggestions_strip_divider_holo</item>
-        <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
-        <item name="colorValidTypedWord">@color/typed_word_color_klp</item>
-        <item name="colorTypedWord">@color/typed_word_color_klp</item>
-        <item name="colorAutoCorrect">@color/highlight_color_klp</item>
-        <item name="colorSuggested">@color/suggested_word_color_klp</item>
-        <item name="alphaObsoleted">70%</item>
-    </style>
-    <style
-        name="SuggestionWord.KLP"
-        parent="SuggestionWord"
-    >
-        <item name="android:background">@drawable/btn_suggestion_klp</item>
-        <item name="android:textColor">@color/highlight_color_klp</item>
-    </style>
-</resources>
diff --git a/java/res/values/themes-lxx-dark.xml b/java/res/values/themes-lxx-dark.xml
index 949d26163..2b53e747f 100644
--- a/java/res/values/themes-lxx-dark.xml
+++ b/java/res/values/themes-lxx-dark.xml
@@ -138,7 +138,7 @@
         <item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item>
         <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>
         <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>
-        <item name="android:background">@drawable/keyboard_suggest_strip_lxx_dark</item>
+        <item name="android:background">@color/gesture_floating_preview_color_lxx_dark</item>
         <item name="android:src">@drawable/suggestions_strip_divider_lxx_dark</item>
         <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
         <item name="colorValidTypedWord">@color/typed_word_color_lxx_dark</item>
diff --git a/java/res/values/themes-lxx-light.xml b/java/res/values/themes-lxx-light.xml
index c6650afce..aac14fa41 100644
--- a/java/res/values/themes-lxx-light.xml
+++ b/java/res/values/themes-lxx-light.xml
@@ -138,7 +138,7 @@
         <item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item>
         <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>
         <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>
-        <item name="android:background">@drawable/keyboard_suggest_strip_lxx_light</item>
+        <item name="android:background">@color/gesture_floating_preview_color_lxx_light</item>
         <item name="android:src">@drawable/suggestions_strip_divider_lxx_light</item>
         <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
         <item name="colorValidTypedWord">@color/typed_word_color_lxx_light</item>
diff --git a/java/src/org/futo/inputmethod/keyboard/KeyboardTheme.java b/java/src/org/futo/inputmethod/keyboard/KeyboardTheme.java
index 6c083f791..3122e3dd9 100644
--- a/java/src/org/futo/inputmethod/keyboard/KeyboardTheme.java
+++ b/java/src/org/futo/inputmethod/keyboard/KeyboardTheme.java
@@ -37,22 +37,14 @@ public final class KeyboardTheme implements Comparable<KeyboardTheme> {
 
     // These should be aligned with Keyboard.themeId and Keyboard.Case.keyboardTheme
     // attributes' values in attrs.xml.
-    public static final int THEME_ID_ICS = 0;
-    public static final int THEME_ID_KLP = 2;
     public static final int THEME_ID_LXX_LIGHT = 3;
     public static final int THEME_ID_LXX_DARK = 4;
-    public static final int DEFAULT_THEME_ID = THEME_ID_KLP;
+    public static final int DEFAULT_THEME_ID = THEME_ID_LXX_LIGHT;
 
     private static KeyboardTheme[] AVAILABLE_KEYBOARD_THEMES;
 
     /* package private for testing */
     static final KeyboardTheme[] KEYBOARD_THEMES = {
-        new KeyboardTheme(THEME_ID_ICS, "ICS", R.style.KeyboardTheme_ICS,
-                // This has never been selected because we support ICS or later.
-                VERSION_CODES.BASE),
-        new KeyboardTheme(THEME_ID_KLP, "KLP", R.style.KeyboardTheme_KLP,
-                // Default theme for ICS, JB, and KLP.
-                VERSION_CODES.ICE_CREAM_SANDWICH),
         new KeyboardTheme(THEME_ID_LXX_LIGHT, "LXXLight", R.style.KeyboardTheme_LXX_Light,
                 // Default theme for LXX.
                 Build.VERSION_CODES.LOLLIPOP),
diff --git a/tests/src/org/futo/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysKlpTests.java b/tests/src/org/futo/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysKlpTests.java
index a1643de53..5d5d7c650 100644
--- a/tests/src/org/futo/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysKlpTests.java
+++ b/tests/src/org/futo/inputmethod/keyboard/KeyboardLayoutSetNavigateMoreKeysKlpTests.java
@@ -23,6 +23,6 @@ public class KeyboardLayoutSetNavigateMoreKeysKlpTests
         extends KeyboardLayoutSetNavigateMoreKeysBase {
     @Override
     protected int getKeyboardThemeForTests() {
-        return KeyboardTheme.THEME_ID_KLP;
+        return KeyboardTheme.THEME_ID_LXX_LIGHT;
     }
 }
diff --git a/tests/src/org/futo/inputmethod/keyboard/KeyboardThemeTests.java b/tests/src/org/futo/inputmethod/keyboard/KeyboardThemeTests.java
index fcd5192a0..ba648096f 100644
--- a/tests/src/org/futo/inputmethod/keyboard/KeyboardThemeTests.java
+++ b/tests/src/org/futo/inputmethod/keyboard/KeyboardThemeTests.java
@@ -16,8 +16,6 @@
 
 package org.futo.inputmethod.keyboard;
 
-import static org.futo.inputmethod.keyboard.KeyboardTheme.THEME_ID_ICS;
-import static org.futo.inputmethod.keyboard.KeyboardTheme.THEME_ID_KLP;
 import static org.futo.inputmethod.keyboard.KeyboardTheme.THEME_ID_LXX_DARK;
 import static org.futo.inputmethod.keyboard.KeyboardTheme.THEME_ID_LXX_LIGHT;
 
@@ -67,8 +65,6 @@ public class KeyboardThemeTests {
 
     private static boolean isValidKeyboardThemeId(final int themeId) {
         switch (themeId) {
-        case THEME_ID_ICS:
-        case THEME_ID_KLP:
         case THEME_ID_LXX_LIGHT:
         case THEME_ID_LXX_DARK:
             return true;
@@ -116,10 +112,8 @@ public class KeyboardThemeTests {
     }
 
     private void assertKeyboardThemePreferenceOnKlp(final int sdkVersion) {
-        final int defaultThemeId = THEME_ID_KLP;
+        final int defaultThemeId = THEME_ID_LXX_LIGHT;
         assertKeyboardThemePreference(sdkVersion, THEME_ID_NULL, defaultThemeId);
-        assertKeyboardThemePreference(sdkVersion, THEME_ID_ICS, THEME_ID_ICS);
-        assertKeyboardThemePreference(sdkVersion, THEME_ID_KLP, THEME_ID_KLP);
         assertKeyboardThemePreference(sdkVersion, THEME_ID_LXX_LIGHT, THEME_ID_LXX_LIGHT);
         assertKeyboardThemePreference(sdkVersion, THEME_ID_LXX_DARK, THEME_ID_LXX_DARK);
         assertKeyboardThemePreference(sdkVersion, THEME_ID_UNKNOWN, defaultThemeId);
@@ -139,8 +133,6 @@ public class KeyboardThemeTests {
     private void assertKeyboardThemePreferenceOnLxx(final int sdkVersion) {
         final int defaultThemeId = THEME_ID_LXX_LIGHT;
         assertKeyboardThemePreference(sdkVersion, THEME_ID_NULL, defaultThemeId);
-        assertKeyboardThemePreference(sdkVersion, THEME_ID_ICS, THEME_ID_ICS);
-        assertKeyboardThemePreference(sdkVersion, THEME_ID_KLP, THEME_ID_KLP);
         assertKeyboardThemePreference(sdkVersion, THEME_ID_LXX_LIGHT, THEME_ID_LXX_LIGHT);
         assertKeyboardThemePreference(sdkVersion, THEME_ID_LXX_DARK, THEME_ID_LXX_DARK);
         assertKeyboardThemePreference(sdkVersion, THEME_ID_UNKNOWN, defaultThemeId);
@@ -176,11 +168,6 @@ public class KeyboardThemeTests {
     }
 
     private void assertDefaultKeyboardThemeOnKlp(final int sdkVersion) {
-        assertDefaultKeyboardTheme(sdkVersion, THEME_ID_NULL, THEME_ID_KLP);
-        assertDefaultKeyboardTheme(sdkVersion, THEME_ID_ICS, THEME_ID_ICS);
-        assertDefaultKeyboardTheme(sdkVersion, THEME_ID_KLP, THEME_ID_KLP);
-        assertDefaultKeyboardTheme(sdkVersion, THEME_ID_UNKNOWN, THEME_ID_KLP);
-        assertDefaultKeyboardTheme(sdkVersion, THEME_ID_ILLEGAL, THEME_ID_KLP);
     }
 
     @Test
@@ -196,8 +183,6 @@ public class KeyboardThemeTests {
     private void assertDefaultKeyboardThemeOnLxx(final int sdkVersion) {
         // Forced to switch to LXX theme.
         assertDefaultKeyboardTheme(sdkVersion, THEME_ID_NULL, THEME_ID_LXX_LIGHT);
-        assertDefaultKeyboardTheme(sdkVersion, THEME_ID_ICS, THEME_ID_LXX_LIGHT);
-        assertDefaultKeyboardTheme(sdkVersion, THEME_ID_KLP, THEME_ID_LXX_LIGHT);
         assertDefaultKeyboardTheme(sdkVersion, THEME_ID_UNKNOWN, THEME_ID_LXX_LIGHT);
         assertDefaultKeyboardTheme(sdkVersion, THEME_ID_ILLEGAL, THEME_ID_LXX_LIGHT);
     }
@@ -243,11 +228,6 @@ public class KeyboardThemeTests {
     }
 
     private void assertUpgradeKeyboardToLxxOnKlp(final int sdkVersion) {
-        assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_NULL, THEME_ID_KLP);
-        assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_ICS, THEME_ID_ICS);
-        assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_KLP, THEME_ID_KLP);
-        assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_UNKNOWN, THEME_ID_KLP);
-        assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_ILLEGAL, THEME_ID_KLP);
     }
 
     // Upgrading keyboard on I,J and K.
@@ -264,8 +244,6 @@ public class KeyboardThemeTests {
     private void assertUpgradeKeyboardToLxxOnLxx(final int sdkVersion) {
         // Forced to switch to LXX theme.
         assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_NULL, THEME_ID_LXX_LIGHT);
-        assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_ICS, THEME_ID_LXX_LIGHT);
-        assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_KLP, THEME_ID_LXX_LIGHT);
         assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_UNKNOWN, THEME_ID_LXX_LIGHT);
         assertUpgradeKeyboardToLxxOn(sdkVersion, THEME_ID_ILLEGAL, THEME_ID_LXX_LIGHT);
     }
@@ -298,11 +276,6 @@ public class KeyboardThemeTests {
 
     private void assertUpgradePlatformFromKlpToKlp(final int oldSdkVersion,
             final int newSdkVersion) {
-        assertUpgradePlatformFromTo(oldSdkVersion, newSdkVersion, THEME_ID_NULL, THEME_ID_KLP);
-        assertUpgradePlatformFromTo(oldSdkVersion, newSdkVersion, THEME_ID_ICS, THEME_ID_ICS);
-        assertUpgradePlatformFromTo(oldSdkVersion, newSdkVersion, THEME_ID_KLP, THEME_ID_KLP);
-        assertUpgradePlatformFromTo(oldSdkVersion, newSdkVersion, THEME_ID_UNKNOWN, THEME_ID_KLP);
-        assertUpgradePlatformFromTo(oldSdkVersion, newSdkVersion, THEME_ID_ILLEGAL, THEME_ID_KLP);
     }
 
     private void assertUpgradePlatformToKlpFrom(final int oldSdkVersion) {
@@ -330,10 +303,6 @@ public class KeyboardThemeTests {
         final int newSdkVersion = Build.VERSION_CODES.LOLLIPOP;
         assertUpgradePlatformFromTo(
                 oldSdkVersion, newSdkVersion, THEME_ID_NULL, THEME_ID_LXX_LIGHT);
-        assertUpgradePlatformFromTo(
-                oldSdkVersion, newSdkVersion, THEME_ID_ICS, THEME_ID_LXX_LIGHT);
-        assertUpgradePlatformFromTo(
-                oldSdkVersion, newSdkVersion, THEME_ID_KLP, THEME_ID_LXX_LIGHT);
         assertUpgradePlatformFromTo(
                 oldSdkVersion, newSdkVersion, THEME_ID_UNKNOWN, THEME_ID_LXX_LIGHT);
         assertUpgradePlatformFromTo(
@@ -358,10 +327,6 @@ public class KeyboardThemeTests {
         final int newSdkVersion = Build.VERSION_CODES.LOLLIPOP;
         assertUpgradePlatformFromTo(
                 oldSdkVersion, newSdkVersion, THEME_ID_NULL, THEME_ID_LXX_LIGHT);
-        assertUpgradePlatformFromTo(
-                oldSdkVersion, newSdkVersion, THEME_ID_ICS, THEME_ID_ICS);
-        assertUpgradePlatformFromTo(
-                oldSdkVersion, newSdkVersion, THEME_ID_KLP, THEME_ID_KLP);
         assertUpgradePlatformFromTo(
                 oldSdkVersion, newSdkVersion, THEME_ID_LXX_LIGHT, THEME_ID_LXX_LIGHT);
         assertUpgradePlatformFromTo(
@@ -403,8 +368,6 @@ public class KeyboardThemeTests {
      * Test for missing selected theme.
      */
     private static KeyboardTheme[] LIMITED_THEMES = {
-        KeyboardTheme.searchKeyboardThemeById(THEME_ID_ICS, KeyboardTheme.KEYBOARD_THEMES),
-        KeyboardTheme.searchKeyboardThemeById(THEME_ID_KLP, KeyboardTheme.KEYBOARD_THEMES)
     };
     static {
         Arrays.sort(LIMITED_THEMES);
@@ -424,7 +387,6 @@ public class KeyboardThemeTests {
         final KeyboardTheme actualTheme = KeyboardTheme.getKeyboardTheme(
                 mPrefs, sdkVersion, LIMITED_THEMES);
         // LXX_LIGHT is missing, fall-back to KLP.
-        assertEquals(THEME_ID_KLP, actualTheme.mThemeId);
     }
 
     @Test
@@ -440,7 +402,6 @@ public class KeyboardThemeTests {
         final KeyboardTheme actualTheme = KeyboardTheme.getKeyboardTheme(
                 mPrefs, sdkVersion, LIMITED_THEMES);
         // LXX_LIGHT is missing, fall-back to KLP.
-        assertEquals(THEME_ID_KLP, actualTheme.mThemeId);
     }
 
     @Test
@@ -456,6 +417,5 @@ public class KeyboardThemeTests {
         final KeyboardTheme actualTheme = KeyboardTheme.getKeyboardTheme(
                 mPrefs, sdkVersion, LIMITED_THEMES);
         // LXX_DARK is missing, fall-back to KLP.
-        assertEquals(THEME_ID_KLP, actualTheme.mThemeId);
     }
 }
diff --git a/tests/src/org/futo/inputmethod/keyboard/action/KlpActionTestsBase.java b/tests/src/org/futo/inputmethod/keyboard/action/KlpActionTestsBase.java
index c22652efe..8ffef76e7 100644
--- a/tests/src/org/futo/inputmethod/keyboard/action/KlpActionTestsBase.java
+++ b/tests/src/org/futo/inputmethod/keyboard/action/KlpActionTestsBase.java
@@ -50,6 +50,6 @@ abstract class KlpActionTestsBase extends ActionTestsBase {
 
     @Override
     protected int getKeyboardThemeForTests() {
-        return KeyboardTheme.THEME_ID_KLP;
+        return KeyboardTheme.THEME_ID_LXX_LIGHT;
     }
 }
diff --git a/tests/src/org/futo/inputmethod/keyboard/layout/tests/KeyboardLayoutSetSubtypesCountTests.java b/tests/src/org/futo/inputmethod/keyboard/layout/tests/KeyboardLayoutSetSubtypesCountTests.java
index c4bf3a335..f6275874f 100644
--- a/tests/src/org/futo/inputmethod/keyboard/layout/tests/KeyboardLayoutSetSubtypesCountTests.java
+++ b/tests/src/org/futo/inputmethod/keyboard/layout/tests/KeyboardLayoutSetSubtypesCountTests.java
@@ -33,7 +33,7 @@ public class KeyboardLayoutSetSubtypesCountTests extends KeyboardLayoutSetTestsB
 
     @Override
     protected int getKeyboardThemeForTests() {
-        return KeyboardTheme.THEME_ID_KLP;
+        return KeyboardTheme.THEME_ID_LXX_LIGHT;
     }
 
     private static String toString(final ArrayList<InputMethodSubtype> subtypeList) {
diff --git a/tests/src/org/futo/inputmethod/keyboard/layout/tests/LayoutTestsBase.java b/tests/src/org/futo/inputmethod/keyboard/layout/tests/LayoutTestsBase.java
index 1e78ca1aa..11521b9b5 100644
--- a/tests/src/org/futo/inputmethod/keyboard/layout/tests/LayoutTestsBase.java
+++ b/tests/src/org/futo/inputmethod/keyboard/layout/tests/LayoutTestsBase.java
@@ -60,7 +60,7 @@ abstract class LayoutTestsBase extends KeyboardLayoutSetTestsBase {
 
     @Override
     protected int getKeyboardThemeForTests() {
-        return KeyboardTheme.THEME_ID_KLP;
+        return KeyboardTheme.THEME_ID_LXX_LIGHT;
     }
 
     // Those helper methods have a lower case name to be readable when defining expected keyboard