diff --git a/res/drawable-hdpi/ic_directions_bike_white_24dp.png b/res/drawable-hdpi/ic_directions_bike_white_24dp.png
deleted file mode 100644
index b45c38bad..000000000
Binary files a/res/drawable-hdpi/ic_directions_bike_white_24dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_activity_activated_dark.png b/res/drawable-hdpi/ic_emoji_activity_activated_dark.png
new file mode 100644
index 000000000..f6adac4d8
Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_activity_activated_dark.png differ
diff --git a/res/drawable-hdpi/ic_emoji_activity_activated_light.png b/res/drawable-hdpi/ic_emoji_activity_activated_light.png
new file mode 100644
index 000000000..cec4c2ba3
Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_activity_activated_light.png differ
diff --git a/res/drawable-hdpi/ic_emoji_activity_normal_dark.png b/res/drawable-hdpi/ic_emoji_activity_normal_dark.png
new file mode 100644
index 000000000..a61dcce74
Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_activity_normal_dark.png differ
diff --git a/res/drawable-hdpi/ic_emoji_activity_normal_light.png b/res/drawable-hdpi/ic_emoji_activity_normal_light.png
new file mode 100644
index 000000000..f6adac4d8
Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_activity_normal_light.png differ
diff --git a/res/drawable-hdpi/ic_emoji_flag_activated_dark.png b/res/drawable-hdpi/ic_emoji_flag_activated_dark.png
new file mode 100644
index 000000000..cb37eb1f0
Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_flag_activated_dark.png differ
diff --git a/res/drawable-hdpi/ic_emoji_flag_activated_light.png b/res/drawable-hdpi/ic_emoji_flag_activated_light.png
new file mode 100644
index 000000000..97bc953d6
Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_flag_activated_light.png differ
diff --git a/res/drawable-hdpi/ic_emoji_flag_normal_dark.png b/res/drawable-hdpi/ic_emoji_flag_normal_dark.png
new file mode 100644
index 000000000..56583915d
Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_flag_normal_dark.png differ
diff --git a/res/drawable-hdpi/ic_emoji_flag_normal_light.png b/res/drawable-hdpi/ic_emoji_flag_normal_light.png
new file mode 100644
index 000000000..cb37eb1f0
Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_flag_normal_light.png differ
diff --git a/res/drawable-hdpi/ic_emoji_foods_activated_dark.png b/res/drawable-hdpi/ic_emoji_foods_activated_dark.png
new file mode 100644
index 000000000..2f07dbb65
Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_foods_activated_dark.png differ
diff --git a/res/drawable-hdpi/ic_emoji_foods_activated_light.png b/res/drawable-hdpi/ic_emoji_foods_activated_light.png
new file mode 100644
index 000000000..365785ada
Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_foods_activated_light.png differ
diff --git a/res/drawable-hdpi/ic_emoji_foods_normal_dark.png b/res/drawable-hdpi/ic_emoji_foods_normal_dark.png
new file mode 100644
index 000000000..5c533050f
Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_foods_normal_dark.png differ
diff --git a/res/drawable-hdpi/ic_emoji_foods_normal_light.png b/res/drawable-hdpi/ic_emoji_foods_normal_light.png
new file mode 100644
index 000000000..2f07dbb65
Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_foods_normal_light.png differ
diff --git a/res/drawable-hdpi/ic_emoji_nature_activated_dark.png b/res/drawable-hdpi/ic_emoji_nature_activated_dark.png
index 8ae67c762..8e970200b 100644
Binary files a/res/drawable-hdpi/ic_emoji_nature_activated_dark.png and b/res/drawable-hdpi/ic_emoji_nature_activated_dark.png differ
diff --git a/res/drawable-hdpi/ic_emoji_nature_activated_light.png b/res/drawable-hdpi/ic_emoji_nature_activated_light.png
index 5d02a02a3..b6f53b41d 100644
Binary files a/res/drawable-hdpi/ic_emoji_nature_activated_light.png and b/res/drawable-hdpi/ic_emoji_nature_activated_light.png differ
diff --git a/res/drawable-hdpi/ic_emoji_nature_normal_dark.png b/res/drawable-hdpi/ic_emoji_nature_normal_dark.png
index fd22d38a4..90ca0acb5 100644
Binary files a/res/drawable-hdpi/ic_emoji_nature_normal_dark.png and b/res/drawable-hdpi/ic_emoji_nature_normal_dark.png differ
diff --git a/res/drawable-hdpi/ic_emoji_nature_normal_light.png b/res/drawable-hdpi/ic_emoji_nature_normal_light.png
index 2a9395052..8e970200b 100644
Binary files a/res/drawable-hdpi/ic_emoji_nature_normal_light.png and b/res/drawable-hdpi/ic_emoji_nature_normal_light.png differ
diff --git a/res/drawable-hdpi/ic_emoji_object_activated_dark.png b/res/drawable-hdpi/ic_emoji_object_activated_dark.png
new file mode 100644
index 000000000..823394d6e
Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_object_activated_dark.png differ
diff --git a/res/drawable-hdpi/ic_emoji_object_activated_light.png b/res/drawable-hdpi/ic_emoji_object_activated_light.png
new file mode 100644
index 000000000..2ece8cead
Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_object_activated_light.png differ
diff --git a/res/drawable-hdpi/ic_emoji_object_normal_dark.png b/res/drawable-hdpi/ic_emoji_object_normal_dark.png
new file mode 100644
index 000000000..23f6b43a0
Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_object_normal_dark.png differ
diff --git a/res/drawable-hdpi/ic_emoji_object_normal_light.png b/res/drawable-hdpi/ic_emoji_object_normal_light.png
new file mode 100644
index 000000000..823394d6e
Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_object_normal_light.png differ
diff --git a/res/drawable-hdpi/ic_emoji_people_activated_dark.png b/res/drawable-hdpi/ic_emoji_people_activated_dark.png
index e70241562..787d0002c 100644
Binary files a/res/drawable-hdpi/ic_emoji_people_activated_dark.png and b/res/drawable-hdpi/ic_emoji_people_activated_dark.png differ
diff --git a/res/drawable-hdpi/ic_emoji_people_activated_light.png b/res/drawable-hdpi/ic_emoji_people_activated_light.png
index b16705c5f..262ea943a 100644
Binary files a/res/drawable-hdpi/ic_emoji_people_activated_light.png and b/res/drawable-hdpi/ic_emoji_people_activated_light.png differ
diff --git a/res/drawable-hdpi/ic_emoji_people_normal_dark.png b/res/drawable-hdpi/ic_emoji_people_normal_dark.png
index aea6cfe79..e581af307 100644
Binary files a/res/drawable-hdpi/ic_emoji_people_normal_dark.png and b/res/drawable-hdpi/ic_emoji_people_normal_dark.png differ
diff --git a/res/drawable-hdpi/ic_emoji_people_normal_light.png b/res/drawable-hdpi/ic_emoji_people_normal_light.png
index 00bc3b6d0..787d0002c 100644
Binary files a/res/drawable-hdpi/ic_emoji_people_normal_light.png and b/res/drawable-hdpi/ic_emoji_people_normal_light.png differ
diff --git a/res/drawable-hdpi/ic_emoji_places_activated_dark.png b/res/drawable-hdpi/ic_emoji_places_activated_dark.png
index b4683d11c..721281d84 100644
Binary files a/res/drawable-hdpi/ic_emoji_places_activated_dark.png and b/res/drawable-hdpi/ic_emoji_places_activated_dark.png differ
diff --git a/res/drawable-hdpi/ic_emoji_places_activated_light.png b/res/drawable-hdpi/ic_emoji_places_activated_light.png
index f6d936827..78a4a39e0 100644
Binary files a/res/drawable-hdpi/ic_emoji_places_activated_light.png and b/res/drawable-hdpi/ic_emoji_places_activated_light.png differ
diff --git a/res/drawable-hdpi/ic_emoji_places_normal_dark.png b/res/drawable-hdpi/ic_emoji_places_normal_dark.png
index 4527cdefc..1744eb741 100644
Binary files a/res/drawable-hdpi/ic_emoji_places_normal_dark.png and b/res/drawable-hdpi/ic_emoji_places_normal_dark.png differ
diff --git a/res/drawable-hdpi/ic_emoji_places_normal_light.png b/res/drawable-hdpi/ic_emoji_places_normal_light.png
index ebcfd5a29..721281d84 100644
Binary files a/res/drawable-hdpi/ic_emoji_places_normal_light.png and b/res/drawable-hdpi/ic_emoji_places_normal_light.png differ
diff --git a/res/drawable-hdpi/ic_emoji_symbols_activated_dark.png b/res/drawable-hdpi/ic_emoji_symbols_activated_dark.png
index 9738d5d6a..05fe46c8b 100644
Binary files a/res/drawable-hdpi/ic_emoji_symbols_activated_dark.png and b/res/drawable-hdpi/ic_emoji_symbols_activated_dark.png differ
diff --git a/res/drawable-hdpi/ic_emoji_symbols_activated_light.png b/res/drawable-hdpi/ic_emoji_symbols_activated_light.png
index dbe027f33..76c8b1ba0 100644
Binary files a/res/drawable-hdpi/ic_emoji_symbols_activated_light.png and b/res/drawable-hdpi/ic_emoji_symbols_activated_light.png differ
diff --git a/res/drawable-hdpi/ic_emoji_symbols_normal_dark.png b/res/drawable-hdpi/ic_emoji_symbols_normal_dark.png
index 7c768717c..6f56d2d57 100644
Binary files a/res/drawable-hdpi/ic_emoji_symbols_normal_dark.png and b/res/drawable-hdpi/ic_emoji_symbols_normal_dark.png differ
diff --git a/res/drawable-hdpi/ic_emoji_symbols_normal_light.png b/res/drawable-hdpi/ic_emoji_symbols_normal_light.png
index dddaa9496..05fe46c8b 100644
Binary files a/res/drawable-hdpi/ic_emoji_symbols_normal_light.png and b/res/drawable-hdpi/ic_emoji_symbols_normal_light.png differ
diff --git a/res/drawable-hdpi/ic_restaurant_white_24dp.png b/res/drawable-hdpi/ic_restaurant_white_24dp.png
deleted file mode 100644
index c24e8b16f..000000000
Binary files a/res/drawable-hdpi/ic_restaurant_white_24dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_directions_bike_white_24dp.png b/res/drawable-mdpi/ic_directions_bike_white_24dp.png
deleted file mode 100644
index 214e77c13..000000000
Binary files a/res/drawable-mdpi/ic_directions_bike_white_24dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_activity_activated_dark.png b/res/drawable-mdpi/ic_emoji_activity_activated_dark.png
new file mode 100644
index 000000000..4a1574abe
Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_activity_activated_dark.png differ
diff --git a/res/drawable-mdpi/ic_emoji_activity_activated_light.png b/res/drawable-mdpi/ic_emoji_activity_activated_light.png
new file mode 100644
index 000000000..677223f79
Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_activity_activated_light.png differ
diff --git a/res/drawable-mdpi/ic_emoji_activity_normal_dark.png b/res/drawable-mdpi/ic_emoji_activity_normal_dark.png
new file mode 100644
index 000000000..bfcafda8a
Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_activity_normal_dark.png differ
diff --git a/res/drawable-mdpi/ic_emoji_activity_normal_light.png b/res/drawable-mdpi/ic_emoji_activity_normal_light.png
new file mode 100644
index 000000000..4a1574abe
Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_activity_normal_light.png differ
diff --git a/res/drawable-mdpi/ic_emoji_flag_activated_dark.png b/res/drawable-mdpi/ic_emoji_flag_activated_dark.png
new file mode 100644
index 000000000..ae1ca3f9d
Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_flag_activated_dark.png differ
diff --git a/res/drawable-mdpi/ic_emoji_flag_activated_light.png b/res/drawable-mdpi/ic_emoji_flag_activated_light.png
new file mode 100644
index 000000000..2bc9f8f09
Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_flag_activated_light.png differ
diff --git a/res/drawable-mdpi/ic_emoji_flag_normal_dark.png b/res/drawable-mdpi/ic_emoji_flag_normal_dark.png
new file mode 100644
index 000000000..ede66c976
Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_flag_normal_dark.png differ
diff --git a/res/drawable-mdpi/ic_emoji_flag_normal_light.png b/res/drawable-mdpi/ic_emoji_flag_normal_light.png
new file mode 100644
index 000000000..ae1ca3f9d
Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_flag_normal_light.png differ
diff --git a/res/drawable-mdpi/ic_emoji_foods_activated_dark.png b/res/drawable-mdpi/ic_emoji_foods_activated_dark.png
new file mode 100644
index 000000000..785deee01
Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_foods_activated_dark.png differ
diff --git a/res/drawable-mdpi/ic_emoji_foods_activated_light.png b/res/drawable-mdpi/ic_emoji_foods_activated_light.png
new file mode 100644
index 000000000..68efa0a50
Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_foods_activated_light.png differ
diff --git a/res/drawable-mdpi/ic_emoji_foods_normal_dark.png b/res/drawable-mdpi/ic_emoji_foods_normal_dark.png
new file mode 100644
index 000000000..aed613d5b
Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_foods_normal_dark.png differ
diff --git a/res/drawable-mdpi/ic_emoji_foods_normal_light.png b/res/drawable-mdpi/ic_emoji_foods_normal_light.png
new file mode 100644
index 000000000..785deee01
Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_foods_normal_light.png differ
diff --git a/res/drawable-mdpi/ic_emoji_nature_activated_dark.png b/res/drawable-mdpi/ic_emoji_nature_activated_dark.png
index 04d055951..7de887a96 100644
Binary files a/res/drawable-mdpi/ic_emoji_nature_activated_dark.png and b/res/drawable-mdpi/ic_emoji_nature_activated_dark.png differ
diff --git a/res/drawable-mdpi/ic_emoji_nature_activated_light.png b/res/drawable-mdpi/ic_emoji_nature_activated_light.png
index c37a23345..234f2d980 100644
Binary files a/res/drawable-mdpi/ic_emoji_nature_activated_light.png and b/res/drawable-mdpi/ic_emoji_nature_activated_light.png differ
diff --git a/res/drawable-mdpi/ic_emoji_nature_normal_dark.png b/res/drawable-mdpi/ic_emoji_nature_normal_dark.png
index 2e460a0bd..d63616d11 100644
Binary files a/res/drawable-mdpi/ic_emoji_nature_normal_dark.png and b/res/drawable-mdpi/ic_emoji_nature_normal_dark.png differ
diff --git a/res/drawable-mdpi/ic_emoji_nature_normal_light.png b/res/drawable-mdpi/ic_emoji_nature_normal_light.png
index e1e93c756..7de887a96 100644
Binary files a/res/drawable-mdpi/ic_emoji_nature_normal_light.png and b/res/drawable-mdpi/ic_emoji_nature_normal_light.png differ
diff --git a/res/drawable-mdpi/ic_emoji_object_activated_dark.png b/res/drawable-mdpi/ic_emoji_object_activated_dark.png
new file mode 100644
index 000000000..6206af2b2
Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_object_activated_dark.png differ
diff --git a/res/drawable-mdpi/ic_emoji_object_activated_light.png b/res/drawable-mdpi/ic_emoji_object_activated_light.png
new file mode 100644
index 000000000..11f25dcc6
Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_object_activated_light.png differ
diff --git a/res/drawable-mdpi/ic_emoji_object_normal_dark.png b/res/drawable-mdpi/ic_emoji_object_normal_dark.png
new file mode 100644
index 000000000..cdc756575
Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_object_normal_dark.png differ
diff --git a/res/drawable-mdpi/ic_emoji_object_normal_light.png b/res/drawable-mdpi/ic_emoji_object_normal_light.png
new file mode 100644
index 000000000..6206af2b2
Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_object_normal_light.png differ
diff --git a/res/drawable-mdpi/ic_emoji_people_activated_dark.png b/res/drawable-mdpi/ic_emoji_people_activated_dark.png
index faf91ff98..91cae22a7 100644
Binary files a/res/drawable-mdpi/ic_emoji_people_activated_dark.png and b/res/drawable-mdpi/ic_emoji_people_activated_dark.png differ
diff --git a/res/drawable-mdpi/ic_emoji_people_activated_light.png b/res/drawable-mdpi/ic_emoji_people_activated_light.png
index 4ca14de90..353a3100a 100644
Binary files a/res/drawable-mdpi/ic_emoji_people_activated_light.png and b/res/drawable-mdpi/ic_emoji_people_activated_light.png differ
diff --git a/res/drawable-mdpi/ic_emoji_people_normal_dark.png b/res/drawable-mdpi/ic_emoji_people_normal_dark.png
index c027acc1b..851df9e96 100644
Binary files a/res/drawable-mdpi/ic_emoji_people_normal_dark.png and b/res/drawable-mdpi/ic_emoji_people_normal_dark.png differ
diff --git a/res/drawable-mdpi/ic_emoji_people_normal_light.png b/res/drawable-mdpi/ic_emoji_people_normal_light.png
index 94009c364..91cae22a7 100644
Binary files a/res/drawable-mdpi/ic_emoji_people_normal_light.png and b/res/drawable-mdpi/ic_emoji_people_normal_light.png differ
diff --git a/res/drawable-mdpi/ic_emoji_places_activated_dark.png b/res/drawable-mdpi/ic_emoji_places_activated_dark.png
index d000e34b4..ceab263b3 100644
Binary files a/res/drawable-mdpi/ic_emoji_places_activated_dark.png and b/res/drawable-mdpi/ic_emoji_places_activated_dark.png differ
diff --git a/res/drawable-mdpi/ic_emoji_places_activated_light.png b/res/drawable-mdpi/ic_emoji_places_activated_light.png
index 3fc3956d9..23ae27f14 100644
Binary files a/res/drawable-mdpi/ic_emoji_places_activated_light.png and b/res/drawable-mdpi/ic_emoji_places_activated_light.png differ
diff --git a/res/drawable-mdpi/ic_emoji_places_normal_dark.png b/res/drawable-mdpi/ic_emoji_places_normal_dark.png
index 137813ec4..67f90d42f 100644
Binary files a/res/drawable-mdpi/ic_emoji_places_normal_dark.png and b/res/drawable-mdpi/ic_emoji_places_normal_dark.png differ
diff --git a/res/drawable-mdpi/ic_emoji_places_normal_light.png b/res/drawable-mdpi/ic_emoji_places_normal_light.png
index 59acd0078..ceab263b3 100644
Binary files a/res/drawable-mdpi/ic_emoji_places_normal_light.png and b/res/drawable-mdpi/ic_emoji_places_normal_light.png differ
diff --git a/res/drawable-mdpi/ic_emoji_symbols_activated_dark.png b/res/drawable-mdpi/ic_emoji_symbols_activated_dark.png
index a2a9a9855..3aca48546 100644
Binary files a/res/drawable-mdpi/ic_emoji_symbols_activated_dark.png and b/res/drawable-mdpi/ic_emoji_symbols_activated_dark.png differ
diff --git a/res/drawable-mdpi/ic_emoji_symbols_activated_light.png b/res/drawable-mdpi/ic_emoji_symbols_activated_light.png
index 7cbd256cb..3db7b5a0f 100644
Binary files a/res/drawable-mdpi/ic_emoji_symbols_activated_light.png and b/res/drawable-mdpi/ic_emoji_symbols_activated_light.png differ
diff --git a/res/drawable-mdpi/ic_emoji_symbols_normal_dark.png b/res/drawable-mdpi/ic_emoji_symbols_normal_dark.png
index 62fef53d3..aa56d6b40 100644
Binary files a/res/drawable-mdpi/ic_emoji_symbols_normal_dark.png and b/res/drawable-mdpi/ic_emoji_symbols_normal_dark.png differ
diff --git a/res/drawable-mdpi/ic_emoji_symbols_normal_light.png b/res/drawable-mdpi/ic_emoji_symbols_normal_light.png
index 39956edf3..3aca48546 100644
Binary files a/res/drawable-mdpi/ic_emoji_symbols_normal_light.png and b/res/drawable-mdpi/ic_emoji_symbols_normal_light.png differ
diff --git a/res/drawable-mdpi/ic_restaurant_white_24dp.png b/res/drawable-mdpi/ic_restaurant_white_24dp.png
deleted file mode 100644
index 6cf757fcf..000000000
Binary files a/res/drawable-mdpi/ic_restaurant_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_directions_bike_white_24dp.png b/res/drawable-xhdpi/ic_directions_bike_white_24dp.png
deleted file mode 100644
index bafabbeaa..000000000
Binary files a/res/drawable-xhdpi/ic_directions_bike_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_activity_activated_dark.png b/res/drawable-xhdpi/ic_emoji_activity_activated_dark.png
new file mode 100644
index 000000000..1d04bc797
Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_activity_activated_dark.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_activity_activated_light.png b/res/drawable-xhdpi/ic_emoji_activity_activated_light.png
new file mode 100644
index 000000000..7001af641
Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_activity_activated_light.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_activity_normal_dark.png b/res/drawable-xhdpi/ic_emoji_activity_normal_dark.png
new file mode 100644
index 000000000..68b5d8d2f
Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_activity_normal_dark.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_activity_normal_light.png b/res/drawable-xhdpi/ic_emoji_activity_normal_light.png
new file mode 100644
index 000000000..1d04bc797
Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_activity_normal_light.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_flag_activated_dark.png b/res/drawable-xhdpi/ic_emoji_flag_activated_dark.png
new file mode 100644
index 000000000..471d644f8
Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_flag_activated_dark.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_flag_activated_light.png b/res/drawable-xhdpi/ic_emoji_flag_activated_light.png
new file mode 100644
index 000000000..58a1b7bf2
Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_flag_activated_light.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_flag_normal_dark.png b/res/drawable-xhdpi/ic_emoji_flag_normal_dark.png
new file mode 100644
index 000000000..597de87f5
Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_flag_normal_dark.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_flag_normal_light.png b/res/drawable-xhdpi/ic_emoji_flag_normal_light.png
new file mode 100644
index 000000000..471d644f8
Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_flag_normal_light.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_foods_activated_dark.png b/res/drawable-xhdpi/ic_emoji_foods_activated_dark.png
new file mode 100644
index 000000000..a49d4f55b
Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_foods_activated_dark.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_foods_activated_light.png b/res/drawable-xhdpi/ic_emoji_foods_activated_light.png
new file mode 100644
index 000000000..8ad2915cc
Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_foods_activated_light.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_foods_normal_dark.png b/res/drawable-xhdpi/ic_emoji_foods_normal_dark.png
new file mode 100644
index 000000000..e1cac3ffc
Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_foods_normal_dark.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_foods_normal_light.png b/res/drawable-xhdpi/ic_emoji_foods_normal_light.png
new file mode 100644
index 000000000..a49d4f55b
Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_foods_normal_light.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_nature_activated_dark.png b/res/drawable-xhdpi/ic_emoji_nature_activated_dark.png
index 423ee33fa..0b409d57c 100644
Binary files a/res/drawable-xhdpi/ic_emoji_nature_activated_dark.png and b/res/drawable-xhdpi/ic_emoji_nature_activated_dark.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_nature_activated_light.png b/res/drawable-xhdpi/ic_emoji_nature_activated_light.png
index 2ed1a5447..c4e2e9977 100644
Binary files a/res/drawable-xhdpi/ic_emoji_nature_activated_light.png and b/res/drawable-xhdpi/ic_emoji_nature_activated_light.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_nature_normal_dark.png b/res/drawable-xhdpi/ic_emoji_nature_normal_dark.png
index 8b9a9a1b1..8bce78856 100644
Binary files a/res/drawable-xhdpi/ic_emoji_nature_normal_dark.png and b/res/drawable-xhdpi/ic_emoji_nature_normal_dark.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_nature_normal_light.png b/res/drawable-xhdpi/ic_emoji_nature_normal_light.png
index 711036f03..0b409d57c 100644
Binary files a/res/drawable-xhdpi/ic_emoji_nature_normal_light.png and b/res/drawable-xhdpi/ic_emoji_nature_normal_light.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_object_activated_dark.png b/res/drawable-xhdpi/ic_emoji_object_activated_dark.png
new file mode 100644
index 000000000..e7afca3f6
Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_object_activated_dark.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_object_activated_light.png b/res/drawable-xhdpi/ic_emoji_object_activated_light.png
new file mode 100644
index 000000000..1b51f9e12
Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_object_activated_light.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_object_normal_dark.png b/res/drawable-xhdpi/ic_emoji_object_normal_dark.png
new file mode 100644
index 000000000..02e7ea6d4
Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_object_normal_dark.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_object_normal_light.png b/res/drawable-xhdpi/ic_emoji_object_normal_light.png
new file mode 100644
index 000000000..e7afca3f6
Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_object_normal_light.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_people_activated_dark.png b/res/drawable-xhdpi/ic_emoji_people_activated_dark.png
index 91dd01151..693a1c69f 100644
Binary files a/res/drawable-xhdpi/ic_emoji_people_activated_dark.png and b/res/drawable-xhdpi/ic_emoji_people_activated_dark.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_people_activated_light.png b/res/drawable-xhdpi/ic_emoji_people_activated_light.png
index 965a7c45d..6ae3d264c 100644
Binary files a/res/drawable-xhdpi/ic_emoji_people_activated_light.png and b/res/drawable-xhdpi/ic_emoji_people_activated_light.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_people_normal_dark.png b/res/drawable-xhdpi/ic_emoji_people_normal_dark.png
index d6f523aa2..fe91469aa 100644
Binary files a/res/drawable-xhdpi/ic_emoji_people_normal_dark.png and b/res/drawable-xhdpi/ic_emoji_people_normal_dark.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_people_normal_light.png b/res/drawable-xhdpi/ic_emoji_people_normal_light.png
index 6e5078b5e..693a1c69f 100644
Binary files a/res/drawable-xhdpi/ic_emoji_people_normal_light.png and b/res/drawable-xhdpi/ic_emoji_people_normal_light.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_places_activated_dark.png b/res/drawable-xhdpi/ic_emoji_places_activated_dark.png
index fd3022a28..0b368d62f 100644
Binary files a/res/drawable-xhdpi/ic_emoji_places_activated_dark.png and b/res/drawable-xhdpi/ic_emoji_places_activated_dark.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_places_activated_light.png b/res/drawable-xhdpi/ic_emoji_places_activated_light.png
index 098f36f9c..d4c49d78f 100644
Binary files a/res/drawable-xhdpi/ic_emoji_places_activated_light.png and b/res/drawable-xhdpi/ic_emoji_places_activated_light.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_places_normal_dark.png b/res/drawable-xhdpi/ic_emoji_places_normal_dark.png
index 425e2cc03..fc67497e1 100644
Binary files a/res/drawable-xhdpi/ic_emoji_places_normal_dark.png and b/res/drawable-xhdpi/ic_emoji_places_normal_dark.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_places_normal_light.png b/res/drawable-xhdpi/ic_emoji_places_normal_light.png
index 86188352f..0b368d62f 100644
Binary files a/res/drawable-xhdpi/ic_emoji_places_normal_light.png and b/res/drawable-xhdpi/ic_emoji_places_normal_light.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_symbols_activated_dark.png b/res/drawable-xhdpi/ic_emoji_symbols_activated_dark.png
index 664a7375b..a28e4a84a 100644
Binary files a/res/drawable-xhdpi/ic_emoji_symbols_activated_dark.png and b/res/drawable-xhdpi/ic_emoji_symbols_activated_dark.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_symbols_activated_light.png b/res/drawable-xhdpi/ic_emoji_symbols_activated_light.png
index 13b587852..a6f6ebc4e 100644
Binary files a/res/drawable-xhdpi/ic_emoji_symbols_activated_light.png and b/res/drawable-xhdpi/ic_emoji_symbols_activated_light.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_symbols_normal_dark.png b/res/drawable-xhdpi/ic_emoji_symbols_normal_dark.png
index cf5c6747d..7c016ef66 100644
Binary files a/res/drawable-xhdpi/ic_emoji_symbols_normal_dark.png and b/res/drawable-xhdpi/ic_emoji_symbols_normal_dark.png differ
diff --git a/res/drawable-xhdpi/ic_emoji_symbols_normal_light.png b/res/drawable-xhdpi/ic_emoji_symbols_normal_light.png
index eaea7bd33..a28e4a84a 100644
Binary files a/res/drawable-xhdpi/ic_emoji_symbols_normal_light.png and b/res/drawable-xhdpi/ic_emoji_symbols_normal_light.png differ
diff --git a/res/drawable-xhdpi/ic_restaurant_white_24dp.png b/res/drawable-xhdpi/ic_restaurant_white_24dp.png
deleted file mode 100644
index 1f1d09dcc..000000000
Binary files a/res/drawable-xhdpi/ic_restaurant_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_directions_bike_white_24dp.png b/res/drawable-xxhdpi/ic_directions_bike_white_24dp.png
deleted file mode 100644
index 2289d9303..000000000
Binary files a/res/drawable-xxhdpi/ic_directions_bike_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_activity_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_activity_activated_dark.png
new file mode 100644
index 000000000..5cf9101c0
Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_activity_activated_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_activity_activated_light.png b/res/drawable-xxhdpi/ic_emoji_activity_activated_light.png
new file mode 100644
index 000000000..76a4aebe5
Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_activity_activated_light.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_activity_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_activity_normal_dark.png
new file mode 100644
index 000000000..6d90599b1
Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_activity_normal_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_activity_normal_light.png b/res/drawable-xxhdpi/ic_emoji_activity_normal_light.png
new file mode 100644
index 000000000..5cf9101c0
Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_activity_normal_light.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_flag_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_flag_activated_dark.png
new file mode 100644
index 000000000..5797242bc
Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_flag_activated_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_flag_activated_light.png b/res/drawable-xxhdpi/ic_emoji_flag_activated_light.png
new file mode 100644
index 000000000..adf73cf40
Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_flag_activated_light.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_flag_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_flag_normal_dark.png
new file mode 100644
index 000000000..47f75e2ca
Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_flag_normal_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_flag_normal_light.png b/res/drawable-xxhdpi/ic_emoji_flag_normal_light.png
new file mode 100644
index 000000000..5797242bc
Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_flag_normal_light.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_foods_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_foods_activated_dark.png
new file mode 100644
index 000000000..8a0be6d50
Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_foods_activated_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_foods_activated_light.png b/res/drawable-xxhdpi/ic_emoji_foods_activated_light.png
new file mode 100644
index 000000000..784f603a5
Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_foods_activated_light.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_foods_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_foods_normal_dark.png
new file mode 100644
index 000000000..ed5571a88
Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_foods_normal_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_foods_normal_light.png b/res/drawable-xxhdpi/ic_emoji_foods_normal_light.png
new file mode 100644
index 000000000..8a0be6d50
Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_foods_normal_light.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_nature_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_nature_activated_dark.png
index 4439faa92..15214246c 100644
Binary files a/res/drawable-xxhdpi/ic_emoji_nature_activated_dark.png and b/res/drawable-xxhdpi/ic_emoji_nature_activated_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_nature_activated_light.png b/res/drawable-xxhdpi/ic_emoji_nature_activated_light.png
index d0ae5eaf3..65947ba06 100644
Binary files a/res/drawable-xxhdpi/ic_emoji_nature_activated_light.png and b/res/drawable-xxhdpi/ic_emoji_nature_activated_light.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_nature_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_nature_normal_dark.png
index 29ac9b5c6..12a2324fd 100644
Binary files a/res/drawable-xxhdpi/ic_emoji_nature_normal_dark.png and b/res/drawable-xxhdpi/ic_emoji_nature_normal_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_nature_normal_light.png b/res/drawable-xxhdpi/ic_emoji_nature_normal_light.png
index a881fd5a5..15214246c 100644
Binary files a/res/drawable-xxhdpi/ic_emoji_nature_normal_light.png and b/res/drawable-xxhdpi/ic_emoji_nature_normal_light.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_object_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_object_activated_dark.png
new file mode 100644
index 000000000..41b8604be
Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_object_activated_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_object_activated_light.png b/res/drawable-xxhdpi/ic_emoji_object_activated_light.png
new file mode 100644
index 000000000..1979f6513
Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_object_activated_light.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_object_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_object_normal_dark.png
new file mode 100644
index 000000000..671eef827
Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_object_normal_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_object_normal_light.png b/res/drawable-xxhdpi/ic_emoji_object_normal_light.png
new file mode 100644
index 000000000..41b8604be
Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_object_normal_light.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_people_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_people_activated_dark.png
index b5a7ac55c..40753d285 100644
Binary files a/res/drawable-xxhdpi/ic_emoji_people_activated_dark.png and b/res/drawable-xxhdpi/ic_emoji_people_activated_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_people_activated_light.png b/res/drawable-xxhdpi/ic_emoji_people_activated_light.png
index 4c5324764..2b6ed0c16 100644
Binary files a/res/drawable-xxhdpi/ic_emoji_people_activated_light.png and b/res/drawable-xxhdpi/ic_emoji_people_activated_light.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_people_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_people_normal_dark.png
index b73d3ba0c..72df107d8 100644
Binary files a/res/drawable-xxhdpi/ic_emoji_people_normal_dark.png and b/res/drawable-xxhdpi/ic_emoji_people_normal_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_people_normal_light.png b/res/drawable-xxhdpi/ic_emoji_people_normal_light.png
index f38fddc7f..40753d285 100644
Binary files a/res/drawable-xxhdpi/ic_emoji_people_normal_light.png and b/res/drawable-xxhdpi/ic_emoji_people_normal_light.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_places_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_places_activated_dark.png
index cba29598f..9ae9fc7b2 100644
Binary files a/res/drawable-xxhdpi/ic_emoji_places_activated_dark.png and b/res/drawable-xxhdpi/ic_emoji_places_activated_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_places_activated_light.png b/res/drawable-xxhdpi/ic_emoji_places_activated_light.png
index 1a09a3429..a7fafaec6 100644
Binary files a/res/drawable-xxhdpi/ic_emoji_places_activated_light.png and b/res/drawable-xxhdpi/ic_emoji_places_activated_light.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_places_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_places_normal_dark.png
index 2e752e6f0..dbdbd9e0c 100644
Binary files a/res/drawable-xxhdpi/ic_emoji_places_normal_dark.png and b/res/drawable-xxhdpi/ic_emoji_places_normal_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_places_normal_light.png b/res/drawable-xxhdpi/ic_emoji_places_normal_light.png
index c3b3b123e..9ae9fc7b2 100644
Binary files a/res/drawable-xxhdpi/ic_emoji_places_normal_light.png and b/res/drawable-xxhdpi/ic_emoji_places_normal_light.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_symbols_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_symbols_activated_dark.png
index 1e55d5d30..780b6397d 100644
Binary files a/res/drawable-xxhdpi/ic_emoji_symbols_activated_dark.png and b/res/drawable-xxhdpi/ic_emoji_symbols_activated_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_symbols_activated_light.png b/res/drawable-xxhdpi/ic_emoji_symbols_activated_light.png
index 83d76f150..2cb85bbd8 100644
Binary files a/res/drawable-xxhdpi/ic_emoji_symbols_activated_light.png and b/res/drawable-xxhdpi/ic_emoji_symbols_activated_light.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_symbols_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_symbols_normal_dark.png
index 34c889a79..fc6090071 100644
Binary files a/res/drawable-xxhdpi/ic_emoji_symbols_normal_dark.png and b/res/drawable-xxhdpi/ic_emoji_symbols_normal_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_emoji_symbols_normal_light.png b/res/drawable-xxhdpi/ic_emoji_symbols_normal_light.png
index dfd75697b..780b6397d 100644
Binary files a/res/drawable-xxhdpi/ic_emoji_symbols_normal_light.png and b/res/drawable-xxhdpi/ic_emoji_symbols_normal_light.png differ
diff --git a/res/drawable-xxhdpi/ic_restaurant_white_24dp.png b/res/drawable-xxhdpi/ic_restaurant_white_24dp.png
deleted file mode 100644
index ff87ca5de..000000000
Binary files a/res/drawable-xxhdpi/ic_restaurant_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_directions_bike_white_24dp.png b/res/drawable-xxxhdpi/ic_directions_bike_white_24dp.png
deleted file mode 100644
index 3b99dba33..000000000
Binary files a/res/drawable-xxxhdpi/ic_directions_bike_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_activity_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_activity_activated_dark.png
new file mode 100644
index 000000000..b2c61c6bd
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_activity_activated_dark.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_activity_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_activity_activated_light.png
new file mode 100644
index 000000000..3196e256a
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_activity_activated_light.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_activity_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_activity_normal_dark.png
new file mode 100644
index 000000000..6745d84e5
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_activity_normal_dark.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_activity_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_activity_normal_light.png
new file mode 100644
index 000000000..b2c61c6bd
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_activity_normal_light.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_flag_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_flag_activated_dark.png
new file mode 100644
index 000000000..dced7d638
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_flag_activated_dark.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_flag_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_flag_activated_light.png
new file mode 100644
index 000000000..678adf4d2
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_flag_activated_light.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_flag_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_flag_normal_dark.png
new file mode 100644
index 000000000..c69c5c3e8
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_flag_normal_dark.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_flag_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_flag_normal_light.png
new file mode 100644
index 000000000..dced7d638
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_flag_normal_light.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_foods_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_foods_activated_dark.png
new file mode 100644
index 000000000..39455b4fc
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_foods_activated_dark.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_foods_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_foods_activated_light.png
new file mode 100644
index 000000000..662dbac2b
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_foods_activated_light.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_foods_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_foods_normal_dark.png
new file mode 100644
index 000000000..c2b243232
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_foods_normal_dark.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_foods_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_foods_normal_light.png
new file mode 100644
index 000000000..39455b4fc
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_foods_normal_light.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_nature_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_nature_activated_dark.png
new file mode 100644
index 000000000..e9106a7c4
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_nature_activated_dark.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_nature_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_nature_activated_light.png
new file mode 100644
index 000000000..9d3e7d4de
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_nature_activated_light.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_nature_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_nature_normal_dark.png
new file mode 100644
index 000000000..2e8d68435
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_nature_normal_dark.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_nature_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_nature_normal_light.png
new file mode 100644
index 000000000..e9106a7c4
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_nature_normal_light.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_object_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_object_activated_dark.png
new file mode 100644
index 000000000..841e9f12e
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_object_activated_dark.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_object_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_object_activated_light.png
new file mode 100644
index 000000000..21bcb25ad
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_object_activated_light.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_object_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_object_normal_dark.png
new file mode 100644
index 000000000..5541e5b84
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_object_normal_dark.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_object_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_object_normal_light.png
new file mode 100644
index 000000000..841e9f12e
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_object_normal_light.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_people_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_people_activated_dark.png
new file mode 100644
index 000000000..daa4020ce
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_people_activated_dark.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_people_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_people_activated_light.png
new file mode 100644
index 000000000..eac554f53
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_people_activated_light.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_people_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_people_normal_dark.png
new file mode 100644
index 000000000..e093154a7
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_people_normal_dark.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_people_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_people_normal_light.png
new file mode 100644
index 000000000..daa4020ce
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_people_normal_light.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_places_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_places_activated_dark.png
new file mode 100644
index 000000000..1953371c4
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_places_activated_dark.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_places_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_places_activated_light.png
new file mode 100644
index 000000000..27f4935a3
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_places_activated_light.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_places_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_places_normal_dark.png
new file mode 100644
index 000000000..4088e5000
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_places_normal_dark.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_places_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_places_normal_light.png
new file mode 100644
index 000000000..1953371c4
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_places_normal_light.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_symbols_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_symbols_activated_dark.png
new file mode 100644
index 000000000..062f03133
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_symbols_activated_dark.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_symbols_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_symbols_activated_light.png
new file mode 100644
index 000000000..eecad2793
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_symbols_activated_light.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_symbols_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_symbols_normal_dark.png
new file mode 100644
index 000000000..86152fa22
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_symbols_normal_dark.png differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_symbols_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_symbols_normal_light.png
new file mode 100644
index 000000000..062f03133
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_symbols_normal_light.png differ
diff --git a/res/drawable-xxxhdpi/ic_restaurant_white_24dp.png b/res/drawable-xxxhdpi/ic_restaurant_white_24dp.png
deleted file mode 100644
index 11420fb4b..000000000
Binary files a/res/drawable-xxxhdpi/ic_restaurant_white_24dp.png and /dev/null differ
diff --git a/res/drawable/emoji_category_activity_dark.xml b/res/drawable/emoji_category_activity_dark.xml
index 045afe0e6..84269ce56 100644
--- a/res/drawable/emoji_category_activity_dark.xml
+++ b/res/drawable/emoji_category_activity_dark.xml
@@ -2,13 +2,8 @@
- -
-
-
- -
-
-
+
+
+
diff --git a/res/drawable/emoji_category_activity_light.xml b/res/drawable/emoji_category_activity_light.xml
index 25209a2d7..befeb3138 100644
--- a/res/drawable/emoji_category_activity_light.xml
+++ b/res/drawable/emoji_category_activity_light.xml
@@ -2,13 +2,8 @@
- -
-
-
- -
-
-
+
+
+
diff --git a/res/drawable/emoji_category_flags_dark.xml b/res/drawable/emoji_category_flags_dark.xml
index 2e48c313e..41416774f 100644
--- a/res/drawable/emoji_category_flags_dark.xml
+++ b/res/drawable/emoji_category_flags_dark.xml
@@ -2,13 +2,8 @@
- -
-
-
- -
-
-
+
+
+
diff --git a/res/drawable/emoji_category_flags_light.xml b/res/drawable/emoji_category_flags_light.xml
index 68eeae7e6..2f61d042d 100644
--- a/res/drawable/emoji_category_flags_light.xml
+++ b/res/drawable/emoji_category_flags_light.xml
@@ -2,13 +2,8 @@
- -
-
-
- -
-
-
+
+
+
diff --git a/res/drawable/emoji_category_foods_dark.xml b/res/drawable/emoji_category_foods_dark.xml
index e276212e7..650de4343 100644
--- a/res/drawable/emoji_category_foods_dark.xml
+++ b/res/drawable/emoji_category_foods_dark.xml
@@ -2,13 +2,8 @@
- -
-
-
- -
-
-
+
+
+
diff --git a/res/drawable/emoji_category_foods_light.xml b/res/drawable/emoji_category_foods_light.xml
index 10a772f86..475bd2135 100644
--- a/res/drawable/emoji_category_foods_light.xml
+++ b/res/drawable/emoji_category_foods_light.xml
@@ -2,13 +2,8 @@
- -
-
-
- -
-
-
+
+
+
diff --git a/res/drawable/emoji_category_objects_dark.xml b/res/drawable/emoji_category_objects_dark.xml
index 9c43230d7..3eb67ce51 100644
--- a/res/drawable/emoji_category_objects_dark.xml
+++ b/res/drawable/emoji_category_objects_dark.xml
@@ -2,13 +2,8 @@
- -
-
-
- -
-
-
+
+
+
diff --git a/res/drawable/emoji_category_objects_light.xml b/res/drawable/emoji_category_objects_light.xml
index 08d4e0e4e..83421c32c 100644
--- a/res/drawable/emoji_category_objects_light.xml
+++ b/res/drawable/emoji_category_objects_light.xml
@@ -2,13 +2,8 @@
- -
-
-
- -
-
-
+
+
+