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 b45c38bad3..0000000000
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 0000000000..f6adac4d80
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 0000000000..cec4c2ba31
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 0000000000..a61dcce747
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 0000000000..f6adac4d80
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 0000000000..cb37eb1f06
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 0000000000..97bc953d62
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 0000000000..56583915da
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 0000000000..cb37eb1f06
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 0000000000..2f07dbb658
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 0000000000..365785adaf
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 0000000000..5c533050f1
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 0000000000..2f07dbb658
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 8ae67c762a..8e970200bf 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 5d02a02a30..b6f53b41db 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 fd22d38a4f..90ca0acb57 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 2a93950523..8e970200bf 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 0000000000..823394d6e7
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 0000000000..2ece8ceada
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 0000000000..23f6b43a08
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 0000000000..823394d6e7
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 e70241562c..787d0002cf 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 b16705c5f8..262ea943a2 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 aea6cfe795..e581af307a 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 00bc3b6d00..787d0002cf 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 b4683d11c1..721281d84f 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 f6d936827d..78a4a39e00 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 4527cdefce..1744eb741c 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 ebcfd5a291..721281d84f 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 9738d5d6a8..05fe46c8bf 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 dbe027f33c..76c8b1ba02 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 7c768717c7..6f56d2d57f 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 dddaa94968..05fe46c8bf 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 c24e8b16f8..0000000000
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 214e77c13c..0000000000
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 0000000000..4a1574abea
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 0000000000..677223f79f
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 0000000000..bfcafda8a9
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 0000000000..4a1574abea
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 0000000000..ae1ca3f9d4
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 0000000000..2bc9f8f09b
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 0000000000..ede66c9761
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 0000000000..ae1ca3f9d4
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 0000000000..785deee018
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 0000000000..68efa0a50e
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 0000000000..aed613d5bc
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 0000000000..785deee018
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 04d0559515..7de887a96e 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 c37a233454..234f2d9802 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 2e460a0bd4..d63616d118 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 e1e93c7563..7de887a96e 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 0000000000..6206af2b2b
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 0000000000..11f25dcc69
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 0000000000..cdc756575c
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 0000000000..6206af2b2b
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 faf91ff98e..91cae22a77 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 4ca14de904..353a3100a2 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 c027acc1b0..851df9e964 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 94009c3647..91cae22a77 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 d000e34b45..ceab263b39 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 3fc3956d90..23ae27f140 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 137813ec4d..67f90d42f6 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 59acd0078e..ceab263b39 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 a2a9a98556..3aca48546c 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 7cbd256cb1..3db7b5a0fb 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 62fef53d33..aa56d6b40f 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 39956edf3e..3aca48546c 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 6cf757fcf6..0000000000
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 bafabbeaa0..0000000000
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 0000000000..1d04bc797d
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 0000000000..7001af641f
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 0000000000..68b5d8d2ff
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 0000000000..1d04bc797d
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 0000000000..471d644f84
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 0000000000..58a1b7bf2d
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 0000000000..597de87f52
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 0000000000..471d644f84
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 0000000000..a49d4f55b1
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 0000000000..8ad2915cc8
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 0000000000..e1cac3ffc7
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 0000000000..a49d4f55b1
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 423ee33fa3..0b409d57ce 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 2ed1a5447d..c4e2e99778 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 8b9a9a1b17..8bce788565 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 711036f032..0b409d57ce 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 0000000000..e7afca3f6e
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 0000000000..1b51f9e128
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 0000000000..02e7ea6d44
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 0000000000..e7afca3f6e
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 91dd01151f..693a1c69f6 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 965a7c45d2..6ae3d264c9 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 d6f523aa29..fe91469aab 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 6e5078b5e4..693a1c69f6 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 fd3022a28e..0b368d62fb 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 098f36f9c1..d4c49d78f2 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 425e2cc036..fc67497e11 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 86188352fd..0b368d62fb 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 664a7375b9..a28e4a84ad 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 13b587852c..a6f6ebc4e0 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 cf5c6747db..7c016ef665 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 eaea7bd333..a28e4a84ad 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 1f1d09dcc9..0000000000
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 2289d9303c..0000000000
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 0000000000..5cf9101c06
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 0000000000..76a4aebe5b
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 0000000000..6d90599b1f
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 0000000000..5cf9101c06
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 0000000000..5797242bc0
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 0000000000..adf73cf40f
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 0000000000..47f75e2cae
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 0000000000..5797242bc0
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 0000000000..8a0be6d505
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 0000000000..784f603a50
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 0000000000..ed5571a88e
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 0000000000..8a0be6d505
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 4439faa92e..15214246c2 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 d0ae5eaf31..65947ba066 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 29ac9b5c62..12a2324fd0 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 a881fd5a54..15214246c2 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 0000000000..41b8604be6
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 0000000000..1979f6513f
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 0000000000..671eef8273
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 0000000000..41b8604be6
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 b5a7ac55cf..40753d285e 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 4c53247646..2b6ed0c163 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 b73d3ba0c0..72df107d85 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 f38fddc7f0..40753d285e 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 cba29598fc..9ae9fc7b26 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 1a09a34290..a7fafaec64 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 2e752e6f0d..dbdbd9e0cc 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 c3b3b123e1..9ae9fc7b26 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 1e55d5d305..780b6397dc 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 83d76f150a..2cb85bbd80 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 34c889a79f..fc60900710 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 dfd75697b0..780b6397dc 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 ff87ca5de5..0000000000
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 3b99dba33a..0000000000
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 0000000000..b2c61c6bd1
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 0000000000..3196e256a6
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 0000000000..6745d84e54
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 0000000000..b2c61c6bd1
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 0000000000..dced7d6383
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 0000000000..678adf4d2d
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 0000000000..c69c5c3e82
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 0000000000..dced7d6383
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 0000000000..39455b4fc5
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 0000000000..662dbac2b9
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 0000000000..c2b2432326
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 0000000000..39455b4fc5
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 0000000000..e9106a7c4f
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 0000000000..9d3e7d4de7
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 0000000000..2e8d684359
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 0000000000..e9106a7c4f
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 0000000000..841e9f12e7
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 0000000000..21bcb25ad1
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 0000000000..5541e5b849
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 0000000000..841e9f12e7
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 0000000000..daa4020ce4
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 0000000000..eac554f536
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 0000000000..e093154a75
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 0000000000..daa4020ce4
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 0000000000..1953371c4d
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 0000000000..27f4935a32
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 0000000000..4088e50005
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 0000000000..1953371c4d
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 0000000000..062f031337
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 0000000000..eecad27933
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 0000000000..86152fa226
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 0000000000..062f031337
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 11420fb4b9..0000000000
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 045afe0e66..84269ce568 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 25209a2d78..befeb3138d 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 2e48c313e6..41416774f3 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 68eeae7e64..2f61d042d2 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 e276212e79..650de4343a 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 10a772f865..475bd21352 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 9c43230d7a..3eb67ce51c 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 08d4e0e4ec..83421c32c0 100644
--- a/res/drawable/emoji_category_objects_light.xml
+++ b/res/drawable/emoji_category_objects_light.xml
@@ -2,13 +2,8 @@
- -
-
-
- -
-
-
+
+
+