diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3569e8e655..b284098f43 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -174,6 +174,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -579,6 +601,14 @@
android:authorities="org.thoughtcrime.securesms.database.attachment"
android:exported="false" />
+
+
+
+
diff --git a/build.gradle b/build.gradle
index 97ceb9a957..f902416314 100644
--- a/build.gradle
+++ b/build.gradle
@@ -87,7 +87,7 @@ dependencies {
compile 'org.conscrypt:conscrypt-android:2.0.0'
compile 'org.signal:aesgcmprovider:0.0.3'
- compile 'org.whispersystems:signal-service-android:2.13.1'
+ compile 'org.whispersystems:signal-service-android:2.13.2'
compile 'org.whispersystems:webrtc-android:M74'
@@ -190,7 +190,7 @@ dependencyVerification {
'com.google.android.exoplayer:exoplayer-core:b6ab34abac36bc2bc6934b7a50008162feca2c0fde91aaf1e8c1c22f2c16e2c0',
'org.conscrypt:conscrypt-android:400ca559a49b860a82862b22cee0e3110764bdcf7ee7c79e7479895c25cdfc09',
'org.signal:aesgcmprovider:6eb4422e8a618b3b76cb2096a3619d251f9e27989dc68307a1e5414c3710f2d1',
- 'org.whispersystems:signal-service-android:2f5ac0cc0d3a016285fd02ec0fb12cf287653fca056a499643aadb4ed35b1c85',
+ 'org.whispersystems:signal-service-android:11fd7307248429e5bf3274b57410e60b26492621b138a3d651cc8369d5aa6507',
'org.whispersystems:webrtc-android:2f7befaa3b47a04d244a4eef7c03c2d49c1685a6f92fc505cd5f4ac7eca2dc18',
'me.leolin:ShortcutBadger:e3cb3e7625892129b0c92dd5e4bc649faffdd526d5af26d9c45ee31ff8851774',
'se.emilsjolander:stickylistheaders:a08ca948aa6b220f09d82f16bbbac395f6b78897e9eeac6a9f0b0ba755928eeb',
@@ -258,7 +258,7 @@ dependencyVerification {
'com.android.support:support-annotations:5d5b9414f02d3fa0ee7526b8d5ddae0da67c8ecc8c4d63ffa6cf91488a93b927',
'com.android.support.constraint:constraint-layout-solver:2cafbe356f71c208013d021f32943904798cd6459e5107f9fe27000eb5bc2aef',
'org.signal:signal-metadata-android:02323bc29317fa9d3b62fab0b507c94ba2e9bcc4a78d588888ffd313853757b3',
- 'org.whispersystems:signal-service-java:5275b437591577d9da1cc6bde7d4fc1d6549c221e2365e108a595b4d21cf7499',
+ 'org.whispersystems:signal-service-java:c48607b1fa3dbb67b5204adfd681c6948c7bbb43cc3e6502b65984a3ef53dc49',
'com.github.bumptech.glide:disklrucache:c1b1b6f5bbd01e2fcdc9d7f60913c8d338bdb65ed4a93bfa02b56f19daaade4b',
'com.github.bumptech.glide:annotations:bede99ef9f71517a4274bac18fd3e483e9f2b6108d7d6fe8f4949be4aa4d9512',
'com.nineoldandroids:library:68025a14e3e7673d6ad2f95e4b46d78d7d068343aa99256b686fe59de1b3163a',
diff --git a/protobuf/Backups.proto b/protobuf/Backups.proto
index 054c3526ef..c7efc39146 100644
--- a/protobuf/Backups.proto
+++ b/protobuf/Backups.proto
@@ -34,6 +34,11 @@ message Attachment {
optional uint32 length = 3;
}
+message Sticker {
+ optional uint64 rowId = 1;
+ optional uint32 length = 2;
+}
+
message Avatar {
optional string name = 1;
optional uint32 length = 2;
@@ -56,4 +61,5 @@ message BackupFrame {
optional DatabaseVersion version = 5;
optional bool end = 6;
optional Avatar avatar = 7;
+ optional Sticker sticker = 8;
}
\ No newline at end of file
diff --git a/res/drawable-hdpi/ic_emoji_activity_activated_dark.png b/res/drawable-hdpi/ic_emoji_activity_activated_dark.png
deleted file mode 100644
index f6adac4d80..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_activity_activated_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_activity_activated_light.png b/res/drawable-hdpi/ic_emoji_activity_activated_light.png
deleted file mode 100644
index cec4c2ba31..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_activity_activated_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_activity_normal_dark.png b/res/drawable-hdpi/ic_emoji_activity_normal_dark.png
deleted file mode 100644
index a61dcce747..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_activity_normal_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_activity_normal_light.png b/res/drawable-hdpi/ic_emoji_activity_normal_light.png
deleted file mode 100644
index f6adac4d80..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_activity_normal_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_emoticons_activated_dark.png b/res/drawable-hdpi/ic_emoji_emoticons_activated_dark.png
deleted file mode 100644
index 79110bd85a..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_emoticons_activated_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_emoticons_activated_light.png b/res/drawable-hdpi/ic_emoji_emoticons_activated_light.png
deleted file mode 100644
index 0f40f277a7..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_emoticons_activated_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_emoticons_normal_dark.png b/res/drawable-hdpi/ic_emoji_emoticons_normal_dark.png
deleted file mode 100644
index da39504430..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_emoticons_normal_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_emoticons_normal_light.png b/res/drawable-hdpi/ic_emoji_emoticons_normal_light.png
deleted file mode 100644
index 2557bad897..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_emoticons_normal_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_flag_activated_dark.png b/res/drawable-hdpi/ic_emoji_flag_activated_dark.png
deleted file mode 100644
index cb37eb1f06..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_flag_activated_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_flag_activated_light.png b/res/drawable-hdpi/ic_emoji_flag_activated_light.png
deleted file mode 100644
index 97bc953d62..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_flag_activated_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_flag_normal_dark.png b/res/drawable-hdpi/ic_emoji_flag_normal_dark.png
deleted file mode 100644
index 56583915da..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_flag_normal_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_flag_normal_light.png b/res/drawable-hdpi/ic_emoji_flag_normal_light.png
deleted file mode 100644
index cb37eb1f06..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_flag_normal_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_foods_activated_dark.png b/res/drawable-hdpi/ic_emoji_foods_activated_dark.png
deleted file mode 100644
index 2f07dbb658..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_foods_activated_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_foods_activated_light.png b/res/drawable-hdpi/ic_emoji_foods_activated_light.png
deleted file mode 100644
index 365785adaf..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_foods_activated_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_foods_normal_dark.png b/res/drawable-hdpi/ic_emoji_foods_normal_dark.png
deleted file mode 100644
index 5c533050f1..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_foods_normal_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_foods_normal_light.png b/res/drawable-hdpi/ic_emoji_foods_normal_light.png
deleted file mode 100644
index 2f07dbb658..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_foods_normal_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_nature_activated_dark.png b/res/drawable-hdpi/ic_emoji_nature_activated_dark.png
deleted file mode 100644
index 8e970200bf..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_nature_activated_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_nature_activated_light.png b/res/drawable-hdpi/ic_emoji_nature_activated_light.png
deleted file mode 100644
index b6f53b41db..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_nature_activated_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_nature_normal_dark.png b/res/drawable-hdpi/ic_emoji_nature_normal_dark.png
deleted file mode 100644
index 90ca0acb57..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_nature_normal_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_nature_normal_light.png b/res/drawable-hdpi/ic_emoji_nature_normal_light.png
deleted file mode 100644
index 8e970200bf..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_nature_normal_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_object_activated_dark.png b/res/drawable-hdpi/ic_emoji_object_activated_dark.png
deleted file mode 100644
index 823394d6e7..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_object_activated_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_object_activated_light.png b/res/drawable-hdpi/ic_emoji_object_activated_light.png
deleted file mode 100644
index 2ece8ceada..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_object_activated_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_object_normal_dark.png b/res/drawable-hdpi/ic_emoji_object_normal_dark.png
deleted file mode 100644
index 23f6b43a08..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_object_normal_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_object_normal_light.png b/res/drawable-hdpi/ic_emoji_object_normal_light.png
deleted file mode 100644
index 823394d6e7..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_object_normal_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_people_activated_dark.png b/res/drawable-hdpi/ic_emoji_people_activated_dark.png
deleted file mode 100644
index 787d0002cf..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_people_activated_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_people_activated_light.png b/res/drawable-hdpi/ic_emoji_people_activated_light.png
deleted file mode 100644
index 262ea943a2..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_people_activated_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_people_normal_dark.png b/res/drawable-hdpi/ic_emoji_people_normal_dark.png
deleted file mode 100644
index e581af307a..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_people_normal_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_people_normal_light.png b/res/drawable-hdpi/ic_emoji_people_normal_light.png
deleted file mode 100644
index 787d0002cf..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_people_normal_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_places_activated_dark.png b/res/drawable-hdpi/ic_emoji_places_activated_dark.png
deleted file mode 100644
index 721281d84f..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_places_activated_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_places_activated_light.png b/res/drawable-hdpi/ic_emoji_places_activated_light.png
deleted file mode 100644
index 78a4a39e00..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_places_activated_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_places_normal_dark.png b/res/drawable-hdpi/ic_emoji_places_normal_dark.png
deleted file mode 100644
index 1744eb741c..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_places_normal_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_places_normal_light.png b/res/drawable-hdpi/ic_emoji_places_normal_light.png
deleted file mode 100644
index 721281d84f..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_places_normal_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_recents_activated_dark.png b/res/drawable-hdpi/ic_emoji_recents_activated_dark.png
deleted file mode 100644
index 9ee13353c8..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_recents_activated_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_recents_activated_light.png b/res/drawable-hdpi/ic_emoji_recents_activated_light.png
deleted file mode 100644
index 50725d9844..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_recents_activated_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_recents_normal_dark.png b/res/drawable-hdpi/ic_emoji_recents_normal_dark.png
deleted file mode 100644
index f081e4d29b..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_recents_normal_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_recents_normal_light.png b/res/drawable-hdpi/ic_emoji_recents_normal_light.png
deleted file mode 100644
index 91e8542ffd..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_recents_normal_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_symbols_activated_dark.png b/res/drawable-hdpi/ic_emoji_symbols_activated_dark.png
deleted file mode 100644
index 05fe46c8bf..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_symbols_activated_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_symbols_activated_light.png b/res/drawable-hdpi/ic_emoji_symbols_activated_light.png
deleted file mode 100644
index 76c8b1ba02..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_symbols_activated_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_symbols_normal_dark.png b/res/drawable-hdpi/ic_emoji_symbols_normal_dark.png
deleted file mode 100644
index 6f56d2d57f..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_symbols_normal_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_symbols_normal_light.png b/res/drawable-hdpi/ic_emoji_symbols_normal_light.png
deleted file mode 100644
index 05fe46c8bf..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_symbols_normal_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/transfer_controls_background.9.png b/res/drawable-hdpi/transfer_controls_background.9.png
deleted file mode 100644
index c7b7f575f4..0000000000
Binary files a/res/drawable-hdpi/transfer_controls_background.9.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
deleted file mode 100644
index 4a1574abea..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_activity_activated_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_activity_activated_light.png b/res/drawable-mdpi/ic_emoji_activity_activated_light.png
deleted file mode 100644
index 677223f79f..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_activity_activated_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_activity_normal_dark.png b/res/drawable-mdpi/ic_emoji_activity_normal_dark.png
deleted file mode 100644
index bfcafda8a9..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_activity_normal_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_activity_normal_light.png b/res/drawable-mdpi/ic_emoji_activity_normal_light.png
deleted file mode 100644
index 4a1574abea..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_activity_normal_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_emoticons_activated_dark.png b/res/drawable-mdpi/ic_emoji_emoticons_activated_dark.png
deleted file mode 100644
index 6a94d111ba..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_emoticons_activated_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_emoticons_activated_light.png b/res/drawable-mdpi/ic_emoji_emoticons_activated_light.png
deleted file mode 100644
index a63d23cc24..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_emoticons_activated_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_emoticons_normal_dark.png b/res/drawable-mdpi/ic_emoji_emoticons_normal_dark.png
deleted file mode 100644
index 7945730178..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_emoticons_normal_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_emoticons_normal_light.png b/res/drawable-mdpi/ic_emoji_emoticons_normal_light.png
deleted file mode 100644
index 4cec12ef16..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_emoticons_normal_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_flag_activated_dark.png b/res/drawable-mdpi/ic_emoji_flag_activated_dark.png
deleted file mode 100644
index ae1ca3f9d4..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_flag_activated_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_flag_activated_light.png b/res/drawable-mdpi/ic_emoji_flag_activated_light.png
deleted file mode 100644
index 2bc9f8f09b..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_flag_activated_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_flag_normal_dark.png b/res/drawable-mdpi/ic_emoji_flag_normal_dark.png
deleted file mode 100644
index ede66c9761..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_flag_normal_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_flag_normal_light.png b/res/drawable-mdpi/ic_emoji_flag_normal_light.png
deleted file mode 100644
index ae1ca3f9d4..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_flag_normal_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_foods_activated_dark.png b/res/drawable-mdpi/ic_emoji_foods_activated_dark.png
deleted file mode 100644
index 785deee018..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_foods_activated_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_foods_activated_light.png b/res/drawable-mdpi/ic_emoji_foods_activated_light.png
deleted file mode 100644
index 68efa0a50e..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_foods_activated_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_foods_normal_dark.png b/res/drawable-mdpi/ic_emoji_foods_normal_dark.png
deleted file mode 100644
index aed613d5bc..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_foods_normal_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_foods_normal_light.png b/res/drawable-mdpi/ic_emoji_foods_normal_light.png
deleted file mode 100644
index 785deee018..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_foods_normal_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_nature_activated_dark.png b/res/drawable-mdpi/ic_emoji_nature_activated_dark.png
deleted file mode 100644
index 7de887a96e..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_nature_activated_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_nature_activated_light.png b/res/drawable-mdpi/ic_emoji_nature_activated_light.png
deleted file mode 100644
index 234f2d9802..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_nature_activated_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_nature_normal_dark.png b/res/drawable-mdpi/ic_emoji_nature_normal_dark.png
deleted file mode 100644
index d63616d118..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_nature_normal_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_nature_normal_light.png b/res/drawable-mdpi/ic_emoji_nature_normal_light.png
deleted file mode 100644
index 7de887a96e..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_nature_normal_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_object_activated_dark.png b/res/drawable-mdpi/ic_emoji_object_activated_dark.png
deleted file mode 100644
index 6206af2b2b..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_object_activated_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_object_activated_light.png b/res/drawable-mdpi/ic_emoji_object_activated_light.png
deleted file mode 100644
index 11f25dcc69..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_object_activated_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_object_normal_dark.png b/res/drawable-mdpi/ic_emoji_object_normal_dark.png
deleted file mode 100644
index cdc756575c..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_object_normal_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_object_normal_light.png b/res/drawable-mdpi/ic_emoji_object_normal_light.png
deleted file mode 100644
index 6206af2b2b..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_object_normal_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_people_activated_dark.png b/res/drawable-mdpi/ic_emoji_people_activated_dark.png
deleted file mode 100644
index 91cae22a77..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_people_activated_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_people_activated_light.png b/res/drawable-mdpi/ic_emoji_people_activated_light.png
deleted file mode 100644
index 353a3100a2..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_people_activated_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_people_normal_dark.png b/res/drawable-mdpi/ic_emoji_people_normal_dark.png
deleted file mode 100644
index 851df9e964..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_people_normal_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_people_normal_light.png b/res/drawable-mdpi/ic_emoji_people_normal_light.png
deleted file mode 100644
index 91cae22a77..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_people_normal_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_places_activated_dark.png b/res/drawable-mdpi/ic_emoji_places_activated_dark.png
deleted file mode 100644
index ceab263b39..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_places_activated_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_places_activated_light.png b/res/drawable-mdpi/ic_emoji_places_activated_light.png
deleted file mode 100644
index 23ae27f140..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_places_activated_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_places_normal_dark.png b/res/drawable-mdpi/ic_emoji_places_normal_dark.png
deleted file mode 100644
index 67f90d42f6..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_places_normal_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_places_normal_light.png b/res/drawable-mdpi/ic_emoji_places_normal_light.png
deleted file mode 100644
index ceab263b39..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_places_normal_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_recents_activated_dark.png b/res/drawable-mdpi/ic_emoji_recents_activated_dark.png
deleted file mode 100644
index 775f3d7504..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_recents_activated_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_recents_activated_light.png b/res/drawable-mdpi/ic_emoji_recents_activated_light.png
deleted file mode 100644
index 5fb21b2ddb..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_recents_activated_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_recents_normal_dark.png b/res/drawable-mdpi/ic_emoji_recents_normal_dark.png
deleted file mode 100644
index 6c0b551073..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_recents_normal_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_recents_normal_light.png b/res/drawable-mdpi/ic_emoji_recents_normal_light.png
deleted file mode 100644
index da20de7fa5..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_recents_normal_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_symbols_activated_dark.png b/res/drawable-mdpi/ic_emoji_symbols_activated_dark.png
deleted file mode 100644
index 3aca48546c..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_symbols_activated_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_symbols_activated_light.png b/res/drawable-mdpi/ic_emoji_symbols_activated_light.png
deleted file mode 100644
index 3db7b5a0fb..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_symbols_activated_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_symbols_normal_dark.png b/res/drawable-mdpi/ic_emoji_symbols_normal_dark.png
deleted file mode 100644
index aa56d6b40f..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_symbols_normal_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_symbols_normal_light.png b/res/drawable-mdpi/ic_emoji_symbols_normal_light.png
deleted file mode 100644
index 3aca48546c..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_symbols_normal_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/transfer_controls_background.9.png b/res/drawable-mdpi/transfer_controls_background.9.png
deleted file mode 100644
index 5e8b65b45d..0000000000
Binary files a/res/drawable-mdpi/transfer_controls_background.9.png and /dev/null differ
diff --git a/res/drawable-v21/sticker_button_dark.xml b/res/drawable-v21/sticker_button_dark.xml
new file mode 100644
index 0000000000..bbd18b7e9f
--- /dev/null
+++ b/res/drawable-v21/sticker_button_dark.xml
@@ -0,0 +1,17 @@
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
diff --git a/res/drawable-v21/sticker_button_light.xml b/res/drawable-v21/sticker_button_light.xml
new file mode 100644
index 0000000000..f20b4e89d1
--- /dev/null
+++ b/res/drawable-v21/sticker_button_light.xml
@@ -0,0 +1,17 @@
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
diff --git a/res/drawable-xhdpi/ic_emoji_activity_activated_dark.png b/res/drawable-xhdpi/ic_emoji_activity_activated_dark.png
deleted file mode 100644
index 1d04bc797d..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_activity_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_activity_activated_light.png b/res/drawable-xhdpi/ic_emoji_activity_activated_light.png
deleted file mode 100644
index 7001af641f..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_activity_activated_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_activity_normal_dark.png b/res/drawable-xhdpi/ic_emoji_activity_normal_dark.png
deleted file mode 100644
index 68b5d8d2ff..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_activity_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_activity_normal_light.png b/res/drawable-xhdpi/ic_emoji_activity_normal_light.png
deleted file mode 100644
index 1d04bc797d..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_activity_normal_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_emoticons_activated_dark.png b/res/drawable-xhdpi/ic_emoji_emoticons_activated_dark.png
deleted file mode 100644
index 4c75aa7cd2..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_emoticons_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_emoticons_activated_light.png b/res/drawable-xhdpi/ic_emoji_emoticons_activated_light.png
deleted file mode 100644
index fa46ef2bf0..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_emoticons_activated_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_emoticons_normal_dark.png b/res/drawable-xhdpi/ic_emoji_emoticons_normal_dark.png
deleted file mode 100644
index 3be4ee4aa1..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_emoticons_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_emoticons_normal_light.png b/res/drawable-xhdpi/ic_emoji_emoticons_normal_light.png
deleted file mode 100644
index 21c3f5bdde..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_emoticons_normal_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_flag_activated_dark.png b/res/drawable-xhdpi/ic_emoji_flag_activated_dark.png
deleted file mode 100644
index 471d644f84..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_flag_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_flag_activated_light.png b/res/drawable-xhdpi/ic_emoji_flag_activated_light.png
deleted file mode 100644
index 58a1b7bf2d..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_flag_activated_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_flag_normal_dark.png b/res/drawable-xhdpi/ic_emoji_flag_normal_dark.png
deleted file mode 100644
index 597de87f52..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_flag_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_flag_normal_light.png b/res/drawable-xhdpi/ic_emoji_flag_normal_light.png
deleted file mode 100644
index 471d644f84..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_flag_normal_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_foods_activated_dark.png b/res/drawable-xhdpi/ic_emoji_foods_activated_dark.png
deleted file mode 100644
index a49d4f55b1..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_foods_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_foods_activated_light.png b/res/drawable-xhdpi/ic_emoji_foods_activated_light.png
deleted file mode 100644
index 8ad2915cc8..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_foods_activated_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_foods_normal_dark.png b/res/drawable-xhdpi/ic_emoji_foods_normal_dark.png
deleted file mode 100644
index e1cac3ffc7..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_foods_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_foods_normal_light.png b/res/drawable-xhdpi/ic_emoji_foods_normal_light.png
deleted file mode 100644
index a49d4f55b1..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_foods_normal_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_nature_activated_dark.png b/res/drawable-xhdpi/ic_emoji_nature_activated_dark.png
deleted file mode 100644
index 0b409d57ce..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_nature_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_nature_activated_light.png b/res/drawable-xhdpi/ic_emoji_nature_activated_light.png
deleted file mode 100644
index c4e2e99778..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_nature_activated_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_nature_normal_dark.png b/res/drawable-xhdpi/ic_emoji_nature_normal_dark.png
deleted file mode 100644
index 8bce788565..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_nature_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_nature_normal_light.png b/res/drawable-xhdpi/ic_emoji_nature_normal_light.png
deleted file mode 100644
index 0b409d57ce..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_nature_normal_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_object_activated_dark.png b/res/drawable-xhdpi/ic_emoji_object_activated_dark.png
deleted file mode 100644
index e7afca3f6e..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_object_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_object_activated_light.png b/res/drawable-xhdpi/ic_emoji_object_activated_light.png
deleted file mode 100644
index 1b51f9e128..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_object_activated_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_object_normal_dark.png b/res/drawable-xhdpi/ic_emoji_object_normal_dark.png
deleted file mode 100644
index 02e7ea6d44..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_object_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_object_normal_light.png b/res/drawable-xhdpi/ic_emoji_object_normal_light.png
deleted file mode 100644
index e7afca3f6e..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_object_normal_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_people_activated_dark.png b/res/drawable-xhdpi/ic_emoji_people_activated_dark.png
deleted file mode 100644
index 693a1c69f6..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_people_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_people_activated_light.png b/res/drawable-xhdpi/ic_emoji_people_activated_light.png
deleted file mode 100644
index 6ae3d264c9..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_people_activated_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_people_normal_dark.png b/res/drawable-xhdpi/ic_emoji_people_normal_dark.png
deleted file mode 100644
index fe91469aab..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_people_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_people_normal_light.png b/res/drawable-xhdpi/ic_emoji_people_normal_light.png
deleted file mode 100644
index 693a1c69f6..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_people_normal_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_places_activated_dark.png b/res/drawable-xhdpi/ic_emoji_places_activated_dark.png
deleted file mode 100644
index 0b368d62fb..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_places_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_places_activated_light.png b/res/drawable-xhdpi/ic_emoji_places_activated_light.png
deleted file mode 100644
index d4c49d78f2..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_places_activated_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_places_normal_dark.png b/res/drawable-xhdpi/ic_emoji_places_normal_dark.png
deleted file mode 100644
index fc67497e11..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_places_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_places_normal_light.png b/res/drawable-xhdpi/ic_emoji_places_normal_light.png
deleted file mode 100644
index 0b368d62fb..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_places_normal_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_recents_activated_dark.png b/res/drawable-xhdpi/ic_emoji_recents_activated_dark.png
deleted file mode 100644
index 944a180fea..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_recents_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_recents_activated_light.png b/res/drawable-xhdpi/ic_emoji_recents_activated_light.png
deleted file mode 100644
index 0b07c84a6f..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_recents_activated_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_recents_normal_dark.png b/res/drawable-xhdpi/ic_emoji_recents_normal_dark.png
deleted file mode 100644
index adcc1ace43..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_recents_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_recents_normal_light.png b/res/drawable-xhdpi/ic_emoji_recents_normal_light.png
deleted file mode 100644
index 4dd87fe536..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_recents_normal_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_symbols_activated_dark.png b/res/drawable-xhdpi/ic_emoji_symbols_activated_dark.png
deleted file mode 100644
index a28e4a84ad..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_symbols_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_symbols_activated_light.png b/res/drawable-xhdpi/ic_emoji_symbols_activated_light.png
deleted file mode 100644
index a6f6ebc4e0..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_symbols_activated_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_symbols_normal_dark.png b/res/drawable-xhdpi/ic_emoji_symbols_normal_dark.png
deleted file mode 100644
index 7c016ef665..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_symbols_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_symbols_normal_light.png b/res/drawable-xhdpi/ic_emoji_symbols_normal_light.png
deleted file mode 100644
index a28e4a84ad..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_symbols_normal_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/transfer_controls_background.9.png b/res/drawable-xhdpi/transfer_controls_background.9.png
deleted file mode 100644
index 3721dc5202..0000000000
Binary files a/res/drawable-xhdpi/transfer_controls_background.9.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
deleted file mode 100644
index 5cf9101c06..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_activity_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_activity_activated_light.png b/res/drawable-xxhdpi/ic_emoji_activity_activated_light.png
deleted file mode 100644
index 76a4aebe5b..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_activity_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_activity_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_activity_normal_dark.png
deleted file mode 100644
index 6d90599b1f..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_activity_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_activity_normal_light.png b/res/drawable-xxhdpi/ic_emoji_activity_normal_light.png
deleted file mode 100644
index 5cf9101c06..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_activity_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_emoticons_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_emoticons_activated_dark.png
deleted file mode 100644
index e2ec29d53d..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_emoticons_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_emoticons_activated_light.png b/res/drawable-xxhdpi/ic_emoji_emoticons_activated_light.png
deleted file mode 100644
index 012700f0b0..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_emoticons_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_emoticons_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_emoticons_normal_dark.png
deleted file mode 100644
index f4487745b9..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_emoticons_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_emoticons_normal_light.png b/res/drawable-xxhdpi/ic_emoji_emoticons_normal_light.png
deleted file mode 100644
index 20c1fcde70..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_emoticons_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_flag_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_flag_activated_dark.png
deleted file mode 100644
index 5797242bc0..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_flag_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_flag_activated_light.png b/res/drawable-xxhdpi/ic_emoji_flag_activated_light.png
deleted file mode 100644
index adf73cf40f..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_flag_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_flag_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_flag_normal_dark.png
deleted file mode 100644
index 47f75e2cae..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_flag_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_flag_normal_light.png b/res/drawable-xxhdpi/ic_emoji_flag_normal_light.png
deleted file mode 100644
index 5797242bc0..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_flag_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_foods_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_foods_activated_dark.png
deleted file mode 100644
index 8a0be6d505..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_foods_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_foods_activated_light.png b/res/drawable-xxhdpi/ic_emoji_foods_activated_light.png
deleted file mode 100644
index 784f603a50..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_foods_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_foods_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_foods_normal_dark.png
deleted file mode 100644
index ed5571a88e..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_foods_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_foods_normal_light.png b/res/drawable-xxhdpi/ic_emoji_foods_normal_light.png
deleted file mode 100644
index 8a0be6d505..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_foods_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_nature_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_nature_activated_dark.png
deleted file mode 100644
index 15214246c2..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_nature_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_nature_activated_light.png b/res/drawable-xxhdpi/ic_emoji_nature_activated_light.png
deleted file mode 100644
index 65947ba066..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_nature_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_nature_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_nature_normal_dark.png
deleted file mode 100644
index 12a2324fd0..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_nature_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_nature_normal_light.png b/res/drawable-xxhdpi/ic_emoji_nature_normal_light.png
deleted file mode 100644
index 15214246c2..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_nature_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_object_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_object_activated_dark.png
deleted file mode 100644
index 41b8604be6..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_object_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_object_activated_light.png b/res/drawable-xxhdpi/ic_emoji_object_activated_light.png
deleted file mode 100644
index 1979f6513f..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_object_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_object_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_object_normal_dark.png
deleted file mode 100644
index 671eef8273..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_object_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_object_normal_light.png b/res/drawable-xxhdpi/ic_emoji_object_normal_light.png
deleted file mode 100644
index 41b8604be6..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_object_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_people_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_people_activated_dark.png
deleted file mode 100644
index 40753d285e..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_people_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_people_activated_light.png b/res/drawable-xxhdpi/ic_emoji_people_activated_light.png
deleted file mode 100644
index 2b6ed0c163..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_people_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_people_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_people_normal_dark.png
deleted file mode 100644
index 72df107d85..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_people_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_people_normal_light.png b/res/drawable-xxhdpi/ic_emoji_people_normal_light.png
deleted file mode 100644
index 40753d285e..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_people_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_places_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_places_activated_dark.png
deleted file mode 100644
index 9ae9fc7b26..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_places_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_places_activated_light.png b/res/drawable-xxhdpi/ic_emoji_places_activated_light.png
deleted file mode 100644
index a7fafaec64..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_places_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_places_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_places_normal_dark.png
deleted file mode 100644
index dbdbd9e0cc..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_places_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_places_normal_light.png b/res/drawable-xxhdpi/ic_emoji_places_normal_light.png
deleted file mode 100644
index 9ae9fc7b26..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_places_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_recents_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_recents_activated_dark.png
deleted file mode 100644
index 8c4a00a7d2..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_recents_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_recents_activated_light.png b/res/drawable-xxhdpi/ic_emoji_recents_activated_light.png
deleted file mode 100644
index 94d7cd05c5..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_recents_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_recents_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_recents_normal_dark.png
deleted file mode 100644
index 651dc5cc01..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_recents_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_recents_normal_light.png b/res/drawable-xxhdpi/ic_emoji_recents_normal_light.png
deleted file mode 100644
index 9988097d2a..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_recents_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_symbols_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_symbols_activated_dark.png
deleted file mode 100644
index 780b6397dc..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_symbols_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_symbols_activated_light.png b/res/drawable-xxhdpi/ic_emoji_symbols_activated_light.png
deleted file mode 100644
index 2cb85bbd80..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_symbols_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_symbols_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_symbols_normal_dark.png
deleted file mode 100644
index fc60900710..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_symbols_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_symbols_normal_light.png b/res/drawable-xxhdpi/ic_emoji_symbols_normal_light.png
deleted file mode 100644
index 780b6397dc..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_symbols_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/transfer_controls_background.9.png b/res/drawable-xxhdpi/transfer_controls_background.9.png
deleted file mode 100644
index 0fa81940ce..0000000000
Binary files a/res/drawable-xxhdpi/transfer_controls_background.9.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
deleted file mode 100644
index b2c61c6bd1..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_activity_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_activity_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_activity_activated_light.png
deleted file mode 100644
index 3196e256a6..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_activity_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_activity_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_activity_normal_dark.png
deleted file mode 100644
index 6745d84e54..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_activity_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_activity_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_activity_normal_light.png
deleted file mode 100644
index b2c61c6bd1..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_activity_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_flag_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_flag_activated_dark.png
deleted file mode 100644
index dced7d6383..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_flag_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_flag_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_flag_activated_light.png
deleted file mode 100644
index 678adf4d2d..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_flag_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_flag_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_flag_normal_dark.png
deleted file mode 100644
index c69c5c3e82..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_flag_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_flag_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_flag_normal_light.png
deleted file mode 100644
index dced7d6383..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_flag_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_foods_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_foods_activated_dark.png
deleted file mode 100644
index 39455b4fc5..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_foods_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_foods_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_foods_activated_light.png
deleted file mode 100644
index 662dbac2b9..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_foods_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_foods_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_foods_normal_dark.png
deleted file mode 100644
index c2b2432326..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_foods_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_foods_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_foods_normal_light.png
deleted file mode 100644
index 39455b4fc5..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_foods_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_nature_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_nature_activated_dark.png
deleted file mode 100644
index e9106a7c4f..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_nature_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_nature_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_nature_activated_light.png
deleted file mode 100644
index 9d3e7d4de7..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_nature_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_nature_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_nature_normal_dark.png
deleted file mode 100644
index 2e8d684359..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_nature_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_nature_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_nature_normal_light.png
deleted file mode 100644
index e9106a7c4f..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_nature_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_object_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_object_activated_dark.png
deleted file mode 100644
index 841e9f12e7..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_object_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_object_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_object_activated_light.png
deleted file mode 100644
index 21bcb25ad1..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_object_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_object_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_object_normal_dark.png
deleted file mode 100644
index 5541e5b849..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_object_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_object_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_object_normal_light.png
deleted file mode 100644
index 841e9f12e7..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_object_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_people_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_people_activated_dark.png
deleted file mode 100644
index daa4020ce4..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_people_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_people_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_people_activated_light.png
deleted file mode 100644
index eac554f536..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_people_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_people_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_people_normal_dark.png
deleted file mode 100644
index e093154a75..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_people_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_people_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_people_normal_light.png
deleted file mode 100644
index daa4020ce4..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_people_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_places_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_places_activated_dark.png
deleted file mode 100644
index 1953371c4d..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_places_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_places_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_places_activated_light.png
deleted file mode 100644
index 27f4935a32..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_places_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_places_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_places_normal_dark.png
deleted file mode 100644
index 4088e50005..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_places_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_places_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_places_normal_light.png
deleted file mode 100644
index 1953371c4d..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_places_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_symbols_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_symbols_activated_dark.png
deleted file mode 100644
index 062f031337..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_symbols_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_symbols_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_symbols_activated_light.png
deleted file mode 100644
index eecad27933..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_symbols_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_symbols_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_symbols_normal_dark.png
deleted file mode 100644
index 86152fa226..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_symbols_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_symbols_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_symbols_normal_light.png
deleted file mode 100644
index 062f031337..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_symbols_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/transfer_controls_background.9.png b/res/drawable-xxxhdpi/transfer_controls_background.9.png
deleted file mode 100644
index e349e74058..0000000000
Binary files a/res/drawable-xxxhdpi/transfer_controls_background.9.png and /dev/null differ
diff --git a/res/drawable/emoji_category_activity_dark.xml b/res/drawable/emoji_category_activity_dark.xml
deleted file mode 100644
index 84269ce568..0000000000
--- a/res/drawable/emoji_category_activity_dark.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
diff --git a/res/drawable/emoji_category_activity_light.xml b/res/drawable/emoji_category_activity_light.xml
deleted file mode 100644
index befeb3138d..0000000000
--- a/res/drawable/emoji_category_activity_light.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
diff --git a/res/drawable/emoji_category_emoticons_dark.xml b/res/drawable/emoji_category_emoticons_dark.xml
deleted file mode 100644
index 3209fe5448..0000000000
--- a/res/drawable/emoji_category_emoticons_dark.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
diff --git a/res/drawable/emoji_category_emoticons_light.xml b/res/drawable/emoji_category_emoticons_light.xml
deleted file mode 100644
index 8777fb389a..0000000000
--- a/res/drawable/emoji_category_emoticons_light.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
diff --git a/res/drawable/emoji_category_flags_dark.xml b/res/drawable/emoji_category_flags_dark.xml
deleted file mode 100644
index 41416774f3..0000000000
--- a/res/drawable/emoji_category_flags_dark.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
diff --git a/res/drawable/emoji_category_flags_light.xml b/res/drawable/emoji_category_flags_light.xml
deleted file mode 100644
index 2f61d042d2..0000000000
--- a/res/drawable/emoji_category_flags_light.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
diff --git a/res/drawable/emoji_category_foods_dark.xml b/res/drawable/emoji_category_foods_dark.xml
deleted file mode 100644
index 650de4343a..0000000000
--- a/res/drawable/emoji_category_foods_dark.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
diff --git a/res/drawable/emoji_category_foods_light.xml b/res/drawable/emoji_category_foods_light.xml
deleted file mode 100644
index 475bd21352..0000000000
--- a/res/drawable/emoji_category_foods_light.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
diff --git a/res/drawable/emoji_category_nature_dark.xml b/res/drawable/emoji_category_nature_dark.xml
deleted file mode 100644
index e54e35885a..0000000000
--- a/res/drawable/emoji_category_nature_dark.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
diff --git a/res/drawable/emoji_category_nature_light.xml b/res/drawable/emoji_category_nature_light.xml
deleted file mode 100644
index f21883347e..0000000000
--- a/res/drawable/emoji_category_nature_light.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
diff --git a/res/drawable/emoji_category_objects_dark.xml b/res/drawable/emoji_category_objects_dark.xml
deleted file mode 100644
index 3eb67ce51c..0000000000
--- a/res/drawable/emoji_category_objects_dark.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
diff --git a/res/drawable/emoji_category_objects_light.xml b/res/drawable/emoji_category_objects_light.xml
deleted file mode 100644
index 83421c32c0..0000000000
--- a/res/drawable/emoji_category_objects_light.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
diff --git a/res/drawable/emoji_category_people_dark.xml b/res/drawable/emoji_category_people_dark.xml
deleted file mode 100644
index 8ffc79c280..0000000000
--- a/res/drawable/emoji_category_people_dark.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
diff --git a/res/drawable/emoji_category_people_light.xml b/res/drawable/emoji_category_people_light.xml
deleted file mode 100644
index 639af154ce..0000000000
--- a/res/drawable/emoji_category_people_light.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
diff --git a/res/drawable/emoji_category_places_dark.xml b/res/drawable/emoji_category_places_dark.xml
deleted file mode 100644
index fa62492587..0000000000
--- a/res/drawable/emoji_category_places_dark.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
diff --git a/res/drawable/emoji_category_places_light.xml b/res/drawable/emoji_category_places_light.xml
deleted file mode 100644
index 51d7a8a879..0000000000
--- a/res/drawable/emoji_category_places_light.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
diff --git a/res/drawable/emoji_category_recent_dark.xml b/res/drawable/emoji_category_recent_dark.xml
deleted file mode 100644
index 5d8581dbaf..0000000000
--- a/res/drawable/emoji_category_recent_dark.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
diff --git a/res/drawable/emoji_category_recent_light.xml b/res/drawable/emoji_category_recent_light.xml
deleted file mode 100644
index ea5c1cc77c..0000000000
--- a/res/drawable/emoji_category_recent_light.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
diff --git a/res/drawable/emoji_category_symbol_dark.xml b/res/drawable/emoji_category_symbol_dark.xml
deleted file mode 100644
index e98cbee842..0000000000
--- a/res/drawable/emoji_category_symbol_dark.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
diff --git a/res/drawable/emoji_category_symbol_light.xml b/res/drawable/emoji_category_symbol_light.xml
deleted file mode 100644
index d3cc7c8fbb..0000000000
--- a/res/drawable/emoji_category_symbol_light.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
diff --git a/res/drawable/ic_arrow_down.xml b/res/drawable/ic_arrow_down.xml
new file mode 100644
index 0000000000..2afc613651
--- /dev/null
+++ b/res/drawable/ic_arrow_down.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_arrow_down_circle_filled.xml b/res/drawable/ic_arrow_down_circle_filled.xml
new file mode 100644
index 0000000000..be0bc5b4ac
--- /dev/null
+++ b/res/drawable/ic_arrow_down_circle_filled.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_activity_dark_20.xml b/res/drawable/ic_emoji_activity_dark_20.xml
new file mode 100644
index 0000000000..7772677cd1
--- /dev/null
+++ b/res/drawable/ic_emoji_activity_dark_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_activity_light_20.xml b/res/drawable/ic_emoji_activity_light_20.xml
new file mode 100644
index 0000000000..809d801ee8
--- /dev/null
+++ b/res/drawable/ic_emoji_activity_light_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_animal_dark_20.xml b/res/drawable/ic_emoji_animal_dark_20.xml
new file mode 100644
index 0000000000..8ddbc2e127
--- /dev/null
+++ b/res/drawable/ic_emoji_animal_dark_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_animal_light_20.xml b/res/drawable/ic_emoji_animal_light_20.xml
new file mode 100644
index 0000000000..63f2f9e10c
--- /dev/null
+++ b/res/drawable/ic_emoji_animal_light_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_emoticon_dark_20.xml b/res/drawable/ic_emoji_emoticon_dark_20.xml
new file mode 100644
index 0000000000..6a1b096cc0
--- /dev/null
+++ b/res/drawable/ic_emoji_emoticon_dark_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_emoticon_light_20.xml b/res/drawable/ic_emoji_emoticon_light_20.xml
new file mode 100644
index 0000000000..8b5df632c6
--- /dev/null
+++ b/res/drawable/ic_emoji_emoticon_light_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_filled.xml b/res/drawable/ic_emoji_filled.xml
new file mode 100644
index 0000000000..ed160bb6d5
--- /dev/null
+++ b/res/drawable/ic_emoji_filled.xml
@@ -0,0 +1,4 @@
+
+
+
diff --git a/res/drawable/ic_emoji_filled_keyboard_dark.xml b/res/drawable/ic_emoji_filled_keyboard_dark.xml
new file mode 100644
index 0000000000..e0429d88fe
--- /dev/null
+++ b/res/drawable/ic_emoji_filled_keyboard_dark.xml
@@ -0,0 +1,4 @@
+
+
+
diff --git a/res/drawable/ic_emoji_filled_keyboard_light.xml b/res/drawable/ic_emoji_filled_keyboard_light.xml
new file mode 100644
index 0000000000..ed8a86b40a
--- /dev/null
+++ b/res/drawable/ic_emoji_filled_keyboard_light.xml
@@ -0,0 +1,4 @@
+
+
+
diff --git a/res/drawable/ic_emoji_flag_dark_20.xml b/res/drawable/ic_emoji_flag_dark_20.xml
new file mode 100644
index 0000000000..1b1d730edb
--- /dev/null
+++ b/res/drawable/ic_emoji_flag_dark_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_flag_light_20.xml b/res/drawable/ic_emoji_flag_light_20.xml
new file mode 100644
index 0000000000..f5b87e490c
--- /dev/null
+++ b/res/drawable/ic_emoji_flag_light_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_food_dark_20.xml b/res/drawable/ic_emoji_food_dark_20.xml
new file mode 100644
index 0000000000..36b786fce8
--- /dev/null
+++ b/res/drawable/ic_emoji_food_dark_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_food_light_20.xml b/res/drawable/ic_emoji_food_light_20.xml
new file mode 100644
index 0000000000..49898b5a2f
--- /dev/null
+++ b/res/drawable/ic_emoji_food_light_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_object_dark_20.xml b/res/drawable/ic_emoji_object_dark_20.xml
new file mode 100644
index 0000000000..44934dd47d
--- /dev/null
+++ b/res/drawable/ic_emoji_object_dark_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_object_light_20.xml b/res/drawable/ic_emoji_object_light_20.xml
new file mode 100644
index 0000000000..6aa4c053e6
--- /dev/null
+++ b/res/drawable/ic_emoji_object_light_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_outline.xml b/res/drawable/ic_emoji_outline.xml
new file mode 100644
index 0000000000..943277e7a3
--- /dev/null
+++ b/res/drawable/ic_emoji_outline.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_outline_keyboard.xml b/res/drawable/ic_emoji_outline_keyboard.xml
new file mode 100644
index 0000000000..943277e7a3
--- /dev/null
+++ b/res/drawable/ic_emoji_outline_keyboard.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_people_dark_20.xml b/res/drawable/ic_emoji_people_dark_20.xml
new file mode 100644
index 0000000000..c28e8c86c9
--- /dev/null
+++ b/res/drawable/ic_emoji_people_dark_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_people_light_20.xml b/res/drawable/ic_emoji_people_light_20.xml
new file mode 100644
index 0000000000..26867afd88
--- /dev/null
+++ b/res/drawable/ic_emoji_people_light_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_symbol_dark_20.xml b/res/drawable/ic_emoji_symbol_dark_20.xml
new file mode 100644
index 0000000000..c2049dc470
--- /dev/null
+++ b/res/drawable/ic_emoji_symbol_dark_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_symbol_light_20.xml b/res/drawable/ic_emoji_symbol_light_20.xml
new file mode 100644
index 0000000000..5a5b27697b
--- /dev/null
+++ b/res/drawable/ic_emoji_symbol_light_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_travel_dark_20.xml b/res/drawable/ic_emoji_travel_dark_20.xml
new file mode 100644
index 0000000000..c22c93c470
--- /dev/null
+++ b/res/drawable/ic_emoji_travel_dark_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_travel_light_20.xml b/res/drawable/ic_emoji_travel_light_20.xml
new file mode 100644
index 0000000000..6a0448e21b
--- /dev/null
+++ b/res/drawable/ic_emoji_travel_light_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_forward_outline.xml b/res/drawable/ic_forward_outline.xml
new file mode 100644
index 0000000000..d1463dda12
--- /dev/null
+++ b/res/drawable/ic_forward_outline.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_mic_filled_24.xml b/res/drawable/ic_mic_filled_24.xml
new file mode 100644
index 0000000000..acffc548c3
--- /dev/null
+++ b/res/drawable/ic_mic_filled_24.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_plus_24.xml b/res/drawable/ic_plus_24.xml
new file mode 100644
index 0000000000..d287574e12
--- /dev/null
+++ b/res/drawable/ic_plus_24.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_recent_dark_20.xml b/res/drawable/ic_recent_dark_20.xml
new file mode 100644
index 0000000000..7cb39ce596
--- /dev/null
+++ b/res/drawable/ic_recent_dark_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_recent_light_20.xml b/res/drawable/ic_recent_light_20.xml
new file mode 100644
index 0000000000..1e888e4f6c
--- /dev/null
+++ b/res/drawable/ic_recent_light_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_sticker_filled.xml b/res/drawable/ic_sticker_filled.xml
new file mode 100644
index 0000000000..9b4b5c566a
--- /dev/null
+++ b/res/drawable/ic_sticker_filled.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_sticker_filled_keyboard_dark.xml b/res/drawable/ic_sticker_filled_keyboard_dark.xml
new file mode 100644
index 0000000000..b8a968b034
--- /dev/null
+++ b/res/drawable/ic_sticker_filled_keyboard_dark.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_sticker_filled_keyboard_light.xml b/res/drawable/ic_sticker_filled_keyboard_light.xml
new file mode 100644
index 0000000000..d4db977f52
--- /dev/null
+++ b/res/drawable/ic_sticker_filled_keyboard_light.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_sticker_outline.xml b/res/drawable/ic_sticker_outline.xml
new file mode 100644
index 0000000000..d2f6e5bb03
--- /dev/null
+++ b/res/drawable/ic_sticker_outline.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_sticker_outline_keyboard.xml b/res/drawable/ic_sticker_outline_keyboard.xml
new file mode 100644
index 0000000000..d2f6e5bb03
--- /dev/null
+++ b/res/drawable/ic_sticker_outline_keyboard.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_triangle_down.xml b/res/drawable/ic_triangle_down.xml
new file mode 100644
index 0000000000..9ff7fc1c8c
--- /dev/null
+++ b/res/drawable/ic_triangle_down.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/res/drawable/ic_triangle_left.xml b/res/drawable/ic_triangle_left.xml
new file mode 100644
index 0000000000..571c2b3ca5
--- /dev/null
+++ b/res/drawable/ic_triangle_left.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/res/drawable/ic_triangle_right.xml b/res/drawable/ic_triangle_right.xml
new file mode 100644
index 0000000000..f14e6941d0
--- /dev/null
+++ b/res/drawable/ic_triangle_right.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/res/drawable/ic_triangle_up.xml b/res/drawable/ic_triangle_up.xml
new file mode 100644
index 0000000000..b8736e3422
--- /dev/null
+++ b/res/drawable/ic_triangle_up.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/res/drawable/ic_x.xml b/res/drawable/ic_x.xml
new file mode 100644
index 0000000000..4fa8aa41a3
--- /dev/null
+++ b/res/drawable/ic_x.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/media_keyboard_selected_background_dark.xml b/res/drawable/media_keyboard_selected_background_dark.xml
new file mode 100644
index 0000000000..b41f2cf6d8
--- /dev/null
+++ b/res/drawable/media_keyboard_selected_background_dark.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/media_keyboard_selected_background_light.xml b/res/drawable/media_keyboard_selected_background_light.xml
new file mode 100644
index 0000000000..e0afb0fc4a
--- /dev/null
+++ b/res/drawable/media_keyboard_selected_background_light.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/remove_button_state.xml b/res/drawable/remove_button_state.xml
new file mode 100644
index 0000000000..89c87b25ca
--- /dev/null
+++ b/res/drawable/remove_button_state.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/sticker_button_dark.xml b/res/drawable/sticker_button_dark.xml
new file mode 100644
index 0000000000..646748d34b
--- /dev/null
+++ b/res/drawable/sticker_button_dark.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/sticker_button_light.xml b/res/drawable/sticker_button_light.xml
new file mode 100644
index 0000000000..97fcffe0fb
--- /dev/null
+++ b/res/drawable/sticker_button_light.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/sticker_management_empty_background.xml b/res/drawable/sticker_management_empty_background.xml
new file mode 100644
index 0000000000..63855710d8
--- /dev/null
+++ b/res/drawable/sticker_management_empty_background.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/sticker_missing_background_dark.xml b/res/drawable/sticker_missing_background_dark.xml
new file mode 100644
index 0000000000..b41f2cf6d8
--- /dev/null
+++ b/res/drawable/sticker_missing_background_dark.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/sticker_missing_background_light.xml b/res/drawable/sticker_missing_background_light.xml
new file mode 100644
index 0000000000..fdc4810c96
--- /dev/null
+++ b/res/drawable/sticker_missing_background_light.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/tooltip_background.xml b/res/drawable/tooltip_background.xml
new file mode 100644
index 0000000000..900668e094
--- /dev/null
+++ b/res/drawable/tooltip_background.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/transfer_controls_background.xml b/res/drawable/transfer_controls_background.xml
new file mode 100644
index 0000000000..1ba1aa2ece
--- /dev/null
+++ b/res/drawable/transfer_controls_background.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/album_thumbnail_view.xml b/res/layout/album_thumbnail_view.xml
index 3bac5cb0e1..11af8b53fb 100644
--- a/res/layout/album_thumbnail_view.xml
+++ b/res/layout/album_thumbnail_view.xml
@@ -13,8 +13,8 @@
diff --git a/res/layout/conversation_activity_emojidrawer_stub.xml b/res/layout/conversation_activity_emojidrawer_stub.xml
index d29a342eaa..c52ae1d333 100644
--- a/res/layout/conversation_activity_emojidrawer_stub.xml
+++ b/res/layout/conversation_activity_emojidrawer_stub.xml
@@ -1,5 +1,5 @@
-
+
+
+
+
+ android:paddingEnd="16dp"
+ android:paddingBottom="6dp">
-
-
-
+ android:clipToPadding="false">
-
-
-
-
-
+ android:clipToPadding="false"
+ android:orientation="vertical">
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+ android:clipToPadding="false"
+ android:paddingStart="8dp">
-
+
+
+
+
+
+
+
+
+
-
-
-
-
+
-
+
-
+
-
+
-
+
+
+ android:layout_height="match_parent"
+ android:layout_gravity="right|end"
+ android:visibility="gone">
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index ed289e509b..82451b14d6 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -121,6 +121,12 @@
android:layout_height="wrap_content"
android:layout="@layout/conversation_item_received_thumbnail" />
+
+
+
+
+
diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml
index f9ff329f4d..48fc73b18a 100644
--- a/res/layout/conversation_item_sent.xml
+++ b/res/layout/conversation_item_sent.xml
@@ -62,6 +62,12 @@
android:layout_height="wrap_content"
android:layout="@layout/conversation_item_sent_thumbnail" />
+
+
+
+
+
diff --git a/res/layout/emoji_drawer.xml b/res/layout/emoji_drawer.xml
deleted file mode 100644
index 8a461832e2..0000000000
--- a/res/layout/emoji_drawer.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/res/layout/emoji_keyboard_icon_dark.xml b/res/layout/emoji_keyboard_icon_dark.xml
new file mode 100644
index 0000000000..cc906e4d06
--- /dev/null
+++ b/res/layout/emoji_keyboard_icon_dark.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/emoji_keyboard_icon_dark_selected.xml b/res/layout/emoji_keyboard_icon_dark_selected.xml
new file mode 100644
index 0000000000..1abaf57d49
--- /dev/null
+++ b/res/layout/emoji_keyboard_icon_dark_selected.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/emoji_keyboard_icon_light.xml b/res/layout/emoji_keyboard_icon_light.xml
new file mode 100644
index 0000000000..7d7f2fe269
--- /dev/null
+++ b/res/layout/emoji_keyboard_icon_light.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/emoji_keyboard_icon_light_selected.xml b/res/layout/emoji_keyboard_icon_light_selected.xml
new file mode 100644
index 0000000000..c833b4191d
--- /dev/null
+++ b/res/layout/emoji_keyboard_icon_light_selected.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/media_keyboard.xml b/res/layout/media_keyboard.xml
new file mode 100644
index 0000000000..35320d4f46
--- /dev/null
+++ b/res/layout/media_keyboard.xml
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/media_keyboard_bottom_tab_item.xml b/res/layout/media_keyboard_bottom_tab_item.xml
new file mode 100644
index 0000000000..a80ee8cb6d
--- /dev/null
+++ b/res/layout/media_keyboard_bottom_tab_item.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
diff --git a/res/layout/microphone_recorder_view.xml b/res/layout/microphone_recorder_view.xml
index 986bed2dba..ace424f178 100644
--- a/res/layout/microphone_recorder_view.xml
+++ b/res/layout/microphone_recorder_view.xml
@@ -6,14 +6,15 @@
+ android:scaleType="fitCenter"
+ android:tint="?compose_icon_tint"
+ app:srcCompat="@drawable/ic_mic_filled_24" />
diff --git a/res/layout/profile_create_activity.xml b/res/layout/profile_create_activity.xml
index 532605c577..b7e6934c11 100644
--- a/res/layout/profile_create_activity.xml
+++ b/res/layout/profile_create_activity.xml
@@ -163,7 +163,7 @@
android:text="@string/profile_create_activity__set_later"
android:textColor="@color/gray50" />
-
-
diff --git a/res/layout/scribble_select_sticker_fragment.xml b/res/layout/scribble_select_sticker_fragment.xml
index 805a3bc80d..d8ffa275ac 100644
--- a/res/layout/scribble_select_sticker_fragment.xml
+++ b/res/layout/scribble_select_sticker_fragment.xml
@@ -1,6 +1,9 @@
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/stickers_recycler_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingTop="4dp"
+ android:clipToPadding="false"
+ android:clipChildren="false"/>
diff --git a/res/layout/sticker_keyboard_icon_dark.xml b/res/layout/sticker_keyboard_icon_dark.xml
new file mode 100644
index 0000000000..d0658ef8cd
--- /dev/null
+++ b/res/layout/sticker_keyboard_icon_dark.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/sticker_keyboard_icon_dark_selected.xml b/res/layout/sticker_keyboard_icon_dark_selected.xml
new file mode 100644
index 0000000000..42a93ba985
--- /dev/null
+++ b/res/layout/sticker_keyboard_icon_dark_selected.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/sticker_keyboard_icon_light.xml b/res/layout/sticker_keyboard_icon_light.xml
new file mode 100644
index 0000000000..5edaeb5b56
--- /dev/null
+++ b/res/layout/sticker_keyboard_icon_light.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/sticker_keyboard_icon_light_selected.xml b/res/layout/sticker_keyboard_icon_light_selected.xml
new file mode 100644
index 0000000000..2fe1507818
--- /dev/null
+++ b/res/layout/sticker_keyboard_icon_light_selected.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/sticker_keyboard_page.xml b/res/layout/sticker_keyboard_page.xml
new file mode 100644
index 0000000000..e64252d4d0
--- /dev/null
+++ b/res/layout/sticker_keyboard_page.xml
@@ -0,0 +1,8 @@
+
+
diff --git a/res/layout/sticker_keyboard_page_list_item.xml b/res/layout/sticker_keyboard_page_list_item.xml
new file mode 100644
index 0000000000..cb56ced74e
--- /dev/null
+++ b/res/layout/sticker_keyboard_page_list_item.xml
@@ -0,0 +1,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/sticker_management_activity.xml b/res/layout/sticker_management_activity.xml
new file mode 100644
index 0000000000..72c5068f36
--- /dev/null
+++ b/res/layout/sticker_management_activity.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/sticker_management_empty_item.xml b/res/layout/sticker_management_empty_item.xml
new file mode 100644
index 0000000000..efb51797bc
--- /dev/null
+++ b/res/layout/sticker_management_empty_item.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/res/layout/sticker_management_header_item.xml b/res/layout/sticker_management_header_item.xml
new file mode 100644
index 0000000000..8971080e1f
--- /dev/null
+++ b/res/layout/sticker_management_header_item.xml
@@ -0,0 +1,14 @@
+
+
diff --git a/res/layout/sticker_management_sticker_item.xml b/res/layout/sticker_management_sticker_item.xml
new file mode 100644
index 0000000000..b766dfef42
--- /dev/null
+++ b/res/layout/sticker_management_sticker_item.xml
@@ -0,0 +1,127 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/res/layout/sticker_preview_activity.xml b/res/layout/sticker_preview_activity.xml
new file mode 100644
index 0000000000..cbf165c120
--- /dev/null
+++ b/res/layout/sticker_preview_activity.xml
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/sticker_preview_list_item.xml b/res/layout/sticker_preview_list_item.xml
new file mode 100644
index 0000000000..464d98a8fb
--- /dev/null
+++ b/res/layout/sticker_preview_list_item.xml
@@ -0,0 +1,6 @@
+
+
diff --git a/res/layout/sticker_preview_popup.xml b/res/layout/sticker_preview_popup.xml
new file mode 100644
index 0000000000..92ce17a520
--- /dev/null
+++ b/res/layout/sticker_preview_popup.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/sticker_suggestion_list_item.xml b/res/layout/sticker_suggestion_list_item.xml
new file mode 100644
index 0000000000..b4fe548cf9
--- /dev/null
+++ b/res/layout/sticker_suggestion_list_item.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/sticker_view.xml b/res/layout/sticker_view.xml
new file mode 100644
index 0000000000..3dfd2b289b
--- /dev/null
+++ b/res/layout/sticker_view.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
diff --git a/res/layout/thumbnail_view.xml b/res/layout/thumbnail_view.xml
index 53042951d4..91a4b9c5c8 100644
--- a/res/layout/thumbnail_view.xml
+++ b/res/layout/thumbnail_view.xml
@@ -45,8 +45,8 @@
diff --git a/res/layout/tooltip.xml b/res/layout/tooltip.xml
new file mode 100644
index 0000000000..db4122b4a1
--- /dev/null
+++ b/res/layout/tooltip.xml
@@ -0,0 +1,104 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/res/layout/transfer_controls_stub.xml b/res/layout/transfer_controls_stub.xml
index 63c6545c11..84a998c0ea 100644
--- a/res/layout/transfer_controls_stub.xml
+++ b/res/layout/transfer_controls_stub.xml
@@ -1,8 +1,9 @@
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/transfer_controls"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:elevation="2dp"
+ android:orientation="vertical" />
diff --git a/res/layout/transfer_controls_view.xml b/res/layout/transfer_controls_view.xml
index 2890f62a04..7a54d547b7 100644
--- a/res/layout/transfer_controls_view.xml
+++ b/res/layout/transfer_controls_view.xml
@@ -1,40 +1,54 @@
-
+
+ android:id="@+id/progress_wheel"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:visibility="gone"
+ android:padding="4dp"
+ app:matProg_barColor="@color/core_blue"
+ app:matProg_rimColor="@color/core_grey_05"
+ app:matProg_linearProgress="true"
+ app:matProg_spinSpeed="0.2"
+ app:matProg_barWidth="2dp"
+ app:matProg_rimWidth="2dp"
+ app:matProg_circleRadius="24dp"
+ tools:visibility="visible"/>
+ android:orientation="horizontal"
+ android:visibility="gone"
+ tools:visibility="visible">
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:tint="@color/core_grey_60"
+ app:srcCompat="@drawable/ic_arrow_down_circle_filled" />
-
+ android:textColor="@color/black" />
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 836d8a3c9a..74468f35b8 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -38,6 +38,7 @@
+
@@ -47,12 +48,15 @@
+
+
+
-
+
@@ -66,9 +70,12 @@
+
+
+
@@ -117,6 +124,8 @@
+
+
@@ -166,6 +175,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/res/values/colors.xml b/res/values/colors.xml
index f238c9f606..fe2dd51e58 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -57,6 +57,9 @@
#400099cc
#40ffffff
+ @color/conversation_crimson
+ @color/core_blue
+
#99ffffff
#00FFFFFF
#00000000
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index f1b494bd82..0ddbef44e4 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -46,10 +46,14 @@
240dp
100dp
320dp
+ 128dp
175dp
85dp
+ 5dp
+ 4dp
+
120dp
4dp
@@ -72,6 +76,15 @@
52dp
+ 8dp
+ 88dp
+ 8dp
+ 96dp
+
+ 16dp
+
+ 8dp
+
150dp
70dp
16dp
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a363709fb8..19dbde81f8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -189,6 +189,9 @@
%1$d of %2$d
No results
+ Sticker pack installed
+ New! Say it with stickers
+
- %d unread message
@@ -645,6 +648,7 @@
Image
+ Sticker
Audio
Video
@@ -660,6 +664,26 @@
%s reset the secure session.
Duplicate message.
+
+ Stickers
+
+
+ Installed Stickers
+ Stickers You Received
+ Signal Artist Series
+ No stickers installed
+ Stickers from incoming messages will appear here
+ Untitled
+ Unknown
+
+
+ Untitled
+ Unknown
+ Install
+ Remove
+ Stickers
+ Failed to load sticker pack
+
Group updated
Left the group
@@ -754,6 +778,7 @@
Mark all as read
Mark read
Media message
+ Sticker
Reply
Signal Message
Unsecured SMS
@@ -904,6 +929,7 @@
Audio
Video
Photo
+ Sticker
Document
You
Original message not found
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 093d7a6139..ebe918de31 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -99,6 +99,11 @@
- @anim/slide_to_top
+
+