diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_active_ics_dark.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_active_ics_dark.9.png
deleted file mode 100644
index 9aa8db60e..000000000
Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_active_ics_dark.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_on_ics_dark.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_on_ics_dark.9.png
deleted file mode 100644
index 9f4587b4a..000000000
Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_on_ics_dark.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_popup_selected_ics.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_popup_selected_ics.9.png
deleted file mode 100644
index c2e8b3779..000000000
Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_popup_selected_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_ics_dark.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_ics_dark.9.png
deleted file mode 100644
index 7ec33dd20..000000000
Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_ics_dark.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_ics_light.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_ics_light.9.png
deleted file mode 100644
index 5612c51a1..000000000
Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_ics_light.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_off_ics_dark.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_off_ics_dark.9.png
deleted file mode 100644
index 655bc01b1..000000000
Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_off_ics_dark.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_on_ics_dark.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_on_ics_dark.9.png
deleted file mode 100644
index 138e915d9..000000000
Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_on_ics_dark.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/emoji_category_tab_selected_holo_blue.9.png b/app/src/main/res/drawable-hdpi/emoji_category_tab_selected_holo_blue.9.png
deleted file mode 100644
index 9138cef9c..000000000
Binary files a/app/src/main/res/drawable-hdpi/emoji_category_tab_selected_holo_blue.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_add_circle_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_add_circle_white_24dp.webp
deleted file mode 100644
index b04988804..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_add_circle_white_24dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/keyboard_key_feedback_background_ics.9.png b/app/src/main/res/drawable-hdpi/keyboard_key_feedback_background_ics.9.png
deleted file mode 100644
index 28b406a5c..000000000
Binary files a/app/src/main/res/drawable-hdpi/keyboard_key_feedback_background_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/keyboard_key_feedback_left_background_ics.9.png b/app/src/main/res/drawable-hdpi/keyboard_key_feedback_left_background_ics.9.png
deleted file mode 100644
index e42cd88dc..000000000
Binary files a/app/src/main/res/drawable-hdpi/keyboard_key_feedback_left_background_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/keyboard_key_feedback_left_more_background_ics.9.png b/app/src/main/res/drawable-hdpi/keyboard_key_feedback_left_more_background_ics.9.png
deleted file mode 100644
index 160344073..000000000
Binary files a/app/src/main/res/drawable-hdpi/keyboard_key_feedback_left_more_background_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/keyboard_key_feedback_more_background_ics.9.png b/app/src/main/res/drawable-hdpi/keyboard_key_feedback_more_background_ics.9.png
deleted file mode 100644
index a40d4277c..000000000
Binary files a/app/src/main/res/drawable-hdpi/keyboard_key_feedback_more_background_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/keyboard_key_feedback_right_background_ics.9.png b/app/src/main/res/drawable-hdpi/keyboard_key_feedback_right_background_ics.9.png
deleted file mode 100644
index 1f6807376..000000000
Binary files a/app/src/main/res/drawable-hdpi/keyboard_key_feedback_right_background_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/keyboard_key_feedback_right_more_background_ics.9.png b/app/src/main/res/drawable-hdpi/keyboard_key_feedback_right_more_background_ics.9.png
deleted file mode 100644
index ec53593d9..000000000
Binary files a/app/src/main/res/drawable-hdpi/keyboard_key_feedback_right_more_background_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_holo_blue.9.png b/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_holo_blue.9.png
deleted file mode 100644
index 53d7b6fb3..000000000
Binary files a/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_holo_blue.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_space.webp b/app/src/main/res/drawable-hdpi/sym_keyboard_space.webp
deleted file mode 100644
index 685c05d9a..000000000
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_space.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/unbundled_check_02.webp b/app/src/main/res/drawable-hdpi/unbundled_check_02.webp
deleted file mode 100644
index 4ae0ee7c0..000000000
Binary files a/app/src/main/res/drawable-hdpi/unbundled_check_02.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/unbundled_earth_02.webp b/app/src/main/res/drawable-hdpi/unbundled_earth_02.webp
deleted file mode 100644
index eea0f1791..000000000
Binary files a/app/src/main/res/drawable-hdpi/unbundled_earth_02.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/unbundled_key_02.webp b/app/src/main/res/drawable-hdpi/unbundled_key_02.webp
deleted file mode 100644
index 65f668e40..000000000
Binary files a/app/src/main/res/drawable-hdpi/unbundled_key_02.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/unbundled_select_02.webp b/app/src/main/res/drawable-hdpi/unbundled_select_02.webp
deleted file mode 100644
index fc69e3723..000000000
Binary files a/app/src/main/res/drawable-hdpi/unbundled_select_02.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_active_ics_dark.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_active_ics_dark.9.png
deleted file mode 100644
index e810c7789..000000000
Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_active_ics_dark.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_on_ics_dark.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_on_ics_dark.9.png
deleted file mode 100644
index f3fc64114..000000000
Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_on_ics_dark.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_popup_selected_ics.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_popup_selected_ics.9.png
deleted file mode 100644
index 93a6e7921..000000000
Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_popup_selected_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_ics_dark.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_ics_dark.9.png
deleted file mode 100644
index 8f340d355..000000000
Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_ics_dark.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_ics_light.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_ics_light.9.png
deleted file mode 100644
index c39dd4a94..000000000
Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_ics_light.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_off_ics_dark.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_off_ics_dark.9.png
deleted file mode 100644
index 53ea5f894..000000000
Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_off_ics_dark.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_on_ics_dark.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_on_ics_dark.9.png
deleted file mode 100644
index 69c84e7ec..000000000
Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_on_ics_dark.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/emoji_category_tab_selected_holo_blue.9.png b/app/src/main/res/drawable-mdpi/emoji_category_tab_selected_holo_blue.9.png
deleted file mode 100644
index 1731b46ad..000000000
Binary files a/app/src/main/res/drawable-mdpi/emoji_category_tab_selected_holo_blue.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_add_circle_white_24dp.webp b/app/src/main/res/drawable-mdpi/ic_add_circle_white_24dp.webp
deleted file mode 100644
index 313c01f13..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_add_circle_white_24dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/keyboard_key_feedback_background_ics.9.png b/app/src/main/res/drawable-mdpi/keyboard_key_feedback_background_ics.9.png
deleted file mode 100644
index 7a9f640d1..000000000
Binary files a/app/src/main/res/drawable-mdpi/keyboard_key_feedback_background_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/keyboard_key_feedback_left_background_ics.9.png b/app/src/main/res/drawable-mdpi/keyboard_key_feedback_left_background_ics.9.png
deleted file mode 100644
index 5b06f09bb..000000000
Binary files a/app/src/main/res/drawable-mdpi/keyboard_key_feedback_left_background_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/keyboard_key_feedback_left_more_background_ics.9.png b/app/src/main/res/drawable-mdpi/keyboard_key_feedback_left_more_background_ics.9.png
deleted file mode 100644
index fd992d6f4..000000000
Binary files a/app/src/main/res/drawable-mdpi/keyboard_key_feedback_left_more_background_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/keyboard_key_feedback_more_background_ics.9.png b/app/src/main/res/drawable-mdpi/keyboard_key_feedback_more_background_ics.9.png
deleted file mode 100644
index 128dcd6ad..000000000
Binary files a/app/src/main/res/drawable-mdpi/keyboard_key_feedback_more_background_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/keyboard_key_feedback_right_background_ics.9.png b/app/src/main/res/drawable-mdpi/keyboard_key_feedback_right_background_ics.9.png
deleted file mode 100644
index 0b08d1747..000000000
Binary files a/app/src/main/res/drawable-mdpi/keyboard_key_feedback_right_background_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/keyboard_key_feedback_right_more_background_ics.9.png b/app/src/main/res/drawable-mdpi/keyboard_key_feedback_right_more_background_ics.9.png
deleted file mode 100644
index cf0b33c1d..000000000
Binary files a/app/src/main/res/drawable-mdpi/keyboard_key_feedback_right_more_background_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_holo_blue.9.png b/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_holo_blue.9.png
deleted file mode 100644
index 61988a8e1..000000000
Binary files a/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_holo_blue.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_space.webp b/app/src/main/res/drawable-mdpi/sym_keyboard_space.webp
deleted file mode 100644
index 93a438767..000000000
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_space.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/unbundled_check_02.webp b/app/src/main/res/drawable-mdpi/unbundled_check_02.webp
deleted file mode 100644
index c0cd63e91..000000000
Binary files a/app/src/main/res/drawable-mdpi/unbundled_check_02.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/unbundled_earth_02.webp b/app/src/main/res/drawable-mdpi/unbundled_earth_02.webp
deleted file mode 100644
index 59e805f35..000000000
Binary files a/app/src/main/res/drawable-mdpi/unbundled_earth_02.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/unbundled_key_02.webp b/app/src/main/res/drawable-mdpi/unbundled_key_02.webp
deleted file mode 100644
index de5b9beff..000000000
Binary files a/app/src/main/res/drawable-mdpi/unbundled_key_02.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/unbundled_select_02.webp b/app/src/main/res/drawable-mdpi/unbundled_select_02.webp
deleted file mode 100644
index c8043fac1..000000000
Binary files a/app/src/main/res/drawable-mdpi/unbundled_select_02.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_active_ics_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_active_ics_dark.9.png
deleted file mode 100644
index d990c0258..000000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_active_ics_dark.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_on_ics_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_on_ics_dark.9.png
deleted file mode 100644
index ab8fb2e86..000000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_on_ics_dark.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_popup_selected_ics.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_popup_selected_ics.9.png
deleted file mode 100644
index 0c7bfdace..000000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_popup_selected_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_ics_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_ics_dark.9.png
deleted file mode 100644
index 3871689ef..000000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_ics_dark.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_ics_light.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_ics_light.9.png
deleted file mode 100644
index c23a4b225..000000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_ics_light.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_off_ics_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_off_ics_dark.9.png
deleted file mode 100644
index 912506368..000000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_off_ics_dark.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_on_ics_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_on_ics_dark.9.png
deleted file mode 100644
index 35ce67fdc..000000000
Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_on_ics_dark.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/emoji_category_tab_selected_holo_blue.9.png b/app/src/main/res/drawable-xhdpi/emoji_category_tab_selected_holo_blue.9.png
deleted file mode 100644
index 11bc966b0..000000000
Binary files a/app/src/main/res/drawable-xhdpi/emoji_category_tab_selected_holo_blue.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_add_circle_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_add_circle_white_24dp.webp
deleted file mode 100644
index 0c4468edc..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_add_circle_white_24dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_background_ics.9.png b/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_background_ics.9.png
deleted file mode 100644
index d999127f2..000000000
Binary files a/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_background_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_left_background_ics.9.png b/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_left_background_ics.9.png
deleted file mode 100644
index c4d694136..000000000
Binary files a/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_left_background_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_ics.9.png b/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_ics.9.png
deleted file mode 100644
index 5429c1785..000000000
Binary files a/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_more_background_ics.9.png b/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_more_background_ics.9.png
deleted file mode 100644
index 5135a0869..000000000
Binary files a/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_more_background_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_right_background_ics.9.png b/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_right_background_ics.9.png
deleted file mode 100644
index 19a77a29f..000000000
Binary files a/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_right_background_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_ics.9.png b/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_ics.9.png
deleted file mode 100644
index ae2ffff8e..000000000
Binary files a/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_holo_blue.9.png b/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_holo_blue.9.png
deleted file mode 100644
index 1dee699f4..000000000
Binary files a/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_holo_blue.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_space.webp b/app/src/main/res/drawable-xhdpi/sym_keyboard_space.webp
deleted file mode 100644
index 38a95b654..000000000
Binary files a/app/src/main/res/drawable-xhdpi/sym_keyboard_space.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/unbundled_check_02.webp b/app/src/main/res/drawable-xhdpi/unbundled_check_02.webp
deleted file mode 100644
index 180998dd0..000000000
Binary files a/app/src/main/res/drawable-xhdpi/unbundled_check_02.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/unbundled_earth_02.webp b/app/src/main/res/drawable-xhdpi/unbundled_earth_02.webp
deleted file mode 100644
index f62fb7ce5..000000000
Binary files a/app/src/main/res/drawable-xhdpi/unbundled_earth_02.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/unbundled_key_02.webp b/app/src/main/res/drawable-xhdpi/unbundled_key_02.webp
deleted file mode 100644
index 92b3f35f7..000000000
Binary files a/app/src/main/res/drawable-xhdpi/unbundled_key_02.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/unbundled_select_02.webp b/app/src/main/res/drawable-xhdpi/unbundled_select_02.webp
deleted file mode 100644
index f032bba12..000000000
Binary files a/app/src/main/res/drawable-xhdpi/unbundled_select_02.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_ics_dark.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_ics_dark.9.png
deleted file mode 100644
index 680421eaf..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_ics_dark.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_on_ics_dark.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_on_ics_dark.9.png
deleted file mode 100644
index 40f5011c0..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_on_ics_dark.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_ics.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_ics.9.png
deleted file mode 100644
index 6d2af5942..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_ics_dark.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_ics_dark.9.png
deleted file mode 100644
index 6ff6319d3..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_ics_dark.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_ics_light.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_ics_light.9.png
deleted file mode 100644
index 3c17c5eec..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_ics_light.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_ics_dark.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_ics_dark.9.png
deleted file mode 100644
index 818ea70fd..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_ics_dark.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_ics_dark.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_ics_dark.9.png
deleted file mode 100644
index a476d2a9e..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_ics_dark.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/emoji_category_tab_selected_holo_blue.9.png b/app/src/main/res/drawable-xxhdpi/emoji_category_tab_selected_holo_blue.9.png
deleted file mode 100644
index b13ee2b6a..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/emoji_category_tab_selected_holo_blue.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_circle_white_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_add_circle_white_24dp.webp
deleted file mode 100644
index 1c2d6e604..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_add_circle_white_24dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_background_ics.9.png b/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_background_ics.9.png
deleted file mode 100644
index bd1ef3cd9..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_background_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_left_background_ics.9.png b/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_left_background_ics.9.png
deleted file mode 100644
index 65af4b569..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_left_background_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_ics.9.png b/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_ics.9.png
deleted file mode 100644
index ac6750dcb..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_more_background_ics.9.png b/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_more_background_ics.9.png
deleted file mode 100644
index cea7c05f6..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_more_background_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_right_background_ics.9.png b/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_right_background_ics.9.png
deleted file mode 100644
index 520fa7c6b..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_right_background_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_ics.9.png b/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_ics.9.png
deleted file mode 100644
index eee221758..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_ics.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_holo_blue.9.png b/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_holo_blue.9.png
deleted file mode 100644
index 721c24400..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_holo_blue.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_add_circle_white_24dp.webp b/app/src/main/res/drawable-xxxhdpi/ic_add_circle_white_24dp.webp
deleted file mode 100644
index 133135344..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_add_circle_white_24dp.webp and /dev/null differ
diff --git a/app/src/main/res/drawable/btn_keyboard_key_functional_holo_blue.xml b/app/src/main/res/drawable/btn_keyboard_key_functional_holo_blue.xml
deleted file mode 100644
index 846bccc49..000000000
--- a/app/src/main/res/drawable/btn_keyboard_key_functional_holo_blue.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/app/src/main/res/drawable/btn_keyboard_key_holo_blue.xml b/app/src/main/res/drawable/btn_keyboard_key_holo_blue.xml
deleted file mode 100644
index bacd5d78f..000000000
--- a/app/src/main/res/drawable/btn_keyboard_key_holo_blue.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/app/src/main/res/drawable/btn_keyboard_key_popup_holo_blue.xml b/app/src/main/res/drawable/btn_keyboard_key_popup_holo_blue.xml
deleted file mode 100644
index 17d646b8f..000000000
--- a/app/src/main/res/drawable/btn_keyboard_key_popup_holo_blue.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/app/src/main/res/drawable/btn_keyboard_spacebar_holo_blue.xml b/app/src/main/res/drawable/btn_keyboard_spacebar_holo_blue.xml
deleted file mode 100644
index 229f7a965..000000000
--- a/app/src/main/res/drawable/btn_keyboard_spacebar_holo_blue.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/app/src/main/res/drawable/btn_suggestion_holo_blue.xml b/app/src/main/res/drawable/btn_suggestion_holo_blue.xml
deleted file mode 100644
index 8f528ee4b..000000000
--- a/app/src/main/res/drawable/btn_suggestion_holo_blue.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/app/src/main/res/drawable/ic_setup_finish.xml b/app/src/main/res/drawable/ic_setup_finish.xml
index 8ac8a86d1..f02538bca 100644
--- a/app/src/main/res/drawable/ic_setup_finish.xml
+++ b/app/src/main/res/drawable/ic_setup_finish.xml
@@ -25,6 +25,9 @@
     <item
         android:state_pressed="true"
         android:drawable="@drawable/unbundled_check_01" />
-    <item
-        android:drawable="@drawable/unbundled_check_02" />
+    <item>
+        <bitmap
+            android:src="@drawable/unbundled_check_01"
+            android:tint="@color/accent"/>
+    </item>
 </selector>
diff --git a/app/src/main/res/drawable/ic_setup_step1.xml b/app/src/main/res/drawable/ic_setup_step1.xml
index e26afb3ca..616123167 100644
--- a/app/src/main/res/drawable/ic_setup_step1.xml
+++ b/app/src/main/res/drawable/ic_setup_step1.xml
@@ -25,6 +25,9 @@
     <item
         android:state_pressed="true"
         android:drawable="@drawable/unbundled_key_01" />
-    <item
-        android:drawable="@drawable/unbundled_key_02" />
+    <item>
+        <bitmap
+            android:src="@drawable/unbundled_key_01"
+            android:tint="@color/accent"/>
+    </item>
 </selector>
diff --git a/app/src/main/res/drawable/ic_setup_step2.xml b/app/src/main/res/drawable/ic_setup_step2.xml
index 46db29306..052026a80 100644
--- a/app/src/main/res/drawable/ic_setup_step2.xml
+++ b/app/src/main/res/drawable/ic_setup_step2.xml
@@ -25,6 +25,9 @@
     <item
         android:state_pressed="true"
         android:drawable="@drawable/unbundled_select_01" />
-    <item
-        android:drawable="@drawable/unbundled_select_02" />
+    <item>
+        <bitmap
+            android:src="@drawable/unbundled_select_01"
+            android:tint="@color/accent"/>
+    </item>
 </selector>
diff --git a/app/src/main/res/drawable/ic_setup_step3.xml b/app/src/main/res/drawable/ic_setup_step3.xml
index 4ff9fd933..b4449e350 100644
--- a/app/src/main/res/drawable/ic_setup_step3.xml
+++ b/app/src/main/res/drawable/ic_setup_step3.xml
@@ -25,6 +25,9 @@
     <item
         android:state_pressed="true"
         android:drawable="@drawable/unbundled_earth_01" />
-    <item
-        android:drawable="@drawable/unbundled_earth_02" />
+    <item>
+        <bitmap
+            android:src="@drawable/unbundled_earth_01"
+            android:tint="@color/accent"/>
+    </item>
 </selector>
diff --git a/app/src/main/res/drawable/keyboard_key_feedback_holo_blue.xml b/app/src/main/res/drawable/keyboard_key_feedback_holo_blue.xml
deleted file mode 100644
index cd42a1433..000000000
--- a/app/src/main/res/drawable/keyboard_key_feedback_holo_blue.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-auto"
->
-    <!-- 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>