diff --git a/java/res/drawable-hdpi/btn_keyboard_key_active_lxx_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_active_lxx_dark.9.png
index 82e850c6b72eec0dab0d05d84d74c6d8a3b1afbf..bbdc4111664a71619c81342465d67d638ab0811b 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_active_lxx_dark.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_active_lxx_dark.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png
index e2b9e3d9cc4bc32e5d42ce8970bebcab1fb02cc8..33f7d8077ddb4f4abdb24924e184347470be5107 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_off_lxx_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_off_lxx_dark.9.png
index 2e6489cf56a12c135b131db8ab04ba04cf030447..b8bb10f244be2314fda3df18c35bddc31f4476cf 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_on_lxx_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_on_lxx_dark.9.png
index 0b1482281510f98b4a5c239159a1d8ebd9395a17..b1f5435486ceeee57d9e1848adef5e78faefdb4d 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_on_lxx_dark.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_normal_on_lxx_dark.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
new file mode 100644
index 0000000000000000000000000000000000000000..0ef8cc7644adee87b512df3ee01ecf724a36133e
Binary files /dev/null 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_pressed_off_lxx_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png
index 4bf38fc35aa0878cfb3efd697bcca148a7eaddef..bfc981edb9f4fd0448099f34335523646feaac50 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_on_lxx_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png
index ea12c77763395e2b25a796be619c4a3f67d949e4..fbb4f8c43cc680775b7229cf8c4d1e2b0137f85c 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/keyboard_key_feedback_background_lxx_dark.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_background_lxx_dark.9.png
index 9d6514bdd250fc85f3bb29acbf4510424ddb8a20..e49efe5dc2662447e399b57d094ef14f8da1d580 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_more_background_lxx_dark.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lxx_dark.9.png
index 8ad54f69d2139fe0803e636aa88097b3b584a029..a0511a1a134bb503df7d46bf31e048d14bf28553 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_popup_panel_background_lxx_dark.9.png b/java/res/drawable-hdpi/keyboard_popup_panel_background_lxx_dark.9.png
index f9dd3b8b1efe3fefb68a39769924c9d451701c71..c7b147f5f921f245990d3ffa50b65d0410f7a896 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/suggestions_strip_divider.png b/java/res/drawable-hdpi/suggestions_strip_divider_holo.png
similarity index 100%
rename from java/res/drawable-hdpi/suggestions_strip_divider.png
rename to java/res/drawable-hdpi/suggestions_strip_divider_holo.png
diff --git a/java/res/drawable-hdpi/suggestions_strip_divider_lxx_dark.png b/java/res/drawable-hdpi/suggestions_strip_divider_lxx_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..68a2270a5783adb7eb2e17aea13e098ed88b8dda
Binary files /dev/null and b/java/res/drawable-hdpi/suggestions_strip_divider_lxx_dark.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 5f5eb3fe7d133c529932883ba18de9bc644561bc..2e68b20164d910467a6f570d4a5c9c83fba71229 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_language_switch_lxx_dark.png b/java/res/drawable-hdpi/sym_keyboard_language_switch_lxx_dark.png
index edf9a20debd771e032136559c14a0687cf50e0b7..4fc82d6d41ba86bfa6b81d45b03001fc9fa3486b 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_settings_lxx_dark.png b/java/res/drawable-hdpi/sym_keyboard_settings_lxx_dark.png
index f2613023ff4af850b106bf77c6af5186a38d0137..23eac1674cd3db40ef0af17a580e03ea53e09562 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_shift_lxx_dark.png b/java/res/drawable-hdpi/sym_keyboard_shift_lxx_dark.png
index cb03e55a842293605e247694df7e57a8bb2bc45b..427f0146808c7c37eb6d390f63f2f392a0ac3cab 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_smiley_lxx_dark.png b/java/res/drawable-hdpi/sym_keyboard_smiley_lxx_dark.png
index 3999d1e2d7611e353a87c4c1f25e37778b43c488..2cfe1d4060eef4c2df1de2408bc362314a3b0537 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_smiley_lxx_dark.png and b/java/res/drawable-hdpi/sym_keyboard_smiley_lxx_dark.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 f344deeec2e6fdfa560d320f86e7979603d24ea5..c57cb73a5e2b92c2937db400bcb5599e680e0a69 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_voice_lxx_dark.png b/java/res/drawable-hdpi/sym_keyboard_voice_lxx_dark.png
index 6b68c8af50d5e56d4c9a92bb546e16ede14576e7..80d12481a940b74759ed8a21b519ebbed9ce4513 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_off_lxx_dark.png b/java/res/drawable-hdpi/sym_keyboard_voice_off_lxx_dark.png
index e67697b3faefdc4ac2e7f1dde174fa985593c265..e2bd604b8fe182851edda2f4ef88ed6f75631b06 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-mdpi/btn_keyboard_key_active_lxx_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_active_lxx_dark.9.png
index 281b5d3bc4b58a6bdf08395bf2b39b898bc18408..787ce45ce44580d14af19624f9ef16da365dc54b 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_active_lxx_dark.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_active_lxx_dark.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png
index eb15643536735748bff3af6ec65a0d7671e0d7ab..7e34c6cf18fcee1cd848b94f201053459215f2aa 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_active_pressed_lxx_dark.9.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 9f244f2e920db563a4a379a751675d0c80e9e15b..bb9fc5910dfa1bbf7b1aff6fb895648ab1f92754 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_on_lxx_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_on_lxx_dark.9.png
index c5b3fbbd7e650695d0e0f8fe98a3988b28a7915e..5b23e22b425af0779d8d76018a48440d03949ad4 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_normal_on_lxx_dark.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_normal_on_lxx_dark.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
new file mode 100644
index 0000000000000000000000000000000000000000..cf12a8c1f904f592e1ff5474ea63eb1b5bc8399e
Binary files /dev/null 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_pressed_off_lxx_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png
index 66824cf8e13e42dff8815e0b0e2bdab539000059..1b0ed0c97800a6de969c84bb938dec5f009f297d 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_on_lxx_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png
index 527dfd0141a033d55581b0f5b9f309ee7dabebe1..f990a9e7c834585f4dccc0572c10b5c76df30e0e 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/keyboard_key_feedback_background_lxx_dark.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_background_lxx_dark.9.png
index d3200921ac6be864381cdf442ce155c4284fce8d..8bd1343b78e0a0c7eb04e23a5c5b85e6206d0089 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_more_background_lxx_dark.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lxx_dark.9.png
index 60a36333e5f39fa4c7a5e898195c72ece710a6b8..37e45fb28942a1c2b58f96073761a02506dfe447 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_popup_panel_background_lxx_dark.9.png b/java/res/drawable-mdpi/keyboard_popup_panel_background_lxx_dark.9.png
index 896505518f99ae3e4e8d975713893e2b56485af8..f12ba5f7f198c5910e68361ea3cd6a574bd80b1c 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/suggestions_strip_divider.png b/java/res/drawable-mdpi/suggestions_strip_divider_holo.png
similarity index 100%
rename from java/res/drawable-mdpi/suggestions_strip_divider.png
rename to java/res/drawable-mdpi/suggestions_strip_divider_holo.png
diff --git a/java/res/drawable-mdpi/suggestions_strip_divider_lxx_dark.png b/java/res/drawable-mdpi/suggestions_strip_divider_lxx_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8afc66817716553a91193460ad07616a8a27fd7
Binary files /dev/null and b/java/res/drawable-mdpi/suggestions_strip_divider_lxx_dark.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 2d3ac9749205325c61bb92bdb4de550b7f697c69..ba74e5e147e276d08c8822cd6c2ee4c143b23c7a 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_language_switch_lxx_dark.png b/java/res/drawable-mdpi/sym_keyboard_language_switch_lxx_dark.png
index a90bf757ceb374f982989d70ba3cbe150022131b..44dc1b6202a6bd59dc48338730c6f3f01b31e42b 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_settings_lxx_dark.png b/java/res/drawable-mdpi/sym_keyboard_settings_lxx_dark.png
index dea7addfe2697de5e80999b0e57488b59e517de8..a04f4f515586734b2bd5748ff641af80f797ea62 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_shift_lxx_dark.png b/java/res/drawable-mdpi/sym_keyboard_shift_lxx_dark.png
index c10066e81761eb8fe056f6afb579aefc948f2e1f..d5bd44cb3c462a6621eece9c56c1c7558af5c884 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_smiley_lxx_dark.png b/java/res/drawable-mdpi/sym_keyboard_smiley_lxx_dark.png
index 8276d992c657151ee97b4a81b1b8d5921b21377d..2258851a91a20e632e2e78876ff0b94578a61067 100644
Binary files a/java/res/drawable-mdpi/sym_keyboard_smiley_lxx_dark.png and b/java/res/drawable-mdpi/sym_keyboard_smiley_lxx_dark.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 ed32cf6529d72443d555d09a88d6a633727ab876..30892b8ee14781016eb4d9e4e0e4be207fbd92e1 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_voice_lxx_dark.png b/java/res/drawable-mdpi/sym_keyboard_voice_lxx_dark.png
index 5661f6b332a0a004c8516fa2bfcc9b54566832c1..d40b106875bab47b16e1a4e459dbb9dbdbd1e892 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_off_lxx_dark.png b/java/res/drawable-mdpi/sym_keyboard_voice_off_lxx_dark.png
index 5182f1e8f9056e3f99cdf15ab2f1ce1985f827dd..7bde452e70dddfabcdf3e4932ea11b3a0dd208b9 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-xhdpi/btn_keyboard_key_active_lxx_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_active_lxx_dark.9.png
index 0f6a3e1e02bc43ad5ba36b873957e163581b85f6..47264065a59bcf1dd265c8ca9fe375119106252a 100644
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_active_lxx_dark.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_active_lxx_dark.9.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png
index 44c84f1f8acd8b2c12487aafb6968062f8ad60ba..8063fcd82409e3eacc7fbbd6ce33255bf68d522e 100644
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.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 98c085b157433b1de3d36c7dcd833a949bf28dc1..daa3c8afc3ec9d8539e9882b022c11cba58310f4 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_on_lxx_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_lxx_dark.9.png
index f0c132869ab72729077dc66a30226a381e12d038..ea002f53bbd03636f4ad61ff67bbbfc815ab2a70 100644
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_lxx_dark.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_lxx_dark.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
new file mode 100644
index 0000000000000000000000000000000000000000..4c024e2611d3fa138e6513e2f4080fd92082f970
Binary files /dev/null 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_pressed_off_lxx_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png
index a2b17ba50719b23f41c54005e68230320922ab4f..10a6ab5f95f274f4a03bd227e4f3acda903e5d82 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_on_lxx_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png
index 99ff0affb4d127eb79a8ecd2c4c9407f545c4a78..e6227c34bf1719a458726b77cb6e6842b28e129d 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/keyboard_key_feedback_background_lxx_dark.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_dark.9.png
index d40afebd8295e4aaa5858e25ac033a3674186321..8407877e23e41b2500bba49feacd4586423140ff 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_more_background_lxx_dark.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png
index d1a2f75991b18d552cf0caee24f5e8ad0fb4bb04..630340ff08a0d32ea4cb7d05f90bb9f504174131 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_popup_panel_background_lxx_dark.9.png b/java/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_dark.9.png
index 36df715b60a3adc1957576d8f37f7c704b2cc096..19957fa5f6405f94725b39b45225623db4f14e41 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/suggestions_strip_divider.png b/java/res/drawable-xhdpi/suggestions_strip_divider_holo.png
similarity index 100%
rename from java/res/drawable-xhdpi/suggestions_strip_divider.png
rename to java/res/drawable-xhdpi/suggestions_strip_divider_holo.png
diff --git a/java/res/drawable-xhdpi/suggestions_strip_divider_lxx_dark.png b/java/res/drawable-xhdpi/suggestions_strip_divider_lxx_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..0334602a228ea1e8d9adf7b1d56e250bc44c7a6e
Binary files /dev/null and b/java/res/drawable-xhdpi/suggestions_strip_divider_lxx_dark.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 7c9f34f1234915d9d99fcca72f89cbde923073bb..ffb9598cceb7eb84a5b0d961f719ba705281ca06 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_language_switch_lxx_dark.png b/java/res/drawable-xhdpi/sym_keyboard_language_switch_lxx_dark.png
index f964346c1812a34dc1bcda50ff24668883c46ae1..bdc12679665d33a85f18849701eceef389b1f23b 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_settings_lxx_dark.png b/java/res/drawable-xhdpi/sym_keyboard_settings_lxx_dark.png
index 8c83d9fb64888377eb9b79f2e935ae402638edb8..ec72c3867067ac68d3919971ce435762c25be986 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_shift_lxx_dark.png b/java/res/drawable-xhdpi/sym_keyboard_shift_lxx_dark.png
index 19acffaeb7af234b37bd9e1cc50f3adb1cd6049f..bf556058021eab0a0e8c706f9fa43980748d0c44 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_smiley_lxx_dark.png b/java/res/drawable-xhdpi/sym_keyboard_smiley_lxx_dark.png
index 78923fadb687d175e46b8164f2e6715a4ef574d1..a1d4b225960bf28446cb6a7b5eba58567a921ade 100644
Binary files a/java/res/drawable-xhdpi/sym_keyboard_smiley_lxx_dark.png and b/java/res/drawable-xhdpi/sym_keyboard_smiley_lxx_dark.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 71234e570ac82a652f751d893cf2cceeaaed8ad2..9eaa00560d2f3055cfaee6d83c3c06ffb4012a49 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_voice_lxx_dark.png b/java/res/drawable-xhdpi/sym_keyboard_voice_lxx_dark.png
index 4e9631e7b2dbd1e4f706da4c425a354ddf7143ac..5c2b40603236c63321a7c900b36c004ff0c08366 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_off_lxx_dark.png b/java/res/drawable-xhdpi/sym_keyboard_voice_off_lxx_dark.png
index 66c0e3c56ddd0d96af5c541974f199b05db1b139..a32f741b3b98fccc1e7108badbf730ca24351e60 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-xxhdpi/btn_keyboard_key_active_lxx_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_active_lxx_dark.9.png
index dc67c6f193978c702d16f312c8c12e595f542310..f4923979456edea380189b36de9e7886615320dd 100644
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_active_lxx_dark.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_active_lxx_dark.9.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png
index 2e12dd1d41a081ca33ce380673c1e4dd4d0e6e70..65e455c7b1a8c74dd7b00ca81dae5b57925d7c7f 100644
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.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 4ec5864c12336ab3d70729c4a7d11121b37abbcf..535a00adea37b725806d980dc8260a01e0b4df3f 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_on_lxx_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_normal_on_lxx_dark.9.png
index 6b5c0c0a41aa8155f39a072a222b422437720cf1..2166f62adee501107a81dbf95560b7667cab2a4e 100644
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_normal_on_lxx_dark.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_normal_on_lxx_dark.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
new file mode 100644
index 0000000000000000000000000000000000000000..f74ac5ce46b4cf11c00874ed83b60817cb0e285f
Binary files /dev/null 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_pressed_off_lxx_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png
index 6fd8eedd3f7797f8afb8591844d885a5fc7d955f..2fd8b670b784d1de82a1e2b2ae6f69b0d9db2574 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_on_lxx_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png
index 91322882fbb17297d7b9055c80da29931240f356..d0252e165fe170a796ceec962e742433bdc0053e 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/keyboard_key_feedback_background_lxx_dark.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_dark.9.png
index f7814917da8b1222fc668955f54775f6e5da5b3f..284302f9b2da2070a873bdc3d32a44aac7e442df 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_more_background_lxx_dark.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lxx_dark.9.png
index a79499f24558d2489bd3dbae4572d28dd5f06f5c..1ae262510f4891e0c244c497fa8f3ea4b2b8bf99 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_popup_panel_background_lxx_dark.9.png b/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_dark.9.png
index 91d5d7f90ad2f867c4253c1eb780b2290897d8a8..92c479da88fdfb5da107abbfddbc9793cd43f723 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/suggestions_strip_divider.png b/java/res/drawable-xxhdpi/suggestions_strip_divider_holo.png
similarity index 100%
rename from java/res/drawable-xxhdpi/suggestions_strip_divider.png
rename to java/res/drawable-xxhdpi/suggestions_strip_divider_holo.png
diff --git a/java/res/drawable-xxhdpi/suggestions_strip_divider_lxx_dark.png b/java/res/drawable-xxhdpi/suggestions_strip_divider_lxx_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f0b3dec52efc8e87ff2bd766b1769d58649f1f7
Binary files /dev/null and b/java/res/drawable-xxhdpi/suggestions_strip_divider_lxx_dark.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 dd95be61eba8341b753a3736dcd3420cdb730644..0196033a9ac7c5ebeef63992c32b17a0fcf49628 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_language_switch_lxx_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_language_switch_lxx_dark.png
index fc85e512d21ea5154c1ccf8c105a7dbb7259c7e8..151fafe8e743ff410d94e126fad266c80fc4cb09 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_settings_lxx_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_settings_lxx_dark.png
index d513ad9e65e7f85a538329ffb38487ec4512c260..143ec0038451437b6a563b1981ca6e1610d2f905 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_shift_lxx_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_shift_lxx_dark.png
index ddfc1a90daae3f0a7d3fa548e931716bc59ac06f..774174c8b3866c93af4ae3d92f3ddf0dcee2d75b 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_smiley_lxx_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_smiley_lxx_dark.png
index a4df3bb0e86065f99ac84979fc7215a91ab41a54..ea89a879046a5ad184e5ef214d64e13699b7afd1 100644
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_smiley_lxx_dark.png and b/java/res/drawable-xxhdpi/sym_keyboard_smiley_lxx_dark.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 01075ebf3eacdaae959f92ebc2169e8f02022727..abd263f009da2b3036c2d7f16cd67773dbf8127d 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_voice_lxx_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_voice_lxx_dark.png
index a36724caced263006d2b58f38955924d377f05bf..9bc9effcb3b04225f7d7d23d6a4ad2d5f299cf20 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_off_lxx_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_voice_off_lxx_dark.png
index 2706dca57955b4e1c2f2bc2246bfeacaf6a30023..413c4ff3f0d66b7baad0e3a88a4ef8df70e1cea1 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/btn_keyboard_key_popup_lxx_dark.xml b/java/res/drawable/btn_keyboard_key_popup_lxx_dark.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dee6457121627181f159a6ed60c47eb7f9b4421d
--- /dev/null
+++ b/java/res/drawable/btn_keyboard_key_popup_lxx_dark.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_popup_selected_lxx_dark" />
+    <item android:drawable="@android:color/transparent" />
+</selector>
diff --git a/java/res/layout/emoji_palettes_view.xml b/java/res/layout/emoji_palettes_view.xml
index 9ff090aada102a23e7de113f9e7ce66a1fd55e4b..a6ea38ba4f3f99c7a508047637afd80cb1c67faf 100644
--- a/java/res/layout/emoji_palettes_view.xml
+++ b/java/res/layout/emoji_palettes_view.xml
@@ -30,6 +30,7 @@
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="@dimen/config_suggestions_strip_height"
+        style="?attr/suggestionStripViewStyle"
     >
         <TabHost
             android:id="@+id/emoji_category_tabhost"
@@ -57,10 +58,7 @@
                     android:visibility="gone" />
             </FrameLayout>
         </TabHost>
-        <View
-            android:layout_width="2dip"
-            android:layout_height="match_parent"
-            android:background="@drawable/suggestions_strip_divider" />
+        <include layout="@layout/suggestion_divider" />
         <!-- TODO: Implement KeyView and replace this. -->
         <!-- Provide audio and haptic feedback by ourselves based on the keyboard settings.
              We just need to ignore the system's audio and haptic feedback settings. -->
diff --git a/java/res/layout/suggestion_divider.xml b/java/res/layout/suggestion_divider.xml
index 563599d8231d0428905d731852c9275cb4b37c33..dfea017e61fc7c03e61f5b77079f2593dea97428 100644
--- a/java/res/layout/suggestion_divider.xml
+++ b/java/res/layout/suggestion_divider.xml
@@ -26,9 +26,9 @@
     android:layout_height="match_parent"
     android:padding="0dp"
     android:gravity="center"
-    android:src="@drawable/suggestions_strip_divider"
     android:contentDescription="@null"
     android:clickable="false"
     android:longClickable="false"
     android:hapticFeedbackEnabled="false"
-    android:soundEffectsEnabled="false" />
+    android:soundEffectsEnabled="false"
+    style="?attr/suggestionStripViewStyle" />
diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
index 0eee08de2d1bb50b624b4adf5572728893a9fc2d..c85710d6a30c1bd429d6ea452396a8ef32d2df5a 100644
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@@ -40,21 +40,21 @@
     <color name="typed_word_color_klp">#D8F0F0F0</color>
     <color name="suggested_word_color_klp">#B2F0F0F0</color>
     <color name="highlight_translucent_color_klp">#99E0E0E0</color>
-    <!-- Color resources for LXX theme. Base color = F0F0F0 -->
-    <color name="key_text_color_lxx_dark">#FFFFFF</color>
-    <color name="key_text_inactive_color_lxx_dark">#808184</color>
-    <color name="key_hint_letter_color_lxx_dark">#808184</color>
-    <color name="highlight_color_lxx_dark">#7FCAC3</color>
-    <color name="typed_word_color_lxx_dark">#D87FCAC3</color>
-    <color name="suggested_word_color_lxx_dark">#B27FCAC3</color>
-    <color name="highlight_translucent_color_lxx_dark">#997FCAC3</color>
-    <color name="keyboard_background_lxx_dark">#384248</color>
-    <color name="key_background_lxx_dark">#384248</color>
-    <color name="key_background_pressed_lxx_dark">#546872</color>
-    <color name="suggestions_strip_background_lxx_dark">#263238</color>
-    <color name="suggested_word_background_selected_lxx_dark">#384248</color>
+    <!-- Color resources for LXX_Dark theme. -->
+    <color name="key_text_color_lxx_dark">#B3FFFFFF</color>
+    <color name="key_text_inactive_color_lxx_dark">#66FFFFFF</color>
+    <color name="key_hint_letter_color_lxx_dark">#66FFFFFF</color>
+    <color name="highlight_color_lxx_dark">#80CBC4</color>
+    <color name="typed_word_color_lxx_dark">#D880CBC4</color>
+    <color name="suggested_word_color_lxx_dark">#B280CBC4</color>
+    <color name="highlight_translucent_color_lxx_dark">#9980CBC4</color>
+    <color name="keyboard_background_lxx_dark">#263238</color>
+    <color name="key_background_lxx_dark">#263238</color>
+    <color name="key_background_pressed_lxx_dark">#26CFD8DC</color>
+    <color name="suggestions_strip_background_lxx_dark">#21272B</color>
+    <color name="suggested_word_background_selected_lxx_dark">#26CFD8DC</color>
     <color name="gesture_floating_preview_color_lxx_dark">#C0000000</color>
-    <color name="emoji_tab_page_indicator_background_lxx_dark">#263238</color>
+    <color name="emoji_tab_page_indicator_background_lxx_dark">#21272B</color>
     <!-- Color resources for setup wizard and tutorial -->
     <color name="setup_background">#FFEBEBEB</color>
     <color name="setup_text_dark">#FF707070</color>
diff --git a/java/res/values/keyboard-icons-lxx-dark.xml b/java/res/values/keyboard-icons-lxx-dark.xml
index 7988e739e0767b525b7ddf9dfcbba4b54b219843..b1549f2cad04e0dd9bbd25c81b208bec23931677 100644
--- a/java/res/values/keyboard-icons-lxx-dark.xml
+++ b/java/res/values/keyboard-icons-lxx-dark.xml
@@ -21,7 +21,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <style name="KeyboardIcons.LXX_Dark">
         <!-- Keyboard icons -->
-        <!-- TODO: Update those icons for LXX theme. -->
+        <!-- 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>
diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-ics.xml
index 073ae90b922bafe20521dd5a22245c3de3144fed..6118ce17798fa313a26326d8c6ff329fb6051aac 100644
--- a/java/res/values/themes-ics.xml
+++ b/java/res/values/themes-ics.xml
@@ -121,6 +121,7 @@
         <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>
         <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>
         <item name="android:background">@drawable/keyboard_suggest_strip_holo</item>
+        <item name="android:src">@drawable/suggestions_strip_divider_holo</item>
         <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
         <item name="colorValidTypedWord">@color/typed_word_color_ics</item>
         <item name="colorTypedWord">@color/typed_word_color_ics</item>
diff --git a/java/res/values/themes-klp.xml b/java/res/values/themes-klp.xml
index f895de572080c8e987505261abad2f84e9be0e06..193386062d3de0f4db7d8f2882da7ad695323004 100644
--- a/java/res/values/themes-klp.xml
+++ b/java/res/values/themes-klp.xml
@@ -121,6 +121,7 @@
         <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>
         <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>
         <item name="android:background">@drawable/keyboard_suggest_strip_holo</item>
+        <item name="android:src">@drawable/suggestions_strip_divider_holo</item>
         <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
         <item name="colorValidTypedWord">@color/typed_word_color_klp</item>
         <item name="colorTypedWord">@color/typed_word_color_klp</item>
diff --git a/java/res/values/themes-lxx-dark.xml b/java/res/values/themes-lxx-dark.xml
index 1db8f428eec63d5109bc88c023a32cc7fea50979..8d6be3b851409fdc67874952488d39869f37daf2 100644
--- a/java/res/values/themes-lxx-dark.xml
+++ b/java/res/values/themes-lxx-dark.xml
@@ -108,8 +108,7 @@
         parent="KeyboardView.LXX_Dark"
     >
         <item name="android:background">@drawable/keyboard_popup_panel_background_lxx_dark</item>
-        <!-- Reuse KLP key background -->
-        <item name="keyBackground">@drawable/btn_keyboard_key_popup_klp</item>
+        <item name="keyBackground">@drawable/btn_keyboard_key_popup_lxx_dark</item>
         <item name="keyTypeface">normal</item>
         <item name="verticalCorrection">@dimen/config_more_keys_keyboard_vertical_correction_holo</item>
     </style>
@@ -122,6 +121,7 @@
         <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>
         <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>
         <item name="android:background">@color/suggestions_strip_background_lxx_dark</item>
+        <item name="android:src">@drawable/suggestions_strip_divider_lxx_dark</item>
         <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
         <item name="colorValidTypedWord">@color/typed_word_color_lxx_dark</item>
         <item name="colorTypedWord">@color/typed_word_color_lxx_dark</item>