diff --git a/app/src/main/res/drawable-hdpi/ic_emoji_activities_normal_holo_dark.png b/app/src/main/res/drawable-hdpi/ic_emoji_activities.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_emoji_activities_normal_holo_dark.png
rename to app/src/main/res/drawable-hdpi/ic_emoji_activities.png
diff --git a/app/src/main/res/drawable-hdpi/ic_emoji_activities_normal_lxx_light.png b/app/src/main/res/drawable-hdpi/ic_emoji_activities_normal_lxx_light.png
deleted file mode 100644
index a9390754f..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_emoji_activities_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_emoji_animals_nature_normal_holo_dark.png b/app/src/main/res/drawable-hdpi/ic_emoji_animals_nature.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_emoji_animals_nature_normal_holo_dark.png
rename to app/src/main/res/drawable-hdpi/ic_emoji_animals_nature.png
diff --git a/app/src/main/res/drawable-hdpi/ic_emoji_animals_nature_normal_lxx_light.png b/app/src/main/res/drawable-hdpi/ic_emoji_animals_nature_normal_lxx_light.png
deleted file mode 100644
index 4bff3dd7d..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_emoji_animals_nature_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_emoji_emoticons_normal_holo_dark.webp b/app/src/main/res/drawable-hdpi/ic_emoji_emoticons.webp
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_emoji_emoticons_normal_holo_dark.webp
rename to app/src/main/res/drawable-hdpi/ic_emoji_emoticons.webp
diff --git a/app/src/main/res/drawable-hdpi/ic_emoji_emoticons_normal_lxx_light.png b/app/src/main/res/drawable-hdpi/ic_emoji_emoticons_normal_lxx_light.png
deleted file mode 100644
index 4c4d865c2..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_emoji_emoticons_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_emoji_flags_normal_holo_dark.png b/app/src/main/res/drawable-hdpi/ic_emoji_flags.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_emoji_flags_normal_holo_dark.png
rename to app/src/main/res/drawable-hdpi/ic_emoji_flags.png
diff --git a/app/src/main/res/drawable-hdpi/ic_emoji_flags_normal_lxx_light.png b/app/src/main/res/drawable-hdpi/ic_emoji_flags_normal_lxx_light.png
deleted file mode 100644
index 609f409b6..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_emoji_flags_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_emoji_food_drink_normal_holo_dark.png b/app/src/main/res/drawable-hdpi/ic_emoji_food_drink.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_emoji_food_drink_normal_holo_dark.png
rename to app/src/main/res/drawable-hdpi/ic_emoji_food_drink.png
diff --git a/app/src/main/res/drawable-hdpi/ic_emoji_food_drink_normal_lxx_light.png b/app/src/main/res/drawable-hdpi/ic_emoji_food_drink_normal_lxx_light.png
deleted file mode 100644
index 88dd8ba5c..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_emoji_food_drink_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_emoji_objects_normal_holo_dark.png b/app/src/main/res/drawable-hdpi/ic_emoji_objects.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_emoji_objects_normal_holo_dark.png
rename to app/src/main/res/drawable-hdpi/ic_emoji_objects.png
diff --git a/app/src/main/res/drawable-hdpi/ic_emoji_objects_normal_lxx_light.png b/app/src/main/res/drawable-hdpi/ic_emoji_objects_normal_lxx_light.png
deleted file mode 100644
index cc023c8ec..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_emoji_objects_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_emoji_people_body_normal_holo_dark.png b/app/src/main/res/drawable-hdpi/ic_emoji_people_body.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_emoji_people_body_normal_holo_dark.png
rename to app/src/main/res/drawable-hdpi/ic_emoji_people_body.png
diff --git a/app/src/main/res/drawable-hdpi/ic_emoji_people_body_normal_lxx_light.png b/app/src/main/res/drawable-hdpi/ic_emoji_people_body_normal_lxx_light.png
deleted file mode 100644
index f00aeedbd..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_emoji_people_body_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_emoji_recents_normal_holo_dark.png b/app/src/main/res/drawable-hdpi/ic_emoji_recents.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_emoji_recents_normal_holo_dark.png
rename to app/src/main/res/drawable-hdpi/ic_emoji_recents.png
diff --git a/app/src/main/res/drawable-hdpi/ic_emoji_recents_lxx.png b/app/src/main/res/drawable-hdpi/ic_emoji_recents_lxx.png
new file mode 100644
index 000000000..6a092ce79
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_emoji_recents_lxx.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_emoji_recents_normal_lxx_light.png b/app/src/main/res/drawable-hdpi/ic_emoji_recents_normal_lxx_light.png
deleted file mode 100644
index 692124de2..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_emoji_recents_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_emoji_smileys_emotion_normal_holo_dark.png b/app/src/main/res/drawable-hdpi/ic_emoji_smileys_emotion.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_emoji_smileys_emotion_normal_holo_dark.png
rename to app/src/main/res/drawable-hdpi/ic_emoji_smileys_emotion.png
diff --git a/app/src/main/res/drawable-hdpi/ic_emoji_smileys_emotion_normal_lxx_light.png b/app/src/main/res/drawable-hdpi/ic_emoji_smileys_emotion_normal_lxx_light.png
deleted file mode 100644
index 5c994b494..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_emoji_smileys_emotion_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_emoji_symbols_normal_holo_dark.png b/app/src/main/res/drawable-hdpi/ic_emoji_symbols.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_emoji_symbols_normal_holo_dark.png
rename to app/src/main/res/drawable-hdpi/ic_emoji_symbols.png
diff --git a/app/src/main/res/drawable-hdpi/ic_emoji_symbols_normal_lxx_light.png b/app/src/main/res/drawable-hdpi/ic_emoji_symbols_normal_lxx_light.png
deleted file mode 100644
index 6f0f77014..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_emoji_symbols_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_emoji_travel_places_normal_holo_dark.png b/app/src/main/res/drawable-hdpi/ic_emoji_travel_places.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_emoji_travel_places_normal_holo_dark.png
rename to app/src/main/res/drawable-hdpi/ic_emoji_travel_places.png
diff --git a/app/src/main/res/drawable-hdpi/ic_emoji_travel_places_normal_lxx_light.png b/app/src/main/res/drawable-hdpi/ic_emoji_travel_places_normal_lxx_light.png
deleted file mode 100644
index d8c134f27..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_emoji_travel_places_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_emoji_activities_normal_holo_dark.png b/app/src/main/res/drawable-mdpi/ic_emoji_activities.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_emoji_activities_normal_holo_dark.png
rename to app/src/main/res/drawable-mdpi/ic_emoji_activities.png
diff --git a/app/src/main/res/drawable-mdpi/ic_emoji_activities_normal_lxx_light.png b/app/src/main/res/drawable-mdpi/ic_emoji_activities_normal_lxx_light.png
deleted file mode 100644
index 9bd24fbc2..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_emoji_activities_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_emoji_animals_nature_normal_holo_dark.png b/app/src/main/res/drawable-mdpi/ic_emoji_animals_nature.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_emoji_animals_nature_normal_holo_dark.png
rename to app/src/main/res/drawable-mdpi/ic_emoji_animals_nature.png
diff --git a/app/src/main/res/drawable-mdpi/ic_emoji_animals_nature_normal_lxx_light.png b/app/src/main/res/drawable-mdpi/ic_emoji_animals_nature_normal_lxx_light.png
deleted file mode 100644
index 24dad25b8..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_emoji_animals_nature_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_emoji_emoticons_normal_holo_dark.webp b/app/src/main/res/drawable-mdpi/ic_emoji_emoticons.webp
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_emoji_emoticons_normal_holo_dark.webp
rename to app/src/main/res/drawable-mdpi/ic_emoji_emoticons.webp
diff --git a/app/src/main/res/drawable-mdpi/ic_emoji_emoticons_normal_lxx_light.png b/app/src/main/res/drawable-mdpi/ic_emoji_emoticons_normal_lxx_light.png
deleted file mode 100644
index 47fa86024..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_emoji_emoticons_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_emoji_flags_normal_holo_dark.png b/app/src/main/res/drawable-mdpi/ic_emoji_flags.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_emoji_flags_normal_holo_dark.png
rename to app/src/main/res/drawable-mdpi/ic_emoji_flags.png
diff --git a/app/src/main/res/drawable-mdpi/ic_emoji_flags_normal_lxx_light.png b/app/src/main/res/drawable-mdpi/ic_emoji_flags_normal_lxx_light.png
deleted file mode 100644
index 05d74cafe..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_emoji_flags_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_emoji_food_drink_normal_holo_dark.png b/app/src/main/res/drawable-mdpi/ic_emoji_food_drink.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_emoji_food_drink_normal_holo_dark.png
rename to app/src/main/res/drawable-mdpi/ic_emoji_food_drink.png
diff --git a/app/src/main/res/drawable-mdpi/ic_emoji_food_drink_normal_lxx_light.png b/app/src/main/res/drawable-mdpi/ic_emoji_food_drink_normal_lxx_light.png
deleted file mode 100644
index d570cae2a..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_emoji_food_drink_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_emoji_objects_normal_holo_dark.png b/app/src/main/res/drawable-mdpi/ic_emoji_objects.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_emoji_objects_normal_holo_dark.png
rename to app/src/main/res/drawable-mdpi/ic_emoji_objects.png
diff --git a/app/src/main/res/drawable-mdpi/ic_emoji_objects_normal_lxx_light.png b/app/src/main/res/drawable-mdpi/ic_emoji_objects_normal_lxx_light.png
deleted file mode 100644
index 855509f57..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_emoji_objects_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_emoji_people_body_normal_holo_dark.png b/app/src/main/res/drawable-mdpi/ic_emoji_people_body.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_emoji_people_body_normal_holo_dark.png
rename to app/src/main/res/drawable-mdpi/ic_emoji_people_body.png
diff --git a/app/src/main/res/drawable-mdpi/ic_emoji_people_body_normal_lxx_light.png b/app/src/main/res/drawable-mdpi/ic_emoji_people_body_normal_lxx_light.png
deleted file mode 100644
index 7722e1cf6..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_emoji_people_body_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_emoji_recents_normal_holo_dark.png b/app/src/main/res/drawable-mdpi/ic_emoji_recents.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_emoji_recents_normal_holo_dark.png
rename to app/src/main/res/drawable-mdpi/ic_emoji_recents.png
diff --git a/app/src/main/res/drawable-mdpi/ic_emoji_recents_lxx.png b/app/src/main/res/drawable-mdpi/ic_emoji_recents_lxx.png
new file mode 100644
index 000000000..eb784adca
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_emoji_recents_lxx.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_emoji_recents_normal_lxx_light.png b/app/src/main/res/drawable-mdpi/ic_emoji_recents_normal_lxx_light.png
deleted file mode 100644
index 2e96a6623..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_emoji_recents_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_emoji_smileys_emotion_normal_holo_dark.png b/app/src/main/res/drawable-mdpi/ic_emoji_smileys_emotion.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_emoji_smileys_emotion_normal_holo_dark.png
rename to app/src/main/res/drawable-mdpi/ic_emoji_smileys_emotion.png
diff --git a/app/src/main/res/drawable-mdpi/ic_emoji_smileys_emotion_normal_lxx_light.png b/app/src/main/res/drawable-mdpi/ic_emoji_smileys_emotion_normal_lxx_light.png
deleted file mode 100644
index 18ca57c0e..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_emoji_smileys_emotion_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_emoji_symbols_normal_holo_dark.png b/app/src/main/res/drawable-mdpi/ic_emoji_symbols.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_emoji_symbols_normal_holo_dark.png
rename to app/src/main/res/drawable-mdpi/ic_emoji_symbols.png
diff --git a/app/src/main/res/drawable-mdpi/ic_emoji_symbols_normal_lxx_light.png b/app/src/main/res/drawable-mdpi/ic_emoji_symbols_normal_lxx_light.png
deleted file mode 100644
index f042d52fd..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_emoji_symbols_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_emoji_travel_places_normal_holo_dark.png b/app/src/main/res/drawable-mdpi/ic_emoji_travel_places.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_emoji_travel_places_normal_holo_dark.png
rename to app/src/main/res/drawable-mdpi/ic_emoji_travel_places.png
diff --git a/app/src/main/res/drawable-mdpi/ic_emoji_travel_places_normal_lxx_light.png b/app/src/main/res/drawable-mdpi/ic_emoji_travel_places_normal_lxx_light.png
deleted file mode 100644
index 9c6c2429f..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_emoji_travel_places_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_emoji_activities_normal_holo_dark.png b/app/src/main/res/drawable-xhdpi/ic_emoji_activities.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_emoji_activities_normal_holo_dark.png
rename to app/src/main/res/drawable-xhdpi/ic_emoji_activities.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_emoji_activities_normal_lxx_light.png b/app/src/main/res/drawable-xhdpi/ic_emoji_activities_normal_lxx_light.png
deleted file mode 100644
index 6153a7514..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_emoji_activities_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_emoji_animals_nature_normal_holo_dark.png b/app/src/main/res/drawable-xhdpi/ic_emoji_animals_nature.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_emoji_animals_nature_normal_holo_dark.png
rename to app/src/main/res/drawable-xhdpi/ic_emoji_animals_nature.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_emoji_animals_nature_normal_lxx_light.png b/app/src/main/res/drawable-xhdpi/ic_emoji_animals_nature_normal_lxx_light.png
deleted file mode 100644
index 839fe45ce..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_emoji_animals_nature_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_emoji_emoticons_normal_holo_dark.webp b/app/src/main/res/drawable-xhdpi/ic_emoji_emoticons.webp
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_emoji_emoticons_normal_holo_dark.webp
rename to app/src/main/res/drawable-xhdpi/ic_emoji_emoticons.webp
diff --git a/app/src/main/res/drawable-xhdpi/ic_emoji_emoticons_normal_lxx_light.png b/app/src/main/res/drawable-xhdpi/ic_emoji_emoticons_normal_lxx_light.png
deleted file mode 100644
index a9cb4b0ad..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_emoji_emoticons_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_emoji_flags_normal_holo_dark.png b/app/src/main/res/drawable-xhdpi/ic_emoji_flags.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_emoji_flags_normal_holo_dark.png
rename to app/src/main/res/drawable-xhdpi/ic_emoji_flags.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_emoji_flags_normal_lxx_light.png b/app/src/main/res/drawable-xhdpi/ic_emoji_flags_normal_lxx_light.png
deleted file mode 100644
index 173a7f89e..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_emoji_flags_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_emoji_food_drink_normal_holo_dark.png b/app/src/main/res/drawable-xhdpi/ic_emoji_food_drink.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_emoji_food_drink_normal_holo_dark.png
rename to app/src/main/res/drawable-xhdpi/ic_emoji_food_drink.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_emoji_food_drink_normal_lxx_light.png b/app/src/main/res/drawable-xhdpi/ic_emoji_food_drink_normal_lxx_light.png
deleted file mode 100644
index 5c73e82c6..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_emoji_food_drink_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_emoji_objects_normal_holo_dark.png b/app/src/main/res/drawable-xhdpi/ic_emoji_objects.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_emoji_objects_normal_holo_dark.png
rename to app/src/main/res/drawable-xhdpi/ic_emoji_objects.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_emoji_objects_normal_lxx_light.png b/app/src/main/res/drawable-xhdpi/ic_emoji_objects_normal_lxx_light.png
deleted file mode 100644
index cdfb08459..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_emoji_objects_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_emoji_people_body_normal_holo_dark.png b/app/src/main/res/drawable-xhdpi/ic_emoji_people_body.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_emoji_people_body_normal_holo_dark.png
rename to app/src/main/res/drawable-xhdpi/ic_emoji_people_body.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_emoji_people_body_normal_lxx_light.png b/app/src/main/res/drawable-xhdpi/ic_emoji_people_body_normal_lxx_light.png
deleted file mode 100644
index c2774cc61..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_emoji_people_body_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_emoji_recents_normal_holo_dark.png b/app/src/main/res/drawable-xhdpi/ic_emoji_recents.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_emoji_recents_normal_holo_dark.png
rename to app/src/main/res/drawable-xhdpi/ic_emoji_recents.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_emoji_recents_lxx.png b/app/src/main/res/drawable-xhdpi/ic_emoji_recents_lxx.png
new file mode 100644
index 000000000..2f53c0464
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_emoji_recents_lxx.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_emoji_recents_normal_lxx_light.png b/app/src/main/res/drawable-xhdpi/ic_emoji_recents_normal_lxx_light.png
deleted file mode 100644
index d5a6bcf27..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_emoji_recents_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_emoji_smileys_emotion_normal_holo_dark.png b/app/src/main/res/drawable-xhdpi/ic_emoji_smileys_emotion.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_emoji_smileys_emotion_normal_holo_dark.png
rename to app/src/main/res/drawable-xhdpi/ic_emoji_smileys_emotion.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_emoji_smileys_emotion_normal_lxx_light.png b/app/src/main/res/drawable-xhdpi/ic_emoji_smileys_emotion_normal_lxx_light.png
deleted file mode 100644
index a9d7487ab..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_emoji_smileys_emotion_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_emoji_symbols_normal_holo_dark.png b/app/src/main/res/drawable-xhdpi/ic_emoji_symbols.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_emoji_symbols_normal_holo_dark.png
rename to app/src/main/res/drawable-xhdpi/ic_emoji_symbols.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_emoji_symbols_normal_lxx_light.png b/app/src/main/res/drawable-xhdpi/ic_emoji_symbols_normal_lxx_light.png
deleted file mode 100644
index 966fab6f9..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_emoji_symbols_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_emoji_travel_places_normal_holo_dark.png b/app/src/main/res/drawable-xhdpi/ic_emoji_travel_places.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_emoji_travel_places_normal_holo_dark.png
rename to app/src/main/res/drawable-xhdpi/ic_emoji_travel_places.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_emoji_travel_places_normal_lxx_light.png b/app/src/main/res/drawable-xhdpi/ic_emoji_travel_places_normal_lxx_light.png
deleted file mode 100644
index c142db08c..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_emoji_travel_places_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_emoji_activities_normal_holo_dark.png b/app/src/main/res/drawable-xxhdpi/ic_emoji_activities.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_emoji_activities_normal_holo_dark.png
rename to app/src/main/res/drawable-xxhdpi/ic_emoji_activities.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_emoji_activities_normal_lxx_light.png b/app/src/main/res/drawable-xxhdpi/ic_emoji_activities_normal_lxx_light.png
deleted file mode 100644
index 85d7429f7..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_emoji_activities_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_emoji_animals_nature_normal_holo_dark.png b/app/src/main/res/drawable-xxhdpi/ic_emoji_animals_nature.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_emoji_animals_nature_normal_holo_dark.png
rename to app/src/main/res/drawable-xxhdpi/ic_emoji_animals_nature.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_emoji_animals_nature_normal_lxx_light.png b/app/src/main/res/drawable-xxhdpi/ic_emoji_animals_nature_normal_lxx_light.png
deleted file mode 100644
index 32f97906b..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_emoji_animals_nature_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_emoji_emoticons_normal_holo_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_emoji_emoticons.webp
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_emoji_emoticons_normal_holo_dark.webp
rename to app/src/main/res/drawable-xxhdpi/ic_emoji_emoticons.webp
diff --git a/app/src/main/res/drawable-xxhdpi/ic_emoji_emoticons_normal_lxx_light.png b/app/src/main/res/drawable-xxhdpi/ic_emoji_emoticons_normal_lxx_light.png
deleted file mode 100644
index 2f7223a59..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_emoji_emoticons_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_emoji_flags_normal_holo_dark.png b/app/src/main/res/drawable-xxhdpi/ic_emoji_flags.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_emoji_flags_normal_holo_dark.png
rename to app/src/main/res/drawable-xxhdpi/ic_emoji_flags.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_emoji_flags_normal_lxx_light.png b/app/src/main/res/drawable-xxhdpi/ic_emoji_flags_normal_lxx_light.png
deleted file mode 100644
index 707b67cd5..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_emoji_flags_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_emoji_food_drink_normal_holo_dark.png b/app/src/main/res/drawable-xxhdpi/ic_emoji_food_drink.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_emoji_food_drink_normal_holo_dark.png
rename to app/src/main/res/drawable-xxhdpi/ic_emoji_food_drink.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_emoji_food_drink_normal_lxx_light.png b/app/src/main/res/drawable-xxhdpi/ic_emoji_food_drink_normal_lxx_light.png
deleted file mode 100644
index ad08889e0..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_emoji_food_drink_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_emoji_objects_normal_holo_dark.png b/app/src/main/res/drawable-xxhdpi/ic_emoji_objects.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_emoji_objects_normal_holo_dark.png
rename to app/src/main/res/drawable-xxhdpi/ic_emoji_objects.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_emoji_objects_normal_lxx_light.png b/app/src/main/res/drawable-xxhdpi/ic_emoji_objects_normal_lxx_light.png
deleted file mode 100644
index 295b54901..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_emoji_objects_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_emoji_people_body_normal_holo_dark.png b/app/src/main/res/drawable-xxhdpi/ic_emoji_people_body.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_emoji_people_body_normal_holo_dark.png
rename to app/src/main/res/drawable-xxhdpi/ic_emoji_people_body.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_emoji_people_body_normal_lxx_light.png b/app/src/main/res/drawable-xxhdpi/ic_emoji_people_body_normal_lxx_light.png
deleted file mode 100644
index f332cd7bb..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_emoji_people_body_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_emoji_recents_normal_holo_dark.png b/app/src/main/res/drawable-xxhdpi/ic_emoji_recents.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_emoji_recents_normal_holo_dark.png
rename to app/src/main/res/drawable-xxhdpi/ic_emoji_recents.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_emoji_recents_lxx.png b/app/src/main/res/drawable-xxhdpi/ic_emoji_recents_lxx.png
new file mode 100644
index 000000000..93fe1f3c8
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_emoji_recents_lxx.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_emoji_recents_normal_lxx_light.png b/app/src/main/res/drawable-xxhdpi/ic_emoji_recents_normal_lxx_light.png
deleted file mode 100644
index 41b353ffe..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_emoji_recents_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_emoji_smileys_emotion_normal_holo_dark.png b/app/src/main/res/drawable-xxhdpi/ic_emoji_smileys_emotion.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_emoji_smileys_emotion_normal_holo_dark.png
rename to app/src/main/res/drawable-xxhdpi/ic_emoji_smileys_emotion.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_emoji_smileys_emotion_normal_lxx_light.png b/app/src/main/res/drawable-xxhdpi/ic_emoji_smileys_emotion_normal_lxx_light.png
deleted file mode 100644
index ec40fad0f..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_emoji_smileys_emotion_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_emoji_symbols_normal_holo_dark.png b/app/src/main/res/drawable-xxhdpi/ic_emoji_symbols.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_emoji_symbols_normal_holo_dark.png
rename to app/src/main/res/drawable-xxhdpi/ic_emoji_symbols.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_emoji_symbols_normal_lxx_light.png b/app/src/main/res/drawable-xxhdpi/ic_emoji_symbols_normal_lxx_light.png
deleted file mode 100644
index f4ad3425c..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_emoji_symbols_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_emoji_travel_places_normal_holo_dark.png b/app/src/main/res/drawable-xxhdpi/ic_emoji_travel_places.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_emoji_travel_places_normal_holo_dark.png
rename to app/src/main/res/drawable-xxhdpi/ic_emoji_travel_places.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_emoji_travel_places_normal_lxx_light.png b/app/src/main/res/drawable-xxhdpi/ic_emoji_travel_places_normal_lxx_light.png
deleted file mode 100644
index 882648c07..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_emoji_travel_places_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_emoji_activities_normal_lxx_light.png b/app/src/main/res/drawable-xxxhdpi/ic_emoji_activities_normal_lxx_light.png
deleted file mode 100644
index e39498fe6..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_emoji_activities_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_emoji_animals_nature_normal_lxx_light.png b/app/src/main/res/drawable-xxxhdpi/ic_emoji_animals_nature_normal_lxx_light.png
deleted file mode 100644
index ed90d2629..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_emoji_animals_nature_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_emoji_emoticons_normal_lxx_light.png b/app/src/main/res/drawable-xxxhdpi/ic_emoji_emoticons_normal_lxx_light.png
deleted file mode 100644
index 04f7b648d..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_emoji_emoticons_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_emoji_flags_normal_lxx_light.png b/app/src/main/res/drawable-xxxhdpi/ic_emoji_flags_normal_lxx_light.png
deleted file mode 100644
index 9d968e475..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_emoji_flags_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_emoji_food_drink_normal_lxx_light.png b/app/src/main/res/drawable-xxxhdpi/ic_emoji_food_drink_normal_lxx_light.png
deleted file mode 100644
index 09fbbcc28..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_emoji_food_drink_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_emoji_objects_normal_lxx_light.png b/app/src/main/res/drawable-xxxhdpi/ic_emoji_objects_normal_lxx_light.png
deleted file mode 100644
index cc4d97d91..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_emoji_objects_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_emoji_people_body_normal_holo_dark.png b/app/src/main/res/drawable-xxxhdpi/ic_emoji_people_body.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_emoji_people_body_normal_holo_dark.png
rename to app/src/main/res/drawable-xxxhdpi/ic_emoji_people_body.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_emoji_people_body_normal_lxx_light.png b/app/src/main/res/drawable-xxxhdpi/ic_emoji_people_body_normal_lxx_light.png
deleted file mode 100644
index 35720eca4..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_emoji_people_body_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_emoji_recents_lxx.png b/app/src/main/res/drawable-xxxhdpi/ic_emoji_recents_lxx.png
new file mode 100644
index 000000000..d6b9aa4dd
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_emoji_recents_lxx.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_emoji_recents_normal_lxx_light.png b/app/src/main/res/drawable-xxxhdpi/ic_emoji_recents_normal_lxx_light.png
deleted file mode 100644
index c9cdd7f81..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_emoji_recents_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_emoji_smileys_emotion_normal_holo_dark.png b/app/src/main/res/drawable-xxxhdpi/ic_emoji_smileys_emotion.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_emoji_smileys_emotion_normal_holo_dark.png
rename to app/src/main/res/drawable-xxxhdpi/ic_emoji_smileys_emotion.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_emoji_smileys_emotion_normal_lxx_light.png b/app/src/main/res/drawable-xxxhdpi/ic_emoji_smileys_emotion_normal_lxx_light.png
deleted file mode 100644
index 21fee1893..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_emoji_smileys_emotion_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_emoji_symbols_normal_lxx_light.png b/app/src/main/res/drawable-xxxhdpi/ic_emoji_symbols_normal_lxx_light.png
deleted file mode 100644
index f8c16c3fa..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_emoji_symbols_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_emoji_travel_places_normal_lxx_light.png b/app/src/main/res/drawable-xxxhdpi/ic_emoji_travel_places_normal_lxx_light.png
deleted file mode 100644
index 468059717..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_emoji_travel_places_normal_lxx_light.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_emoji_activities_lxx.xml b/app/src/main/res/drawable/ic_emoji_activities_lxx.xml
new file mode 100644
index 000000000..73ee64733
--- /dev/null
+++ b/app/src/main/res/drawable/ic_emoji_activities_lxx.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- when using inset drawable, insets are only respected in preview -->
+    <!-- when setting width/height for the whole drawable (and not just a layer), it's ignored too -->
+    <item
+        android:width="24dp"
+        android:height="24dp"
+        android:drawable="@drawable/ic_emoji_activities"
+        />
+</layer-list>
diff --git a/app/src/main/res/drawable/ic_emoji_animals_nature_lxx.xml b/app/src/main/res/drawable/ic_emoji_animals_nature_lxx.xml
new file mode 100644
index 000000000..26362de4b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_emoji_animals_nature_lxx.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- when using inset drawable, insets are only respected in preview -->
+    <!-- when setting width/height for the whole drawable (and not just a layer), it's ignored too -->
+    <item
+        android:width="24dp"
+        android:height="24dp"
+        android:drawable="@drawable/ic_emoji_animals_nature"
+        />
+</layer-list>
diff --git a/app/src/main/res/drawable/ic_emoji_emoticons_lxx.xml b/app/src/main/res/drawable/ic_emoji_emoticons_lxx.xml
new file mode 100644
index 000000000..f97c2049f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_emoji_emoticons_lxx.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- when using inset drawable, insets are only respected in preview -->
+    <!-- when setting width/height for the whole drawable (and not just a layer), it's ignored too -->
+    <item
+        android:width="24dp"
+        android:height="24dp"
+        android:drawable="@drawable/ic_emoji_emoticons"
+        />
+</layer-list>
diff --git a/app/src/main/res/drawable/ic_emoji_flags_lxx.xml b/app/src/main/res/drawable/ic_emoji_flags_lxx.xml
new file mode 100644
index 000000000..a1b8dd31a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_emoji_flags_lxx.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- when using inset drawable, insets are only respected in preview -->
+    <!-- when setting width/height for the whole drawable (and not just a layer), it's ignored too -->
+    <item
+        android:width="24dp"
+        android:height="24dp"
+        android:drawable="@drawable/ic_emoji_flags"
+        />
+</layer-list>
diff --git a/app/src/main/res/drawable/ic_emoji_food_drink_lxx.xml b/app/src/main/res/drawable/ic_emoji_food_drink_lxx.xml
new file mode 100644
index 000000000..0279b55c2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_emoji_food_drink_lxx.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- when using inset drawable, insets are only respected in preview -->
+    <!-- when setting width/height for the whole drawable (and not just a layer), it's ignored too -->
+    <item
+        android:width="24dp"
+        android:height="24dp"
+        android:drawable="@drawable/ic_emoji_food_drink"
+        />
+</layer-list>
diff --git a/app/src/main/res/drawable/ic_emoji_objects_lxx.xml b/app/src/main/res/drawable/ic_emoji_objects_lxx.xml
new file mode 100644
index 000000000..f93efc610
--- /dev/null
+++ b/app/src/main/res/drawable/ic_emoji_objects_lxx.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- when using inset drawable, insets are only respected in preview -->
+    <!-- when setting width/height for the whole drawable (and not just a layer), it's ignored too -->
+    <item
+        android:width="24dp"
+        android:height="24dp"
+        android:drawable="@drawable/ic_emoji_objects"
+        />
+</layer-list>
diff --git a/app/src/main/res/drawable/ic_emoji_people_body_lxx.xml b/app/src/main/res/drawable/ic_emoji_people_body_lxx.xml
new file mode 100644
index 000000000..f7f321a3f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_emoji_people_body_lxx.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- when using inset drawable, insets are only respected in preview -->
+    <!-- when setting width/height for the whole drawable (and not just a layer), it's ignored too -->
+    <item
+        android:width="24dp"
+        android:height="24dp"
+        android:drawable="@drawable/ic_emoji_people_body"
+        />
+</layer-list>
diff --git a/app/src/main/res/drawable/ic_emoji_recents_lxx_wrap.xml b/app/src/main/res/drawable/ic_emoji_recents_lxx_wrap.xml
new file mode 100644
index 000000000..c83176bcc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_emoji_recents_lxx_wrap.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- when using inset drawable, insets are only respected in preview -->
+    <!-- when setting width/height for the whole drawable (and not just a layer), it's ignored too -->
+    <item
+        android:width="24dp"
+        android:height="24dp"
+        android:drawable="@drawable/ic_emoji_recents_lxx"
+        />
+</layer-list>
diff --git a/app/src/main/res/drawable/ic_emoji_smileys_emotion_lxx.xml b/app/src/main/res/drawable/ic_emoji_smileys_emotion_lxx.xml
new file mode 100644
index 000000000..6832571d1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_emoji_smileys_emotion_lxx.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- when using inset drawable, insets are only respected in preview -->
+    <!-- when setting width/height for the whole drawable (and not just a layer), it's ignored too -->
+    <item
+        android:width="24dp"
+        android:height="24dp"
+        android:drawable="@drawable/ic_emoji_smileys_emotion"
+        />
+</layer-list>
diff --git a/app/src/main/res/drawable/ic_emoji_symbols_lxx.xml b/app/src/main/res/drawable/ic_emoji_symbols_lxx.xml
new file mode 100644
index 000000000..0634c7b16
--- /dev/null
+++ b/app/src/main/res/drawable/ic_emoji_symbols_lxx.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- when using inset drawable, insets are only respected in preview -->
+    <!-- when setting width/height for the whole drawable (and not just a layer), it's ignored too -->
+    <item
+        android:width="24dp"
+        android:height="24dp"
+        android:drawable="@drawable/ic_emoji_symbols"
+        />
+</layer-list>
diff --git a/app/src/main/res/drawable/ic_emoji_travel_places_lxx.xml b/app/src/main/res/drawable/ic_emoji_travel_places_lxx.xml
new file mode 100644
index 000000000..0076f2f10
--- /dev/null
+++ b/app/src/main/res/drawable/ic_emoji_travel_places_lxx.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- when using inset drawable, insets are only respected in preview -->
+    <!-- when setting width/height for the whole drawable (and not just a layer), it's ignored too -->
+    <item
+        android:width="24dp"
+        android:height="24dp"
+        android:drawable="@drawable/ic_emoji_travel_places"
+        />
+</layer-list>
diff --git a/app/src/main/res/values/themes-holo_base.xml b/app/src/main/res/values/themes-holo_base.xml
index 4729340e8..a6ca74325 100644
--- a/app/src/main/res/values/themes-holo_base.xml
+++ b/app/src/main/res/values/themes-holo_base.xml
@@ -87,17 +87,17 @@
         <item name="categoryIndicatorBackground">@drawable/emoji_category_tab_unselected_holo_dark</item>
         <item name="categoryPageIndicatorColor">@color/highlight_color_holo_white</item>
         <item name="categoryPageIndicatorBackground">@color/emoji_tab_page_indicator_background_holo</item>
-        <item name="iconEmojiRecentsTab">@drawable/ic_emoji_recents_normal_holo_dark</item>
-        <item name="iconEmojiCategory1Tab">@drawable/ic_emoji_smileys_emotion_normal_holo_dark</item>
-        <item name="iconEmojiCategory2Tab">@drawable/ic_emoji_people_body_normal_holo_dark</item>
-        <item name="iconEmojiCategory3Tab">@drawable/ic_emoji_animals_nature_normal_holo_dark</item>
-        <item name="iconEmojiCategory4Tab">@drawable/ic_emoji_food_drink_normal_holo_dark</item>
-        <item name="iconEmojiCategory5Tab">@drawable/ic_emoji_travel_places_normal_holo_dark</item>
-        <item name="iconEmojiCategory6Tab">@drawable/ic_emoji_activities_normal_holo_dark</item>
-        <item name="iconEmojiCategory7Tab">@drawable/ic_emoji_objects_normal_holo_dark</item>
-        <item name="iconEmojiCategory8Tab">@drawable/ic_emoji_symbols_normal_holo_dark</item>
-        <item name="iconEmojiCategory9Tab">@drawable/ic_emoji_flags_normal_holo_dark</item>
-        <item name="iconEmojiCategory10Tab">@drawable/ic_emoji_emoticons_normal_holo_dark</item>
+        <item name="iconEmojiRecentsTab">@drawable/ic_emoji_recents</item>
+        <item name="iconEmojiCategory1Tab">@drawable/ic_emoji_smileys_emotion</item>
+        <item name="iconEmojiCategory2Tab">@drawable/ic_emoji_people_body</item>
+        <item name="iconEmojiCategory3Tab">@drawable/ic_emoji_animals_nature</item>
+        <item name="iconEmojiCategory4Tab">@drawable/ic_emoji_food_drink</item>
+        <item name="iconEmojiCategory5Tab">@drawable/ic_emoji_travel_places</item>
+        <item name="iconEmojiCategory6Tab">@drawable/ic_emoji_activities</item>
+        <item name="iconEmojiCategory7Tab">@drawable/ic_emoji_objects</item>
+        <item name="iconEmojiCategory8Tab">@drawable/ic_emoji_symbols</item>
+        <item name="iconEmojiCategory9Tab">@drawable/ic_emoji_flags</item>
+        <item name="iconEmojiCategory10Tab">@drawable/ic_emoji_emoticons</item>
     </style>
     <style
             name="ClipboardHistoryView.HoloBase"
diff --git a/app/src/main/res/values/themes-lxx-base.xml b/app/src/main/res/values/themes-lxx-base.xml
index 0bb16868a..861764a0b 100644
--- a/app/src/main/res/values/themes-lxx-base.xml
+++ b/app/src/main/res/values/themes-lxx-base.xml
@@ -67,17 +67,17 @@
         <item name="categoryIndicatorEnabled">false</item>
         <item name="categoryPageIndicatorColor">@color/highlight_color_lxx_light</item>
         <item name="categoryPageIndicatorBackground">@color/emoji_tab_page_indicator_background_lxx_base</item>
-        <item name="iconEmojiRecentsTab">@drawable/ic_emoji_recents_normal_lxx_light</item>
-        <item name="iconEmojiCategory1Tab">@drawable/ic_emoji_smileys_emotion_normal_lxx_light</item>
-        <item name="iconEmojiCategory2Tab">@drawable/ic_emoji_people_body_normal_lxx_light</item>
-        <item name="iconEmojiCategory3Tab">@drawable/ic_emoji_animals_nature_normal_lxx_light</item>
-        <item name="iconEmojiCategory4Tab">@drawable/ic_emoji_food_drink_normal_lxx_light</item>
-        <item name="iconEmojiCategory5Tab">@drawable/ic_emoji_travel_places_normal_lxx_light</item>
-        <item name="iconEmojiCategory6Tab">@drawable/ic_emoji_activities_normal_lxx_light</item>
-        <item name="iconEmojiCategory7Tab">@drawable/ic_emoji_objects_normal_lxx_light</item>
-        <item name="iconEmojiCategory8Tab">@drawable/ic_emoji_symbols_normal_lxx_light</item>
-        <item name="iconEmojiCategory9Tab">@drawable/ic_emoji_flags_normal_lxx_light</item>
-        <item name="iconEmojiCategory10Tab">@drawable/ic_emoji_emoticons_normal_lxx_light</item>
+        <item name="iconEmojiRecentsTab">@drawable/ic_emoji_recents_lxx_wrap</item>
+        <item name="iconEmojiCategory1Tab">@drawable/ic_emoji_smileys_emotion_lxx</item>
+        <item name="iconEmojiCategory2Tab">@drawable/ic_emoji_people_body_lxx</item>
+        <item name="iconEmojiCategory3Tab">@drawable/ic_emoji_animals_nature_lxx</item>
+        <item name="iconEmojiCategory4Tab">@drawable/ic_emoji_food_drink_lxx</item>
+        <item name="iconEmojiCategory5Tab">@drawable/ic_emoji_travel_places_lxx</item>
+        <item name="iconEmojiCategory6Tab">@drawable/ic_emoji_activities_lxx</item>
+        <item name="iconEmojiCategory7Tab">@drawable/ic_emoji_objects_lxx</item>
+        <item name="iconEmojiCategory8Tab">@drawable/ic_emoji_symbols_lxx</item>
+        <item name="iconEmojiCategory9Tab">@drawable/ic_emoji_flags_lxx</item>
+        <item name="iconEmojiCategory10Tab">@drawable/ic_emoji_emoticons_lxx</item>
     </style>
     <style
         name="ClipboardHistoryView.LXX_Base"