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
index b8bb10f24..5014c9472 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_off_lxx_dark.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_normal_off_lxx_dark.9.png 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
index 0802b11f8..79594c872 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_off_lxx_light.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_normal_off_lxx_light.9.png 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
index 0ef8cc764..31cd37925 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png 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
index 45d586570..b8717e668 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_light.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_light.9.png 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
index bfc981edb..be0812fdf 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png 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
index 1b52bcc85..4209ef92b 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_pressed_off_lxx_light.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_pressed_off_lxx_light.9.png 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
index fbb4f8c43..a36ca323d 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png 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
index 1bc2a233f..c6a474a8e 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_pressed_on_lxx_light.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_pressed_on_lxx_light.9.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_emoticons_activated_lxx_dark.png b/java/res/drawable-hdpi/ic_emoji_emoticons_activated_lxx_dark.png
new file mode 100644
index 000000000..d24060cdc
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_emoticons_activated_lxx_dark.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_emoticons_activated_lxx_light.png b/java/res/drawable-hdpi/ic_emoji_emoticons_activated_lxx_light.png
new file mode 100644
index 000000000..98ab99339
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_emoticons_activated_lxx_light.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_emoticons_normal_lxx_dark.png b/java/res/drawable-hdpi/ic_emoji_emoticons_normal_lxx_dark.png
new file mode 100644
index 000000000..abbd973db
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_emoticons_normal_lxx_dark.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_emoticons_normal_lxx_light.png b/java/res/drawable-hdpi/ic_emoji_emoticons_normal_lxx_light.png
new file mode 100644
index 000000000..89eac64a2
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_emoticons_normal_lxx_light.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_nature_activated_lxx_dark.png b/java/res/drawable-hdpi/ic_emoji_nature_activated_lxx_dark.png
new file mode 100644
index 000000000..7daf029c9
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_nature_activated_lxx_dark.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_nature_activated_lxx_light.png b/java/res/drawable-hdpi/ic_emoji_nature_activated_lxx_light.png
new file mode 100644
index 000000000..1c2432036
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_nature_activated_lxx_light.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_nature_normal_lxx_dark.png b/java/res/drawable-hdpi/ic_emoji_nature_normal_lxx_dark.png
new file mode 100644
index 000000000..5e9e79623
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_nature_normal_lxx_dark.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_nature_normal_lxx_light.png b/java/res/drawable-hdpi/ic_emoji_nature_normal_lxx_light.png
new file mode 100644
index 000000000..a567fdbd0
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_nature_normal_lxx_light.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_objects_activated_lxx_dark.png b/java/res/drawable-hdpi/ic_emoji_objects_activated_lxx_dark.png
new file mode 100644
index 000000000..04d64f308
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_objects_activated_lxx_dark.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_objects_activated_lxx_light.png b/java/res/drawable-hdpi/ic_emoji_objects_activated_lxx_light.png
new file mode 100644
index 000000000..01d68d5ef
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_objects_activated_lxx_light.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_objects_normal_lxx_dark.png b/java/res/drawable-hdpi/ic_emoji_objects_normal_lxx_dark.png
new file mode 100644
index 000000000..a9d79f153
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_objects_normal_lxx_dark.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_objects_normal_lxx_light.png b/java/res/drawable-hdpi/ic_emoji_objects_normal_lxx_light.png
new file mode 100644
index 000000000..a040f0d22
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_objects_normal_lxx_light.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_people_activated_lxx_dark.png b/java/res/drawable-hdpi/ic_emoji_people_activated_lxx_dark.png
new file mode 100644
index 000000000..47e673afe
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_people_activated_lxx_dark.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_people_activated_lxx_light.png b/java/res/drawable-hdpi/ic_emoji_people_activated_lxx_light.png
new file mode 100644
index 000000000..ad933ca01
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_people_activated_lxx_light.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_people_normal_lxx_dark.png b/java/res/drawable-hdpi/ic_emoji_people_normal_lxx_dark.png
new file mode 100644
index 000000000..a894c60b0
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_people_normal_lxx_dark.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_people_normal_lxx_light.png b/java/res/drawable-hdpi/ic_emoji_people_normal_lxx_light.png
new file mode 100644
index 000000000..2d8bdf884
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_people_normal_lxx_light.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_places_activated_lxx_dark.png b/java/res/drawable-hdpi/ic_emoji_places_activated_lxx_dark.png
new file mode 100644
index 000000000..c9b81e1de
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_places_activated_lxx_dark.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_places_activated_lxx_light.png b/java/res/drawable-hdpi/ic_emoji_places_activated_lxx_light.png
new file mode 100644
index 000000000..1c031c0bc
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_places_activated_lxx_light.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_places_normal_lxx_dark.png b/java/res/drawable-hdpi/ic_emoji_places_normal_lxx_dark.png
new file mode 100644
index 000000000..36fbf9150
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_places_normal_lxx_dark.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_places_normal_lxx_light.png b/java/res/drawable-hdpi/ic_emoji_places_normal_lxx_light.png
new file mode 100644
index 000000000..3bd317c19
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_places_normal_lxx_light.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_recents_activated_lxx_dark.png b/java/res/drawable-hdpi/ic_emoji_recents_activated_lxx_dark.png
new file mode 100644
index 000000000..43d3f304c
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_recents_activated_lxx_dark.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_recents_activated_lxx_light.png b/java/res/drawable-hdpi/ic_emoji_recents_activated_lxx_light.png
new file mode 100644
index 000000000..3a6b3acff
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_recents_activated_lxx_light.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_recents_normal_lxx_dark.png b/java/res/drawable-hdpi/ic_emoji_recents_normal_lxx_dark.png
new file mode 100644
index 000000000..a07f6069c
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_recents_normal_lxx_dark.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_recents_normal_lxx_light.png b/java/res/drawable-hdpi/ic_emoji_recents_normal_lxx_light.png
new file mode 100644
index 000000000..d86c1b98a
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_recents_normal_lxx_light.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_symbols_activated_lxx_dark.png b/java/res/drawable-hdpi/ic_emoji_symbols_activated_lxx_dark.png
new file mode 100644
index 000000000..1c01e90f9
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_symbols_activated_lxx_dark.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_symbols_activated_lxx_light.png b/java/res/drawable-hdpi/ic_emoji_symbols_activated_lxx_light.png
new file mode 100644
index 000000000..e57ad369b
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_symbols_activated_lxx_light.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_symbols_normal_lxx_dark.png b/java/res/drawable-hdpi/ic_emoji_symbols_normal_lxx_dark.png
new file mode 100644
index 000000000..1218d4801
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_symbols_normal_lxx_dark.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_symbols_normal_lxx_light.png b/java/res/drawable-hdpi/ic_emoji_symbols_normal_lxx_light.png
new file mode 100644
index 000000000..35fc594f6
Binary files /dev/null and b/java/res/drawable-hdpi/ic_emoji_symbols_normal_lxx_light.png 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
index e49efe5dc..306e4554c 100644
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_dark.9.png and b/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_dark.9.png 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
index 615a40a3d..867f5516d 100644
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_light.9.png and b/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_light.9.png 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
index a0511a1a1..b3e6ee784 100644
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_dark.9.png and b/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_dark.9.png 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
index c5871f699..827f80f13 100644
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_light.9.png and b/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_light.9.png 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
index c7b147f5f..33d80877d 100644
Binary files a/java/res/drawable-hdpi/keyboard_popup_panel_background_lxx_dark.9.png and b/java/res/drawable-hdpi/keyboard_popup_panel_background_lxx_dark.9.png 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
index 41b0a1b35..9b6f1bdce 100644
Binary files a/java/res/drawable-hdpi/keyboard_popup_panel_background_lxx_light.9.png and b/java/res/drawable-hdpi/keyboard_popup_panel_background_lxx_light.9.png 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
index 68a2270a5..e94f0b560 100644
Binary files a/java/res/drawable-hdpi/suggestions_strip_divider_lxx_dark.png and b/java/res/drawable-hdpi/suggestions_strip_divider_lxx_dark.png 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
index 12485ef1a..9b0f20d62 100644
Binary files a/java/res/drawable-hdpi/suggestions_strip_divider_lxx_light.png and b/java/res/drawable-hdpi/suggestions_strip_divider_lxx_light.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_delete_lxx_dark.png b/java/res/drawable-hdpi/sym_keyboard_delete_lxx_dark.png
index 2e68b2016..e0f99cae4 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_delete_lxx_dark.png and b/java/res/drawable-hdpi/sym_keyboard_delete_lxx_dark.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_delete_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_delete_lxx_light.png
index e17d29715..120d066d8 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_delete_lxx_light.png and b/java/res/drawable-hdpi/sym_keyboard_delete_lxx_light.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_language_switch_lxx_dark.png b/java/res/drawable-hdpi/sym_keyboard_language_switch_lxx_dark.png
index 4fc82d6d4..19c8b88ff 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_language_switch_lxx_dark.png and b/java/res/drawable-hdpi/sym_keyboard_language_switch_lxx_dark.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_language_switch_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_language_switch_lxx_light.png
index 1c7af2018..6f8c177dc 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_language_switch_lxx_light.png and b/java/res/drawable-hdpi/sym_keyboard_language_switch_lxx_light.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_next_lxx_dark.png b/java/res/drawable-hdpi/sym_keyboard_next_lxx_dark.png
index 8a88a90d7..77f63ef3d 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_next_lxx_dark.png and b/java/res/drawable-hdpi/sym_keyboard_next_lxx_dark.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_next_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_next_lxx_light.png
index 70679b028..c27d0c6b2 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_next_lxx_light.png and b/java/res/drawable-hdpi/sym_keyboard_next_lxx_light.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_previous_lxx_dark.png b/java/res/drawable-hdpi/sym_keyboard_previous_lxx_dark.png
index ee804abce..fa7034be8 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_previous_lxx_dark.png and b/java/res/drawable-hdpi/sym_keyboard_previous_lxx_dark.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_previous_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_previous_lxx_light.png
index 952dd4fd2..32ef35826 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_previous_lxx_light.png and b/java/res/drawable-hdpi/sym_keyboard_previous_lxx_light.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_settings_lxx_dark.png b/java/res/drawable-hdpi/sym_keyboard_settings_lxx_dark.png
index 23eac1674..f17a77328 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_settings_lxx_dark.png and b/java/res/drawable-hdpi/sym_keyboard_settings_lxx_dark.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_settings_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_settings_lxx_light.png
index 144b15b0c..4230aa15e 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_settings_lxx_light.png and b/java/res/drawable-hdpi/sym_keyboard_settings_lxx_light.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_shift_lxx_dark.png b/java/res/drawable-hdpi/sym_keyboard_shift_lxx_dark.png
index 427f01468..a9f6f5617 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_shift_lxx_dark.png and b/java/res/drawable-hdpi/sym_keyboard_shift_lxx_dark.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_shift_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_shift_lxx_light.png
index a46d65383..acedd4b6e 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_shift_lxx_light.png and b/java/res/drawable-hdpi/sym_keyboard_shift_lxx_light.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_spacebar_lxx_dark.9.png b/java/res/drawable-hdpi/sym_keyboard_spacebar_lxx_dark.9.png
index c57cb73a5..32311666f 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_spacebar_lxx_dark.9.png and b/java/res/drawable-hdpi/sym_keyboard_spacebar_lxx_dark.9.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_spacebar_lxx_light.9.png b/java/res/drawable-hdpi/sym_keyboard_spacebar_lxx_light.9.png
index c27a36e81..1256b8b21 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_spacebar_lxx_light.9.png and b/java/res/drawable-hdpi/sym_keyboard_spacebar_lxx_light.9.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_tab_lxx_dark.png b/java/res/drawable-hdpi/sym_keyboard_tab_lxx_dark.png
new file mode 100644
index 000000000..eff70dabb
Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_tab_lxx_dark.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_tab_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_tab_lxx_light.png
new file mode 100644
index 000000000..a0c445e08
Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_tab_lxx_light.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_voice_lxx_dark.png b/java/res/drawable-hdpi/sym_keyboard_voice_lxx_dark.png
index 80d12481a..faf227687 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_voice_lxx_dark.png and b/java/res/drawable-hdpi/sym_keyboard_voice_lxx_dark.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_voice_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_voice_lxx_light.png
index d6b070eb6..26cbe56e2 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_voice_lxx_light.png and b/java/res/drawable-hdpi/sym_keyboard_voice_lxx_light.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_voice_off_lxx_dark.png b/java/res/drawable-hdpi/sym_keyboard_voice_off_lxx_dark.png
index e2bd604b8..ba733cfc6 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_voice_off_lxx_dark.png and b/java/res/drawable-hdpi/sym_keyboard_voice_off_lxx_dark.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_voice_off_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_voice_off_lxx_light.png
index d33ab4e88..fb8f5aa07 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_voice_off_lxx_light.png and b/java/res/drawable-hdpi/sym_keyboard_voice_off_lxx_light.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_zwj_lxx_dark.png b/java/res/drawable-hdpi/sym_keyboard_zwj_lxx_dark.png
new file mode 100644
index 000000000..a8424f067
Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_zwj_lxx_dark.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_zwj_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_zwj_lxx_light.png
new file mode 100644
index 000000000..26b831794
Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_zwj_lxx_light.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_zwnj_lxx_dark.png b/java/res/drawable-hdpi/sym_keyboard_zwnj_lxx_dark.png
new file mode 100644
index 000000000..9816ef543
Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_zwnj_lxx_dark.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_zwnj_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_zwnj_lxx_light.png
new file mode 100644
index 000000000..0a5f92705
Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_zwnj_lxx_light.png 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
index bb9fc5910..bdf2e49f1 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_normal_off_lxx_dark.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_normal_off_lxx_dark.9.png 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
index afcb4f9b1..80cf6faba 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_normal_off_lxx_light.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_normal_off_lxx_light.9.png 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
index cf12a8c1f..81c1d71bf 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png 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
index e388cfb2f..8fff67bf1 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_light.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_light.9.png 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
index 1b0ed0c97..ca17d52ed 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png 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
index d8e4355ce..19aabf8a6 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_pressed_off_lxx_light.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_pressed_off_lxx_light.9.png 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
index f990a9e7c..1c2c101e9 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png 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
index b9a42fa72..edbaa8373 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_pressed_on_lxx_light.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_pressed_on_lxx_light.9.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_emoticons_activated_lxx_dark.png b/java/res/drawable-mdpi/ic_emoji_emoticons_activated_lxx_dark.png
new file mode 100644
index 000000000..6225b61d5
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_emoticons_activated_lxx_dark.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_emoticons_activated_lxx_light.png b/java/res/drawable-mdpi/ic_emoji_emoticons_activated_lxx_light.png
new file mode 100644
index 000000000..d089e6ebd
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_emoticons_activated_lxx_light.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_emoticons_normal_lxx_dark.png b/java/res/drawable-mdpi/ic_emoji_emoticons_normal_lxx_dark.png
new file mode 100644
index 000000000..324e5e2e9
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_emoticons_normal_lxx_dark.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_emoticons_normal_lxx_light.png b/java/res/drawable-mdpi/ic_emoji_emoticons_normal_lxx_light.png
new file mode 100644
index 000000000..c2a5046e9
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_emoticons_normal_lxx_light.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_nature_activated_lxx_dark.png b/java/res/drawable-mdpi/ic_emoji_nature_activated_lxx_dark.png
new file mode 100644
index 000000000..848d0cecc
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_nature_activated_lxx_dark.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_nature_activated_lxx_light.png b/java/res/drawable-mdpi/ic_emoji_nature_activated_lxx_light.png
new file mode 100644
index 000000000..2e1674ba5
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_nature_activated_lxx_light.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_nature_normal_lxx_dark.png b/java/res/drawable-mdpi/ic_emoji_nature_normal_lxx_dark.png
new file mode 100644
index 000000000..18d20be5a
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_nature_normal_lxx_dark.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_nature_normal_lxx_light.png b/java/res/drawable-mdpi/ic_emoji_nature_normal_lxx_light.png
new file mode 100644
index 000000000..7cf36c47e
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_nature_normal_lxx_light.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_objects_activated_lxx_dark.png b/java/res/drawable-mdpi/ic_emoji_objects_activated_lxx_dark.png
new file mode 100644
index 000000000..4006697f6
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_objects_activated_lxx_dark.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_objects_activated_lxx_light.png b/java/res/drawable-mdpi/ic_emoji_objects_activated_lxx_light.png
new file mode 100644
index 000000000..d6ba9135b
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_objects_activated_lxx_light.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_objects_normal_lxx_dark.png b/java/res/drawable-mdpi/ic_emoji_objects_normal_lxx_dark.png
new file mode 100644
index 000000000..ceeaa191c
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_objects_normal_lxx_dark.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_objects_normal_lxx_light.png b/java/res/drawable-mdpi/ic_emoji_objects_normal_lxx_light.png
new file mode 100644
index 000000000..5eb839ba1
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_objects_normal_lxx_light.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_people_activated_lxx_dark.png b/java/res/drawable-mdpi/ic_emoji_people_activated_lxx_dark.png
new file mode 100644
index 000000000..952b570f8
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_people_activated_lxx_dark.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_people_activated_lxx_light.png b/java/res/drawable-mdpi/ic_emoji_people_activated_lxx_light.png
new file mode 100644
index 000000000..d0d72dbdb
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_people_activated_lxx_light.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_people_normal_lxx_dark.png b/java/res/drawable-mdpi/ic_emoji_people_normal_lxx_dark.png
new file mode 100644
index 000000000..1f46b9b7e
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_people_normal_lxx_dark.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_people_normal_lxx_light.png b/java/res/drawable-mdpi/ic_emoji_people_normal_lxx_light.png
new file mode 100644
index 000000000..8b7c1a385
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_people_normal_lxx_light.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_places_activated_lxx_dark.png b/java/res/drawable-mdpi/ic_emoji_places_activated_lxx_dark.png
new file mode 100644
index 000000000..fadb7511f
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_places_activated_lxx_dark.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_places_activated_lxx_light.png b/java/res/drawable-mdpi/ic_emoji_places_activated_lxx_light.png
new file mode 100644
index 000000000..5c0e40d57
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_places_activated_lxx_light.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_places_normal_lxx_dark.png b/java/res/drawable-mdpi/ic_emoji_places_normal_lxx_dark.png
new file mode 100644
index 000000000..5eed3d9c8
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_places_normal_lxx_dark.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_places_normal_lxx_light.png b/java/res/drawable-mdpi/ic_emoji_places_normal_lxx_light.png
new file mode 100644
index 000000000..fff799823
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_places_normal_lxx_light.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_recents_activated_lxx_dark.png b/java/res/drawable-mdpi/ic_emoji_recents_activated_lxx_dark.png
new file mode 100644
index 000000000..e6c8dc0f2
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_recents_activated_lxx_dark.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_recents_activated_lxx_light.png b/java/res/drawable-mdpi/ic_emoji_recents_activated_lxx_light.png
new file mode 100644
index 000000000..25ac3f5d9
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_recents_activated_lxx_light.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_recents_normal_lxx_dark.png b/java/res/drawable-mdpi/ic_emoji_recents_normal_lxx_dark.png
new file mode 100644
index 000000000..e660891fc
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_recents_normal_lxx_dark.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_recents_normal_lxx_light.png b/java/res/drawable-mdpi/ic_emoji_recents_normal_lxx_light.png
new file mode 100644
index 000000000..614d081ce
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_recents_normal_lxx_light.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_symbols_activated_lxx_dark.png b/java/res/drawable-mdpi/ic_emoji_symbols_activated_lxx_dark.png
new file mode 100644
index 000000000..5b71c5d8d
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_symbols_activated_lxx_dark.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_symbols_activated_lxx_light.png b/java/res/drawable-mdpi/ic_emoji_symbols_activated_lxx_light.png
new file mode 100644
index 000000000..724987984
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_symbols_activated_lxx_light.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_symbols_normal_lxx_dark.png b/java/res/drawable-mdpi/ic_emoji_symbols_normal_lxx_dark.png
new file mode 100644
index 000000000..f6db5e091
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_symbols_normal_lxx_dark.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_symbols_normal_lxx_light.png b/java/res/drawable-mdpi/ic_emoji_symbols_normal_lxx_light.png
new file mode 100644
index 000000000..5d7e9bff3
Binary files /dev/null and b/java/res/drawable-mdpi/ic_emoji_symbols_normal_lxx_light.png 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
index 8bd1343b7..4f6731f60 100644
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_dark.9.png and b/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_dark.9.png 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
index f97cfb913..14da5f919 100644
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_light.9.png and b/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_light.9.png 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
index 37e45fb28..9bca991b2 100644
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_dark.9.png and b/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_dark.9.png 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
index 1fe06f9fe..14f4b5f24 100644
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_light.9.png and b/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_light.9.png 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
index f12ba5f7f..71f16b035 100644
Binary files a/java/res/drawable-mdpi/keyboard_popup_panel_background_lxx_dark.9.png and b/java/res/drawable-mdpi/keyboard_popup_panel_background_lxx_dark.9.png 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
index 1edf94fbf..323aefb6f 100644
Binary files a/java/res/drawable-mdpi/keyboard_popup_panel_background_lxx_light.9.png and b/java/res/drawable-mdpi/keyboard_popup_panel_background_lxx_light.9.png 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
index c8afc6681..c06e73ca1 100644
Binary files a/java/res/drawable-mdpi/suggestions_strip_divider_lxx_dark.png and b/java/res/drawable-mdpi/suggestions_strip_divider_lxx_dark.png 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
index 051e66ccd..cc9d8edc1 100644
Binary files a/java/res/drawable-mdpi/suggestions_strip_divider_lxx_light.png and b/java/res/drawable-mdpi/suggestions_strip_divider_lxx_light.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_delete_lxx_dark.png b/java/res/drawable-mdpi/sym_keyboard_delete_lxx_dark.png
index ba74e5e14..cc4481961 100644
Binary files a/java/res/drawable-mdpi/sym_keyboard_delete_lxx_dark.png and b/java/res/drawable-mdpi/sym_keyboard_delete_lxx_dark.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_delete_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_delete_lxx_light.png
index 007b5ea49..8afc8178f 100644
Binary files a/java/res/drawable-mdpi/sym_keyboard_delete_lxx_light.png and b/java/res/drawable-mdpi/sym_keyboard_delete_lxx_light.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_language_switch_lxx_dark.png b/java/res/drawable-mdpi/sym_keyboard_language_switch_lxx_dark.png
index 44dc1b620..af60d4396 100644
Binary files a/java/res/drawable-mdpi/sym_keyboard_language_switch_lxx_dark.png and b/java/res/drawable-mdpi/sym_keyboard_language_switch_lxx_dark.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_language_switch_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_language_switch_lxx_light.png
index e1c1265d5..a061a0588 100644
Binary files a/java/res/drawable-mdpi/sym_keyboard_language_switch_lxx_light.png and b/java/res/drawable-mdpi/sym_keyboard_language_switch_lxx_light.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_next_lxx_dark.png b/java/res/drawable-mdpi/sym_keyboard_next_lxx_dark.png
index 414cb0d58..bea9d6f63 100644
Binary files a/java/res/drawable-mdpi/sym_keyboard_next_lxx_dark.png and b/java/res/drawable-mdpi/sym_keyboard_next_lxx_dark.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_next_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_next_lxx_light.png
index e18b1cf1c..78773ab25 100644
Binary files a/java/res/drawable-mdpi/sym_keyboard_next_lxx_light.png and b/java/res/drawable-mdpi/sym_keyboard_next_lxx_light.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_previous_lxx_dark.png b/java/res/drawable-mdpi/sym_keyboard_previous_lxx_dark.png
index 40655ca3b..f02f66e55 100644
Binary files a/java/res/drawable-mdpi/sym_keyboard_previous_lxx_dark.png and b/java/res/drawable-mdpi/sym_keyboard_previous_lxx_dark.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_previous_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_previous_lxx_light.png
index 2044db67e..87db29b75 100644
Binary files a/java/res/drawable-mdpi/sym_keyboard_previous_lxx_light.png and b/java/res/drawable-mdpi/sym_keyboard_previous_lxx_light.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_settings_lxx_dark.png b/java/res/drawable-mdpi/sym_keyboard_settings_lxx_dark.png
index a04f4f515..24121dee3 100644
Binary files a/java/res/drawable-mdpi/sym_keyboard_settings_lxx_dark.png and b/java/res/drawable-mdpi/sym_keyboard_settings_lxx_dark.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_settings_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_settings_lxx_light.png
index f70030ba3..a3546f39f 100644
Binary files a/java/res/drawable-mdpi/sym_keyboard_settings_lxx_light.png and b/java/res/drawable-mdpi/sym_keyboard_settings_lxx_light.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_shift_lxx_dark.png b/java/res/drawable-mdpi/sym_keyboard_shift_lxx_dark.png
index d5bd44cb3..503c384b7 100644
Binary files a/java/res/drawable-mdpi/sym_keyboard_shift_lxx_dark.png and b/java/res/drawable-mdpi/sym_keyboard_shift_lxx_dark.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_shift_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_shift_lxx_light.png
index 056fc51d6..a99b7f90c 100644
Binary files a/java/res/drawable-mdpi/sym_keyboard_shift_lxx_light.png and b/java/res/drawable-mdpi/sym_keyboard_shift_lxx_light.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_spacebar_lxx_dark.9.png b/java/res/drawable-mdpi/sym_keyboard_spacebar_lxx_dark.9.png
index 30892b8ee..b8e56dab4 100644
Binary files a/java/res/drawable-mdpi/sym_keyboard_spacebar_lxx_dark.9.png and b/java/res/drawable-mdpi/sym_keyboard_spacebar_lxx_dark.9.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_spacebar_lxx_light.9.png b/java/res/drawable-mdpi/sym_keyboard_spacebar_lxx_light.9.png
index ab64cd642..281f83062 100644
Binary files a/java/res/drawable-mdpi/sym_keyboard_spacebar_lxx_light.9.png and b/java/res/drawable-mdpi/sym_keyboard_spacebar_lxx_light.9.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_tab_lxx_dark.png b/java/res/drawable-mdpi/sym_keyboard_tab_lxx_dark.png
new file mode 100644
index 000000000..a9cdae75a
Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_tab_lxx_dark.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_tab_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_tab_lxx_light.png
new file mode 100644
index 000000000..89c687d6b
Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_tab_lxx_light.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_voice_lxx_dark.png b/java/res/drawable-mdpi/sym_keyboard_voice_lxx_dark.png
index d40b10687..ab7726a1a 100644
Binary files a/java/res/drawable-mdpi/sym_keyboard_voice_lxx_dark.png and b/java/res/drawable-mdpi/sym_keyboard_voice_lxx_dark.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_voice_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_voice_lxx_light.png
index 0ddcb792c..365486414 100644
Binary files a/java/res/drawable-mdpi/sym_keyboard_voice_lxx_light.png and b/java/res/drawable-mdpi/sym_keyboard_voice_lxx_light.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_voice_off_lxx_dark.png b/java/res/drawable-mdpi/sym_keyboard_voice_off_lxx_dark.png
index 7bde452e7..7db32d48c 100644
Binary files a/java/res/drawable-mdpi/sym_keyboard_voice_off_lxx_dark.png and b/java/res/drawable-mdpi/sym_keyboard_voice_off_lxx_dark.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_voice_off_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_voice_off_lxx_light.png
index 8831bc04c..bc61a691b 100644
Binary files a/java/res/drawable-mdpi/sym_keyboard_voice_off_lxx_light.png and b/java/res/drawable-mdpi/sym_keyboard_voice_off_lxx_light.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_zwj_lxx_dark.png b/java/res/drawable-mdpi/sym_keyboard_zwj_lxx_dark.png
new file mode 100644
index 000000000..4fbcb28ed
Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_zwj_lxx_dark.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_zwj_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_zwj_lxx_light.png
new file mode 100644
index 000000000..af049b090
Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_zwj_lxx_light.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_zwnj_lxx_dark.png b/java/res/drawable-mdpi/sym_keyboard_zwnj_lxx_dark.png
new file mode 100644
index 000000000..bcdc2a378
Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_zwnj_lxx_dark.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_zwnj_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_zwnj_lxx_light.png
new file mode 100644
index 000000000..d8275bc9b
Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_zwnj_lxx_light.png 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
index daa3c8afc..8709e63b2 100644
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_lxx_dark.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_lxx_dark.9.png 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
index e58df5cb0..98edd3706 100644
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_lxx_light.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_lxx_light.9.png 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
index 4c024e261..b1c9006ad 100644
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png 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
index 0b340e2cb..52a4ad059 100644
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png 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
index 10a6ab5f9..6ebc4e098 100644
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png 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
index 58b705414..6392f6e00 100644
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png 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
index e6227c34b..f05f987ac 100644
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png 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
index 3da5f47b0..3e8cac2c1 100644
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_emoticons_activated_lxx_dark.png b/java/res/drawable-xhdpi/ic_emoji_emoticons_activated_lxx_dark.png
new file mode 100644
index 000000000..5ec557dae
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_emoticons_activated_lxx_dark.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_emoticons_activated_lxx_light.png b/java/res/drawable-xhdpi/ic_emoji_emoticons_activated_lxx_light.png
new file mode 100644
index 000000000..1c1017e36
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_emoticons_activated_lxx_light.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_emoticons_normal_lxx_dark.png b/java/res/drawable-xhdpi/ic_emoji_emoticons_normal_lxx_dark.png
new file mode 100644
index 000000000..fc7032483
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_emoticons_normal_lxx_dark.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_emoticons_normal_lxx_light.png b/java/res/drawable-xhdpi/ic_emoji_emoticons_normal_lxx_light.png
new file mode 100644
index 000000000..8af5a16c2
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_emoticons_normal_lxx_light.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_nature_activated_lxx_dark.png b/java/res/drawable-xhdpi/ic_emoji_nature_activated_lxx_dark.png
new file mode 100644
index 000000000..1e74d5b40
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_nature_activated_lxx_dark.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_nature_activated_lxx_light.png b/java/res/drawable-xhdpi/ic_emoji_nature_activated_lxx_light.png
new file mode 100644
index 000000000..377065cb1
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_nature_activated_lxx_light.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_nature_normal_lxx_dark.png b/java/res/drawable-xhdpi/ic_emoji_nature_normal_lxx_dark.png
new file mode 100644
index 000000000..d687f8d55
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_nature_normal_lxx_dark.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_nature_normal_lxx_light.png b/java/res/drawable-xhdpi/ic_emoji_nature_normal_lxx_light.png
new file mode 100644
index 000000000..298f41d46
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_nature_normal_lxx_light.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_objects_activated_lxx_dark.png b/java/res/drawable-xhdpi/ic_emoji_objects_activated_lxx_dark.png
new file mode 100644
index 000000000..182f2bfaf
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_objects_activated_lxx_dark.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_objects_activated_lxx_light.png b/java/res/drawable-xhdpi/ic_emoji_objects_activated_lxx_light.png
new file mode 100644
index 000000000..7c3a2d041
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_objects_activated_lxx_light.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_objects_normal_lxx_dark.png b/java/res/drawable-xhdpi/ic_emoji_objects_normal_lxx_dark.png
new file mode 100644
index 000000000..8a1faf485
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_objects_normal_lxx_dark.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_objects_normal_lxx_light.png b/java/res/drawable-xhdpi/ic_emoji_objects_normal_lxx_light.png
new file mode 100644
index 000000000..50a11742a
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_objects_normal_lxx_light.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_people_activated_lxx_dark.png b/java/res/drawable-xhdpi/ic_emoji_people_activated_lxx_dark.png
new file mode 100644
index 000000000..cf2aeb591
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_people_activated_lxx_dark.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_people_activated_lxx_light.png b/java/res/drawable-xhdpi/ic_emoji_people_activated_lxx_light.png
new file mode 100644
index 000000000..3ecf9d010
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_people_activated_lxx_light.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_people_normal_lxx_dark.png b/java/res/drawable-xhdpi/ic_emoji_people_normal_lxx_dark.png
new file mode 100644
index 000000000..b0a448ae0
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_people_normal_lxx_dark.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_people_normal_lxx_light.png b/java/res/drawable-xhdpi/ic_emoji_people_normal_lxx_light.png
new file mode 100644
index 000000000..d71bc1cbb
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_people_normal_lxx_light.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_places_activated_lxx_dark.png b/java/res/drawable-xhdpi/ic_emoji_places_activated_lxx_dark.png
new file mode 100644
index 000000000..33f4e0a1f
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_places_activated_lxx_dark.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_places_activated_lxx_light.png b/java/res/drawable-xhdpi/ic_emoji_places_activated_lxx_light.png
new file mode 100644
index 000000000..194f49332
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_places_activated_lxx_light.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_places_normal_lxx_dark.png b/java/res/drawable-xhdpi/ic_emoji_places_normal_lxx_dark.png
new file mode 100644
index 000000000..82d4ce613
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_places_normal_lxx_dark.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_places_normal_lxx_light.png b/java/res/drawable-xhdpi/ic_emoji_places_normal_lxx_light.png
new file mode 100644
index 000000000..e1b90a919
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_places_normal_lxx_light.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_recents_activated_lxx_dark.png b/java/res/drawable-xhdpi/ic_emoji_recents_activated_lxx_dark.png
new file mode 100644
index 000000000..330573753
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_recents_activated_lxx_dark.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_recents_activated_lxx_light.png b/java/res/drawable-xhdpi/ic_emoji_recents_activated_lxx_light.png
new file mode 100644
index 000000000..8c74847a2
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_recents_activated_lxx_light.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_recents_normal_lxx_dark.png b/java/res/drawable-xhdpi/ic_emoji_recents_normal_lxx_dark.png
new file mode 100644
index 000000000..b9c1a659b
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_recents_normal_lxx_dark.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_recents_normal_lxx_light.png b/java/res/drawable-xhdpi/ic_emoji_recents_normal_lxx_light.png
new file mode 100644
index 000000000..64e1c4df5
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_recents_normal_lxx_light.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_symbols_activated_lxx_dark.png b/java/res/drawable-xhdpi/ic_emoji_symbols_activated_lxx_dark.png
new file mode 100644
index 000000000..35a06c542
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_symbols_activated_lxx_dark.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_symbols_activated_lxx_light.png b/java/res/drawable-xhdpi/ic_emoji_symbols_activated_lxx_light.png
new file mode 100644
index 000000000..a64d375c4
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_symbols_activated_lxx_light.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_symbols_normal_lxx_dark.png b/java/res/drawable-xhdpi/ic_emoji_symbols_normal_lxx_dark.png
new file mode 100644
index 000000000..ac80c79e8
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_symbols_normal_lxx_dark.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_symbols_normal_lxx_light.png b/java/res/drawable-xhdpi/ic_emoji_symbols_normal_lxx_light.png
new file mode 100644
index 000000000..5d574236c
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_emoji_symbols_normal_lxx_light.png 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
index 8407877e2..654ccd10c 100644
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_dark.9.png and b/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_dark.9.png 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
index bd6ec94b8..c566e3d7c 100644
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_light.9.png and b/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_light.9.png 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
index 630340ff0..f5f613caa 100644
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png and b/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png 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
index eef27a377..35aaa7d7c 100644
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_light.9.png and b/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_light.9.png 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
index 19957fa5f..cf5b5d368 100644
Binary files a/java/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_dark.9.png and b/java/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_dark.9.png 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
index 8a51d7148..324ee3a86 100644
Binary files a/java/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_light.9.png and b/java/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_light.9.png 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
index 0334602a2..275ec73a8 100644
Binary files a/java/res/drawable-xhdpi/suggestions_strip_divider_lxx_dark.png and b/java/res/drawable-xhdpi/suggestions_strip_divider_lxx_dark.png 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
index 0047e5c17..ee85744c5 100644
Binary files a/java/res/drawable-xhdpi/suggestions_strip_divider_lxx_light.png and b/java/res/drawable-xhdpi/suggestions_strip_divider_lxx_light.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_delete_lxx_dark.png b/java/res/drawable-xhdpi/sym_keyboard_delete_lxx_dark.png
index ffb9598cc..3301915da 100644
Binary files a/java/res/drawable-xhdpi/sym_keyboard_delete_lxx_dark.png and b/java/res/drawable-xhdpi/sym_keyboard_delete_lxx_dark.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_delete_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_delete_lxx_light.png
index df4e358a1..a03c6b1d5 100644
Binary files a/java/res/drawable-xhdpi/sym_keyboard_delete_lxx_light.png and b/java/res/drawable-xhdpi/sym_keyboard_delete_lxx_light.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_language_switch_lxx_dark.png b/java/res/drawable-xhdpi/sym_keyboard_language_switch_lxx_dark.png
index bdc126796..fff13b6b7 100644
Binary files a/java/res/drawable-xhdpi/sym_keyboard_language_switch_lxx_dark.png and b/java/res/drawable-xhdpi/sym_keyboard_language_switch_lxx_dark.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_language_switch_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_language_switch_lxx_light.png
index 023e64720..c3c499b00 100644
Binary files a/java/res/drawable-xhdpi/sym_keyboard_language_switch_lxx_light.png and b/java/res/drawable-xhdpi/sym_keyboard_language_switch_lxx_light.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_next_lxx_dark.png b/java/res/drawable-xhdpi/sym_keyboard_next_lxx_dark.png
index 8b5b0b4de..0476942fe 100644
Binary files a/java/res/drawable-xhdpi/sym_keyboard_next_lxx_dark.png and b/java/res/drawable-xhdpi/sym_keyboard_next_lxx_dark.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_next_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_next_lxx_light.png
index 2c1fe6d3c..1733ca8fe 100644
Binary files a/java/res/drawable-xhdpi/sym_keyboard_next_lxx_light.png and b/java/res/drawable-xhdpi/sym_keyboard_next_lxx_light.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_previous_lxx_dark.png b/java/res/drawable-xhdpi/sym_keyboard_previous_lxx_dark.png
index 9bc4fc81e..87f0d6487 100644
Binary files a/java/res/drawable-xhdpi/sym_keyboard_previous_lxx_dark.png and b/java/res/drawable-xhdpi/sym_keyboard_previous_lxx_dark.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_previous_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_previous_lxx_light.png
index 49b2651f3..0c88c60e9 100644
Binary files a/java/res/drawable-xhdpi/sym_keyboard_previous_lxx_light.png and b/java/res/drawable-xhdpi/sym_keyboard_previous_lxx_light.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_settings_lxx_dark.png b/java/res/drawable-xhdpi/sym_keyboard_settings_lxx_dark.png
index ec72c3867..35e4023ad 100644
Binary files a/java/res/drawable-xhdpi/sym_keyboard_settings_lxx_dark.png and b/java/res/drawable-xhdpi/sym_keyboard_settings_lxx_dark.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_settings_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_settings_lxx_light.png
index d46c26bc8..73fafcc19 100644
Binary files a/java/res/drawable-xhdpi/sym_keyboard_settings_lxx_light.png and b/java/res/drawable-xhdpi/sym_keyboard_settings_lxx_light.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_shift_lxx_dark.png b/java/res/drawable-xhdpi/sym_keyboard_shift_lxx_dark.png
index bf5560580..9a87d77da 100644
Binary files a/java/res/drawable-xhdpi/sym_keyboard_shift_lxx_dark.png and b/java/res/drawable-xhdpi/sym_keyboard_shift_lxx_dark.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_shift_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_shift_lxx_light.png
index 3a56ed9dc..196046b97 100644
Binary files a/java/res/drawable-xhdpi/sym_keyboard_shift_lxx_light.png and b/java/res/drawable-xhdpi/sym_keyboard_shift_lxx_light.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_spacebar_lxx_dark.9.png b/java/res/drawable-xhdpi/sym_keyboard_spacebar_lxx_dark.9.png
index 9eaa00560..ab032dc17 100644
Binary files a/java/res/drawable-xhdpi/sym_keyboard_spacebar_lxx_dark.9.png and b/java/res/drawable-xhdpi/sym_keyboard_spacebar_lxx_dark.9.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_spacebar_lxx_light.9.png b/java/res/drawable-xhdpi/sym_keyboard_spacebar_lxx_light.9.png
index 0cf38f2af..c1ed863f8 100644
Binary files a/java/res/drawable-xhdpi/sym_keyboard_spacebar_lxx_light.9.png and b/java/res/drawable-xhdpi/sym_keyboard_spacebar_lxx_light.9.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_tab_lxx_dark.png b/java/res/drawable-xhdpi/sym_keyboard_tab_lxx_dark.png
new file mode 100644
index 000000000..134e1b89f
Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_tab_lxx_dark.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_tab_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_tab_lxx_light.png
new file mode 100644
index 000000000..0aae98266
Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_tab_lxx_light.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_voice_lxx_dark.png b/java/res/drawable-xhdpi/sym_keyboard_voice_lxx_dark.png
index 5c2b40603..65fa6d673 100644
Binary files a/java/res/drawable-xhdpi/sym_keyboard_voice_lxx_dark.png and b/java/res/drawable-xhdpi/sym_keyboard_voice_lxx_dark.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_voice_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_voice_lxx_light.png
index c9b25040c..1b0463bd3 100644
Binary files a/java/res/drawable-xhdpi/sym_keyboard_voice_lxx_light.png and b/java/res/drawable-xhdpi/sym_keyboard_voice_lxx_light.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_voice_off_lxx_dark.png b/java/res/drawable-xhdpi/sym_keyboard_voice_off_lxx_dark.png
index a32f741b3..ceddbacd5 100644
Binary files a/java/res/drawable-xhdpi/sym_keyboard_voice_off_lxx_dark.png and b/java/res/drawable-xhdpi/sym_keyboard_voice_off_lxx_dark.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_voice_off_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_voice_off_lxx_light.png
index 1398a3ed6..f8fab8963 100644
Binary files a/java/res/drawable-xhdpi/sym_keyboard_voice_off_lxx_light.png and b/java/res/drawable-xhdpi/sym_keyboard_voice_off_lxx_light.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_zwj_lxx_dark.png b/java/res/drawable-xhdpi/sym_keyboard_zwj_lxx_dark.png
new file mode 100644
index 000000000..d72cc3235
Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_zwj_lxx_dark.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_zwj_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_zwj_lxx_light.png
new file mode 100644
index 000000000..22bc6171c
Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_zwj_lxx_light.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_zwnj_lxx_dark.png b/java/res/drawable-xhdpi/sym_keyboard_zwnj_lxx_dark.png
new file mode 100644
index 000000000..044a33b58
Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_zwnj_lxx_dark.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_zwnj_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_zwnj_lxx_light.png
new file mode 100644
index 000000000..bcfed2e30
Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_zwnj_lxx_light.png 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
index 535a00ade..f2b5e4c0a 100644
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_normal_off_lxx_dark.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_normal_off_lxx_dark.9.png 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
index fb1dc62d1..265109d33 100644
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_normal_off_lxx_light.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_normal_off_lxx_light.9.png 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
index f74ac5ce4..d1efb6e18 100644
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png 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
index e58d6643f..8a6583e7c 100644
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png 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
index 2fd8b670b..b74d1ca83 100644
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png 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
index 8e01cfa2d..48ae93f53 100644
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png 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
index d0252e165..0a6c2ea79 100644
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png 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
index 1619411b2..65dc814f6 100644
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_emoticons_activated_lxx_dark.png b/java/res/drawable-xxhdpi/ic_emoji_emoticons_activated_lxx_dark.png
new file mode 100644
index 000000000..732ed3b98
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_emoticons_activated_lxx_dark.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_emoticons_activated_lxx_light.png b/java/res/drawable-xxhdpi/ic_emoji_emoticons_activated_lxx_light.png
new file mode 100644
index 000000000..fbefde4c6
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_emoticons_activated_lxx_light.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_emoticons_normal_lxx_dark.png b/java/res/drawable-xxhdpi/ic_emoji_emoticons_normal_lxx_dark.png
new file mode 100644
index 000000000..dbe8eec6a
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_emoticons_normal_lxx_dark.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_emoticons_normal_lxx_light.png b/java/res/drawable-xxhdpi/ic_emoji_emoticons_normal_lxx_light.png
new file mode 100644
index 000000000..5dcb48d27
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_emoticons_normal_lxx_light.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_nature_activated_lxx_dark.png b/java/res/drawable-xxhdpi/ic_emoji_nature_activated_lxx_dark.png
new file mode 100644
index 000000000..024b33a7d
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_nature_activated_lxx_dark.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_nature_activated_lxx_light.png b/java/res/drawable-xxhdpi/ic_emoji_nature_activated_lxx_light.png
new file mode 100644
index 000000000..9232f9e5b
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_nature_activated_lxx_light.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_nature_normal_lxx_dark.png b/java/res/drawable-xxhdpi/ic_emoji_nature_normal_lxx_dark.png
new file mode 100644
index 000000000..598d3dd9e
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_nature_normal_lxx_dark.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_nature_normal_lxx_light.png b/java/res/drawable-xxhdpi/ic_emoji_nature_normal_lxx_light.png
new file mode 100644
index 000000000..d39d14625
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_nature_normal_lxx_light.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_objects_activated_lxx_dark.png b/java/res/drawable-xxhdpi/ic_emoji_objects_activated_lxx_dark.png
new file mode 100644
index 000000000..20775e146
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_objects_activated_lxx_dark.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_objects_activated_lxx_light.png b/java/res/drawable-xxhdpi/ic_emoji_objects_activated_lxx_light.png
new file mode 100644
index 000000000..b89376097
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_objects_activated_lxx_light.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_objects_normal_lxx_dark.png b/java/res/drawable-xxhdpi/ic_emoji_objects_normal_lxx_dark.png
new file mode 100644
index 000000000..ec35112a2
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_objects_normal_lxx_dark.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_objects_normal_lxx_light.png b/java/res/drawable-xxhdpi/ic_emoji_objects_normal_lxx_light.png
new file mode 100644
index 000000000..df769c590
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_objects_normal_lxx_light.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_people_activated_lxx_dark.png b/java/res/drawable-xxhdpi/ic_emoji_people_activated_lxx_dark.png
new file mode 100644
index 000000000..9ca031a5a
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_people_activated_lxx_dark.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_people_activated_lxx_light.png b/java/res/drawable-xxhdpi/ic_emoji_people_activated_lxx_light.png
new file mode 100644
index 000000000..6faad5c80
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_people_activated_lxx_light.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_people_normal_lxx_dark.png b/java/res/drawable-xxhdpi/ic_emoji_people_normal_lxx_dark.png
new file mode 100644
index 000000000..ed71326a9
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_people_normal_lxx_dark.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_people_normal_lxx_light.png b/java/res/drawable-xxhdpi/ic_emoji_people_normal_lxx_light.png
new file mode 100644
index 000000000..a5516fa3a
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_people_normal_lxx_light.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_places_activated_lxx_dark.png b/java/res/drawable-xxhdpi/ic_emoji_places_activated_lxx_dark.png
new file mode 100644
index 000000000..513198227
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_places_activated_lxx_dark.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_places_activated_lxx_light.png b/java/res/drawable-xxhdpi/ic_emoji_places_activated_lxx_light.png
new file mode 100644
index 000000000..8a4614d73
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_places_activated_lxx_light.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_places_normal_lxx_dark.png b/java/res/drawable-xxhdpi/ic_emoji_places_normal_lxx_dark.png
new file mode 100644
index 000000000..0dfbadd66
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_places_normal_lxx_dark.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_places_normal_lxx_light.png b/java/res/drawable-xxhdpi/ic_emoji_places_normal_lxx_light.png
new file mode 100644
index 000000000..2f22dfbb5
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_places_normal_lxx_light.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_recents_activated_lxx_dark.png b/java/res/drawable-xxhdpi/ic_emoji_recents_activated_lxx_dark.png
new file mode 100644
index 000000000..28402b8c8
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_recents_activated_lxx_dark.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_recents_activated_lxx_light.png b/java/res/drawable-xxhdpi/ic_emoji_recents_activated_lxx_light.png
new file mode 100644
index 000000000..92da7f2bb
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_recents_activated_lxx_light.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_recents_normal_lxx_dark.png b/java/res/drawable-xxhdpi/ic_emoji_recents_normal_lxx_dark.png
new file mode 100644
index 000000000..24561f9fc
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_recents_normal_lxx_dark.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_recents_normal_lxx_light.png b/java/res/drawable-xxhdpi/ic_emoji_recents_normal_lxx_light.png
new file mode 100644
index 000000000..96ff801b2
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_recents_normal_lxx_light.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_symbols_activated_lxx_dark.png b/java/res/drawable-xxhdpi/ic_emoji_symbols_activated_lxx_dark.png
new file mode 100644
index 000000000..73f720ddd
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_symbols_activated_lxx_dark.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_symbols_activated_lxx_light.png b/java/res/drawable-xxhdpi/ic_emoji_symbols_activated_lxx_light.png
new file mode 100644
index 000000000..3bbec182e
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_symbols_activated_lxx_light.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_symbols_normal_lxx_dark.png b/java/res/drawable-xxhdpi/ic_emoji_symbols_normal_lxx_dark.png
new file mode 100644
index 000000000..938f3f38c
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_symbols_normal_lxx_dark.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_symbols_normal_lxx_light.png b/java/res/drawable-xxhdpi/ic_emoji_symbols_normal_lxx_light.png
new file mode 100644
index 000000000..b7f51ebca
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_emoji_symbols_normal_lxx_light.png 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
index 284302f9b..f5215bc56 100644
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_dark.9.png and b/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_dark.9.png 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
index dcc0ab084..b565ff07c 100644
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_light.9.png and b/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_light.9.png 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
index 1ae262510..6d931ed42 100644
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png and b/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png 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
index 5fd175187..2c5ced966 100644
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_light.9.png and b/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_light.9.png 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
index 92c479da8..440b5bbb7 100644
Binary files a/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_dark.9.png and b/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_dark.9.png 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
index 1336d8005..15915f745 100644
Binary files a/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_light.9.png and b/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_light.9.png 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
index 5f0b3dec5..6b414b7a1 100644
Binary files a/java/res/drawable-xxhdpi/suggestions_strip_divider_lxx_dark.png and b/java/res/drawable-xxhdpi/suggestions_strip_divider_lxx_dark.png 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
index 9b37dd094..eccfff7b9 100644
Binary files a/java/res/drawable-xxhdpi/suggestions_strip_divider_lxx_light.png and b/java/res/drawable-xxhdpi/suggestions_strip_divider_lxx_light.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_delete_lxx_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_delete_lxx_dark.png
index 0196033a9..1f37a02de 100644
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_delete_lxx_dark.png and b/java/res/drawable-xxhdpi/sym_keyboard_delete_lxx_dark.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_delete_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_delete_lxx_light.png
index c3937c491..76b3d7272 100644
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_delete_lxx_light.png and b/java/res/drawable-xxhdpi/sym_keyboard_delete_lxx_light.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_language_switch_lxx_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_language_switch_lxx_dark.png
index 151fafe8e..329158cea 100644
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_language_switch_lxx_dark.png and b/java/res/drawable-xxhdpi/sym_keyboard_language_switch_lxx_dark.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_language_switch_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_language_switch_lxx_light.png
index 82b4d51e5..588bf6efe 100644
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_language_switch_lxx_light.png and b/java/res/drawable-xxhdpi/sym_keyboard_language_switch_lxx_light.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_next_lxx_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_next_lxx_dark.png
index 1e2819b73..43cde8d92 100644
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_next_lxx_dark.png and b/java/res/drawable-xxhdpi/sym_keyboard_next_lxx_dark.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_next_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_next_lxx_light.png
index 4e1407012..392ed4980 100644
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_next_lxx_light.png and b/java/res/drawable-xxhdpi/sym_keyboard_next_lxx_light.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_previous_lxx_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_previous_lxx_dark.png
index bae6cb1fa..193e34f1b 100644
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_previous_lxx_dark.png and b/java/res/drawable-xxhdpi/sym_keyboard_previous_lxx_dark.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_previous_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_previous_lxx_light.png
index 78865cb0e..33e2e0b35 100644
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_previous_lxx_light.png and b/java/res/drawable-xxhdpi/sym_keyboard_previous_lxx_light.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_settings_lxx_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_settings_lxx_dark.png
index 143ec0038..a52764f21 100644
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_settings_lxx_dark.png and b/java/res/drawable-xxhdpi/sym_keyboard_settings_lxx_dark.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_settings_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_settings_lxx_light.png
index e5be02811..5464d4fb6 100644
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_settings_lxx_light.png and b/java/res/drawable-xxhdpi/sym_keyboard_settings_lxx_light.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_shift_lxx_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_shift_lxx_dark.png
index 774174c8b..8c33ad840 100644
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_shift_lxx_dark.png and b/java/res/drawable-xxhdpi/sym_keyboard_shift_lxx_dark.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_shift_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_shift_lxx_light.png
index ee51c562b..b96bf10ba 100644
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_shift_lxx_light.png and b/java/res/drawable-xxhdpi/sym_keyboard_shift_lxx_light.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_spacebar_lxx_dark.9.png b/java/res/drawable-xxhdpi/sym_keyboard_spacebar_lxx_dark.9.png
index abd263f00..0339de37d 100644
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_spacebar_lxx_dark.9.png and b/java/res/drawable-xxhdpi/sym_keyboard_spacebar_lxx_dark.9.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_spacebar_lxx_light.9.png b/java/res/drawable-xxhdpi/sym_keyboard_spacebar_lxx_light.9.png
index 90c963733..b57cfb3d2 100644
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_spacebar_lxx_light.9.png and b/java/res/drawable-xxhdpi/sym_keyboard_spacebar_lxx_light.9.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_tab_lxx_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_tab_lxx_dark.png
new file mode 100644
index 000000000..55de1b795
Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_tab_lxx_dark.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_tab_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_tab_lxx_light.png
new file mode 100644
index 000000000..d3205819a
Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_tab_lxx_light.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_voice_lxx_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_voice_lxx_dark.png
index 9bc9effcb..28ef257ad 100644
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_voice_lxx_dark.png and b/java/res/drawable-xxhdpi/sym_keyboard_voice_lxx_dark.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_voice_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_voice_lxx_light.png
index 42331e920..1480ba930 100644
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_voice_lxx_light.png and b/java/res/drawable-xxhdpi/sym_keyboard_voice_lxx_light.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_voice_off_lxx_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_voice_off_lxx_dark.png
index 413c4ff3f..69591f405 100644
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_voice_off_lxx_dark.png and b/java/res/drawable-xxhdpi/sym_keyboard_voice_off_lxx_dark.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_voice_off_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_voice_off_lxx_light.png
index 5a3ed0d48..61c92f079 100644
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_voice_off_lxx_light.png and b/java/res/drawable-xxhdpi/sym_keyboard_voice_off_lxx_light.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_zwj_lxx_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_zwj_lxx_dark.png
new file mode 100644
index 000000000..f8bd0c719
Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_zwj_lxx_dark.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_zwj_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_zwj_lxx_light.png
new file mode 100644
index 000000000..83411c831
Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_zwj_lxx_light.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_zwnj_lxx_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_zwnj_lxx_dark.png
new file mode 100644
index 000000000..b1372f631
Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_zwnj_lxx_dark.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_zwnj_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_zwnj_lxx_light.png
new file mode 100644
index 000000000..3aece2ee3
Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_zwnj_lxx_light.png differ
diff --git a/java/res/drawable/ic_emoji_emoticons_lxx_dark.xml b/java/res/drawable/ic_emoji_emoticons_lxx_dark.xml
new file mode 100644
index 000000000..a8f167ac3
--- /dev/null
+++ b/java/res/drawable/ic_emoji_emoticons_lxx_dark.xml
@@ -0,0 +1,32 @@
+<?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_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_emoticons_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_emoticons_activated_lxx_dark" />
+    <item android:drawable="@drawable/ic_emoji_emoticons_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_emoticons_lxx_light.xml b/java/res/drawable/ic_emoji_emoticons_lxx_light.xml
new file mode 100644
index 000000000..e1820906b
--- /dev/null
+++ b/java/res/drawable/ic_emoji_emoticons_lxx_light.xml
@@ -0,0 +1,32 @@
+<?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_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_emoticons_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_emoticons_activated_lxx_light" />
+    <item android:drawable="@drawable/ic_emoji_emoticons_normal_lxx_light" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_nature_lxx_dark.xml b/java/res/drawable/ic_emoji_nature_lxx_dark.xml
new file mode 100644
index 000000000..6f03e50b4
--- /dev/null
+++ b/java/res/drawable/ic_emoji_nature_lxx_dark.xml
@@ -0,0 +1,33 @@
+<?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_nature_activated_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_nature_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_nature_activated_lxx_dark" />
+    <item
+        android:drawable="@drawable/ic_emoji_nature_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_nature_lxx_light.xml b/java/res/drawable/ic_emoji_nature_lxx_light.xml
new file mode 100644
index 000000000..47525ad94
--- /dev/null
+++ b/java/res/drawable/ic_emoji_nature_lxx_light.xml
@@ -0,0 +1,33 @@
+<?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_nature_activated_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_nature_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_nature_activated_lxx_light" />
+    <item
+        android:drawable="@drawable/ic_emoji_nature_normal_lxx_light" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_objects_lxx_dark.xml b/java/res/drawable/ic_emoji_objects_lxx_dark.xml
new file mode 100644
index 000000000..cf150f412
--- /dev/null
+++ b/java/res/drawable/ic_emoji_objects_lxx_dark.xml
@@ -0,0 +1,32 @@
+<?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_objects_activated_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_objects_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_objects_activated_lxx_dark" />
+    <item android:drawable="@drawable/ic_emoji_objects_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_objects_lxx_light.xml b/java/res/drawable/ic_emoji_objects_lxx_light.xml
new file mode 100644
index 000000000..be7f32f78
--- /dev/null
+++ b/java/res/drawable/ic_emoji_objects_lxx_light.xml
@@ -0,0 +1,32 @@
+<?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_objects_activated_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_objects_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_objects_activated_lxx_light" />
+    <item android:drawable="@drawable/ic_emoji_objects_normal_lxx_light" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_people_lxx_dark.xml b/java/res/drawable/ic_emoji_people_lxx_dark.xml
new file mode 100644
index 000000000..f91b5c4f3
--- /dev/null
+++ b/java/res/drawable/ic_emoji_people_lxx_dark.xml
@@ -0,0 +1,32 @@
+<?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_people_activated_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_people_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_people_activated_lxx_dark" />
+    <item android:drawable="@drawable/ic_emoji_people_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_people_lxx_light.xml b/java/res/drawable/ic_emoji_people_lxx_light.xml
new file mode 100644
index 000000000..88394bf77
--- /dev/null
+++ b/java/res/drawable/ic_emoji_people_lxx_light.xml
@@ -0,0 +1,32 @@
+<?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_people_activated_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_people_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_people_activated_lxx_light" />
+    <item android:drawable="@drawable/ic_emoji_people_normal_lxx_light" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_places_lxx_dark.xml b/java/res/drawable/ic_emoji_places_lxx_dark.xml
new file mode 100644
index 000000000..ace036465
--- /dev/null
+++ b/java/res/drawable/ic_emoji_places_lxx_dark.xml
@@ -0,0 +1,32 @@
+<?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_places_activated_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_places_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_places_activated_lxx_dark" />
+    <item android:drawable="@drawable/ic_emoji_places_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_places_lxx_light.xml b/java/res/drawable/ic_emoji_places_lxx_light.xml
new file mode 100644
index 000000000..93d74f773
--- /dev/null
+++ b/java/res/drawable/ic_emoji_places_lxx_light.xml
@@ -0,0 +1,32 @@
+<?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_places_activated_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_places_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_places_activated_lxx_light" />
+    <item android:drawable="@drawable/ic_emoji_places_normal_lxx_light" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_recents_lxx_dark.xml b/java/res/drawable/ic_emoji_recents_lxx_dark.xml
new file mode 100644
index 000000000..50f0e086b
--- /dev/null
+++ b/java/res/drawable/ic_emoji_recents_lxx_dark.xml
@@ -0,0 +1,32 @@
+<?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_recents_activated_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_recents_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_recents_activated_lxx_dark" />
+    <item android:drawable="@drawable/ic_emoji_recents_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_recents_lxx_light.xml b/java/res/drawable/ic_emoji_recents_lxx_light.xml
new file mode 100644
index 000000000..f06480c51
--- /dev/null
+++ b/java/res/drawable/ic_emoji_recents_lxx_light.xml
@@ -0,0 +1,32 @@
+<?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_recents_activated_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_recents_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_recents_activated_lxx_light" />
+    <item android:drawable="@drawable/ic_emoji_recents_normal_lxx_light" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_symbols_lxx_dark.xml b/java/res/drawable/ic_emoji_symbols_lxx_dark.xml
new file mode 100644
index 000000000..d2dbc220d
--- /dev/null
+++ b/java/res/drawable/ic_emoji_symbols_lxx_dark.xml
@@ -0,0 +1,32 @@
+<?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_symbols_activated_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_symbols_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_symbols_activated_lxx_dark" />
+    <item android:drawable="@drawable/ic_emoji_symbols_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_symbols_lxx_light.xml b/java/res/drawable/ic_emoji_symbols_lxx_light.xml
new file mode 100644
index 000000000..fb59399f5
--- /dev/null
+++ b/java/res/drawable/ic_emoji_symbols_lxx_light.xml
@@ -0,0 +1,32 @@
+<?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_symbols_activated_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_symbols_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_symbols_activated_lxx_light" />
+    <item android:drawable="@drawable/ic_emoji_symbols_normal_lxx_light" />
+</selector>
diff --git a/java/res/values/keyboard-icons-lxx-dark.xml b/java/res/values/keyboard-icons-lxx-dark.xml
index b1549f2ca..15d267cb2 100644
--- a/java/res/values/keyboard-icons-lxx-dark.xml
+++ b/java/res/values/keyboard-icons-lxx-dark.xml
@@ -21,7 +21,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <style name="KeyboardIcons.LXX_Dark">
         <!-- Keyboard icons -->
-        <!-- TODO: Update those icons for LXX_Dark theme. -->
         <item name="iconShiftKey">@drawable/sym_keyboard_shift_lxx_dark</item>
         <item name="iconDeleteKey">@drawable/sym_keyboard_delete_lxx_dark</item>
         <item name="iconSettingsKey">@drawable/sym_keyboard_settings_lxx_dark</item>
@@ -33,14 +32,15 @@
         <item name="iconNextKey">@drawable/sym_keyboard_next_lxx_dark</item>
         <item name="iconDoneKey">@drawable/sym_keyboard_done_lxx_dark</item>
         <item name="iconPreviousKey">@drawable/sym_keyboard_previous_lxx_dark</item>
-        <item name="iconTabKey">@drawable/sym_keyboard_tab_holo_dark</item>
+        <item name="iconTabKey">@drawable/sym_keyboard_tab_lxx_dark</item>
         <item name="iconShortcutKey">@drawable/sym_keyboard_voice_lxx_dark</item>
+        <!-- TODO: Update this icon for LXX_Dark theme. -->
         <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space_holo_dark</item>
         <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked_lxx_dark</item>
         <item name="iconShortcutKeyDisabled">@drawable/sym_keyboard_voice_off_lxx_dark</item>
         <item name="iconLanguageSwitchKey">@drawable/sym_keyboard_language_switch_lxx_dark</item>
-        <item name="iconZwnjKey">@drawable/sym_keyboard_zwnj_holo_dark</item>
-        <item name="iconZwjKey">@drawable/sym_keyboard_zwj_holo_dark</item>
+        <item name="iconZwnjKey">@drawable/sym_keyboard_zwnj_lxx_dark</item>
+        <item name="iconZwjKey">@drawable/sym_keyboard_zwj_lxx_dark</item>
         <item name="iconEmojiKey">@drawable/sym_keyboard_smiley_lxx_dark</item>
     </style>
 </resources>
diff --git a/java/res/values/keyboard-icons-lxx-light.xml b/java/res/values/keyboard-icons-lxx-light.xml
index 651e75ce2..0c4d1aeb8 100644
--- a/java/res/values/keyboard-icons-lxx-light.xml
+++ b/java/res/values/keyboard-icons-lxx-light.xml
@@ -21,7 +21,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <style name="KeyboardIcons.LXX_Light">
         <!-- Keyboard icons -->
-        <!-- TODO: Update those icons for LXX_Light theme. -->
         <item name="iconShiftKey">@drawable/sym_keyboard_shift_lxx_light</item>
         <item name="iconDeleteKey">@drawable/sym_keyboard_delete_lxx_light</item>
         <item name="iconSettingsKey">@drawable/sym_keyboard_settings_lxx_light</item>
@@ -33,14 +32,15 @@
         <item name="iconNextKey">@drawable/sym_keyboard_next_lxx_light</item>
         <item name="iconDoneKey">@drawable/sym_keyboard_done_lxx_light</item>
         <item name="iconPreviousKey">@drawable/sym_keyboard_previous_lxx_light</item>
-        <item name="iconTabKey">@drawable/sym_keyboard_tab_holo_dark</item>
+        <item name="iconTabKey">@drawable/sym_keyboard_tab_lxx_light</item>
         <item name="iconShortcutKey">@drawable/sym_keyboard_voice_lxx_light</item>
+        <!-- TODO: Update this icon for LXX_Light theme. -->
         <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space_holo_dark</item>
         <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked_lxx_dark</item>
         <item name="iconShortcutKeyDisabled">@drawable/sym_keyboard_voice_off_lxx_light</item>
         <item name="iconLanguageSwitchKey">@drawable/sym_keyboard_language_switch_lxx_light</item>
-        <item name="iconZwnjKey">@drawable/sym_keyboard_zwnj_holo_dark</item>
-        <item name="iconZwjKey">@drawable/sym_keyboard_zwj_holo_dark</item>
+        <item name="iconZwnjKey">@drawable/sym_keyboard_zwnj_lxx_light</item>
+        <item name="iconZwjKey">@drawable/sym_keyboard_zwj_lxx_light</item>
         <item name="iconEmojiKey">@drawable/sym_keyboard_smiley_lxx_light</item>
     </style>
 </resources>
diff --git a/java/res/values/themes-lxx-dark.xml b/java/res/values/themes-lxx-dark.xml
index c04e04d56..f01b1f53e 100644
--- a/java/res/values/themes-lxx-dark.xml
+++ b/java/res/values/themes-lxx-dark.xml
@@ -85,14 +85,13 @@
         <item name="categoryIndicatorEnabled">false</item>
         <item name="categoryPageIndicatorColor">@color/highlight_color_lxx_dark</item>
         <item name="categoryPageIndicatorBackground">@color/emoji_tab_page_indicator_background_lxx_dark</item>
-        <!-- TODO: Update those icons to LXX_Dark theme. -->
-        <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="iconEmojiRecentsTab">@drawable/ic_emoji_recents_lxx_dark</item>
+        <item name="iconEmojiCategory1Tab">@drawable/ic_emoji_people_lxx_dark</item>
+        <item name="iconEmojiCategory2Tab">@drawable/ic_emoji_objects_lxx_dark</item>
+        <item name="iconEmojiCategory3Tab">@drawable/ic_emoji_nature_lxx_dark</item>
+        <item name="iconEmojiCategory4Tab">@drawable/ic_emoji_places_lxx_dark</item>
+        <item name="iconEmojiCategory5Tab">@drawable/ic_emoji_symbols_lxx_dark</item>
+        <item name="iconEmojiCategory6Tab">@drawable/ic_emoji_emoticons_lxx_dark</item>
     </style>
     <style
         name="MoreKeysKeyboard.LXX_Dark"
diff --git a/java/res/values/themes-lxx-light.xml b/java/res/values/themes-lxx-light.xml
index 3695f8046..ba3dc9d16 100644
--- a/java/res/values/themes-lxx-light.xml
+++ b/java/res/values/themes-lxx-light.xml
@@ -85,14 +85,13 @@
         <item name="categoryIndicatorEnabled">false</item>
         <item name="categoryPageIndicatorColor">@color/highlight_color_lxx_light</item>
         <item name="categoryPageIndicatorBackground">@color/emoji_tab_page_indicator_background_lxx_light</item>
-        <!-- TODO: Update those icons to LXX_Light theme. -->
-        <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="iconEmojiRecentsTab">@drawable/ic_emoji_recents_lxx_light</item>
+        <item name="iconEmojiCategory1Tab">@drawable/ic_emoji_people_lxx_light</item>
+        <item name="iconEmojiCategory2Tab">@drawable/ic_emoji_objects_lxx_light</item>
+        <item name="iconEmojiCategory3Tab">@drawable/ic_emoji_nature_lxx_light</item>
+        <item name="iconEmojiCategory4Tab">@drawable/ic_emoji_places_lxx_light</item>
+        <item name="iconEmojiCategory5Tab">@drawable/ic_emoji_symbols_lxx_light</item>
+        <item name="iconEmojiCategory6Tab">@drawable/ic_emoji_emoticons_lxx_light</item>
     </style>
     <style
         name="MoreKeysKeyboard.LXX_Light"