diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index be8b6be0f..465b48d58 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -182,6 +182,21 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
               android:exported="true" />
 
+    <activity android:name=".stickers.StickerPackPreviewActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:launchMode="singleTask"
+              android:noHistory="true"
+              android:windowSoftInputMode="stateHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
+        <intent-filter>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="sgnl"
+                android:host="addstickers" />
+        </intent-filter>
+    </activity>
+
     <activity-alias android:name=".RoutingActivity"
                     android:targetActivity="org.thoughtcrime.securesms.ConversationListActivity"
                     android:exported="true">
@@ -319,9 +334,15 @@
               android:windowSoftInputMode="stateUnchanged"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-     <activity android:name="org.thoughtcrime.securesms.DeviceActivity"
-               android:label="@string/AndroidManifest__linked_devices"
-               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+    <activity android:name="org.thoughtcrime.securesms.DeviceActivity"
+              android:label="@string/AndroidManifest__linked_devices"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name="org.thoughtcrime.securesms.stickers.StickerManagementActivity"
+              android:launchMode="singleTask"
+              android:theme="@style/TextSecure.LightTheme"
+              android:windowSoftInputMode="stateUnchanged"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name="org.thoughtcrime.securesms.LogSubmitActivity"
               android:label="@string/AndroidManifest__log_submit"
@@ -598,6 +619,14 @@
               android:authorities="network.loki.securesms.database.attachment"
               android:exported="false" />
 
+    <provider android:name="org.thoughtcrime.securesms.database.DatabaseContentProviders$Sticker"
+              android:authorities="network.loki.securesms.database.sticker"
+              android:exported="false" />
+
+    <provider android:name="org.thoughtcrime.securesms.database.DatabaseContentProviders$StickerPack"
+              android:authorities="network.loki.securesms.database.stickerpack"
+              android:exported="false" />
+
     <receiver android:name="org.thoughtcrime.securesms.service.BootReceiver">
         <intent-filter>
             <action android:name="android.intent.action.BOOT_COMPLETED"/>
diff --git a/build.gradle b/build.gradle
index a6675c26d..b86d6122b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -181,6 +181,16 @@ dependencies {
     implementation "com.github.lelloman:android-identicons:$identicon_version"
 }
 
+def canonicalVersionCode = 6
+def canonicalVersionName = "1.0.0"
+
+def postFixSize = 10
+def abiPostFix = ['armeabi-v7a' : 1,
+                  'arm64-v8a'   : 2,
+                  'x86'         : 3,
+                  'x86_64'      : 4,
+                  'universal'   : 5]
+
 android {
     flavorDimensions "none"
     compileSdkVersion 28
@@ -192,8 +202,8 @@ android {
     }
 
     defaultConfig {
-        versionCode 6
-        versionName "1.0.0"
+        versionCode canonicalVersionCode * postFixSize
+        versionName canonicalVersionName
 
         minSdkVersion 21
         targetSdkVersion 28
@@ -214,9 +224,10 @@ android {
         buildConfigField "String", "MRENCLAVE", "\"cd6cfc342937b23b1bdd3bbf9721aa5615ac9ff50a75c5527d441cd3276826c9\""
         buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF\""
         buildConfigField "String[]", "LANGUAGES", "new String[]{\"" + autoResConfig().collect { s -> s.replace('-r', '_') }.join('", "') + '"}'
+        buildConfigField "int", "CANONICAL_VERSION_CODE", "$canonicalVersionCode"
 
         ndk {
-            abiFilters 'armeabi-v7a', 'x86'
+            abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
         }
 
         resConfigs autoResConfig()
@@ -225,7 +236,7 @@ android {
             abi {
                 enable true
                 reset()
-                include 'armeabi-v7a', 'x86'
+                include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
                 universalApk true
             }
         }
@@ -295,8 +306,14 @@ android {
     }
 
     android.applicationVariants.all { variant ->
-        variant.outputs.all {
-            outputFileName = outputFileName.replace(".apk", "-${variant.versionName}.apk")
+        variant.outputs.each { output ->
+            output.outputFileName = output.outputFileName.replace(".apk", "-${variant.versionName}.apk")
+            def abiName = output.getFilter("ABI") ?: 'universal'
+            def postFix = abiPostFix.get(abiName, 0)
+
+            if (postFix >= postFixSize) throw new AssertionError("postFix is too large")
+
+            output.versionCodeOverride = canonicalVersionCode * postFixSize + postFix
         }
     }
 
@@ -322,8 +339,9 @@ android {
         website.manifest.srcFile 'website/AndroidManifest.xml'
     }
 
-     lintOptions {
-        abortOnError false
+    lintOptions {
+        abortOnError true
+        baseline file("lint-baseline.xml")
     }
 
     testOptions {
@@ -345,8 +363,8 @@ def assembleWebsiteDescriptor = { variant, file ->
         String apkName = file.getName()
 
         String descriptor = "{" +
-                "\"versionCode\" : $project.android.defaultConfig.versionCode," +
-                "\"versionName\" : \"$project.android.defaultConfig.versionName\"," +
+                "\"versionCode\" : $canonicalVersionCode," +
+                "\"versionName\" : \"$canonicalVersionName\"," +
                 "\"sha256sum\" : \"$digest\"," +
                 "\"url\" : \"$url/$apkName\"" +
                 "}"
@@ -427,5 +445,5 @@ static def autoResConfig() {
 task qa {
   group 'Verification'
   description 'Quality Assurance. Run before pushing.'
-  dependsOn ':testPlayReleaseUnitTest', ':assemblePlayDebug'
+  dependsOn ':testPlayReleaseUnitTest', ':lintPlayRelease', ':assemblePlayDebug'
 }
diff --git a/buildSrc/src/main/groovy/org/whispersystems/witness/WitnessPlugin.groovy b/buildSrc/src/main/groovy/org/whispersystems/witness/WitnessPlugin.groovy
new file mode 100644
index 000000000..31dae7e99
--- /dev/null
+++ b/buildSrc/src/main/groovy/org/whispersystems/witness/WitnessPlugin.groovy
@@ -0,0 +1,92 @@
+package org.whispersystems.witness
+
+import org.gradle.api.InvalidUserDataException
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.artifacts.Configuration
+import org.gradle.api.artifacts.ResolvedArtifact
+
+import java.security.MessageDigest
+
+class WitnessPluginExtension {
+    List verify
+    String configuration
+}
+
+class WitnessPlugin implements Plugin<Project> {
+
+    static String calculateSha256(file) {
+        MessageDigest md = MessageDigest.getInstance("SHA-256");
+        file.eachByte 4096, {bytes, size ->
+            md.update(bytes, 0, size);
+        }
+        return md.digest().collect {String.format "%02x", it}.join();
+    }
+
+    void apply(Project project) {
+        project.extensions.create("dependencyVerification", WitnessPluginExtension)
+        project.afterEvaluate {
+            project.dependencyVerification.verify.each {
+                assertion ->
+                    List  parts  = assertion.tokenize(":")
+                    String group = parts.get(0)
+                    String name  = parts.get(1)
+                    String hash  = parts.get(2)
+
+                    def artifacts = allArtifacts(project).findAll {
+                        return it.name.equals(name) && it.moduleVersion.id.group.equals(group)
+                    }
+
+                    if (artifacts.size() > 1) {
+                        throw new InvalidUserDataException("Multiple artifacts found for $group:$name, ${artifacts.size()} found")
+                    }
+
+                    ResolvedArtifact dependency = artifacts.find()
+
+                    println "Verifying " + group + ":" + name
+
+                    if (dependency == null) {
+                        throw new InvalidUserDataException("No dependency for integrity assertion found: " + group + ":" + name)
+                    }
+
+                    if (!hash.equals(calculateSha256(dependency.file))) {
+                        throw new InvalidUserDataException("Checksum failed for " + assertion)
+                    }
+            }
+        }
+
+        project.task('calculateChecksums').doLast {
+            println "dependencyVerification {"
+
+            def configurationName = project.dependencyVerification.configuration
+            if (configurationName != null) {
+                println "    configuration = '$configurationName'"
+            }
+
+            println "    verify = ["
+
+            allArtifacts(project).each {
+                dep ->
+                    println "        '" + dep.moduleVersion.id.group+ ":" + dep.name + ":" + calculateSha256(dep.file) + "',"
+            }
+
+            println "    ]"
+            println "}"
+        }
+    }
+
+    private static Set<ResolvedArtifact> allArtifacts(Project project) {
+        def configurationName = project.dependencyVerification.configuration
+        project.configurations
+                .findAll { config -> config.name =~ configurationName }
+                .collectMany { tryGetArtifacts(it) }
+    }
+
+    private static Set<ResolvedArtifact> tryGetArtifacts(Configuration configuration) {
+        try {
+            configuration.resolvedConfiguration.resolvedArtifacts
+        } catch (Exception ignored) {
+            [] as Set<ResolvedArtifact>
+        }
+    }
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/witness.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/witness.properties
new file mode 100644
index 000000000..dae767f67
--- /dev/null
+++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/witness.properties
@@ -0,0 +1 @@
+implementation-class=org.whispersystems.witness.WitnessPlugin
diff --git a/libs/gradle-witness.jar b/libs/gradle-witness.jar
deleted file mode 100644
index 53abf2bb3..000000000
Binary files a/libs/gradle-witness.jar and /dev/null differ
diff --git a/lint-baseline.xml b/lint-baseline.xml
new file mode 100644
index 000000000..2e4d821e4
--- /dev/null
+++ b/lint-baseline.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 3.3.2" client="gradle" variant="playRelease" version="3.3.2">
+
+    <issue
+        id="LintError"
+        message="Unexpected failure during lint analysis of JobManager.java (this is a bug in lint or one of the libraries it depends on)&#xA;&#xA;Stack: `NullPointerException:ClsFileImpl.getMirror(ClsFileImpl.java:343)←ClsElementImpl.getMirror(ClsElementImpl.java:159)←ClsElementImpl.getText(ClsElementImpl.java:202)←InferenceSession.argConstraints(InferenceSession.java:1817)←InferenceSession.isFunctionalTypeMoreSpecific(InferenceSession.java:1748)←InferenceSession.isFunctionalTypeMoreSpecificOnExpression(InferenceSession.java:1729)←JavaMethodsConflictResolver.isFunctionalTypeMoreSpecific(JavaMethodsConflictResolver.java:779)←JavaMethodsConflictResolver.isTypeMoreSpecific(JavaMethodsConflictResolver.java:673)`&#xA;&#xA;You can set environment variable `LINT_PRINT_STACKTRACE=true` to dump a full stacktrace to stdout.">
+        <location
+            file="src/org/thoughtcrime/securesms/jobmanager/JobManager.java"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Call requires permission which may be rejected by user: code should explicitly check to see if permission is available (with `checkPermission`) or explicitly handle a potential `SecurityException`"
+        errorLine1="    List&lt;SubscriptionInfo> list = subscriptionManager.getActiveSubscriptionInfoList();"
+        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java"
+            line="101"
+            column="35"/>
+    </issue>
+
+    <issue
+        id="ResourceType"
+        message="Expected resource of type styleable"
+        errorLine1="                drawables.getColor(1, 0xff000000);"
+        errorLine2="                                   ~">
+        <location
+            file="src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java"
+            line="187"
+            column="36"/>
+    </issue>
+
+    <issue
+        id="AppLinkUrlError"
+        message="Missing URL"
+        errorLine1="        &lt;intent-filter>"
+        errorLine2="        ^">
+        <location
+            file="AndroidManifest.xml"
+            line="368"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="AppLinkUrlError"
+        message="Missing URL"
+        errorLine1="        &lt;intent-filter>"
+        errorLine2="        ^">
+        <location
+            file="AndroidManifest.xml"
+            line="381"
+            column="9"/>
+    </issue>
+
+</issues>
diff --git a/protobuf/Backups.proto b/protobuf/Backups.proto
index 054c3526e..c7efc3914 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 f6adac4d8..000000000
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 cec4c2ba3..000000000
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 a61dcce74..000000000
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 f6adac4d8..000000000
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 79110bd85..000000000
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 0f40f277a..000000000
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 da3950443..000000000
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 2557bad89..000000000
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 cb37eb1f0..000000000
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 97bc953d6..000000000
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 56583915d..000000000
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 cb37eb1f0..000000000
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 2f07dbb65..000000000
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 365785ada..000000000
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 5c533050f..000000000
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 2f07dbb65..000000000
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 8e970200b..000000000
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 b6f53b41d..000000000
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 90ca0acb5..000000000
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 8e970200b..000000000
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 823394d6e..000000000
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 2ece8cead..000000000
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 23f6b43a0..000000000
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 823394d6e..000000000
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 787d0002c..000000000
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 262ea943a..000000000
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 e581af307..000000000
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 787d0002c..000000000
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 721281d84..000000000
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 78a4a39e0..000000000
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 1744eb741..000000000
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 721281d84..000000000
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 9ee13353c..000000000
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 50725d984..000000000
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 f081e4d29..000000000
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 91e8542ff..000000000
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 05fe46c8b..000000000
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 76c8b1ba0..000000000
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 6f56d2d57..000000000
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 05fe46c8b..000000000
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 c7b7f575f..000000000
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 4a1574abe..000000000
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 677223f79..000000000
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 bfcafda8a..000000000
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 4a1574abe..000000000
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 6a94d111b..000000000
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 a63d23cc2..000000000
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 794573017..000000000
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 4cec12ef1..000000000
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 ae1ca3f9d..000000000
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 2bc9f8f09..000000000
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 ede66c976..000000000
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 ae1ca3f9d..000000000
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 785deee01..000000000
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 68efa0a50..000000000
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 aed613d5b..000000000
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 785deee01..000000000
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 7de887a96..000000000
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 234f2d980..000000000
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 d63616d11..000000000
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 7de887a96..000000000
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 6206af2b2..000000000
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 11f25dcc6..000000000
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 cdc756575..000000000
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 6206af2b2..000000000
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 91cae22a7..000000000
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 353a3100a..000000000
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 851df9e96..000000000
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 91cae22a7..000000000
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 ceab263b3..000000000
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 23ae27f14..000000000
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 67f90d42f..000000000
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 ceab263b3..000000000
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 775f3d750..000000000
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 5fb21b2dd..000000000
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 6c0b55107..000000000
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 da20de7fa..000000000
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 3aca48546..000000000
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 3db7b5a0f..000000000
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 aa56d6b40..000000000
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 3aca48546..000000000
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 5e8b65b45..000000000
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 000000000..bbd18b7e9
--- /dev/null
+++ b/res/drawable-v21/sticker_button_dark.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/transparent_white_40">
+
+    <item android:id="@+id/mask">
+        <shape android:shape="oval">
+            <solid android:color="@color/transparent_black" />
+        </shape>
+    </item>
+
+    <item>
+        <shape android:shape="oval" >
+            <solid android:color="@color/core_grey_75"/>
+        </shape>
+    </item>
+</ripple>
diff --git a/res/drawable-v21/sticker_button_light.xml b/res/drawable-v21/sticker_button_light.xml
new file mode 100644
index 000000000..f20b4e89d
--- /dev/null
+++ b/res/drawable-v21/sticker_button_light.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/transparent_black_40">
+
+    <item android:id="@+id/mask">
+        <shape android:shape="oval">
+            <solid android:color="@color/transparent_black" />
+        </shape>
+    </item>
+
+    <item>
+        <shape android:shape="oval" >
+            <solid android:color="@color/core_grey_05"/>
+        </shape>
+    </item>
+</ripple>
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 1d04bc797..000000000
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 7001af641..000000000
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 68b5d8d2f..000000000
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 1d04bc797..000000000
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 4c75aa7cd..000000000
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 fa46ef2bf..000000000
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 3be4ee4aa..000000000
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 21c3f5bdd..000000000
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 471d644f8..000000000
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 58a1b7bf2..000000000
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 597de87f5..000000000
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 471d644f8..000000000
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 a49d4f55b..000000000
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 8ad2915cc..000000000
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 e1cac3ffc..000000000
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 a49d4f55b..000000000
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 0b409d57c..000000000
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 c4e2e9977..000000000
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 8bce78856..000000000
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 0b409d57c..000000000
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 e7afca3f6..000000000
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 1b51f9e12..000000000
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 02e7ea6d4..000000000
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 e7afca3f6..000000000
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 693a1c69f..000000000
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 6ae3d264c..000000000
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 fe91469aa..000000000
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 693a1c69f..000000000
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 0b368d62f..000000000
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 d4c49d78f..000000000
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 fc67497e1..000000000
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 0b368d62f..000000000
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 944a180fe..000000000
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 0b07c84a6..000000000
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 adcc1ace4..000000000
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 4dd87fe53..000000000
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 a28e4a84a..000000000
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 a6f6ebc4e..000000000
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 7c016ef66..000000000
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 a28e4a84a..000000000
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 3721dc520..000000000
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 5cf9101c0..000000000
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 76a4aebe5..000000000
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 6d90599b1..000000000
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 5cf9101c0..000000000
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 e2ec29d53..000000000
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 012700f0b..000000000
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 f4487745b..000000000
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 20c1fcde7..000000000
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 5797242bc..000000000
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 adf73cf40..000000000
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 47f75e2ca..000000000
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 5797242bc..000000000
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 8a0be6d50..000000000
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 784f603a5..000000000
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 ed5571a88..000000000
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 8a0be6d50..000000000
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 15214246c..000000000
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 65947ba06..000000000
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 12a2324fd..000000000
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 15214246c..000000000
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 41b8604be..000000000
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 1979f6513..000000000
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 671eef827..000000000
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 41b8604be..000000000
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 40753d285..000000000
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 2b6ed0c16..000000000
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 72df107d8..000000000
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 40753d285..000000000
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 9ae9fc7b2..000000000
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 a7fafaec6..000000000
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 dbdbd9e0c..000000000
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 9ae9fc7b2..000000000
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 8c4a00a7d..000000000
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 94d7cd05c..000000000
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 651dc5cc0..000000000
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 9988097d2..000000000
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 780b6397d..000000000
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 2cb85bbd8..000000000
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 fc6090071..000000000
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 780b6397d..000000000
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 0fa81940c..000000000
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 b2c61c6bd..000000000
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 3196e256a..000000000
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 6745d84e5..000000000
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 b2c61c6bd..000000000
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 dced7d638..000000000
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 678adf4d2..000000000
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 c69c5c3e8..000000000
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 dced7d638..000000000
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 39455b4fc..000000000
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 662dbac2b..000000000
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 c2b243232..000000000
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 39455b4fc..000000000
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 e9106a7c4..000000000
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 9d3e7d4de..000000000
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 2e8d68435..000000000
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 e9106a7c4..000000000
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 841e9f12e..000000000
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 21bcb25ad..000000000
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 5541e5b84..000000000
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 841e9f12e..000000000
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 daa4020ce..000000000
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 eac554f53..000000000
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 e093154a7..000000000
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 daa4020ce..000000000
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 1953371c4..000000000
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 27f4935a3..000000000
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 4088e5000..000000000
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 1953371c4..000000000
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 062f03133..000000000
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 eecad2793..000000000
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 86152fa22..000000000
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 062f03133..000000000
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 e349e7405..000000000
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 84269ce56..000000000
--- a/res/drawable/emoji_category_activity_dark.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          android:enterFadeDuration="200"
-          android:exitFadeDuration="300">
-
-    <item android:state_selected="true" android:drawable="@drawable/ic_emoji_activity_activated_dark" />
-    <item android:drawable="@drawable/ic_emoji_activity_normal_dark" />
-
-</selector>
diff --git a/res/drawable/emoji_category_activity_light.xml b/res/drawable/emoji_category_activity_light.xml
deleted file mode 100644
index befeb3138..000000000
--- a/res/drawable/emoji_category_activity_light.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          android:enterFadeDuration="200"
-          android:exitFadeDuration="300">
-
-    <item android:state_selected="true" android:drawable="@drawable/ic_emoji_activity_activated_light" />
-    <item android:drawable="@drawable/ic_emoji_activity_normal_light" />
-
-</selector>
diff --git a/res/drawable/emoji_category_emoticons_dark.xml b/res/drawable/emoji_category_emoticons_dark.xml
deleted file mode 100644
index 3209fe544..000000000
--- a/res/drawable/emoji_category_emoticons_dark.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          android:enterFadeDuration="200"
-          android:exitFadeDuration="300">
-	<item android:state_selected="true" android:drawable="@drawable/ic_emoji_emoticons_activated_dark" />
-	<item android:drawable="@drawable/ic_emoji_emoticons_normal_dark" />
-</selector>
-
diff --git a/res/drawable/emoji_category_emoticons_light.xml b/res/drawable/emoji_category_emoticons_light.xml
deleted file mode 100644
index 8777fb389..000000000
--- a/res/drawable/emoji_category_emoticons_light.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          android:enterFadeDuration="200"
-          android:exitFadeDuration="300">
-	<item android:state_selected="true" android:drawable="@drawable/ic_emoji_emoticons_activated_light" />
-	<item android:drawable="@drawable/ic_emoji_emoticons_normal_light" />
-</selector>
-
diff --git a/res/drawable/emoji_category_flags_dark.xml b/res/drawable/emoji_category_flags_dark.xml
deleted file mode 100644
index 41416774f..000000000
--- a/res/drawable/emoji_category_flags_dark.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          android:enterFadeDuration="200"
-          android:exitFadeDuration="300">
-
-    <item android:state_selected="true" android:drawable="@drawable/ic_emoji_flag_activated_dark" />
-    <item android:drawable="@drawable/ic_emoji_flag_normal_dark" />
-
-</selector>
diff --git a/res/drawable/emoji_category_flags_light.xml b/res/drawable/emoji_category_flags_light.xml
deleted file mode 100644
index 2f61d042d..000000000
--- a/res/drawable/emoji_category_flags_light.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          android:enterFadeDuration="200"
-          android:exitFadeDuration="300">
-
-    <item android:state_selected="true" android:drawable="@drawable/ic_emoji_flag_activated_light" />
-    <item android:drawable="@drawable/ic_emoji_flag_normal_light" />
-
-</selector>
diff --git a/res/drawable/emoji_category_foods_dark.xml b/res/drawable/emoji_category_foods_dark.xml
deleted file mode 100644
index 650de4343..000000000
--- a/res/drawable/emoji_category_foods_dark.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          android:enterFadeDuration="200"
-          android:exitFadeDuration="300">
-
-    <item android:state_selected="true" android:drawable="@drawable/ic_emoji_foods_activated_dark" />
-    <item android:drawable="@drawable/ic_emoji_foods_normal_dark" />
-
-</selector>
diff --git a/res/drawable/emoji_category_foods_light.xml b/res/drawable/emoji_category_foods_light.xml
deleted file mode 100644
index 475bd2135..000000000
--- a/res/drawable/emoji_category_foods_light.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          android:enterFadeDuration="200"
-          android:exitFadeDuration="300">
-
-    <item android:state_selected="true" android:drawable="@drawable/ic_emoji_foods_activated_light" />
-    <item android:drawable="@drawable/ic_emoji_foods_normal_light" />
-
-</selector>
diff --git a/res/drawable/emoji_category_nature_dark.xml b/res/drawable/emoji_category_nature_dark.xml
deleted file mode 100644
index e54e35885..000000000
--- a/res/drawable/emoji_category_nature_dark.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          android:enterFadeDuration="200"
-          android:exitFadeDuration="300">
-	<item android:state_selected="true" android:drawable="@drawable/ic_emoji_nature_activated_dark" />
-	<item android:drawable="@drawable/ic_emoji_nature_normal_dark" />
-</selector>
diff --git a/res/drawable/emoji_category_nature_light.xml b/res/drawable/emoji_category_nature_light.xml
deleted file mode 100644
index f21883347..000000000
--- a/res/drawable/emoji_category_nature_light.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          android:enterFadeDuration="200"
-          android:exitFadeDuration="300">
-	<item android:state_selected="true" android:drawable="@drawable/ic_emoji_nature_activated_light" />
-	<item android:drawable="@drawable/ic_emoji_nature_normal_light" />
-</selector>
diff --git a/res/drawable/emoji_category_objects_dark.xml b/res/drawable/emoji_category_objects_dark.xml
deleted file mode 100644
index 3eb67ce51..000000000
--- a/res/drawable/emoji_category_objects_dark.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-		  android:enterFadeDuration="200"
-		  android:exitFadeDuration="300">
-
-	<item android:state_selected="true" android:drawable="@drawable/ic_emoji_object_activated_dark" />
-	<item android:drawable="@drawable/ic_emoji_object_normal_dark" />
-
-</selector>
diff --git a/res/drawable/emoji_category_objects_light.xml b/res/drawable/emoji_category_objects_light.xml
deleted file mode 100644
index 83421c32c..000000000
--- a/res/drawable/emoji_category_objects_light.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-		  android:enterFadeDuration="200"
-		  android:exitFadeDuration="300">
-
-	<item android:state_selected="true" android:drawable="@drawable/ic_emoji_object_activated_light" />
-	<item android:drawable="@drawable/ic_emoji_object_normal_light" />
-
-</selector>
diff --git a/res/drawable/emoji_category_people_dark.xml b/res/drawable/emoji_category_people_dark.xml
deleted file mode 100644
index 8ffc79c28..000000000
--- a/res/drawable/emoji_category_people_dark.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          android:enterFadeDuration="200"
-          android:exitFadeDuration="300">
-	<item android:state_selected="true" android:drawable="@drawable/ic_emoji_people_activated_dark" />
-	<item android:drawable="@drawable/ic_emoji_people_normal_dark" />
-</selector>
diff --git a/res/drawable/emoji_category_people_light.xml b/res/drawable/emoji_category_people_light.xml
deleted file mode 100644
index 639af154c..000000000
--- a/res/drawable/emoji_category_people_light.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          android:enterFadeDuration="200"
-          android:exitFadeDuration="300">
-	<item android:state_selected="true" android:drawable="@drawable/ic_emoji_people_activated_light" />
-	<item android:drawable="@drawable/ic_emoji_people_normal_light" />
-</selector>
diff --git a/res/drawable/emoji_category_places_dark.xml b/res/drawable/emoji_category_places_dark.xml
deleted file mode 100644
index fa6249258..000000000
--- a/res/drawable/emoji_category_places_dark.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          android:enterFadeDuration="200"
-          android:exitFadeDuration="300">
-	<item android:state_selected="true" android:drawable="@drawable/ic_emoji_places_activated_dark" />
-	<item android:drawable="@drawable/ic_emoji_places_normal_dark" />
-</selector>
diff --git a/res/drawable/emoji_category_places_light.xml b/res/drawable/emoji_category_places_light.xml
deleted file mode 100644
index 51d7a8a87..000000000
--- a/res/drawable/emoji_category_places_light.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          android:enterFadeDuration="200"
-          android:exitFadeDuration="300">
-	<item android:state_selected="true" android:drawable="@drawable/ic_emoji_places_activated_light" />
-	<item android:drawable="@drawable/ic_emoji_places_normal_light" />
-</selector>
diff --git a/res/drawable/emoji_category_recent_dark.xml b/res/drawable/emoji_category_recent_dark.xml
deleted file mode 100644
index 5d8581dba..000000000
--- a/res/drawable/emoji_category_recent_dark.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          android:enterFadeDuration="200"
-          android:exitFadeDuration="300">
-	<item android:state_selected="true" android:drawable="@drawable/ic_emoji_recents_activated_dark" />
-	<item android:drawable="@drawable/ic_emoji_recents_normal_dark" />
-</selector>
-
diff --git a/res/drawable/emoji_category_recent_light.xml b/res/drawable/emoji_category_recent_light.xml
deleted file mode 100644
index ea5c1cc77..000000000
--- a/res/drawable/emoji_category_recent_light.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          android:enterFadeDuration="200"
-          android:exitFadeDuration="300">
-	<item android:state_selected="true" android:drawable="@drawable/ic_emoji_recents_activated_light" />
-	<item android:drawable="@drawable/ic_emoji_recents_normal_light" />
-</selector>
-
diff --git a/res/drawable/emoji_category_symbol_dark.xml b/res/drawable/emoji_category_symbol_dark.xml
deleted file mode 100644
index e98cbee84..000000000
--- a/res/drawable/emoji_category_symbol_dark.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          android:enterFadeDuration="200"
-          android:exitFadeDuration="300">
-	<item android:state_selected="true" android:drawable="@drawable/ic_emoji_symbols_activated_dark" />
-	<item android:drawable="@drawable/ic_emoji_symbols_normal_dark" />
-</selector>
-
diff --git a/res/drawable/emoji_category_symbol_light.xml b/res/drawable/emoji_category_symbol_light.xml
deleted file mode 100644
index d3cc7c8fb..000000000
--- a/res/drawable/emoji_category_symbol_light.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          android:enterFadeDuration="200"
-          android:exitFadeDuration="300">
-	<item android:state_selected="true" android:drawable="@drawable/ic_emoji_symbols_activated_light" />
-	<item android:drawable="@drawable/ic_emoji_symbols_normal_light" />
-</selector>
-
diff --git a/res/drawable/ic_arrow_down.xml b/res/drawable/ic_arrow_down.xml
new file mode 100644
index 000000000..2afc61365
--- /dev/null
+++ b/res/drawable/ic_arrow_down.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12.8,2v17.8c0.4,-0.6 0.7,-1 0.7,-1l5.6,-5.6l1.1,1.1l-7.5,7.5c-0.3,0.3 -0.8,0.3 -1.1,0l-7.5,-7.5L5,13.2l5.6,5.6c0,0 0.3,0.4 0.7,1V2H12.8z"/>
+</vector>
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 000000000..be0bc5b4a
--- /dev/null
+++ b/res/drawable/ic_arrow_down_circle_filled.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,1C5.9,1 1,5.9 1,12s4.9,11 11,11s11,-4.9 11,-11S18.1,1 12,1zM12.5,18.8c-0.3,0.3 -0.8,0.3 -1.1,0l-5.5,-5.5L7,12.2l3.6,3.6c0,0 0.3,0.4 0.7,1V5h1.5v11.8c0.4,-0.6 0.7,-1 0.7,-1l3.6,-3.6l1.1,1.1L12.5,18.8z"/>
+</vector>
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 000000000..7772677cd
--- /dev/null
+++ b/res/drawable/ic_emoji_activity_dark_20.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="@color/core_grey_25"
+      android:pathData="M10,1c-5,0 -9,4 -9,9s4,9 9,9s9,-4 9,-9S15,1 10,1zM15.5,15.1c-0.1,-1 -0.2,-2.2 -0.3,-3.2l-3.2,-1.2c-0.9,0.7 -1.7,1.4 -2.5,2L10,16c0.8,0.3 1.9,0.6 2.8,0.9c-2,0.8 -4.2,0.7 -6.1,-0.2L9,16l-0.6,-3.3c-0.8,-0.6 -1.7,-1.2 -2.6,-1.8L4,12c0,0.7 -0.1,1.6 -0.1,2.3C3,13.1 2.5,11.6 2.5,10c0,-0.3 0,-0.6 0.1,-0.9L3.8,11l1.8,-1l0,0c0.3,-0.9 0.6,-1.9 0.9,-2.8L5.3,5.6L3.5,6.4C4.3,4.8 5.7,3.6 7.4,3C7,3.6 6.5,4.4 6.1,5l1.1,1.6C8.2,6.5 9.1,6.4 10,6.4L12.4,4c-0.3,-0.4 -0.8,-1 -1.2,-1.4c1.7,0.3 3.3,1.1 4.4,2.4c-0.7,-0.2 -1.5,-0.3 -2.2,-0.5l-2.4,2.4c0.4,1 0.8,1.9 1.2,2.8l3.3,1.3c0.6,-0.8 1.3,-1.7 1.9,-2.6c0.1,0.5 0.2,1.1 0.2,1.6C17.5,11.9 16.8,13.7 15.5,15.1z"/>
+</vector>
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 000000000..809d801ee
--- /dev/null
+++ b/res/drawable/ic_emoji_activity_light_20.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="@color/core_grey_60"
+      android:pathData="M10,1c-5,0 -9,4 -9,9s4,9 9,9s9,-4 9,-9S15,1 10,1zM17.3,8.4c-0.6,0.9 -1.3,1.8 -1.9,2.6l-3.3,-1.3c-0.4,-0.9 -0.8,-1.8 -1.2,-2.8l2.4,-2.4C14,4.6 14.8,4.8 15.6,5C16.4,5.9 17,7.1 17.3,8.4zM11.1,2.6C11.6,3.1 12,3.5 12.4,4L10,6.4c-0.9,0 -1.9,0 -2.8,0.1L6.1,5C6.5,4.3 7,3.6 7.4,3C8.2,2.7 9.1,2.5 10,2.5C10.4,2.5 10.8,2.5 11.1,2.6zM5.6,10L5.6,10l-1.8,1C3.4,10.4 3,9.7 2.6,9.1c0.1,-1 0.4,-1.9 0.9,-2.7l1.9,-0.7l1.1,1.6C6.1,8.1 5.8,9.1 5.6,10zM3.9,14.3C3.9,13.5 4,12.7 4,12l1.8,-1c0.9,0.6 1.8,1.2 2.6,1.8L9,16l-2.3,0.7C5.6,16.1 4.6,15.3 3.9,14.3zM12.8,17c-1,-0.3 -1.9,-0.6 -2.8,-0.9l-0.6,-3.3c0.8,-0.7 1.6,-1.4 2.5,-2l3.2,1.2c0.1,1 0.2,2.1 0.3,3.2C14.7,16 13.8,16.6 12.8,17z"/>
+</vector>
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 000000000..8ddbc2e12
--- /dev/null
+++ b/res/drawable/ic_emoji_animal_dark_20.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="@color/core_grey_25"
+      android:pathData="M16.9,9c0,-0.2 -0.1,-0.5 -0.1,-0.7c0.1,-0.1 0.2,-0.1 0.2,-0.2c1.8,-1.8 2.1,-4.3 0.7,-5.7S13.8,1.2 12,3c-0.1,0.1 -0.1,0.2 -0.2,0.2c-1.2,-0.3 -2.4,-0.3 -3.6,0C8.1,3.2 8.1,3.1 8,3C6.2,1.2 3.7,0.9 2.3,2.3S1.2,6.2 3,8l0.2,0.2C3.2,8.4 3.1,8.7 3.1,8.9c-2.2,1.6 -2.7,4.7 -1.1,7C2.9,17.2 4.4,18 6,18c0,0 0.8,0 1.8,-0.1c0.9,1.2 2.6,1.4 3.8,0.5c0.2,-0.2 0.4,-0.3 0.5,-0.5C13.1,18 14,18 14,18c2.8,0 5,-2.3 4.9,-5.1C18.9,11.4 18.1,9.9 16.9,9zM3.8,6.7C3.4,6.2 3.1,5.5 3,4.8C2.9,4.3 3.1,3.8 3.4,3.4C3.7,3.1 4.1,3 4.5,3c0.8,0 1.6,0.4 2.1,0.9l0,0C5.5,4.5 4.5,5.5 3.8,6.7zM7,12.5c-0.6,0 -1,-0.7 -1,-1.5s0.4,-1.5 1,-1.5s1,0.7 1,1.5S7.6,12.5 7,12.5zM11.2,16l-0.8,0.7c-0.2,0.2 -0.5,0.2 -0.7,0L8.8,16c-0.4,-0.3 -0.5,-0.9 -0.2,-1.3c0.2,-0.2 0.5,-0.4 0.7,-0.4h1.4c0.5,0 0.9,0.4 0.9,0.9C11.6,15.5 11.4,15.8 11.2,16zM13,12.5c-0.6,0 -1,-0.7 -1,-1.5s0.4,-1.5 1,-1.5s1,0.7 1,1.5S13.6,12.5 13,12.5zM13.3,3.8L13.3,3.8C13.9,3.3 14.7,3 15.5,3c0.4,0 0.8,0.1 1.2,0.4c0.3,0.4 0.5,0.9 0.4,1.4c-0.1,0.7 -0.4,1.3 -0.9,1.8C15.5,5.5 14.5,4.5 13.3,3.8z"/>
+</vector>
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 000000000..63f2f9e10
--- /dev/null
+++ b/res/drawable/ic_emoji_animal_light_20.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="@color/core_grey_60"
+      android:pathData="M8,11c0,0.8 -0.4,1.5 -1,1.5S6,11.8 6,11s0.4,-1.5 1,-1.5S8,10.2 8,11zM13,9.5c-0.6,0 -1,0.7 -1,1.5s0.4,1.5 1,1.5s1,-0.7 1,-1.5S13.6,9.5 13,9.5zM19,13c0,2.8 -2.2,5 -5,5l0,0c-0.1,0 -0.9,0 -1.8,-0.1c-0.9,1.2 -2.6,1.4 -3.8,0.5c-0.2,-0.2 -0.4,-0.3 -0.5,-0.5C6.9,18 6.1,18 6,18l0,0c-2.8,0 -5,-2.3 -4.9,-5.1c0,-1.5 0.8,-3 2,-3.9c0,-0.3 0.1,-0.5 0.2,-0.8C3.2,8.1 3.1,8.1 3,8C1.2,6.2 0.9,3.7 2.3,2.3c0.6,-0.6 1.4,-0.9 2.2,-0.9C5.9,1.5 7.1,2 8,3c0.1,0.1 0.1,0.2 0.2,0.2c1.2,-0.3 2.4,-0.3 3.6,0C11.9,3.2 11.9,3.1 12,3c0.9,-1 2.1,-1.5 3.5,-1.5c0.8,0 1.6,0.3 2.2,0.9C19.1,3.7 18.8,6.2 17,8c-0.1,0.1 -0.2,0.1 -0.2,0.2c0.1,0.2 0.1,0.5 0.2,0.8C18.2,9.9 19,11.4 19,13zM13.3,3.8c1.2,0.7 2.2,1.6 2.8,2.8c0.4,-0.5 0.7,-1.2 0.8,-1.8c0.1,-0.5 -0.1,-1.1 -0.4,-1.5C16.3,3.1 15.9,3 15.5,3C14.7,3 13.9,3.4 13.3,3.8L13.3,3.8zM3.8,6.7c0.6,-1.2 1.6,-2.2 2.8,-2.9l0,0C6.1,3.3 5.3,3 4.5,3C4.1,3 3.7,3.1 3.4,3.4C3.1,3.8 2.9,4.3 3,4.8C3.1,5.5 3.4,6.2 3.8,6.7zM17.5,13c0,-1.1 -0.6,-2.2 -1.5,-2.8l-0.5,-0.4l-0.1,-0.6c-0.4,-3 -3.2,-5.1 -6.2,-4.6C6.8,4.9 4.9,6.8 4.5,9.2L4.4,9.8L4,10.2c-0.9,0.6 -1.5,1.7 -1.5,2.8c0,1.9 1.6,3.5 3.5,3.5c0,0 0.8,0 1.7,-0.1l0.8,-0.1L9,17c0.4,0.6 1.1,0.7 1.7,0.3c0.1,-0.1 0.2,-0.2 0.3,-0.3l0.5,-0.6l0.8,0.1c0.9,0.1 1.6,0.1 1.7,0.1C15.9,16.5 17.5,14.9 17.5,13zM11.8,14.8c0,-0.6 -0.4,-1 -1,-1H9.3c-0.6,0 -1,0.4 -1,1c0,0.3 0.2,0.7 0.4,0.8l0.9,0.7c0.2,0.2 0.6,0.2 0.8,0l0.9,-0.7C11.6,15.4 11.8,15.1 11.8,14.8z"/>
+</vector>
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 000000000..6a1b096cc
--- /dev/null
+++ b/res/drawable/ic_emoji_emoticon_dark_20.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="@color/core_grey_25"
+      android:pathData="m16.614,10.1801c0.0155,3.1165 -1.1329,6.4181 -3.6417,8.3195 -0.7118,0.4002 -1.0296,-1.1937 -0.2831,-1.3774 1.6236,-1.8414 2.0655,-4.4306 2.0997,-6.8333 0.0249,-2.4959 -0.4452,-5.1675 -2.0694,-7.1137 -0.4547,-0.2685 -0.5838,-0.7136 -0.3174,-1.1536 0.0661,-0.8558 0.7305,-0.1301 1.1203,0.172 2.1748,1.9746 3.1179,5.0755 3.0915,7.9866zM11.2592,10.6311c-1.4007,0 -2.8015,0 -4.2022,0 0,-0.5357 0,-1.0715 0,-1.6072 1.4007,0 2.8015,0 4.2022,0 0,0.5357 0,1.0715 0,1.6072zM4.3036,12.8041C5.2775,12.6653 5.8523,14.1022 5.1035,14.7279 4.4431,15.3258 3.1038,14.9005 3.1695,13.9029 3.1464,13.2907 3.7055,12.7411 4.3036,12.8041ZM4.3036,5.8422c0.9739,-0.1388 1.5488,1.2981 0.7999,1.9237 -0.6604,0.5979 -1.9997,0.1727 -1.934,-0.8249 -0.0231,-0.6123 0.536,-1.1618 1.1341,-1.0988z" />
+</vector>
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 000000000..8b5df632c
--- /dev/null
+++ b/res/drawable/ic_emoji_emoticon_light_20.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="@color/core_grey_60"
+      android:pathData="m16.614,10.1801c0.0155,3.1165 -1.1329,6.4181 -3.6417,8.3195 -0.7118,0.4002 -1.0296,-1.1937 -0.2831,-1.3774 1.6236,-1.8414 2.0655,-4.4306 2.0997,-6.8333 0.0249,-2.4959 -0.4452,-5.1675 -2.0694,-7.1137 -0.4547,-0.2685 -0.5838,-0.7136 -0.3174,-1.1536 0.0661,-0.8558 0.7305,-0.1301 1.1203,0.172 2.1748,1.9746 3.1179,5.0755 3.0915,7.9866zM11.2592,10.6311c-1.4007,0 -2.8015,0 -4.2022,0 0,-0.5357 0,-1.0715 0,-1.6072 1.4007,0 2.8015,0 4.2022,0 0,0.5357 0,1.0715 0,1.6072zM4.3036,12.8041C5.2775,12.6653 5.8523,14.1022 5.1035,14.7279 4.4431,15.3258 3.1038,14.9005 3.1695,13.9029 3.1464,13.2907 3.7055,12.7411 4.3036,12.8041ZM4.3036,5.8422c0.9739,-0.1388 1.5488,1.2981 0.7999,1.9237 -0.6604,0.5979 -1.9997,0.1727 -1.934,-0.8249 -0.0231,-0.6123 0.536,-1.1618 1.1341,-1.0988z" />
+</vector>
diff --git a/res/drawable/ic_emoji_filled.xml b/res/drawable/ic_emoji_filled.xml
new file mode 100644
index 000000000..ed160bb6d
--- /dev/null
+++ b/res/drawable/ic_emoji_filled.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="28"
+    android:viewportWidth="28" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFBBBDBE" android:pathData="M14,2C7.6,1.8 2.2,6.9 2,13.3c0,0.2 0,0.4 0,0.7c-0.2,6.4 4.9,11.8 11.3,12c0.2,0 0.4,0 0.7,0c6.4,0.2 11.8,-4.9 12,-11.3c0,-0.2 0,-0.4 0,-0.7c0.2,-6.4 -4.9,-11.8 -11.3,-12C14.4,2 14.2,2 14,2zM17.6,9.5c0.9,0 1.6,1 1.6,2.2S18.5,14 17.6,14S16,13 16,11.8S16.7,9.5 17.6,9.5zM10.4,9.5c0.9,0 1.6,1 1.6,2.2S11.3,14 10.4,14s-1.6,-1 -1.6,-2.2S9.5,9.5 10.4,9.5zM20,18.3c-2.5,3.3 -7.2,3.9 -10.5,1.4c-0.5,-0.4 -1,-0.9 -1.4,-1.4c-0.3,-0.3 -0.2,-0.8 0.1,-1.1C8.5,16.9 9,17 9.2,17.3c0,0 0.1,0.1 0.1,0.1c1.1,1.5 2.8,2.3 4.7,2.3c1.9,0 3.6,-0.8 4.7,-2.3c0.2,-0.3 0.7,-0.4 1,-0.2S20.2,17.9 20,18.3L20,18.3z"/>
+</vector>
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 000000000..e0429d88f
--- /dev/null
+++ b/res/drawable/ic_emoji_filled_keyboard_dark.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="28"
+    android:viewportWidth="28" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/core_grey_25" android:pathData="M14,2C7.6,1.8 2.2,6.9 2,13.3c0,0.2 0,0.4 0,0.7c-0.2,6.4 4.9,11.8 11.3,12c0.2,0 0.4,0 0.7,0c6.4,0.2 11.8,-4.9 12,-11.3c0,-0.2 0,-0.4 0,-0.7c0.2,-6.4 -4.9,-11.8 -11.3,-12C14.4,2 14.2,2 14,2zM17.6,9.5c0.9,0 1.6,1 1.6,2.2S18.5,14 17.6,14S16,13 16,11.8S16.7,9.5 17.6,9.5zM10.4,9.5c0.9,0 1.6,1 1.6,2.2S11.3,14 10.4,14s-1.6,-1 -1.6,-2.2S9.5,9.5 10.4,9.5zM20,18.3c-2.5,3.3 -7.2,3.9 -10.5,1.4c-0.5,-0.4 -1,-0.9 -1.4,-1.4c-0.3,-0.3 -0.2,-0.8 0.1,-1.1C8.5,16.9 9,17 9.2,17.3c0,0 0.1,0.1 0.1,0.1c1.1,1.5 2.8,2.3 4.7,2.3c1.9,0 3.6,-0.8 4.7,-2.3c0.2,-0.3 0.7,-0.4 1,-0.2S20.2,17.9 20,18.3L20,18.3z"/>
+</vector>
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 000000000..ed8a86b40
--- /dev/null
+++ b/res/drawable/ic_emoji_filled_keyboard_light.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="28"
+    android:viewportWidth="28" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/core_grey_60" android:pathData="M14,2C7.6,1.8 2.2,6.9 2,13.3c0,0.2 0,0.4 0,0.7c-0.2,6.4 4.9,11.8 11.3,12c0.2,0 0.4,0 0.7,0c6.4,0.2 11.8,-4.9 12,-11.3c0,-0.2 0,-0.4 0,-0.7c0.2,-6.4 -4.9,-11.8 -11.3,-12C14.4,2 14.2,2 14,2zM17.6,9.5c0.9,0 1.6,1 1.6,2.2S18.5,14 17.6,14S16,13 16,11.8S16.7,9.5 17.6,9.5zM10.4,9.5c0.9,0 1.6,1 1.6,2.2S11.3,14 10.4,14s-1.6,-1 -1.6,-2.2S9.5,9.5 10.4,9.5zM20,18.3c-2.5,3.3 -7.2,3.9 -10.5,1.4c-0.5,-0.4 -1,-0.9 -1.4,-1.4c-0.3,-0.3 -0.2,-0.8 0.1,-1.1C8.5,16.9 9,17 9.2,17.3c0,0 0.1,0.1 0.1,0.1c1.1,1.5 2.8,2.3 4.7,2.3c1.9,0 3.6,-0.8 4.7,-2.3c0.2,-0.3 0.7,-0.4 1,-0.2S20.2,17.9 20,18.3L20,18.3z"/>
+</vector>
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 000000000..1b1d730ed
--- /dev/null
+++ b/res/drawable/ic_emoji_flag_dark_20.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="@color/core_grey_25"
+      android:pathData="M17.5,3.3c-2.4,-0.8 -4.9,-0.8 -7.3,0C8.1,4 5.8,4 3.8,3.3L3.5,3.2V2H2v16h1.5v-4.2c1,0.4 2.1,0.5 3.2,0.6c1.3,0 2.6,-0.2 3.8,-0.6c2.1,-0.7 4.4,-0.7 6.4,0l1,0.4V3.5L17.5,3.3zM5,12.6c-0.4,-0.1 -0.8,-0.2 -1.2,-0.4l-0.2,-0.1V4.8C4,4.9 4.5,5.1 5,5.2V12.6z"/>
+</vector>
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 000000000..f5b87e490
--- /dev/null
+++ b/res/drawable/ic_emoji_flag_light_20.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="@color/core_grey_60"
+      android:pathData="M17.5,3.3c-2.4,-0.8 -4.9,-0.8 -7.3,0C8.1,4 5.8,4 3.8,3.3L3.5,3.2V2H2v16h1.5v-4.2c1,0.4 2.1,0.5 3.2,0.6c1.3,0 2.6,-0.2 3.8,-0.6c2.1,-0.7 4.4,-0.7 6.4,0l1,0.4V3.5L17.5,3.3zM16.5,12c-2.1,-0.5 -4.3,-0.4 -6.3,0.3c-2.1,0.7 -4.4,0.7 -6.4,0l-0.2,-0.1V4.8c2.3,0.7 4.8,0.7 7.1,0c1.9,-0.7 4,-0.7 5.9,-0.2V12z"/>
+</vector>
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 000000000..36b786fce
--- /dev/null
+++ b/res/drawable/ic_emoji_food_dark_20.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="@color/core_grey_25"
+      android:pathData="M9.1,10.4C8.7,9.7 8.5,9 8.5,8.2c0,-0.8 0.2,-1.6 0.6,-2.3c0.3,-0.5 0.4,-1.1 0.4,-1.8c0,-0.6 -0.2,-1.2 -0.4,-1.7l1.4,-0.6C10.8,2.6 11,3.4 11,4.2c0,0.8 -0.2,1.6 -0.6,2.3C10.2,7 10,7.6 10,8.2c0,0.6 0.2,1.1 0.4,1.6L9.1,10.4zM13.4,9.8C13.2,9.3 13,8.8 13,8.2c0,-0.6 0.2,-1.2 0.4,-1.7C13.8,5.8 14,5 14,4.2c0,-0.8 -0.2,-1.6 -0.6,-2.3l-1.4,0.6c0.3,0.5 0.4,1.1 0.4,1.7c0,0.6 -0.2,1.2 -0.4,1.8c-0.4,0.7 -0.5,1.5 -0.6,2.3c0,0.8 0.2,1.6 0.6,2.3L13.4,9.8zM19,10.3L19,10.3c0,2.7 -2.3,8.7 -9,8.7c-4.9,0 -8.8,-3.8 -9,-8.7l0,0C1,9.1 2.8,8 5.6,7.4c0.1,-0.5 0.3,-1 0.5,-1.5c0.3,-0.5 0.4,-1.1 0.4,-1.8c0,-0.6 -0.2,-1.2 -0.4,-1.7l1.4,-0.6C7.8,2.6 8,3.4 8,4.2C8,5 7.8,5.8 7.4,6.5C7.2,7 7,7.6 7,8.2c0,0.2 0,0.3 0,0.5c0.1,0.4 0.2,0.8 0.4,1.2L6,10.4C5.8,10 5.7,9.5 5.6,9c-1.1,0.2 -2.2,0.6 -3,1.4c0.4,0.6 2.9,1.9 7.5,1.9s7.1,-1.3 7.5,-1.9c-0.8,-0.7 -1.8,-1.2 -2.9,-1.4c-0.1,-0.3 -0.1,-0.5 -0.1,-0.8c0,-0.2 0,-0.5 0.1,-0.7C17.2,8 19,9.1 19,10.3z"/>
+</vector>
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 000000000..49898b5a2
--- /dev/null
+++ b/res/drawable/ic_emoji_food_light_20.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="@color/core_grey_60"
+      android:pathData="M12.1,10.4c-0.4,-0.7 -0.6,-1.5 -0.6,-2.3c0,-0.8 0.2,-1.6 0.6,-2.3c0.3,-0.5 0.4,-1.1 0.4,-1.8c0,-0.6 -0.2,-1.2 -0.4,-1.7l1.4,-0.6C13.8,2.6 14,3.4 14,4.2c0,0.8 -0.2,1.6 -0.6,2.3C13.2,7 13,7.6 13,8.2c0,0.6 0.2,1.1 0.4,1.6L12.1,10.4zM10.4,9.8C10.2,9.3 10,8.8 10,8.2c0,-0.6 0.2,-1.2 0.4,-1.7C10.8,5.8 11,5 11,4.2c0,-0.8 -0.2,-1.6 -0.6,-2.3L9.1,2.5C9.3,3 9.5,3.6 9.5,4.2c0,0.6 -0.2,1.2 -0.4,1.8C8.7,6.6 8.5,7.4 8.5,8.2c0,0.8 0.2,1.6 0.6,2.3L10.4,9.8zM19,10.3L19,10.3c0,2.7 -2.3,8.7 -9,8.7c-4.9,0 -8.8,-3.8 -9,-8.7l0,0C1,9.1 2.8,8 5.6,7.4c0.1,-0.5 0.3,-1 0.5,-1.5c0.3,-0.5 0.4,-1.1 0.4,-1.8c0,-0.6 -0.2,-1.2 -0.4,-1.7l1.4,-0.6C7.8,2.6 8,3.4 8,4.2C8,5 7.8,5.8 7.4,6.5C7.2,7 7,7.6 7,8.2c0,0.2 0,0.3 0,0.5c0.1,0.4 0.2,0.8 0.4,1.2L6,10.4C5.8,10 5.7,9.5 5.6,9c-1.1,0.2 -2.2,0.6 -3,1.4c0.4,0.6 2.9,1.9 7.5,1.9s7.1,-1.3 7.5,-1.9c-0.8,-0.7 -1.8,-1.2 -2.9,-1.4c-0.1,-0.3 -0.1,-0.5 -0.1,-0.8c0,-0.2 0,-0.5 0.1,-0.7C17.2,8 19,9.1 19,10.3zM17.2,12c-0.2,0.3 -0.5,0.5 -0.8,0.6c-2.1,0.7 -4.2,1 -6.4,1c-2.2,0 -4.3,-0.3 -6.3,-1C3.3,12.5 3,12.3 2.8,12c0.1,0.4 0.2,0.7 0.4,1.1c1.1,2.8 3.8,4.5 6.8,4.5c3,0.1 5.7,-1.7 6.9,-4.5C17,12.7 17.1,12.4 17.2,12z"/>
+</vector>
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 000000000..44934dd47
--- /dev/null
+++ b/res/drawable/ic_emoji_object_dark_20.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="@color/core_grey_25"
+      android:pathData="M16.5,7.5C16.5,3.9 13.6,1 10,1C6.4,1 3.5,3.9 3.5,7.5c0,1.5 0.5,2.9 1.4,4.1l0,0l0,0v0.1c1.4,1.6 2.6,2.9 2.6,4.4v1.5c0,0.6 0.4,1.2 1,1.5h3c0.6,-0.3 1,-0.9 1,-1.5H9V16h3.5c0,-1.5 1.2,-2.8 2.5,-4.3v-0.1l0,0l0,0C16,10.5 16.5,9 16.5,7.5z"/>
+</vector>
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 000000000..6aa4c053e
--- /dev/null
+++ b/res/drawable/ic_emoji_object_light_20.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="@color/core_grey_60"
+      android:pathData="M10,1C6.4,1 3.5,3.9 3.5,7.5c0,1.5 0.5,2.9 1.4,4.1c1.3,1.7 2.6,2.9 2.6,4.4v1.5c0,0.6 0.4,1.2 1,1.5h3c0.6,-0.3 1,-0.9 1,-1.5H9V16h3.5c0,-1.5 1.2,-2.8 2.6,-4.4c2.3,-2.8 1.8,-6.9 -1,-9.1C12.9,1.5 11.5,1 10,1zM8.7,14.5c-0.5,-1.2 -1.2,-2.2 -2.1,-3.2l-0.5,-0.7C5.4,9.8 5,8.6 5,7.5c0,-2.8 2.2,-5 5,-5s5,2.2 5,5c0,1.2 -0.4,2.3 -1.1,3.2l-0.5,0.6c-0.9,0.9 -1.6,2 -2.1,3.2H8.7z"/>
+</vector>
diff --git a/res/drawable/ic_emoji_outline.xml b/res/drawable/ic_emoji_outline.xml
new file mode 100644
index 000000000..943277e7a
--- /dev/null
+++ b/res/drawable/ic_emoji_outline.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF636467"
+      android:pathData="M12,18.7c-2.1,0 -4.2,-1 -5.5,-2.7c-0.2,-0.3 -0.2,-0.8 0.2,-1.1s0.8,-0.2 1.1,0.2l0,0c1,1.3 2.6,2.1 4.3,2.1c1.7,0 3.3,-0.8 4.3,-2.1c0.2,-0.3 0.7,-0.4 1,-0.2c0,0 0,0 0,0c0.3,0.2 0.4,0.7 0.2,1C16.2,17.6 14.2,18.7 12,18.7zM12,2.5c-5.1,-0.2 -9.3,3.8 -9.5,8.9c0,0.2 0,0.4 0,0.6c-0.2,5.1 3.8,9.3 8.9,9.5c0.2,0 0.4,0 0.6,0c5.1,0.2 9.3,-3.8 9.5,-8.9c0,-0.2 0,-0.4 0,-0.6c0.2,-5.1 -3.8,-9.3 -8.9,-9.5C12.4,2.5 12.2,2.5 12,2.5M12,1c5.9,-0.2 10.8,4.5 11,10.4c0,0.2 0,0.4 0,0.6c0.2,5.9 -4.5,10.8 -10.4,11c-0.2,0 -0.4,0 -0.6,0C6.1,23.2 1.2,18.5 1,12.6c0,-0.2 0,-0.4 0,-0.6C0.8,6.1 5.5,1.2 11.4,1C11.6,1 11.8,1 12,1zM8.5,8C7.7,8 7,8.9 7,10s0.7,2 1.5,2s1.5,-0.9 1.5,-2S9.3,8 8.5,8zM15.5,8C14.7,8 14,8.9 14,10s0.7,2 1.5,2s1.5,-0.9 1.5,-2S16.3,8 15.5,8z"/>
+</vector>
diff --git a/res/drawable/ic_emoji_outline_keyboard.xml b/res/drawable/ic_emoji_outline_keyboard.xml
new file mode 100644
index 000000000..943277e7a
--- /dev/null
+++ b/res/drawable/ic_emoji_outline_keyboard.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF636467"
+      android:pathData="M12,18.7c-2.1,0 -4.2,-1 -5.5,-2.7c-0.2,-0.3 -0.2,-0.8 0.2,-1.1s0.8,-0.2 1.1,0.2l0,0c1,1.3 2.6,2.1 4.3,2.1c1.7,0 3.3,-0.8 4.3,-2.1c0.2,-0.3 0.7,-0.4 1,-0.2c0,0 0,0 0,0c0.3,0.2 0.4,0.7 0.2,1C16.2,17.6 14.2,18.7 12,18.7zM12,2.5c-5.1,-0.2 -9.3,3.8 -9.5,8.9c0,0.2 0,0.4 0,0.6c-0.2,5.1 3.8,9.3 8.9,9.5c0.2,0 0.4,0 0.6,0c5.1,0.2 9.3,-3.8 9.5,-8.9c0,-0.2 0,-0.4 0,-0.6c0.2,-5.1 -3.8,-9.3 -8.9,-9.5C12.4,2.5 12.2,2.5 12,2.5M12,1c5.9,-0.2 10.8,4.5 11,10.4c0,0.2 0,0.4 0,0.6c0.2,5.9 -4.5,10.8 -10.4,11c-0.2,0 -0.4,0 -0.6,0C6.1,23.2 1.2,18.5 1,12.6c0,-0.2 0,-0.4 0,-0.6C0.8,6.1 5.5,1.2 11.4,1C11.6,1 11.8,1 12,1zM8.5,8C7.7,8 7,8.9 7,10s0.7,2 1.5,2s1.5,-0.9 1.5,-2S9.3,8 8.5,8zM15.5,8C14.7,8 14,8.9 14,10s0.7,2 1.5,2s1.5,-0.9 1.5,-2S16.3,8 15.5,8z"/>
+</vector>
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 000000000..c28e8c86c
--- /dev/null
+++ b/res/drawable/ic_emoji_people_dark_20.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="@color/core_grey_25"
+      android:pathData="M10,1C5.2,0.9 1.1,4.7 1,9.5C1,9.7 1,9.8 1,10c-0.1,4.8 3.7,8.9 8.5,9c0.2,0 0.3,0 0.5,0c4.8,0.1 8.9,-3.7 9,-8.5c0,-0.2 0,-0.3 0,-0.5c0.1,-4.8 -3.7,-8.9 -8.5,-9C10.3,1 10.2,1 10,1zM12.8,6.8c0.8,0.1 1.3,0.8 1.2,1.6c0.1,0.8 -0.5,1.5 -1.2,1.6c-0.8,-0.1 -1.3,-0.8 -1.2,-1.6C11.4,7.6 12,6.9 12.8,6.8zM7.2,6.8C8,6.9 8.6,7.6 8.5,8.4C8.6,9.2 8,9.9 7.2,10C6.5,9.9 5.9,9.2 6,8.4C5.9,7.6 6.5,6.9 7.2,6.8zM14.6,13.2c-1.9,2.5 -5.5,3.1 -8.1,1.1c-0.4,-0.3 -0.8,-0.7 -1.1,-1.1c-0.2,-0.3 -0.2,-0.8 0.2,-1.1s0.8,-0.2 1.1,0.2c1.4,1.9 4.1,2.2 6,0.8c0.3,-0.2 0.6,-0.5 0.8,-0.8c0.2,-0.3 0.7,-0.4 1.1,-0.2S14.9,12.9 14.6,13.2z"/>
+</vector>
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 000000000..26867afd8
--- /dev/null
+++ b/res/drawable/ic_emoji_people_light_20.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="@color/core_grey_60"
+      android:pathData="M10,15.5c-1.8,0 -3.5,-0.8 -4.6,-2.3c-0.2,-0.3 -0.2,-0.8 0.2,-1.1c0.3,-0.2 0.8,-0.2 1.1,0.2c1.4,1.9 4.1,2.2 6,0.8c0.3,-0.2 0.6,-0.5 0.8,-0.8c0.2,-0.3 0.7,-0.4 1.1,-0.2s0.4,0.7 0.2,1.1l0,0C13.5,14.7 11.8,15.5 10,15.5zM10,2.5c-4,-0.1 -7.4,3 -7.5,7c0,0.2 0,0.3 0,0.5c-0.1,4 3,7.4 7,7.5c0.2,0 0.3,0 0.5,0c4,0.1 7.4,-3 7.5,-7c0,-0.2 0,-0.3 0,-0.5c0.1,-4 -3,-7.4 -7,-7.5C10.3,2.5 10.2,2.5 10,2.5M10,1c4.8,-0.1 8.9,3.7 9,8.5c0,0.2 0,0.3 0,0.5c0.1,4.8 -3.7,8.9 -8.5,9c-0.2,0 -0.3,0 -0.5,0c-4.8,0.1 -8.9,-3.7 -9,-8.5c0,-0.2 0,-0.3 0,-0.5C0.9,5.2 4.7,1.1 9.5,1C9.7,1 9.8,1 10,1zM7.2,6.8C6.5,6.9 5.9,7.6 6,8.4C5.9,9.2 6.5,9.9 7.2,10C8,9.9 8.6,9.2 8.5,8.4C8.6,7.6 8,6.9 7.2,6.8zM12.8,6.8c-0.8,0.1 -1.3,0.8 -1.2,1.6C11.4,9.2 12,9.9 12.8,10c0.8,-0.1 1.3,-0.8 1.2,-1.6C14.1,7.6 13.5,6.9 12.8,6.8z"/>
+</vector>
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 000000000..c2049dc47
--- /dev/null
+++ b/res/drawable/ic_emoji_symbol_dark_20.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="@color/core_grey_25"
+      android:pathData="M18.9,5.8c-0.2,-0.9 -0.6,-1.7 -1.3,-2.4c-1.9,-1.9 -4.9,-1.9 -6.7,0c-0.3,0.3 -0.6,0.7 -0.9,1c-0.3,-0.4 -0.6,-0.7 -0.9,-1c-1.9,-1.9 -4.9,-1.9 -6.7,0C1.7,4 1.3,4.8 1.1,5.7C1,6 1,6.3 1,6.7c0,4.6 5.1,9.1 9,12.4c4,-3.2 9,-7.8 9,-12.4C19,6.4 19,6.1 18.9,5.8z"/>
+</vector>
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 000000000..5a5b27697
--- /dev/null
+++ b/res/drawable/ic_emoji_symbol_light_20.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="@color/core_grey_60"
+      android:pathData="M14.2,3.5c1.6,0 2.9,1.1 3.2,2.6c0,0.2 0.1,0.4 0.1,0.5c0,3.6 -4,7.5 -7.5,10.4c-2.8,-2.3 -7.5,-6.6 -7.5,-10.4c0,-0.2 0,-0.4 0.1,-0.6l0,0C2.7,5.5 3,4.9 3.4,4.5c1.3,-1.3 3.3,-1.3 4.6,0l0,0l0,0C8.3,4.7 8.5,5 8.7,5.3L10,7.1l1.2,-1.9c0.2,-0.3 0.4,-0.5 0.6,-0.8l0,0l0,0l0,0C12.5,3.9 13.3,3.5 14.2,3.5M14.2,2c-1.3,0 -2.5,0.5 -3.4,1.4c-0.3,0.3 -0.6,0.7 -0.8,1c-0.3,-0.4 -0.6,-0.7 -0.9,-1c-1.9,-1.9 -4.9,-1.9 -6.7,0C1.7,4 1.3,4.8 1.1,5.7C1,6 1,6.3 1,6.7c0,4.6 5.1,9.1 9,12.4c4,-3.2 9,-7.8 9,-12.4c0,-0.3 0,-0.6 -0.1,-0.9C18.4,3.6 16.5,2 14.2,2L14.2,2z"/>
+</vector>
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 000000000..c22c93c47
--- /dev/null
+++ b/res/drawable/ic_emoji_travel_dark_20.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="@color/core_grey_25"
+      android:pathData="M14.5,8.5l2.2,-2.2c1.6,-1.6 2.2,-3.6 1.4,-4.4s-2.9,-0.1 -4.4,1.4l-2.2,2.2L7.7,4.2l-4.8,-2L1.1,4l4.5,3.9l1.7,1.7l-1.2,1.2c-0.2,0.3 -0.4,0.5 -0.6,0.9H2.1l-1,1.1l3.1,1.9c-0.2,0.5 -0.3,0.9 -0.3,0.9l0.6,0.6l0.9,-0.3l1.9,3l1,-1v-3.4c0.3,-0.2 0.6,-0.4 0.9,-0.6l1.1,-1.1l1.7,1.8l3.8,4.6l1.8,-1.8l-1.9,-4.9L14.5,8.5z"/>
+</vector>
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 000000000..6a0448e21
--- /dev/null
+++ b/res/drawable/ic_emoji_travel_light_20.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="@color/core_grey_60"
+      android:pathData="M16,8.2L17.2,7c1.6,-1.6 1.9,-3.9 0.8,-5c-0.5,-0.4 -1.1,-0.7 -1.8,-0.7c-1.2,0 -2.4,0.5 -3.2,1.4L11.7,4L8.3,3.6L3.2,1.9L0.9,4.2L5.5,8l1.1,1.1l-1.2,1.2c-0.3,0.4 -0.5,0.8 -0.7,1.2l-2.6,0.2l-1.2,1.2l2.9,1.7c-0.1,0.6 -0.2,1.1 -0.2,1.1l0.8,0.8l1,-0.2L7,19l1.2,-1.2l0.2,-2.5c0.4,-0.2 0.8,-0.4 1.2,-0.7l1.2,-1.2l1.1,1.1l3.7,4.7l2.3,-2.3l-1.5,-5.3L16,8.2zM6.5,6.9l-3.6,-3l0.5,-0.5L8,5.1l2.5,0.2L7.6,8.1L6.5,6.9zM8.1,13.9c-1,0.6 -2.1,1 -3.2,1.2C5.1,14 5.5,12.8 6,11.8l8,-8c0.6,-0.6 1.3,-1 2.2,-1c0.3,0 0.5,0.1 0.7,0.2c0.4,0.4 0.3,1.8 -0.8,2.9L8.1,13.9zM15.9,17L13,13.4l-1.1,-1.1l2.8,-2.8l0.2,2.5l1.5,4.7L15.9,17z"/>
+</vector>
diff --git a/res/drawable/ic_forward_outline.xml b/res/drawable/ic_forward_outline.xml
new file mode 100644
index 000000000..d1463dda1
--- /dev/null
+++ b/res/drawable/ic_forward_outline.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12.91,3.91h0m1.71,2.16V9.32l-1.31,0.17A11,11 0,0 0,3.84 17c-0.12,0.33 -0.8,1.59 -0.8,1.59s1,-1 1.3,-1.22A17.36,17.36 0,0 1,13 14.5l1.62,-0.12v3.48l-0.06,0.81L15,18 21,12 14.9,5.9l-0.34,-0.54ZM13.48,2.58a0.76,0.76 0,0 1,0.49 0.27l8.79,8.8a0.48,0.48 0,0 1,0 0.7L14,21.15a0.76,0.76 0,0 1,-0.49 0.27c-0.22,0 -0.36,-0.22 -0.36,-0.63V16c-5,0.39 -8.83,2.48 -11.37,6 -0.14,0.2 -0.27,0.29 -0.37,0.29s-0.2,-0.17 -0.16,-0.5C2,14.43 5.59,9 13.12,8V3.21c0,-0.41 0.14,-0.63 0.36,-0.63Z"/>
+</vector>
diff --git a/res/drawable/ic_mic_filled_24.xml b/res/drawable/ic_mic_filled_24.xml
new file mode 100644
index 000000000..acffc548c
--- /dev/null
+++ b/res/drawable/ic_mic_filled_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,16L12,16c-2.5,0 -4.5,-2 -4.5,-4.5c0,0 0,0 0,0v-6C7.5,3 9.5,1 12,1c0,0 0,0 0,0l0,0c2.5,0 4.5,2 4.5,4.5c0,0 0,0 0,0v6C16.5,14 14.5,16 12,16C12,16 12,16 12,16zM20,11.5h-1.5c0,3.6 -2.9,6.5 -6.5,6.5s-6.5,-2.9 -6.5,-6.5H4c0,3.9 2.9,7.3 6.8,7.9V23h2.5v-3.6C17.1,18.8 20,15.4 20,11.5z"/>
+</vector>
diff --git a/res/drawable/ic_plus_24.xml b/res/drawable/ic_plus_24.xml
new file mode 100644
index 000000000..d287574e1
--- /dev/null
+++ b/res/drawable/ic_plus_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M22,11.2l-9.2,0l0,-9.2l-1.6,0l0,9.2l-9.2,0l0,1.6l9.2,0l0,9.2l1.6,0l0,-9.2l9.2,0z"/>
+</vector>
diff --git a/res/drawable/ic_recent_dark_20.xml b/res/drawable/ic_recent_dark_20.xml
new file mode 100644
index 000000000..7cb39ce59
--- /dev/null
+++ b/res/drawable/ic_recent_dark_20.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="@color/core_grey_25"
+      android:pathData="M10,1c-5,0 -9,4 -9,9s4,9 9,9s9,-4 9,-9S15,1 10,1zM10.5,11.5L5,11v-1l4.6,-0.4L10,4h1l0.5,6.5C11.5,11.1 11.1,11.5 10.5,11.5z"/>
+</vector>
diff --git a/res/drawable/ic_recent_light_20.xml b/res/drawable/ic_recent_light_20.xml
new file mode 100644
index 000000000..1e888e4f6
--- /dev/null
+++ b/res/drawable/ic_recent_light_20.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="@color/core_grey_60"
+      android:pathData="M10,2.5c4.1,0 7.5,3.4 7.5,7.5s-3.4,7.5 -7.5,7.5S2.5,14.1 2.5,10S5.9,2.5 10,2.5M10,1c-5,0 -9,4 -9,9s4,9 9,9s9,-4 9,-9S15,1 10,1zM11,4h-1L9.6,9.6L5,10v1l5.5,0.5c0.6,0 1,-0.4 1,-1L11,4z"/>
+</vector>
diff --git a/res/drawable/ic_sticker_filled.xml b/res/drawable/ic_sticker_filled.xml
new file mode 100644
index 000000000..9b4b5c566
--- /dev/null
+++ b/res/drawable/ic_sticker_filled.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFBBBDBE"
+      android:pathData="M9,22H7.1c-1.1,0.1 -2.1,-0.1 -3.1,-0.5c-0.6,-0.3 -1.2,-0.8 -1.5,-1.5c-0.5,-1 -0.6,-2.1 -0.5,-3.1V7.1C1.9,6.1 2.1,5 2.5,4.1c0.3,-0.6 0.9,-1.2 1.5,-1.5c1,-0.5 2,-0.6 3.1,-0.5h9.7C17.9,1.9 19,2.1 20,2.5c0.6,0.3 1.2,0.9 1.5,1.5c0.4,1 0.6,2 0.5,3.1V9c0,0.5 0,1 -1.5,1h-4.6c-1.2,-0.1 -2.4,0.1 -3.4,0.6c-0.8,0.4 -1.4,1.1 -1.8,1.8c-0.5,1.1 -0.7,2.3 -0.6,3.4v4.6C10,21.9 9.6,22 9,22zM15.9,11.5c-0.9,-0.1 -1.9,0 -2.7,0.4c-0.5,0.3 -0.9,0.7 -1.2,1.2c-0.4,0.8 -0.6,1.8 -0.4,2.7v4.6c0,0.2 0,0.4 0,0.5l9.5,-9.6c-0.2,0 -0.4,0 -0.5,0L15.9,11.5z"/>
+</vector>
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 000000000..b8a968b03
--- /dev/null
+++ b/res/drawable/ic_sticker_filled_keyboard_dark.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@color/core_grey_25"
+      android:pathData="M9,22H7.1c-1.1,0.1 -2.1,-0.1 -3.1,-0.5c-0.6,-0.3 -1.2,-0.8 -1.5,-1.5c-0.5,-1 -0.6,-2.1 -0.5,-3.1V7.1C1.9,6.1 2.1,5 2.5,4.1c0.3,-0.6 0.9,-1.2 1.5,-1.5c1,-0.5 2,-0.6 3.1,-0.5h9.7C17.9,1.9 19,2.1 20,2.5c0.6,0.3 1.2,0.9 1.5,1.5c0.4,1 0.6,2 0.5,3.1V9c0,0.5 0,1 -1.5,1h-4.6c-1.2,-0.1 -2.4,0.1 -3.4,0.6c-0.8,0.4 -1.4,1.1 -1.8,1.8c-0.5,1.1 -0.7,2.3 -0.6,3.4v4.6C10,21.9 9.6,22 9,22zM15.9,11.5c-0.9,-0.1 -1.9,0 -2.7,0.4c-0.5,0.3 -0.9,0.7 -1.2,1.2c-0.4,0.8 -0.6,1.8 -0.4,2.7v4.6c0,0.2 0,0.4 0,0.5l9.5,-9.6c-0.2,0 -0.4,0 -0.5,0L15.9,11.5z"/>
+</vector>
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 000000000..d4db977f5
--- /dev/null
+++ b/res/drawable/ic_sticker_filled_keyboard_light.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@color/core_grey_60"
+      android:pathData="M9,22H7.1c-1.1,0.1 -2.1,-0.1 -3.1,-0.5c-0.6,-0.3 -1.2,-0.8 -1.5,-1.5c-0.5,-1 -0.6,-2.1 -0.5,-3.1V7.1C1.9,6.1 2.1,5 2.5,4.1c0.3,-0.6 0.9,-1.2 1.5,-1.5c1,-0.5 2,-0.6 3.1,-0.5h9.7C17.9,1.9 19,2.1 20,2.5c0.6,0.3 1.2,0.9 1.5,1.5c0.4,1 0.6,2 0.5,3.1V9c0,0.5 0,1 -1.5,1h-4.6c-1.2,-0.1 -2.4,0.1 -3.4,0.6c-0.8,0.4 -1.4,1.1 -1.8,1.8c-0.5,1.1 -0.7,2.3 -0.6,3.4v4.6C10,21.9 9.6,22 9,22zM15.9,11.5c-0.9,-0.1 -1.9,0 -2.7,0.4c-0.5,0.3 -0.9,0.7 -1.2,1.2c-0.4,0.8 -0.6,1.8 -0.4,2.7v4.6c0,0.2 0,0.4 0,0.5l9.5,-9.6c-0.2,0 -0.4,0 -0.5,0L15.9,11.5z"/>
+</vector>
diff --git a/res/drawable/ic_sticker_outline.xml b/res/drawable/ic_sticker_outline.xml
new file mode 100644
index 000000000..d2f6e5bb0
--- /dev/null
+++ b/res/drawable/ic_sticker_outline.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF636467"
+      android:pathData="M21.5,4.1c-0.3,-0.6 -0.8,-1.2 -1.5,-1.5c-1,-0.5 -2.1,-0.6 -3.1,-0.5H7.1C6.1,1.9 5,2.1 4.1,2.5C3.4,2.9 2.9,3.4 2.5,4.1C2.1,5 1.9,6.1 2,7.1v9.7C1.9,17.9 2.1,19 2.5,20c0.3,0.6 0.9,1.2 1.5,1.5c1,0.4 2,0.6 3.1,0.5h2.1c0.8,0 1.6,-0.3 2.1,-0.9l9.7,-9.7c0.6,-0.6 0.9,-1.3 0.9,-2.1V7.1C22.1,6.1 21.9,5 21.5,4.1zM11.5,18.9v-3c-0.1,-0.9 0.1,-1.9 0.5,-2.7c0.3,-0.5 0.7,-0.9 1.2,-1.2c0.8,-0.4 1.8,-0.6 2.7,-0.4h3L11.5,18.9zM19,10h-3.1c-1.2,-0.1 -2.4,0.1 -3.4,0.6c-0.8,0.4 -1.4,1.1 -1.8,1.8c-0.5,1.1 -0.7,2.3 -0.6,3.4V19c0,1.4 -0.4,1.5 -1,1.5H7.1c-1.7,0 -2,-0.2 -2.4,-0.4c-0.4,-0.2 -0.7,-0.5 -0.9,-0.9c-0.2,-0.3 -0.4,-0.7 -0.4,-2.4V7.1c0,-1.7 0.2,-2 0.4,-2.4c0.2,-0.4 0.5,-0.7 0.9,-0.9c0.3,-0.2 0.7,-0.4 2.4,-0.4h9.7c1.7,0 2,0.2 2.4,0.4c0.4,0.2 0.7,0.5 0.9,0.9c0.2,0.3 0.4,0.7 0.4,2.4V9C20.5,9.5 20.5,10 19,10z"/>
+</vector>
diff --git a/res/drawable/ic_sticker_outline_keyboard.xml b/res/drawable/ic_sticker_outline_keyboard.xml
new file mode 100644
index 000000000..d2f6e5bb0
--- /dev/null
+++ b/res/drawable/ic_sticker_outline_keyboard.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF636467"
+      android:pathData="M21.5,4.1c-0.3,-0.6 -0.8,-1.2 -1.5,-1.5c-1,-0.5 -2.1,-0.6 -3.1,-0.5H7.1C6.1,1.9 5,2.1 4.1,2.5C3.4,2.9 2.9,3.4 2.5,4.1C2.1,5 1.9,6.1 2,7.1v9.7C1.9,17.9 2.1,19 2.5,20c0.3,0.6 0.9,1.2 1.5,1.5c1,0.4 2,0.6 3.1,0.5h2.1c0.8,0 1.6,-0.3 2.1,-0.9l9.7,-9.7c0.6,-0.6 0.9,-1.3 0.9,-2.1V7.1C22.1,6.1 21.9,5 21.5,4.1zM11.5,18.9v-3c-0.1,-0.9 0.1,-1.9 0.5,-2.7c0.3,-0.5 0.7,-0.9 1.2,-1.2c0.8,-0.4 1.8,-0.6 2.7,-0.4h3L11.5,18.9zM19,10h-3.1c-1.2,-0.1 -2.4,0.1 -3.4,0.6c-0.8,0.4 -1.4,1.1 -1.8,1.8c-0.5,1.1 -0.7,2.3 -0.6,3.4V19c0,1.4 -0.4,1.5 -1,1.5H7.1c-1.7,0 -2,-0.2 -2.4,-0.4c-0.4,-0.2 -0.7,-0.5 -0.9,-0.9c-0.2,-0.3 -0.4,-0.7 -0.4,-2.4V7.1c0,-1.7 0.2,-2 0.4,-2.4c0.2,-0.4 0.5,-0.7 0.9,-0.9c0.3,-0.2 0.7,-0.4 2.4,-0.4h9.7c1.7,0 2,0.2 2.4,0.4c0.4,0.2 0.7,0.5 0.9,0.9c0.2,0.3 0.4,0.7 0.4,2.4V9C20.5,9.5 20.5,10 19,10z"/>
+</vector>
diff --git a/res/drawable/ic_triangle_down.xml b/res/drawable/ic_triangle_down.xml
new file mode 100644
index 000000000..9ff7fc1c8
--- /dev/null
+++ b/res/drawable/ic_triangle_down.xml
@@ -0,0 +1,7 @@
+<vector android:height="24dp" android:viewportHeight="203.66562"
+    android:viewportWidth="203.66562" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#ffffff" android:pathData="M50.919,100.832L0.999,1.002L100.839,1.002L200.669,1.002L150.759,100.832L100.839,200.662L50.919,100.832Z"/>
+    <path android:fillAlpha="0" android:fillColor="#FF000000"
+        android:pathData="M50.919,100.832L0.999,1.002L100.839,1.002L200.669,1.002L150.759,100.832L100.839,200.662L50.919,100.832Z"
+        android:strokeAlpha="1" android:strokeWidth="0"/>
+</vector>
diff --git a/res/drawable/ic_triangle_left.xml b/res/drawable/ic_triangle_left.xml
new file mode 100644
index 000000000..571c2b3ca
--- /dev/null
+++ b/res/drawable/ic_triangle_left.xml
@@ -0,0 +1,7 @@
+<vector android:height="24dp" android:viewportHeight="203.66562"
+    android:viewportWidth="203.66562" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#ffffff" android:pathData="M100.829,50.912L200.669,1.002L200.669,100.832L200.669,200.662L100.829,150.752L0.999,100.832L100.829,50.912Z"/>
+    <path android:fillAlpha="0" android:fillColor="#FF000000"
+        android:pathData="M100.829,50.912L200.669,1.002L200.669,100.832L200.669,200.662L100.829,150.752L0.999,100.832L100.829,50.912Z"
+        android:strokeAlpha="1" android:strokeWidth="0"/>
+</vector>
diff --git a/res/drawable/ic_triangle_right.xml b/res/drawable/ic_triangle_right.xml
new file mode 100644
index 000000000..f14e6941d
--- /dev/null
+++ b/res/drawable/ic_triangle_right.xml
@@ -0,0 +1,7 @@
+<vector android:height="24dp" android:viewportHeight="203.66562"
+    android:viewportWidth="203.66562" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#ffffff" android:pathData="M100.829,150.752L0.999,200.662L0.999,100.832L0.999,1.002L100.829,50.912L200.669,100.832L100.829,150.752Z"/>
+    <path android:fillAlpha="0" android:fillColor="#FF000000"
+        android:pathData="M100.829,150.752L0.999,200.662L0.999,100.832L0.999,1.002L100.829,50.912L200.669,100.832L100.829,150.752Z"
+        android:strokeAlpha="1" android:strokeWidth="0"/>
+</vector>
diff --git a/res/drawable/ic_triangle_up.xml b/res/drawable/ic_triangle_up.xml
new file mode 100644
index 000000000..b8736e342
--- /dev/null
+++ b/res/drawable/ic_triangle_up.xml
@@ -0,0 +1,7 @@
+<vector android:height="24dp" android:viewportHeight="203.66562"
+    android:viewportWidth="203.66562" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#ffffff" android:pathData="M150.749,100.832L200.669,200.662L100.829,200.662L0.999,200.662L50.909,100.832L100.829,1.002L150.749,100.832Z"/>
+    <path android:fillAlpha="0" android:fillColor="#FF000000"
+        android:pathData="M150.749,100.832L200.669,200.662L100.829,200.662L0.999,200.662L50.909,100.832L100.829,1.002L150.749,100.832Z"
+        android:strokeAlpha="1" android:strokeWidth="0"/>
+</vector>
diff --git a/res/drawable/ic_x.xml b/res/drawable/ic_x.xml
new file mode 100644
index 000000000..4fa8aa41a
--- /dev/null
+++ b/res/drawable/ic_x.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M20.5,4.5l-1,-1l-7.5,7.4l-7.5,-7.4l-1,1l7.4,7.5l-7.4,7.5l1,1l7.5,-7.4l7.5,7.4l1,-1l-7.4,-7.5z"/>
+</vector>
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 000000000..b41f2cf6d
--- /dev/null
+++ b/res/drawable/media_keyboard_selected_background_dark.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="8dp" />
+    <solid android:color="@color/core_grey_75" />
+
+</shape>
\ 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 000000000..e0afb0fc4
--- /dev/null
+++ b/res/drawable/media_keyboard_selected_background_light.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="8dp" />
+    <solid android:color="@color/core_grey_05" />
+
+</shape>
\ 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 000000000..89c87b25c
--- /dev/null
+++ b/res/drawable/remove_button_state.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true"
+          android:color="@color/conversation_crimson"/>
+    <item android:state_focused="true"
+          android:color="@color/conversation_crimson"/>
+    <item android:state_enabled="false"
+          android:color="@color/conversation_crimson"/>
+    <item android:state_enabled="true"
+          android:color="@color/conversation_crimson"/>
+</selector>
\ 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 000000000..646748d34
--- /dev/null
+++ b/res/drawable/sticker_button_dark.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" >
+    <solid android:color="@color/core_grey_75"/>
+</shape>
\ 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 000000000..97fcffe0f
--- /dev/null
+++ b/res/drawable/sticker_button_light.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" >
+    <solid android:color="@color/core_grey_05"/>
+</shape>
\ 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 000000000..63855710d
--- /dev/null
+++ b/res/drawable/sticker_management_empty_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <solid android:color="@color/core_white"/>
+    <corners android:radius="8dp"/>
+</shape>
\ 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 000000000..b41f2cf6d
--- /dev/null
+++ b/res/drawable/sticker_missing_background_dark.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="8dp" />
+    <solid android:color="@color/core_grey_75" />
+
+</shape>
\ 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 000000000..fdc4810c9
--- /dev/null
+++ b/res/drawable/sticker_missing_background_light.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="8dp" />
+    <solid android:color="@color/core_grey_45" />
+
+</shape>
\ 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 000000000..900668e09
--- /dev/null
+++ b/res/drawable/tooltip_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <solid android:color="@color/white"/>
+    <corners android:radius="8dp"/>
+</shape>
\ 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 000000000..1ba1aa2ec
--- /dev/null
+++ b/res/drawable/transfer_controls_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="16dp" />
+    <solid android:color="@color/core_grey_02" />
+
+</shape>
\ No newline at end of file
diff --git a/res/layout/album_thumbnail_view.xml b/res/layout/album_thumbnail_view.xml
index 3bac5cb0e..11af8b53f 100644
--- a/res/layout/album_thumbnail_view.xml
+++ b/res/layout/album_thumbnail_view.xml
@@ -13,8 +13,8 @@
 
     <ViewStub
         android:id="@+id/album_transfer_controls_stub"
-        android:layout_width="70dp"
-        android:layout_height="70dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout="@layout/transfer_controls_stub" />
 
diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 4672c4663..fc87bafa8 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -1,108 +1,131 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<org.thoughtcrime.securesms.components.InputAwareLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout_container"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <LinearLayout
-        android:id="@+id/conversation_container"
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipChildren="false"
-        android:clipToPadding="false"
-        android:gravity="bottom"
-        android:orientation="vertical"
-        android:paddingTop="?attr/actionBarSize">
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/conversation_list_toolbar_background"
+        android:theme="?attr/actionBarStyle"
+        app:contentInsetStartWithNavigation="0dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:navigationIcon="?homeAsUpIndicator"
+        tools:background="#ff007f00">
 
-        <ViewStub
-            android:id="@+id/group_share_profile_view_stub"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inflatedId="@+id/group_share_profile_view"
-            android:layout="@layout/conversation_activity_group_share_profile_stub" />
+        <include layout="@layout/conversation_title_view" />
 
-        <ViewStub
-            android:id="@+id/unverified_banner_stub"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inflatedId="@+id/unverified_banner"
-            android:layout="@layout/conversation_activity_unverified_banner_stub" />
+    </android.support.v7.widget.Toolbar>
 
-        <ViewStub
-            android:id="@+id/reminder_stub"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inflatedId="@+id/reminder"
-            android:layout="@layout/conversation_activity_reminderview_stub" />
+    <org.thoughtcrime.securesms.components.InputAwareLayout
+        android:id="@+id/layout_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
-        <FrameLayout
-            android:id="@+id/fragment_content"
+        <LinearLayout
+            android:id="@+id/conversation_container"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1" />
-
-        <ViewStub
-            android:id="@+id/attachment_editor_stub"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inflatedId="@+id/attachment_editor"
-            android:layout="@layout/conversation_activity_attachment_editor_stub" />
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:clipChildren="false"
-            android:clipToPadding="false">
+            android:clipToPadding="false"
+            android:gravity="bottom"
+            android:orientation="vertical"
+            android:paddingTop="?attr/actionBarSize">
 
-            <include layout="@layout/conversation_input_panel" />
+            <ViewStub
+                android:id="@+id/group_share_profile_view_stub"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inflatedId="@+id/group_share_profile_view"
+                android:layout="@layout/conversation_activity_group_share_profile_stub" />
 
-            <include layout="@layout/conversation_search_nav" />
+            <ViewStub
+                android:id="@+id/unverified_banner_stub"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inflatedId="@+id/unverified_banner"
+                android:layout="@layout/conversation_activity_unverified_banner_stub" />
 
-        </FrameLayout>
+            <ViewStub
+                android:id="@+id/reminder_stub"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inflatedId="@+id/reminder"
+                android:layout="@layout/conversation_activity_reminderview_stub" />
 
-        <Button
-            android:id="@+id/register_button"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:padding="20dp"
-            android:text="@string/conversation_activity__enable_signal_messages"
-            android:visibility="gone" />
+            <FrameLayout
+                android:id="@+id/fragment_content"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
 
-        <Button
-            android:id="@+id/unblock_button"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:padding="20dp"
-            android:text="@string/ConversationActivity_unblock"
-            android:visibility="gone" />
+            <ViewStub
+                android:id="@+id/attachment_editor_stub"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inflatedId="@+id/attachment_editor"
+                android:layout="@layout/conversation_activity_attachment_editor_stub" />
 
-        <Button
-            android:id="@+id/make_default_sms_button"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:padding="20dp"
-            android:text="@string/conversation_activity__enable_signal_for_sms"
-            android:visibility="gone" />
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:clipChildren="false"
+                android:clipToPadding="false">
 
-        <TextView
-            android:id="@+id/space_left"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:background="?android:windowBackground"
-            android:paddingStart="5dip"
-            android:text="160/160 (1)"
-            android:visibility="gone" />
+                <include layout="@layout/conversation_input_panel" />
+
+                <include layout="@layout/conversation_search_nav" />
+
+            </FrameLayout>
+
+            <Button
+                android:id="@+id/register_button"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:padding="20dp"
+                android:text="@string/conversation_activity__enable_signal_messages"
+                android:visibility="gone" />
+
+            <Button
+                android:id="@+id/unblock_button"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:padding="20dp"
+                android:text="@string/ConversationActivity_unblock"
+                android:visibility="gone" />
+
+            <Button
+                android:id="@+id/make_default_sms_button"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:padding="20dp"
+                android:text="@string/conversation_activity__enable_signal_for_sms"
+                android:visibility="gone" />
+
+            <TextView
+                android:id="@+id/space_left"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:background="?android:windowBackground"
+                android:paddingStart="5dip"
+                android:text="160/160 (1)"
+                android:visibility="gone" />
 
 
-        <ViewStub
-            android:id="@+id/emoji_drawer_stub"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inflatedId="@+id/emoji_drawer"
-            android:layout="@layout/conversation_activity_emojidrawer_stub" />
+            <ViewStub
+                android:id="@+id/emoji_drawer_stub"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inflatedId="@+id/emoji_drawer"
+                android:layout="@layout/conversation_activity_emojidrawer_stub" />
 
-    </LinearLayout>
+        </LinearLayout>
 
-</org.thoughtcrime.securesms.components.InputAwareLayout>
+    </org.thoughtcrime.securesms.components.InputAwareLayout>
+
+</FrameLayout>
diff --git a/res/layout/conversation_activity_emojidrawer_stub.xml b/res/layout/conversation_activity_emojidrawer_stub.xml
index d29a342ea..c52ae1d33 100644
--- a/res/layout/conversation_activity_emojidrawer_stub.xml
+++ b/res/layout/conversation_activity_emojidrawer_stub.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.components.emoji.EmojiDrawer
+<org.thoughtcrime.securesms.components.emoji.MediaKeyboard
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/emoji_drawer"
         android:layout_width="match_parent"
diff --git a/res/layout/conversation_input_panel.xml b/res/layout/conversation_input_panel.xml
index bf2d1d855..3a97180cb 100644
--- a/res/layout/conversation_input_panel.xml
+++ b/res/layout/conversation_input_panel.xml
@@ -1,20 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.InputPanel
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/bottom_panel"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:clickable="true"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:paddingTop="6dp"
-        android:paddingBottom="6dp"
-        android:clipChildren="false"
-        android:clipToPadding="false">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/bottom_panel"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:clickable="true"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
+    android:paddingTop="6dp"
+    android:paddingBottom="6dp"
+    android:clipChildren="false"
+    android:clipToPadding="false">
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/input_panel_sticker_suggestion"
+        android:layout_width="match_parent"
+        android:layout_height="90dp"
+        android:background="?emoji_tab_strip_background"
+        android:visibility="gone" />
 
     <FrameLayout
         android:layout_width="0dp"
@@ -200,4 +207,5 @@
             android:background="@drawable/circle_touch_highlight_background" />
 
     </org.thoughtcrime.securesms.components.AnimatingToggle>
-</org.thoughtcrime.securesms.components.InputPanel>
+
+</org.thoughtcrime.securesms.components.InputPanel>
\ No newline at end of file
diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index bab891167..90a1c6917 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -130,6 +130,12 @@
                     android:layout_height="wrap_content"
                     android:layout="@layout/conversation_item_received_thumbnail" />
 
+                <ViewStub
+                    android:id="@+id/sticker_view_stub"
+                    android:layout_width="@dimen/media_bubble_sticker_dimens"
+                    android:layout_height="@dimen/media_bubble_sticker_dimens"
+                    android:layout="@layout/conversation_item_received_sticker" />
+
                 <ViewStub
                     android:id="@+id/link_preview_stub"
                     android:layout_width="match_parent"
@@ -186,6 +192,19 @@
                     app:footer_text_color="?conversation_item_received_text_secondary_color"
                     app:footer_icon_color="?conversation_item_received_text_secondary_color"/>
 
+                <org.thoughtcrime.securesms.components.ConversationItemFooter
+                    android:id="@+id/conversation_item_sticker_footer"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+                    android:clipChildren="false"
+                    android:clipToPadding="false"
+                    android:visibility="gone"
+                    app:footer_text_color="?conversation_sticker_footer_text_color"
+                    app:footer_icon_color="?conversation_sticker_footer_icon_color"/>
+
             </LinearLayout>
 
             <org.thoughtcrime.securesms.loki.FriendRequestView
diff --git a/res/layout/conversation_item_received_sticker.xml b/res/layout/conversation_item_received_sticker.xml
new file mode 100644
index 000000000..b162cece3
--- /dev/null
+++ b/res/layout/conversation_item_received_sticker.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.thoughtcrime.securesms.components.StickerView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/image_view"
+        android:layout_width="@dimen/media_bubble_sticker_dimens"
+        android:layout_height="@dimen/media_bubble_sticker_dimens"
+        android:contentDescription="@string/conversation_item__mms_image_description" />
diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml
index 6b6ede6eb..86fdc3eee 100644
--- a/res/layout/conversation_item_sent.xml
+++ b/res/layout/conversation_item_sent.xml
@@ -70,6 +70,12 @@
                     android:layout_height="wrap_content"
                     android:layout="@layout/conversation_item_sent_thumbnail" />
 
+                <ViewStub
+                    android:id="@+id/sticker_view_stub"
+                    android:layout_width="@dimen/media_bubble_sticker_dimens"
+                    android:layout_height="@dimen/media_bubble_sticker_dimens"
+                    android:layout="@layout/conversation_item_sent_sticker" />
+
                 <ViewStub
                     android:id="@+id/link_preview_stub"
                     android:layout_width="match_parent"
@@ -143,6 +149,19 @@
                     app:footer_text_color="?attr/conversation_item_sent_text_secondary_color"
                     app:footer_icon_color="?attr/conversation_item_sent_icon_color"/>
 
+                <org.thoughtcrime.securesms.components.ConversationItemFooter
+                    android:id="@+id/conversation_item_sticker_footer"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+                    android:clipChildren="false"
+                    android:clipToPadding="false"
+                    android:visibility="gone"
+                    app:footer_text_color="?conversation_sticker_footer_text_color"
+                    app:footer_icon_color="?conversation_sticker_footer_icon_color"/>
+
             </LinearLayout>
 
             <org.thoughtcrime.securesms.loki.FriendRequestView
diff --git a/res/layout/conversation_item_sent_sticker.xml b/res/layout/conversation_item_sent_sticker.xml
new file mode 100644
index 000000000..b162cece3
--- /dev/null
+++ b/res/layout/conversation_item_sent_sticker.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.thoughtcrime.securesms.components.StickerView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/image_view"
+        android:layout_width="@dimen/media_bubble_sticker_dimens"
+        android:layout_height="@dimen/media_bubble_sticker_dimens"
+        android:contentDescription="@string/conversation_item__mms_image_description" />
diff --git a/res/layout/conversation_title_view.xml b/res/layout/conversation_title_view.xml
index f16882db4..b4abaf761 100644
--- a/res/layout/conversation_title_view.xml
+++ b/res/layout/conversation_title_view.xml
@@ -2,30 +2,19 @@
 <org.thoughtcrime.securesms.conversation.ConversationTitleView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/conversation_title_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_gravity="center_vertical"
         android:gravity="center_vertical">
 
-    <ImageView android:id="@+id/up_button"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:src="@drawable/ic_arrow_back_white_24dp"
-               android:clickable="true"
-               android:paddingEnd="12dp"
-               android:layout_marginEnd="12dp"
-               android:layout_alignParentStart="true"
-               android:layout_centerVertical="true"
-               android:background="?selectableItemBackgroundBorderless"
-               android:visibility="visible"/>
-
     <org.thoughtcrime.securesms.components.AvatarImageView
             android:id="@+id/contact_photo_image"
             android:foreground="@drawable/contact_photo_background"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:layout_toEndOf="@id/up_button"
+            android:layout_alignParentStart="true"
             android:layout_centerVertical="true"
             android:layout_marginEnd="10dp"
             android:cropToPadding="true"
@@ -55,6 +44,7 @@
             android:gravity="center_vertical"
             android:layout_gravity="center_vertical"
             style="@style/TextSecure.TitleTextStyle"
+            tools:text="Contact name"
             tools:ignore="UnusedAttribute"/>
 
         <LinearLayout
diff --git a/res/layout/emoji_drawer.xml b/res/layout/emoji_drawer.xml
deleted file mode 100644
index 8a461832e..000000000
--- a/res/layout/emoji_drawer.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <LinearLayout android:background="?emoji_tab_strip_background"
-                  android:orientation="horizontal"
-                  android:layout_width="match_parent"
-                  android:layout_height="40dp">
-
-        <com.astuetz.PagerSlidingTabStrip android:id="@+id/tabs"
-                                          android:layout_weight="1"
-                                          android:layout_width="0dp"
-                                          android:layout_height="match_parent"
-                                          android:background="?emoji_tab_strip_background"
-                                          app:pstsShouldExpand="true"
-                                          app:pstsTabPaddingLeftRight="@dimen/emoji_drawer_left_right_padding"
-                                          app:pstsUnderlineColor="?emoji_tab_underline"
-                                          app:pstsIndicatorColor="?emoji_tab_indicator"
-                                          app:pstsIndicatorHeight="@dimen/emoji_drawer_indicator_height" />
-
-        <View android:layout_width="1px"
-              android:layout_height="match_parent"
-              android:background="?emoji_tab_seperator"
-              android:layout_marginTop="10dp"
-              android:layout_marginBottom="10dp" />
-
-        <org.thoughtcrime.securesms.components.RepeatableImageKey
-                android:id="@+id/backspace"
-                android:background="?emoji_tab_strip_background"
-                android:src="@drawable/ic_backspace_grey600_24dp"
-                android:paddingStart="10dp"
-                android:paddingEnd="10dp"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent" />
-
-    </LinearLayout>
-
-    <org.thoughtcrime.securesms.components.ControllableViewPager
-            android:id="@+id/emoji_pager"
-            android:visibility="visible"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-</merge>
\ 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 000000000..cc906e4d0
--- /dev/null
+++ b/res/layout/emoji_keyboard_icon_dark.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginEnd="@dimen/media_keyboard_provider_icon_margin"
+    android:padding="@dimen/media_keyboard_provider_icon_padding">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:srcCompat="@drawable/ic_emoji_filled" />
+
+</FrameLayout>
\ 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 000000000..1abaf57d4
--- /dev/null
+++ b/res/layout/emoji_keyboard_icon_dark_selected.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginEnd="@dimen/media_keyboard_provider_icon_margin"
+    android:padding="@dimen/media_keyboard_provider_icon_padding"
+    android:background="@drawable/media_keyboard_selected_background_dark">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:srcCompat="@drawable/ic_emoji_filled" />
+
+</FrameLayout>
\ 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 000000000..7d7f2fe26
--- /dev/null
+++ b/res/layout/emoji_keyboard_icon_light.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginEnd="@dimen/media_keyboard_provider_icon_margin"
+    android:padding="@dimen/media_keyboard_provider_icon_padding">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:srcCompat="@drawable/ic_emoji_outline" />
+
+</FrameLayout>
\ 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 000000000..c833b4191
--- /dev/null
+++ b/res/layout/emoji_keyboard_icon_light_selected.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginEnd="@dimen/media_keyboard_provider_icon_margin"
+    android:padding="@dimen/media_keyboard_provider_icon_padding"
+    android:background="@drawable/media_keyboard_selected_background_light">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:srcCompat="@drawable/ic_emoji_outline" />
+
+</FrameLayout>
\ 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 000000000..35320d4f4
--- /dev/null
+++ b/res/layout/media_keyboard.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<merge
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:parentTag="org.thoughtcrime.securesms.components.emoji.MediaKeyboard">
+
+    <android.support.constraint.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?emoji_drawer_background">
+
+        <ImageView
+            android:id="@+id/media_keyboard_search"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:padding="6dp"
+            android:src="@drawable/ic_search_white_24dp"
+            android:tint="?media_keyboard_button_color"
+            android:background="?selectableItemBackgroundBorderless"
+            android:visibility="invisible"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/media_keyboard_provider_tabs"
+            app:layout_constraintBottom_toBottomOf="@id/media_keyboard_provider_tabs"
+            tools:visibility="visible"/>
+
+        <LinearLayout
+            android:id="@+id/media_keyboard_provider_tabs"
+            android:layout_width="0dp"
+            android:layout_height="40dp"
+            android:layout_marginStart="8dp"
+            android:gravity="center"
+            android:orientation="horizontal"
+            app:layout_constraintEnd_toStartOf="@id/media_keyboard_backspace"
+            app:layout_constraintStart_toEndOf="@id/media_keyboard_search"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <org.thoughtcrime.securesms.components.RepeatableImageKey
+            android:id="@+id/media_keyboard_backspace"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="6dp"
+            android:padding="6dp"
+            android:src="@drawable/ic_backspace_grey600_24dp"
+            android:background="?selectableItemBackgroundBorderless"
+            android:visibility="invisible"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/media_keyboard_provider_tabs"
+            app:layout_constraintBottom_toBottomOf="@id/media_keyboard_provider_tabs"
+            tools:visibility="visible"/>
+
+        <org.thoughtcrime.securesms.components.ControllableViewPager
+            android:id="@+id/media_keyboard_pager"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:visibility="visible"
+            app:layout_constraintTop_toBottomOf="@id/media_keyboard_provider_tabs"
+            app:layout_constraintBottom_toTopOf="@id/media_keyboard_tabs"/>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:background="?emoji_tab_strip_background"
+            app:layout_constraintBottom_toBottomOf="@id/media_keyboard_tabs"
+            app:layout_constraintTop_toTopOf="@+id/media_keyboard_tabs" />
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/media_keyboard_tabs"
+            android:layout_width="0dp"
+            android:layout_height="40dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/media_keyboard_add"
+            tools:layout_height="40dp"/>
+
+        <org.thoughtcrime.securesms.components.RepeatableImageKey
+            android:id="@+id/media_keyboard_backspace_backup"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="6dp"
+            android:padding="6dp"
+            android:src="@drawable/ic_backspace_grey600_24dp"
+            android:background="?selectableItemBackgroundBorderless"
+            android:visibility="invisible"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/media_keyboard_tabs"
+            app:layout_constraintBottom_toBottomOf="@id/media_keyboard_tabs"
+            tools:visibility="visible"/>
+
+        <ImageView
+            android:id="@+id/media_keyboard_add"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="12dp"
+            android:scaleType="fitCenter"
+            android:tint="?media_keyboard_button_color"
+            android:visibility="gone"
+            android:background="?selectableItemBackground"
+            app:srcCompat="@drawable/ic_plus_24"
+            app:layout_constraintBottom_toBottomOf="@id/media_keyboard_tabs"
+            app:layout_constraintTop_toTopOf="@id/media_keyboard_tabs"
+            app:layout_constraintEnd_toStartOf="@id/media_keyboard_backspace_backup"
+            tools:visibility="visible"/>
+
+    </android.support.constraint.ConstraintLayout>
+
+</merge>
\ 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 000000000..a80ee8cb6
--- /dev/null
+++ b/res/layout/media_keyboard_bottom_tab_item.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:background="?selectableItemBackground"
+    android:animateLayoutChanges="true">
+
+    <View
+        android:id="@+id/media_keyboard_bottom_tab_indicator"
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        android:background="?emoji_tab_indicator"/>
+
+    <ImageView
+        android:id="@+id/media_keyboard_bottom_tab_image"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:padding="6dp"/>
+
+</LinearLayout>
+
diff --git a/res/layout/microphone_recorder_view.xml b/res/layout/microphone_recorder_view.xml
index 986bed2db..ace424f17 100644
--- a/res/layout/microphone_recorder_view.xml
+++ b/res/layout/microphone_recorder_view.xml
@@ -6,14 +6,15 @@
 
     <ImageButton
         android:id="@+id/quick_audio_toggle"
-        android:layout_width="wrap_content"
+        android:layout_width="24dp"
         android:layout_height="match_parent"
         android:layout_gravity="center_vertical"
         android:layout_marginEnd="2dp"
         android:background="@null"
         android:contentDescription="@string/conversation_activity__quick_attachment_drawer_record_and_send_audio_description"
-        android:padding="6dp"
-        android:src="?quick_mic_icon" />
+        android:scaleType="fitCenter"
+        android:tint="?compose_icon_tint"
+        app:srcCompat="@drawable/ic_mic_filled_24" />
 
     <LinearLayout
         android:id="@+id/lock_drop_target"
@@ -53,11 +54,12 @@
         android:layout_height="74dp"
         android:layout_marginStart="-18dp"
         android:layout_marginTop="-18dp"
+        android:padding="18dp"
         android:background="@drawable/circle_tintable"
         android:clickable="false"
-        android:scaleType="center"
-        android:src="@drawable/ic_mic_white_48dp"
         android:visibility="gone"
+        android:tint="@color/core_white"
+        app:srcCompat="@drawable/ic_mic_filled_24"
         tools:ignore="ContentDescription"
         tools:visibility="visible" />
 </merge>
diff --git a/res/layout/profile_create_activity.xml b/res/layout/profile_create_activity.xml
index fbcc588fc..c9b105c59 100644
--- a/res/layout/profile_create_activity.xml
+++ b/res/layout/profile_create_activity.xml
@@ -168,7 +168,7 @@
             android:text="@string/profile_create_activity__set_later"
             android:textColor="@color/gray50" />
 
-        <org.thoughtcrime.securesms.components.emoji.EmojiDrawer
+        <org.thoughtcrime.securesms.components.emoji.MediaKeyboard
             android:id="@+id/emoji_drawer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/res/layout/recording_layout.xml b/res/layout/recording_layout.xml
index c2a8efa0c..0082e30f9 100644
--- a/res/layout/recording_layout.xml
+++ b/res/layout/recording_layout.xml
@@ -17,9 +17,9 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="14dp"
         android:importantForAccessibility="no"
-        android:src="?quick_mic_icon"
         android:tint="@color/red_500"
         android:visibility="invisible"
+        app:srcCompat="@drawable/ic_mic_filled_24"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/res/layout/scribble_fragment_emojidrawer_stub.xml b/res/layout/scribble_fragment_emojidrawer_stub.xml
index e49b08bfd..181b7e49a 100644
--- a/res/layout/scribble_fragment_emojidrawer_stub.xml
+++ b/res/layout/scribble_fragment_emojidrawer_stub.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.components.emoji.EmojiDrawer
+<org.thoughtcrime.securesms.components.emoji.MediaKeyboard
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/emoji_drawer"
         android:layout_width="match_parent"
diff --git a/res/layout/scribble_select_sticker_activity.xml b/res/layout/scribble_select_sticker_activity.xml
index 3e0dd01d4..b2e976450 100644
--- a/res/layout/scribble_select_sticker_activity.xml
+++ b/res/layout/scribble_select_sticker_activity.xml
@@ -6,14 +6,14 @@
               android:orientation="vertical">
 
     <android.support.design.widget.TabLayout
-            android:id="@+id/tabs"
+            android:id="@+id/camera_sticker_tabs"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:tabBackground="@color/core_grey_90"
             app:tabMode="fixed"/>
 
     <android.support.v4.view.ViewPager
-            android:id="@+id/pager"
+            android:id="@+id/camera_sticker_pager"
             android:layout_width="match_parent"
             android:layout_height="0px"
             android:layout_weight="1" />
diff --git a/res/layout/scribble_select_sticker_fragment.xml b/res/layout/scribble_select_sticker_fragment.xml
index 805a3bc80..d8ffa275a 100644
--- a/res/layout/scribble_select_sticker_fragment.xml
+++ b/res/layout/scribble_select_sticker_fragment.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v7.widget.RecyclerView
-        android:id="@+id/stickers_recycler_view"
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+    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 000000000..d0658ef8c
--- /dev/null
+++ b/res/layout/sticker_keyboard_icon_dark.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginEnd="@dimen/media_keyboard_provider_icon_margin"
+    android:padding="@dimen/media_keyboard_provider_icon_padding">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:srcCompat="@drawable/ic_sticker_filled" />
+
+</FrameLayout>
\ 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 000000000..42a93ba98
--- /dev/null
+++ b/res/layout/sticker_keyboard_icon_dark_selected.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginEnd="@dimen/media_keyboard_provider_icon_margin"
+    android:padding="@dimen/media_keyboard_provider_icon_padding"
+    android:background="@drawable/media_keyboard_selected_background_dark">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:srcCompat="@drawable/ic_sticker_filled" />
+
+</FrameLayout>
\ 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 000000000..5edaeb5b5
--- /dev/null
+++ b/res/layout/sticker_keyboard_icon_light.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginEnd="@dimen/media_keyboard_provider_icon_margin"
+    android:padding="@dimen/media_keyboard_provider_icon_padding">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:srcCompat="@drawable/ic_sticker_outline" />
+
+</FrameLayout>
\ 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 000000000..2fe150781
--- /dev/null
+++ b/res/layout/sticker_keyboard_icon_light_selected.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginEnd="@dimen/media_keyboard_provider_icon_margin"
+    android:padding="@dimen/media_keyboard_provider_icon_padding"
+    android:background="@drawable/media_keyboard_selected_background_light">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:srcCompat="@drawable/ic_sticker_outline" />
+
+</FrameLayout>
\ 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 000000000..e64252d4d
--- /dev/null
+++ b/res/layout/sticker_keyboard_page.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.RecyclerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/sticker_keyboard_list"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingStart="4dp"
+    android:paddingEnd="4dp"/>
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 000000000..cb56ced74
--- /dev/null
+++ b/res/layout/sticker_keyboard_page_list_item.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/sticker_keyboard_page_image"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="4dp">
+
+</ImageView>
\ 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 000000000..72c5068f3
--- /dev/null
+++ b/res/layout/sticker_management_activity.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/sticker_management_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingBottom="16dp"/>
+
+</LinearLayout>
\ 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 000000000..efb51797b
--- /dev/null
+++ b/res/layout/sticker_management_empty_item.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="64dp"
+    android:layout_marginStart="@dimen/sticker_management_horizontal_margin"
+    android:layout_marginEnd="@dimen/sticker_management_horizontal_margin">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:src="@drawable/sticker_management_empty_background"
+        android:tint="?sticker_management_empty_background_color"/>
+    
+    <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+        android:id="@+id/sticker_management_empty_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:textSize="13sp"
+        style="@style/Signal.Text.Caption"
+        tools:text="@string/StickerManagementAdapter_no_stickers_installed"/>
+
+    <!-- TODO: THEME!! -->
+
+</FrameLayout>
diff --git a/res/layout/sticker_management_header_item.xml b/res/layout/sticker_management_header_item.xml
new file mode 100644
index 000000000..8971080e1
--- /dev/null
+++ b/res/layout/sticker_management_header_item.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.thoughtcrime.securesms.components.emoji.EmojiTextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/sticker_management_header"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="@dimen/sticker_management_horizontal_margin"
+    android:layout_marginEnd="@dimen/sticker_management_horizontal_margin"
+    android:layout_marginTop="16dp"
+    android:layout_marginBottom="24dp"
+    style="@style/Signal.Text.Preview"
+    android:fontFamily="sans-serif-medium"
+    tools:text="@string/StickerManagementAdapter_installed_stickers"/>
diff --git a/res/layout/sticker_management_sticker_item.xml b/res/layout/sticker_management_sticker_item.xml
new file mode 100644
index 000000000..b766dfef4
--- /dev/null
+++ b/res/layout/sticker_management_sticker_item.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="8dp"
+    android:paddingStart="@dimen/sticker_management_horizontal_margin"
+    android:paddingEnd="@dimen/sticker_management_horizontal_margin"
+    android:background="?selectableItemBackground">
+
+    <ImageView
+        android:id="@+id/sticker_management_cover"
+        android:layout_width="64dp"
+        android:layout_height="64dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
+    <LinearLayout
+        android:id="@+id/sticker_management_text_container"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="4dp"
+        android:orientation="vertical"
+        app:layout_constraintTop_toTopOf="@id/sticker_management_cover"
+        app:layout_constraintBottom_toBottomOf="@id/sticker_management_cover"
+        app:layout_constraintStart_toEndOf="@id/sticker_management_cover"
+        app:layout_constraintEnd_toStartOf="@id/sticker_management_share_button">
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center_vertical">
+
+            <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+                android:id="@+id/sticker_management_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Signal.Text.Body"
+                android:maxLines="2"
+                android:ellipsize="end"
+                tools:text="Spider-Man"/>
+
+            <ImageView
+                android:id="@+id/sticker_management_blessed_badge"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="2dp"
+                android:layout_marginTop="1dp"
+                android:src="@drawable/ic_check_circle_white_18dp"
+                android:tint="@color/core_blue"/>
+
+            <Space
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"/>
+
+        </LinearLayout>
+
+        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+            android:id="@+id/sticker_management_author"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/Signal.Text.Body"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:textColor="@color/core_grey_60"
+            tools:text="Peter Parker"/>
+
+    </LinearLayout>
+
+    <View
+        android:id="@+id/sticker_management_share_button"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginEnd="4dp"
+        android:background="?sticker_management_icon"
+        app:layout_constraintEnd_toStartOf="@id/sticker_management_action_button"
+        app:layout_constraintTop_toTopOf="@id/sticker_management_text_container"
+        app:layout_constraintBottom_toBottomOf="@id/sticker_management_text_container" />
+
+    <ImageView
+        android:id="@+id/sticker_management_share_button_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:tint="?sticker_management_action_button_color"
+        app:srcCompat="@drawable/ic_forward_outline"
+        app:layout_constraintTop_toTopOf="@id/sticker_management_share_button"
+        app:layout_constraintBottom_toBottomOf="@id/sticker_management_share_button"
+        app:layout_constraintStart_toStartOf="@id/sticker_management_share_button"
+        app:layout_constraintEnd_toEndOf="@id/sticker_management_share_button"/>
+
+    <View
+        android:id="@+id/sticker_management_action_button"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:background="?sticker_management_icon"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/sticker_management_text_container"
+        app:layout_constraintBottom_toBottomOf="@id/sticker_management_text_container" />
+
+    <ImageView
+        android:id="@+id/sticker_management_action_button_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:tint="?sticker_management_action_button_color"
+        tools:src="@drawable/ic_arrow_down"
+        app:layout_constraintTop_toTopOf="@id/sticker_management_action_button"
+        app:layout_constraintBottom_toBottomOf="@id/sticker_management_action_button"
+        app:layout_constraintStart_toStartOf="@id/sticker_management_action_button"
+        app:layout_constraintEnd_toEndOf="@id/sticker_management_action_button"/>
+
+    <View
+        android:id="@+id/sticker_management_divider"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:background="?sticker_management_divider_color"
+        android:layout_marginTop="8dp"
+        app:layout_constraintStart_toStartOf="@id/sticker_management_text_container"
+        app:layout_constraintTop_toBottomOf="@id/sticker_management_cover"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
+</android.support.constraint.ConstraintLayout>
diff --git a/res/layout/sticker_preview_activity.xml b/res/layout/sticker_preview_activity.xml
new file mode 100644
index 000000000..cbf165c12
--- /dev/null
+++ b/res/layout/sticker_preview_activity.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/sticker_install_toolbar"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:background="?sticker_preview_toolbar_background"
+        android:elevation="4dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/sticker_install_cover"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_marginStart="16dp"
+        app:layout_constraintTop_toTopOf="@id/sticker_install_title"
+        app:layout_constraintBottom_toBottomOf="@id/sticker_install_author"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:src="@mipmap/ic_person_shortcut"/>
+
+    <TextView
+        android:id="@+id/sticker_install_title"
+        style="@style/Signal.Text.Headline"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="8dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        app:layout_constraintEnd_toStartOf="@id/sticker_install_share_button"
+        app:layout_constraintStart_toEndOf="@id/sticker_install_cover"
+        app:layout_constraintTop_toBottomOf="@id/sticker_install_toolbar"
+        tools:text="Spider-Man" />
+
+    <TextView
+        android:id="@+id/sticker_install_author"
+        style="@style/Signal.Text.Caption"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textSize="16dp"
+        app:layout_constraintEnd_toEndOf="@id/sticker_install_title"
+        app:layout_constraintStart_toStartOf="@id/sticker_install_title"
+        app:layout_constraintTop_toBottomOf="@id/sticker_install_title"
+        tools:text="Peter Parker" />
+
+    <View
+        android:id="@+id/sticker_install_share_button"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginEnd="16dp"
+        android:background="?sticker_management_icon"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/sticker_install_title"
+        app:layout_constraintBottom_toBottomOf="@id/sticker_install_title"
+        tools:visibility="visible"/>
+
+    <ImageView
+        android:id="@+id/sticker_install_share_button_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:tint="@color/core_grey_90"
+        android:visibility="gone"
+        app:srcCompat="@drawable/ic_forward_outline"
+        app:layout_constraintTop_toTopOf="@id/sticker_install_share_button"
+        app:layout_constraintBottom_toBottomOf="@id/sticker_install_share_button"
+        app:layout_constraintStart_toStartOf="@id/sticker_install_share_button"
+        app:layout_constraintEnd_toEndOf="@id/sticker_install_share_button"
+        tools:visibility="visible"/>
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/sticker_install_list"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginBottom="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintBottom_toTopOf="@id/sticker_install_bottom_barrier"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/sticker_install_author" />
+
+    <com.dd.CircularProgressButton
+        android:id="@+id/sticker_install_button"
+        android:layout_width="0dp"
+        android:layout_height="50dp"
+        android:layout_marginBottom="16dp"
+        android:elevation="4dp"
+        android:textColor="@color/white"
+        android:visibility="gone"
+        app:cpb_colorIndicator="@color/white"
+        app:cpb_colorProgress="@color/StickerPreviewActivity_install_button_color"
+        app:cpb_cornerRadius="4dp"
+        app:cpb_selectorIdle="@drawable/progress_button_state"
+        app:cpb_textIdle="@string/StickerPackPreviewActivity_install"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@id/sticker_install_list"
+        app:layout_constraintStart_toStartOf="@id/sticker_install_list" />
+
+    <com.dd.CircularProgressButton
+        android:id="@+id/sticker_install_remove_button"
+        android:layout_width="0dp"
+        android:layout_height="50dp"
+        android:layout_marginBottom="16dp"
+        android:elevation="4dp"
+        android:textColor="@color/white"
+        android:visibility="gone"
+        app:cpb_colorIndicator="@color/white"
+        app:cpb_colorProgress="@color/StickerPreviewActivity_remove_button_color"
+        app:cpb_cornerRadius="4dp"
+        app:cpb_selectorIdle="@drawable/remove_button_state"
+        app:cpb_textIdle="@string/StickerPackPreviewActivity_remove"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@id/sticker_install_list"
+        app:layout_constraintStart_toStartOf="@id/sticker_install_list" />
+
+    <android.support.constraint.Barrier
+        android:id="@+id/sticker_install_bottom_barrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="top"
+        app:constraint_referenced_ids="sticker_install_remove_button,sticker_install_button"/>
+
+</android.support.constraint.ConstraintLayout>
\ 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 000000000..464d98a8f
--- /dev/null
+++ b/res/layout/sticker_preview_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/sticker_install_item_image"
+    android:layout_width="@dimen/sticker_preview_sticker_size"
+    android:layout_height="@dimen/sticker_preview_sticker_size"/>
diff --git a/res/layout/sticker_preview_popup.xml b/res/layout/sticker_preview_popup.xml
new file mode 100644
index 000000000..92ce17a52
--- /dev/null
+++ b/res/layout/sticker_preview_popup.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?sticker_popup_background">
+
+    <ImageView
+        android:id="@+id/sticker_popup_image"
+        android:layout_width="200dp"
+        android:layout_height="200dp"
+        android:layout_gravity="center"/>
+
+</FrameLayout>
\ 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 000000000..b4fe548cf
--- /dev/null
+++ b/res/layout/sticker_suggestion_list_item.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:background="?selectableItemBackground">
+
+    <ImageView
+        android:id="@+id/sticker_suggestion_item_image"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:paddingStart="5dp"
+        android:paddingEnd="5dp"
+        android:layout_gravity="center"/>
+
+</FrameLayout>
\ 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 000000000..3dfd2b289
--- /dev/null
+++ b/res/layout/sticker_view.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:parentTag="org.thoughtcrime.securesms.components.StickerView">
+
+    <View
+        android:id="@+id/sticker_missing_shade"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?sticker_view_missing_background"
+        android:visibility="gone"
+        tools:visibility="visible"/>
+
+    <org.thoughtcrime.securesms.components.ThumbnailView
+        android:id="@+id/sticker_thumbnail"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:thumbnail_radius="0dp"/>
+
+</merge>
diff --git a/res/layout/thumbnail_view.xml b/res/layout/thumbnail_view.xml
index 53042951d..91a4b9c5c 100644
--- a/res/layout/thumbnail_view.xml
+++ b/res/layout/thumbnail_view.xml
@@ -45,8 +45,8 @@
 
     <ViewStub
         android:id="@+id/transfer_controls_stub"
-        android:layout_width="70dp"
-        android:layout_height="70dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout="@layout/transfer_controls_stub" />
 
diff --git a/res/layout/tooltip.xml b/res/layout/tooltip.xml
new file mode 100644
index 000000000..db4122b4a
--- /dev/null
+++ b/res/layout/tooltip.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:clipChildren="false"
+    android:clipToPadding="false">
+
+    <ImageView
+        android:id="@+id/tooltip_arrow_start"
+        android:layout_width="8dp"
+        android:layout_height="16dp"
+        android:visibility="gone"
+        android:tint="?tooltip_default_color"
+        android:scaleType="fitXY"
+        android:elevation="6dp"
+        app:srcCompat="@drawable/ic_triangle_left"
+        tools:visibility="visible"
+        tools:tint="@color/core_blue"/>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:clipChildren="false"
+        android:clipToPadding="false">
+
+        <ImageView
+            android:id="@+id/tooltip_arrow_top"
+            android:layout_width="16dp"
+            android:layout_height="8dp"
+            android:visibility="gone"
+            android:tint="?tooltip_default_color"
+            android:scaleType="fitXY"
+            android:elevation="6dp"
+            app:srcCompat="@drawable/ic_triangle_up"
+            tools:visibility="visible"
+            tools:tint="@color/core_blue"/>
+
+        <LinearLayout
+            android:id="@+id/tooltip_bubble"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingTop="6dp"
+            android:paddingBottom="6dp"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:background="@drawable/tooltip_background"
+            android:gravity="center_vertical"
+            android:elevation="6dp"
+            android:clipChildren="false"
+            android:clipToPadding="false">
+
+            <ImageView
+                android:id="@+id/tooltip_icon"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_marginEnd="2dp"
+                android:visibility="gone"
+                tools:src="@drawable/ic_person_white_24dp"
+                tools:tint="@color/core_blue"
+                tools:visibility="visible"/>
+
+            <TextView
+                android:id="@+id/tooltip_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Signal.Text.Body"
+                tools:text="It is my gift. It is my curse." />
+
+        </LinearLayout>
+
+        <ImageView
+            android:id="@+id/tooltip_arrow_bottom"
+            android:layout_width="16dp"
+            android:layout_height="8dp"
+            android:visibility="gone"
+            android:tint="?tooltip_default_color"
+            android:scaleType="fitXY"
+            android:elevation="6dp"
+            app:srcCompat="@drawable/ic_triangle_down"
+            tools:visibility="visible"
+            tools:tint="@color/core_blue"/>
+
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/tooltip_arrow_end"
+        android:layout_width="8dp"
+        android:layout_height="16dp"
+        android:visibility="gone"
+        android:tint="?tooltip_default_color"
+        android:scaleType="fitXY"
+        android:elevation="6dp"
+        app:srcCompat="@drawable/ic_triangle_right"
+        tools:visibility="visible"
+        tools:tint="@color/core_blue"/>
+
+</LinearLayout>
diff --git a/res/layout/transfer_controls_stub.xml b/res/layout/transfer_controls_stub.xml
index 63c6545c1..84a998c0e 100644
--- a/res/layout/transfer_controls_stub.xml
+++ b/res/layout/transfer_controls_stub.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.thoughtcrime.securesms.components.TransferControlView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/transfer_controls"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+    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 2890f62a0..7a54d547b 100644
--- a/res/layout/transfer_controls_view.xml
+++ b/res/layout/transfer_controls_view.xml
@@ -1,40 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:app="http://schemas.android.com/apk/res-auto">
+<merge
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:parentTag="org.thoughtcrime.securesms.components.TransferControlView">
 
     <com.pnikosis.materialishprogress.ProgressWheel
-            android:id="@+id/progress_wheel"
-            android:layout_width="@dimen/transfer_controls_contracted_width"
-            android:layout_height="@dimen/transfer_controls_contracted_width"
-            android:visibility="gone"
-            android:layout_gravity="center"
-            app:matProg_barColor="@color/white"
-            app:matProg_linearProgress="true"
-            app:matProg_spinSpeed="0.333" />
+        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"/>
 
     <LinearLayout
         android:id="@+id/download_details"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
         android:layout_gravity="center"
+        android:padding="4dp"
         android:gravity="center"
-        android:visibility="gone">
+        android:orientation="horizontal"
+        android:visibility="gone"
+        tools:visibility="visible">
 
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_file_download_white_36dp"/>
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:tint="@color/core_grey_60"
+            app:srcCompat="@drawable/ic_arrow_down_circle_filled" />
 
-        <TextView android:id="@+id/download_details_text"
+        <TextView
+            android:id="@+id/download_details_text"
+            style="@style/Signal.Text.Preview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="15dp"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="4dp"
+            android:fontFamily="sans-serif-medium"
             android:gravity="center"
             android:longClickable="false"
-            android:textColor="?conversation_item_received_text_primary_color"
-            android:textSize="16dp"
-            android:textStyle="bold" />
+            android:textColor="@color/black" />
 
     </LinearLayout>
 
diff --git a/res/values-v21/themes.xml b/res/values-v21/themes.xml
new file mode 100644
index 000000000..752864db1
--- /dev/null
+++ b/res/values-v21/themes.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TextSecure.DarkTheme" parent="@style/TextSecure.BaseDarkTheme">
+        <item name="android:navigationBarColor">@color/core_grey_90</item>
+    </style>
+
+    <style name="TextSecure.DarkNoActionBar" parent="@style/TextSecure.BaseDarkNoActionBar">
+        <item name="android:navigationBarColor">@color/core_grey_90</item>
+        <item name="android:colorControlActivated">@color/signal_primary_dark</item>
+    </style>
+
+</resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 836d8a3c9..74468f35b 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -38,6 +38,7 @@
     <attr name="conversation_transport_push_indicator" format="reference"/>
     <attr name="conversation_transport_popup_background" format="reference"/>
     <attr name="conversation_emoji_toggle" format="reference"/>
+    <attr name="conversation_sticker_toggle" format="reference"/>
     <attr name="conversation_keyboard_toggle" format="reference"/>
     <attr name="conversation_attach_camera" format="reference"/>
     <attr name="conversation_attach_image" format="reference"/>
@@ -47,12 +48,15 @@
     <attr name="conversation_attach" format="reference"/>
     <attr name="conversation_number_picker_text_color_normal" format="reference|color"/>
     <attr name="conversation_number_picker_text_color_selected" format="reference|color"/>
+    <attr name="conversation_sticker_footer_text_color" format="reference|color"/>
+    <attr name="conversation_sticker_footer_icon_color" format="reference|color"/>
+    <attr name="conversation_sticker_author_color" format="reference|color"/>
 
     <attr name="emoji_tab_strip_background" format="color" />
     <attr name="emoji_tab_indicator" format="color" />
     <attr name="emoji_tab_underline" format="color" />
     <attr name="emoji_tab_seperator" format="color" />
-    <attr name="emoji_background" format="color" />
+    <attr name="emoji_drawer_background" format="color" />
     <attr name="emoji_text_color" format="color" />
 
     <attr name="emoji_category_recent" format="reference"/>
@@ -66,9 +70,12 @@
     <attr name="emoji_category_flags" format="reference"/>
     <attr name="emoji_category_emoticons" format="reference"/>
     <attr name="emoji_variation_selector_background" format="reference|color" />
+
     <attr name="quick_camera_icon" format="reference"/>
     <attr name="quick_mic_icon" format="reference"/>
 
+    <attr name="compose_icon_tint" />
+
     <attr name="conversation_item_background" format="reference"/>
     <attr name="conversation_item_bubble_background" format="reference|color"/>
     <attr name="conversation_item_sent_text_primary_color" format="reference|color"/>
@@ -117,6 +124,8 @@
 
     <attr name="reminder_header_background" format="color"/>
 
+    <attr name="media_keyboard_button_color" format="color" />
+
     <attr name="menu_new_conversation_icon" format="reference" />
     <attr name="menu_search_icon" format="reference" />
     <attr name="menu_call_icon" format="reference" />
@@ -166,6 +175,17 @@
     <attr name="search_toolbar_background" format="color"/>
     <attr name="search_background" format="color"/>
 
+    <attr name="sticker_management_icon" format="reference" />
+    <attr name="sticker_management_divider_color" format="color" />
+    <attr name="sticker_management_empty_background_color" format="color" />
+    <attr name="sticker_management_action_button_color" format="color" />
+    <attr name="sticker_popup_background" format="color" />
+    <attr name="sticker_preview_toolbar_background" format="color" />
+    <attr name="sticker_preview_status_bar_color" format="color" />
+    <attr name="sticker_view_missing_background" format="reference|color" />
+
+    <attr name="tooltip_default_color" format="reference|color" />
+
     <attr name="contact_list_divider" format="reference"/>
 
     <attr name="login_top_background" format="color"/>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index beb118a01..e9e32991c 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -62,6 +62,9 @@
     <color name="import_export_touch_highlight_light">#400099cc</color>
     <color name="import_export_touch_highlight_dark">#40ffffff</color>
 
+    <color name="StickerPreviewActivity_remove_button_color">@color/conversation_crimson</color>
+    <color name="StickerPreviewActivity_install_button_color">@color/core_blue</color>
+
     <color name="sticker_selected_color">#99ffffff</color>
     <color name="transparent">#00FFFFFF</color>
     <color name="transparent_black">#00000000</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index f1b494bd8..0ddbef44e 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -46,10 +46,14 @@
     <dimen name="media_bubble_max_width">240dp</dimen>
     <dimen name="media_bubble_min_height">100dp</dimen>
     <dimen name="media_bubble_max_height">320dp</dimen>
+    <dimen name="media_bubble_sticker_dimens">128dp</dimen>
 
     <dimen name="media_picker_folder_width">175dp</dimen>
     <dimen name="media_picker_item_width">85dp</dimen>
 
+    <dimen name="media_keyboard_provider_icon_padding">5dp</dimen>
+    <dimen name="media_keyboard_provider_icon_margin">4dp</dimen>
+
     <dimen name="mediasend_progress_dialog_size">120dp</dimen>
 
     <dimen name="thumbnail_default_radius">4dp</dimen>
@@ -72,6 +76,15 @@
 
     <dimen name="quick_camera_shutter_ring_size">52dp</dimen>
 
+    <dimen name="sticker_page_item_padding">8dp</dimen>
+    <dimen name="sticker_page_item_divisor">88dp</dimen>
+    <dimen name="sticker_page_item_multiplier">8dp</dimen>
+    <dimen name="sticker_preview_sticker_size">96dp</dimen>
+
+    <dimen name="sticker_management_horizontal_margin">16dp</dimen>
+
+    <dimen name="tooltip_popup_margin">8dp</dimen>
+
     <dimen name="transfer_controls_expanded_width">150dp</dimen>
     <dimen name="transfer_controls_contracted_width">70dp</dimen>
     <dimen name="conversation_list_fragment_archive_padding">16dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4ac56cf60..aa74e59bc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Loki Messenger</string>
+    <string name="install_url" translatable="false">https://signal.org/install</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="delete">Delete</string>
@@ -91,6 +92,7 @@
 
     <!-- CommunicationActions -->
     <string name="CommunicationActions_no_browser_found">No web browser found.</string>
+    <string name="CommunicationActions_a_cellular_call_is_already_in_progress">A cellular call is already in progress.</string>
 
     <!-- ConfirmIdentityDialog -->
     <string name="ConfirmIdentityDialog_your_safety_number_with_s_has_changed">Your safety number with %1$s has changed. This could either mean that someone is trying to intercept your communication, or that %2$s simply reinstalled Signal.</string>
@@ -158,7 +160,6 @@
     <string name="ConversationActivity_transport_insecure_mms">Insecure MMS</string>
     <string name="ConversationActivity_transport_signal">Loki Messenger</string>
     <string name="ConversationActivity_lets_switch_to_signal">Let\'s switch to Signal %1$s</string>
-    <string name="ConversationActivity_lets_use_this_to_chat">Let\'s use this to chat: %1$s</string>
     <string name="ConversationActivity_error_leaving_group">Error leaving group</string>
     <string name="ConversationActivity_specify_recipient">Please choose a contact</string>
     <string name="ConversationActivity_unblock_this_contact_question">Unblock this contact?</string>
@@ -186,6 +187,9 @@
     <string name="ConversationActivity_search_position">%1$d of %2$d</string>
     <string name="ConversationActivity_no_results">No results</string>
 
+    <string name="ConversationActivity_sticker_pack_installed">Sticker pack installed</string>
+    <string name="ConversationActivity_new_say_it_with_stickers">New! Say it with stickers</string>
+
     <!-- ConversationAdapter -->
     <plurals name="ConversationAdapter_n_unread_messages">
         <item quantity="one">%d unread message</item>
@@ -642,6 +646,7 @@
 
     <!-- Slide -->
     <string name="Slide_image">Image</string>
+    <string name="Slide_sticker">Sticker</string>
     <string name="Slide_audio">Audio</string>
     <string name="Slide_video">Video</string>
 
@@ -657,6 +662,26 @@
     <string name="SmsMessageRecord_secure_session_reset_s">%s reset the secure session.</string>
     <string name="SmsMessageRecord_duplicate_message">Duplicate message.</string>
 
+    <!-- StickerManagementActivity -->
+    <string name="StickerManagementActivity_stickers">Stickers</string>
+
+    <!-- StickerManagementAdapter -->
+    <string name="StickerManagementAdapter_installed_stickers">Installed Stickers</string>
+    <string name="StickerManagementAdapter_stickers_you_received">Stickers You Received</string>
+    <string name="StickerManagementAdapter_signal_artist_series">Signal Artist Series</string>
+    <string name="StickerManagementAdapter_no_stickers_installed">No stickers installed</string>
+    <string name="StickerManagementAdapter_stickers_from_incoming_messages_will_appear_here">Stickers from incoming messages will appear here</string>
+    <string name="StickerManagementAdapter_untitled">Untitled</string>
+    <string name="StickerManagementAdapter_unknown">Unknown</string>
+
+    <!-- StickerPackPreviewActivity -->
+    <string name="StickerPackPreviewActivity_untitled">Untitled</string>
+    <string name="StickerPackPreviewActivity_unknown">Unknown</string>
+    <string name="StickerPackPreviewActivity_install">Install</string>
+    <string name="StickerPackPreviewActivity_remove">Remove</string>
+    <string name="StickerPackPreviewActivity_stickers">Stickers</string>
+    <string name="StickerPackPreviewActivity_failed_to_load_sticker_pack">Failed to load sticker pack</string>
+
     <!-- ThreadRecord -->
     <string name="ThreadRecord_group_updated">Group updated</string>
     <string name="ThreadRecord_left_the_group">Left the group</string>
@@ -751,6 +776,7 @@
     <string name="MessageNotifier_mark_all_as_read">Mark all as read</string>
     <string name="MessageNotifier_mark_read">Mark read</string>
     <string name="MessageNotifier_media_message">Media message</string>
+    <string name="MessageNotifier_sticker">Sticker</string>
     <string name="MessageNotifier_reply">Reply</string>
     <string name="MessageNotifier_signal_message">Signal Message</string>
     <string name="MessageNotifier_unsecured_sms">Unsecured SMS</string>
@@ -901,6 +927,7 @@
     <string name="QuoteView_audio">Audio</string>
     <string name="QuoteView_video">Video</string>
     <string name="QuoteView_photo">Photo</string>
+    <string name="QuoteView_sticker">Sticker</string>
     <string name="QuoteView_document">Document</string>
     <string name="QuoteView_you">You</string>
     <string name="QuoteView_original_missing">Original message not found</string>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index a456ad1cd..155b8d206 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
 
     <style name="TextSecure.LightNoActionBar" parent="@style/TextSecure.LightTheme">
         <item name="windowActionBar">false</item>
@@ -25,7 +25,11 @@
         <item name="media_overview_document_secondary">@color/core_grey_60</item>
     </style>
 
-    <style name="TextSecure.DarkNoActionBar" parent="@style/TextSecure.DarkTheme">
+    <style name="TextSecure.DarkNoActionBar" parent="@style/TextSecure.BaseDarkNoActionBar">
+        <!-- leave empty to allow overriding -->
+    </style>
+
+    <style name="TextSecure.BaseDarkNoActionBar" parent="@style/TextSecure.BaseDarkTheme">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="windowActionModeOverlay">true</item>
@@ -34,7 +38,6 @@
         <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="colorPrimary">@color/gray95</item>
         <item name="colorAccent">@color/signal_primary_dark</item>
-        <item name="android:colorControlActivated" tools:ignore="NewApi">@color/signal_primary_dark</item>
 
         <item name="recipient_preference_blocked">#d00000</item>
         <item name="contact_selection_label_text">#66eeeeee</item>
@@ -99,15 +102,20 @@
         <item name="android:windowExitAnimation">@anim/slide_to_top</item>
     </style>
 
+    <style name="StickerPopupAnimation" parent="@android:style/Animation">
+        <item name="android:windowEnterAnimation">@anim/fade_in</item>
+        <item name="android:windowExitAnimation">@anim/fade_out</item>
+    </style>
+
     <style name="TextSecure.LightTheme.Popup" parent="TextSecure.LightTheme">
         <item name="android:windowIsFloating">false</item>
         <item name="android:windowSoftInputMode">stateUnchanged</item>
         <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowActionModeOverlay" tools:targetApi="honeycomb">true</item>
+        <item name="android:windowActionModeOverlay">true</item>
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowFrame">@null</item>
         <item name="android:windowAnimationStyle">@style/PopupAnimation</item>
-        <item name="android:windowCloseOnTouchOutside" tools:targetApi="honeycomb">true</item>
+        <item name="android:windowCloseOnTouchOutside">true</item>
         <item name="android:backgroundDimEnabled">false</item>
     </style>
 
@@ -131,6 +139,8 @@
         <item name="attachment_document_icon_small">@drawable/ic_document_small_light</item>
         <item name="attachment_document_icon_large">@drawable/ic_document_large_light</item>
 
+        <item name="compose_icon_tint">@color/core_grey_60</item>
+
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background</item>
         <item name="conversation_list_item_contact_color">@color/core_grey_90</item>
         <item name="conversation_list_item_subject_color">@color/core_grey_60</item>
@@ -155,7 +165,8 @@
         <item name="conversation_transport_sms_indicator">@drawable/ic_send_sms_insecure</item>
         <item name="conversation_transport_push_indicator">@drawable/ic_send_push</item>
         <item name="conversation_transport_popup_background">@color/white</item>
-        <item name="conversation_emoji_toggle">@drawable/ic_mood_grey600_24dp</item>
+        <item name="conversation_emoji_toggle">@drawable/ic_emoji_filled_keyboard_light</item>
+        <item name="conversation_sticker_toggle">@drawable/ic_sticker_filled_keyboard_light</item>
         <item name="conversation_keyboard_toggle">@drawable/ic_keyboard_grey600_24dp</item>
         <item name="conversation_attach_camera">@drawable/ic_photo_camera_light</item>
         <item name="conversation_attach_image">@drawable/ic_image_light</item>
@@ -165,27 +176,31 @@
         <item name="conversation_attach">@drawable/ic_attach_grey600_24dp</item>
         <item name="conversation_number_picker_text_color_normal">@color/gray65</item>
         <item name="conversation_number_picker_text_color_selected">@color/black</item>
+        <item name="conversation_sticker_footer_text_color">@color/core_grey_60</item>
+        <item name="conversation_sticker_footer_icon_color">@color/core_grey_60</item>
+        <item name="conversation_sticker_author_color">@color/core_grey_95</item>
 
         <item name="contact_list_divider">@drawable/contact_list_divider_light</item>
 
         <item name="verification_background">@color/core_grey_05</item>
 
-        <item name="emoji_tab_strip_background">@color/gray12</item>
+        <item name="emoji_tab_strip_background">@color/core_grey_05</item>
         <item name="emoji_tab_indicator">#66555555</item>
         <item name="emoji_tab_underline">#44555555</item>
         <item name="emoji_tab_seperator">@color/gray20</item>
+        <item name="emoji_drawer_background">@color/core_grey_02</item>
         <item name="emoji_text_color">@color/black</item>
 
-        <item name="emoji_category_recent">@drawable/emoji_category_recent_light</item>
-        <item name="emoji_category_people">@drawable/emoji_category_people_light</item>
-        <item name="emoji_category_nature">@drawable/emoji_category_nature_light</item>
-        <item name="emoji_category_foods">@drawable/emoji_category_foods_light</item>
-        <item name="emoji_category_activity">@drawable/emoji_category_activity_light</item>
-        <item name="emoji_category_places">@drawable/emoji_category_places_light</item>
-        <item name="emoji_category_objects">@drawable/emoji_category_objects_light</item>
-        <item name="emoji_category_symbol">@drawable/emoji_category_symbol_light</item>
-        <item name="emoji_category_flags">@drawable/emoji_category_flags_light</item>
-        <item name="emoji_category_emoticons">@drawable/emoji_category_emoticons_light</item>
+        <item name="emoji_category_recent">@drawable/ic_recent_light_20</item>
+        <item name="emoji_category_people">@drawable/ic_emoji_people_light_20</item>
+        <item name="emoji_category_nature">@drawable/ic_emoji_animal_light_20</item>
+        <item name="emoji_category_foods">@drawable/ic_emoji_food_light_20</item>
+        <item name="emoji_category_activity">@drawable/ic_emoji_activity_light_20</item>
+        <item name="emoji_category_places">@drawable/ic_emoji_travel_light_20</item>
+        <item name="emoji_category_objects">@drawable/ic_emoji_object_light_20</item>
+        <item name="emoji_category_symbol">@drawable/ic_emoji_symbol_light_20</item>
+        <item name="emoji_category_flags">@drawable/ic_emoji_flag_light_20</item>
+        <item name="emoji_category_emoticons">@drawable/ic_emoji_emoticon_light_20</item>
         <item name="emoji_variation_selector_background">@drawable/emoji_variation_selector_background_light</item>
 
         <item name="conversation_item_bubble_background">@color/core_grey_05</item>
@@ -227,6 +242,8 @@
         <item name="linkpreview_secondary_text_color">@color/core_grey_60</item>
         <item name="linkpreview_divider_color">@color/core_grey_25</item>
 
+        <item name="media_keyboard_button_color">@color/core_grey_60</item>
+
         <item name="menu_new_conversation_icon">@drawable/ic_add_white_24dp</item>
         <item name="menu_group_icon">@drawable/ic_group_white_24dp</item>
         <item name="menu_search_icon">@drawable/ic_search_white_24dp</item>
@@ -251,6 +268,17 @@
 
         <item name="reminder_header_background">#ff1d85d7</item>
 
+        <item name="sticker_management_icon">@drawable/sticker_button_light</item>
+        <item name="sticker_management_divider_color">@color/core_grey_15</item>
+        <item name="sticker_management_empty_background_color">@color/core_grey_05</item>
+        <item name="sticker_management_action_button_color">@color/core_grey_90</item>
+        <item name="sticker_popup_background">@color/transparent_white_aa</item>
+        <item name="sticker_preview_toolbar_background">@color/core_white</item>
+        <item name="sticker_preview_status_bar_color">@color/core_grey_05</item>
+        <item name="sticker_view_missing_background">@drawable/sticker_missing_background_light</item>
+
+        <item name="tooltip_default_color">@color/core_white</item>
+
         <item name="pref_icon_tint">@color/textsecure_primary_dark</item>
 
         <item name="pref_divider">@drawable/preference_divider_light</item>
@@ -270,7 +298,11 @@
         <item name="android:statusBarColor">@color/black</item>
     </style>
 
-    <style name="TextSecure.DarkTheme" parent="@style/Theme.AppCompat">
+    <style name="TextSecure.DarkTheme" parent="@style/TextSecure.BaseDarkTheme">
+        <!-- leave empty to allow overriding -->
+    </style>
+
+    <style name="TextSecure.BaseDarkTheme" parent="@style/Theme.AppCompat">
         <item name="theme_type">dark</item>
         <item name="actionBarStyle">@style/TextSecure.DarkActionBar</item>
         <item name="actionBarTabBarStyle">@style/TextSecure.DarkActionBar.TabBar</item>
@@ -290,6 +322,8 @@
         <item name="attachment_document_icon_small">@drawable/ic_document_small_dark</item>
         <item name="attachment_document_icon_large">@drawable/ic_document_large_dark</item>
 
+        <item name="compose_icon_tint">@color/core_grey_25</item>
+
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background_dark</item>
         <item name="conversation_list_item_contact_color">#ffdddddd</item>
         <item name="conversation_list_item_subject_color">#ffdddddd</item>
@@ -348,7 +382,8 @@
         <item name="conversation_transport_sms_indicator">@drawable/ic_send_sms_insecure_dark</item>
         <item name="conversation_transport_push_indicator">@drawable/ic_send_push</item>
         <item name="conversation_transport_popup_background">@color/black</item>
-        <item name="conversation_emoji_toggle">@drawable/ic_mood_white_24dp</item>
+        <item name="conversation_emoji_toggle">@drawable/ic_emoji_filled_keyboard_dark</item>
+        <item name="conversation_sticker_toggle">@drawable/ic_sticker_filled_keyboard_dark</item>
         <item name="conversation_keyboard_toggle">@drawable/ic_keyboard_white_24dp</item>
         <item name="conversation_attach_camera">@drawable/ic_photo_camera_dark</item>
         <item name="conversation_attach_image">@drawable/ic_image_dark</item>
@@ -358,24 +393,27 @@
         <item name="conversation_attach">@drawable/ic_attach_white_24dp</item>
         <item name="conversation_number_picker_text_color_normal">@color/gray13</item>
         <item name="conversation_number_picker_text_color_selected">@color/white</item>
+        <item name="conversation_sticker_footer_text_color">@color/core_grey_25</item>
+        <item name="conversation_sticker_footer_icon_color">@color/core_grey_25</item>
+        <item name="conversation_sticker_author_color">@color/core_grey_05</item>
 
-        <item name="emoji_tab_strip_background">@color/gray95</item>
+        <item name="emoji_tab_strip_background">@color/core_grey_85</item>
         <item name="emoji_tab_indicator">@color/gray65</item>
         <item name="emoji_tab_underline">@color/gray78</item>
         <item name="emoji_tab_seperator">@color/gray70</item>
-        <item name="emoji_background">@color/black</item>
+        <item name="emoji_drawer_background">@color/core_grey_95</item>
         <item name="emoji_text_color">@color/white</item>
 
-        <item name="emoji_category_recent">@drawable/emoji_category_recent_dark</item>
-        <item name="emoji_category_people">@drawable/emoji_category_people_dark</item>
-        <item name="emoji_category_nature">@drawable/emoji_category_nature_dark</item>
-        <item name="emoji_category_foods">@drawable/emoji_category_foods_dark</item>
-        <item name="emoji_category_activity">@drawable/emoji_category_activity_dark</item>
-        <item name="emoji_category_places">@drawable/emoji_category_places_dark</item>
-        <item name="emoji_category_objects">@drawable/emoji_category_objects_dark</item>
-        <item name="emoji_category_symbol">@drawable/emoji_category_symbol_dark</item>
-        <item name="emoji_category_flags">@drawable/emoji_category_flags_dark</item>
-        <item name="emoji_category_emoticons">@drawable/emoji_category_emoticons_dark</item>
+        <item name="emoji_category_recent">@drawable/ic_recent_dark_20</item>
+        <item name="emoji_category_people">@drawable/ic_emoji_people_dark_20</item>
+        <item name="emoji_category_nature">@drawable/ic_emoji_animal_dark_20</item>
+        <item name="emoji_category_foods">@drawable/ic_emoji_food_dark_20</item>
+        <item name="emoji_category_activity">@drawable/ic_emoji_activity_dark_20</item>
+        <item name="emoji_category_places">@drawable/ic_emoji_travel_dark_20</item>
+        <item name="emoji_category_objects">@drawable/ic_emoji_object_dark_20</item>
+        <item name="emoji_category_symbol">@drawable/ic_emoji_symbol_dark_20</item>
+        <item name="emoji_category_flags">@drawable/ic_emoji_flag_dark_20</item>
+        <item name="emoji_category_emoticons">@drawable/ic_emoji_emoticon_dark_20</item>
         <item name="emoji_variation_selector_background">@drawable/emoji_variation_selector_background_dark</item>
 
         <item name="linkpreview_background_color">@color/core_grey_95</item>
@@ -386,6 +424,8 @@
         <item name="quick_camera_icon">@drawable/quick_camera_dark</item>
         <item name="quick_mic_icon">@drawable/ic_mic_white_24dp</item>
 
+        <item name="media_keyboard_button_color">@color/core_grey_25</item>
+
         <item name="menu_new_conversation_icon">@drawable/ic_add_white_24dp</item>
         <item name="menu_group_icon">@drawable/ic_group_white_24dp</item>
         <item name="menu_search_icon">@drawable/ic_search_white_24dp</item>
@@ -410,6 +450,17 @@
 
         <item name="reminder_header_background">@color/textsecure_primary_dark</item>
 
+        <item name="sticker_management_icon">@drawable/sticker_button_dark</item>
+        <item name="sticker_management_divider_color">@color/core_grey_75</item>
+        <item name="sticker_management_empty_background_color">@color/core_grey_85</item>
+        <item name="sticker_management_action_button_color">@color/core_grey_25</item>
+        <item name="sticker_popup_background">@color/transparent_black_90</item>
+        <item name="sticker_preview_toolbar_background">@color/core_grey_95</item>
+        <item name="sticker_preview_status_bar_color">@color/core_grey_85</item>
+        <item name="sticker_view_missing_background">@drawable/sticker_missing_background_dark</item>
+
+        <item name="tooltip_default_color">@color/core_grey_75</item>
+
         <item name="pref_icon_tint">#FFFFFF</item>
 
         <item name="pref_divider">@drawable/preference_divider_dark</item>
diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java
index a17bb52e6..834c0d522 100644
--- a/src/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/src/org/thoughtcrime/securesms/ApplicationContext.java
@@ -57,6 +57,7 @@ import org.thoughtcrime.securesms.logging.UncaughtExceptionLogger;
 import org.thoughtcrime.securesms.loki.BackgroundPollWorker;
 import org.thoughtcrime.securesms.loki.LokiAPIDatabase;
 import org.thoughtcrime.securesms.loki.LokiGroupChatPoller;
+import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
@@ -108,7 +109,7 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
   private ExpiringMessageManager  expiringMessageManager;
   private TypingStatusRepository  typingStatusRepository;
   private TypingStatusSender      typingStatusSender;
-  private JobManager jobManager;
+  private JobManager              jobManager;
   private IncomingMessageObserver incomingMessageObserver;
   private ObjectGraph             objectGraph;
   private PersistentLogger        persistentLogger;
@@ -166,6 +167,7 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
     isAppVisible = false;
     Log.i(TAG, "App is no longer visible.");
     KeyCachingService.onAppBackgrounded(this);
+    MessageNotifier.setVisibleThread(-1);
     // Loki - Stop long polling if needed
     if (lokiLongPoller != null) { lokiLongPoller.stopIfNeeded(); }
   }
diff --git a/src/org/thoughtcrime/securesms/BasicIntroFragment.java b/src/org/thoughtcrime/securesms/BasicIntroFragment.java
index 46242fbaa..74db43d4a 100644
--- a/src/org/thoughtcrime/securesms/BasicIntroFragment.java
+++ b/src/org/thoughtcrime/securesms/BasicIntroFragment.java
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms;
 
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -43,7 +44,7 @@ public class BasicIntroFragment extends Fragment {
   }
 
   @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup container,
+  public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                            Bundle savedInstanceState) {
     View v = inflater.inflate(R.layout.color_fragment, container, false);
 
diff --git a/src/org/thoughtcrime/securesms/BindableConversationItem.java b/src/org/thoughtcrime/securesms/BindableConversationItem.java
index 19f5ae207..459a99be2 100644
--- a/src/org/thoughtcrime/securesms/BindableConversationItem.java
+++ b/src/org/thoughtcrime/securesms/BindableConversationItem.java
@@ -11,6 +11,7 @@ import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.stickers.StickerLocator;
 import org.whispersystems.libsignal.util.guava.Optional;
 
 import java.util.List;
@@ -36,6 +37,7 @@ public interface BindableConversationItem extends Unbindable {
     void onQuoteClicked(MmsMessageRecord messageRecord);
     void onLinkPreviewClicked(@NonNull LinkPreview linkPreview);
     void onMoreTextClicked(@NonNull Address conversationAddress, long messageId, boolean isMms);
+    void onStickerClicked(@NonNull StickerLocator stickerLocator);
     void onSharedContactDetailsClicked(@NonNull Contact contact, @NonNull View avatarTransitionView);
     void onAddToContactsClicked(@NonNull Contact contact);
     void onMessageSharedContactClicked(@NonNull List<Recipient> choices);
diff --git a/src/org/thoughtcrime/securesms/BlockedContactsActivity.java b/src/org/thoughtcrime/securesms/BlockedContactsActivity.java
index 82cc2e527..bd6dc38df 100644
--- a/src/org/thoughtcrime/securesms/BlockedContactsActivity.java
+++ b/src/org/thoughtcrime/securesms/BlockedContactsActivity.java
@@ -87,19 +87,19 @@ public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity
     }
 
     @Override
-    public Loader<Cursor> onCreateLoader(int id, Bundle args) {
+    public @NonNull Loader<Cursor> onCreateLoader(int id, Bundle args) {
       return new BlockedContactsLoader(getActivity());
     }
 
     @Override
-    public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
+    public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor data) {
       if (getListAdapter() != null) {
         ((CursorAdapter) getListAdapter()).changeCursor(data);
       }
     }
 
     @Override
-    public void onLoaderReset(Loader<Cursor> loader) {
+    public void onLoaderReset(@NonNull Loader<Cursor> loader) {
       if (getListAdapter() != null) {
         ((CursorAdapter) getListAdapter()).changeCursor(null);
       }
diff --git a/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java
index 0679e7ea6..18c46d3ae 100644
--- a/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java
+++ b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java
@@ -123,7 +123,7 @@ public class ContactSelectionListFragment extends    Fragment
   }
 
   @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+  public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
     View view = inflater.inflate(R.layout.contact_selection_list_fragment, container, false);
 
     emptyText               = ViewUtil.findById(view, android.R.id.empty);
@@ -215,14 +215,14 @@ public class ContactSelectionListFragment extends    Fragment
   }
 
   @Override
-  public Loader<Cursor> onCreateLoader(int id, Bundle args) {
+  public @NonNull Loader<Cursor> onCreateLoader(int id, Bundle args) {
     return new ContactsCursorLoader(getActivity(),
                                     getActivity().getIntent().getIntExtra(DISPLAY_MODE, DisplayMode.FLAG_ALL),
                                     cursorFilter, getActivity().getIntent().getBooleanExtra(RECENTS, false));
   }
 
   @Override
-  public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
+  public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor data) {
     swipeRefresh.setVisibility(View.VISIBLE);
     showContactsLayout.setVisibility(View.GONE);
 
@@ -237,7 +237,7 @@ public class ContactSelectionListFragment extends    Fragment
   }
 
   @Override
-  public void onLoaderReset(Loader<Cursor> loader) {
+  public void onLoaderReset(@NonNull Loader<Cursor> loader) {
     ((CursorRecyclerViewAdapter) recyclerView.getAdapter()).changeCursor(null);
     fastScroller.setVisibility(View.GONE);
   }
diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java
index ac308810e..03125430c 100644
--- a/src/org/thoughtcrime/securesms/ConversationListFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java
@@ -136,8 +136,8 @@ public class ConversationListFragment extends Fragment
     emptyImage   = ViewUtil.findById(view, R.id.empty);
     emptySearch  = ViewUtil.findById(view, R.id.empty_search);
 
-    if (archive) fab.setVisibility(View.GONE);
-    else         fab.setVisibility(View.VISIBLE);
+    if (archive) fab.hide();
+    else         fab.show();
 
     reminderView.setOnDismissListener(() -> updateReminders(true));
 
@@ -355,12 +355,12 @@ public class ConversationListFragment extends Fragment
   }
 
   @Override
-  public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
+  public @NonNull Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
     return new ConversationListLoader(getActivity(), queryFilter, archive);
   }
 
   @Override
-  public void onLoadFinished(Loader<Cursor> arg0, Cursor cursor) {
+  public void onLoadFinished(@NonNull Loader<Cursor> arg0, Cursor cursor) {
     if ((cursor == null || cursor.getCount() <= 0) && TextUtils.isEmpty(queryFilter) && !archive) {
       list.setVisibility(View.INVISIBLE);
       emptyState.setVisibility(View.VISIBLE);
@@ -383,7 +383,7 @@ public class ConversationListFragment extends Fragment
   }
 
   @Override
-  public void onLoaderReset(Loader<Cursor> arg0) {
+  public void onLoaderReset(@NonNull Loader<Cursor> arg0) {
     getListAdapter().changeCursor(null);
   }
 
@@ -486,15 +486,15 @@ public class ConversationListFragment extends Fragment
     }
 
     @Override
-    public boolean onMove(RecyclerView recyclerView,
-                          RecyclerView.ViewHolder viewHolder,
-                          RecyclerView.ViewHolder target)
+    public boolean onMove(@NonNull RecyclerView recyclerView,
+                          @NonNull RecyclerView.ViewHolder viewHolder,
+                          @NonNull RecyclerView.ViewHolder target)
     {
       return false;
     }
 
     @Override
-    public int getSwipeDirs(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+    public int getSwipeDirs(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder) {
       if (viewHolder.itemView instanceof ConversationListItemAction) {
         return 0;
       }
@@ -508,7 +508,7 @@ public class ConversationListFragment extends Fragment
 
     @SuppressLint("StaticFieldLeak")
     @Override
-    public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
+    public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction) {
       if (viewHolder.itemView instanceof ConversationListItemInboxZero) return;
       final long threadId    = ((ConversationListItem)viewHolder.itemView).getThreadId();
       final int  unreadCount = ((ConversationListItem)viewHolder.itemView).getUnreadCount();
@@ -562,8 +562,8 @@ public class ConversationListFragment extends Fragment
     }
 
     @Override
-    public void onChildDraw(Canvas c, RecyclerView recyclerView,
-                            RecyclerView.ViewHolder viewHolder,
+    public void onChildDraw(@NonNull Canvas c, @NonNull RecyclerView recyclerView,
+                            @NonNull RecyclerView.ViewHolder viewHolder,
                             float dX, float dY, int actionState,
                             boolean isCurrentlyActive)
     {
diff --git a/src/org/thoughtcrime/securesms/ConversationListItem.java b/src/org/thoughtcrime/securesms/ConversationListItem.java
index d7dee732e..b03b6a3f7 100644
--- a/src/org/thoughtcrime/securesms/ConversationListItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationListItem.java
@@ -202,7 +202,7 @@ public class ConversationListItem extends RelativeLayout
     String name = recipient.isLocalNumber() ? getContext().getString(R.string.note_to_self) : recipient.getName();
 
     fromView.setText(SearchUtil.getHighlightedSpan(locale, () -> new StyleSpan(Typeface.BOLD), name, highlightSubstring));
-    subjectView.setText(SearchUtil.getHighlightedSpan(locale, () -> new StyleSpan(Typeface.BOLD), contact.getAddress().toPhoneString(), highlightSubstring));
+    subjectView.setText(SearchUtil.getHighlightedSpan(locale, () -> new StyleSpan(Typeface.BOLD), contact.getAddress().toString(), highlightSubstring));
     dateView.setText("");
     archivedView.setVisibility(GONE);
     unreadIndicator.setVisibility(GONE);
diff --git a/src/org/thoughtcrime/securesms/CountrySelectionFragment.java b/src/org/thoughtcrime/securesms/CountrySelectionFragment.java
index eae87f8d5..4b4d7ba23 100644
--- a/src/org/thoughtcrime/securesms/CountrySelectionFragment.java
+++ b/src/org/thoughtcrime/securesms/CountrySelectionFragment.java
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms;
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.app.ListFragment;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
@@ -55,12 +56,12 @@ public class CountrySelectionFragment extends ListFragment implements LoaderMana
   }
 
   @Override
-  public Loader<ArrayList<Map<String, String>>> onCreateLoader(int arg0, Bundle arg1) {
+  public @NonNull Loader<ArrayList<Map<String, String>>> onCreateLoader(int arg0, Bundle arg1) {
     return new CountryListLoader(getActivity());
   }
 
   @Override
-  public void onLoadFinished(Loader<ArrayList<Map<String, String>>> loader,
+  public void onLoadFinished(@NonNull Loader<ArrayList<Map<String, String>>> loader,
                              ArrayList<Map<String, String>> results)
   {
     String[] from = {"country_name", "country_code"};
@@ -73,7 +74,7 @@ public class CountrySelectionFragment extends ListFragment implements LoaderMana
   }
 
   @Override
-  public void onLoaderReset(Loader<ArrayList<Map<String, String>>> arg0) {
+  public void onLoaderReset(@NonNull Loader<ArrayList<Map<String, String>>> arg0) {
     this.setListAdapter(null);
   }
 
diff --git a/src/org/thoughtcrime/securesms/CreateProfileActivity.java b/src/org/thoughtcrime/securesms/CreateProfileActivity.java
index 6b3f386d9..58f2a65f1 100644
--- a/src/org/thoughtcrime/securesms/CreateProfileActivity.java
+++ b/src/org/thoughtcrime/securesms/CreateProfileActivity.java
@@ -31,8 +31,9 @@ import com.dd.CircularProgressButton;
 import org.thoughtcrime.securesms.avatar.AvatarSelection;
 import org.thoughtcrime.securesms.components.InputAwareLayout;
 import org.thoughtcrime.securesms.components.LabeledEditText;
-import org.thoughtcrime.securesms.components.emoji.EmojiDrawer;
+import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider;
 import org.thoughtcrime.securesms.components.emoji.EmojiToggle;
+import org.thoughtcrime.securesms.components.emoji.MediaKeyboard;
 import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
 import org.thoughtcrime.securesms.database.Address;
@@ -85,7 +86,7 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Inje
   private CircularProgressButton finishButton;
   private LabeledEditText        name;
   private EmojiToggle            emojiToggle;
-  private EmojiDrawer            emojiDrawer;
+  private MediaKeyboard          mediaKeyboard;
   private View                   reveal;
 
   private Intent nextIntent;
@@ -128,7 +129,7 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Inje
   public void onConfigurationChanged(Configuration newConfig) {
     super.onConfigurationChanged(newConfig);
 
-    if (container.getCurrentInput() == emojiDrawer) {
+    if (container.getCurrentInput() == mediaKeyboard) {
       container.hideAttachedInput(true);
     }
   }
@@ -201,7 +202,7 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Inje
     this.avatar       = ViewUtil.findById(this, R.id.avatar);
     this.name         = ViewUtil.findById(this, R.id.name);
     this.emojiToggle  = ViewUtil.findById(this, R.id.emoji_toggle);
-    this.emojiDrawer  = ViewUtil.findById(this, R.id.emoji_drawer);
+    this.mediaKeyboard = ViewUtil.findById(this, R.id.emoji_drawer);
     this.container    = ViewUtil.findById(this, R.id.container);
     this.finishButton = ViewUtil.findById(this, R.id.finish_button);
     this.reveal       = ViewUtil.findById(this, R.id.reveal);
@@ -314,17 +315,17 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Inje
   }
 
   private void initializeEmojiInput() {
-    this.emojiToggle.attach(emojiDrawer);
+    this.emojiToggle.attach(mediaKeyboard);
 
     this.emojiToggle.setOnClickListener(v -> {
-      if (container.getCurrentInput() == emojiDrawer) {
+      if (container.getCurrentInput() == mediaKeyboard) {
         container.showSoftkey(name.getInput());
       } else {
-        container.show(name.getInput(), emojiDrawer);
+        container.show(name.getInput(), mediaKeyboard);
       }
     });
 
-    this.emojiDrawer.setEmojiEventListener(new EmojiDrawer.EmojiEventListener() {
+    this.mediaKeyboard.setProviders(0, new EmojiKeyboardProvider(this, new EmojiKeyboardProvider.EmojiEventListener() {
       @Override
       public void onKeyEvent(KeyEvent keyEvent) {
         name.dispatchKeyEvent(keyEvent);
@@ -338,9 +339,9 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Inje
         name.getText().replace(Math.min(start, end), Math.max(start, end), emoji);
         name.getInput().setSelection(start + emoji.length());
       }
-    });
+    }));
 
-    this.container.addOnKeyboardShownListener(() -> emojiToggle.setToEmoji());
+    this.container.addOnKeyboardShownListener(() -> emojiToggle.setToMedia());
     this.name.setOnClickListener(v -> container.showSoftkey(name.getInput()));
   }
 
diff --git a/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java b/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java
index 54915b9b8..67b50b639 100644
--- a/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java
+++ b/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java
@@ -20,7 +20,6 @@ package org.thoughtcrime.securesms;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -149,7 +148,7 @@ public class DatabaseUpgradeActivity extends BaseActivity {
   }
 
   private boolean needsUpgradeTask() {
-    int currentVersionCode = Util.getCurrentApkReleaseVersion(this);
+    int currentVersionCode = Util.getCanonicalVersionCode();
     int lastSeenVersion    = VersionTracker.getLastSeenVersion(this);
 
     Log.i("DatabaseUpgradeActivity", "LastSeenVersion: " + lastSeenVersion);
@@ -167,14 +166,10 @@ public class DatabaseUpgradeActivity extends BaseActivity {
   }
 
   public static boolean isUpdate(Context context) {
-    try {
-      int currentVersionCode  = context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionCode;
-      int previousVersionCode = VersionTracker.getLastSeenVersion(context);
+    int currentVersionCode  = Util.getCanonicalVersionCode();
+    int previousVersionCode = VersionTracker.getLastSeenVersion(context);
 
-      return previousVersionCode < currentVersionCode;
-    } catch (PackageManager.NameNotFoundException e) {
-      throw new AssertionError(e);
-    }
+    return previousVersionCode < currentVersionCode;
   }
 
   @SuppressLint("StaticFieldLeak")
diff --git a/src/org/thoughtcrime/securesms/DeviceAddFragment.java b/src/org/thoughtcrime/securesms/DeviceAddFragment.java
index af73ba646..af18022e9 100644
--- a/src/org/thoughtcrime/securesms/DeviceAddFragment.java
+++ b/src/org/thoughtcrime/securesms/DeviceAddFragment.java
@@ -5,6 +5,7 @@ import android.annotation.TargetApi;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -31,7 +32,7 @@ public class DeviceAddFragment extends Fragment {
   private ScanListener   scanListener;
 
   @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup viewGroup, Bundle bundle) {
+  public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup viewGroup, Bundle bundle) {
     this.container    = ViewUtil.inflate(inflater, viewGroup, R.layout.device_add_fragment);
     this.overlay      = ViewUtil.findById(this.container, R.id.overlay);
     this.scannerView  = ViewUtil.findById(this.container, R.id.scanner);
diff --git a/src/org/thoughtcrime/securesms/DeviceListFragment.java b/src/org/thoughtcrime/securesms/DeviceListFragment.java
index 0448da964..220b60564 100644
--- a/src/org/thoughtcrime/securesms/DeviceListFragment.java
+++ b/src/org/thoughtcrime/securesms/DeviceListFragment.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.app.ListFragment;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
@@ -90,7 +91,7 @@ public class DeviceListFragment extends ListFragment
   }
 
   @Override
-  public Loader<List<Device>> onCreateLoader(int id, Bundle args) {
+  public @NonNull Loader<List<Device>> onCreateLoader(int id, Bundle args) {
     empty.setVisibility(View.GONE);
     progressContainer.setVisibility(View.VISIBLE);
 
@@ -98,7 +99,7 @@ public class DeviceListFragment extends ListFragment
   }
 
   @Override
-  public void onLoadFinished(Loader<List<Device>> loader, List<Device> data) {
+  public void onLoadFinished(@NonNull Loader<List<Device>> loader, List<Device> data) {
     progressContainer.setVisibility(View.GONE);
 
     if (data == null) {
@@ -117,7 +118,7 @@ public class DeviceListFragment extends ListFragment
   }
 
   @Override
-  public void onLoaderReset(Loader<List<Device>> loader) {
+  public void onLoaderReset(@NonNull Loader<List<Device>> loader) {
     setListAdapter(null);
   }
 
@@ -211,7 +212,7 @@ public class DeviceListFragment extends ListFragment
     }
 
     @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
+    public @NonNull View getView(int position, View convertView, @NonNull ViewGroup parent) {
       if (convertView == null) {
         convertView = ((Activity)getContext()).getLayoutInflater().inflate(resource, parent, false);
       }
diff --git a/src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java b/src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java
index f47157dde..47f9b6b44 100644
--- a/src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java
+++ b/src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java
@@ -187,7 +187,7 @@ public class ExperienceUpgradeActivity extends BaseActionBarActivity implements
   private void onContinue(Optional<ExperienceUpgrade> seenUpgrade) {
     ServiceUtil.getNotificationManager(this).cancel(NOTIFICATION_ID);
     int latestVersion = seenUpgrade.isPresent() ? seenUpgrade.get().getVersion()
-                                                : Util.getCurrentApkReleaseVersion(this);
+                                                : Util.getCanonicalVersionCode();
     TextSecurePreferences.setLastExperienceVersionCode(this, latestVersion);
     if (seenUpgrade.isPresent() && seenUpgrade.get().nextIntent != null) {
       Intent intent     = new Intent(this, seenUpgrade.get().nextIntent);
@@ -206,7 +206,7 @@ public class ExperienceUpgradeActivity extends BaseActionBarActivity implements
   }
 
   public static Optional<ExperienceUpgrade> getExperienceUpgrade(Context context) {
-    final int currentVersionCode = Util.getCurrentApkReleaseVersion(context);
+    final int currentVersionCode = Util.getCanonicalVersionCode();
     final int lastSeenVersion    = TextSecurePreferences.getLastExperienceVersionCode(context);
     Log.i(TAG, "getExperienceUpgrade(" + lastSeenVersion + ")");
 
@@ -313,7 +313,7 @@ public class ExperienceUpgradeActivity extends BaseActionBarActivity implements
                                         .build();
         ServiceUtil.getNotificationManager(context).notify(NOTIFICATION_ID, notification);
       } else if (DISMISS_ACTION.equals(intent.getAction())) {
-        TextSecurePreferences.setExperienceDismissedVersionCode(context, Util.getCurrentApkReleaseVersion(context));
+        TextSecurePreferences.setExperienceDismissedVersionCode(context, Util.getCanonicalVersionCode());
       }
     }
   }
diff --git a/src/org/thoughtcrime/securesms/InviteActivity.java b/src/org/thoughtcrime/securesms/InviteActivity.java
index 47a97f07f..2aab71392 100644
--- a/src/org/thoughtcrime/securesms/InviteActivity.java
+++ b/src/org/thoughtcrime/securesms/InviteActivity.java
@@ -78,7 +78,7 @@ public class InviteActivity extends PassphraseRequiredActionBarActivity implemen
     heart             = ViewUtil.findById(this, R.id.heart);
     contactsFragment  = (ContactSelectionListFragment)getSupportFragmentManager().findFragmentById(R.id.contact_selection_list_fragment);
 
-    inviteText.setText(getString(R.string.InviteActivity_lets_switch_to_signal, "https://sgnl.link/1KpeYmF"));
+    inviteText.setText(getString(R.string.InviteActivity_lets_switch_to_signal, getString(R.string.install_url)));
     updateSmsButtonText();
 
     if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
diff --git a/src/org/thoughtcrime/securesms/LinkPreviewsIntroFragment.java b/src/org/thoughtcrime/securesms/LinkPreviewsIntroFragment.java
index 996e7b27b..972b43edb 100644
--- a/src/org/thoughtcrime/securesms/LinkPreviewsIntroFragment.java
+++ b/src/org/thoughtcrime/securesms/LinkPreviewsIntroFragment.java
@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -43,7 +44,7 @@ public class LinkPreviewsIntroFragment extends Fragment {
   }
 
   @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+  public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
     View view = inflater.inflate(R.layout.experience_upgrade_link_previews_fragment, container, false);
 
     view.findViewById(R.id.experience_ok_button).setOnClickListener(v -> {
diff --git a/src/org/thoughtcrime/securesms/MediaOverviewActivity.java b/src/org/thoughtcrime/securesms/MediaOverviewActivity.java
index 46e3a9a78..199b52f61 100644
--- a/src/org/thoughtcrime/securesms/MediaOverviewActivity.java
+++ b/src/org/thoughtcrime/securesms/MediaOverviewActivity.java
@@ -259,12 +259,12 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity {
     }
 
     @Override
-    public Loader<BucketedThreadMedia> onCreateLoader(int i, Bundle bundle) {
+    public @NonNull Loader<BucketedThreadMedia> onCreateLoader(int i, Bundle bundle) {
       return new BucketedThreadMediaLoader(getContext(), recipient.getAddress());
     }
 
     @Override
-    public void onLoadFinished(Loader<BucketedThreadMedia> loader, BucketedThreadMedia bucketedThreadMedia) {
+    public void onLoadFinished(@NonNull Loader<BucketedThreadMedia> loader, BucketedThreadMedia bucketedThreadMedia) {
       ((MediaGalleryAdapter) recyclerView.getAdapter()).setMedia(bucketedThreadMedia);
       ((MediaGalleryAdapter) recyclerView.getAdapter()).notifyAllSectionsDataSetChanged();
 
@@ -273,7 +273,7 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity {
     }
 
     @Override
-    public void onLoaderReset(Loader<BucketedThreadMedia> cursorLoader) {
+    public void onLoaderReset(@NonNull Loader<BucketedThreadMedia> cursorLoader) {
       ((MediaGalleryAdapter) recyclerView.getAdapter()).setMedia(new BucketedThreadMedia(getContext()));
     }
 
@@ -498,12 +498,12 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity {
     }
 
     @Override
-    public Loader<Cursor> onCreateLoader(int id, Bundle args) {
+    public @NonNull Loader<Cursor> onCreateLoader(int id, Bundle args) {
       return new ThreadMediaLoader(getContext(), recipient.getAddress(), false);
     }
 
     @Override
-    public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
+    public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor data) {
       ((CursorRecyclerViewAdapter)this.recyclerView.getAdapter()).changeCursor(data);
       getActivity().invalidateOptionsMenu();
 
@@ -511,7 +511,7 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity {
     }
 
     @Override
-    public void onLoaderReset(Loader<Cursor> loader) {
+    public void onLoaderReset(@NonNull Loader<Cursor> loader) {
       ((CursorRecyclerViewAdapter)this.recyclerView.getAdapter()).changeCursor(null);
       getActivity().invalidateOptionsMenu();
     }
diff --git a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java b/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
index 0ec74a762..3a9958ff1 100644
--- a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
+++ b/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
@@ -443,12 +443,12 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im
   }
 
   @Override
-  public Loader<Pair<Cursor, Integer>> onCreateLoader(int id, Bundle args) {
+  public @NonNull Loader<Pair<Cursor, Integer>> onCreateLoader(int id, Bundle args) {
     return new PagingMediaLoader(this, conversationRecipient, initialMediaUri, leftIsRecent);
   }
 
   @Override
-  public void onLoadFinished(Loader<Pair<Cursor, Integer>> loader, @Nullable Pair<Cursor, Integer> data) {
+  public void onLoadFinished(@NonNull Loader<Pair<Cursor, Integer>> loader, @Nullable Pair<Cursor, Integer> data) {
     if (data != null) {
       @SuppressWarnings("ConstantConditions")
       CursorPagerAdapter adapter = new CursorPagerAdapter(this, GlideApp.with(this), getWindow(), data.first, data.second, leftIsRecent);
@@ -467,7 +467,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im
   }
 
   @Override
-  public void onLoaderReset(Loader<Pair<Cursor, Integer>> loader) {
+  public void onLoaderReset(@NonNull Loader<Pair<Cursor, Integer>> loader) {
 
   }
 
diff --git a/src/org/thoughtcrime/securesms/PassphraseCreateActivity.java b/src/org/thoughtcrime/securesms/PassphraseCreateActivity.java
index be4aaf8c5..e0b06454d 100644
--- a/src/org/thoughtcrime/securesms/PassphraseCreateActivity.java
+++ b/src/org/thoughtcrime/securesms/PassphraseCreateActivity.java
@@ -68,7 +68,7 @@ public class PassphraseCreateActivity extends PassphraseActivity {
       IdentityKeyUtil.generateIdentityKeys(PassphraseCreateActivity.this);
       VersionTracker.updateLastSeenVersion(PassphraseCreateActivity.this);
 
-      TextSecurePreferences.setLastExperienceVersionCode(PassphraseCreateActivity.this, Util.getCurrentApkReleaseVersion(PassphraseCreateActivity.this));
+      TextSecurePreferences.setLastExperienceVersionCode(PassphraseCreateActivity.this, Util.getCanonicalVersionCode());
       TextSecurePreferences.setPasswordDisabled(PassphraseCreateActivity.this, true);
       TextSecurePreferences.setReadReceiptsEnabled(PassphraseCreateActivity.this, true);
       TextSecurePreferences.setTypingIndicatorsEnabled(PassphraseCreateActivity.this, true);
diff --git a/src/org/thoughtcrime/securesms/PlayServicesProblemFragment.java b/src/org/thoughtcrime/securesms/PlayServicesProblemFragment.java
index 661670a77..6931e8430 100644
--- a/src/org/thoughtcrime/securesms/PlayServicesProblemFragment.java
+++ b/src/org/thoughtcrime/securesms/PlayServicesProblemFragment.java
@@ -22,6 +22,7 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AlertDialog;
 
@@ -32,12 +33,12 @@ import network.loki.messenger.R;
 public class PlayServicesProblemFragment extends DialogFragment {
 
   @Override
-  public @NonNull Dialog onCreateDialog(@NonNull Bundle bundle) {
+  public @NonNull Dialog onCreateDialog(@Nullable Bundle bundle) {
     int    code   = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(getActivity());
     Dialog dialog = GoogleApiAvailability.getInstance().getErrorDialog(getActivity(), code, 9111);
 
     if (dialog == null) {
-      return new AlertDialog.Builder(getActivity())
+      return new AlertDialog.Builder(requireActivity())
               .setNegativeButton(android.R.string.ok, null)
               .setMessage(R.string.PlayServicesProblemFragment_the_version_of_google_play_services_you_have_installed_is_not_functioning)
               .create();
diff --git a/src/org/thoughtcrime/securesms/ReadReceiptsIntroFragment.java b/src/org/thoughtcrime/securesms/ReadReceiptsIntroFragment.java
index a421bb641..135c0c6d9 100644
--- a/src/org/thoughtcrime/securesms/ReadReceiptsIntroFragment.java
+++ b/src/org/thoughtcrime/securesms/ReadReceiptsIntroFragment.java
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms;
 
 
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 import android.support.v7.widget.SwitchCompat;
 import android.view.LayoutInflater;
@@ -31,7 +32,7 @@ public class ReadReceiptsIntroFragment extends Fragment {
   }
 
   @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+  public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
     View         v          = inflater.inflate(R.layout.experience_upgrade_preference_fragment, container, false);
     SwitchCompat preference = ViewUtil.findById(v, R.id.preference);
 
diff --git a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
index 97729d283..9303347f1 100644
--- a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
+++ b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
@@ -232,12 +232,12 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
   }
 
   @Override
-  public Loader<Cursor> onCreateLoader(int id, Bundle args) {
+  public @NonNull Loader<Cursor> onCreateLoader(int id, Bundle args) {
     return new ThreadMediaLoader(this, address, true);
   }
 
   @Override
-  public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
+  public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor data) {
     if (data != null && data.getCount() > 0) {
       this.threadPhotoRailLabel.setVisibility(View.GONE);
       this.threadPhotoRailView.setVisibility(View.GONE);
@@ -254,7 +254,7 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
   }
 
   @Override
-  public void onLoaderReset(Loader<Cursor> loader) {
+  public void onLoaderReset(@NonNull Loader<Cursor> loader) {
     this.threadPhotoRailView.setCursor(glideRequests, null);
   }
 
diff --git a/src/org/thoughtcrime/securesms/ShareActivity.java b/src/org/thoughtcrime/securesms/ShareActivity.java
index 975e5706c..a1727f98f 100644
--- a/src/org/thoughtcrime/securesms/ShareActivity.java
+++ b/src/org/thoughtcrime/securesms/ShareActivity.java
@@ -47,6 +47,7 @@ import org.thoughtcrime.securesms.mediasend.Media;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.stickers.StickerLocator;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
@@ -254,12 +255,14 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
   }
 
   private Intent getBaseShareIntent(final @NonNull Class<?> target) {
-    final Intent           intent     = new Intent(this, target);
-    final String           textExtra  = getIntent().getStringExtra(Intent.EXTRA_TEXT);
-    final ArrayList<Media> mediaExtra = getIntent().getParcelableArrayListExtra(ConversationActivity.MEDIA_EXTRA);
+    final Intent           intent       = new Intent(this, target);
+    final String           textExtra    = getIntent().getStringExtra(Intent.EXTRA_TEXT);
+    final ArrayList<Media> mediaExtra   = getIntent().getParcelableArrayListExtra(ConversationActivity.MEDIA_EXTRA);
+    final StickerLocator   stickerExtra = getIntent().getParcelableExtra(ConversationActivity.STICKER_EXTRA);
 
     intent.putExtra(ConversationActivity.TEXT_EXTRA, textExtra);
     intent.putExtra(ConversationActivity.MEDIA_EXTRA, mediaExtra);
+    intent.putExtra(ConversationActivity.STICKER_EXTRA, stickerExtra);
 
     if (resolvedExtra != null) intent.setDataAndType(resolvedExtra, mimeType);
 
diff --git a/src/org/thoughtcrime/securesms/TransportOptions.java b/src/org/thoughtcrime/securesms/TransportOptions.java
index 315b60e33..39400b7dd 100644
--- a/src/org/thoughtcrime/securesms/TransportOptions.java
+++ b/src/org/thoughtcrime/securesms/TransportOptions.java
@@ -36,10 +36,12 @@ public class TransportOptions {
   private Optional<Integer>         defaultSubscriptionId = Optional.absent();
   private Optional<TransportOption> selectedOption        = Optional.absent();
 
+  private final Optional<Integer> systemSubscriptionId;
+
   public TransportOptions(Context context, boolean media) {
-    this.context               = context;
-    this.enabledTransports     = initializeAvailableTransports(media);
-    this.defaultSubscriptionId = new SubscriptionManagerCompat(context).getPreferredSubscriptionId();
+    this.context              = context;
+    this.enabledTransports    = initializeAvailableTransports(media);
+    this.systemSubscriptionId = new SubscriptionManagerCompat(context).getPreferredSubscriptionId();
   }
 
   public void reset(boolean media) {
@@ -90,13 +92,10 @@ public class TransportOptions {
   public @NonNull TransportOption getSelectedTransport() {
     if (selectedOption.isPresent()) return selectedOption.get();
 
-    if (defaultSubscriptionId.isPresent()) {
-      for (TransportOption transportOption : enabledTransports) {
-        if (transportOption.getType() == defaultTransportType &&
-            (int)defaultSubscriptionId.get() == transportOption.getSimSubscriptionId().or(-1))
-        {
-          return transportOption;
-        }
+    if (defaultTransportType == Type.SMS) {
+      TransportOption transportOption = findEnabledSmsTransportOption(defaultSubscriptionId.or(systemSubscriptionId));
+      if (transportOption != null) {
+        return transportOption;
       }
     }
 
@@ -109,6 +108,20 @@ public class TransportOptions {
     throw new AssertionError("No options of default type!");
   }
 
+  private @Nullable TransportOption findEnabledSmsTransportOption(Optional<Integer> subscriptionId) {
+    if (subscriptionId.isPresent()) {
+      final int subId = subscriptionId.get();
+
+      for (TransportOption transportOption : enabledTransports) {
+        if (transportOption.getType() == Type.SMS &&
+            subId == transportOption.getSimSubscriptionId().or(-1)) {
+          return transportOption;
+        }
+      }
+    }
+    return null;
+  }
+
   public void disableTransport(Type type) {
     TransportOption selected = selectedOption.orNull();
 
diff --git a/src/org/thoughtcrime/securesms/TypingIndicatorIntroFragment.java b/src/org/thoughtcrime/securesms/TypingIndicatorIntroFragment.java
index d89172951..2ee5027ee 100644
--- a/src/org/thoughtcrime/securesms/TypingIndicatorIntroFragment.java
+++ b/src/org/thoughtcrime/securesms/TypingIndicatorIntroFragment.java
@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -44,7 +45,7 @@ public class TypingIndicatorIntroFragment extends Fragment {
   }
 
   @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+  public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
     View view      = inflater.inflate(R.layout.experience_upgrade_typing_indicators_fragment, container, false);
     View yesButton = view.findViewById(R.id.experience_yes_button);
     View noButton  = view.findViewById(R.id.experience_no_button);
diff --git a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
index 562447dda..22162a917 100644
--- a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
+++ b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
@@ -232,7 +232,7 @@ public class VerifyIdentityActivity extends PassphraseRequiredActionBarActivity
     private boolean    animateFailureOnDraw = false;
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup viewGroup, Bundle bundle) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup viewGroup, Bundle bundle) {
       this.container        = ViewUtil.inflate(inflater, viewGroup, R.layout.verify_display_fragment);
       this.numbersContainer = ViewUtil.findById(container, R.id.number_table);
       this.qrCode           = ViewUtil.findById(container, R.id.qr_code);
@@ -625,7 +625,7 @@ public class VerifyIdentityActivity extends PassphraseRequiredActionBarActivity
     private ScanningThread scanningThread;
     private ScanListener   scanListener;
 
-    public View onCreateView(LayoutInflater inflater, ViewGroup viewGroup, Bundle bundle) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup viewGroup, Bundle bundle) {
       this.container  = ViewUtil.inflate(inflater, viewGroup, R.layout.verify_scan_fragment);
       this.cameraView = ViewUtil.findById(container, R.id.scanner);
 
diff --git a/src/org/thoughtcrime/securesms/attachments/Attachment.java b/src/org/thoughtcrime/securesms/attachments/Attachment.java
index c639811ad..760ef65e3 100644
--- a/src/org/thoughtcrime/securesms/attachments/Attachment.java
+++ b/src/org/thoughtcrime/securesms/attachments/Attachment.java
@@ -5,6 +5,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
+import org.thoughtcrime.securesms.stickers.StickerLocator;
 
 public abstract class Attachment {
 
@@ -40,10 +41,13 @@ public abstract class Attachment {
   @Nullable
   private final String caption;
 
+  @Nullable
+  private final StickerLocator stickerLocator;
+
   public Attachment(@NonNull String contentType, int transferState, long size, @Nullable String fileName,
                     @Nullable String location, @Nullable String key, @Nullable String relay,
                     @Nullable byte[] digest, @Nullable String fastPreflightId, boolean voiceNote,
-                    int width, int height, boolean quote, @Nullable String caption)
+                    int width, int height, boolean quote, @Nullable String caption, @Nullable StickerLocator stickerLocator)
   {
     this.contentType     = contentType;
     this.transferState   = transferState;
@@ -58,6 +62,7 @@ public abstract class Attachment {
     this.width           = width;
     this.height          = height;
     this.quote           = quote;
+    this.stickerLocator  = stickerLocator;
     this.caption         = caption;
   }
 
@@ -131,6 +136,14 @@ public abstract class Attachment {
     return quote;
   }
 
+  public boolean isSticker() {
+    return stickerLocator != null;
+  }
+
+  public @Nullable StickerLocator getSticker() {
+    return stickerLocator;
+  }
+
   public @Nullable String getCaption() {
     return caption;
   }
diff --git a/src/org/thoughtcrime/securesms/attachments/AttachmentId.java b/src/org/thoughtcrime/securesms/attachments/AttachmentId.java
index afd44c034..89389bb8d 100644
--- a/src/org/thoughtcrime/securesms/attachments/AttachmentId.java
+++ b/src/org/thoughtcrime/securesms/attachments/AttachmentId.java
@@ -1,5 +1,7 @@
 package org.thoughtcrime.securesms.attachments;
 
+import android.support.annotation.NonNull;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.thoughtcrime.securesms.util.Util;
@@ -29,7 +31,7 @@ public class AttachmentId {
     return new String[] {String.valueOf(rowId), String.valueOf(uniqueId)};
   }
 
-  public String toString() {
+  public @NonNull String toString() {
     return "(row id: " + rowId + ", unique ID: " + uniqueId + ")";
   }
 
diff --git a/src/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java b/src/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java
index f293991d2..bcb4f7b05 100644
--- a/src/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java
+++ b/src/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java
@@ -4,6 +4,7 @@ import android.net.Uri;
 import android.support.annotation.Nullable;
 
 import org.thoughtcrime.securesms.mms.PartAuthority;
+import org.thoughtcrime.securesms.stickers.StickerLocator;
 
 public class DatabaseAttachment extends Attachment {
 
@@ -17,9 +18,10 @@ public class DatabaseAttachment extends Attachment {
                             String contentType, int transferProgress, long size,
                             String fileName, String location, String key, String relay,
                             byte[] digest, String fastPreflightId, boolean voiceNote,
-                            int width, int height, boolean quote, @Nullable String caption)
+                            int width, int height, boolean quote, @Nullable String caption,
+                            @Nullable StickerLocator stickerLocator)
   {
-    super(contentType, transferProgress, size, fileName, location, key, relay, digest, fastPreflightId, voiceNote, width, height, quote, caption);
+    super(contentType, transferProgress, size, fileName, location, key, relay, digest, fastPreflightId, voiceNote, width, height, quote, caption, stickerLocator);
     this.attachmentId = attachmentId;
     this.hasData      = hasData;
     this.hasThumbnail = hasThumbnail;
diff --git a/src/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java b/src/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java
index 2983ce488..1826b7f21 100644
--- a/src/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java
+++ b/src/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java
@@ -10,7 +10,7 @@ import org.thoughtcrime.securesms.database.MmsDatabase;
 public class MmsNotificationAttachment extends Attachment {
 
   public MmsNotificationAttachment(int status, long size) {
-    super("application/mms", getTransferStateFromStatus(status), size, null, null, null, null, null, null, false, 0, 0, false, null);
+    super("application/mms", getTransferStateFromStatus(status), size, null, null, null, null, null, null, false, 0, 0, false, null, null);
   }
 
   @Nullable
diff --git a/src/org/thoughtcrime/securesms/attachments/PointerAttachment.java b/src/org/thoughtcrime/securesms/attachments/PointerAttachment.java
index aba842f44..b862142bb 100644
--- a/src/org/thoughtcrime/securesms/attachments/PointerAttachment.java
+++ b/src/org/thoughtcrime/securesms/attachments/PointerAttachment.java
@@ -5,6 +5,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
+import org.thoughtcrime.securesms.stickers.StickerLocator;
 import org.thoughtcrime.securesms.util.Base64;
 import org.whispersystems.libsignal.util.guava.Optional;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
@@ -18,10 +19,10 @@ public class PointerAttachment extends Attachment {
   private PointerAttachment(@NonNull String contentType, int transferState, long size,
                             @Nullable String fileName,  @NonNull String location,
                             @Nullable String key, @Nullable String relay,
-                            @Nullable byte[] digest, boolean voiceNote,
-                            int width, int height, @Nullable String caption)
+                            @Nullable byte[] digest, @Nullable String fastPreflightId, boolean voiceNote,
+                            int width, int height, @Nullable String caption, @Nullable StickerLocator stickerLocator)
   {
-    super(contentType, transferState, size, fileName, location, key, relay, digest, null, voiceNote, width, height, false, caption);
+    super(contentType, transferState, size, fileName, location, key, relay, digest, fastPreflightId, voiceNote, width, height, false, caption, stickerLocator);
   }
 
   @Nullable
@@ -70,6 +71,14 @@ public class PointerAttachment extends Attachment {
   }
 
   public static Optional<Attachment> forPointer(Optional<SignalServiceAttachment> pointer) {
+    return forPointer(pointer, null, null);
+  }
+
+  public static Optional<Attachment> forPointer(Optional<SignalServiceAttachment> pointer, @Nullable StickerLocator stickerLocator) {
+    return forPointer(pointer, stickerLocator, null);
+  }
+
+  public static Optional<Attachment> forPointer(Optional<SignalServiceAttachment> pointer, @Nullable StickerLocator stickerLocator, @Nullable String fastPreflightId) {
     if (!pointer.isPresent() || !pointer.get().isPointer()) return Optional.absent();
 
     String encodedKey = null;
@@ -85,10 +94,12 @@ public class PointerAttachment extends Attachment {
                                       String.valueOf(pointer.get().asPointer().getId()),
                                       encodedKey, null,
                                       pointer.get().asPointer().getDigest().orNull(),
+                                      fastPreflightId,
                                       pointer.get().asPointer().getVoiceNote(),
                                       pointer.get().asPointer().getWidth(),
                                       pointer.get().asPointer().getHeight(),
-                                      pointer.get().asPointer().getCaption().orNull()));
+                                      pointer.get().asPointer().getCaption().orNull(),
+        stickerLocator));
 
   }
 
@@ -103,9 +114,11 @@ public class PointerAttachment extends Attachment {
                                              thumbnail != null && thumbnail.asPointer().getKey() != null ? Base64.encodeBytes(thumbnail.asPointer().getKey()) : null,
                                              null,
                                              thumbnail != null ? thumbnail.asPointer().getDigest().orNull() : null,
+                                             null,
                                              false,
                                              thumbnail != null ? thumbnail.asPointer().getWidth() : 0,
                                              thumbnail != null ? thumbnail.asPointer().getHeight() : 0,
-                                             thumbnail != null ? thumbnail.asPointer().getCaption().orNull() : null));
+                                             thumbnail != null ? thumbnail.asPointer().getCaption().orNull() : null,
+                                             null));
   }
 }
diff --git a/src/org/thoughtcrime/securesms/attachments/UriAttachment.java b/src/org/thoughtcrime/securesms/attachments/UriAttachment.java
index bea12e15a..f7c5f2180 100644
--- a/src/org/thoughtcrime/securesms/attachments/UriAttachment.java
+++ b/src/org/thoughtcrime/securesms/attachments/UriAttachment.java
@@ -4,23 +4,26 @@ import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
+import org.thoughtcrime.securesms.stickers.StickerLocator;
+
 public class UriAttachment extends Attachment {
 
   private final @NonNull  Uri dataUri;
   private final @Nullable Uri thumbnailUri;
 
   public UriAttachment(@NonNull Uri uri, @NonNull String contentType, int transferState, long size,
-                       @Nullable String fileName, boolean voiceNote, boolean quote, @Nullable String caption)
+                       @Nullable String fileName, boolean voiceNote, boolean quote, @Nullable String caption,
+                       @Nullable StickerLocator stickerLocator)
   {
-    this(uri, uri, contentType, transferState, size, 0, 0, fileName, null, voiceNote, quote, caption);
+    this(uri, uri, contentType, transferState, size, 0, 0, fileName, null, voiceNote, quote, caption, stickerLocator);
   }
 
   public UriAttachment(@NonNull Uri dataUri, @Nullable Uri thumbnailUri,
                        @NonNull String contentType, int transferState, long size, int width, int height,
                        @Nullable String fileName, @Nullable String fastPreflightId,
-                       boolean voiceNote, boolean quote, @Nullable String caption)
+                       boolean voiceNote, boolean quote, @Nullable String caption, @Nullable StickerLocator stickerLocator)
   {
-    super(contentType, transferState, size, fileName, null, null, null, null, fastPreflightId, voiceNote, width, height, quote, caption);
+    super(contentType, transferState, size, fileName, null, null, null, null, fastPreflightId, voiceNote, width, height, quote, caption, stickerLocator);
     this.dataUri      = dataUri;
     this.thumbnailUri = thumbnailUri;
   }
diff --git a/src/org/thoughtcrime/securesms/backup/BackupProtos.java b/src/org/thoughtcrime/securesms/backup/BackupProtos.java
index 56aeed036..f3b78606f 100644
--- a/src/org/thoughtcrime/securesms/backup/BackupProtos.java
+++ b/src/org/thoughtcrime/securesms/backup/BackupProtos.java
@@ -2980,6 +2980,483 @@ public final class BackupProtos {
     // @@protoc_insertion_point(class_scope:signal.Attachment)
   }
 
+  public interface StickerOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
+
+    // optional uint64 rowId = 1;
+    /**
+     * <code>optional uint64 rowId = 1;</code>
+     */
+    boolean hasRowId();
+    /**
+     * <code>optional uint64 rowId = 1;</code>
+     */
+    long getRowId();
+
+    // optional uint32 length = 2;
+    /**
+     * <code>optional uint32 length = 2;</code>
+     */
+    boolean hasLength();
+    /**
+     * <code>optional uint32 length = 2;</code>
+     */
+    int getLength();
+  }
+  /**
+   * Protobuf type {@code signal.Sticker}
+   */
+  public static final class Sticker extends
+      com.google.protobuf.GeneratedMessage
+      implements StickerOrBuilder {
+    // Use Sticker.newBuilder() to construct.
+    private Sticker(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+      this.unknownFields = builder.getUnknownFields();
+    }
+    private Sticker(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+    private static final Sticker defaultInstance;
+    public static Sticker getDefaultInstance() {
+      return defaultInstance;
+    }
+
+    public Sticker getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private Sticker(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      initFields();
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 8: {
+              bitField0_ |= 0x00000001;
+              rowId_ = input.readUInt64();
+              break;
+            }
+            case 16: {
+              bitField0_ |= 0x00000002;
+              length_ = input.readUInt32();
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e.getMessage()).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return org.thoughtcrime.securesms.backup.BackupProtos.internal_static_signal_Sticker_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return org.thoughtcrime.securesms.backup.BackupProtos.internal_static_signal_Sticker_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              org.thoughtcrime.securesms.backup.BackupProtos.Sticker.class, org.thoughtcrime.securesms.backup.BackupProtos.Sticker.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<Sticker> PARSER =
+        new com.google.protobuf.AbstractParser<Sticker>() {
+      public Sticker parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new Sticker(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<Sticker> getParserForType() {
+      return PARSER;
+    }
+
+    private int bitField0_;
+    // optional uint64 rowId = 1;
+    public static final int ROWID_FIELD_NUMBER = 1;
+    private long rowId_;
+    /**
+     * <code>optional uint64 rowId = 1;</code>
+     */
+    public boolean hasRowId() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
+    }
+    /**
+     * <code>optional uint64 rowId = 1;</code>
+     */
+    public long getRowId() {
+      return rowId_;
+    }
+
+    // optional uint32 length = 2;
+    public static final int LENGTH_FIELD_NUMBER = 2;
+    private int length_;
+    /**
+     * <code>optional uint32 length = 2;</code>
+     */
+    public boolean hasLength() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
+    }
+    /**
+     * <code>optional uint32 length = 2;</code>
+     */
+    public int getLength() {
+      return length_;
+    }
+
+    private void initFields() {
+      rowId_ = 0L;
+      length_ = 0;
+    }
+    private byte memoizedIsInitialized = -1;
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized != -1) return isInitialized == 1;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      getSerializedSize();
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        output.writeUInt64(1, rowId_);
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        output.writeUInt32(2, length_);
+      }
+      getUnknownFields().writeTo(output);
+    }
+
+    private int memoizedSerializedSize = -1;
+    public int getSerializedSize() {
+      int size = memoizedSerializedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(1, rowId_);
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(2, length_);
+      }
+      size += getUnknownFields().getSerializedSize();
+      memoizedSerializedSize = size;
+      return size;
+    }
+
+    private static final long serialVersionUID = 0L;
+    @java.lang.Override
+    protected java.lang.Object writeReplace()
+        throws java.io.ObjectStreamException {
+      return super.writeReplace();
+    }
+
+    public static org.thoughtcrime.securesms.backup.BackupProtos.Sticker parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.thoughtcrime.securesms.backup.BackupProtos.Sticker parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static org.thoughtcrime.securesms.backup.BackupProtos.Sticker parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.thoughtcrime.securesms.backup.BackupProtos.Sticker parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static org.thoughtcrime.securesms.backup.BackupProtos.Sticker parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static org.thoughtcrime.securesms.backup.BackupProtos.Sticker parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+    public static org.thoughtcrime.securesms.backup.BackupProtos.Sticker parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input);
+    }
+    public static org.thoughtcrime.securesms.backup.BackupProtos.Sticker parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+    }
+    public static org.thoughtcrime.securesms.backup.BackupProtos.Sticker parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static org.thoughtcrime.securesms.backup.BackupProtos.Sticker parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+
+    public static Builder newBuilder() { return Builder.create(); }
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder(org.thoughtcrime.securesms.backup.BackupProtos.Sticker prototype) {
+      return newBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() { return newBuilder(this); }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code signal.Sticker}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements org.thoughtcrime.securesms.backup.BackupProtos.StickerOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return org.thoughtcrime.securesms.backup.BackupProtos.internal_static_signal_Sticker_descriptor;
+      }
+
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return org.thoughtcrime.securesms.backup.BackupProtos.internal_static_signal_Sticker_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                org.thoughtcrime.securesms.backup.BackupProtos.Sticker.class, org.thoughtcrime.securesms.backup.BackupProtos.Sticker.Builder.class);
+      }
+
+      // Construct using org.thoughtcrime.securesms.backup.BackupProtos.Sticker.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        }
+      }
+      private static Builder create() {
+        return new Builder();
+      }
+
+      public Builder clear() {
+        super.clear();
+        rowId_ = 0L;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        length_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        return this;
+      }
+
+      public Builder clone() {
+        return create().mergeFrom(buildPartial());
+      }
+
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return org.thoughtcrime.securesms.backup.BackupProtos.internal_static_signal_Sticker_descriptor;
+      }
+
+      public org.thoughtcrime.securesms.backup.BackupProtos.Sticker getDefaultInstanceForType() {
+        return org.thoughtcrime.securesms.backup.BackupProtos.Sticker.getDefaultInstance();
+      }
+
+      public org.thoughtcrime.securesms.backup.BackupProtos.Sticker build() {
+        org.thoughtcrime.securesms.backup.BackupProtos.Sticker result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      public org.thoughtcrime.securesms.backup.BackupProtos.Sticker buildPartial() {
+        org.thoughtcrime.securesms.backup.BackupProtos.Sticker result = new org.thoughtcrime.securesms.backup.BackupProtos.Sticker(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        result.rowId_ = rowId_;
+        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+          to_bitField0_ |= 0x00000002;
+        }
+        result.length_ = length_;
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof org.thoughtcrime.securesms.backup.BackupProtos.Sticker) {
+          return mergeFrom((org.thoughtcrime.securesms.backup.BackupProtos.Sticker)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(org.thoughtcrime.securesms.backup.BackupProtos.Sticker other) {
+        if (other == org.thoughtcrime.securesms.backup.BackupProtos.Sticker.getDefaultInstance()) return this;
+        if (other.hasRowId()) {
+          setRowId(other.getRowId());
+        }
+        if (other.hasLength()) {
+          setLength(other.getLength());
+        }
+        this.mergeUnknownFields(other.getUnknownFields());
+        return this;
+      }
+
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        org.thoughtcrime.securesms.backup.BackupProtos.Sticker parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (org.thoughtcrime.securesms.backup.BackupProtos.Sticker) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      // optional uint64 rowId = 1;
+      private long rowId_ ;
+      /**
+       * <code>optional uint64 rowId = 1;</code>
+       */
+      public boolean hasRowId() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
+      }
+      /**
+       * <code>optional uint64 rowId = 1;</code>
+       */
+      public long getRowId() {
+        return rowId_;
+      }
+      /**
+       * <code>optional uint64 rowId = 1;</code>
+       */
+      public Builder setRowId(long value) {
+        bitField0_ |= 0x00000001;
+        rowId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional uint64 rowId = 1;</code>
+       */
+      public Builder clearRowId() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        rowId_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      // optional uint32 length = 2;
+      private int length_ ;
+      /**
+       * <code>optional uint32 length = 2;</code>
+       */
+      public boolean hasLength() {
+        return ((bitField0_ & 0x00000002) == 0x00000002);
+      }
+      /**
+       * <code>optional uint32 length = 2;</code>
+       */
+      public int getLength() {
+        return length_;
+      }
+      /**
+       * <code>optional uint32 length = 2;</code>
+       */
+      public Builder setLength(int value) {
+        bitField0_ |= 0x00000002;
+        length_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional uint32 length = 2;</code>
+       */
+      public Builder clearLength() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        length_ = 0;
+        onChanged();
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:signal.Sticker)
+    }
+
+    static {
+      defaultInstance = new Sticker(true);
+      defaultInstance.initFields();
+    }
+
+    // @@protoc_insertion_point(class_scope:signal.Sticker)
+  }
+
   public interface AvatarOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
@@ -4507,6 +4984,20 @@ public final class BackupProtos {
      * <code>optional .signal.Avatar avatar = 7;</code>
      */
     org.thoughtcrime.securesms.backup.BackupProtos.AvatarOrBuilder getAvatarOrBuilder();
+
+    // optional .signal.Sticker sticker = 8;
+    /**
+     * <code>optional .signal.Sticker sticker = 8;</code>
+     */
+    boolean hasSticker();
+    /**
+     * <code>optional .signal.Sticker sticker = 8;</code>
+     */
+    org.thoughtcrime.securesms.backup.BackupProtos.Sticker getSticker();
+    /**
+     * <code>optional .signal.Sticker sticker = 8;</code>
+     */
+    org.thoughtcrime.securesms.backup.BackupProtos.StickerOrBuilder getStickerOrBuilder();
   }
   /**
    * Protobuf type {@code signal.BackupFrame}
@@ -4642,6 +5133,19 @@ public final class BackupProtos {
               bitField0_ |= 0x00000040;
               break;
             }
+            case 66: {
+              org.thoughtcrime.securesms.backup.BackupProtos.Sticker.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000080) == 0x00000080)) {
+                subBuilder = sticker_.toBuilder();
+              }
+              sticker_ = input.readMessage(org.thoughtcrime.securesms.backup.BackupProtos.Sticker.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(sticker_);
+                sticker_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000080;
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -4830,6 +5334,28 @@ public final class BackupProtos {
       return avatar_;
     }
 
+    // optional .signal.Sticker sticker = 8;
+    public static final int STICKER_FIELD_NUMBER = 8;
+    private org.thoughtcrime.securesms.backup.BackupProtos.Sticker sticker_;
+    /**
+     * <code>optional .signal.Sticker sticker = 8;</code>
+     */
+    public boolean hasSticker() {
+      return ((bitField0_ & 0x00000080) == 0x00000080);
+    }
+    /**
+     * <code>optional .signal.Sticker sticker = 8;</code>
+     */
+    public org.thoughtcrime.securesms.backup.BackupProtos.Sticker getSticker() {
+      return sticker_;
+    }
+    /**
+     * <code>optional .signal.Sticker sticker = 8;</code>
+     */
+    public org.thoughtcrime.securesms.backup.BackupProtos.StickerOrBuilder getStickerOrBuilder() {
+      return sticker_;
+    }
+
     private void initFields() {
       header_ = org.thoughtcrime.securesms.backup.BackupProtos.Header.getDefaultInstance();
       statement_ = org.thoughtcrime.securesms.backup.BackupProtos.SqlStatement.getDefaultInstance();
@@ -4838,6 +5364,7 @@ public final class BackupProtos {
       version_ = org.thoughtcrime.securesms.backup.BackupProtos.DatabaseVersion.getDefaultInstance();
       end_ = false;
       avatar_ = org.thoughtcrime.securesms.backup.BackupProtos.Avatar.getDefaultInstance();
+      sticker_ = org.thoughtcrime.securesms.backup.BackupProtos.Sticker.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -4872,6 +5399,9 @@ public final class BackupProtos {
       if (((bitField0_ & 0x00000040) == 0x00000040)) {
         output.writeMessage(7, avatar_);
       }
+      if (((bitField0_ & 0x00000080) == 0x00000080)) {
+        output.writeMessage(8, sticker_);
+      }
       getUnknownFields().writeTo(output);
     }
 
@@ -4909,6 +5439,10 @@ public final class BackupProtos {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(7, avatar_);
       }
+      if (((bitField0_ & 0x00000080) == 0x00000080)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(8, sticker_);
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
       return size;
@@ -5023,6 +5557,7 @@ public final class BackupProtos {
           getAttachmentFieldBuilder();
           getVersionFieldBuilder();
           getAvatarFieldBuilder();
+          getStickerFieldBuilder();
         }
       }
       private static Builder create() {
@@ -5069,6 +5604,12 @@ public final class BackupProtos {
           avatarBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000040);
+        if (stickerBuilder_ == null) {
+          sticker_ = org.thoughtcrime.securesms.backup.BackupProtos.Sticker.getDefaultInstance();
+        } else {
+          stickerBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000080);
         return this;
       }
 
@@ -5149,6 +5690,14 @@ public final class BackupProtos {
         } else {
           result.avatar_ = avatarBuilder_.build();
         }
+        if (((from_bitField0_ & 0x00000080) == 0x00000080)) {
+          to_bitField0_ |= 0x00000080;
+        }
+        if (stickerBuilder_ == null) {
+          result.sticker_ = sticker_;
+        } else {
+          result.sticker_ = stickerBuilder_.build();
+        }
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -5186,6 +5735,9 @@ public final class BackupProtos {
         if (other.hasAvatar()) {
           mergeAvatar(other.getAvatar());
         }
+        if (other.hasSticker()) {
+          mergeSticker(other.getSticker());
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
@@ -5948,6 +6500,123 @@ public final class BackupProtos {
         return avatarBuilder_;
       }
 
+      // optional .signal.Sticker sticker = 8;
+      private org.thoughtcrime.securesms.backup.BackupProtos.Sticker sticker_ = org.thoughtcrime.securesms.backup.BackupProtos.Sticker.getDefaultInstance();
+      private com.google.protobuf.SingleFieldBuilder<
+          org.thoughtcrime.securesms.backup.BackupProtos.Sticker, org.thoughtcrime.securesms.backup.BackupProtos.Sticker.Builder, org.thoughtcrime.securesms.backup.BackupProtos.StickerOrBuilder> stickerBuilder_;
+      /**
+       * <code>optional .signal.Sticker sticker = 8;</code>
+       */
+      public boolean hasSticker() {
+        return ((bitField0_ & 0x00000080) == 0x00000080);
+      }
+      /**
+       * <code>optional .signal.Sticker sticker = 8;</code>
+       */
+      public org.thoughtcrime.securesms.backup.BackupProtos.Sticker getSticker() {
+        if (stickerBuilder_ == null) {
+          return sticker_;
+        } else {
+          return stickerBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .signal.Sticker sticker = 8;</code>
+       */
+      public Builder setSticker(org.thoughtcrime.securesms.backup.BackupProtos.Sticker value) {
+        if (stickerBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          sticker_ = value;
+          onChanged();
+        } else {
+          stickerBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000080;
+        return this;
+      }
+      /**
+       * <code>optional .signal.Sticker sticker = 8;</code>
+       */
+      public Builder setSticker(
+          org.thoughtcrime.securesms.backup.BackupProtos.Sticker.Builder builderForValue) {
+        if (stickerBuilder_ == null) {
+          sticker_ = builderForValue.build();
+          onChanged();
+        } else {
+          stickerBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000080;
+        return this;
+      }
+      /**
+       * <code>optional .signal.Sticker sticker = 8;</code>
+       */
+      public Builder mergeSticker(org.thoughtcrime.securesms.backup.BackupProtos.Sticker value) {
+        if (stickerBuilder_ == null) {
+          if (((bitField0_ & 0x00000080) == 0x00000080) &&
+              sticker_ != org.thoughtcrime.securesms.backup.BackupProtos.Sticker.getDefaultInstance()) {
+            sticker_ =
+              org.thoughtcrime.securesms.backup.BackupProtos.Sticker.newBuilder(sticker_).mergeFrom(value).buildPartial();
+          } else {
+            sticker_ = value;
+          }
+          onChanged();
+        } else {
+          stickerBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000080;
+        return this;
+      }
+      /**
+       * <code>optional .signal.Sticker sticker = 8;</code>
+       */
+      public Builder clearSticker() {
+        if (stickerBuilder_ == null) {
+          sticker_ = org.thoughtcrime.securesms.backup.BackupProtos.Sticker.getDefaultInstance();
+          onChanged();
+        } else {
+          stickerBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000080);
+        return this;
+      }
+      /**
+       * <code>optional .signal.Sticker sticker = 8;</code>
+       */
+      public org.thoughtcrime.securesms.backup.BackupProtos.Sticker.Builder getStickerBuilder() {
+        bitField0_ |= 0x00000080;
+        onChanged();
+        return getStickerFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .signal.Sticker sticker = 8;</code>
+       */
+      public org.thoughtcrime.securesms.backup.BackupProtos.StickerOrBuilder getStickerOrBuilder() {
+        if (stickerBuilder_ != null) {
+          return stickerBuilder_.getMessageOrBuilder();
+        } else {
+          return sticker_;
+        }
+      }
+      /**
+       * <code>optional .signal.Sticker sticker = 8;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          org.thoughtcrime.securesms.backup.BackupProtos.Sticker, org.thoughtcrime.securesms.backup.BackupProtos.Sticker.Builder, org.thoughtcrime.securesms.backup.BackupProtos.StickerOrBuilder> 
+          getStickerFieldBuilder() {
+        if (stickerBuilder_ == null) {
+          stickerBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              org.thoughtcrime.securesms.backup.BackupProtos.Sticker, org.thoughtcrime.securesms.backup.BackupProtos.Sticker.Builder, org.thoughtcrime.securesms.backup.BackupProtos.StickerOrBuilder>(
+                  sticker_,
+                  getParentForChildren(),
+                  isClean());
+          sticker_ = null;
+        }
+        return stickerBuilder_;
+      }
+
       // @@protoc_insertion_point(builder_scope:signal.BackupFrame)
     }
 
@@ -5979,6 +6648,11 @@ public final class BackupProtos {
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_signal_Attachment_fieldAccessorTable;
+  private static com.google.protobuf.Descriptors.Descriptor
+    internal_static_signal_Sticker_descriptor;
+  private static
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_signal_Sticker_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
     internal_static_signal_Avatar_descriptor;
   private static
@@ -6017,18 +6691,20 @@ public final class BackupProtos {
       "ameter\030\005 \001(\010\"<\n\020SharedPreference\022\014\n\004file" +
       "\030\001 \001(\t\022\013\n\003key\030\002 \001(\t\022\r\n\005value\030\003 \001(\t\"A\n\nAt" +
       "tachment\022\r\n\005rowId\030\001 \001(\004\022\024\n\014attachmentId\030" +
-      "\002 \001(\004\022\016\n\006length\030\003 \001(\r\"&\n\006Avatar\022\014\n\004name\030",
-      "\001 \001(\t\022\016\n\006length\030\002 \001(\r\"\"\n\017DatabaseVersion" +
-      "\022\017\n\007version\030\001 \001(\r\"\"\n\006Header\022\n\n\002iv\030\001 \001(\014\022" +
-      "\014\n\004salt\030\002 \001(\014\"\203\002\n\013BackupFrame\022\036\n\006header\030" +
-      "\001 \001(\0132\016.signal.Header\022\'\n\tstatement\030\002 \001(\013" +
-      "2\024.signal.SqlStatement\022,\n\npreference\030\003 \001" +
-      "(\0132\030.signal.SharedPreference\022&\n\nattachme" +
-      "nt\030\004 \001(\0132\022.signal.Attachment\022(\n\007version\030" +
-      "\005 \001(\0132\027.signal.DatabaseVersion\022\013\n\003end\030\006 " +
-      "\001(\010\022\036\n\006avatar\030\007 \001(\0132\016.signal.AvatarB1\n!o" +
-      "rg.thoughtcrime.securesms.backupB\014Backup",
-      "Protos"
+      "\002 \001(\004\022\016\n\006length\030\003 \001(\r\"(\n\007Sticker\022\r\n\005rowI",
+      "d\030\001 \001(\004\022\016\n\006length\030\002 \001(\r\"&\n\006Avatar\022\014\n\004nam" +
+      "e\030\001 \001(\t\022\016\n\006length\030\002 \001(\r\"\"\n\017DatabaseVersi" +
+      "on\022\017\n\007version\030\001 \001(\r\"\"\n\006Header\022\n\n\002iv\030\001 \001(" +
+      "\014\022\014\n\004salt\030\002 \001(\014\"\245\002\n\013BackupFrame\022\036\n\006heade" +
+      "r\030\001 \001(\0132\016.signal.Header\022\'\n\tstatement\030\002 \001" +
+      "(\0132\024.signal.SqlStatement\022,\n\npreference\030\003" +
+      " \001(\0132\030.signal.SharedPreference\022&\n\nattach" +
+      "ment\030\004 \001(\0132\022.signal.Attachment\022(\n\007versio" +
+      "n\030\005 \001(\0132\027.signal.DatabaseVersion\022\013\n\003end\030" +
+      "\006 \001(\010\022\036\n\006avatar\030\007 \001(\0132\016.signal.Avatar\022 \n",
+      "\007sticker\030\010 \001(\0132\017.signal.StickerB1\n!org.t" +
+      "houghtcrime.securesms.backupB\014BackupProt" +
+      "os"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -6059,30 +6735,36 @@ public final class BackupProtos {
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_signal_Attachment_descriptor,
               new java.lang.String[] { "RowId", "AttachmentId", "Length", });
-          internal_static_signal_Avatar_descriptor =
+          internal_static_signal_Sticker_descriptor =
             getDescriptor().getMessageTypes().get(3);
+          internal_static_signal_Sticker_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_signal_Sticker_descriptor,
+              new java.lang.String[] { "RowId", "Length", });
+          internal_static_signal_Avatar_descriptor =
+            getDescriptor().getMessageTypes().get(4);
           internal_static_signal_Avatar_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_signal_Avatar_descriptor,
               new java.lang.String[] { "Name", "Length", });
           internal_static_signal_DatabaseVersion_descriptor =
-            getDescriptor().getMessageTypes().get(4);
+            getDescriptor().getMessageTypes().get(5);
           internal_static_signal_DatabaseVersion_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_signal_DatabaseVersion_descriptor,
               new java.lang.String[] { "Version", });
           internal_static_signal_Header_descriptor =
-            getDescriptor().getMessageTypes().get(5);
+            getDescriptor().getMessageTypes().get(6);
           internal_static_signal_Header_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_signal_Header_descriptor,
               new java.lang.String[] { "Iv", "Salt", });
           internal_static_signal_BackupFrame_descriptor =
-            getDescriptor().getMessageTypes().get(6);
+            getDescriptor().getMessageTypes().get(7);
           internal_static_signal_BackupFrame_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_signal_BackupFrame_descriptor,
-              new java.lang.String[] { "Header", "Statement", "Preference", "Attachment", "Version", "End", "Avatar", });
+              new java.lang.String[] { "Header", "Statement", "Preference", "Attachment", "Version", "End", "Avatar", "Sticker", });
           return null;
         }
       };
diff --git a/src/org/thoughtcrime/securesms/backup/FullBackupExporter.java b/src/org/thoughtcrime/securesms/backup/FullBackupExporter.java
index 23c252ca7..a706a8fc2 100644
--- a/src/org/thoughtcrime/securesms/backup/FullBackupExporter.java
+++ b/src/org/thoughtcrime/securesms/backup/FullBackupExporter.java
@@ -28,6 +28,7 @@ import org.thoughtcrime.securesms.database.SearchDatabase;
 import org.thoughtcrime.securesms.database.SessionDatabase;
 import org.thoughtcrime.securesms.database.SignedPreKeyDatabase;
 import org.thoughtcrime.securesms.database.SmsDatabase;
+import org.thoughtcrime.securesms.database.StickerDatabase;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
 import org.thoughtcrime.securesms.util.Conversions;
@@ -80,6 +81,8 @@ public class FullBackupExporter extends FullBackupBase {
         count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(GroupReceiptDatabase.MMS_ID))), null, count);
       } else if (table.equals(AttachmentDatabase.TABLE_NAME)) {
         count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.MMS_ID))), cursor -> exportAttachment(attachmentSecret, cursor, outputStream), count);
+      } else if (table.equals(StickerDatabase.TABLE_NAME)) {
+        count = exportTable(table, input, outputStream, cursor -> true, cursor -> exportSticker(attachmentSecret, cursor, outputStream), count);
       } else if (!table.equals(SignedPreKeyDatabase.TABLE_NAME)       &&
                  !table.equals(OneTimePreKeyDatabase.TABLE_NAME)      &&
                  !table.equals(SessionDatabase.TABLE_NAME)            &&
@@ -216,6 +219,23 @@ public class FullBackupExporter extends FullBackupBase {
     }
   }
 
+  private static void exportSticker(@NonNull AttachmentSecret attachmentSecret, @NonNull Cursor cursor, @NonNull BackupFrameOutputStream outputStream) {
+    try {
+      long rowId    = cursor.getLong(cursor.getColumnIndexOrThrow(StickerDatabase._ID));
+      long size     = cursor.getLong(cursor.getColumnIndexOrThrow(StickerDatabase.FILE_LENGTH));
+
+      String data   = cursor.getString(cursor.getColumnIndexOrThrow(StickerDatabase.FILE_PATH));
+      byte[] random = cursor.getBlob(cursor.getColumnIndexOrThrow(StickerDatabase.FILE_RANDOM));
+
+      if (!TextUtils.isEmpty(data) && size > 0) {
+        InputStream inputStream = ModernDecryptingPartInputStream.createFor(attachmentSecret, random, new File(data), 0);
+        outputStream.writeSticker(rowId, inputStream, size);
+      }
+    } catch (IOException e) {
+      Log.w(TAG, e);
+    }
+  }
+
   private static long calculateVeryOldStreamLength(@NonNull AttachmentSecret attachmentSecret, @Nullable byte[] random, @NonNull String data) throws IOException {
     long result = 0;
     InputStream inputStream;
@@ -321,6 +341,17 @@ public class FullBackupExporter extends FullBackupBase {
       writeStream(in);
     }
 
+    public void writeSticker(long rowId, @NonNull InputStream in, long size) throws IOException {
+      write(outputStream, BackupProtos.BackupFrame.newBuilder()
+                                                  .setSticker(BackupProtos.Sticker.newBuilder()
+                                                                                  .setRowId(rowId)
+                                                                                  .setLength(Util.toIntExact(size))
+                                                                                  .build())
+                                                  .build());
+
+      writeStream(in);
+    }
+
     void writeDatabaseVersion(int version) throws IOException {
       write(outputStream, BackupProtos.BackupFrame.newBuilder()
                                                   .setVersion(BackupProtos.DatabaseVersion.newBuilder().setVersion(version))
diff --git a/src/org/thoughtcrime/securesms/backup/FullBackupImporter.java b/src/org/thoughtcrime/securesms/backup/FullBackupImporter.java
index 637fd0865..a39163855 100644
--- a/src/org/thoughtcrime/securesms/backup/FullBackupImporter.java
+++ b/src/org/thoughtcrime/securesms/backup/FullBackupImporter.java
@@ -7,9 +7,6 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.support.annotation.NonNull;
-
-import org.thoughtcrime.securesms.database.RecipientDatabase;
-import org.thoughtcrime.securesms.logging.Log;
 import android.util.Pair;
 
 import net.sqlcipher.database.SQLiteDatabase;
@@ -21,6 +18,7 @@ import org.thoughtcrime.securesms.backup.BackupProtos.BackupFrame;
 import org.thoughtcrime.securesms.backup.BackupProtos.DatabaseVersion;
 import org.thoughtcrime.securesms.backup.BackupProtos.SharedPreference;
 import org.thoughtcrime.securesms.backup.BackupProtos.SqlStatement;
+import org.thoughtcrime.securesms.backup.BackupProtos.Sticker;
 import org.thoughtcrime.securesms.crypto.AttachmentSecret;
 import org.thoughtcrime.securesms.crypto.ModernEncryptingPartOutputStream;
 import org.thoughtcrime.securesms.database.Address;
@@ -29,10 +27,10 @@ import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupReceiptDatabase;
 import org.thoughtcrime.securesms.database.MmsDatabase;
 import org.thoughtcrime.securesms.database.SearchDatabase;
+import org.thoughtcrime.securesms.database.StickerDatabase;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
-import org.thoughtcrime.securesms.notifications.NotificationChannels;
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
-import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.Conversions;
 import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.libsignal.kdf.HKDFv3;
@@ -85,6 +83,7 @@ public class FullBackupImporter extends FullBackupBase {
         else if (frame.hasStatement())  processStatement(db, frame.getStatement());
         else if (frame.hasPreference()) processPreference(context, frame.getPreference());
         else if (frame.hasAttachment()) processAttachment(context, attachmentSecret, db, frame.getAttachment(), inputStream);
+        else if (frame.hasSticker())    processSticker(context, attachmentSecret, db, frame.getSticker(), inputStream);
         else if (frame.hasAvatar())     processAvatar(context, frame.getAvatar(), inputStream);
       }
 
@@ -150,6 +149,25 @@ public class FullBackupImporter extends FullBackupBase {
               new String[] {String.valueOf(attachment.getRowId()), String.valueOf(attachment.getAttachmentId())});
   }
 
+  private static void processSticker(@NonNull Context context, @NonNull AttachmentSecret attachmentSecret, @NonNull SQLiteDatabase db, @NonNull Sticker sticker, BackupRecordInputStream inputStream)
+      throws IOException
+  {
+    File stickerDirectory = context.getDir(AttachmentDatabase.DIRECTORY, Context.MODE_PRIVATE);
+    File dataFile         = File.createTempFile("sticker", ".mms", stickerDirectory);
+
+    Pair<byte[], OutputStream> output = ModernEncryptingPartOutputStream.createFor(attachmentSecret, dataFile, false);
+
+    inputStream.readAttachmentTo(output.second, sticker.getLength());
+
+    ContentValues contentValues = new ContentValues();
+    contentValues.put(StickerDatabase.FILE_PATH, dataFile.getAbsolutePath());
+    contentValues.put(StickerDatabase.FILE_RANDOM, output.first);
+
+    db.update(StickerDatabase.TABLE_NAME, contentValues,
+              StickerDatabase._ID + " = ?",
+              new String[] {String.valueOf(sticker.getRowId())});
+  }
+
   private static void processAvatar(@NonNull Context context, @NonNull BackupProtos.Avatar avatar, @NonNull BackupRecordInputStream inputStream) throws IOException {
     inputStream.readAttachmentTo(new FileOutputStream(AvatarHelper.getAvatarFile(context, Address.fromExternal(context, avatar.getName()))), avatar.getLength());
   }
diff --git a/src/org/thoughtcrime/securesms/components/CircleColorImageView.java b/src/org/thoughtcrime/securesms/components/CircleColorImageView.java
index 7346cf246..a8a099115 100644
--- a/src/org/thoughtcrime/securesms/components/CircleColorImageView.java
+++ b/src/org/thoughtcrime/securesms/components/CircleColorImageView.java
@@ -3,15 +3,14 @@ package org.thoughtcrime.securesms.components;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Color;
-import android.graphics.ColorFilter;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
+import android.support.v7.widget.AppCompatImageView;
 import android.util.AttributeSet;
-import android.widget.ImageView;
 
 import network.loki.messenger.R;
 
-public class CircleColorImageView extends ImageView {
+public class CircleColorImageView extends AppCompatImageView {
 
  public CircleColorImageView(Context context) {
     this(context, null);
diff --git a/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java b/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
index 90cb47499..15c24b124 100644
--- a/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
+++ b/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
@@ -3,9 +3,6 @@ package org.thoughtcrime.securesms.components;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.graphics.RectF;
 import android.support.annotation.ColorInt;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -32,6 +29,7 @@ public class ConversationItemThumbnail extends FrameLayout {
   private ConversationItemFooter footer;
   private CornerMask             cornerMask;
   private Outliner               outliner;
+  private boolean                borderless;
 
   public ConversationItemThumbnail(Context context) {
     super(context);
@@ -75,10 +73,12 @@ public class ConversationItemThumbnail extends FrameLayout {
   protected void dispatchDraw(Canvas canvas) {
     super.dispatchDraw(canvas);
 
-    cornerMask.mask(canvas);
+    if (!borderless) {
+      cornerMask.mask(canvas);
 
-    if (album.getVisibility() != VISIBLE) {
-      outliner.draw(canvas);
+      if (album.getVisibility() != VISIBLE) {
+        outliner.draw(canvas);
+      }
     }
   }
 
@@ -110,6 +110,10 @@ public class ConversationItemThumbnail extends FrameLayout {
     outliner.setRadii(topLeft, topRight, bottomRight, bottomLeft);
   }
 
+  public void setBorderless(boolean borderless) {
+    this.borderless = borderless;
+  }
+
   public ConversationItemFooter getFooter() {
     return footer;
   }
diff --git a/src/org/thoughtcrime/securesms/components/CustomDefaultPreference.java b/src/org/thoughtcrime/securesms/components/CustomDefaultPreference.java
index 2814f916e..e40b05fde 100644
--- a/src/org/thoughtcrime/securesms/components/CustomDefaultPreference.java
+++ b/src/org/thoughtcrime/securesms/components/CustomDefaultPreference.java
@@ -140,7 +140,7 @@ public class CustomDefaultPreference extends DialogPreference {
 
 
     @Override
-    public Dialog onCreateDialog(Bundle instanceState) {
+    public @NonNull Dialog onCreateDialog(Bundle instanceState) {
       Dialog dialog = super.onCreateDialog(instanceState);
 
       CustomDefaultPreference preference = (CustomDefaultPreference)getPreference();
diff --git a/src/org/thoughtcrime/securesms/components/ImageDivet.java b/src/org/thoughtcrime/securesms/components/ImageDivet.java
index c925f86c2..dad179a3e 100644
--- a/src/org/thoughtcrime/securesms/components/ImageDivet.java
+++ b/src/org/thoughtcrime/securesms/components/ImageDivet.java
@@ -4,12 +4,12 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
+import android.support.v7.widget.AppCompatImageView;
 import android.util.AttributeSet;
-import android.widget.ImageView;
 
 import network.loki.messenger.R;
 
-public class ImageDivet extends ImageView {
+public class ImageDivet extends AppCompatImageView {
   private static final float CORNER_OFFSET = 12F;
   private static final String[] POSITIONS  = new String[] {"bottom_right"};
 
@@ -84,10 +84,6 @@ public class ImageDivet extends ImageView {
     return CORNER_OFFSET * density;
   }
 
-  public ImageView asImageView() {
-    return this;
-  }
-
   public float getFarOffset() {
     return getCloseOffset() + drawableIntrinsicHeight;
   }
diff --git a/src/org/thoughtcrime/securesms/components/InputPanel.java b/src/org/thoughtcrime/securesms/components/InputPanel.java
index 8514c4d4d..f9fd36ab9 100644
--- a/src/org/thoughtcrime/securesms/components/InputPanel.java
+++ b/src/org/thoughtcrime/securesms/components/InputPanel.java
@@ -9,6 +9,8 @@ import android.support.annotation.MainThread;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.view.ViewCompat;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.text.format.DateUtils;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
@@ -23,10 +25,14 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import network.loki.messenger.R;
-import org.thoughtcrime.securesms.components.emoji.EmojiDrawer;
+import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider;
 import org.thoughtcrime.securesms.components.emoji.EmojiToggle;
+import org.thoughtcrime.securesms.components.emoji.MediaKeyboard;
+import org.thoughtcrime.securesms.conversation.ConversationStickerSuggestionAdapter;
+import org.thoughtcrime.securesms.database.model.StickerRecord;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
 import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.QuoteModel;
 import org.thoughtcrime.securesms.mms.SlideDeck;
@@ -39,21 +45,24 @@ import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
 import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
 import org.whispersystems.libsignal.util.guava.Optional;
 
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 public class InputPanel extends LinearLayout
     implements MicrophoneRecorderView.Listener,
                KeyboardAwareLinearLayout.OnKeyboardShownListener,
-               EmojiDrawer.EmojiEventListener
+               EmojiKeyboardProvider.EmojiEventListener,
+               ConversationStickerSuggestionAdapter.EventListener
 {
 
   private static final String TAG = InputPanel.class.getSimpleName();
 
   private static final int FADE_TIME = 150;
 
+  private RecyclerView    stickerSuggestion;
   private QuoteView       quoteView;
   private LinkPreviewView linkPreview;
-  private EmojiToggle     emojiToggle;
+  private EmojiToggle     mediaKeyboard;
   public  ComposeText     composeText;
   private View            quickCameraToggle;
   private View            quickAudioToggle;
@@ -66,7 +75,9 @@ public class InputPanel extends LinearLayout
   private RecordTime             recordTime;
 
   private @Nullable Listener listener;
-  private boolean emojiVisible;
+  private           boolean  emojiVisible;
+
+  private ConversationStickerSuggestionAdapter stickerSuggestionAdapter;
 
   public InputPanel(Context context) {
     super(context);
@@ -87,9 +98,10 @@ public class InputPanel extends LinearLayout
 
     View quoteDismiss = findViewById(R.id.quote_dismiss);
 
+    this.stickerSuggestion      = findViewById(R.id.input_panel_sticker_suggestion);
     this.quoteView              = findViewById(R.id.quote_view);
     this.linkPreview            = findViewById(R.id.link_preview);
-    this.emojiToggle            = findViewById(R.id.emoji_toggle);
+    this.mediaKeyboard          = findViewById(R.id.emoji_toggle);
     this.composeText            = findViewById(R.id.embedded_text_editor);
     this.quickCameraToggle      = findViewById(R.id.quick_camera_toggle);
     this.quickAudioToggle       = findViewById(R.id.quick_audio_toggle);
@@ -107,10 +119,10 @@ public class InputPanel extends LinearLayout
     this.recordLockCancel.setOnClickListener(v -> microphoneRecorderView.cancelAction());
 
     if (TextSecurePreferences.isSystemEmojiPreferred(getContext())) {
-      emojiToggle.setVisibility(View.GONE);
+      mediaKeyboard.setVisibility(View.GONE);
       emojiVisible = false;
     } else {
-      emojiToggle.setVisibility(View.VISIBLE);
+      mediaKeyboard.setVisibility(View.VISIBLE);
       emojiVisible = true;
     }
 
@@ -121,12 +133,17 @@ public class InputPanel extends LinearLayout
         listener.onLinkPreviewCanceled();
       }
     });
+
+    stickerSuggestionAdapter = new ConversationStickerSuggestionAdapter(GlideApp.with(this), this);
+
+    stickerSuggestion.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
+    stickerSuggestion.setAdapter(stickerSuggestionAdapter);
   }
 
   public void setListener(final @NonNull Listener listener) {
     this.listener = listener;
 
-    emojiToggle.setOnClickListener(v -> listener.onEmojiToggle());
+    mediaKeyboard.setOnClickListener(v -> listener.onEmojiToggle());
   }
 
   public void setMediaListener(@NonNull MediaListener listener) {
@@ -179,8 +196,26 @@ public class InputPanel extends LinearLayout
     this.linkPreview.setCorners(cornerRadius, cornerRadius);
   }
 
-  public void setEmojiDrawer(@NonNull EmojiDrawer emojiDrawer) {
-    emojiToggle.attach(emojiDrawer);
+  public void setMediaKeyboard(@NonNull MediaKeyboard mediaKeyboard) {
+    this.mediaKeyboard.attach(mediaKeyboard);
+  }
+
+  public void setStickerSuggestions(@NonNull List<StickerRecord> stickers) {
+    stickerSuggestion.setVisibility(stickers.isEmpty() ? View.GONE : View.VISIBLE);
+    stickerSuggestionAdapter.setStickers(stickers);
+  }
+
+  public void showMediaKeyboardToggle(boolean show) {
+    emojiVisible = show;
+    mediaKeyboard.setVisibility(show ? View.VISIBLE : GONE);
+  }
+
+  public void setMediaKeyboardToggleMode(boolean isSticker) {
+    mediaKeyboard.setStickerMode(isSticker);
+  }
+
+  public View getMediaKeyboardToggleAnchorView() {
+    return mediaKeyboard;
   }
 
   @Override
@@ -194,7 +229,7 @@ public class InputPanel extends LinearLayout
     recordTime.display();
     slideToCancel.display();
 
-    if (emojiVisible) ViewUtil.fadeOut(emojiToggle, FADE_TIME, View.INVISIBLE);
+    if (emojiVisible) ViewUtil.fadeOut(mediaKeyboard, FADE_TIME, View.INVISIBLE);
     ViewUtil.fadeOut(composeText, FADE_TIME, View.INVISIBLE);
     ViewUtil.fadeOut(quickCameraToggle, FADE_TIME, View.INVISIBLE);
     ViewUtil.fadeOut(quickAudioToggle, FADE_TIME, View.INVISIBLE);
@@ -250,7 +285,7 @@ public class InputPanel extends LinearLayout
 
   public void setEnabled(boolean enabled) {
     composeText.setEnabled(enabled);
-    emojiToggle.setEnabled(enabled);
+    mediaKeyboard.setEnabled(enabled);
     quickAudioToggle.setEnabled(enabled);
     quickCameraToggle.setEnabled(enabled);
   }
@@ -268,7 +303,7 @@ public class InputPanel extends LinearLayout
     future.addListener(new AssertedSuccessListener<Void>() {
       @Override
       public void onSuccess(Void result) {
-        if (emojiVisible) ViewUtil.fadeIn(emojiToggle, FADE_TIME);
+        if (emojiVisible) ViewUtil.fadeIn(mediaKeyboard, FADE_TIME);
         ViewUtil.fadeIn(composeText, FADE_TIME);
         ViewUtil.fadeIn(quickCameraToggle, FADE_TIME);
         ViewUtil.fadeIn(quickAudioToggle, FADE_TIME);
@@ -281,7 +316,7 @@ public class InputPanel extends LinearLayout
 
   @Override
   public void onKeyboardShown() {
-    emojiToggle.setToEmoji();
+    mediaKeyboard.setToMedia();
   }
 
   @Override
@@ -294,6 +329,13 @@ public class InputPanel extends LinearLayout
     composeText.insertEmoji(emoji);
   }
 
+  @Override
+  public void onStickerSuggestionClicked(@NonNull StickerRecord sticker) {
+    if (listener != null) {
+      listener.onStickerSuggestionSelected(sticker);
+    }
+  }
+
   private int readDimen(@DimenRes int dimenRes) {
     return getResources().getDimensionPixelSize(dimenRes);
   }
@@ -314,6 +356,7 @@ public class InputPanel extends LinearLayout
     void onRecorderPermissionRequired();
     void onEmojiToggle();
     void onLinkPreviewCanceled();
+    void onStickerSuggestionSelected(@NonNull StickerRecord sticker);
   }
 
   private static class SlideToCancel {
diff --git a/src/org/thoughtcrime/securesms/components/QuoteView.java b/src/org/thoughtcrime/securesms/components/QuoteView.java
index 733a1cc30..63f66cfa7 100644
--- a/src/org/thoughtcrime/securesms/components/QuoteView.java
+++ b/src/org/thoughtcrime/securesms/components/QuoteView.java
@@ -209,6 +209,7 @@ public class QuoteView extends FrameLayout implements RecipientModifiedListener
     List<Slide> documentSlides = Stream.of(attachments.getSlides()).filter(Slide::hasDocument).limit(1).toList();
     List<Slide> imageSlides    = Stream.of(attachments.getSlides()).filter(Slide::hasImage).limit(1).toList();
     List<Slide> videoSlides    = Stream.of(attachments.getSlides()).filter(Slide::hasVideo).limit(1).toList();
+    List<Slide> stickerSlides  = Stream.of(attachments.getSlides()).filter(Slide::hasSticker).limit(1).toList();
 
     // Given that most types have images, we specifically check images last
     if (!audioSlides.isEmpty()) {
@@ -217,13 +218,15 @@ public class QuoteView extends FrameLayout implements RecipientModifiedListener
       mediaDescriptionText.setVisibility(GONE);
     } else if (!videoSlides.isEmpty()) {
       mediaDescriptionText.setText(R.string.QuoteView_video);
+    } else if (!stickerSlides.isEmpty()) {
+      mediaDescriptionText.setText(R.string.QuoteView_sticker);
     } else if (!imageSlides.isEmpty()) {
       mediaDescriptionText.setText(R.string.QuoteView_photo);
     }
   }
 
   private void setQuoteAttachment(@NonNull GlideRequests glideRequests, @NonNull SlideDeck slideDeck) {
-    List<Slide> imageVideoSlides = Stream.of(slideDeck.getSlides()).filter(s -> s.hasImage() || s.hasVideo()).limit(1).toList();
+    List<Slide> imageVideoSlides = Stream.of(slideDeck.getSlides()).filter(s -> s.hasImage() || s.hasVideo() || s.hasSticker()).limit(1).toList();
     List<Slide> documentSlides   = Stream.of(attachments.getSlides()).filter(Slide::hasDocument).limit(1).toList();
 
     attachmentVideoOverlayView.setVisibility(GONE);
diff --git a/src/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java b/src/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java
index 56fd98c72..d1ce48088 100644
--- a/src/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java
+++ b/src/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java
@@ -64,17 +64,17 @@ public class RecentPhotoViewRail extends FrameLayout implements LoaderManager.Lo
   }
 
   @Override
-  public Loader<Cursor> onCreateLoader(int id, Bundle args) {
+  public @NonNull Loader<Cursor> onCreateLoader(int id, Bundle args) {
     return new RecentPhotosLoader(getContext());
   }
 
   @Override
-  public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
+  public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor data) {
     this.recyclerView.setAdapter(new RecentPhotoAdapter(getContext(), data, RecentPhotosLoader.BASE_URL, listener));
   }
 
   @Override
-  public void onLoaderReset(Loader<Cursor> loader) {
+  public void onLoaderReset(@NonNull Loader<Cursor> loader) {
     ((CursorRecyclerViewAdapter)this.recyclerView.getAdapter()).changeCursor(null);
   }
 
diff --git a/src/org/thoughtcrime/securesms/components/RecyclerViewFastScroller.java b/src/org/thoughtcrime/securesms/components/RecyclerViewFastScroller.java
index 4cd35c798..05c32624b 100644
--- a/src/org/thoughtcrime/securesms/components/RecyclerViewFastScroller.java
+++ b/src/org/thoughtcrime/securesms/components/RecyclerViewFastScroller.java
@@ -52,7 +52,7 @@ public class RecyclerViewFastScroller extends LinearLayout {
 
   private final RecyclerView.OnScrollListener onScrollListener = new RecyclerView.OnScrollListener() {
     @Override
-    public void onScrolled(final RecyclerView recyclerView, final int dx, final int dy) {
+    public void onScrolled(@NonNull final RecyclerView recyclerView, final int dx, final int dy) {
       if (handle.isSelected()) return;
       final int   offset      = recyclerView.computeVerticalScrollOffset();
       final int   range       = recyclerView.computeVerticalScrollRange();
diff --git a/src/org/thoughtcrime/securesms/components/RepeatableImageKey.java b/src/org/thoughtcrime/securesms/components/RepeatableImageKey.java
index 602db3d9f..5cf63cfe7 100644
--- a/src/org/thoughtcrime/securesms/components/RepeatableImageKey.java
+++ b/src/org/thoughtcrime/securesms/components/RepeatableImageKey.java
@@ -1,19 +1,14 @@
 package org.thoughtcrime.securesms.components;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
+import android.support.v7.widget.AppCompatImageButton;
 import android.util.AttributeSet;
 import android.view.HapticFeedbackConstants;
-import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
-import android.widget.EditText;
-import android.widget.ImageButton;
 
-public class RepeatableImageKey extends ImageButton {
+public class RepeatableImageKey extends AppCompatImageButton {
 
   private KeyEventListener listener;
 
@@ -32,14 +27,6 @@ public class RepeatableImageKey extends ImageButton {
     init();
   }
 
-  @TargetApi(VERSION_CODES.LOLLIPOP)
-  public RepeatableImageKey(Context context, AttributeSet attrs, int defStyleAttr,
-                            int defStyleRes)
-  {
-    super(context, attrs, defStyleAttr, defStyleRes);
-    init();
-  }
-
   private void init() {
     setOnClickListener(new RepeaterClickListener());
     setOnTouchListener(new RepeaterTouchListener());
@@ -60,31 +47,25 @@ public class RepeatableImageKey extends ImageButton {
   }
 
   private class Repeater implements Runnable {
-    @TargetApi(VERSION_CODES.HONEYCOMB_MR1)
     @Override
     public void run() {
       notifyListener();
-      postDelayed(this, VERSION.SDK_INT >= VERSION_CODES.HONEYCOMB_MR1
-                        ? ViewConfiguration.getKeyRepeatDelay()
-                        : 50);
+      postDelayed(this, ViewConfiguration.getKeyRepeatDelay());
     }
   }
 
   private class RepeaterTouchListener implements OnTouchListener {
-    private Repeater repeater;
+    private final Repeater repeater;
 
-    public RepeaterTouchListener() {
+    RepeaterTouchListener() {
       this.repeater = new Repeater();
     }
 
-    @TargetApi(VERSION_CODES.HONEYCOMB_MR1)
     @Override
     public boolean onTouch(View view, MotionEvent motionEvent) {
       switch (motionEvent.getAction()) {
       case MotionEvent.ACTION_DOWN:
-        view.postDelayed(repeater, VERSION.SDK_INT >= VERSION_CODES.HONEYCOMB_MR1
-                                   ? ViewConfiguration.getKeyRepeatTimeout()
-                                   : ViewConfiguration.getLongPressTimeout());
+        view.postDelayed(repeater, ViewConfiguration.getKeyRepeatTimeout());
         performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP);
         return false;
       case MotionEvent.ACTION_CANCEL:
diff --git a/src/org/thoughtcrime/securesms/components/SendButton.java b/src/org/thoughtcrime/securesms/components/SendButton.java
index 7d1579189..476b99fa5 100644
--- a/src/org/thoughtcrime/securesms/components/SendButton.java
+++ b/src/org/thoughtcrime/securesms/components/SendButton.java
@@ -2,9 +2,9 @@ package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
+import android.support.v7.widget.AppCompatImageButton;
 import android.util.AttributeSet;
 import android.view.View;
-import android.widget.ImageButton;
 
 import org.thoughtcrime.securesms.TransportOption;
 import org.thoughtcrime.securesms.TransportOptions;
@@ -13,7 +13,7 @@ import org.thoughtcrime.securesms.TransportOptionsPopup;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.whispersystems.libsignal.util.guava.Optional;
 
-public class SendButton extends ImageButton
+public class SendButton extends AppCompatImageButton
     implements TransportOptions.OnTransportChangedListener,
                TransportOptionsPopup.SelectedListener,
                View.OnLongClickListener
diff --git a/src/org/thoughtcrime/securesms/components/SquareImageView.java b/src/org/thoughtcrime/securesms/components/SquareImageView.java
index 57ba99720..997349d69 100644
--- a/src/org/thoughtcrime/securesms/components/SquareImageView.java
+++ b/src/org/thoughtcrime/securesms/components/SquareImageView.java
@@ -1,12 +1,10 @@
 package org.thoughtcrime.securesms.components;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build;
+import android.support.v7.widget.AppCompatImageView;
 import android.util.AttributeSet;
-import android.widget.ImageView;
 
-public class SquareImageView extends ImageView {
+public class SquareImageView extends AppCompatImageView {
   public SquareImageView(Context context) {
     super(context);
   }
@@ -19,13 +17,9 @@ public class SquareImageView extends ImageView {
     super(context, attrs, defStyleAttr);
   }
 
-  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-  public SquareImageView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-    super(context, attrs, defStyleAttr, defStyleRes);
-  }
-
   @Override
   public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    //noinspection SuspiciousNameCombination
     super.onMeasure(widthMeasureSpec, widthMeasureSpec);
   }
 }
diff --git a/src/org/thoughtcrime/securesms/components/StickerView.java b/src/org/thoughtcrime/securesms/components/StickerView.java
new file mode 100644
index 000000000..ae4813917
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/components/StickerView.java
@@ -0,0 +1,68 @@
+package org.thoughtcrime.securesms.components;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.FrameLayout;
+
+import org.thoughtcrime.securesms.mms.GlideRequests;
+import org.thoughtcrime.securesms.mms.Slide;
+import org.thoughtcrime.securesms.mms.SlideClickListener;
+import org.thoughtcrime.securesms.mms.SlidesClickedListener;
+
+import network.loki.messenger.R;
+
+public class StickerView extends FrameLayout {
+
+  private ThumbnailView image;
+  private View          missingShade;
+
+  public StickerView(@NonNull Context context) {
+    super(context);
+    init();
+  }
+
+  public StickerView(@NonNull Context context, @Nullable AttributeSet attrs) {
+    super(context, attrs);
+    init();
+  }
+
+  private void init() {
+    inflate(getContext(), R.layout.sticker_view, this);
+
+    this.image        = findViewById(R.id.sticker_thumbnail);
+    this.missingShade = findViewById(R.id.sticker_missing_shade);
+  }
+
+  @Override
+  public void setFocusable(boolean focusable) {
+    image.setFocusable(focusable);
+  }
+
+  @Override
+  public void setClickable(boolean clickable) {
+    image.setClickable(clickable);
+  }
+
+  @Override
+  public void setOnLongClickListener(@Nullable OnLongClickListener l) {
+    image.setOnLongClickListener(l);
+  }
+
+  public void setSticker(@NonNull GlideRequests glideRequests, @NonNull Slide stickerSlide) {
+    boolean showControls = stickerSlide.asAttachment().getDataUri() == null;
+
+    image.setImageResource(glideRequests, stickerSlide, showControls, false);
+    missingShade.setVisibility(showControls ? View.VISIBLE : View.GONE);
+  }
+
+  public void setThumbnailClickListener(@NonNull SlideClickListener listener) {
+    image.setThumbnailClickListener(listener);
+  }
+
+  public void setDownloadClickListener(@NonNull SlidesClickedListener listener) {
+    image.setDownloadClickListener(listener);
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/components/TooltipPopup.java b/src/org/thoughtcrime/securesms/components/TooltipPopup.java
new file mode 100644
index 000000000..a24cb7ca9
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/components/TooltipPopup.java
@@ -0,0 +1,225 @@
+package org.thoughtcrime.securesms.components;
+
+import android.content.Context;
+import android.graphics.PorterDuff;
+import android.os.Build;
+import android.support.annotation.ColorInt;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+import android.widget.ImageView;
+import android.widget.PopupWindow;
+import android.widget.TextView;
+
+import org.thoughtcrime.securesms.mms.GlideApp;
+import org.thoughtcrime.securesms.util.ThemeUtil;
+
+import network.loki.messenger.R;
+
+/**
+ * Class for creating simple tooltips to show throughout the app. Utilizes a popup window so you
+ * don't have to worry about view hierarchies or anything.
+ */
+public class TooltipPopup extends PopupWindow {
+
+  public static final int POSITION_ABOVE = 0;
+  public static final int POSITION_BELOW = 1;
+  public static final int POSITION_START = 2;
+  public static final int POSITION_END   = 3;
+
+  private static final int POSITION_LEFT  = 4;
+  private static final int POSITION_RIGHT = 5;
+
+  private final View      anchor;
+  private final ImageView arrow;
+  private final int       position;
+
+  public static Builder forTarget(@NonNull View anchor) {
+    return new Builder(anchor);
+  }
+
+  private TooltipPopup(@NonNull View anchor,
+                       int rawPosition,
+                       @NonNull String text,
+                       @ColorInt int backgroundTint,
+                       @ColorInt int textColor,
+                       @Nullable Object iconGlideModel,
+                       @Nullable OnDismissListener dismissListener)
+  {
+    super(LayoutInflater.from(anchor.getContext()).inflate(R.layout.tooltip, null),
+          ViewGroup.LayoutParams.WRAP_CONTENT,
+          ViewGroup.LayoutParams.WRAP_CONTENT);
+
+    this.anchor   = anchor;
+    this.position = getRtlPosition(anchor.getContext(), rawPosition);
+
+    switch (rawPosition) {
+      case POSITION_ABOVE: arrow = getContentView().findViewById(R.id.tooltip_arrow_bottom); break;
+      case POSITION_BELOW: arrow = getContentView().findViewById(R.id.tooltip_arrow_top); break;
+      case POSITION_START: arrow = getContentView().findViewById(R.id.tooltip_arrow_end); break;
+      case POSITION_END:   arrow = getContentView().findViewById(R.id.tooltip_arrow_start); break;
+      default: throw new AssertionError("Invalid position!");
+    }
+
+    arrow.setVisibility(View.VISIBLE);
+
+    TextView textView = getContentView().findViewById(R.id.tooltip_text);
+    textView.setText(text);
+
+    if (textColor != 0) {
+      textView.setTextColor(textColor);
+    }
+
+    View bubble = getContentView().findViewById(R.id.tooltip_bubble);
+
+    if (backgroundTint == 0) {
+      bubble.getBackground().setColorFilter(ThemeUtil.getThemedColor(anchor.getContext(), R.attr.tooltip_default_color), PorterDuff.Mode.MULTIPLY);
+      arrow.setColorFilter(ThemeUtil.getThemedColor(anchor.getContext(), R.attr.tooltip_default_color), PorterDuff.Mode.MULTIPLY);
+    } else {
+      bubble.getBackground().setColorFilter(backgroundTint, PorterDuff.Mode.MULTIPLY);
+      arrow.setColorFilter(backgroundTint, PorterDuff.Mode.MULTIPLY);
+    }
+
+    if (iconGlideModel != null) {
+      ImageView iconView = getContentView().findViewById(R.id.tooltip_icon);
+      iconView.setVisibility(View.VISIBLE);
+      GlideApp.with(anchor.getContext()).load(iconGlideModel).into(iconView);
+    }
+
+    if (Build.VERSION.SDK_INT >= 21) {
+      setElevation(10);
+    }
+
+    getContentView().setOnClickListener(v -> dismiss());
+
+    setOnDismissListener(dismissListener);
+    setBackgroundDrawable(null);
+    setOutsideTouchable(true);
+  }
+
+  private void show() {
+    if (anchor.getWidth() == 0 && anchor.getHeight() == 0) {
+      anchor.post(this::show);
+      return;
+    }
+
+    getContentView().measure(View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED),
+                             View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED));
+
+    int tooltipSpacing = anchor.getContext().getResources().getDimensionPixelOffset(R.dimen.tooltip_popup_margin);
+
+    int xoffset;
+    int yoffset;
+
+    switch (position) {
+      case POSITION_ABOVE:
+        xoffset = 0;
+        yoffset = -(2 * anchor.getWidth() + tooltipSpacing);
+        onLayout(() -> setArrowHorizontalPosition(arrow, anchor));
+        break;
+      case POSITION_BELOW:
+        xoffset = 0;
+        yoffset = tooltipSpacing;
+        onLayout(() -> setArrowHorizontalPosition(arrow, anchor));
+        break;
+      case POSITION_LEFT:
+        xoffset = -getContentView().getMeasuredWidth() - tooltipSpacing;
+        yoffset = -(getContentView().getMeasuredHeight()/2 + anchor.getHeight()/2);
+        break;
+      case POSITION_RIGHT:
+        xoffset = anchor.getWidth() + tooltipSpacing;
+        yoffset = -(getContentView().getMeasuredHeight()/2 + anchor.getHeight()/2);
+        break;
+      default:
+        throw new AssertionError("Invalid tooltip position!");
+    }
+
+    showAsDropDown(anchor, xoffset, yoffset);
+  }
+
+  private void onLayout(@NonNull Runnable runnable) {
+    getContentView().getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+      @Override
+      public void onGlobalLayout() {
+        getContentView().getViewTreeObserver().removeOnGlobalLayoutListener(this);
+        runnable.run();
+      }
+    });
+  }
+
+  private static void setArrowHorizontalPosition(@NonNull View arrow, @NonNull View anchor) {
+    int arrowCenterX  = getAbsolutePosition(arrow)[0] + arrow.getWidth()/2;
+    int anchorCenterX = getAbsolutePosition(anchor)[0] + anchor.getWidth()/2;
+
+    arrow.setX(anchorCenterX - arrowCenterX);
+  }
+
+  private static int[] getAbsolutePosition(@NonNull View view) {
+    int[] position = new int[2];
+    view.getLocationOnScreen(position);
+    return position;
+  }
+
+  private static int getRtlPosition(@NonNull Context context, int position) {
+    if (position == POSITION_ABOVE || position == POSITION_BELOW) {
+      return position;
+    } else if (context.getResources().getConfiguration().getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {
+      return position == POSITION_START ? POSITION_RIGHT : POSITION_LEFT;
+    } else {
+      return position == POSITION_START ? POSITION_LEFT : POSITION_RIGHT;
+    }
+  }
+
+  public static class Builder {
+
+    private final View anchor;
+
+    private int               backgroundTint;
+    private int               textColor;
+    private int               textResId;
+    private Object            iconGlideModel;
+    private OnDismissListener dismissListener;
+
+    private Builder(@NonNull View anchor) {
+      this.anchor = anchor;
+    }
+
+    public Builder setBackgroundTint(int color) {
+      this.backgroundTint = color;
+      return this;
+    }
+
+    public Builder setTextColor(int color) {
+      this.textColor = color;
+      return this;
+    }
+
+    public Builder setText(@StringRes int stringResId) {
+      this.textResId = stringResId;
+      return this;
+    }
+
+    public Builder setIconGlideModel(Object model) {
+      this.iconGlideModel = model;
+      return this;
+    }
+
+    public Builder setOnDismissListener(OnDismissListener dismissListener) {
+      this.dismissListener = dismissListener;
+      return this;
+    }
+
+    public TooltipPopup show(int position) {
+      String       text    = anchor.getContext().getString(textResId);
+      TooltipPopup tooltip = new TooltipPopup(anchor, position, text, backgroundTint, textColor, iconGlideModel, dismissListener);
+
+      tooltip.show();
+
+      return tooltip;
+    }
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/components/TransferControlView.java b/src/org/thoughtcrime/securesms/components/TransferControlView.java
index c9eace7eb..809de1197 100644
--- a/src/org/thoughtcrime/securesms/components/TransferControlView.java
+++ b/src/org/thoughtcrime/securesms/components/TransferControlView.java
@@ -1,23 +1,16 @@
 package org.thoughtcrime.securesms.components;
 
+import android.animation.LayoutTransition;
 import android.content.Context;
-import android.graphics.PorterDuff.Mode;
-import android.graphics.drawable.Drawable;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
-import android.support.v4.view.animation.FastOutSlowInInterpolator;
 import android.util.AttributeSet;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
 import com.annimon.stream.Stream;
-import com.nineoldandroids.animation.Animator;
-import com.nineoldandroids.animation.ValueAnimator;
 import com.pnikosis.materialishprogress.ProgressWheel;
 
 import org.greenrobot.eventbus.EventBus;
@@ -36,7 +29,6 @@ import java.util.List;
 import java.util.Map;
 
 public class TransferControlView extends FrameLayout {
-  private static final int TRANSITION_MS = 300;
 
   @Nullable private List<Slide> slides;
   @Nullable private View        current;
@@ -44,8 +36,6 @@ public class TransferControlView extends FrameLayout {
   private final ProgressWheel progressWheel;
   private final View          downloadDetails;
   private final TextView      downloadDetailsText;
-  private final int           contractedWidth;
-  private final int           expandedWidth;
 
   private final Map<Attachment, Float> downloadProgress;
 
@@ -61,20 +51,15 @@ public class TransferControlView extends FrameLayout {
     super(context, attrs, defStyleAttr);
     inflate(context, R.layout.transfer_controls_view, this);
 
-    final Drawable background = ContextCompat.getDrawable(context, R.drawable.transfer_controls_background);
-    if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN_MR1) {
-      background.setColorFilter(0x66ffffff, Mode.MULTIPLY);
-    }
     setLongClickable(false);
-    ViewUtil.setBackground(this, background);
+    ViewUtil.setBackground(this, ContextCompat.getDrawable(context, R.drawable.transfer_controls_background));
     setVisibility(GONE);
+    setLayoutTransition(new LayoutTransition());
 
     this.downloadProgress    = new HashMap<>();
     this.progressWheel       = ViewUtil.findById(this, R.id.progress_wheel);
     this.downloadDetails     = ViewUtil.findById(this, R.id.download_details);
     this.downloadDetailsText = ViewUtil.findById(this, R.id.download_details_text);
-    this.contractedWidth     = getResources().getDimensionPixelSize(R.dimen.transfer_controls_contracted_width);
-    this.expandedWidth       = getResources().getDimensionPixelSize(R.dimen.transfer_controls_expanded_width);
   }
 
   @Override
@@ -208,42 +193,20 @@ public class TransferControlView extends FrameLayout {
   }
 
   private void display(@Nullable final View view) {
-    final int sourceWidth = (current == downloadDetails && downloadDetailsText.getVisibility() == VISIBLE) ? expandedWidth : contractedWidth;
-    final int targetWidth = (view    == downloadDetails && downloadDetailsText.getVisibility() == VISIBLE) ? expandedWidth : contractedWidth;
-
-    if (current == view || current == null) {
-      ViewGroup.LayoutParams layoutParams = getLayoutParams();
-      layoutParams.width = targetWidth;
-      setLayoutParams(layoutParams);
-    } else {
-      ViewUtil.fadeOut(current, TRANSITION_MS);
-      Animator anim = getWidthAnimator(sourceWidth, targetWidth);
-      anim.start();
+    if (current != null) {
+      current.setVisibility(GONE);
     }
 
-    if (view == null) {
-      ViewUtil.fadeOut(this, TRANSITION_MS);
+    if (view != null) {
+      view.setVisibility(VISIBLE);
+      setVisibility(VISIBLE);
     } else {
-      ViewUtil.fadeIn(this, TRANSITION_MS);
-      ViewUtil.fadeIn(view, TRANSITION_MS);
+      setVisibility(GONE);
     }
 
     current = view;
   }
 
-  private Animator getWidthAnimator(final int from, final int to) {
-    final ValueAnimator anim = ValueAnimator.ofInt(from, to);
-    anim.addUpdateListener(animation -> {
-      final int val = (Integer)animation.getAnimatedValue();
-      final ViewGroup.LayoutParams layoutParams = getLayoutParams();
-      layoutParams.width = val;
-      setLayoutParams(layoutParams);
-    });
-    anim.setInterpolator(new FastOutSlowInInterpolator());
-    anim.setDuration(TRANSITION_MS);
-    return anim;
-  }
-
   private float calculateProgress(@NonNull Map<Attachment, Float> downloadProgress) {
     float totalProgress = 0;
     for (float progress : downloadProgress.values()) {
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java
deleted file mode 100644
index c6ede305f..000000000
--- a/src/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java
+++ /dev/null
@@ -1,201 +0,0 @@
-package org.thoughtcrime.securesms.components.emoji;
-
-import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.util.AttributeSet;
-
-import org.thoughtcrime.securesms.components.emoji.EmojiPageViewGridAdapter.VariationSelectorListener;
-import org.thoughtcrime.securesms.logging.Log;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.ImageView.ScaleType;
-import android.widget.LinearLayout;
-
-import com.astuetz.PagerSlidingTabStrip;
-
-import network.loki.messenger.R;
-import org.thoughtcrime.securesms.components.InputAwareLayout.InputView;
-import org.thoughtcrime.securesms.components.RepeatableImageKey;
-import org.thoughtcrime.securesms.components.RepeatableImageKey.KeyEventListener;
-import org.thoughtcrime.securesms.components.emoji.EmojiPageView.EmojiSelectionListener;
-import org.thoughtcrime.securesms.util.ResUtil;
-
-import java.util.LinkedList;
-import java.util.List;
-
-public class EmojiDrawer extends LinearLayout implements InputView, EmojiSelectionListener, VariationSelectorListener {
-
-  private static final String TAG = EmojiDrawer.class.getSimpleName();
-
-  private static final KeyEvent DELETE_KEY_EVENT = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL);
-
-  private ViewPager            pager;
-  private List<EmojiPageModel> models;
-  private PagerSlidingTabStrip strip;
-  private RecentEmojiPageModel recentModel;
-  private EmojiEventListener   listener;
-  private EmojiDrawerListener  drawerListener;
-
-  public EmojiDrawer(Context context) {
-    this(context, null);
-  }
-
-  public EmojiDrawer(Context context, AttributeSet attrs) {
-    super(context, attrs);
-    setOrientation(VERTICAL);
-  }
-
-  private void initView() {
-    final View v = LayoutInflater.from(getContext()).inflate(R.layout.emoji_drawer, this, true);
-    initializeResources(v);
-    initializePageModels();
-    initializeEmojiGrid();
-  }
-
-  public void setEmojiEventListener(EmojiEventListener listener) {
-    this.listener = listener;
-  }
-
-  public void setDrawerListener(EmojiDrawerListener listener) {
-    this.drawerListener = listener;
-  }
-
-  private void initializeResources(View v) {
-    Log.i(TAG, "initializeResources()");
-    this.pager     = (ViewPager)            v.findViewById(R.id.emoji_pager);
-    this.strip     = (PagerSlidingTabStrip) v.findViewById(R.id.tabs);
-
-    RepeatableImageKey backspace = (RepeatableImageKey)v.findViewById(R.id.backspace);
-    backspace.setOnKeyEventListener(new KeyEventListener() {
-      @Override
-      public void onKeyEvent() {
-        if (listener != null) listener.onKeyEvent(DELETE_KEY_EVENT);
-      }
-    });
-  }
-
-  @Override
-  public boolean isShowing() {
-    return getVisibility() == VISIBLE;
-  }
-
-  @Override
-  public void show(int height, boolean immediate) {
-    if (this.pager == null) initView();
-    ViewGroup.LayoutParams params = getLayoutParams();
-    params.height = height;
-    Log.i(TAG, "showing emoji drawer with height " + params.height);
-    setLayoutParams(params);
-    setVisibility(VISIBLE);
-    if (drawerListener != null) drawerListener.onShown();
-  }
-
-  @Override
-  public void hide(boolean immediate) {
-    setVisibility(GONE);
-    if (drawerListener != null) drawerListener.onHidden();
-    Log.i(TAG, "hide()");
-  }
-
-  @Override
-  public void onEmojiSelected(String emoji) {
-    recentModel.onCodePointSelected(emoji);
-    if (listener != null) {
-      listener.onEmojiSelected(emoji);
-    }
-  }
-
-  @Override
-  public void onVariationSelectorStateChanged(boolean open) {
-    pager.setEnabled(!open);
-  }
-
-  private void initializeEmojiGrid() {
-    pager.setAdapter(new EmojiPagerAdapter(getContext(), models, this, this));
-
-    if (recentModel.getDisplayEmoji().size() == 0) {
-      pager.setCurrentItem(1);
-    }
-    strip.setViewPager(pager);
-  }
-
-  private void initializePageModels() {
-    this.models = new LinkedList<>();
-    this.recentModel = new RecentEmojiPageModel(getContext());
-    this.models.add(recentModel);
-    this.models.addAll(EmojiPages.DISPLAY_PAGES);
-  }
-
-  public static class EmojiPagerAdapter extends PagerAdapter
-      implements PagerSlidingTabStrip.CustomTabProvider
-  {
-    private Context                   context;
-    private List<EmojiPageModel>      pages;
-    private EmojiSelectionListener    emojiSelectionListener;
-    private VariationSelectorListener variationSelectorListener;
-
-    public EmojiPagerAdapter(@NonNull Context context,
-                             @NonNull List<EmojiPageModel> pages,
-                             @NonNull EmojiSelectionListener emojiSelectionListener,
-                             @NonNull VariationSelectorListener variationSelectorListener)
-    {
-      super();
-      this.context                   = context;
-      this.pages                     = pages;
-      this.emojiSelectionListener    = emojiSelectionListener;
-      this.variationSelectorListener = variationSelectorListener;
-    }
-
-    @Override
-    public int getCount() {
-      return pages.size();
-    }
-
-    @Override
-    public @NonNull Object instantiateItem(@NonNull ViewGroup container, int position) {
-      EmojiPageView page = new EmojiPageView(context, emojiSelectionListener, variationSelectorListener);
-      page.setModel(pages.get(position));
-      container.addView(page);
-      return page;
-    }
-
-    @Override
-    public void destroyItem(ViewGroup container, int position, Object object) {
-      container.removeView((View)object);
-    }
-
-    @Override
-    public void setPrimaryItem(ViewGroup container, int position, Object object) {
-      EmojiPageView current = (EmojiPageView) object;
-      current.onSelected();
-      super.setPrimaryItem(container, position, object);
-    }
-
-    @Override
-    public boolean isViewFromObject(View view, Object object) {
-      return view == object;
-    }
-
-    @Override
-    public View getCustomTabView(ViewGroup viewGroup, int i) {
-      ImageView  image = new ImageView(context);
-      image.setScaleType(ScaleType.CENTER_INSIDE);
-      image.setImageResource(ResUtil.getDrawableRes(context, pages.get(i).getIconAttr()));
-      return image;
-    }
-  }
-
-  public interface EmojiEventListener extends EmojiSelectionListener {
-    void onKeyEvent(KeyEvent keyEvent);
-  }
-
-  public interface EmojiDrawerListener {
-    void onShown();
-    void onHidden();
-  }
-}
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java
new file mode 100644
index 000000000..c0f1f9048
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java
@@ -0,0 +1,165 @@
+package org.thoughtcrime.securesms.components.emoji;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.view.PagerAdapter;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import org.thoughtcrime.securesms.components.emoji.EmojiPageViewGridAdapter.VariationSelectorListener;
+import org.thoughtcrime.securesms.mms.GlideRequests;
+import org.thoughtcrime.securesms.util.ResUtil;
+import org.thoughtcrime.securesms.util.ThemeUtil;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import network.loki.messenger.R;
+
+/**
+ * A provider to select emoji in the {@link org.thoughtcrime.securesms.components.emoji.MediaKeyboard}.
+ */
+public class EmojiKeyboardProvider implements MediaKeyboardProvider,
+                                              MediaKeyboardProvider.TabIconProvider,
+                                              MediaKeyboardProvider.BackspaceObserver,
+                                              VariationSelectorListener
+{
+  private static final KeyEvent DELETE_KEY_EVENT = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL);
+
+  private final Context              context;
+  private final List<EmojiPageModel> models;
+  private final RecentEmojiPageModel recentModel;
+  private final EmojiPagerAdapter    emojiPagerAdapter;
+  private final EmojiEventListener   emojiEventListener;
+
+  private Controller controller;
+
+  public EmojiKeyboardProvider(@NonNull Context context, @Nullable EmojiEventListener emojiEventListener) {
+    this.context            = context;
+    this.emojiEventListener = emojiEventListener;
+    this.models             = new LinkedList<>();
+    this.recentModel        = new RecentEmojiPageModel(context);
+    this.emojiPagerAdapter  = new EmojiPagerAdapter(context, models, new EmojiEventListener() {
+      @Override
+      public void onEmojiSelected(String emoji) {
+        recentModel.onCodePointSelected(emoji);
+
+        if (emojiEventListener != null) {
+          emojiEventListener.onEmojiSelected(emoji);
+        }
+      }
+
+      @Override
+      public void onKeyEvent(KeyEvent keyEvent) {
+        if (emojiEventListener != null) {
+          emojiEventListener.onKeyEvent(keyEvent);
+        }
+      }
+    }, this);
+
+    models.add(recentModel);
+    models.addAll(EmojiPages.DISPLAY_PAGES);
+  }
+
+  @Override
+  public void requestPresentation(@NonNull Presenter presenter, boolean isSoloProvider) {
+    presenter.present(this, emojiPagerAdapter, this, this, null, null, recentModel.getEmoji().size() > 0 ? 0 : 1);
+  }
+
+  @Override
+  public void setController(@Nullable Controller controller) {
+    this.controller = controller;
+  }
+
+  @Override
+  public int getProviderIconView(boolean selected) {
+    if (selected) {
+      return ThemeUtil.isDarkTheme(context) ? R.layout.emoji_keyboard_icon_dark_selected : R.layout.emoji_keyboard_icon_light_selected;
+    } else {
+      return ThemeUtil.isDarkTheme(context) ? R.layout.emoji_keyboard_icon_dark : R.layout.emoji_keyboard_icon_light;
+    }
+  }
+
+  @Override
+  public void loadCategoryTabIcon(@NonNull GlideRequests glideRequests, @NonNull ImageView imageView, int index) {
+    Drawable drawable = ResUtil.getDrawable(context, models.get(index).getIconAttr());
+    imageView.setImageDrawable(drawable);
+  }
+
+  @Override
+  public void onBackspaceClicked() {
+    if (emojiEventListener != null) {
+      emojiEventListener.onKeyEvent(DELETE_KEY_EVENT);
+    }
+  }
+
+  @Override
+  public void onVariationSelectorStateChanged(boolean open) {
+    if (controller != null) {
+      controller.setViewPagerEnabled(!open);
+    }
+  }
+
+  @Override
+  public boolean equals(@Nullable Object obj) {
+    return obj instanceof EmojiKeyboardProvider;
+  }
+
+  private static class EmojiPagerAdapter extends PagerAdapter {
+    private Context                   context;
+    private List<EmojiPageModel>      pages;
+    private EmojiEventListener emojiSelectionListener;
+    private VariationSelectorListener variationSelectorListener;
+
+    public EmojiPagerAdapter(@NonNull Context context,
+                             @NonNull List<EmojiPageModel> pages,
+                             @NonNull EmojiEventListener emojiSelectionListener,
+                             @NonNull VariationSelectorListener variationSelectorListener)
+    {
+      super();
+      this.context                   = context;
+      this.pages                     = pages;
+      this.emojiSelectionListener    = emojiSelectionListener;
+      this.variationSelectorListener = variationSelectorListener;
+    }
+
+    @Override
+    public int getCount() {
+      return pages.size();
+    }
+
+    @Override
+    public @NonNull Object instantiateItem(@NonNull ViewGroup container, int position) {
+      EmojiPageView page = new EmojiPageView(context, emojiSelectionListener, variationSelectorListener);
+      page.setModel(pages.get(position));
+      container.addView(page);
+      return page;
+    }
+
+    @Override
+    public void destroyItem(ViewGroup container, int position, Object object) {
+      container.removeView((View)object);
+    }
+
+    @Override
+    public void setPrimaryItem(ViewGroup container, int position, Object object) {
+      EmojiPageView current = (EmojiPageView) object;
+      current.onSelected();
+      super.setPrimaryItem(container, position, object);
+    }
+
+    @Override
+    public boolean isViewFromObject(View view, Object object) {
+      return view == object;
+    }
+  }
+
+  public interface EmojiEventListener {
+    void onEmojiSelected(String emoji);
+    void onKeyEvent(KeyEvent keyEvent);
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java
index 03662c166..607bdf608 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java
@@ -9,9 +9,10 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.widget.FrameLayout;
 
-import network.loki.messenger.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiPageViewGridAdapter.VariationSelectorListener;
 
+import network.loki.messenger.R;
+
 public class EmojiPageView extends FrameLayout implements VariationSelectorListener {
   private static final String TAG = EmojiPageView.class.getSimpleName();
 
@@ -24,7 +25,7 @@ public class EmojiPageView extends FrameLayout implements VariationSelectorListe
   private EmojiVariationSelectorPopup      popup;
 
   public EmojiPageView(@NonNull Context context,
-                       @NonNull EmojiSelectionListener emojiSelectionListener,
+                       @NonNull EmojiKeyboardProvider.EmojiEventListener emojiSelectionListener,
                        @NonNull VariationSelectorListener variationSelectorListener)
   {
     super(context);
@@ -37,9 +38,9 @@ public class EmojiPageView extends FrameLayout implements VariationSelectorListe
     scrollDisabler = new ScrollDisabler();
     popup          = new EmojiVariationSelectorPopup(context, emojiSelectionListener);
     adapter        = new EmojiPageViewGridAdapter(EmojiProvider.getInstance(context),
-                                              popup,
-                                              emojiSelectionListener,
-                                              this);
+                                                  popup,
+                                                  emojiSelectionListener,
+                                                  this);
 
     recyclerView.setLayoutManager(layoutManager);
     recyclerView.setAdapter(adapter);
@@ -82,10 +83,6 @@ public class EmojiPageView extends FrameLayout implements VariationSelectorListe
     }
   }
 
-  public interface EmojiSelectionListener {
-    void onEmojiSelected(String emoji);
-  }
-
   private static class ScrollDisabler implements RecyclerView.OnItemTouchListener {
     @Override
     public boolean onInterceptTouchEvent(@NonNull RecyclerView recyclerView, @NonNull MotionEvent motionEvent) {
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiPageViewGridAdapter.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiPageViewGridAdapter.java
index 4cd1e65ab..8b599e378 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/EmojiPageViewGridAdapter.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiPageViewGridAdapter.java
@@ -10,7 +10,7 @@ import android.widget.ImageView;
 import android.widget.PopupWindow;
 
 import network.loki.messenger.R;
-import org.thoughtcrime.securesms.components.emoji.EmojiPageView.EmojiSelectionListener;
+import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider.EmojiEventListener;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,17 +21,17 @@ public class EmojiPageViewGridAdapter extends RecyclerView.Adapter<EmojiPageView
   private final EmojiProvider               emojiProvider;
   private final EmojiVariationSelectorPopup popup;
   private final VariationSelectorListener   variationSelectorListener;
-  private final EmojiSelectionListener      emojiSelectionListener;
+  private final EmojiEventListener          emojiEventListener;
 
   public EmojiPageViewGridAdapter(@NonNull EmojiProvider emojiProvider,
                                   @NonNull EmojiVariationSelectorPopup popup,
-                                  @NonNull EmojiSelectionListener emojiSelectionListener,
+                                  @NonNull EmojiEventListener emojiEventListener,
                                   @NonNull VariationSelectorListener variationSelectorListener)
   {
     this.emojiList                 = new ArrayList<>();
     this.emojiProvider             = emojiProvider;
     this.popup                     = popup;
-    this.emojiSelectionListener    = emojiSelectionListener;
+    this.emojiEventListener        = emojiEventListener;
     this.variationSelectorListener = variationSelectorListener;
 
     popup.setOnDismissListener(this);
@@ -62,7 +62,7 @@ public class EmojiPageViewGridAdapter extends RecyclerView.Adapter<EmojiPageView
     }
 
     viewHolder.itemView.setOnClickListener(v -> {
-      emojiSelectionListener.onEmojiSelected(emoji.getValue());
+      emojiEventListener.onEmojiSelected(emoji.getValue());
     });
 
     if (emoji.getVariations().size() > 1) {
@@ -110,7 +110,7 @@ public class EmojiPageViewGridAdapter extends RecyclerView.Adapter<EmojiPageView
     }
   }
 
-  interface VariationSelectorListener {
+  public interface VariationSelectorListener {
     void onVariationSelectorStateChanged(boolean open);
   }
 }
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiSpan.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiSpan.java
index 35cde3144..998e2b999 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/EmojiSpan.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiSpan.java
@@ -25,7 +25,7 @@ public class EmojiSpan extends AnimatingImageSpan {
   }
 
   @Override
-  public int getSize(Paint paint, CharSequence text, int start, int end, FontMetricsInt fm) {
+  public int getSize(@NonNull Paint paint, CharSequence text, int start, int end, FontMetricsInt fm) {
     if (fm != null && this.fm != null) {
       fm.ascent  = this.fm.ascent;
       fm.descent = this.fm.descent;
@@ -39,7 +39,7 @@ public class EmojiSpan extends AnimatingImageSpan {
   }
 
   @Override
-  public void draw(Canvas canvas, CharSequence text, int start, int end, float x, int top, int y, int bottom, Paint paint) {
+  public void draw(@NonNull Canvas canvas, CharSequence text, int start, int end, float x, int top, int y, int bottom, @NonNull Paint paint) {
     int height          = bottom - top;
     int centeringMargin = (height - size) / 2;
     int adjustedMargin  = (int) (centeringMargin * SHIFT_FACTOR);
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java
index d96c2de34..19c9da5fb 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java
@@ -1,20 +1,25 @@
 package org.thoughtcrime.securesms.components.emoji;
 
-
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.AppCompatImageButton;
 import android.util.AttributeSet;
-import android.widget.ImageButton;
 
 import network.loki.messenger.R;
-import org.thoughtcrime.securesms.components.emoji.EmojiDrawer.EmojiDrawerListener;
+import org.thoughtcrime.securesms.stickers.StickerKeyboardProvider;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
-public class EmojiToggle extends ImageButton implements EmojiDrawerListener {
+public class EmojiToggle extends AppCompatImageButton implements MediaKeyboard.MediaKeyboardListener {
 
   private Drawable emojiToggle;
+  private Drawable stickerToggle;
+
+  private Drawable mediaToggle;
   private Drawable imeToggle;
 
+
   public EmojiToggle(Context context) {
     super(context);
     initialize();
@@ -30,8 +35,8 @@ public class EmojiToggle extends ImageButton implements EmojiDrawerListener {
     initialize();
   }
 
-  public void setToEmoji() {
-    setImageDrawable(emojiToggle);
+  public void setToMedia() {
+    setImageDrawable(mediaToggle);
   }
 
   public void setToIme() {
@@ -40,18 +45,29 @@ public class EmojiToggle extends ImageButton implements EmojiDrawerListener {
 
   private void initialize() {
     int attributes[] = new int[] {R.attr.conversation_emoji_toggle,
-        R.attr.conversation_keyboard_toggle};
+                                  R.attr.conversation_sticker_toggle,
+                                  R.attr.conversation_keyboard_toggle};
 
     TypedArray drawables = getContext().obtainStyledAttributes(attributes);
     this.emojiToggle     = drawables.getDrawable(0);
-    this.imeToggle       = drawables.getDrawable(1);
+    this.stickerToggle   = drawables.getDrawable(1);
+    this.imeToggle       = drawables.getDrawable(2);
+    this.mediaToggle     = emojiToggle;
 
     drawables.recycle();
-    setToEmoji();
+    setToMedia();
   }
 
-  public void attach(EmojiDrawer drawer) {
-    drawer.setDrawerListener(this);
+  public void attach(MediaKeyboard drawer) {
+    drawer.setKeyboardListener(this);
+  }
+
+  public void setStickerMode(boolean stickerMode) {
+    this.mediaToggle = stickerMode ? stickerToggle : emojiToggle;
+
+    if (getDrawable() != imeToggle) {
+      setToMedia();
+    }
   }
 
   @Override public void onShown() {
@@ -59,6 +75,13 @@ public class EmojiToggle extends ImageButton implements EmojiDrawerListener {
   }
 
   @Override public void onHidden() {
-    setToEmoji();
+    setToMedia();
+  }
+
+  @Override
+  public void onKeyboardProviderChanged(@NonNull MediaKeyboardProvider provider) {
+    setStickerMode(provider instanceof StickerKeyboardProvider);
+    TextSecurePreferences.setMediaKeyboardMode(getContext(), (provider instanceof StickerKeyboardProvider) ? TextSecurePreferences.MediaKeyboardMode.STICKER
+                                                                                                           : TextSecurePreferences.MediaKeyboardMode.EMOJI);
   }
 }
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java
index 5af279bc3..06a617d5b 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java
@@ -9,17 +9,17 @@ import android.widget.ImageView;
 import android.widget.PopupWindow;
 
 import network.loki.messenger.R;
-import org.thoughtcrime.securesms.components.emoji.EmojiPageView.EmojiSelectionListener;
+import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider.EmojiEventListener;
 
 import java.util.List;
 
 public class EmojiVariationSelectorPopup extends PopupWindow {
 
-  private final Context                context;
-  private final ViewGroup              list;
-  private final EmojiSelectionListener listener;
+  private final Context            context;
+  private final ViewGroup          list;
+  private final EmojiEventListener listener;
 
-  public EmojiVariationSelectorPopup(@NonNull Context context, @NonNull EmojiSelectionListener listener) {
+  public EmojiVariationSelectorPopup(@NonNull Context context, @NonNull EmojiEventListener listener) {
     super(LayoutInflater.from(context).inflate(R.layout.emoji_variation_selector, null),
           ViewGroup.LayoutParams.WRAP_CONTENT,
           ViewGroup.LayoutParams.WRAP_CONTENT);
diff --git a/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java b/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java
new file mode 100644
index 000000000..ae86d7a79
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java
@@ -0,0 +1,275 @@
+package org.thoughtcrime.securesms.components.emoji;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+
+import org.thoughtcrime.securesms.components.InputAwareLayout.InputView;
+import org.thoughtcrime.securesms.components.RepeatableImageKey;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.mms.GlideApp;
+
+import java.util.Arrays;
+
+import network.loki.messenger.R;
+
+public class MediaKeyboard extends FrameLayout implements InputView,
+                                                          MediaKeyboardProvider.Presenter,
+                                                          MediaKeyboardProvider.Controller,
+                                                          MediaKeyboardBottomTabAdapter.EventListener
+{
+
+  private static final String TAG = Log.tag(MediaKeyboard.class);
+
+  private RecyclerView            categoryTabs;
+  private ViewPager               categoryPager;
+  private ViewGroup               providerTabs;
+  private RepeatableImageKey      backspaceButton;
+  private RepeatableImageKey      backspaceButtonBackup;
+  private View                    searchButton;
+  private View                    addButton;
+  private MediaKeyboardListener keyboardListener;
+  private MediaKeyboardProvider[] providers;
+  private int                     providerIndex;
+
+  private MediaKeyboardBottomTabAdapter categoryTabAdapter;
+
+  public MediaKeyboard(Context context) {
+    this(context, null);
+  }
+
+  public MediaKeyboard(Context context, AttributeSet attrs) {
+    super(context, attrs);
+  }
+
+  public void setProviders(int startIndex, MediaKeyboardProvider... providers) {
+    if (!Arrays.equals(this.providers, providers)) {
+      this.providers     = providers;
+      this.providerIndex = startIndex;
+
+      requestPresent(providers, providerIndex);
+    }
+  }
+
+  public void setKeyboardListener(MediaKeyboardListener listener) {
+    this.keyboardListener = listener;
+  }
+
+  @Override
+  public boolean isShowing() {
+    return getVisibility() == VISIBLE;
+  }
+
+  @Override
+  public void show(int height, boolean immediate) {
+    if (this.categoryPager == null) initView();
+
+    ViewGroup.LayoutParams params = getLayoutParams();
+    params.height = height;
+    Log.i(TAG, "showing emoji drawer with height " + params.height);
+    setLayoutParams(params);
+    setVisibility(VISIBLE);
+
+    if (keyboardListener != null) keyboardListener.onShown();
+
+    requestPresent(providers, providerIndex);
+  }
+
+  @Override
+  public void hide(boolean immediate) {
+    setVisibility(GONE);
+    if (keyboardListener != null) keyboardListener.onHidden();
+    Log.i(TAG, "hide()");
+  }
+
+  @Override
+  public void present(@NonNull MediaKeyboardProvider provider,
+                      @NonNull PagerAdapter pagerAdapter,
+                      @NonNull MediaKeyboardProvider.TabIconProvider tabIconProvider,
+                      @Nullable MediaKeyboardProvider.BackspaceObserver backspaceObserver,
+                      @Nullable MediaKeyboardProvider.AddObserver addObserver,
+                      @Nullable MediaKeyboardProvider.SearchObserver searchObserver,
+                      int startingIndex)
+  {
+    if (categoryPager == null) return;
+    if (!provider.equals(providers[providerIndex])) return;
+    if (keyboardListener != null) keyboardListener.onKeyboardProviderChanged(provider);
+
+    boolean isSolo = providers.length == 1;
+
+    presentProviderStrip(isSolo);
+    presentCategoryPager(pagerAdapter, tabIconProvider, startingIndex);
+    presentProviderTabs(providers, providerIndex);
+    presentSearchButton(searchObserver);
+    presentBackspaceButton(backspaceObserver, isSolo);
+    presentAddButton(addObserver);
+  }
+
+  @Override
+  public int getCurrentPosition() {
+    return categoryPager != null ? categoryPager.getCurrentItem() : 0;
+  }
+
+  @Override
+  public void requestDismissal() {
+    hide(true);
+    providerIndex = 0;
+    keyboardListener.onKeyboardProviderChanged(providers[providerIndex]);
+  }
+
+  @Override
+  public boolean isVisible() {
+    return getVisibility() == View.VISIBLE;
+  }
+
+  @Override
+  public void onTabSelected(int index) {
+    if (categoryPager != null) {
+      categoryPager.setCurrentItem(index);
+      categoryTabs.smoothScrollToPosition(index);
+    }
+  }
+
+  @Override
+  public void setViewPagerEnabled(boolean enabled) {
+    if (categoryPager != null) {
+      categoryPager.setEnabled(enabled);
+    }
+  }
+
+  private void initView() {
+    final View view = LayoutInflater.from(getContext()).inflate(R.layout.media_keyboard, this, true);
+
+    this.categoryTabs          = view.findViewById(R.id.media_keyboard_tabs);
+    this.categoryPager         = view.findViewById(R.id.media_keyboard_pager);
+    this.providerTabs          = view.findViewById(R.id.media_keyboard_provider_tabs);
+    this.backspaceButton       = view.findViewById(R.id.media_keyboard_backspace);
+    this.backspaceButtonBackup = view.findViewById(R.id.media_keyboard_backspace_backup);
+    this.searchButton          = view.findViewById(R.id.media_keyboard_search);
+    this.addButton             = view.findViewById(R.id.media_keyboard_add);
+
+    this.categoryTabAdapter = new MediaKeyboardBottomTabAdapter(GlideApp.with(this), this);
+
+    categoryTabs.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
+    categoryTabs.setAdapter(categoryTabAdapter);
+  }
+
+  private void requestPresent(@NonNull MediaKeyboardProvider[] providers, int newIndex) {
+    providers[providerIndex].setController(null);
+    providerIndex = newIndex;
+
+    providers[providerIndex].setController(this);
+    providers[providerIndex].requestPresentation(this, providers.length == 1);
+  }
+
+
+  private void presentCategoryPager(@NonNull PagerAdapter pagerAdapter,
+                                    @NonNull MediaKeyboardProvider.TabIconProvider iconProvider,
+                                    int startingIndex) {
+    if (categoryPager.getAdapter() != pagerAdapter) {
+      categoryPager.setAdapter(pagerAdapter);
+    }
+
+    categoryPager.setCurrentItem(startingIndex);
+
+    categoryPager.clearOnPageChangeListeners();
+    categoryPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+      @Override
+      public void onPageScrolled(int i, float v, int i1) {
+      }
+
+      @Override
+      public void onPageSelected(int i) {
+        categoryTabAdapter.setActivePosition(i);
+        categoryTabs.smoothScrollToPosition(i);
+      }
+
+      @Override
+      public void onPageScrollStateChanged(int i) {
+      }
+    });
+
+    categoryTabAdapter.setTabIconProvider(iconProvider, pagerAdapter.getCount());
+    categoryTabAdapter.setActivePosition(startingIndex);
+  }
+
+  private void presentProviderTabs(@NonNull MediaKeyboardProvider[] providers, int selected) {
+    providerTabs.removeAllViews();
+
+    LayoutInflater inflater = LayoutInflater.from(getContext());
+
+    for (int i = 0; i < providers.length; i++) {
+      MediaKeyboardProvider provider = providers[i];
+      View                  view     = inflater.inflate(provider.getProviderIconView(i == selected), providerTabs, false);
+
+      view.setTag(provider);
+
+      final int index = i;
+      view.setOnClickListener(v -> {
+        requestPresent(providers, index);
+      });
+
+      providerTabs.addView(view);
+    }
+  }
+
+  private void presentBackspaceButton(@Nullable MediaKeyboardProvider.BackspaceObserver backspaceObserver,
+                                      boolean useBackupPosition)
+  {
+    if (backspaceObserver != null) {
+      if (useBackupPosition) {
+        backspaceButton.setVisibility(INVISIBLE);
+        backspaceButton.setOnKeyEventListener(null);
+        backspaceButtonBackup.setVisibility(VISIBLE);
+        backspaceButtonBackup.setOnKeyEventListener(backspaceObserver::onBackspaceClicked);
+      } else {
+        backspaceButton.setVisibility(VISIBLE);
+        backspaceButton.setOnKeyEventListener(backspaceObserver::onBackspaceClicked);
+        backspaceButtonBackup.setVisibility(GONE);
+        backspaceButtonBackup.setOnKeyEventListener(null);
+      }
+    } else {
+      backspaceButton.setVisibility(INVISIBLE);
+      backspaceButton.setOnKeyEventListener(null);
+      backspaceButtonBackup.setVisibility(GONE);
+      backspaceButton.setOnKeyEventListener(null);
+    }
+  }
+
+  private void presentAddButton(@Nullable MediaKeyboardProvider.AddObserver addObserver) {
+    if (addObserver != null) {
+      addButton.setVisibility(VISIBLE);
+      addButton.setOnClickListener(v -> addObserver.onAddClicked());
+    } else {
+      addButton.setVisibility(GONE);
+      addButton.setOnClickListener(null);
+    }
+  }
+
+  private void presentSearchButton(@Nullable MediaKeyboardProvider.SearchObserver searchObserver) {
+    searchButton.setVisibility(searchObserver != null ? VISIBLE : INVISIBLE);
+  }
+
+  private void presentProviderStrip(boolean isSolo) {
+    int visibility = isSolo ? View.GONE : View.VISIBLE;
+
+    searchButton.setVisibility(visibility);
+    backspaceButton.setVisibility(visibility);
+    providerTabs.setVisibility(visibility);
+  }
+
+  public interface MediaKeyboardListener {
+    void onShown();
+    void onHidden();
+    void onKeyboardProviderChanged(@NonNull MediaKeyboardProvider provider);
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardBottomTabAdapter.java b/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardBottomTabAdapter.java
new file mode 100644
index 000000000..66236978a
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardBottomTabAdapter.java
@@ -0,0 +1,96 @@
+package org.thoughtcrime.securesms.components.emoji;
+
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import org.thoughtcrime.securesms.components.emoji.MediaKeyboardProvider.TabIconProvider;
+import org.thoughtcrime.securesms.mms.GlideRequests;
+
+import network.loki.messenger.R;
+
+public class MediaKeyboardBottomTabAdapter extends RecyclerView.Adapter<MediaKeyboardBottomTabAdapter.MediaKeyboardBottomTabViewHolder>  {
+
+  private final GlideRequests glideRequests;
+  private final EventListener eventListener;
+
+  private TabIconProvider tabIconProvider;
+  private int             activePosition;
+  private int             count;
+
+  public MediaKeyboardBottomTabAdapter(@NonNull GlideRequests glideRequests, @NonNull EventListener eventListener) {
+    this.glideRequests = glideRequests;
+    this.eventListener = eventListener;
+  }
+
+  @Override
+  public @NonNull MediaKeyboardBottomTabViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
+    return new MediaKeyboardBottomTabViewHolder(LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.media_keyboard_bottom_tab_item, viewGroup, false));
+  }
+
+  @Override
+  public void onBindViewHolder(@NonNull MediaKeyboardBottomTabViewHolder viewHolder, int i) {
+    viewHolder.bind(glideRequests, eventListener, tabIconProvider, i, i == activePosition);
+  }
+
+  @Override
+  public void onViewRecycled(@NonNull MediaKeyboardBottomTabViewHolder holder) {
+    holder.recycle();
+  }
+
+  @Override
+  public int getItemCount() {
+    return count;
+  }
+
+  public void setTabIconProvider(@NonNull TabIconProvider iconProvider, int count) {
+    this.tabIconProvider = iconProvider;
+    this.count           = count;
+
+    notifyDataSetChanged();
+  }
+
+  public void setActivePosition(int position) {
+    this.activePosition = position;
+    notifyDataSetChanged();
+  }
+
+  static class MediaKeyboardBottomTabViewHolder extends RecyclerView.ViewHolder {
+
+    private final ImageView image;
+    private final View      indicator;
+
+    public MediaKeyboardBottomTabViewHolder(@NonNull View itemView) {
+      super(itemView);
+
+      this.image     = itemView.findViewById(R.id.media_keyboard_bottom_tab_image);
+      this.indicator = itemView.findViewById(R.id.media_keyboard_bottom_tab_indicator);
+    }
+
+    void bind(@NonNull GlideRequests glideRequests,
+              @NonNull EventListener eventListener,
+              @NonNull TabIconProvider tabIconProvider,
+              int index,
+              boolean selected)
+    {
+      tabIconProvider.loadCategoryTabIcon(glideRequests, image, index);
+      image.setAlpha(selected ? 1 : 0.5f);
+      image.setSelected(selected);
+
+      indicator.setVisibility(selected ? View.VISIBLE : View.INVISIBLE);
+
+      itemView.setOnClickListener(v -> eventListener.onTabSelected(index));
+    }
+
+    void recycle() {
+      itemView.setOnClickListener(null);
+    }
+  }
+
+  interface EventListener {
+    void onTabSelected(int index);
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardProvider.java b/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardProvider.java
new file mode 100644
index 000000000..f324e0cd4
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardProvider.java
@@ -0,0 +1,51 @@
+package org.thoughtcrime.securesms.components.emoji;
+
+import android.support.annotation.LayoutRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.view.PagerAdapter;
+import android.widget.ImageView;
+
+import org.thoughtcrime.securesms.mms.GlideRequests;
+
+public interface MediaKeyboardProvider {
+  @LayoutRes int getProviderIconView(boolean selected);
+  /** @return True if the click was handled with provider-specific logic, otherwise false */
+  void requestPresentation(@NonNull Presenter presenter, boolean isSoloProvider);
+  void setController(@Nullable Controller controller);
+
+  interface BackspaceObserver {
+    void onBackspaceClicked();
+  }
+
+  interface AddObserver {
+    void onAddClicked();
+  }
+
+  interface SearchObserver {
+    void onSearchOpened();
+    void onSearchClosed();
+    void onSearchChanged(@NonNull String query);
+  }
+
+  interface Controller {
+    void setViewPagerEnabled(boolean enabled);
+  }
+
+  interface Presenter {
+    void present(@NonNull MediaKeyboardProvider provider,
+                 @NonNull PagerAdapter pagerAdapter,
+                 @NonNull TabIconProvider iconProvider,
+                 @Nullable BackspaceObserver backspaceObserver,
+                 @Nullable AddObserver addObserver,
+                 @Nullable SearchObserver searchObserver,
+                 int startingIndex);
+    int getCurrentPosition();
+    void requestDismissal();
+    boolean isVisible();
+  }
+
+  interface TabIconProvider {
+    void loadCategoryTabIcon(@NonNull GlideRequests glideRequests, @NonNull ImageView imageView, int index);
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiDrawInfo.java b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiDrawInfo.java
index 142b2b254..28aed0623 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiDrawInfo.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiDrawInfo.java
@@ -22,7 +22,7 @@ public class EmojiDrawInfo {
   }
 
   @Override
-  public String toString() {
+  public @NonNull String toString() {
     return "DrawInfo{" +
         "page=" + page +
         ", index=" + index +
diff --git a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java
index bc7ca54bc..a5487f787 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java
@@ -104,7 +104,7 @@ public class EmojiPageBitmap {
   }
 
   @Override
-  public String toString() {
+  public @NonNull String toString() {
     return model.getSprite();
   }
 }
diff --git a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java
index 119e79725..7a9bc32a7 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java
@@ -124,7 +124,7 @@ public class EmojiParser {
     }
 
     @Override
-    public Iterator<Candidate> iterator() {
+    public @NonNull Iterator<Candidate> iterator() {
       return list.iterator();
     }
   }
diff --git a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallControls.java b/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallControls.java
index 879c41d87..de7abaff1 100644
--- a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallControls.java
+++ b/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallControls.java
@@ -91,8 +91,7 @@ public class WebRtcCallControls extends LinearLayout {
       @Override
       public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         listener.onToggle();
-        cameraFlipButton.setBackgroundResource(isChecked ? R.drawable.webrtc_camera_front_button
-                                                         : R.drawable.webrtc_camera_rear_button);
+        updateCameraFlipIcon(isChecked);
         cameraFlipButton.setEnabled(false);
       }
     });
@@ -153,10 +152,17 @@ public class WebRtcCallControls extends LinearLayout {
 
   public void setCameraFlipButtonEnabled(boolean enabled) {
     cameraFlipButton.setChecked(enabled, false);
+    updateCameraFlipIcon(cameraFlipButton.isChecked());
+  }
+
+  private void updateCameraFlipIcon(boolean isChecked) {
+    cameraFlipButton.setBackgroundResource(isChecked ? R.drawable.webrtc_camera_front_button
+                                                     : R.drawable.webrtc_camera_rear_button);
   }
 
   public void setCameraFlipAvailable(boolean available) {
     cameraFlipAvailable = available;
+    cameraFlipButton.setVisibility(cameraFlipAvailable && isVideoEnabled() ? View.VISIBLE : View.GONE);
   }
 
   public void setCameraFlipClickable(boolean clickable) {
diff --git a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java b/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java
index a6cc1cc0a..7e321efd8 100644
--- a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java
+++ b/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java
@@ -118,7 +118,7 @@ public class WebRtcCallScreen extends FrameLayout implements RecipientModifiedLi
 
   public void setIncomingCall(Recipient personInfo) {
     setCard(personInfo, getContext().getString(R.string.CallScreen_Incoming_call));
-    endCallButton.setVisibility(View.INVISIBLE);
+    endCallButton.hide();
     incomingCallButton.setVisibility(View.VISIBLE);
     incomingCallButton.startRingingAnimation();
   }
@@ -141,7 +141,7 @@ public class WebRtcCallScreen extends FrameLayout implements RecipientModifiedLi
     this.untrustedIdentityExplanation.setText(spannableString);
     this.untrustedIdentityExplanation.setMovementMethod(LinkMovementMethod.getInstance());
 
-    this.endCallButton.setVisibility(View.INVISIBLE);
+    this.endCallButton.hide();
   }
 
   public void setIncomingCallActionListener(WebRtcAnswerDeclineButton.AnswerDeclineListener listener) {
@@ -203,6 +203,7 @@ public class WebRtcCallScreen extends FrameLayout implements RecipientModifiedLi
     if (this.localRenderLayout.isHidden() == cameraState.isEnabled()) {
       this.localRenderLayout.setHidden(!cameraState.isEnabled());
       this.localRenderLayout.requestLayout();
+      this.localRenderer.setVisibility(cameraState.isEnabled() ? VISIBLE : INVISIBLE);
     }
   }
 
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/GroupRecordContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/GroupRecordContactPhoto.java
index 461c2166c..249841afa 100644
--- a/src/org/thoughtcrime/securesms/contacts/avatars/GroupRecordContactPhoto.java
+++ b/src/org/thoughtcrime/securesms/contacts/avatars/GroupRecordContactPhoto.java
@@ -50,7 +50,7 @@ public class GroupRecordContactPhoto implements ContactPhoto {
   }
 
   @Override
-  public void updateDiskCacheKey(MessageDigest messageDigest) {
+  public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
     messageDigest.update(address.serialize().getBytes());
     messageDigest.update(Conversions.longToByteArray(avatarId));
   }
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java
index 486065e3e..62f4cd26a 100644
--- a/src/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java
+++ b/src/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java
@@ -40,7 +40,7 @@ public class ProfileContactPhoto implements ContactPhoto {
   }
 
   @Override
-  public void updateDiskCacheKey(MessageDigest messageDigest) {
+  public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
     messageDigest.update(address.serialize().getBytes());
     messageDigest.update(avatarObject.getBytes());
   }
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/SystemContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/SystemContactPhoto.java
index 1a16b9267..817df232c 100644
--- a/src/org/thoughtcrime/securesms/contacts/avatars/SystemContactPhoto.java
+++ b/src/org/thoughtcrime/securesms/contacts/avatars/SystemContactPhoto.java
@@ -30,9 +30,8 @@ public class SystemContactPhoto implements ContactPhoto {
     return context.getContentResolver().openInputStream(contactPhotoUri);
   }
 
-  @Nullable
   @Override
-  public Uri getUri(@NonNull Context context) {
+  public @Nullable Uri getUri(@NonNull Context context) {
     return contactPhotoUri;
   }
 
@@ -42,7 +41,7 @@ public class SystemContactPhoto implements ContactPhoto {
   }
 
   @Override
-  public void updateDiskCacheKey(MessageDigest messageDigest) {
+  public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
     messageDigest.update(address.serialize().getBytes());
     messageDigest.update(contactPhotoUri.toString().getBytes());
     messageDigest.update(Conversions.longToByteArray(lastModifiedTime));
diff --git a/src/org/thoughtcrime/securesms/contactshare/Contact.java b/src/org/thoughtcrime/securesms/contactshare/Contact.java
index 39d6f1cd3..509ddca64 100644
--- a/src/org/thoughtcrime/securesms/contactshare/Contact.java
+++ b/src/org/thoughtcrime/securesms/contactshare/Contact.java
@@ -540,7 +540,7 @@ public class Contact implements Parcelable {
     };
 
     @Override
-    public String toString() {
+    public @NonNull String toString() {
       StringBuilder builder = new StringBuilder();
 
       if (!TextUtils.isEmpty(street)) {
@@ -642,7 +642,7 @@ public class Contact implements Parcelable {
 
     private static Attachment attachmentFromUri(@Nullable Uri uri) {
       if (uri == null) return null;
-      return new UriAttachment(uri, MediaUtil.IMAGE_JPEG, AttachmentDatabase.TRANSFER_PROGRESS_DONE, 0, null, false, false, null);
+      return new UriAttachment(uri, MediaUtil.IMAGE_JPEG, AttachmentDatabase.TRANSFER_PROGRESS_DONE, 0, null, false, false, null, null);
     }
 
     @Override
diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java b/src/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java
index 93762edc3..bf3632a78 100644
--- a/src/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java
+++ b/src/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java
@@ -39,17 +39,17 @@ class ContactFieldAdapter extends RecyclerView.Adapter<ContactFieldAdapter.Conta
   }
 
   @Override
-  public ContactFieldViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+  public @NonNull ContactFieldViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
     return new ContactFieldViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_selectable_contact_field, parent, false));
   }
 
   @Override
-  public void onBindViewHolder(ContactFieldViewHolder holder, int position) {
+  public void onBindViewHolder(@NonNull ContactFieldViewHolder holder, int position) {
     holder.bind(fields.get(position), glideRequests, selectable);
   }
 
   @Override
-  public void onViewRecycled(ContactFieldViewHolder holder) {
+  public void onViewRecycled(@NonNull ContactFieldViewHolder holder) {
     holder.recycle();
   }
 
diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactShareEditAdapter.java b/src/org/thoughtcrime/securesms/contactshare/ContactShareEditAdapter.java
index 629f34cb3..1f946220a 100644
--- a/src/org/thoughtcrime/securesms/contactshare/ContactShareEditAdapter.java
+++ b/src/org/thoughtcrime/securesms/contactshare/ContactShareEditAdapter.java
@@ -37,14 +37,14 @@ public class ContactShareEditAdapter extends RecyclerView.Adapter<ContactShareEd
   }
 
   @Override
-  public ContactEditViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+  public @NonNull ContactEditViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
     return new ContactEditViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_editable_contact, parent, false),
                                      locale,
                                      glideRequests);
   }
 
   @Override
-  public void onBindViewHolder(ContactEditViewHolder holder, int position) {
+  public void onBindViewHolder(@NonNull ContactEditViewHolder holder, int position) {
     holder.bind(position, contacts.get(position), eventListener);
   }
 
diff --git a/src/org/thoughtcrime/securesms/contactshare/SharedContactDetailsActivity.java b/src/org/thoughtcrime/securesms/contactshare/SharedContactDetailsActivity.java
index 779541a0c..942192248 100644
--- a/src/org/thoughtcrime/securesms/contactshare/SharedContactDetailsActivity.java
+++ b/src/org/thoughtcrime/securesms/contactshare/SharedContactDetailsActivity.java
@@ -230,7 +230,7 @@ public class SharedContactDetailsActivity extends PassphraseRequiredActionBarAct
 
       inviteButtonView.setOnClickListener(v -> {
         ContactUtil.selectRecipientThroughDialog(this, systemUsers, dynamicLanguage.getCurrentLocale(), recipient -> {
-          CommunicationActions.composeSmsThroughDefaultApp(this, recipient.getAddress(), getString(R.string.InviteActivity_lets_switch_to_signal, "https://sgnl.link/1KpeYmF"));
+          CommunicationActions.composeSmsThroughDefaultApp(this, recipient.getAddress(), getString(R.string.InviteActivity_lets_switch_to_signal, getString(R.string.install_url)));
         });
       });
     } else {
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index b91e4a46a..625e7204b 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -49,10 +49,10 @@ import android.support.v4.content.pm.ShortcutInfoCompat;
 import android.support.v4.content.pm.ShortcutManagerCompat;
 import android.support.v4.graphics.drawable.IconCompat;
 import android.support.v4.view.MenuItemCompat;
-import android.support.v4.view.WindowCompat;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.SearchView;
+import android.support.v7.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -106,8 +106,10 @@ import org.thoughtcrime.securesms.components.InputAwareLayout;
 import org.thoughtcrime.securesms.components.InputPanel;
 import org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout.OnKeyboardShownListener;
 import org.thoughtcrime.securesms.components.SendButton;
-import org.thoughtcrime.securesms.components.emoji.EmojiDrawer;
+import org.thoughtcrime.securesms.components.TooltipPopup;
+import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider;
 import org.thoughtcrime.securesms.components.emoji.EmojiStrings;
+import org.thoughtcrime.securesms.components.emoji.MediaKeyboard;
 import org.thoughtcrime.securesms.components.identity.UntrustedSendDialog;
 import org.thoughtcrime.securesms.components.identity.UnverifiedBannerView;
 import org.thoughtcrime.securesms.components.identity.UnverifiedSendDialog;
@@ -142,6 +144,7 @@ import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.database.identity.IdentityRecordList;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
+import org.thoughtcrime.securesms.database.model.StickerRecord;
 import org.thoughtcrime.securesms.events.ReminderUpdateEvent;
 import org.thoughtcrime.securesms.giph.ui.GiphyActivity;
 import org.thoughtcrime.securesms.jobs.MultiDeviceBlockedUpdateJob;
@@ -172,6 +175,7 @@ import org.thoughtcrime.securesms.mms.QuoteId;
 import org.thoughtcrime.securesms.mms.QuoteModel;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideDeck;
+import org.thoughtcrime.securesms.mms.StickerSlide;
 import org.thoughtcrime.securesms.mms.TextSlide;
 import org.thoughtcrime.securesms.mms.VideoSlide;
 import org.thoughtcrime.securesms.notifications.MarkReadReceiver;
@@ -190,19 +194,25 @@ import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.sms.OutgoingEncryptedMessage;
 import org.thoughtcrime.securesms.sms.OutgoingEndSessionMessage;
 import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
+import org.thoughtcrime.securesms.stickers.StickerKeyboardProvider;
+import org.thoughtcrime.securesms.stickers.StickerLocator;
+import org.thoughtcrime.securesms.stickers.StickerManagementActivity;
+import org.thoughtcrime.securesms.stickers.StickerPackInstallEvent;
+import org.thoughtcrime.securesms.stickers.StickerSearchRepository;
 import org.thoughtcrime.securesms.util.BitmapUtil;
 import org.thoughtcrime.securesms.util.CharacterCalculator.CharacterState;
 import org.thoughtcrime.securesms.util.CommunicationActions;
 import org.thoughtcrime.securesms.util.Dialogs;
 import org.thoughtcrime.securesms.util.DirectoryHelper;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
-import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.ExpirationUtil;
 import org.thoughtcrime.securesms.util.GroupUtil;
 import org.thoughtcrime.securesms.util.IdentityUtil;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.ServiceUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.TextSecurePreferences.MediaKeyboardMode;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener;
@@ -220,7 +230,6 @@ import org.whispersystems.signalservice.loki.messaging.LokiMessageFriendRequestS
 import org.whispersystems.signalservice.loki.messaging.LokiThreadFriendRequestStatus;
 
 import java.io.IOException;
-import java.security.SecureRandom;
 import java.text.SimpleDateFormat;
 import java.util.Collections;
 import java.util.Date;
@@ -255,7 +264,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
                InputPanel.MediaListener,
                ComposeText.CursorPositionChangedListener,
                ConversationSearchBottomBar.EventListener,
-        LokiThreadDatabaseDelegate,
+               StickerKeyboardProvider.StickerEventListener,
+               LokiThreadDatabaseDelegate,
                FriendRequestViewDelegate
 {
   private static final String TAG = ConversationActivity.class.getSimpleName();
@@ -265,6 +275,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   public static final String IS_ARCHIVED_EXTRA       = "is_archived";
   public static final String TEXT_EXTRA              = "draft_text";
   public static final String MEDIA_EXTRA             = "media_list";
+  public static final String STICKER_EXTRA           = "media_list";
   public static final String DISTRIBUTION_TYPE_EXTRA = "distribution_type";
   public static final String TIMING_EXTRA            = "timing";
   public static final String LAST_SEEN_EXTRA         = "last_seen";
@@ -307,13 +318,14 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private   AttachmentManager      attachmentManager;
   private   AudioRecorder          audioRecorder;
   private   BroadcastReceiver      securityUpdateReceiver;
-  private   Stub<EmojiDrawer>      emojiDrawerStub;
+  private   Stub<MediaKeyboard>    emojiDrawerStub;
   protected HidingLinearLayout     quickAttachmentToggle;
   protected HidingLinearLayout     inlineAttachmentToggle;
   private   InputPanel             inputPanel;
 
-  private LinkPreviewViewModel        linkPreviewViewModel;
-  private ConversationSearchViewModel searchViewModel;
+  private LinkPreviewViewModel         linkPreviewViewModel;
+  private ConversationSearchViewModel  searchViewModel;
+  private ConversationStickerViewModel stickerViewModel;
 
   private Recipient  recipient;
   private long       threadId;
@@ -324,9 +336,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private boolean    isMmsEnabled          = true;
   private boolean    isSecurityInitialized = false;
 
-  private final IdentityRecordList identityRecords = new IdentityRecordList();
-  private final DynamicTheme       dynamicTheme    = new DynamicTheme();
-  private final DynamicLanguage    dynamicLanguage = new DynamicLanguage();
+  private final IdentityRecordList      identityRecords = new IdentityRecordList();
+  private final DynamicNoActionBarTheme dynamicTheme    = new DynamicNoActionBarTheme();
+  private final DynamicLanguage         dynamicLanguage = new DynamicLanguage();
 
 
   @Override
@@ -339,7 +351,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   protected void onCreate(Bundle state, boolean ready) {
     Log.i(TAG, "onCreate()");
 
-    supportRequestWindowFeature(WindowCompat.FEATURE_ACTION_BAR_OVERLAY);
     setContentView(R.layout.conversation_activity);
 
     TypedArray typedArray = obtainStyledAttributes(new int[] {R.attr.conversation_background});
@@ -357,6 +368,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     initializeResources();
     initializeLinkPreviewObserver();
     initializeSearchObserver();
+    initializeStickerObserver();
     initializeSecurity(false, isDefaultSms).addListener(new AssertedSuccessListener<Boolean>() {
       @Override
       public void onSuccess(Boolean result) {
@@ -416,18 +428,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     searchNav.setVisibility(View.GONE);
   }
 
-  @Override
-  protected void onStart() {
-    super.onStart();
-    EventBus.getDefault().register(this);
-  }
-
   @Override
   protected void onResume() {
     super.onResume();
     dynamicTheme.onResume(this);
     dynamicLanguage.onResume(this);
 
+    EventBus.getDefault().register(this);
     initializeEnabledCheck();
     initializeMmsEnabledCheck();
     initializeIdentityRecords();
@@ -578,7 +585,16 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
       final Context context = ConversationActivity.this.getApplicationContext();
 
-      sendMediaMessage(transport.isSms(), message, slideDeck, Collections.emptyList(), Collections.emptyList(), expiresIn, subscriptionId, initiating).addListener(new AssertedSuccessListener<Void>() {
+      sendMediaMessage(transport.isSms(),
+                       message,
+                       slideDeck,
+                       inputPanel.getQuote().orNull(),
+                       Collections.emptyList(),
+                       Collections.emptyList(),
+                       expiresIn,
+                       subscriptionId,
+                       initiating,
+                       true).addListener(new AssertedSuccessListener<Void>() {
         @Override
         public void onSuccess(Void result) {
           AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
@@ -904,11 +920,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void handleInviteLink() {
-    String inviteText;
-
-    boolean a = new SecureRandom().nextBoolean();
-    if (a) inviteText = getString(R.string.ConversationActivity_lets_switch_to_signal, "https://sgnl.link/1LoIMUl");
-    else   inviteText = getString(R.string.ConversationActivity_lets_use_this_to_chat, "https://sgnl.link/1MF56H1");
+    String inviteText = getString(R.string.ConversationActivity_lets_switch_to_signal, getString(R.string.install_url));
 
     if (isDefaultSms) {
       composeText.appendInvite(inviteText);
@@ -1227,10 +1239,16 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private ListenableFuture<Boolean> initializeDraft() {
     final SettableFuture<Boolean> result = new SettableFuture<>();
 
-    final String      draftText      = getIntent().getStringExtra(TEXT_EXTRA);
-    final Uri         draftMedia     = getIntent().getData();
-    final MediaType   draftMediaType = MediaType.from(getIntent().getType());
-    final List<Media> mediaList      = getIntent().getParcelableArrayListExtra(MEDIA_EXTRA);
+    final String         draftText      = getIntent().getStringExtra(TEXT_EXTRA);
+    final Uri            draftMedia     = getIntent().getData();
+    final MediaType      draftMediaType = MediaType.from(getIntent().getType());
+    final List<Media>    mediaList      = getIntent().getParcelableArrayListExtra(MEDIA_EXTRA);
+    final StickerLocator stickerLocator = getIntent().getParcelableExtra(STICKER_EXTRA);
+
+    if (stickerLocator != null && draftMedia != null) {
+      sendSticker(stickerLocator, draftMedia, 0, true);
+      return new SettableFuture<>(false);
+    }
 
     if (!Util.isEmpty(mediaList)) {
       Intent sendIntent = MediaSendActivity.buildEditorIntent(this, mediaList, recipient, draftText, sendButton.getSelectedTransport());
@@ -1239,7 +1257,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     }
 
     if (draftText != null) {
-      composeText.setText(draftText);
+      composeText.setText("");
+      composeText.append(draftText);
       result.set(true);
     }
 
@@ -1506,10 +1525,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void initializeViews() {
-    ActionBar supportActionBar = getSupportActionBar();
-    if (supportActionBar == null) throw new AssertionError();
-
-    titleView              = (ConversationTitleView) supportActionBar.getCustomView();
+    titleView              = findViewById(R.id.conversation_title_view);
     buttonToggle           = ViewUtil.findById(this, R.id.button_toggle);
     sendButton             = ViewUtil.findById(this, R.id.send_button);
     attachButton           = ViewUtil.findById(this, R.id.attach_button);
@@ -1563,7 +1579,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     titleView.setOnClickListener(v -> handleConversationSettings());
     titleView.setOnLongClickListener(v -> handleDisplayQuickContact());
      */
-    titleView.setOnBackClickedListener(view -> super.onBackPressed());
     unblockButton.setOnClickListener(v -> handleUnblock());
     makeDefaultSmsButton.setOnClickListener(v -> handleMakeDefaultSms());
     registerButton.setOnClickListener(v -> handleRegisterForSignal());
@@ -1587,12 +1602,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   protected void initializeActionBar() {
+    Toolbar toolbar = findViewById(R.id.toolbar);
+    setSupportActionBar(toolbar);
+
     ActionBar supportActionBar = getSupportActionBar();
     if (supportActionBar == null) throw new AssertionError();
 
-    supportActionBar.setDisplayHomeAsUpEnabled(false);
-    supportActionBar.setCustomView(R.layout.conversation_title_view);
-    supportActionBar.setDisplayShowCustomEnabled(true);
+    supportActionBar.setDisplayHomeAsUpEnabled(true);
     supportActionBar.setDisplayShowTitleEnabled(false);
   }
 
@@ -1609,7 +1625,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void initializeLinkPreviewObserver() {
-    linkPreviewViewModel = ViewModelProviders.of(this, new LinkPreviewViewModel.Factory(new LinkPreviewRepository())).get(LinkPreviewViewModel.class);
+    linkPreviewViewModel = ViewModelProviders.of(this, new LinkPreviewViewModel.Factory(new LinkPreviewRepository(this))).get(LinkPreviewViewModel.class);
 
     if (!TextSecurePreferences.isLinkPreviewsEnabled(this)) {
       linkPreviewViewModel.onUserCancel();
@@ -1646,6 +1662,52 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     });
   }
 
+  private void initializeStickerObserver() {
+    StickerSearchRepository repository = new StickerSearchRepository(this);
+
+    stickerViewModel = ViewModelProviders.of(this, new ConversationStickerViewModel.Factory(getApplication(), repository))
+                                         .get(ConversationStickerViewModel.class);
+
+    stickerViewModel.getStickerResults().observe(this, stickers -> {
+      if (stickers == null) return;
+
+      inputPanel.setStickerSuggestions(stickers);
+    });
+
+    stickerViewModel.getStickersAvailability().observe(this, stickersAvailable -> {
+      if (stickersAvailable == null) return;
+
+      boolean           isSystemEmojiPreferred = TextSecurePreferences.isSystemEmojiPreferred(this);
+      MediaKeyboardMode keyboardMode           = TextSecurePreferences.getMediaKeyboardMode(this);
+      boolean           stickerIntro           = !TextSecurePreferences.hasSeenStickerIntroTooltip(this);
+
+      if (stickersAvailable) {
+        inputPanel.showMediaKeyboardToggle(true);
+        inputPanel.setMediaKeyboardToggleMode(isSystemEmojiPreferred || keyboardMode == MediaKeyboardMode.STICKER);
+        if (stickerIntro) showStickerIntroductionTooltip();
+      }
+
+      if (emojiDrawerStub.resolved()) {
+        initializeMediaKeyboardProviders(emojiDrawerStub.get(), stickersAvailable);
+      }
+    });
+  }
+
+  private void showStickerIntroductionTooltip() {
+    TextSecurePreferences.setMediaKeyboardMode(this, MediaKeyboardMode.STICKER);
+    inputPanel.setMediaKeyboardToggleMode(true);
+
+    TooltipPopup.forTarget(inputPanel.getMediaKeyboardToggleAnchorView())
+                .setBackgroundTint(getResources().getColor(R.color.core_blue))
+                .setTextColor(getResources().getColor(R.color.core_white))
+                .setText(R.string.ConversationActivity_new_say_it_with_stickers)
+                .setOnDismissListener(() -> {
+                  TextSecurePreferences.setHasSeenStickerIntroTooltip(this, true);
+                  EventBus.getDefault().removeStickyEvent(StickerPackInstallEvent.class);
+                })
+                .show(TooltipPopup.POSITION_ABOVE);
+  }
+
   @Override
   public void onSearchMoveUpPressed() {
     searchViewModel.onMoveUp();
@@ -1692,6 +1754,17 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     initializeIdentityRecords();
   }
 
+  @Subscribe(threadMode =  ThreadMode.MAIN, sticky = true)
+  public void onStickerPackInstalled(final StickerPackInstallEvent event) {
+    if (!TextSecurePreferences.hasSeenStickerIntroTooltip(this)) return;
+
+    EventBus.getDefault().removeStickyEvent(event);
+    TooltipPopup.forTarget(inputPanel.getMediaKeyboardToggleAnchorView())
+                .setText(R.string.ConversationActivity_sticker_pack_installed)
+                .setIconGlideModel(event.getIconGlideModel())
+                .show(TooltipPopup.POSITION_ABOVE);
+  }
+
   private void initializeReceivers() {
     securityUpdateReceiver = new BroadcastReceiver() {
       @Override
@@ -1769,7 +1842,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     long       expiresIn      = recipient.getExpireMessages() * 1000L;
     boolean    initiating     = threadId == -1;
 
-    sendMediaMessage(isSmsForced(), "", attachmentManager.buildSlideDeck(), contacts, Collections.emptyList(), expiresIn, subscriptionId, initiating);
+    sendMediaMessage(isSmsForced(), "", attachmentManager.buildSlideDeck(), null, contacts, Collections.emptyList(), expiresIn, subscriptionId, initiating, false);
   }
 
   private void selectContactInfo(ContactData contactData) {
@@ -1912,6 +1985,26 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     }
   }
 
+  private void initializeMediaKeyboardProviders(@NonNull MediaKeyboard mediaKeyboard, boolean stickersAvailable) {
+    boolean isSystemEmojiPreferred   = TextSecurePreferences.isSystemEmojiPreferred(this);
+
+    if (stickersAvailable) {
+      if (isSystemEmojiPreferred) {
+        mediaKeyboard.setProviders(0, new StickerKeyboardProvider(this, this));
+      } else {
+        MediaKeyboardMode keyboardMode = TextSecurePreferences.getMediaKeyboardMode(this);
+        int               index        = keyboardMode == MediaKeyboardMode.STICKER ? 1 : 0;
+
+        mediaKeyboard.setProviders(index,
+                                   new EmojiKeyboardProvider(this, inputPanel),
+                                   new StickerKeyboardProvider(this, this));
+      }
+    } else if (!isSystemEmojiPreferred) {
+      mediaKeyboard.setProviders(0, new EmojiKeyboardProvider(this, inputPanel));
+    }
+  }
+
+
   private boolean isSingleConversation() {
     return getRecipient() != null && !getRecipient().isGroupRecipient();
   }
@@ -2109,17 +2202,19 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       throws InvalidMessageException
   {
     Log.i(TAG, "Sending media message...");
-    sendMediaMessage(forceSms, getMessage(), attachmentManager.buildSlideDeck(), Collections.emptyList(), linkPreviewViewModel.getActiveLinkPreviews(), expiresIn, subscriptionId, initiating);
+    sendMediaMessage(forceSms, getMessage(), attachmentManager.buildSlideDeck(), inputPanel.getQuote().orNull(), Collections.emptyList(), linkPreviewViewModel.getActiveLinkPreviews(), expiresIn, subscriptionId, initiating, true);
   }
 
   private ListenableFuture<Void> sendMediaMessage(final boolean forceSms,
                                                   String body,
                                                   SlideDeck slideDeck,
+                                                  QuoteModel quote,
                                                   List<Contact> contacts,
                                                   List<LinkPreview> previews,
                                                   final long expiresIn,
                                                   final int subscriptionId,
-                                                  final boolean initiating)
+                                                  final boolean initiating,
+                                                  final boolean clearComposeBox)
   {
     boolean isLokiPublicChat = isGroupConversation(); // TODO: Figure out a better way of determining this
     if (isLokiPublicChat) {
@@ -2144,7 +2239,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       }
     }
 
-    OutgoingMediaMessage outgoingMessageCandidate = new OutgoingMediaMessage(recipient, slideDeck, body, System.currentTimeMillis(), subscriptionId, expiresIn, distributionType, inputPanel.getQuote().orNull(), contacts, previews);
+    OutgoingMediaMessage outgoingMessageCandidate = new OutgoingMediaMessage(recipient, slideDeck, body, System.currentTimeMillis(), subscriptionId, expiresIn, distributionType, quote, contacts, previews);
 
     final SettableFuture<Void> future  = new SettableFuture<>();
     final Context              context = getApplicationContext();
@@ -2163,9 +2258,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
                .ifNecessary(!isSecureText || forceSms)
                .withPermanentDenialDialog(getString(R.string.ConversationActivity_signal_needs_sms_permission_in_order_to_send_an_sms))
                .onAllGranted(() -> {
-                 inputPanel.clearQuote();
-                 attachmentManager.clear(glideRequests, false);
-                 silentlySetComposeText("");
+                 if (clearComposeBox) {
+                   inputPanel.clearQuote();
+                   attachmentManager.clear(glideRequests, false);
+                   silentlySetComposeText("");
+                 }
+
                  final long id = fragment.stageOutgoingMessage(outgoingMessage);
 
                  new AsyncTask<Void, Void, Long>() {
@@ -2349,7 +2447,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
         SlideDeck  slideDeck      = new SlideDeck();
         slideDeck.addSlide(audioSlide);
 
-        sendMediaMessage(forceSms, "", slideDeck, Collections.emptyList(), Collections.emptyList(), expiresIn, subscriptionId, initiating).addListener(new AssertedSuccessListener<Void>() {
+        sendMediaMessage(forceSms, "", slideDeck, inputPanel.getQuote().orNull(), Collections.emptyList(), Collections.emptyList(), expiresIn, subscriptionId, initiating, true).addListener(new AssertedSuccessListener<Void>() {
           @Override
           public void onSuccess(Void nothing) {
             new AsyncTask<Void, Void, Void>() {
@@ -2399,8 +2497,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   @Override
   public void onEmojiToggle() {
     if (!emojiDrawerStub.resolved()) {
-      inputPanel.setEmojiDrawer(emojiDrawerStub.get());
-      emojiDrawerStub.get().setEmojiEventListener(inputPanel);
+      Boolean stickersAvailable = stickerViewModel.getStickersAvailability().getValue();
+
+      initializeMediaKeyboardProviders(emojiDrawerStub.get(), stickersAvailable == null ? false : stickersAvailable);
+
+      inputPanel.setMediaKeyboard(emojiDrawerStub.get());
     }
 
     if (container.getCurrentInput() == emojiDrawerStub.get()) {
@@ -2415,6 +2516,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     linkPreviewViewModel.onUserCancel();
   }
 
+  @Override
+  public void onStickerSuggestionSelected(@NonNull StickerRecord sticker) {
+    sendSticker(sticker, true);
+  }
+
   @Override
   public void onMediaSelected(@NonNull Uri uri, String contentType) {
     if (!TextUtils.isEmpty(contentType) && contentType.trim().equals("image/gif")) {
@@ -2433,6 +2539,46 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     linkPreviewViewModel.onTextChanged(this, composeText.getTextTrimmed(), start, end);
   }
 
+  @Override
+  public void onStickerSelected(@NonNull StickerRecord stickerRecord) {
+    sendSticker(stickerRecord, false);
+  }
+
+  @Override
+  public void onStickerManagementClicked() {
+    startActivity(StickerManagementActivity.getIntent(this));
+    container.hideAttachedInput(true);
+  }
+
+  private void sendSticker(@NonNull StickerRecord stickerRecord, boolean clearCompose) {
+    sendSticker(new StickerLocator(stickerRecord.getPackId(), stickerRecord.getPackKey(), stickerRecord.getStickerId()), stickerRecord.getUri(), stickerRecord.getSize(), clearCompose);
+
+    AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
+      DatabaseFactory.getStickerDatabase(this).updateStickerLastUsedTime(stickerRecord.getRowId(), System.currentTimeMillis());
+    });
+  }
+
+  private void sendSticker(@NonNull StickerLocator stickerLocator, @NonNull Uri uri, long size, boolean clearCompose) {
+    if (sendButton.getSelectedTransport().isSms()) {
+      Media  media  = new Media(uri, MediaUtil.IMAGE_WEBP, System.currentTimeMillis(), StickerSlide.WIDTH, StickerSlide.HEIGHT, size, Optional.absent(), Optional.absent());
+      Intent intent = MediaSendActivity.buildEditorIntent(this, Collections.singletonList(media), recipient, composeText.getTextTrimmed(), sendButton.getSelectedTransport());
+      startActivityForResult(intent, MEDIA_SENDER);
+      return;
+    }
+
+    long            expiresIn      = recipient.getExpireMessages() * 1000L;
+    int             subscriptionId = sendButton.getSelectedTransport().getSimSubscriptionId().or(-1);
+    boolean         initiating     = threadId == -1;
+    TransportOption transport      = sendButton.getSelectedTransport();
+    SlideDeck       slideDeck      = new SlideDeck();
+    Slide           stickerSlide   = new StickerSlide(this, uri, size, stickerLocator);
+
+    slideDeck.addSlide(stickerSlide);
+
+    sendMediaMessage(transport.isSms(), "", slideDeck, null, Collections.emptyList(), Collections.emptyList(), expiresIn, subscriptionId, initiating, clearCompose);
+
+  }
+
   private void silentlySetComposeText(String text) {
     typingTextWatcher.setEnabled(false);
     composeText.setText(text);
@@ -2538,6 +2684,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       if (composeText.getTextTrimmed().length() == 0 || beforeLength == 0) {
         composeText.postDelayed(ConversationActivity.this::updateToggleButtonState, 50);
       }
+
+      stickerViewModel.onInputTextUpdated(s.toString());
     }
 
     @Override
@@ -2607,7 +2755,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
                           author,
                           messageRecord.getBody(),
                           slideDeck);
-
     } else {
       inputPanel.setQuote(GlideApp.with(this),
                           messageRecord.getDateSent(),
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationAdapter.java b/src/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
index 99a39fd76..2adeae528 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
@@ -302,11 +302,16 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
   @Override
   protected long getItemId(@NonNull MessageRecord record) {
     if (record.isOutgoing() && record.isMms()) {
-      SlideDeck slideDeck = ((MmsMessageRecord)record).getSlideDeck();
+      MmsMessageRecord mmsRecord = (MmsMessageRecord) record;
+      SlideDeck        slideDeck = mmsRecord.getSlideDeck();
 
       if (slideDeck.getThumbnailSlide() != null && slideDeck.getThumbnailSlide().getFastPreflightId() != null) {
         return Long.valueOf(slideDeck.getThumbnailSlide().getFastPreflightId());
       }
+
+      if (slideDeck.getStickerSlide() != null && slideDeck.getStickerSlide().getFastPreflightId() != null) {
+        return Long.valueOf(slideDeck.getStickerSlide().getFastPreflightId());
+      }
     }
 
     return record.getId();
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
index 272f573c5..6003b7427 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -91,6 +91,8 @@ import org.thoughtcrime.securesms.profiles.UnknownSenderView;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
+import org.thoughtcrime.securesms.stickers.StickerLocator;
+import org.thoughtcrime.securesms.stickers.StickerPackPreviewActivity;
 import org.thoughtcrime.securesms.util.CommunicationActions;
 import org.thoughtcrime.securesms.util.SaveAttachmentTask;
 import org.thoughtcrime.securesms.util.StickyHeaderDecoration;
@@ -379,10 +381,11 @@ public class ConversationFragment extends Fragment
       MessageRecord messageRecord = messageRecords.iterator().next();
 
       menu.findItem(R.id.menu_context_resend).setVisible(messageRecord.isFailed());
-      menu.findItem(R.id.menu_context_save_attachment).setVisible(!actionMessage                     &&
-                                                                  messageRecord.isMms()              &&
-                                                                  !messageRecord.isMmsNotification() &&
-                                                                  ((MediaMmsMessageRecord)messageRecord).containsMediaSlide());
+      menu.findItem(R.id.menu_context_save_attachment).setVisible(!actionMessage                                              &&
+                                                                  messageRecord.isMms()                                       &&
+                                                                  !messageRecord.isMmsNotification()                          &&
+                                                                  ((MediaMmsMessageRecord)messageRecord).containsMediaSlide() &&
+                                                                  ((MediaMmsMessageRecord)messageRecord).getSlideDeck().getStickerSlide() == null);
 
       /*
       menu.findItem(R.id.menu_context_forward).setVisible(!actionMessage && !sharedContact);
@@ -530,10 +533,11 @@ public class ConversationFragment extends Fragment
 
       if (message.isMms()) {
         MmsMessageRecord mediaMessage = (MmsMessageRecord) message;
-        boolean          isAlbum      = mediaMessage.containsMediaSlide()                   &&
-                                        mediaMessage.getSlideDeck().getSlides().size() > 1  &&
-                                        mediaMessage.getSlideDeck().getAudioSlide() == null &&
-                                        mediaMessage.getSlideDeck().getDocumentSlide() == null;
+        boolean          isAlbum      = mediaMessage.containsMediaSlide()                      &&
+                                        mediaMessage.getSlideDeck().getSlides().size() > 1     &&
+                                        mediaMessage.getSlideDeck().getAudioSlide() == null    &&
+                                        mediaMessage.getSlideDeck().getDocumentSlide() == null &&
+                                        mediaMessage.getSlideDeck().getStickerSlide() == null;
 
         if (isAlbum) {
           ArrayList<Media> mediaList   = new ArrayList<>(mediaMessage.getSlideDeck().getSlides().size());
@@ -564,6 +568,10 @@ public class ConversationFragment extends Fragment
           Slide slide = mediaMessage.getSlideDeck().getSlides().get(0);
           composeIntent.putExtra(Intent.EXTRA_STREAM, slide.getUri());
           composeIntent.setType(slide.getContentType());
+
+          if (slide.hasSticker()) {
+            composeIntent.putExtra(ConversationActivity.STICKER_EXTRA, slide.asAttachment().getSticker());
+          }
         }
 
         if (mediaMessage.getSlideDeck().getTextSlide() != null && mediaMessage.getSlideDeck().getTextSlide().getUri() != null) {
@@ -617,7 +625,7 @@ public class ConversationFragment extends Fragment
   }
 
   @Override
-  public Loader<Cursor> onCreateLoader(int id, Bundle args) {
+  public @NonNull Loader<Cursor> onCreateLoader(int id, Bundle args) {
     Log.i(TAG, "onCreateLoader");
     loaderStartTime = System.currentTimeMillis();
 
@@ -632,7 +640,7 @@ public class ConversationFragment extends Fragment
   }
 
   @Override
-  public void onLoadFinished(Loader<Cursor> cursorLoader, Cursor cursor) {
+  public void onLoadFinished(@NonNull Loader<Cursor> cursorLoader, Cursor cursor) {
     long loadTime = System.currentTimeMillis() - loaderStartTime;
     int  count    = cursor.getCount();
     Log.i(TAG, "onLoadFinished - took " + loadTime + " ms to load a cursor of size " + count);
@@ -708,7 +716,7 @@ public class ConversationFragment extends Fragment
   }
 
   @Override
-  public void onLoaderReset(Loader<Cursor> arg0) {
+  public void onLoaderReset(@NonNull Loader<Cursor> arg0) {
     if (list.getAdapter() != null) {
       getListAdapter().changeCursor(null);
     }
@@ -831,7 +839,7 @@ public class ConversationFragment extends Fragment
     }
 
     @Override
-    public void onScrolled(final RecyclerView rv, final int dx, final int dy) {
+    public void onScrolled(@NonNull final RecyclerView rv, final int dx, final int dy) {
       boolean currentlyAtBottom           = isAtBottom();
       boolean currentlyAtZoomScrollHeight = isAtZoomScrollHeight();
       int     positionId                  = getHeaderPositionId();
@@ -857,7 +865,7 @@ public class ConversationFragment extends Fragment
     }
 
     @Override
-    public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
+    public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
       if (newState == RecyclerView.SCROLL_STATE_DRAGGING) {
         conversationDateHeader.show();
       } else if (newState == RecyclerView.SCROLL_STATE_IDLE) {
@@ -944,6 +952,13 @@ public class ConversationFragment extends Fragment
       }
     }
 
+    @Override
+    public void onStickerClicked(@NonNull StickerLocator sticker) {
+      if (getContext() != null && getActivity() != null) {
+        startActivity(StickerPackPreviewActivity.getIntent(sticker.getPackId(), sticker.getPackKey()));
+      }
+    }
+
     @Override
     public void onSharedContactDetailsClicked(@NonNull Contact contact, @NonNull View avatarTransitionView) {
       if (getContext() != null && getActivity() != null) {
@@ -983,7 +998,7 @@ public class ConversationFragment extends Fragment
       if (getContext() == null) return;
 
       ContactUtil.selectRecipientThroughDialog(getContext(), choices, locale, recipient -> {
-        CommunicationActions.composeSmsThroughDefaultApp(getContext(), recipient.getAddress(), getString(R.string.InviteActivity_lets_switch_to_signal, "https://sgnl.link/1KpeYmF"));
+        CommunicationActions.composeSmsThroughDefaultApp(getContext(), recipient.getAddress(), getString(R.string.InviteActivity_lets_switch_to_signal, getString(R.string.install_url)));
       });
     }
   }
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
index 60e622d37..03bcd2af0 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -56,7 +56,6 @@ import org.thoughtcrime.securesms.BindableConversationItem;
 import org.thoughtcrime.securesms.ConfirmIdentityDialog;
 import org.thoughtcrime.securesms.MediaPreviewActivity;
 import org.thoughtcrime.securesms.MessageDetailsActivity;
-import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
 import org.thoughtcrime.securesms.components.AlertView;
 import org.thoughtcrime.securesms.components.AudioView;
@@ -67,6 +66,7 @@ import org.thoughtcrime.securesms.components.DocumentView;
 import org.thoughtcrime.securesms.components.LinkPreviewView;
 import org.thoughtcrime.securesms.components.QuoteView;
 import org.thoughtcrime.securesms.components.SharedContactView;
+import org.thoughtcrime.securesms.components.StickerView;
 import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
 import org.thoughtcrime.securesms.contactshare.Contact;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
@@ -88,6 +88,7 @@ import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.loki.FriendRequestView;
 import org.thoughtcrime.securesms.loki.FriendRequestViewDelegate;
+import org.thoughtcrime.securesms.loki.LokiMessageFriendRequestDatabase;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.ImageSlide;
 import org.thoughtcrime.securesms.mms.PartAuthority;
@@ -97,12 +98,14 @@ import org.thoughtcrime.securesms.mms.SlidesClickedListener;
 import org.thoughtcrime.securesms.mms.TextSlide;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientModifiedListener;
+import org.thoughtcrime.securesms.stickers.StickerUrl;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.LongClickCopySpan;
 import org.thoughtcrime.securesms.util.LongClickMovementMethod;
 import org.thoughtcrime.securesms.util.SearchUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.views.Stub;
@@ -142,6 +145,7 @@ public class ConversationItem extends LinearLayout
   private   QuoteView              quoteView;
   private   EmojiTextView          bodyText;
   private   ConversationItemFooter footer;
+  private   ConversationItemFooter stickerFooter;
   private   TextView               groupSender;
   private   TextView               groupSenderProfileName;
   private   View                   groupSenderHolder;
@@ -152,12 +156,13 @@ public class ConversationItem extends LinearLayout
   private   FriendRequestView      friendRequestView;
 
   private @NonNull  Set<MessageRecord>              batchSelected = new HashSet<>();
-  private @NonNull  Recipient                       conversationRecipient;
-  private @NonNull  Stub<ConversationItemThumbnail> mediaThumbnailStub;
-  private @NonNull  Stub<AudioView>                 audioViewStub;
-  private @NonNull  Stub<DocumentView>              documentViewStub;
-  private @NonNull  Stub<SharedContactView>         sharedContactStub;
-  private @NonNull  Stub<LinkPreviewView>           linkPreviewStub;
+  private           Recipient                       conversationRecipient;
+  private           Stub<ConversationItemThumbnail> mediaThumbnailStub;
+  private           Stub<AudioView>                 audioViewStub;
+  private           Stub<DocumentView>              documentViewStub;
+  private           Stub<SharedContactView>         sharedContactStub;
+  private           Stub<LinkPreviewView>           linkPreviewStub;
+  private           Stub<StickerView>               stickerStub;
   private @Nullable EventListener                   eventListener;
 
   private int defaultBubbleColor;
@@ -196,6 +201,7 @@ public class ConversationItem extends LinearLayout
 
     this.bodyText                =            findViewById(R.id.conversation_item_body);
     this.footer                  =            findViewById(R.id.conversation_item_footer);
+    this.stickerFooter           =            findViewById(R.id.conversation_item_sticker_footer);
     this.groupSender             =            findViewById(R.id.group_message_sender);
     this.groupSenderProfileName  =            findViewById(R.id.group_message_sender_profile);
     this.alertView               =            findViewById(R.id.indicators_parent);
@@ -207,6 +213,7 @@ public class ConversationItem extends LinearLayout
     this.documentViewStub        = new Stub<>(findViewById(R.id.document_view_stub));
     this.sharedContactStub       = new Stub<>(findViewById(R.id.shared_contact_view_stub));
     this.linkPreviewStub         = new Stub<>(findViewById(R.id.link_preview_stub));
+    this.stickerStub             = new Stub<>(findViewById(R.id.sticker_view_stub));
     this.groupSenderHolder       =            findViewById(R.id.group_sender_holder);
     this.quoteView               =            findViewById(R.id.quote_view);
     this.container               =            findViewById(R.id.container);
@@ -251,6 +258,7 @@ public class ConversationItem extends LinearLayout
     setStatusIcons(messageRecord);
     setContactPhoto(recipient);
     setGroupMessageStatus(messageRecord, recipient);
+    setGroupAuthorColor(messageRecord);
     setAuthor(messageRecord, previousMessageRecord, nextMessageRecord, groupThread);
     setQuote(messageRecord, previousMessageRecord, nextMessageRecord, groupThread);
     setMessageSpacing(context, messageRecord, previousMessageRecord, nextMessageRecord, groupThread);
@@ -307,7 +315,7 @@ public class ConversationItem extends LinearLayout
     int availableWidth;
     if (hasAudio(messageRecord)) {
       availableWidth = audioViewStub.get().getMeasuredWidth() + ViewUtil.getLeftMargin(audioViewStub.get()) + ViewUtil.getRightMargin(audioViewStub.get());
-    } else if (hasThumbnail(messageRecord)) {
+    } else if (hasThumbnail(messageRecord) || hasBigImageLinkPreview(messageRecord)) {
       availableWidth = mediaThumbnailStub.get().getMeasuredWidth();
     } else {
       availableWidth = bodyBubble.getMeasuredWidth() - bodyBubble.getPaddingLeft() - bodyBubble.getPaddingRight();
@@ -405,8 +413,16 @@ public class ConversationItem extends LinearLayout
     return messageRecord.isMms() && ((MmsMessageRecord)messageRecord).getSlideDeck().getThumbnailSlide() != null;
   }
 
+  private boolean hasSticker(MessageRecord messageRecord) {
+    return messageRecord.isMms() && ((MmsMessageRecord)messageRecord).getSlideDeck().getStickerSlide() != null;
+  }
+
   private boolean hasOnlyThumbnail(MessageRecord messageRecord) {
-    return hasThumbnail(messageRecord) && !hasAudio(messageRecord) && !hasDocument(messageRecord) && !hasSharedContact(messageRecord);
+    return hasThumbnail(messageRecord)      &&
+           !hasAudio(messageRecord)         &&
+           !hasDocument(messageRecord)      &&
+           !hasSharedContact(messageRecord) &&
+           !hasSticker(messageRecord);
   }
 
   private boolean hasDocument(MessageRecord messageRecord) {
@@ -432,6 +448,17 @@ public class ConversationItem extends LinearLayout
     return messageRecord.isMms() && !((MmsMessageRecord)messageRecord).getLinkPreviews().isEmpty();
   }
 
+  private boolean hasBigImageLinkPreview(MessageRecord messageRecord) {
+    if (!hasLinkPreview(messageRecord)) return false;
+
+    LinkPreview linkPreview = ((MmsMessageRecord) messageRecord).getLinkPreviews().get(0);
+    int         minWidth    = getResources().getDimensionPixelSize(R.dimen.media_bubble_min_width);
+
+    return linkPreview.getThumbnail().isPresent()                  &&
+           linkPreview.getThumbnail().get().getWidth() >= minWidth &&
+           !StickerUrl.isValidShareLink(linkPreview.getUrl());
+  }
+
   private void setBodyText(MessageRecord messageRecord, @Nullable String searchQuery) {
     bodyText.setClickable(false);
     bodyText.setFocusable(false);
@@ -469,6 +496,7 @@ public class ConversationItem extends LinearLayout
       if (mediaThumbnailStub.resolved()) mediaThumbnailStub.get().setVisibility(View.GONE);
       if (documentViewStub.resolved())   documentViewStub.get().setVisibility(View.GONE);
       if (linkPreviewStub.resolved())    linkPreviewStub.get().setVisibility(GONE);
+      if (stickerStub.resolved())        stickerStub.get().setVisibility(View.GONE);
 
       sharedContactStub.get().setContact(((MediaMmsMessageRecord) messageRecord).getSharedContacts().get(0), glideRequests, locale);
       sharedContactStub.get().setEventListener(sharedContactEventListener);
@@ -486,11 +514,12 @@ public class ConversationItem extends LinearLayout
       if (mediaThumbnailStub.resolved()) mediaThumbnailStub.get().setVisibility(View.GONE);
       if (documentViewStub.resolved())   documentViewStub.get().setVisibility(View.GONE);
       if (sharedContactStub.resolved())  sharedContactStub.get().setVisibility(GONE);
+      if (stickerStub.resolved())        stickerStub.get().setVisibility(View.GONE);
 
       //noinspection ConstantConditions
       LinkPreview linkPreview = ((MmsMessageRecord) messageRecord).getLinkPreviews().get(0);
 
-      if (linkPreview.getThumbnail().isPresent() && shouldPromotePreviewImage(linkPreview.getThumbnail().get())) {
+      if (hasBigImageLinkPreview(messageRecord)) {
         mediaThumbnailStub.get().setVisibility(VISIBLE);
         mediaThumbnailStub.get().setImageResource(glideRequests, Collections.singletonList(new ImageSlide(context, linkPreview.getThumbnail().get())), showControls, false);
         mediaThumbnailStub.get().setThumbnailClickListener(new LinkPreviewThumbnailClickListener());
@@ -523,6 +552,7 @@ public class ConversationItem extends LinearLayout
       if (documentViewStub.resolved())   documentViewStub.get().setVisibility(View.GONE);
       if (sharedContactStub.resolved())  sharedContactStub.get().setVisibility(GONE);
       if (linkPreviewStub.resolved())    linkPreviewStub.get().setVisibility(GONE);
+      if (stickerStub.resolved())        stickerStub.get().setVisibility(View.GONE);
 
       //noinspection ConstantConditions
       audioViewStub.get().setAudio(((MediaMmsMessageRecord) messageRecord).getSlideDeck().getAudioSlide(), showControls);
@@ -531,6 +561,7 @@ public class ConversationItem extends LinearLayout
 
       ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
       ViewUtil.updateLayoutParams(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+
       footer.setVisibility(VISIBLE);
     } else if (hasDocument(messageRecord)) {
       documentViewStub.get().setVisibility(View.VISIBLE);
@@ -538,15 +569,38 @@ public class ConversationItem extends LinearLayout
       if (audioViewStub.resolved())      audioViewStub.get().setVisibility(View.GONE);
       if (sharedContactStub.resolved())  sharedContactStub.get().setVisibility(GONE);
       if (linkPreviewStub.resolved())    linkPreviewStub.get().setVisibility(GONE);
+      if (stickerStub.resolved())        stickerStub.get().setVisibility(View.GONE);
 
       //noinspection ConstantConditions
-      documentViewStub.get().setDocument(((MediaMmsMessageRecord)messageRecord).getSlideDeck().getDocumentSlide(), showControls);
+      documentViewStub.get().setDocument(((MediaMmsMessageRecord) messageRecord).getSlideDeck().getDocumentSlide(), showControls);
       documentViewStub.get().setDocumentClickListener(new ThumbnailClickListener());
       documentViewStub.get().setDownloadClickListener(singleDownloadClickListener);
       documentViewStub.get().setOnLongClickListener(passthroughClickListener);
 
       ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
       ViewUtil.updateLayoutParams(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+
+      footer.setVisibility(VISIBLE);
+    } else if (hasSticker(messageRecord) && isCaptionlessMms(messageRecord)) {
+      bodyBubble.setBackgroundColor(Color.TRANSPARENT);
+
+      stickerStub.get().setVisibility(View.VISIBLE);
+      if (mediaThumbnailStub.resolved()) mediaThumbnailStub.get().setVisibility(View.GONE);
+      if (audioViewStub.resolved())      audioViewStub.get().setVisibility(View.GONE);
+      if (documentViewStub.resolved())   documentViewStub.get().setVisibility(View.GONE);
+      if (sharedContactStub.resolved())  sharedContactStub.get().setVisibility(GONE);
+      if (linkPreviewStub.resolved())    linkPreviewStub.get().setVisibility(GONE);
+
+      //noinspection ConstantConditions
+      stickerStub.get().setSticker(glideRequests, ((MmsMessageRecord) messageRecord).getSlideDeck().getStickerSlide());
+      stickerStub.get().setThumbnailClickListener(new StickerClickListener());
+      stickerStub.get().setDownloadClickListener(downloadClickListener);
+      stickerStub.get().setOnLongClickListener(passthroughClickListener);
+      stickerStub.get().setOnClickListener(passthroughClickListener);
+
+      ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+      ViewUtil.updateLayoutParams(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+
       footer.setVisibility(VISIBLE);
     } else if (hasThumbnail(messageRecord)) {
       mediaThumbnailStub.get().setVisibility(View.VISIBLE);
@@ -554,6 +608,7 @@ public class ConversationItem extends LinearLayout
       if (documentViewStub.resolved())  documentViewStub.get().setVisibility(View.GONE);
       if (sharedContactStub.resolved()) sharedContactStub.get().setVisibility(GONE);
       if (linkPreviewStub.resolved())   linkPreviewStub.get().setVisibility(GONE);
+      if (stickerStub.resolved())        stickerStub.get().setVisibility(View.GONE);
 
       //noinspection ConstantConditions
       List<Slide> thumbnailSlides = ((MmsMessageRecord) messageRecord).getSlideDeck().getThumbnailSlides();
@@ -568,11 +623,13 @@ public class ConversationItem extends LinearLayout
       mediaThumbnailStub.get().showShade(TextUtils.isEmpty(messageRecord.getDisplayBody(getContext())) && !hasExtraText(messageRecord));
       mediaThumbnailStub.get().setConversationColor(messageRecord.isOutgoing() ? defaultBubbleColor
                                                                                : messageRecord.getRecipient().getColor().toConversationColor(context));
+      mediaThumbnailStub.get().setBorderless(false);
 
       setThumbnailCorners(messageRecord, previousRecord, nextRecord, isGroupThread);
 
       ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
       ViewUtil.updateLayoutParams(groupSenderHolder, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+
       footer.setVisibility(VISIBLE);
     } else {
       if (mediaThumbnailStub.resolved()) mediaThumbnailStub.get().setVisibility(View.GONE);
@@ -580,9 +637,11 @@ public class ConversationItem extends LinearLayout
       if (documentViewStub.resolved())   documentViewStub.get().setVisibility(View.GONE);
       if (sharedContactStub.resolved())  sharedContactStub.get().setVisibility(GONE);
       if (linkPreviewStub.resolved())    linkPreviewStub.get().setVisibility(GONE);
+      if (stickerStub.resolved())        stickerStub.get().setVisibility(View.GONE);
 
       ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
       ViewUtil.updateLayoutParams(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+
       footer.setVisibility(VISIBLE);
     }
   }
@@ -688,11 +747,6 @@ public class ConversationItem extends LinearLayout
     contactPhoto.setAvatar(glideRequests, recipient, true);
   }
 
-  private boolean shouldPromotePreviewImage(@NonNull Attachment attachment) {
-    int minWidth = getResources().getDimensionPixelSize(R.dimen.media_bubble_min_width);
-    return attachment.getWidth() >= minWidth;
-  }
-
   private SpannableString linkifyMessageBody(SpannableString messageBody, boolean shouldLinkifyAllLinks) {
     int     linkPattern = Linkify.WEB_URLS | Linkify.EMAIL_ADDRESSES | Linkify.PHONE_NUMBERS;
     boolean hasLinks    = Linkify.addLinks(messageBody, shouldLinkifyAllLinks ? linkPattern : 0);
@@ -728,7 +782,7 @@ public class ConversationItem extends LinearLayout
   private void setQuote(@NonNull MessageRecord current, @NonNull Optional<MessageRecord> previous, @NonNull Optional<MessageRecord> next, boolean isGroupThread) {
     if (current.isMms() && !current.isMmsNotification() && ((MediaMmsMessageRecord)current).getQuote() != null) {
       Quote quote = ((MediaMmsMessageRecord)current).getQuote();
-      assert quote != null;
+      //noinspection ConstantConditions
       quoteView.setQuote(glideRequests, quote.getId(), Recipient.from(context, quote.getAuthor(), true), quote.getText(), quote.isOriginalMissing(), quote.getAttachment());
       quoteView.setVisibility(View.VISIBLE);
       quoteView.getLayoutParams().width = ViewGroup.LayoutParams.WRAP_CONTENT;
@@ -783,6 +837,7 @@ public class ConversationItem extends LinearLayout
     ViewUtil.updateLayoutParams(footer, LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
 
     footer.setVisibility(GONE);
+    stickerFooter.setVisibility(GONE);
     if (sharedContactStub.resolved())  sharedContactStub.get().getFooter().setVisibility(GONE);
     if (mediaThumbnailStub.resolved()) mediaThumbnailStub.get().getFooter().setVisibility(GONE);
 
@@ -803,7 +858,9 @@ public class ConversationItem extends LinearLayout
   }
 
   private ConversationItemFooter getActiveFooter(@NonNull MessageRecord messageRecord) {
-    if (hasSharedContact(messageRecord)) {
+    if (hasSticker(messageRecord)) {
+      return stickerFooter;
+    } else if (hasSharedContact(messageRecord)) {
       return sharedContactStub.get().getFooter();
     } else if (hasOnlyThumbnail(messageRecord) && TextUtils.isEmpty(messageRecord.getDisplayBody(getContext()))) {
       return mediaThumbnailStub.get().getFooter();
@@ -838,6 +895,16 @@ public class ConversationItem extends LinearLayout
     }
   }
 
+  private void setGroupAuthorColor(@NonNull MessageRecord messageRecord) {
+    if (hasSticker(messageRecord)) {
+      groupSender.setTextColor(ThemeUtil.getThemedColor(context, R.attr.conversation_sticker_author_color));
+      groupSenderProfileName.setTextColor(ThemeUtil.getThemedColor(context, R.attr.conversation_sticker_author_color));
+    } else {
+      groupSender.setTextColor(ThemeUtil.getThemedColor(context, R.attr.conversation_item_received_text_primary_color));
+      groupSenderProfileName.setTextColor(ThemeUtil.getThemedColor(context, R.attr.conversation_item_received_text_primary_color));
+    }
+  }
+
   private void setAuthor(@NonNull MessageRecord current, @NonNull Optional<MessageRecord> previous, @NonNull Optional<MessageRecord> next, boolean isGroupThread) {
     if (isGroupThread && !current.isOutgoing()) {
       contactPhotoHolder.setVisibility(VISIBLE);
@@ -911,6 +978,14 @@ public class ConversationItem extends LinearLayout
     int spacingTop = readDimen(context, R.dimen.conversation_vertical_message_spacing_collapse);
     int spacingBottom = spacingTop;
 
+    boolean isOutgoingStack = current.isOutgoing() && previous.orNull() != null && previous.get().isOutgoing();
+    LokiMessageFriendRequestDatabase friendRequestDatabase = DatabaseFactory.getLokiMessageFriendRequestDatabase(context);
+    boolean isPreviousMessageFriendRequest = previous.orNull() != null && friendRequestDatabase.isFriendRequest(previous.get().id);
+
+    if (isOutgoingStack && isPreviousMessageFriendRequest) {
+      spacingTop = readDimen(context, R.dimen.conversation_vertical_message_spacing_default);
+    }
+
     if (isStartOfMessageCluster(current, previous, isGroupThread)) {
       spacingTop = readDimen(context, R.dimen.conversation_vertical_message_spacing_default);
     }
@@ -1090,6 +1165,18 @@ public class ConversationItem extends LinearLayout
     }
   }
 
+  private class StickerClickListener implements SlideClickListener {
+    @Override
+    public void onClick(View v, Slide slide) {
+      if (shouldInterceptClicks(messageRecord) || !batchSelected.isEmpty()) {
+        performClick();
+      } else if (eventListener != null && hasSticker(messageRecord)){
+        //noinspection ConstantConditions
+        eventListener.onStickerClicked(((MmsMessageRecord) messageRecord).getSlideDeck().getStickerSlide().asAttachment().getSticker());
+      }
+    }
+  }
+
   private class ThumbnailClickListener implements SlideClickListener {
     public void onClick(final View v, final Slide slide) {
       if (shouldInterceptClicks(messageRecord) || !batchSelected.isEmpty()) {
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java b/src/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java
index 8e48ac18f..0680a156f 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java
@@ -4,7 +4,6 @@ import android.app.Application;
 import android.arch.lifecycle.AndroidViewModel;
 import android.arch.lifecycle.LiveData;
 import android.content.Context;
-import android.os.AsyncTask;
 import android.support.annotation.NonNull;
 
 import org.thoughtcrime.securesms.contacts.ContactAccessor;
@@ -15,6 +14,7 @@ import org.thoughtcrime.securesms.search.model.MessageResult;
 import org.thoughtcrime.securesms.util.CloseableLiveData;
 import org.thoughtcrime.securesms.util.Debouncer;
 import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
 
 import java.io.Closeable;
 import java.util.List;
@@ -40,7 +40,7 @@ public class ConversationSearchViewModel extends AndroidViewModel {
                                             DatabaseFactory.getContactsDatabase(context),
                                             DatabaseFactory.getThreadDatabase(context),
                                             ContactAccessor.getInstance(),
-                                            AsyncTask.THREAD_POOL_EXECUTOR);
+                                            SignalExecutors.SERIAL);
   }
 
   LiveData<SearchResult> getSearchResults() {
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationStickerSuggestionAdapter.java b/src/org/thoughtcrime/securesms/conversation/ConversationStickerSuggestionAdapter.java
new file mode 100644
index 000000000..d4b0912e4
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationStickerSuggestionAdapter.java
@@ -0,0 +1,86 @@
+package org.thoughtcrime.securesms.conversation;
+
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
+
+import org.thoughtcrime.securesms.database.model.StickerRecord;
+import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
+import org.thoughtcrime.securesms.mms.GlideRequests;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import network.loki.messenger.R;
+
+public class ConversationStickerSuggestionAdapter extends RecyclerView.Adapter<ConversationStickerSuggestionAdapter.StickerSuggestionViewHolder> {
+
+  private final GlideRequests       glideRequests;
+  private final EventListener       eventListener;
+  private final List<StickerRecord> stickers;
+
+  public ConversationStickerSuggestionAdapter(@NonNull GlideRequests glideRequests, @NonNull EventListener eventListener) {
+    this.glideRequests = glideRequests;
+    this.eventListener = eventListener;
+    this.stickers      = new ArrayList<>();
+  }
+
+  @Override
+  public @NonNull StickerSuggestionViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
+    return new StickerSuggestionViewHolder(LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.sticker_suggestion_list_item, viewGroup, false));
+  }
+
+  @Override
+  public void onBindViewHolder(@NonNull StickerSuggestionViewHolder viewHolder, int i) {
+    viewHolder.bind(glideRequests, eventListener, stickers.get(i));
+  }
+
+  @Override
+  public void onViewRecycled(@NonNull StickerSuggestionViewHolder holder) {
+    holder.recycle();
+  }
+
+  @Override
+  public int getItemCount() {
+    return stickers.size();
+  }
+
+  public void setStickers(@NonNull List<StickerRecord> stickers) {
+    this.stickers.clear();
+    this.stickers.addAll(stickers);
+    notifyDataSetChanged();
+  }
+
+  static class StickerSuggestionViewHolder extends RecyclerView.ViewHolder {
+
+    private final ImageView image;
+
+    StickerSuggestionViewHolder(@NonNull View itemView) {
+      super(itemView);
+      this.image = itemView.findViewById(R.id.sticker_suggestion_item_image);
+    }
+
+    void bind(@NonNull GlideRequests glideRequests, @NonNull EventListener eventListener, @NonNull StickerRecord sticker) {
+      glideRequests.load(new DecryptableUri(sticker.getUri()))
+                   .transition(DrawableTransitionOptions.withCrossFade())
+                   .into(image);
+
+      itemView.setOnClickListener(v -> {
+        eventListener.onStickerSuggestionClicked(sticker);
+      });
+    }
+
+    void recycle() {
+      itemView.setOnClickListener(null);
+    }
+  }
+
+  public interface EventListener {
+    void onStickerSuggestionClicked(@NonNull StickerRecord sticker);
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationStickerViewModel.java b/src/org/thoughtcrime/securesms/conversation/ConversationStickerViewModel.java
new file mode 100644
index 000000000..d55bb1753
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationStickerViewModel.java
@@ -0,0 +1,85 @@
+package org.thoughtcrime.securesms.conversation;
+
+import android.app.Application;
+import android.arch.lifecycle.LiveData;
+import android.arch.lifecycle.MutableLiveData;
+import android.arch.lifecycle.ViewModel;
+import android.arch.lifecycle.ViewModelProvider;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.support.annotation.NonNull;
+import android.text.TextUtils;
+
+import org.thoughtcrime.securesms.database.CursorList;
+import org.thoughtcrime.securesms.database.DatabaseContentProviders;
+import org.thoughtcrime.securesms.database.model.StickerRecord;
+import org.thoughtcrime.securesms.stickers.StickerSearchRepository;
+import org.thoughtcrime.securesms.util.CloseableLiveData;
+import org.thoughtcrime.securesms.util.Throttler;
+
+class ConversationStickerViewModel extends ViewModel {
+
+  private static final int SEARCH_LIMIT = 10;
+
+  private final Application                                  application;
+  private final StickerSearchRepository                      repository;
+  private final CloseableLiveData<CursorList<StickerRecord>> stickers;
+  private final MutableLiveData<Boolean>                     stickersAvailable;
+  private final Throttler                                    availabilityThrottler;
+  private final ContentObserver                              packObserver;
+
+  private ConversationStickerViewModel(@NonNull Application application, @NonNull StickerSearchRepository repository) {
+    this.application           = application;
+    this.repository            = repository;
+    this.stickers              = new CloseableLiveData<>();
+    this.stickersAvailable     = new MutableLiveData<>();
+    this.availabilityThrottler = new Throttler(500);
+    this.packObserver          = new ContentObserver(new Handler()) {
+      @Override
+      public void onChange(boolean selfChange) {
+        availabilityThrottler.publish(() -> repository.getStickerFeatureAvailability(stickersAvailable::postValue));
+      }
+    };
+
+    application.getContentResolver().registerContentObserver(DatabaseContentProviders.StickerPack.CONTENT_URI, true, packObserver);
+  }
+
+  @NonNull LiveData<CursorList<StickerRecord>> getStickerResults() {
+    return stickers;
+  }
+
+  @NonNull LiveData<Boolean> getStickersAvailability() {
+    repository.getStickerFeatureAvailability(stickersAvailable::postValue);
+    return stickersAvailable;
+  }
+
+  void onInputTextUpdated(@NonNull String text) {
+    if (TextUtils.isEmpty(text) || text.length() > SEARCH_LIMIT) {
+      stickers.setValue(CursorList.emptyList());
+    } else {
+      repository.searchByEmoji(text, stickers::postValue);
+    }
+  }
+
+  @Override
+  protected void onCleared() {
+    stickers.close();
+    application.getContentResolver().unregisterContentObserver(packObserver);
+  }
+
+  static class Factory extends ViewModelProvider.NewInstanceFactory {
+    private final Application             application;
+    private final StickerSearchRepository repository;
+
+    public Factory(@NonNull Application application, @NonNull StickerSearchRepository repository) {
+      this.application = application;
+      this.repository  = repository;
+    }
+
+    @Override
+    public @NonNull <T extends ViewModel> T create(@NonNull Class<T> modelClass) {
+      //noinspection ConstantConditions
+      return modelClass.cast(new ConversationStickerViewModel(application, repository));
+    }
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java b/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
index d4c4630b3..1c29f96f7 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
@@ -28,7 +28,6 @@ public class ConversationTitleView extends RelativeLayout {
   private static final String TAG = ConversationTitleView.class.getSimpleName();
 
   private View            content;
-  private ImageView       back;
   private AvatarImageView avatar;
   private TextView        title;
   private TextView        subtitle;
@@ -48,7 +47,6 @@ public class ConversationTitleView extends RelativeLayout {
   public void onFinishInflate() {
     super.onFinishInflate();
 
-    this.back              = ViewUtil.findById(this, R.id.up_button);
     this.content           = ViewUtil.findById(this, R.id.content);
     this.title             = ViewUtil.findById(this, R.id.title);
     this.subtitle          = ViewUtil.findById(this, R.id.subtitle);
@@ -95,10 +93,6 @@ public class ConversationTitleView extends RelativeLayout {
     this.avatar.setOnLongClickListener(listener);
   }
 
-  public void setOnBackClickedListener(@Nullable OnClickListener listener) {
-    this.back.setOnClickListener(listener);
-  }
-
   private void setComposeTitle() {
     this.title.setText(R.string.ConversationActivity_compose_message);
     this.subtitle.setText(null);
@@ -147,10 +141,14 @@ public class ConversationTitleView extends RelativeLayout {
   private void setContactRecipientTitle(Recipient recipient) {
     this.title.setText(recipient.getName());
 
-    if (recipient.getCustomLabel() != null) this.subtitle.setText(recipient.getCustomLabel());
-    else                                    this.subtitle.setText(recipient.getAddress().serialize());
-
-    this.subtitle.setVisibility(View.VISIBLE);
-    this.subtitleContainer.setVisibility(VISIBLE);
+    if (TextUtils.isEmpty(recipient.getCustomLabel())) {
+      this.subtitle.setText(null);
+      this.subtitle.setVisibility(View.GONE);
+      this.subtitleContainer.setVisibility(View.GONE);
+    } else {
+      this.subtitle.setText(recipient.getCustomLabel());
+      this.subtitle.setVisibility(View.VISIBLE);
+      this.subtitleContainer.setVisibility(View.VISIBLE);
+    }
   }
 }
diff --git a/src/org/thoughtcrime/securesms/database/Address.java b/src/org/thoughtcrime/securesms/database/Address.java
index 5cb2cf258..f70033991 100644
--- a/src/org/thoughtcrime/securesms/database/Address.java
+++ b/src/org/thoughtcrime/securesms/database/Address.java
@@ -126,22 +126,26 @@ public class Address implements Parcelable, Comparable<Address> {
   }
 
   public @NonNull String toGroupString() {
-    if (!isGroup()) throw new AssertionError("Not group: " + address);
+    if (!isGroup()) throw new AssertionError("Not group");
     return address;
   }
 
   public @NonNull String toPhoneString() {
-    if (!isPhone()) throw new AssertionError("Not e164: " + address);
+    if (!isPhone()) {
+      if (isEmail()) throw new AssertionError("Not e164, is email");
+      if (isGroup()) throw new AssertionError("Not e164, is group");
+      throw new AssertionError("Not e164, unknown");
+    }
     return address;
   }
 
   public @NonNull String toEmailString() {
-    if (!isEmail()) throw new AssertionError("Not email: " + address);
+    if (!isEmail()) throw new AssertionError("Not email");
     return address;
   }
 
   @Override
-  public String toString() {
+  public @NonNull String toString() {
     return address;
   }
 
diff --git a/src/org/thoughtcrime/securesms/database/AttachmentDatabase.java b/src/org/thoughtcrime/securesms/database/AttachmentDatabase.java
index e5b630891..0827a2bd1 100644
--- a/src/org/thoughtcrime/securesms/database/AttachmentDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/AttachmentDatabase.java
@@ -28,7 +28,6 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
-import org.thoughtcrime.securesms.logging.Log;
 import android.util.Pair;
 
 import com.bumptech.glide.Glide;
@@ -45,9 +44,11 @@ import org.thoughtcrime.securesms.crypto.ClassicDecryptingPartInputStream;
 import org.thoughtcrime.securesms.crypto.ModernDecryptingPartInputStream;
 import org.thoughtcrime.securesms.crypto.ModernEncryptingPartOutputStream;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.MediaStream;
 import org.thoughtcrime.securesms.mms.MmsException;
 import org.thoughtcrime.securesms.mms.PartAuthority;
+import org.thoughtcrime.securesms.stickers.StickerLocator;
 import org.thoughtcrime.securesms.util.BitmapDecodingException;
 import org.thoughtcrime.securesms.util.BitmapUtil;
 import org.thoughtcrime.securesms.util.JsonUtils;
@@ -93,6 +94,9 @@ public class AttachmentDatabase extends Database {
           static final String DIGEST                 = "digest";
           static final String VOICE_NOTE             = "voice_note";
           static final String QUOTE                  = "quote";
+  public  static final String STICKER_PACK_ID        = "sticker_pack_id";
+  public  static final String STICKER_PACK_KEY       = "sticker_pack_key";
+          static final String STICKER_ID             = "sticker_id";
           static final String FAST_PREFLIGHT_ID      = "fast_preflight_id";
   public  static final String DATA_RANDOM            = "data_random";
   private static final String THUMBNAIL_RANDOM       = "thumbnail_random";
@@ -115,7 +119,7 @@ public class AttachmentDatabase extends Database {
                                                            SIZE, FILE_NAME, THUMBNAIL, THUMBNAIL_ASPECT_RATIO,
                                                            UNIQUE_ID, DIGEST, FAST_PREFLIGHT_ID, VOICE_NOTE,
                                                            QUOTE, DATA_RANDOM, THUMBNAIL_RANDOM, WIDTH, HEIGHT,
-                                                           CAPTION };
+                                                           CAPTION, STICKER_PACK_ID, STICKER_PACK_KEY, STICKER_ID};
 
   public static final String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " (" + ROW_ID + " INTEGER PRIMARY KEY, " +
     MMS_ID + " INTEGER, " + "seq" + " INTEGER DEFAULT 0, "                        +
@@ -128,11 +132,13 @@ public class AttachmentDatabase extends Database {
     UNIQUE_ID + " INTEGER NOT NULL, " + DIGEST + " BLOB, " + FAST_PREFLIGHT_ID + " TEXT, " +
     VOICE_NOTE + " INTEGER DEFAULT 0, " + DATA_RANDOM + " BLOB, " + THUMBNAIL_RANDOM + " BLOB, " +
     QUOTE + " INTEGER DEFAULT 0, " + WIDTH + " INTEGER DEFAULT 0, " + HEIGHT + " INTEGER DEFAULT 0, " +
-    CAPTION + " TEXT DEFAULT NULL);";
+    CAPTION + " TEXT DEFAULT NULL, " + STICKER_PACK_ID + " TEXT DEFAULT NULL, " +
+    STICKER_PACK_KEY + " DEFAULT NULL, " + STICKER_ID + " INTEGER DEFAULT -1);";
 
   public static final String[] CREATE_INDEXS = {
     "CREATE INDEX IF NOT EXISTS part_mms_id_index ON " + TABLE_NAME + " (" + MMS_ID + ");",
     "CREATE INDEX IF NOT EXISTS pending_push_index ON " + TABLE_NAME + " (" + TRANSFER_STATE + ");",
+    "CREATE INDEX IF NOT EXISTS part_sticker_pack_id_index ON " + TABLE_NAME + " (" + STICKER_PACK_ID + ");",
   };
 
   private final ExecutorService thumbnailExecutor = Util.newSingleThreadedLifoExecutor();
@@ -176,6 +182,15 @@ public class AttachmentDatabase extends Database {
     }
   }
 
+  public boolean containsStickerPackId(@NonNull String stickerPackId) {
+    String   selection = STICKER_PACK_ID + " = ?";
+    String[] args      = new String[] { stickerPackId };
+
+    try (Cursor cursor = databaseHelper.getReadableDatabase().query(TABLE_NAME, null, selection, args, null, null, "1")) {
+      return cursor != null && cursor.moveToFirst();
+    }
+  }
+
   public void setTransferProgressFailed(AttachmentId attachmentId, long mmsId)
       throws MmsException
   {
@@ -435,7 +450,8 @@ public class AttachmentDatabase extends Database {
                                   mediaStream.getWidth(),
                                   mediaStream.getHeight(),
                                   databaseAttachment.isQuote(),
-                                  databaseAttachment.getCaption());
+                                  databaseAttachment.getCaption(),
+                                  databaseAttachment.getSticker());
   }
 
 
@@ -477,6 +493,26 @@ public class AttachmentDatabase extends Database {
     notifyConversationListeners(DatabaseFactory.getMmsDatabase(context).getThreadIdForMessage(messageId));
   }
 
+  /**
+   * Returns (pack_id, pack_key) pairs that are referenced in attachments but not in the stickers
+   * database.
+   */
+  public @Nullable Cursor getUnavailableStickerPacks() {
+    String query = "SELECT DISTINCT " + STICKER_PACK_ID + ", " + STICKER_PACK_KEY + " FROM " + TABLE_NAME + " WHERE " + STICKER_PACK_ID + " NOT IN (" +
+                     "SELECT DISTINCT " + StickerDatabase.PACK_ID + " FROM " + StickerDatabase.TABLE_NAME +
+                   ")";
+
+    return databaseHelper.getReadableDatabase().rawQuery(query, null);
+  }
+
+  public boolean hasStickerAttachments() {
+    String selection = STICKER_PACK_ID + " NOT NULL";
+
+    try (Cursor cursor = databaseHelper.getReadableDatabase().query(TABLE_NAME, null, selection, null, null, null, null, "1")) {
+      return cursor != null && cursor.moveToFirst();
+    }
+  }
+
   @SuppressWarnings("WeakerAccess")
   @VisibleForTesting
   protected @Nullable InputStream getDataStream(AttachmentId attachmentId, String dataType, long offset)
@@ -609,7 +645,12 @@ public class AttachmentDatabase extends Database {
                                               object.getInt(WIDTH),
                                               object.getInt(HEIGHT),
                                               object.getInt(QUOTE) == 1,
-                                              object.getString(CAPTION)));
+                                              object.getString(CAPTION),
+                                              object.getInt(STICKER_ID) >= 0
+                                                  ? new StickerLocator(object.getString(STICKER_PACK_ID),
+                                                                       object.getString(STICKER_PACK_KEY),
+                                                                       object.getInt(STICKER_ID))
+                                                  : null));
           }
         }
 
@@ -633,7 +674,12 @@ public class AttachmentDatabase extends Database {
                                                                 cursor.getInt(cursor.getColumnIndexOrThrow(WIDTH)),
                                                                 cursor.getInt(cursor.getColumnIndexOrThrow(HEIGHT)),
                                                                 cursor.getInt(cursor.getColumnIndexOrThrow(QUOTE)) == 1,
-                                                                cursor.getString(cursor.getColumnIndexOrThrow(CAPTION))));
+                                                                cursor.getString(cursor.getColumnIndexOrThrow(CAPTION)),
+                                                                cursor.getInt(cursor.getColumnIndexOrThrow(STICKER_ID)) >= 0
+                                                                    ? new StickerLocator(cursor.getString(cursor.getColumnIndexOrThrow(STICKER_PACK_ID)),
+                                                                                         cursor.getString(cursor.getColumnIndexOrThrow(STICKER_PACK_KEY)),
+                                                                                         cursor.getInt(cursor.getColumnIndexOrThrow(STICKER_ID)))
+                                                                    : null));
       }
     } catch (JSONException e) {
       throw new AssertionError(e);
@@ -673,12 +719,19 @@ public class AttachmentDatabase extends Database {
     contentValues.put(QUOTE, quote);
     contentValues.put(CAPTION, attachment.getCaption());
 
+    if (attachment.isSticker()) {
+      contentValues.put(STICKER_PACK_ID, attachment.getSticker().getPackId());
+      contentValues.put(STICKER_PACK_KEY, attachment.getSticker().getPackKey());
+      contentValues.put(STICKER_ID, attachment.getSticker().getStickerId());
+    }
+
     if (dataInfo != null) {
       contentValues.put(DATA, dataInfo.file.getAbsolutePath());
       contentValues.put(SIZE, dataInfo.length);
       contentValues.put(DATA_RANDOM, dataInfo.random);
     }
 
+    boolean      notifyPacks  = attachment.isSticker() && !hasStickerAttachments();
     long         rowId        = database.insert(TABLE_NAME, null, contentValues);
     AttachmentId attachmentId = new AttachmentId(rowId, uniqueId);
     Uri          thumbnailUri = attachment.getThumbnailUri();
@@ -713,6 +766,10 @@ public class AttachmentDatabase extends Database {
       }
     }
 
+    if (notifyPacks) {
+      notifyStickerPackListeners();
+    }
+
     return attachmentId;
   }
 
diff --git a/src/org/thoughtcrime/securesms/database/CursorList.java b/src/org/thoughtcrime/securesms/database/CursorList.java
index f53aa3b3d..12bc39cb9 100644
--- a/src/org/thoughtcrime/securesms/database/CursorList.java
+++ b/src/org/thoughtcrime/securesms/database/CursorList.java
@@ -2,11 +2,10 @@ package org.thoughtcrime.securesms.database;
 
 import android.database.ContentObserver;
 import android.database.Cursor;
-import android.database.DataSetObserver;
 import android.database.MatrixCursor;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 
-import java.io.Closeable;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
@@ -22,7 +21,7 @@ import java.util.ListIterator;
  *
  * Given that this is cursor-backed, it is effectively immutable.
  */
-public class CursorList<T> implements List<T>, Closeable {
+public class CursorList<T> implements List<T>, ObservableContent {
 
   private final Cursor          cursor;
   private final ModelBuilder<T> modelBuilder;
@@ -58,9 +57,8 @@ public class CursorList<T> implements List<T>, Closeable {
     throw new UnsupportedOperationException();
   }
 
-  @NonNull
   @Override
-  public Iterator<T> iterator() {
+  public @NonNull Iterator<T> iterator() {
     return new Iterator<T>() {
       int index = 0;
 
@@ -77,9 +75,8 @@ public class CursorList<T> implements List<T>, Closeable {
     };
   }
 
-  @NonNull
   @Override
-  public Object[] toArray() {
+  public @NonNull Object[] toArray() {
     Object[] out = new Object[size()];
     for (int i = 0; i < cursor.getCount(); i++) {
       cursor.moveToPosition(i);
@@ -145,19 +142,17 @@ public class CursorList<T> implements List<T>, Closeable {
   }
 
   @Override
-  public ListIterator<T> listIterator() {
+  public @NonNull ListIterator<T> listIterator() {
     throw new UnsupportedOperationException();
   }
 
-  @NonNull
   @Override
-  public ListIterator<T> listIterator(int i) {
+  public @NonNull ListIterator<T> listIterator(int i) {
     throw new UnsupportedOperationException();
   }
 
-  @NonNull
   @Override
-  public List<T> subList(int i, int i1) {
+  public @NonNull List<T> subList(int i, int i1) {
     throw new UnsupportedOperationException();
   }
 
@@ -176,9 +171,8 @@ public class CursorList<T> implements List<T>, Closeable {
     throw new UnsupportedOperationException();
   }
 
-  @NonNull
   @Override
-  public T[] toArray(@NonNull Object[] objects) {
+  public @NonNull T[] toArray(@Nullable Object[] objects) {
     throw new UnsupportedOperationException();
   }
 
@@ -189,10 +183,12 @@ public class CursorList<T> implements List<T>, Closeable {
     }
   }
 
+  @Override
   public void registerContentObserver(@NonNull ContentObserver observer) {
     cursor.registerContentObserver(observer);
   }
 
+  @Override
   public void unregisterContentObserver(@NonNull ContentObserver observer) {
     cursor.unregisterContentObserver(observer);
   }
diff --git a/src/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java b/src/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java
index f815e900d..a7cbec1c7 100644
--- a/src/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java
+++ b/src/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java
@@ -130,7 +130,7 @@ public abstract class CursorRecyclerViewAdapter<VH extends RecyclerView.ViewHold
 
   @SuppressWarnings("unchecked")
   @Override
-  public final void onViewRecycled(ViewHolder holder) {
+  public final void onViewRecycled(@NonNull ViewHolder holder) {
     if (!(holder instanceof HeaderFooterViewHolder)) {
       onItemViewRecycled((VH)holder);
     }
@@ -139,7 +139,7 @@ public abstract class CursorRecyclerViewAdapter<VH extends RecyclerView.ViewHold
   public void onItemViewRecycled(VH holder) {}
 
   @Override
-  public final ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+  public @NonNull final ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
     switch (viewType) {
     case HEADER_TYPE: return new HeaderFooterViewHolder(header);
     case FOOTER_TYPE: return new HeaderFooterViewHolder(footer);
@@ -151,7 +151,7 @@ public abstract class CursorRecyclerViewAdapter<VH extends RecyclerView.ViewHold
 
   @SuppressWarnings("unchecked")
   @Override
-  public final void onBindViewHolder(RecyclerView.ViewHolder viewHolder, int position) {
+  public final void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int position) {
     if (!isHeaderPosition(position) && !isFooterPosition(position)) {
       if (isFastAccessPosition(position)) onBindFastAccessItemViewHolder((VH)viewHolder, position);
       else                                onBindItemViewHolder((VH)viewHolder, getCursorAtPositionOrThrow(position));
@@ -178,9 +178,10 @@ public abstract class CursorRecyclerViewAdapter<VH extends RecyclerView.ViewHold
 
   @Override
   public final long getItemId(int position) {
-    if (isHeaderPosition(position))     return HEADER_ID;
-    if (isFooterPosition(position))     return FOOTER_ID;
-    if (isFastAccessPosition(position)) return getFastAccessItemId(position);
+    if (isHeaderPosition(position))          return HEADER_ID;
+    else if (isFooterPosition(position))     return FOOTER_ID;
+    else if (isFastAccessPosition(position)) return getFastAccessItemId(position);
+
     long itemId = getItemId(getCursorAtPositionOrThrow(position));
     return itemId <= Long.MIN_VALUE + 1 ? itemId + 2 : itemId;
   }
diff --git a/src/org/thoughtcrime/securesms/database/Database.java b/src/org/thoughtcrime/securesms/database/Database.java
index 814251361..bffb0678f 100644
--- a/src/org/thoughtcrime/securesms/database/Database.java
+++ b/src/org/thoughtcrime/securesms/database/Database.java
@@ -19,7 +19,6 @@ package org.thoughtcrime.securesms.database;
 import android.content.Context;
 import android.database.ContentObserver;
 import android.database.Cursor;
-import android.net.Uri;
 import android.support.annotation.NonNull;
 
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
@@ -51,6 +50,14 @@ public abstract class Database {
     context.getContentResolver().notifyChange(DatabaseContentProviders.ConversationList.CONTENT_URI, null);
   }
 
+  protected void notifyStickerListeners() {
+    context.getContentResolver().notifyChange(DatabaseContentProviders.Sticker.CONTENT_URI, null);
+  }
+
+  protected void notifyStickerPackListeners() {
+    context.getContentResolver().notifyChange(DatabaseContentProviders.StickerPack.CONTENT_URI, null);
+  }
+
   protected void setNotifyConverationListeners(Cursor cursor, long threadId) {
     cursor.setNotificationUri(context.getContentResolver(), DatabaseContentProviders.Conversation.getUriForThread(threadId));
   }
@@ -59,6 +66,14 @@ public abstract class Database {
     cursor.setNotificationUri(context.getContentResolver(), DatabaseContentProviders.ConversationList.CONTENT_URI);
   }
 
+  protected void setNotifyStickerListeners(Cursor cursor) {
+    cursor.setNotificationUri(context.getContentResolver(), DatabaseContentProviders.Sticker.CONTENT_URI);
+  }
+
+  protected void setNotifyStickerPackListeners(Cursor cursor) {
+    cursor.setNotificationUri(context.getContentResolver(), DatabaseContentProviders.StickerPack.CONTENT_URI);
+  }
+
   protected void registerAttachmentListeners(@NonNull ContentObserver observer) {
     context.getContentResolver().registerContentObserver(DatabaseContentProviders.Attachment.CONTENT_URI,
                                                          true,
diff --git a/src/org/thoughtcrime/securesms/database/DatabaseContentProviders.java b/src/org/thoughtcrime/securesms/database/DatabaseContentProviders.java
index 7057d1f64..44d4607cd 100644
--- a/src/org/thoughtcrime/securesms/database/DatabaseContentProviders.java
+++ b/src/org/thoughtcrime/securesms/database/DatabaseContentProviders.java
@@ -29,6 +29,14 @@ public class DatabaseContentProviders {
     public static final Uri CONTENT_URI = Uri.parse("content://network.loki.securesms.database.attachment");
   }
 
+  public static class Sticker extends NoopContentProvider {
+    public static final Uri CONTENT_URI = Uri.parse("content://network.loki.securesms.database.sticker");
+  }
+
+  public static class StickerPack extends NoopContentProvider {
+    public static final Uri CONTENT_URI = Uri.parse("content://network.loki.securesms.database.stickerpack");
+  }
+
   private static abstract class NoopContentProvider extends ContentProvider {
 
     @Override
diff --git a/src/org/thoughtcrime/securesms/database/DatabaseFactory.java b/src/org/thoughtcrime/securesms/database/DatabaseFactory.java
index ee625bf62..6ffcbddd0 100644
--- a/src/org/thoughtcrime/securesms/database/DatabaseFactory.java
+++ b/src/org/thoughtcrime/securesms/database/DatabaseFactory.java
@@ -64,6 +64,7 @@ public class DatabaseFactory {
   private final SessionDatabase       sessionDatabase;
   private final SearchDatabase        searchDatabase;
   private final JobDatabase           jobDatabase;
+  private final StickerDatabase       stickerDatabase;
 
   // Loki
   private final LokiAPIDatabase lokiAPIDatabase;
@@ -154,6 +155,10 @@ public class DatabaseFactory {
     return getInstance(context).jobDatabase;
   }
 
+  public static StickerDatabase getStickerDatabase(Context context) {
+    return getInstance(context).stickerDatabase;
+  }
+
   public static SQLiteDatabase getBackupDatabase(Context context) {
     return getInstance(context).databaseHelper.getReadableDatabase();
   }
@@ -214,7 +219,7 @@ public class DatabaseFactory {
     this.sessionDatabase      = new SessionDatabase(context, databaseHelper);
     this.searchDatabase       = new SearchDatabase(context, databaseHelper);
     this.jobDatabase          = new JobDatabase(context, databaseHelper);
-
+    this.stickerDatabase      = new StickerDatabase(context, databaseHelper, attachmentSecret);
     this.lokiAPIDatabase = new LokiAPIDatabase(context, databaseHelper);
     this.lokiContactPreKeyDatabase = new LokiPreKeyRecordDatabase(context, databaseHelper);
     this.lokiPreKeyBundleDatabase = new LokiPreKeyBundleDatabase(context, databaseHelper);
diff --git a/src/org/thoughtcrime/securesms/database/IdentityDatabase.java b/src/org/thoughtcrime/securesms/database/IdentityDatabase.java
index 8f26a84b0..f76873606 100644
--- a/src/org/thoughtcrime/securesms/database/IdentityDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/IdentityDatabase.java
@@ -210,7 +210,7 @@ public class IdentityDatabase extends Database {
     }
 
     @Override
-    public String toString() {
+    public @NonNull String toString() {
       return "{address: " + address + ", identityKey: " + identitykey + ", verifiedStatus: " + verifiedStatus + ", firstUse: " + firstUse + "}";
     }
 
diff --git a/src/org/thoughtcrime/securesms/database/MediaDatabase.java b/src/org/thoughtcrime/securesms/database/MediaDatabase.java
index 3f837a622..e6811ba22 100644
--- a/src/org/thoughtcrime/securesms/database/MediaDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/MediaDatabase.java
@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.database;
 
 import android.content.Context;
-import android.database.ContentObservable;
 import android.database.ContentObserver;
 import android.database.Cursor;
 import android.support.annotation.NonNull;
@@ -9,7 +8,6 @@ import android.support.annotation.Nullable;
 
 import net.sqlcipher.database.SQLiteDatabase;
 
-import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 
@@ -35,6 +33,9 @@ public class MediaDatabase extends Database {
         + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.WIDTH + ", "
         + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.HEIGHT + ", "
         + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.QUOTE + ", "
+        + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.STICKER_PACK_ID + ", "
+        + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.STICKER_PACK_KEY + ", "
+        + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.STICKER_ID + ", "
         + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.CAPTION + ", "
         + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.NAME + ", "
         + MmsDatabase.TABLE_NAME + "." + MmsDatabase.MESSAGE_BOX + ", "
@@ -47,7 +48,8 @@ public class MediaDatabase extends Database {
         + " FROM " + MmsDatabase.TABLE_NAME
         + " WHERE " + MmsDatabase.THREAD_ID + " = ?) AND (%s) AND "
         + AttachmentDatabase.DATA + " IS NOT NULL AND "
-        + AttachmentDatabase.QUOTE + " = 0 "
+        + AttachmentDatabase.QUOTE + " = 0 AND "
+        + AttachmentDatabase.STICKER_PACK_ID + " IS NULL "
         + "ORDER BY " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.ROW_ID + " DESC";
 
   private static final String GALLERY_MEDIA_QUERY  = String.format(BASE_MEDIA_QUERY, AttachmentDatabase.CONTENT_TYPE + " LIKE 'image/%' OR " + AttachmentDatabase.CONTENT_TYPE + " LIKE 'video/%'");
diff --git a/src/org/thoughtcrime/securesms/database/MmsDatabase.java b/src/org/thoughtcrime/securesms/database/MmsDatabase.java
index 8e0f53e46..3d32806be 100644
--- a/src/org/thoughtcrime/securesms/database/MmsDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/MmsDatabase.java
@@ -134,7 +134,7 @@ public class MmsDatabase extends MessagingDatabase {
     "CREATE INDEX IF NOT EXISTS mms_read_and_notified_and_thread_id_index ON " + TABLE_NAME + "(" + READ + "," + NOTIFIED + "," + THREAD_ID + ");",
     "CREATE INDEX IF NOT EXISTS mms_message_box_index ON " + TABLE_NAME + " (" + MESSAGE_BOX + ");",
     "CREATE INDEX IF NOT EXISTS mms_date_sent_index ON " + TABLE_NAME + " (" + DATE_SENT + ");",
-    "CREATE INDEX IF NOT EXISTS mms_thread_date_index ON " + TABLE_NAME + " (" + THREAD_ID + ", " + DATE_RECEIVED + ");"
+    "CREATE INDEX IF NOT EXISTS mms_thread_date_index ON " + TABLE_NAME + " (" + THREAD_ID + ", " + DATE_RECEIVED + ");",
   };
 
   private static final String[] MMS_PROJECTION = new String[] {
@@ -166,7 +166,10 @@ public class MmsDatabase extends MessagingDatabase {
           "'" + AttachmentDatabase.CONTENT_DISPOSITION + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.CONTENT_DISPOSITION + ", " +
           "'" + AttachmentDatabase.NAME + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.NAME + ", " +
           "'" + AttachmentDatabase.TRANSFER_STATE + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.TRANSFER_STATE + ", " +
-          "'" + AttachmentDatabase.CAPTION + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.CAPTION +
+          "'" + AttachmentDatabase.CAPTION + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.CAPTION + ", " +
+          "'" + AttachmentDatabase.STICKER_PACK_ID + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.STICKER_PACK_ID+ ", " +
+          "'" + AttachmentDatabase.STICKER_PACK_KEY + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.STICKER_PACK_KEY + ", " +
+          "'" + AttachmentDatabase.STICKER_ID + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.STICKER_ID +
           ")) AS " + AttachmentDatabase.ATTACHMENT_JSON_ALIAS,
   };
 
@@ -758,7 +761,8 @@ public class MmsDatabase extends MessagingDatabase {
                                                databaseAttachment.getWidth(),
                                                databaseAttachment.getHeight(),
                                                databaseAttachment.isQuote(),
-                                               databaseAttachment.getCaption()));
+                                               databaseAttachment.getCaption(),
+                                               databaseAttachment.getSticker()));
       }
 
       return insertMediaMessage(request.getBody(),
@@ -1065,6 +1069,8 @@ public class MmsDatabase extends MessagingDatabase {
     database.delete(TABLE_NAME, ID_WHERE, new String[] {messageId+""});
     boolean threadDeleted = DatabaseFactory.getThreadDatabase(context).update(threadId, false);
     notifyConversationListeners(threadId);
+    notifyStickerListeners();
+    notifyStickerPackListeners();
     return threadDeleted;
   }
 
@@ -1220,6 +1226,18 @@ public class MmsDatabase extends MessagingDatabase {
     }
   }
 
+  public void beginTransaction() {
+    databaseHelper.getWritableDatabase().beginTransaction();
+  }
+
+  public void setTransactionSuccessful() {
+    databaseHelper.getWritableDatabase().setTransactionSuccessful();
+  }
+
+  public void endTransaction() {
+    databaseHelper.getWritableDatabase().endTransaction();
+  }
+
   public Reader readerFor(Cursor cursor) {
     return new Reader(cursor);
   }
@@ -1448,8 +1466,10 @@ public class MmsDatabase extends MessagingDatabase {
     }
 
     private SlideDeck getSlideDeck(@NonNull List<DatabaseAttachment> attachments) {
-      List<? extends Attachment> messageAttachmnets = Stream.of(attachments).filterNot(Attachment::isQuote).toList();
-      return new SlideDeck(context, messageAttachmnets);
+      List<? extends Attachment> messageAttachments = Stream.of(attachments)
+                                                            .filterNot(Attachment::isQuote)
+                                                            .toList();
+      return new SlideDeck(context, messageAttachments);
     }
 
     private @Nullable Quote getQuote(@NonNull Cursor cursor) {
diff --git a/src/org/thoughtcrime/securesms/database/MmsSmsDatabase.java b/src/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
index 7bd104369..a2c4da21f 100644
--- a/src/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
@@ -248,7 +248,10 @@ public class MmsSmsDatabase extends Database {
                                   "'" + AttachmentDatabase.CONTENT_DISPOSITION + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.CONTENT_DISPOSITION + ", " +
                                   "'" + AttachmentDatabase.NAME + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.NAME + ", " +
                                   "'" + AttachmentDatabase.TRANSFER_STATE + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.TRANSFER_STATE + ", " +
-                                  "'" + AttachmentDatabase.CAPTION + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.CAPTION +
+                                  "'" + AttachmentDatabase.CAPTION + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.CAPTION + ", " +
+                                  "'" + AttachmentDatabase.STICKER_PACK_ID + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.STICKER_PACK_ID + ", " +
+                                  "'" + AttachmentDatabase.STICKER_PACK_KEY + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.STICKER_PACK_KEY + ", " +
+                                  "'" + AttachmentDatabase.STICKER_ID + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.STICKER_ID +
                                   ")) AS " + AttachmentDatabase.ATTACHMENT_JSON_ALIAS,
                               SmsDatabase.BODY, MmsSmsColumns.READ, MmsSmsColumns.THREAD_ID,
                               SmsDatabase.TYPE, SmsDatabase.ADDRESS, SmsDatabase.ADDRESS_DEVICE_ID, SmsDatabase.SUBJECT, MmsDatabase.MESSAGE_TYPE,
@@ -349,6 +352,9 @@ public class MmsSmsDatabase extends Database {
     mmsColumnsPresent.add(AttachmentDatabase.WIDTH);
     mmsColumnsPresent.add(AttachmentDatabase.HEIGHT);
     mmsColumnsPresent.add(AttachmentDatabase.QUOTE);
+    mmsColumnsPresent.add(AttachmentDatabase.STICKER_PACK_ID);
+    mmsColumnsPresent.add(AttachmentDatabase.STICKER_PACK_KEY);
+    mmsColumnsPresent.add(AttachmentDatabase.STICKER_ID);
     mmsColumnsPresent.add(AttachmentDatabase.CAPTION);
     mmsColumnsPresent.add(AttachmentDatabase.CONTENT_DISPOSITION);
     mmsColumnsPresent.add(AttachmentDatabase.NAME);
diff --git a/src/org/thoughtcrime/securesms/database/ObservableContent.java b/src/org/thoughtcrime/securesms/database/ObservableContent.java
new file mode 100644
index 000000000..874fb3612
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/database/ObservableContent.java
@@ -0,0 +1,11 @@
+package org.thoughtcrime.securesms.database;
+
+import android.database.ContentObserver;
+import android.support.annotation.NonNull;
+
+import java.io.Closeable;
+
+public interface ObservableContent extends Closeable {
+  void registerContentObserver(@NonNull ContentObserver observer);
+  void unregisterContentObserver(@NonNull ContentObserver observer);
+}
diff --git a/src/org/thoughtcrime/securesms/database/StickerDatabase.java b/src/org/thoughtcrime/securesms/database/StickerDatabase.java
new file mode 100644
index 000000000..d850aa8aa
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/database/StickerDatabase.java
@@ -0,0 +1,481 @@
+package org.thoughtcrime.securesms.database;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+import android.util.Pair;
+
+import net.sqlcipher.database.SQLiteDatabase;
+
+import org.greenrobot.eventbus.EventBus;
+import org.thoughtcrime.securesms.crypto.AttachmentSecret;
+import org.thoughtcrime.securesms.crypto.ModernDecryptingPartInputStream;
+import org.thoughtcrime.securesms.crypto.ModernEncryptingPartOutputStream;
+import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
+import org.thoughtcrime.securesms.database.model.IncomingSticker;
+import org.thoughtcrime.securesms.database.model.StickerPackRecord;
+import org.thoughtcrime.securesms.database.model.StickerRecord;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
+import org.thoughtcrime.securesms.stickers.BlessedPacks;
+import org.thoughtcrime.securesms.stickers.StickerPackInstallEvent;
+import org.thoughtcrime.securesms.util.Util;
+
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class StickerDatabase extends Database {
+
+  private static final String TAG = Log.tag(StickerDatabase.class);
+
+  public  static final String TABLE_NAME  = "sticker";
+  public  static final String _ID         = "_id";
+          static final String PACK_ID     = "pack_id";
+  private static final String PACK_KEY    = "pack_key";
+  private static final String PACK_TITLE  = "pack_title";
+  private static final String PACK_AUTHOR = "pack_author";
+  private static final String STICKER_ID  = "sticker_id";
+  private static final String EMOJI       = "emoji";
+  private static final String COVER       = "cover";
+  private static final String INSTALLED   = "installed";
+  private static final String LAST_USED   = "last_used";
+  public  static final String FILE_PATH   = "file_path";
+  public  static final String FILE_LENGTH = "file_length";
+  public  static final String FILE_RANDOM = "file_random";
+
+  public static final String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " (" + _ID          + " INTEGER PRIMARY KEY AUTOINCREMENT, " +
+                                                                                  PACK_ID      + " TEXT NOT NULL, " +
+                                                                                  PACK_KEY     + " TEXT NOT NULL, " +
+                                                                                  PACK_TITLE   + " TEXT NOT NULL, " +
+                                                                                  PACK_AUTHOR  + " TEXT NOT NULL, " +
+                                                                                  STICKER_ID   + " INTEGER, " +
+                                                                                  COVER        + " INTEGER, " +
+                                                                                  EMOJI        + " TEXT NOT NULL, " +
+                                                                                  LAST_USED    + " INTEGER, " +
+                                                                                  INSTALLED    + " INTEGER," +
+                                                                                  FILE_PATH    + " TEXT NOT NULL, " +
+                                                                                  FILE_LENGTH  + " INTEGER, " +
+                                                                                  FILE_RANDOM  + " BLOB, " +
+                                                                                  "UNIQUE(" + PACK_ID + ", " + STICKER_ID + ", " + COVER + ") ON CONFLICT IGNORE)";
+
+  public static final String[] CREATE_INDEXES = {
+      "CREATE INDEX IF NOT EXISTS sticker_pack_id_index ON " + TABLE_NAME + " (" + PACK_ID + ");",
+      "CREATE INDEX IF NOT EXISTS sticker_sticker_id_index ON " + TABLE_NAME + " (" + STICKER_ID + ");"
+  };
+
+  private static final String DIRECTORY = "stickers";
+
+  private final AttachmentSecret attachmentSecret;
+
+  public StickerDatabase(Context context, SQLCipherOpenHelper databaseHelper, AttachmentSecret attachmentSecret) {
+    super(context, databaseHelper);
+    this.attachmentSecret = attachmentSecret;
+  }
+
+  public void insertSticker(@NonNull IncomingSticker sticker, @NonNull InputStream dataStream) throws IOException {
+    FileInfo      fileInfo      = saveStickerImage(dataStream);
+    ContentValues contentValues = new ContentValues();
+
+    contentValues.put(PACK_ID, sticker.getPackId());
+    contentValues.put(PACK_KEY, sticker.getPackKey());
+    contentValues.put(PACK_TITLE, sticker.getPackTitle());
+    contentValues.put(PACK_AUTHOR, sticker.getPackAuthor());
+    contentValues.put(STICKER_ID, sticker.getStickerId());
+    contentValues.put(EMOJI, sticker.getEmoji());
+    contentValues.put(COVER, sticker.isCover() ? 1 : 0);
+    contentValues.put(INSTALLED, sticker.isInstalled() ? 1 : 0);
+    contentValues.put(FILE_PATH, fileInfo.getFile().getAbsolutePath());
+    contentValues.put(FILE_LENGTH, fileInfo.getLength());
+    contentValues.put(FILE_RANDOM, fileInfo.getRandom());
+
+    long id = databaseHelper.getWritableDatabase().insert(TABLE_NAME, null, contentValues);
+
+    if (id > 0) {
+      notifyStickerListeners();
+
+      if (sticker.isCover()) {
+        notifyStickerPackListeners();
+
+        if (sticker.isInstalled()) {
+          broadcastInstallEvent(sticker.getPackId());
+        }
+      }
+    }
+  }
+
+  public @Nullable StickerRecord getSticker(@NonNull String packId, int stickerId, boolean isCover) {
+    String   selection = PACK_ID + " = ? AND " + STICKER_ID + " = ? AND " + COVER + " = ?";
+    String[] args      = new String[] { packId, String.valueOf(stickerId), String.valueOf(isCover ? 1 : 0) };
+
+    try (Cursor cursor = databaseHelper.getReadableDatabase().query(TABLE_NAME, null, selection, args, null, null, "1")) {
+      return new StickerRecordReader(cursor).getNext();
+    }
+  }
+
+  public @Nullable StickerPackRecord getStickerPack(@NonNull String packId) {
+    String   query = PACK_ID + " = ? AND " + COVER + " = ?";
+    String[] args  = new String[] { packId, "1" };
+
+    try (Cursor cursor = databaseHelper.getReadableDatabase().query(TABLE_NAME, null, query, args, null, null, null, "1")) {
+      return new StickerPackRecordReader(cursor).getNext();
+    }
+  }
+
+  public @Nullable Cursor getInstalledStickerPacks() {
+    String   selection = COVER + " = ? AND " + INSTALLED + " = ?";
+    String[] args      = new String[] { "1", "1" };
+    Cursor   cursor    = databaseHelper.getReadableDatabase().query(TABLE_NAME, null, selection, args, null, null, null);
+
+    setNotifyStickerPackListeners(cursor);
+    return cursor;
+  }
+
+  public @Nullable Cursor getStickersByEmoji(@NonNull String emoji) {
+    String   selection = EMOJI + " LIKE ? AND " + COVER + " = ?";
+    String[] args      = new String[] { "%"+emoji+"%", "0" };
+
+    Cursor cursor = databaseHelper.getReadableDatabase().query(TABLE_NAME, null, selection, args, null, null, null);
+    setNotifyStickerListeners(cursor);
+
+    return cursor;
+  }
+
+  public @Nullable Cursor getAllStickerPacks() {
+    return getAllStickerPacks(null);
+  }
+
+  public @Nullable Cursor getAllStickerPacks(@Nullable String limit) {
+    String   query  = COVER + " = ?";
+    String[] args   = new String[] { "1" };
+    Cursor   cursor = databaseHelper.getReadableDatabase().query(TABLE_NAME, null, query, args, null, null, null, limit);
+    setNotifyStickerPackListeners(cursor);
+
+    return cursor;
+  }
+
+  public @Nullable Cursor getStickersForPack(@NonNull String packId) {
+    SQLiteDatabase db        = databaseHelper.getReadableDatabase();
+    String         selection = PACK_ID + " = ? AND " + COVER + " = ?";
+    String[]       args      = new String[] { packId, "0" };
+
+    Cursor cursor = db.query(TABLE_NAME, null, selection, args, null, null, null);
+    setNotifyStickerListeners(cursor);
+
+    return cursor;
+  }
+
+  public @Nullable Cursor getRecentlyUsedStickers(int limit) {
+    SQLiteDatabase db        = databaseHelper.getReadableDatabase();
+    String         selection = LAST_USED + " > ? AND " + COVER + " = ?";
+    String[]       args      = new String[] { "0", "0" };
+
+    Cursor cursor = db.query(TABLE_NAME, null, selection, args, null, null, LAST_USED + " DESC", String.valueOf(limit));
+    setNotifyStickerListeners(cursor);
+
+    return cursor;
+  }
+
+  public @Nullable InputStream getStickerStream(long rowId) throws IOException {
+    String   selection = _ID + " = ?";
+    String[] args      = new String[] { String.valueOf(rowId) };
+
+    try (Cursor cursor = databaseHelper.getReadableDatabase().query(TABLE_NAME, null, selection, args, null, null, null)) {
+      if (cursor != null && cursor.moveToNext()) {
+        String path   = cursor.getString(cursor.getColumnIndexOrThrow(FILE_PATH));
+        byte[] random = cursor.getBlob(cursor.getColumnIndexOrThrow(FILE_RANDOM));
+
+        if (path != null) {
+          return ModernDecryptingPartInputStream.createFor(attachmentSecret, random, new File(path), 0);
+        } else {
+          Log.w(TAG, "getStickerStream("+rowId+") - No sticker data");
+        }
+      } else {
+        Log.i(TAG, "getStickerStream("+rowId+") - Sticker not found.");
+      }
+    }
+
+    return null;
+  }
+
+  public boolean isPackInstalled(@NonNull String packId) {
+    StickerPackRecord record = getStickerPack(packId);
+
+    return (record != null && record.isInstalled());
+  }
+
+  public boolean isPackAvailableAsReference(@NonNull String packId) {
+    return getStickerPack(packId) != null;
+  }
+
+  public void updateStickerLastUsedTime(long rowId, long lastUsed) {
+    String        selection = _ID + " = ?";
+    String[]      args      = new String[] { String.valueOf(rowId) };
+    ContentValues values    = new ContentValues();
+
+    values.put(LAST_USED, lastUsed);
+
+    databaseHelper.getWritableDatabase().update(TABLE_NAME, values, selection, args);
+
+    notifyStickerListeners();
+    notifyStickerPackListeners();
+  }
+
+  public void markPackAsInstalled(@NonNull String packKey) {
+    updatePackInstalled(databaseHelper.getWritableDatabase(), packKey, true);
+    notifyStickerPackListeners();
+  }
+
+  public void deleteOrphanedPacks() {
+    SQLiteDatabase db    = databaseHelper.getWritableDatabase();
+    String         query = "SELECT " + PACK_ID + " FROM " + TABLE_NAME + " WHERE " + INSTALLED + " = ? AND " +
+                           PACK_ID + " NOT IN (" +
+                             "SELECT DISTINCT " + AttachmentDatabase.STICKER_PACK_ID + " FROM " + AttachmentDatabase.TABLE_NAME + " " +
+                             "WHERE " + AttachmentDatabase.STICKER_PACK_ID + " NOT NULL" +
+                           ")";
+    String[]      args = new String[] { "0" };
+
+    db.beginTransaction();
+
+    try {
+      boolean performedDelete = false;
+
+      try (Cursor cursor = db.rawQuery(query, args)) {
+        while (cursor != null && cursor.moveToNext()) {
+          String packId = cursor.getString(cursor.getColumnIndexOrThrow(PACK_ID));
+
+          if (!BlessedPacks.contains(packId)) {
+            deletePack(db, packId);
+            performedDelete = true;
+          }
+        }
+      }
+
+      db.setTransactionSuccessful();
+
+      if (performedDelete) {
+        notifyStickerPackListeners();
+        notifyStickerListeners();
+      }
+    } finally {
+      db.endTransaction();
+    }
+  }
+
+  public void uninstallPack(@NonNull String packId) {
+    SQLiteDatabase db = databaseHelper.getWritableDatabase();
+
+    db.beginTransaction();
+    try {
+
+      updatePackInstalled(db, packId, false);
+      deleteStickersInPackExceptCover(db, packId);
+
+      db.setTransactionSuccessful();
+      notifyStickerPackListeners();
+      notifyStickerListeners();
+    } finally {
+      db.endTransaction();
+    }
+  }
+
+  private void updatePackInstalled(@NonNull SQLiteDatabase db, @NonNull String packId, boolean installed) {
+    StickerPackRecord existing = getStickerPack(packId);
+
+    if (existing != null && existing.isInstalled() == installed) {
+      return;
+    }
+
+    String        selection = PACK_ID + " = ?";
+    String[]      args      = new String[]{ packId };
+    ContentValues values    = new ContentValues(1);
+
+    values.put(INSTALLED, installed ? 1 : 0);
+    db.update(TABLE_NAME, values, selection, args);
+
+    if (installed) {
+      broadcastInstallEvent(packId);
+    }
+  }
+
+  private FileInfo saveStickerImage(@NonNull InputStream inputStream) throws IOException {
+    File                       partsDirectory = context.getDir(DIRECTORY, Context.MODE_PRIVATE);
+    File                       file           = File.createTempFile("sticker", ".mms", partsDirectory);
+    Pair<byte[], OutputStream> out            = ModernEncryptingPartOutputStream.createFor(attachmentSecret, file, false);
+    long                       length         = Util.copy(inputStream, out.second);
+
+    return new FileInfo(file, length, out.first);
+  }
+
+  private void deleteSticker(@NonNull SQLiteDatabase db, long rowId, @Nullable String filePath) {
+    String   selection = _ID + " = ?";
+    String[] args      = new String[] { String.valueOf(rowId) };
+
+    db.delete(TABLE_NAME, selection, args);
+
+    if (!TextUtils.isEmpty(filePath)) {
+      new File(filePath).delete();
+    }
+  }
+
+  private void deletePack(@NonNull SQLiteDatabase db, @NonNull String packId) {
+    String   selection = PACK_ID + " = ?";
+    String[] args      = new String[] { packId };
+
+    db.delete(TABLE_NAME, selection, args);
+
+    deleteStickersInPack(db, packId);
+  }
+
+  private void deleteStickersInPack(@NonNull SQLiteDatabase db, @NonNull String packId) {
+    String   selection = PACK_ID + " = ?";
+    String[] args      = new String[] { packId };
+
+    db.beginTransaction();
+
+    try {
+      try (Cursor cursor = db.query(TABLE_NAME, null, selection, args, null, null, null)) {
+        while (cursor != null && cursor.moveToNext()) {
+          String  filePath = cursor.getString(cursor.getColumnIndexOrThrow(FILE_PATH));
+          long    rowId    = cursor.getLong(cursor.getColumnIndexOrThrow(_ID));
+
+          deleteSticker(db, rowId, filePath);
+        }
+      }
+
+      db.setTransactionSuccessful();
+    } finally {
+      db.endTransaction();
+    }
+
+    db.delete(TABLE_NAME, selection, args);
+  }
+
+  private void deleteStickersInPackExceptCover(@NonNull SQLiteDatabase db, @NonNull String packId) {
+    String   selection = PACK_ID + " = ? AND " + COVER + " = ?";
+    String[] args      = new String[] { packId, "0" };
+
+    db.beginTransaction();
+
+    try {
+      try (Cursor cursor = db.query(TABLE_NAME, null, selection, args, null, null, null)) {
+        while (cursor != null && cursor.moveToNext()) {
+          long    rowId     = cursor.getLong(cursor.getColumnIndexOrThrow(_ID));
+          String  filePath  = cursor.getString(cursor.getColumnIndexOrThrow(FILE_PATH));
+
+          deleteSticker(db, rowId, filePath);
+        }
+      }
+
+      db.setTransactionSuccessful();
+    } finally {
+      db.endTransaction();
+    }
+  }
+
+  private void broadcastInstallEvent(@NonNull String packId) {
+    StickerPackRecord pack = getStickerPack(packId);
+
+    if (pack != null) {
+      EventBus.getDefault().postSticky(new StickerPackInstallEvent(new DecryptableUri(pack.getCover().getUri())));
+    }
+  }
+
+  private static final class FileInfo {
+    private final File   file;
+    private final long   length;
+    private final byte[] random;
+
+    private FileInfo(@NonNull File file, long length, @NonNull byte[] random) {
+      this.file   = file;
+      this.length = length;
+      this.random = random;
+    }
+
+    public File getFile() {
+      return file;
+    }
+
+    public long getLength() {
+      return length;
+    }
+
+    public byte[] getRandom() {
+      return random;
+    }
+  }
+
+  public static final class StickerRecordReader implements Closeable {
+
+    private final Cursor cursor;
+
+    public StickerRecordReader(@Nullable Cursor cursor) {
+      this.cursor = cursor;
+    }
+
+    public @Nullable StickerRecord getNext() {
+      if (cursor == null || !cursor.moveToNext()) {
+        return null;
+      }
+
+      return getCurrent();
+    }
+
+    public @NonNull StickerRecord getCurrent() {
+      return new StickerRecord(cursor.getLong(cursor.getColumnIndexOrThrow(_ID)),
+                               cursor.getString(cursor.getColumnIndexOrThrow(PACK_ID)),
+                               cursor.getString(cursor.getColumnIndexOrThrow(PACK_KEY)),
+                               cursor.getInt(cursor.getColumnIndexOrThrow(STICKER_ID)),
+                               cursor.getString(cursor.getColumnIndexOrThrow(EMOJI)),
+                               cursor.getLong(cursor.getColumnIndexOrThrow(FILE_LENGTH)),
+                               cursor.getInt(cursor.getColumnIndexOrThrow(COVER)) == 1);
+    }
+
+    @Override
+    public void close() {
+      if (cursor != null) {
+        cursor.close();
+      }
+    }
+  }
+
+  public static final class StickerPackRecordReader implements Closeable {
+
+    private final Cursor cursor;
+
+    public StickerPackRecordReader(@Nullable Cursor cursor) {
+      this.cursor = cursor;
+    }
+
+    public @Nullable StickerPackRecord getNext() {
+      if (cursor == null || !cursor.moveToNext()) {
+        return null;
+      }
+
+      return getCurrent();
+    }
+
+    public @NonNull StickerPackRecord getCurrent() {
+      StickerRecord cover = new StickerRecordReader(cursor).getCurrent();
+
+      return new StickerPackRecord(cursor.getString(cursor.getColumnIndexOrThrow(PACK_ID)),
+                                   cursor.getString(cursor.getColumnIndexOrThrow(PACK_KEY)),
+                                   cursor.getString(cursor.getColumnIndexOrThrow(PACK_TITLE)),
+                                   cursor.getString(cursor.getColumnIndexOrThrow(PACK_AUTHOR)),
+                                   cover,
+                                   cursor.getInt(cursor.getColumnIndexOrThrow(INSTALLED)) == 1);
+    }
+
+    @Override
+    public void close() {
+      if (cursor != null) {
+        cursor.close();
+      }
+    }
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/database/ThreadDatabase.java b/src/org/thoughtcrime/securesms/database/ThreadDatabase.java
index 378590f66..834ef5dd6 100644
--- a/src/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -605,7 +605,11 @@ public class ThreadDatabase extends Database {
     SlideDeck slideDeck = ((MediaMmsMessageRecord)record).getSlideDeck();
     Slide     thumbnail = slideDeck.getThumbnailSlide();
 
-    return thumbnail != null ? thumbnail.getThumbnailUri() : null;
+    if (thumbnail != null) {
+      return thumbnail.getThumbnailUri();
+    }
+
+    return null;
   }
 
   private @NonNull String createQuery(@NonNull String where, int limit) {
diff --git a/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java b/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
index 4c7c7c070..ccf838db4 100644
--- a/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
+++ b/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
@@ -31,6 +31,7 @@ import org.thoughtcrime.securesms.database.SearchDatabase;
 import org.thoughtcrime.securesms.database.SessionDatabase;
 import org.thoughtcrime.securesms.database.SignedPreKeyDatabase;
 import org.thoughtcrime.securesms.database.SmsDatabase;
+import org.thoughtcrime.securesms.database.StickerDatabase;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.jobs.RefreshPreKeysJob;
 import org.thoughtcrime.securesms.logging.Log;
@@ -70,8 +71,9 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
   private static final int SELF_ATTACHMENT_CLEANUP          = 18;
   private static final int RECIPIENT_FORCE_SMS_SELECTION    = 19;
   private static final int JOBMANAGER_STRIKES_BACK          = 20;
+  private static final int STICKERS                         = 21;
 
-  private static final int    DATABASE_VERSION = 20;
+  private static final int    DATABASE_VERSION = 21;
   private static final String DATABASE_NAME    = "signal.db";
 
   private final Context        context;
@@ -117,6 +119,8 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
     for (String sql : JobDatabase.CREATE_TABLE) {
       db.execSQL(sql);
     }
+    db.execSQL(StickerDatabase.CREATE_TABLE);
+
     db.execSQL(LokiAPIDatabase.getCreateSwarmCacheTableCommand());
     db.execSQL(LokiAPIDatabase.getCreateLastMessageHashValueTableCommand());
     db.execSQL(LokiAPIDatabase.getCreateReceivedMessageHashValuesTableCommand());
@@ -134,6 +138,7 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
     executeStatements(db, DraftDatabase.CREATE_INDEXS);
     executeStatements(db, GroupDatabase.CREATE_INDEXS);
     executeStatements(db, GroupReceiptDatabase.CREATE_INDEXES);
+    executeStatements(db, StickerDatabase.CREATE_INDEXES);
 
     if (context.getDatabasePath(ClassicOpenHelper.NAME).exists()) {
       ClassicOpenHelper                      legacyHelper = new ClassicOpenHelper(context);
@@ -452,6 +457,31 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
                                                 "UNIQUE(job_spec_id, depends_on_job_spec_id))");
       }
 
+      if (oldVersion < STICKERS) {
+        db.execSQL("CREATE TABLE sticker (_id INTEGER PRIMARY KEY AUTOINCREMENT, " +
+                                         "pack_id TEXT NOT NULL, " +
+                                         "pack_key TEXT NOT NULL, " +
+                                         "pack_title TEXT NOT NULL, " +
+                                         "pack_author TEXT NOT NULL, " +
+                                         "sticker_id INTEGER, " +
+                                         "cover INTEGER, " +
+                                         "emoji TEXT NOT NULL, " +
+                                         "last_used INTEGER, " +
+                                         "installed INTEGER," +
+                                         "file_path TEXT NOT NULL, " +
+                                         "file_length INTEGER, " +
+                                         "file_random BLOB, " +
+                                         "UNIQUE(pack_id, sticker_id, cover) ON CONFLICT IGNORE)");
+
+        db.execSQL("CREATE INDEX IF NOT EXISTS sticker_pack_id_index ON sticker (pack_id);");
+        db.execSQL("CREATE INDEX IF NOT EXISTS sticker_sticker_id_index ON sticker (sticker_id);");
+
+        db.execSQL("ALTER TABLE part ADD COLUMN sticker_pack_id TEXT");
+        db.execSQL("ALTER TABLE part ADD COLUMN sticker_pack_key TEXT");
+        db.execSQL("ALTER TABLE part ADD COLUMN sticker_id INTEGER DEFAULT -1");
+        db.execSQL("CREATE INDEX IF NOT EXISTS part_sticker_pack_id_index ON part (sticker_pack_id)");
+      }
+
       db.setTransactionSuccessful();
     } finally {
       db.endTransaction();
diff --git a/src/org/thoughtcrime/securesms/database/model/IncomingSticker.java b/src/org/thoughtcrime/securesms/database/model/IncomingSticker.java
new file mode 100644
index 000000000..5e982e0da
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/database/model/IncomingSticker.java
@@ -0,0 +1,66 @@
+package org.thoughtcrime.securesms.database.model;
+
+import android.support.annotation.NonNull;
+
+public class IncomingSticker {
+
+  private final String  packKey;
+  private final String  packId;
+  private final String  packTitle;
+  private final String  packAuthor;
+  private final int     stickerId;
+  private final String  emoji;
+  private final boolean isCover;
+  private final boolean isInstalled;
+
+  public IncomingSticker(@NonNull String packId,
+                         @NonNull String packKey,
+                         @NonNull String packTitle,
+                         @NonNull String packAuthor,
+                         int stickerId,
+                         @NonNull String emoji,
+                         boolean isCover,
+                         boolean isInstalled)
+  {
+    this.packId      = packId;
+    this.packKey     = packKey;
+    this.packTitle   = packTitle;
+    this.packAuthor  = packAuthor;
+    this.stickerId   = stickerId;
+    this.emoji       = emoji;
+    this.isCover     = isCover;
+    this.isInstalled = isInstalled;
+  }
+
+  public @NonNull String getPackKey() {
+    return packKey;
+  }
+
+  public @NonNull String getPackId() {
+    return packId;
+  }
+
+  public @NonNull String getPackTitle() {
+    return packTitle;
+  }
+
+  public @NonNull String getPackAuthor() {
+    return packAuthor;
+  }
+
+  public int getStickerId() {
+    return stickerId;
+  }
+
+  public @NonNull String getEmoji() {
+    return emoji;
+  }
+
+  public boolean isCover() {
+    return isCover;
+  }
+
+  public boolean isInstalled() {
+    return isInstalled;
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java b/src/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java
index 9e8d1a116..f6ff43312 100644
--- a/src/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java
+++ b/src/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java
@@ -55,8 +55,8 @@ public class MediaMmsMessageRecord extends MmsMessageRecord {
                                List<IdentityKeyMismatch> mismatches,
                                List<NetworkFailure> failures, int subscriptionId,
                                long expiresIn, long expireStarted, int readReceiptCount,
-                               @Nullable Quote quote, @Nullable List<Contact> contacts,
-                               @Nullable List<LinkPreview> linkPreviews, boolean unidentified)
+                               @Nullable Quote quote, @NonNull List<Contact> contacts,
+                               @NonNull List<LinkPreview> linkPreviews, boolean unidentified)
   {
     super(id, body, conversationRecipient, individualRecipient, recipientDeviceId, dateSent,
           dateReceived, threadId, Status.STATUS_NONE, deliveryReceiptCount, mailbox, mismatches, failures,
diff --git a/src/org/thoughtcrime/securesms/database/model/Sticker.java b/src/org/thoughtcrime/securesms/database/model/Sticker.java
new file mode 100644
index 000000000..b3d775ea3
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/database/model/Sticker.java
@@ -0,0 +1,40 @@
+package org.thoughtcrime.securesms.database.model;
+
+import android.support.annotation.NonNull;
+
+import org.thoughtcrime.securesms.attachments.Attachment;
+
+public class Sticker {
+
+  private final String     packId;
+  private final String     packKey;
+  private final int        stickerId;
+  private final Attachment attachment;
+
+  public Sticker(@NonNull String packId,
+                 @NonNull String packKey,
+                 int stickerId,
+                 @NonNull Attachment attachment)
+  {
+    this.packId     = packId;
+    this.packKey    = packKey;
+    this.stickerId  = stickerId;
+    this.attachment = attachment;
+  }
+
+  public @NonNull String getPackId() {
+    return packId;
+  }
+
+  public @NonNull String getPackKey() {
+    return packKey;
+  }
+
+  public int getStickerId() {
+    return stickerId;
+  }
+
+  public @NonNull Attachment getAttachment() {
+    return attachment;
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/database/model/StickerPackRecord.java b/src/org/thoughtcrime/securesms/database/model/StickerPackRecord.java
new file mode 100644
index 000000000..246a57157
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/database/model/StickerPackRecord.java
@@ -0,0 +1,78 @@
+package org.thoughtcrime.securesms.database.model;
+
+import android.support.annotation.NonNull;
+import android.text.TextUtils;
+
+import org.whispersystems.libsignal.util.guava.Optional;
+
+import java.util.Objects;
+
+/**
+ * Represents a record for a sticker pack in the {@link org.thoughtcrime.securesms.database.StickerDatabase}.
+ */
+public final class StickerPackRecord {
+
+  private final String           packId;
+  private final String           packKey;
+  private final Optional<String> title;
+  private final Optional<String> author;
+  private final StickerRecord    cover;
+  private final boolean          installed;
+
+  public StickerPackRecord(@NonNull String packId,
+                           @NonNull String packKey,
+                           @NonNull String title,
+                           @NonNull String author,
+                           @NonNull StickerRecord cover,
+                           boolean installed)
+  {
+    this.packId    = packId;
+    this.packKey   = packKey;
+    this.title     = TextUtils.isEmpty(title) ? Optional.absent() : Optional.of(title);
+    this.author    = TextUtils.isEmpty(author) ? Optional.absent() : Optional.of(author);
+    this.cover     = cover;
+    this.installed = installed;
+  }
+
+  public @NonNull String getPackId() {
+    return packId;
+  }
+
+  public @NonNull String getPackKey() {
+    return packKey;
+  }
+
+  public @NonNull Optional<String> getTitle() {
+    return title;
+  }
+
+  public @NonNull Optional<String> getAuthor() {
+    return author;
+  }
+
+  public @NonNull StickerRecord getCover() {
+    return cover;
+  }
+
+  public boolean isInstalled() {
+    return installed;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    StickerPackRecord record = (StickerPackRecord) o;
+    return installed == record.installed &&
+        packId.equals(record.packId) &&
+        packKey.equals(record.packKey) &&
+        title.equals(record.title) &&
+        author.equals(record.author) &&
+        cover.equals(record.cover);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(packId, packKey, title, author, cover, installed);
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/database/model/StickerRecord.java b/src/org/thoughtcrime/securesms/database/model/StickerRecord.java
new file mode 100644
index 000000000..bb7ae00a9
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/database/model/StickerRecord.java
@@ -0,0 +1,90 @@
+package org.thoughtcrime.securesms.database.model;
+
+import android.net.Uri;
+import android.support.annotation.NonNull;
+
+import org.thoughtcrime.securesms.mms.PartAuthority;
+
+import java.util.Objects;
+
+/**
+ * Represents a record for a sticker pack in the {@link org.thoughtcrime.securesms.database.StickerDatabase}.
+ */
+public final class StickerRecord {
+
+  private final long    rowId;
+  private final String  packId;
+  private final String  packKey;
+  private final int     stickerId;
+  private final String  emoji;
+  private final long    size;
+  private final boolean isCover;
+
+  public StickerRecord(long rowId,
+                       @NonNull String packId,
+                       @NonNull String packKey,
+                       int stickerId,
+                       @NonNull String emoji,
+                       long size,
+                       boolean isCover)
+  {
+    this.rowId     = rowId;
+    this.packId    = packId;
+    this.packKey   = packKey;
+    this.stickerId = stickerId;
+    this.emoji     = emoji;
+    this.size      = size;
+    this.isCover   = isCover;
+  }
+
+  public long getRowId() {
+    return rowId;
+  }
+
+  public @NonNull String getPackId() {
+    return packId;
+  }
+
+  public @NonNull String getPackKey() {
+    return packKey;
+  }
+
+  public int getStickerId() {
+    return stickerId;
+  }
+
+  public @NonNull Uri getUri() {
+    return PartAuthority.getStickerUri(rowId);
+  }
+
+  public @NonNull String getEmoji() {
+    return emoji;
+  }
+
+  public long getSize() {
+    return size;
+  }
+
+  public boolean isCover() {
+    return isCover;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    StickerRecord that = (StickerRecord) o;
+    return rowId == that.rowId &&
+        stickerId == that.stickerId &&
+        size == that.size &&
+        isCover == that.isCover &&
+        packId.equals(that.packId) &&
+        packKey.equals(that.packKey) &&
+        emoji.equals(that.emoji);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(rowId, packId, packKey, stickerId, emoji, size, isCover);
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java b/src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java
index 93c610a05..c1651c3ba 100644
--- a/src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java
+++ b/src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java
@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.dependencies;
 import android.content.Context;
 
 import org.greenrobot.eventbus.EventBus;
-import network.loki.messenger.BuildConfig;
 import org.thoughtcrime.securesms.CreateProfileActivity;
 import org.thoughtcrime.securesms.DeviceListFragment;
 import org.thoughtcrime.securesms.crypto.storage.SignalProtocolStoreImpl;
@@ -23,6 +22,8 @@ import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceGroupUpdateJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceProfileKeyUpdateJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceReadUpdateJob;
+import org.thoughtcrime.securesms.jobs.MultiDeviceStickerPackOperationJob;
+import org.thoughtcrime.securesms.jobs.MultiDeviceStickerPackSyncJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceVerifiedUpdateJob;
 import org.thoughtcrime.securesms.jobs.PushDecryptJob;
 import org.thoughtcrime.securesms.jobs.PushGroupSendJob;
@@ -41,13 +42,18 @@ import org.thoughtcrime.securesms.jobs.RotateProfileKeyJob;
 import org.thoughtcrime.securesms.jobs.RotateSignedPreKeyJob;
 import org.thoughtcrime.securesms.jobs.SendDeliveryReceiptJob;
 import org.thoughtcrime.securesms.jobs.SendReadReceiptJob;
+import org.thoughtcrime.securesms.jobs.StickerDownloadJob;
+import org.thoughtcrime.securesms.jobs.StickerPackDownloadJob;
 import org.thoughtcrime.securesms.jobs.TypingSendJob;
+import org.thoughtcrime.securesms.linkpreview.LinkPreviewRepository;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.preferences.AppProtectionPreferenceFragment;
 import org.thoughtcrime.securesms.push.SecurityEventListener;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
 import org.thoughtcrime.securesms.service.IncomingMessageObserver;
 import org.thoughtcrime.securesms.service.WebRtcCallService;
+import org.thoughtcrime.securesms.stickers.StickerPackPreviewRepository;
+import org.thoughtcrime.securesms.stickers.StickerRemoteUriLoader;
 import org.thoughtcrime.securesms.util.RealtimeSleepTimer;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.whispersystems.libsignal.util.guava.Optional;
@@ -61,6 +67,7 @@ import org.whispersystems.signalservice.api.websocket.ConnectivityListener;
 
 import dagger.Module;
 import dagger.Provides;
+import network.loki.messenger.BuildConfig;
 
 @Module(complete = false, injects = {CleanPreKeysJob.class,
                                      CreateSignedPreKeyJob.class,
@@ -98,7 +105,15 @@ import dagger.Provides;
                                      RefreshUnidentifiedDeliveryAbilityJob.class,
                                      TypingSendJob.class,
                                      AttachmentUploadJob.class,
-                                     PushDecryptJob.class})
+                                     PushDecryptJob.class,
+                                     StickerDownloadJob.class,
+                                     StickerPackPreviewRepository.class,
+                                     StickerRemoteUriLoader.Factory.class,
+                                     StickerPackDownloadJob.class,
+                                     MultiDeviceStickerPackOperationJob.class,
+                                     MultiDeviceStickerPackSyncJob.class,
+                                     LinkPreviewRepository.class})
+
 public class SignalCommunicationModule {
 
   private static final String TAG = SignalCommunicationModule.class.getSimpleName();
diff --git a/src/org/thoughtcrime/securesms/events/WebRtcViewModel.java b/src/org/thoughtcrime/securesms/events/WebRtcViewModel.java
index 20149cf08..442186e6f 100644
--- a/src/org/thoughtcrime/securesms/events/WebRtcViewModel.java
+++ b/src/org/thoughtcrime/securesms/events/WebRtcViewModel.java
@@ -117,7 +117,7 @@ public class WebRtcViewModel {
     return remoteRenderer;
   }
 
-  public String toString() {
+  public @NonNull String toString() {
     return "[State: " + state + ", recipient: " + recipient.getAddress() + ", identity: " + identityKey + ", remoteVideo: " + remoteVideoEnabled + ", localVideo: " + localCameraState.isEnabled() + "]";
   }
 }
diff --git a/src/org/thoughtcrime/securesms/giph/model/ChunkedImageUrl.java b/src/org/thoughtcrime/securesms/giph/model/ChunkedImageUrl.java
index 824bf451a..d425c0cea 100644
--- a/src/org/thoughtcrime/securesms/giph/model/ChunkedImageUrl.java
+++ b/src/org/thoughtcrime/securesms/giph/model/ChunkedImageUrl.java
@@ -34,7 +34,7 @@ public class ChunkedImageUrl implements Key {
   }
 
   @Override
-  public void updateDiskCacheKey(MessageDigest messageDigest) {
+  public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
     messageDigest.update(url.getBytes());
     messageDigest.update(Conversions.longToByteArray(size));
   }
diff --git a/src/org/thoughtcrime/securesms/giph/ui/AspectRatioImageView.java b/src/org/thoughtcrime/securesms/giph/ui/AspectRatioImageView.java
index a1ce36e23..3a7c74682 100644
--- a/src/org/thoughtcrime/securesms/giph/ui/AspectRatioImageView.java
+++ b/src/org/thoughtcrime/securesms/giph/ui/AspectRatioImageView.java
@@ -18,15 +18,14 @@
 package org.thoughtcrime.securesms.giph.ui;
 
 import android.content.Context;
+import android.support.v7.widget.AppCompatImageView;
 import android.util.AttributeSet;
-import android.widget.ImageView;
-
 
 /**
  * AspectRatioImageView maintains an aspect ratio by adjusting the width or height dimension. The
  * aspect ratio (width to height ratio) and adjustment dimension can be configured.
  */
-public class AspectRatioImageView extends ImageView {
+public class AspectRatioImageView extends AppCompatImageView {
 
   private static final float DEFAULT_ASPECT_RATIO = 1.0f;
   private static final int DEFAULT_ADJUST_DIMENSION = 0;
diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java b/src/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java
index d49f12608..0e924411a 100644
--- a/src/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java
+++ b/src/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java
@@ -132,7 +132,7 @@ class GiphyAdapter extends RecyclerView.Adapter<GiphyAdapter.GiphyViewHolder> {
   }
 
   @Override
-  public GiphyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+  public @NonNull GiphyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
     View itemView = LayoutInflater.from(parent.getContext())
                                   .inflate(R.layout.giphy_thumbnail, parent, false);
 
@@ -140,7 +140,7 @@ class GiphyAdapter extends RecyclerView.Adapter<GiphyAdapter.GiphyViewHolder> {
   }
 
   @Override
-  public void onBindViewHolder(GiphyViewHolder holder, int position) {
+  public void onBindViewHolder(@NonNull GiphyViewHolder holder, int position) {
     GiphyImage image = images.get(position);
 
     holder.modelReady = false;
@@ -173,7 +173,7 @@ class GiphyAdapter extends RecyclerView.Adapter<GiphyAdapter.GiphyViewHolder> {
   }
 
   @Override
-  public void onViewRecycled(GiphyViewHolder holder) {
+  public void onViewRecycled(@NonNull GiphyViewHolder holder) {
     super.onViewRecycled(holder);
     glideRequests.clear(holder.thumbnail);
   }
diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java b/src/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java
index 592ebcda3..6deed3565 100644
--- a/src/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java
+++ b/src/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java
@@ -41,7 +41,7 @@ public abstract class GiphyFragment extends Fragment implements LoaderManager.Lo
   protected String searchString;
 
   @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup viewGroup, Bundle bundle) {
+  public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup viewGroup, Bundle bundle) {
     ViewGroup container = ViewUtil.inflate(inflater, viewGroup, R.layout.giphy_fragment);
     this.recyclerView    = ViewUtil.findById(container, R.id.giphy_list);
     this.loadingProgress = ViewUtil.findById(container, R.id.loading_progress);
@@ -66,7 +66,7 @@ public abstract class GiphyFragment extends Fragment implements LoaderManager.Lo
   }
 
   @Override
-  public void onLoadFinished(Loader<List<GiphyImage>> loader, @NonNull List<GiphyImage> data) {
+  public void onLoadFinished(@NonNull Loader<List<GiphyImage>> loader, @NonNull List<GiphyImage> data) {
     this.loadingProgress.setVisibility(View.GONE);
 
     if (data.isEmpty()) noResultsView.setVisibility(View.VISIBLE);
@@ -76,7 +76,7 @@ public abstract class GiphyFragment extends Fragment implements LoaderManager.Lo
   }
 
   @Override
-  public void onLoaderReset(Loader<List<GiphyImage>> loader) {
+  public void onLoaderReset(@NonNull Loader<List<GiphyImage>> loader) {
     noResultsView.setVisibility(View.GONE);
     this.giphyAdapter.setImages(new LinkedList<GiphyImage>());
   }
diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyGifFragment.java b/src/org/thoughtcrime/securesms/giph/ui/GiphyGifFragment.java
index ea6b84597..d38007b4a 100644
--- a/src/org/thoughtcrime/securesms/giph/ui/GiphyGifFragment.java
+++ b/src/org/thoughtcrime/securesms/giph/ui/GiphyGifFragment.java
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.giph.ui;
 
 
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.content.Loader;
 
 import org.thoughtcrime.securesms.giph.model.GiphyImage;
@@ -12,7 +13,7 @@ import java.util.List;
 public class GiphyGifFragment extends GiphyFragment {
 
   @Override
-  public Loader<List<GiphyImage>> onCreateLoader(int id, Bundle args) {
+  public @NonNull Loader<List<GiphyImage>> onCreateLoader(int id, Bundle args) {
     return new GiphyGifLoader(getActivity(), searchString);
   }
 
diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyStickerFragment.java b/src/org/thoughtcrime/securesms/giph/ui/GiphyStickerFragment.java
index 27a03b326..1b0289155 100644
--- a/src/org/thoughtcrime/securesms/giph/ui/GiphyStickerFragment.java
+++ b/src/org/thoughtcrime/securesms/giph/ui/GiphyStickerFragment.java
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.giph.ui;
 
 
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.content.Loader;
 
 import org.thoughtcrime.securesms.giph.model.GiphyImage;
@@ -11,7 +12,7 @@ import java.util.List;
 
 public class GiphyStickerFragment extends GiphyFragment {
   @Override
-  public Loader<List<GiphyImage>> onCreateLoader(int id, Bundle args) {
+  public @NonNull Loader<List<GiphyImage>> onCreateLoader(int id, Bundle args) {
     return new GiphyStickerLoader(getActivity(), searchString);
   }
 }
diff --git a/src/org/thoughtcrime/securesms/giph/util/InfiniteScrollListener.java b/src/org/thoughtcrime/securesms/giph/util/InfiniteScrollListener.java
index ba82f7e0d..872fc28a6 100644
--- a/src/org/thoughtcrime/securesms/giph/util/InfiniteScrollListener.java
+++ b/src/org/thoughtcrime/securesms/giph/util/InfiniteScrollListener.java
@@ -2,6 +2,7 @@
 
 package org.thoughtcrime.securesms.giph.util;
 
+import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
 
 public abstract class InfiniteScrollListener extends RecyclerView.OnScrollListener {
@@ -17,7 +18,7 @@ public abstract class InfiniteScrollListener extends RecyclerView.OnScrollListen
   private int currentPage = 1;
 
   @Override
-  public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+  public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
     super.onScrolled(recyclerView, dx, dy);
 
     RecyclerViewPositionHelper recyclerViewPositionHelper = RecyclerViewPositionHelper.createHelper(recyclerView);
diff --git a/src/org/thoughtcrime/securesms/glide/ChunkedImageUrlLoader.java b/src/org/thoughtcrime/securesms/glide/ChunkedImageUrlLoader.java
index 5ac02f33f..af6fa8faa 100644
--- a/src/org/thoughtcrime/securesms/glide/ChunkedImageUrlLoader.java
+++ b/src/org/thoughtcrime/securesms/glide/ChunkedImageUrlLoader.java
@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.glide;
 
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 import com.bumptech.glide.load.Options;
@@ -23,14 +24,13 @@ public class ChunkedImageUrlLoader implements ModelLoader<ChunkedImageUrl, Input
     this.client  = client;
   }
 
-  @Nullable
   @Override
-  public LoadData<InputStream> buildLoadData(ChunkedImageUrl url, int width, int height, Options options) {
+  public @Nullable LoadData<InputStream> buildLoadData(@NonNull ChunkedImageUrl url, int width, int height, @NonNull Options options) {
     return new LoadData<>(url, new ChunkedImageUrlFetcher(client, url));
   }
 
   @Override
-  public boolean handles(ChunkedImageUrl url) {
+  public boolean handles(@NonNull ChunkedImageUrl url) {
     return true;
   }
 
@@ -48,7 +48,7 @@ public class ChunkedImageUrlLoader implements ModelLoader<ChunkedImageUrl, Input
     }
 
     @Override
-    public ModelLoader<ChunkedImageUrl, InputStream> build(MultiModelLoaderFactory multiFactory) {
+    public @NonNull ModelLoader<ChunkedImageUrl, InputStream> build(@NonNull MultiModelLoaderFactory multiFactory) {
       return new ChunkedImageUrlLoader(client);
     }
 
diff --git a/src/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java b/src/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java
index 29a5d1d67..e8d22713f 100644
--- a/src/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java
+++ b/src/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java
@@ -26,7 +26,7 @@ class ContactPhotoFetcher implements DataFetcher<InputStream> {
   }
 
   @Override
-  public void loadData(Priority priority, DataCallback<? super InputStream> callback) {
+  public void loadData(@NonNull Priority priority, @NonNull DataCallback<? super InputStream> callback) {
     try {
       inputStream = contactPhoto.openInputStream(context);
       callback.onDataReady(inputStream);
@@ -47,15 +47,13 @@ class ContactPhotoFetcher implements DataFetcher<InputStream> {
 
   }
 
-  @NonNull
   @Override
-  public Class<InputStream> getDataClass() {
+  public @NonNull Class<InputStream> getDataClass() {
     return InputStream.class;
   }
 
-  @NonNull
   @Override
-  public DataSource getDataSource() {
+  public @NonNull DataSource getDataSource() {
     return DataSource.LOCAL;
   }
 }
diff --git a/src/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java b/src/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java
index 5bdedf979..fa18edb08 100644
--- a/src/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java
+++ b/src/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.glide;
 
 import android.content.Context;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 import com.bumptech.glide.load.Options;
@@ -20,14 +21,13 @@ public class ContactPhotoLoader implements ModelLoader<ContactPhoto, InputStream
     this.context = context;
   }
 
-  @Nullable
   @Override
-  public LoadData<InputStream> buildLoadData(ContactPhoto contactPhoto, int width, int height, Options options) {
+  public @Nullable LoadData<InputStream> buildLoadData(@NonNull ContactPhoto contactPhoto, int width, int height, @NonNull Options options) {
     return new LoadData<>(contactPhoto, new ContactPhotoFetcher(context, contactPhoto));
   }
 
   @Override
-  public boolean handles(ContactPhoto contactPhoto) {
+  public boolean handles(@NonNull ContactPhoto contactPhoto) {
     return true;
   }
 
@@ -40,7 +40,7 @@ public class ContactPhotoLoader implements ModelLoader<ContactPhoto, InputStream
     }
 
     @Override
-    public ModelLoader<ContactPhoto, InputStream> build(MultiModelLoaderFactory multiFactory) {
+    public @NonNull ModelLoader<ContactPhoto, InputStream> build(@NonNull MultiModelLoaderFactory multiFactory) {
       return new ContactPhotoLoader(context);
     }
 
diff --git a/src/org/thoughtcrime/securesms/glide/OkHttpStreamFetcher.java b/src/org/thoughtcrime/securesms/glide/OkHttpStreamFetcher.java
index bd0c334b3..cf85ee1bb 100644
--- a/src/org/thoughtcrime/securesms/glide/OkHttpStreamFetcher.java
+++ b/src/org/thoughtcrime/securesms/glide/OkHttpStreamFetcher.java
@@ -35,7 +35,7 @@ class OkHttpStreamFetcher implements DataFetcher<InputStream> {
   }
 
   @Override
-  public void loadData(Priority priority, DataCallback<? super InputStream> callback) {
+  public void loadData(@NonNull Priority priority, @NonNull DataCallback<? super InputStream> callback) {
     try {
       Request.Builder requestBuilder = new Request.Builder()
           .url(url.toStringUrl());
@@ -82,15 +82,13 @@ class OkHttpStreamFetcher implements DataFetcher<InputStream> {
     // TODO: call cancel on the client when this method is called on a background thread. See #257
   }
 
-  @NonNull
   @Override
-  public Class<InputStream> getDataClass() {
+  public @NonNull Class<InputStream> getDataClass() {
     return InputStream.class;
   }
 
-  @NonNull
   @Override
-  public DataSource getDataSource() {
+  public @NonNull DataSource getDataSource() {
     return DataSource.REMOTE;
   }
 }
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/glide/OkHttpUrlLoader.java b/src/org/thoughtcrime/securesms/glide/OkHttpUrlLoader.java
index a6f8fa962..39637f76d 100644
--- a/src/org/thoughtcrime/securesms/glide/OkHttpUrlLoader.java
+++ b/src/org/thoughtcrime/securesms/glide/OkHttpUrlLoader.java
@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.glide;
 
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 import com.bumptech.glide.load.Options;
@@ -25,14 +26,13 @@ public class OkHttpUrlLoader implements ModelLoader<GlideUrl, InputStream> {
     this.client = client;
   }
 
-  @Nullable
   @Override
-  public LoadData<InputStream> buildLoadData(GlideUrl glideUrl, int width, int height, Options options) {
+  public @Nullable LoadData<InputStream> buildLoadData(@NonNull GlideUrl glideUrl, int width, int height, @NonNull Options options) {
     return new LoadData<>(glideUrl, new OkHttpStreamFetcher(client, glideUrl));
   }
 
   @Override
-  public boolean handles(GlideUrl glideUrl) {
+  public boolean handles(@NonNull GlideUrl glideUrl) {
     return true;
   }
 
@@ -62,7 +62,7 @@ public class OkHttpUrlLoader implements ModelLoader<GlideUrl, InputStream> {
     }
 
     @Override
-    public ModelLoader<GlideUrl, InputStream> build(MultiModelLoaderFactory multiFactory) {
+    public @NonNull ModelLoader<GlideUrl, InputStream> build(@NonNull MultiModelLoaderFactory multiFactory) {
       return new OkHttpUrlLoader(client);
     }
 
diff --git a/src/org/thoughtcrime/securesms/glide/PaddedHeadersInterceptor.java b/src/org/thoughtcrime/securesms/glide/PaddedHeadersInterceptor.java
index 03922b536..e60293587 100644
--- a/src/org/thoughtcrime/securesms/glide/PaddedHeadersInterceptor.java
+++ b/src/org/thoughtcrime/securesms/glide/PaddedHeadersInterceptor.java
@@ -20,7 +20,7 @@ public class PaddedHeadersInterceptor implements Interceptor {
   private static final int    MAX_RANDOM_BYTES = 64;
 
   @Override
-  public Response intercept(@NonNull Chain chain) throws IOException {
+  public @NonNull Response intercept(@NonNull Chain chain) throws IOException {
     Request padded = chain.request().newBuilder()
                                     .headers(getPaddedHeaders(chain.request().headers()))
                                     .build();
diff --git a/src/org/thoughtcrime/securesms/groups/GroupManager.java b/src/org/thoughtcrime/securesms/groups/GroupManager.java
index f42958d9b..31c22d0ab 100644
--- a/src/org/thoughtcrime/securesms/groups/GroupManager.java
+++ b/src/org/thoughtcrime/securesms/groups/GroupManager.java
@@ -124,7 +124,7 @@ public class GroupManager {
 
       if (avatar != null) {
         Uri avatarUri = BlobProvider.getInstance().forData(avatar).createForSingleUseInMemory();
-        avatarAttachment = new UriAttachment(avatarUri, MediaUtil.IMAGE_PNG, AttachmentDatabase.TRANSFER_PROGRESS_DONE, avatar.length, null, false, false, null);
+        avatarAttachment = new UriAttachment(avatarUri, MediaUtil.IMAGE_PNG, AttachmentDatabase.TRANSFER_PROGRESS_DONE, avatar.length, null, false, false, null, null);
       }
 
       OutgoingGroupMediaMessage outgoingMessage = new OutgoingGroupMediaMessage(groupRecipient, groupContext, avatarAttachment, System.currentTimeMillis(), 0, null, Collections.emptyList(), Collections.emptyList());
diff --git a/src/org/thoughtcrime/securesms/imageeditor/DrawingSession.java b/src/org/thoughtcrime/securesms/imageeditor/DrawingSession.java
index 72dcaa27b..05ef7ad22 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/DrawingSession.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/DrawingSession.java
@@ -34,12 +34,12 @@ class DrawingSession extends ElementEditSession {
   }
 
   @Override
-  public EditSession newPoint(Matrix newInverse, PointF point, int p) {
+  public EditSession newPoint(@NonNull Matrix newInverse, @NonNull PointF point, int p) {
     return this;
   }
 
   @Override
-  public EditSession removePoint(Matrix newInverse, int p) {
+  public EditSession removePoint(@NonNull Matrix newInverse, int p) {
     return this;
   }
 }
diff --git a/src/org/thoughtcrime/securesms/imageeditor/ElementDragEditSession.java b/src/org/thoughtcrime/securesms/imageeditor/ElementDragEditSession.java
index 6f8e05356..27cbb0cdc 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/ElementDragEditSession.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/ElementDragEditSession.java
@@ -31,7 +31,7 @@ final class ElementDragEditSession extends ElementEditSession {
   }
 
   @Override
-  public EditSession newPoint(@NonNull Matrix newInverse, PointF point, int p) {
+  public EditSession newPoint(@NonNull Matrix newInverse, @NonNull PointF point, int p) {
     return ElementScaleEditSession.startScale(this, newInverse, point, p);
   }
 
diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/ElementStack.java b/src/org/thoughtcrime/securesms/imageeditor/model/ElementStack.java
index 15e051614..4eb8aa609 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/model/ElementStack.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/model/ElementStack.java
@@ -13,7 +13,9 @@ import java.util.Stack;
  * <p>
  * Elements are mutable, so this stack serializes the element and keeps a stack of serialized data.
  * <p>
- * The stack has a {@link #limit} and if it exceeds that limit during a push the earliest item is removed.
+ * The stack has a {@link #limit} and if it exceeds that limit during a push the second to earliest item
+ * is removed so that it can always go back to the first state. Effectively collapsing the history for
+ * the start of the stack.
  */
 final class ElementStack implements Parcelable {
 
@@ -35,6 +37,8 @@ final class ElementStack implements Parcelable {
   /**
    * Pushes an element to the stack iff the element's serialized value is different to any found at
    * the top of the stack.
+   * <p>
+   * Removes the second to earliest item if it is overflowing.
    *
    * @param element new editor element state.
    * @return true iff the pushed item was different to the top item.
@@ -46,7 +50,7 @@ final class ElementStack implements Parcelable {
     if (push) {
       stack.push(bytes);
       if (stack.size() > limit) {
-        stack.remove(0);
+        stack.remove(1);
       }
     }
     return push;
diff --git a/src/org/thoughtcrime/securesms/jobmanager/Job.java b/src/org/thoughtcrime/securesms/jobmanager/Job.java
index 702a8f4bb..2f5d4a19c 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/Job.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/Job.java
@@ -60,7 +60,7 @@ public abstract class Job {
    * This is already called by {@link JobController} during job submission, but if you ever run a
    * job without submitting it to the {@link JobManager}, then you'll need to invoke this yourself.
    */
-  protected final void setContext(@NonNull Context context) {
+  public final void setContext(@NonNull Context context) {
     this.context = context;
   }
 
diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobInstantiator.java b/src/org/thoughtcrime/securesms/jobmanager/JobInstantiator.java
index 7fa716f3e..c1166de75 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/JobInstantiator.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/JobInstantiator.java
@@ -13,8 +13,7 @@ class JobInstantiator {
     this.jobFactories = new HashMap<>(jobFactories);
   }
 
-  public @NonNull
-  Job instantiate(@NonNull String jobFactoryKey, @NonNull Job.Parameters parameters, @NonNull Data data) {
+  public @NonNull Job instantiate(@NonNull String jobFactoryKey, @NonNull Job.Parameters parameters, @NonNull Data data) {
     if (jobFactories.containsKey(jobFactoryKey)) {
       return jobFactories.get(jobFactoryKey).create(parameters, data);
     } else {
diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobManager.java b/src/org/thoughtcrime/securesms/jobmanager/JobManager.java
index 64c442237..1ab2cb6b0 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/JobManager.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/JobManager.java
@@ -237,8 +237,7 @@ public class JobManager implements ConstraintObserver.Notifier {
       return executorFactory;
     }
 
-    @NonNull
-    JobInstantiator getJobInstantiator() {
+    @NonNull JobInstantiator getJobInstantiator() {
       return jobInstantiator;
     }
 
diff --git a/src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java b/src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java
index 6cda006c9..947ed1125 100644
--- a/src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java
@@ -4,11 +4,6 @@ import android.support.annotation.NonNull;
 import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
 
-import org.thoughtcrime.securesms.jobmanager.Data;
-import org.thoughtcrime.securesms.jobmanager.Job;
-import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
-import org.thoughtcrime.securesms.logging.Log;
-
 import org.greenrobot.eventbus.EventBus;
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.attachments.AttachmentId;
@@ -17,6 +12,10 @@ import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.dependencies.InjectableType;
 import org.thoughtcrime.securesms.events.PartProgressEvent;
+import org.thoughtcrime.securesms.jobmanager.Data;
+import org.thoughtcrime.securesms.jobmanager.Job;
+import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.MmsException;
 import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.util.AttachmentUtil;
@@ -107,6 +106,11 @@ public class AttachmentDownloadJob extends BaseJob implements InjectableType {
 
   @Override
   public void onRun() throws IOException {
+    doWork();
+    MessageNotifier.updateNotification(context, 0);
+  }
+
+  public void doWork() throws IOException {
     Log.i(TAG, "onRun() messageId: " + messageId + "  partRowId: " + partRowId + "  partUniqueId: " + partUniqueId + "  manual: " + manual);
 
     final AttachmentDatabase database     = DatabaseFactory.getAttachmentDatabase(context);
@@ -133,7 +137,6 @@ public class AttachmentDownloadJob extends BaseJob implements InjectableType {
     database.setTransferState(messageId, attachmentId, AttachmentDatabase.TRANSFER_PROGRESS_STARTED);
 
     retrieveAttachment(messageId, attachmentId, attachment);
-    MessageNotifier.updateNotification(context);
   }
 
   @Override
@@ -145,7 +148,7 @@ public class AttachmentDownloadJob extends BaseJob implements InjectableType {
   }
 
   @Override
-  protected boolean onShouldRetry(Exception exception) {
+  protected boolean onShouldRetry(@NonNull Exception exception) {
     return (exception instanceof PushNetworkException);
   }
 
diff --git a/src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java b/src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java
index 8157ae06d..c09d50b33 100644
--- a/src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java
@@ -25,15 +25,12 @@ import org.whispersystems.libsignal.util.guava.Optional;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
-import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.ConnectException;
 import java.util.concurrent.TimeUnit;
 
 import javax.inject.Inject;
-import javax.net.ssl.SSLException;
 
 public class AttachmentUploadJob extends BaseJob implements InjectableType {
 
@@ -85,8 +82,8 @@ public class AttachmentUploadJob extends BaseJob implements InjectableType {
     MediaConstraints               mediaConstraints = MediaConstraints.getPushMediaConstraints();
     Attachment                     scaledAttachment = scaleAndStripExif(database, mediaConstraints, databaseAttachment);
     SignalServiceAttachment        localAttachment  = getAttachmentFor(scaledAttachment);
-    SignalServiceAttachmentPointer remoteAttachment = messageSender.uploadAttachment(localAttachment.asStream(), false);
-    Attachment                     attachment       = PointerAttachment.forPointer(Optional.of(remoteAttachment)).get();
+    SignalServiceAttachmentPointer remoteAttachment = messageSender.uploadAttachment(localAttachment.asStream(), databaseAttachment.isSticker());
+    Attachment                     attachment       = PointerAttachment.forPointer(Optional.of(remoteAttachment), null, databaseAttachment.getFastPreflightId()).get();
 
     database.updateAttachmentAfterUpload(databaseAttachment.getAttachmentId(), attachment);
   }
@@ -95,10 +92,8 @@ public class AttachmentUploadJob extends BaseJob implements InjectableType {
   public void onCanceled() { }
 
   @Override
-  protected boolean onShouldRetry(Exception exception) {
-    return exception instanceof PushNetworkException ||
-           exception instanceof SSLException         ||
-           exception instanceof ConnectException;
+  protected boolean onShouldRetry(@NonNull Exception exception) {
+    return exception instanceof IOException;
   }
 
   private SignalServiceAttachment getAttachmentFor(Attachment attachment) {
diff --git a/src/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java b/src/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java
index 21ae4b3ab..b97a410db 100644
--- a/src/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java
@@ -111,7 +111,7 @@ public class AvatarDownloadJob extends BaseJob implements InjectableType {
   public void onCanceled() {}
 
   @Override
-  public boolean onShouldRetry(Exception exception) {
+  public boolean onShouldRetry(@NonNull Exception exception) {
     if (exception instanceof IOException) return true;
     return false;
   }
diff --git a/src/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java b/src/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java
index d239a9d7c..464d6e6a2 100644
--- a/src/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java
@@ -97,7 +97,7 @@ public class CleanPreKeysJob extends BaseJob implements InjectableType {
   }
 
   @Override
-  public boolean onShouldRetry(Exception throwable) {
+  public boolean onShouldRetry(@NonNull Exception throwable) {
     if (throwable instanceof NonSuccessfulResponseCodeException) return false;
     if (throwable instanceof PushNetworkException)               return true;
     return false;
diff --git a/src/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java b/src/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java
index cfb5a9fdf..28a866611 100644
--- a/src/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java
@@ -74,7 +74,7 @@ public class CreateSignedPreKeyJob extends BaseJob implements InjectableType {
   public void onCanceled() {}
 
   @Override
-  public boolean onShouldRetry(Exception exception) {
+  public boolean onShouldRetry(@NonNull Exception exception) {
     if (exception instanceof PushNetworkException) return true;
     return false;
   }
diff --git a/src/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java b/src/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java
index a7074187f..5b367dd33 100644
--- a/src/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java
@@ -75,7 +75,7 @@ public class DirectoryRefreshJob extends BaseJob {
   }
 
   @Override
-  public boolean onShouldRetry(Exception exception) {
+  public boolean onShouldRetry(@NonNull Exception exception) {
     if (exception instanceof PushNetworkException) return true;
     return false;
   }
diff --git a/src/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java b/src/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java
index 2a6736172..2f63316d2 100644
--- a/src/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java
@@ -119,7 +119,7 @@ public class FcmRefreshJob extends BaseJob implements InjectableType {
   }
 
   @Override
-  public boolean onShouldRetry(Exception throwable) {
+  public boolean onShouldRetry(@NonNull Exception throwable) {
     if (throwable instanceof NonSuccessfulResponseCodeException) return false;
     return true;
   }
diff --git a/src/org/thoughtcrime/securesms/jobs/JobManagerFactories.java b/src/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
index 8a5912cf8..af769eda2 100644
--- a/src/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
+++ b/src/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
@@ -40,6 +40,8 @@ public final class JobManagerFactories {
       put(MultiDeviceGroupUpdateJob.KEY,             new MultiDeviceGroupUpdateJob.Factory());
       put(MultiDeviceProfileKeyUpdateJob.KEY,        new MultiDeviceProfileKeyUpdateJob.Factory());
       put(MultiDeviceReadUpdateJob.KEY,              new MultiDeviceReadUpdateJob.Factory());
+      put(MultiDeviceStickerPackOperationJob.KEY,    new MultiDeviceStickerPackOperationJob.Factory());
+      put(MultiDeviceStickerPackSyncJob.KEY,         new MultiDeviceStickerPackSyncJob.Factory());
       put(MultiDeviceVerifiedUpdateJob.KEY,          new MultiDeviceVerifiedUpdateJob.Factory());
       put(PushContentReceiveJob.KEY,                 new PushContentReceiveJob.Factory());
       put(PushDecryptJob.KEY,                        new PushDecryptJob.Factory());
@@ -63,6 +65,8 @@ public final class JobManagerFactories {
       put(SmsReceiveJob.KEY,                         new SmsReceiveJob.Factory());
       put(SmsSendJob.KEY,                            new SmsSendJob.Factory());
       put(SmsSentJob.KEY,                            new SmsSentJob.Factory());
+      put(StickerDownloadJob.KEY,                    new StickerDownloadJob.Factory());
+      put(StickerPackDownloadJob.KEY,                new StickerPackDownloadJob.Factory());
       put(TrimThreadJob.KEY,                         new TrimThreadJob.Factory());
       put(TypingSendJob.KEY,                         new TypingSendJob.Factory());
       put(UpdateApkJob.KEY,                          new UpdateApkJob.Factory());
diff --git a/src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java b/src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java
index e022a3035..c4f816c30 100644
--- a/src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java
@@ -102,7 +102,7 @@ public class LocalBackupJob extends BaseJob {
   }
 
   @Override
-  public boolean onShouldRetry(Exception e) {
+  public boolean onShouldRetry(@NonNull Exception e) {
     return false;
   }
 
diff --git a/src/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java b/src/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java
index e418d416a..ac6e20693 100644
--- a/src/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java
@@ -4,10 +4,6 @@ import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import org.thoughtcrime.securesms.jobmanager.Data;
-import org.thoughtcrime.securesms.jobmanager.Job;
-import org.thoughtcrime.securesms.logging.Log;
-
 import com.google.android.mms.pdu_alt.CharacterSets;
 import com.google.android.mms.pdu_alt.EncodedStringValue;
 import com.google.android.mms.pdu_alt.PduBody;
@@ -21,6 +17,9 @@ import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MessagingDatabase.InsertResult;
 import org.thoughtcrime.securesms.database.MmsDatabase;
+import org.thoughtcrime.securesms.jobmanager.Data;
+import org.thoughtcrime.securesms.jobmanager.Job;
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.ApnUnavailableException;
 import org.thoughtcrime.securesms.mms.CompatMmsConnection;
 import org.thoughtcrime.securesms.mms.IncomingMediaMessage;
@@ -183,7 +182,7 @@ public class MmsDownloadJob extends BaseJob {
   }
 
   @Override
-  public boolean onShouldRetry(Exception exception) {
+  public boolean onShouldRetry(@NonNull Exception exception) {
     return false;
   }
 
@@ -239,7 +238,7 @@ public class MmsDownloadJob extends BaseJob {
 
           attachments.add(new UriAttachment(uri, Util.toIsoString(part.getContentType()),
                                             AttachmentDatabase.TRANSFER_PROGRESS_DONE,
-                                            part.getData().length, name, false, false, null));
+                                            part.getData().length, name, false, false, null, null));
         }
       }
     }
diff --git a/src/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java b/src/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java
index d445ba568..5cda9e215 100644
--- a/src/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java
@@ -95,7 +95,7 @@ public class MmsReceiveJob extends BaseJob {
   }
 
   @Override
-  public boolean onShouldRetry(Exception exception) {
+  public boolean onShouldRetry(@NonNull Exception exception) {
     return false;
   }
 
diff --git a/src/org/thoughtcrime/securesms/jobs/MmsSendJob.java b/src/org/thoughtcrime/securesms/jobs/MmsSendJob.java
index bacda8b02..d3112ef61 100644
--- a/src/org/thoughtcrime/securesms/jobs/MmsSendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MmsSendJob.java
@@ -121,7 +121,7 @@ public class MmsSendJob extends SendJob {
   }
 
   @Override
-  public boolean onShouldRetry(Exception exception) {
+  public boolean onShouldRetry(@NonNull Exception exception) {
     return false;
   }
 
diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java
index ff001fe49..13565bcc1 100644
--- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java
@@ -91,7 +91,7 @@ public class MultiDeviceBlockedUpdateJob extends BaseJob implements InjectableTy
   }
 
   @Override
-  public boolean onShouldRetry(Exception exception) {
+  public boolean onShouldRetry(@NonNull Exception exception) {
     if (exception instanceof PushNetworkException) return true;
     return false;
   }
diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java
index 47ddf2410..25b75aeb0 100644
--- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java
@@ -100,7 +100,7 @@ public class MultiDeviceConfigurationUpdateJob extends BaseJob implements Inject
   }
 
   @Override
-  public boolean onShouldRetry(Exception e) {
+  public boolean onShouldRetry(@NonNull Exception e) {
     return e instanceof PushNetworkException;
   }
 
diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
index 0301c0243..a10caa0ed 100644
--- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
@@ -217,7 +217,7 @@ public class MultiDeviceContactUpdateJob extends BaseJob implements InjectableTy
   }
 
   @Override
-  public boolean onShouldRetry(Exception exception) {
+  public boolean onShouldRetry(@NonNull Exception exception) {
     if (exception instanceof PushNetworkException) return true;
     return false;
   }
diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java
index 46c894ec2..be44c9223 100644
--- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java
@@ -119,7 +119,7 @@ public class MultiDeviceGroupUpdateJob extends BaseJob implements InjectableType
   }
 
   @Override
-  public boolean onShouldRetry(Exception exception) {
+  public boolean onShouldRetry(@NonNull Exception exception) {
     if (exception instanceof PushNetworkException) return true;
     return false;
   }
diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java
index 4f92c493c..61c081226 100644
--- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java
@@ -94,7 +94,7 @@ public class MultiDeviceProfileKeyUpdateJob extends BaseJob implements Injectabl
   }
 
   @Override
-  public boolean onShouldRetry(Exception exception) {
+  public boolean onShouldRetry(@NonNull Exception exception) {
     if (exception instanceof PushNetworkException) return true;
     return false;
   }
diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java
index 550f27a88..f83e23e5b 100644
--- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java
@@ -99,7 +99,7 @@ public class MultiDeviceReadUpdateJob extends BaseJob implements InjectableType
   }
 
   @Override
-  public boolean onShouldRetry(Exception exception) {
+  public boolean onShouldRetry(@NonNull Exception exception) {
     return exception instanceof PushNetworkException;
   }
 
diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java
new file mode 100644
index 000000000..3a81fb0cd
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java
@@ -0,0 +1,126 @@
+package org.thoughtcrime.securesms.jobs;
+
+import android.support.annotation.NonNull;
+
+import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
+import org.thoughtcrime.securesms.dependencies.InjectableType;
+import org.thoughtcrime.securesms.jobmanager.Data;
+import org.thoughtcrime.securesms.jobmanager.Job;
+import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.util.Hex;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.whispersystems.signalservice.api.SignalServiceMessageSender;
+import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
+import org.whispersystems.signalservice.api.messages.multidevice.StickerPackOperationMessage;
+import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
+
+import java.util.Collections;
+import java.util.concurrent.TimeUnit;
+
+import javax.inject.Inject;
+
+public class MultiDeviceStickerPackOperationJob extends BaseJob implements InjectableType {
+
+  private static final String TAG = Log.tag(MultiDeviceStickerPackOperationJob.class);
+
+  public static final String KEY = "MultiDeviceStickerPackOperationJob";
+
+  private static final String KEY_PACK_ID  = "pack_id";
+  private static final String KEY_PACK_KEY = "pack_key";
+  private static final String KEY_TYPE     = "type";
+
+  private final String packId;
+  private final String packKey;
+  private final Type   type;
+
+  @Inject SignalServiceMessageSender messageSender;
+
+  public MultiDeviceStickerPackOperationJob(@NonNull String packId,
+                                            @NonNull String packKey,
+                                            @NonNull Type type)
+  {
+    this(new Job.Parameters.Builder()
+                           .setQueue("MultiDeviceStickerPackOperationJob")
+                           .addConstraint(NetworkConstraint.KEY)
+                           .setLifespan(TimeUnit.DAYS.toMillis(1))
+                           .build(),
+        packId,
+        packKey,
+        type);
+  }
+
+  public MultiDeviceStickerPackOperationJob(@NonNull Parameters parameters,
+                                            @NonNull String packId,
+                                            @NonNull String packKey,
+                                            @NonNull Type type)
+  {
+    super(parameters);
+    this.packId  = packId;
+    this.packKey = packKey;
+    this.type    = type;
+  }
+
+  @Override
+  public @NonNull Data serialize() {
+    return new Data.Builder().putString(KEY_PACK_ID, packId)
+                             .putString(KEY_PACK_KEY, packKey)
+                             .putString(KEY_TYPE, type.name())
+                             .build();
+  }
+
+  @Override
+  public @NonNull String getFactoryKey() {
+    return KEY;
+  }
+
+  @Override
+  protected void onRun() throws Exception {
+    if (!TextSecurePreferences.isMultiDevice(context)) {
+      Log.i(TAG, "Not multi device, aborting...");
+      return;
+    }
+
+    byte[] packIdBytes  = Hex.fromStringCondensed(packId);
+    byte[] packKeyBytes = Hex.fromStringCondensed(packKey);
+
+    StickerPackOperationMessage.Type remoteType;
+
+    switch (type) {
+      case INSTALL: remoteType = StickerPackOperationMessage.Type.INSTALL; break;
+      case REMOVE:  remoteType = StickerPackOperationMessage.Type.REMOVE; break;
+      default:      throw new AssertionError("No matching type?");
+    }
+
+    StickerPackOperationMessage stickerPackOperation = new StickerPackOperationMessage(packIdBytes, packKeyBytes, remoteType);
+
+    messageSender.sendMessage(0, SignalServiceSyncMessage.forStickerPackOperations(Collections.singletonList(stickerPackOperation)), // The message ID doesn't matter
+                              UnidentifiedAccessUtil.getAccessForSync(context));
+  }
+
+  @Override
+  protected boolean onShouldRetry(@NonNull Exception e) {
+    return e instanceof PushNetworkException;
+  }
+
+  @Override
+  public void onCanceled() {
+    Log.w(TAG, "Failed to sync sticker pack operation!");
+  }
+
+  // NEVER rename these -- they're persisted by name
+  public enum Type {
+    INSTALL, REMOVE
+  }
+
+  public static class Factory implements Job.Factory<MultiDeviceStickerPackOperationJob> {
+
+    @Override
+    public @NonNull MultiDeviceStickerPackOperationJob create(@NonNull Parameters parameters, @NonNull Data data) {
+      return new MultiDeviceStickerPackOperationJob(parameters,
+                                                    data.getString(KEY_PACK_ID),
+                                                    data.getString(KEY_PACK_KEY),
+                                                    Type.valueOf(data.getString(KEY_TYPE)));
+    }
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java
new file mode 100644
index 000000000..66c12dc19
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java
@@ -0,0 +1,101 @@
+package org.thoughtcrime.securesms.jobs;
+
+import android.support.annotation.NonNull;
+
+import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.StickerDatabase.StickerPackRecordReader;
+import org.thoughtcrime.securesms.database.model.StickerPackRecord;
+import org.thoughtcrime.securesms.dependencies.InjectableType;
+import org.thoughtcrime.securesms.jobmanager.Data;
+import org.thoughtcrime.securesms.jobmanager.Job;
+import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.util.Hex;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.whispersystems.signalservice.api.SignalServiceMessageSender;
+import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
+import org.whispersystems.signalservice.api.messages.multidevice.StickerPackOperationMessage;
+import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import javax.inject.Inject;
+
+/**
+ * Tells a linked desktop about all installed sticker packs.
+ */
+public class MultiDeviceStickerPackSyncJob extends BaseJob implements InjectableType {
+
+  private static final String TAG = Log.tag(MultiDeviceStickerPackSyncJob.class);
+
+  public static final String KEY = "MultiDeviceStickerPackSyncJob";
+
+  @Inject SignalServiceMessageSender messageSender;
+
+  public MultiDeviceStickerPackSyncJob() {
+    this(new Parameters.Builder()
+                           .setQueue("MultiDeviceStickerPackSyncJob")
+                           .addConstraint(NetworkConstraint.KEY)
+                           .setLifespan(TimeUnit.DAYS.toMillis(1))
+                           .build());
+  }
+
+  public MultiDeviceStickerPackSyncJob(@NonNull Parameters parameters) {
+    super(parameters);
+  }
+
+  @Override
+  public @NonNull Data serialize() {
+    return Data.EMPTY;
+  }
+
+  @Override
+  public @NonNull String getFactoryKey() {
+    return KEY;
+  }
+
+  @Override
+  protected void onRun() throws Exception {
+    if (!TextSecurePreferences.isMultiDevice(context)) {
+      Log.i(TAG, "Not multi device, aborting...");
+      return;
+    }
+
+    List<StickerPackOperationMessage> operations = new LinkedList<>();
+
+    try (StickerPackRecordReader reader = new StickerPackRecordReader(DatabaseFactory.getStickerDatabase(context).getInstalledStickerPacks())) {
+      StickerPackRecord pack;
+      while ((pack = reader.getNext()) != null) {
+        byte[] packIdBytes  = Hex.fromStringCondensed(pack.getPackId());
+        byte[] packKeyBytes = Hex.fromStringCondensed(pack.getPackKey());
+
+        operations.add(new StickerPackOperationMessage(packIdBytes, packKeyBytes, StickerPackOperationMessage.Type.INSTALL));
+      }
+    }
+
+    messageSender.sendMessage(0, SignalServiceSyncMessage.forStickerPackOperations(operations), // The message ID doesn't matter
+                              UnidentifiedAccessUtil.getAccessForSync(context));
+  }
+
+  @Override
+  protected boolean onShouldRetry(@NonNull Exception e) {
+    return e instanceof PushNetworkException;
+  }
+
+  @Override
+  public void onCanceled() {
+    Log.w(TAG, "Failed to sync sticker pack operation!");
+  }
+
+  public static class Factory implements Job.Factory<MultiDeviceStickerPackSyncJob> {
+
+    @Override
+    public @NonNull
+    MultiDeviceStickerPackSyncJob create(@NonNull Parameters parameters, @NonNull Data data) {
+      return new MultiDeviceStickerPackSyncJob(parameters);
+    }
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java
index 60ad48f9d..975ea65e6 100644
--- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java
@@ -126,7 +126,7 @@ public class MultiDeviceVerifiedUpdateJob extends BaseJob implements InjectableT
   }
 
   @Override
-  public boolean onShouldRetry(Exception exception) {
+  public boolean onShouldRetry(@NonNull Exception exception) {
     return exception instanceof PushNetworkException;
   }
 
diff --git a/src/org/thoughtcrime/securesms/jobs/PushContentReceiveJob.java b/src/org/thoughtcrime/securesms/jobs/PushContentReceiveJob.java
index 060f36c10..79ad58f61 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushContentReceiveJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushContentReceiveJob.java
@@ -36,7 +36,7 @@ public class PushContentReceiveJob extends PushReceivedJob {
   public void onCanceled() { }
 
   @Override
-  public boolean onShouldRetry(Exception exception) {
+  public boolean onShouldRetry(@NonNull Exception exception) {
     return false;
   }
 
diff --git a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
index a5d80b16e..7b8e38370 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
@@ -33,6 +33,7 @@ import org.thoughtcrime.securesms.ConversationListActivity;
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
 import org.thoughtcrime.securesms.attachments.PointerAttachment;
+import org.thoughtcrime.securesms.attachments.UriAttachment;
 import org.thoughtcrime.securesms.contactshare.Contact;
 import org.thoughtcrime.securesms.contactshare.ContactModelMapper;
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
@@ -41,6 +42,7 @@ import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
 import org.thoughtcrime.securesms.crypto.storage.SignalProtocolStoreImpl;
 import org.thoughtcrime.securesms.crypto.storage.TextSecureSessionStore;
 import org.thoughtcrime.securesms.database.Address;
+import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupDatabase;
 import org.thoughtcrime.securesms.database.GroupReceiptDatabase;
@@ -52,13 +54,16 @@ import org.thoughtcrime.securesms.database.NoSuchMessageException;
 import org.thoughtcrime.securesms.database.PushDatabase;
 import org.thoughtcrime.securesms.database.RecipientDatabase;
 import org.thoughtcrime.securesms.database.SmsDatabase;
+import org.thoughtcrime.securesms.database.StickerDatabase;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
 import org.thoughtcrime.securesms.dependencies.InjectableType;
+import org.thoughtcrime.securesms.database.model.StickerRecord;
 import org.thoughtcrime.securesms.groups.GroupMessageProcessor;
 import org.thoughtcrime.securesms.jobmanager.Data;
 import org.thoughtcrime.securesms.jobmanager.Job;
+import org.thoughtcrime.securesms.jobmanager.JobManager;
 import org.thoughtcrime.securesms.linkpreview.Link;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil;
@@ -74,6 +79,7 @@ import org.thoughtcrime.securesms.mms.OutgoingMediaMessage;
 import org.thoughtcrime.securesms.mms.OutgoingSecureMediaMessage;
 import org.thoughtcrime.securesms.mms.QuoteModel;
 import org.thoughtcrime.securesms.mms.SlideDeck;
+import org.thoughtcrime.securesms.mms.StickerSlide;
 import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -84,8 +90,11 @@ import org.thoughtcrime.securesms.sms.IncomingTextMessage;
 import org.thoughtcrime.securesms.sms.OutgoingEncryptedMessage;
 import org.thoughtcrime.securesms.sms.OutgoingEndSessionMessage;
 import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
+import org.thoughtcrime.securesms.stickers.StickerLocator;
 import org.thoughtcrime.securesms.util.GroupUtil;
+import org.thoughtcrime.securesms.util.Hex;
 import org.thoughtcrime.securesms.util.IdentityUtil;
+import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.whispersystems.libsignal.state.PreKeyBundle;
 import org.whispersystems.libsignal.state.SignalProtocolStore;
@@ -108,6 +117,7 @@ import org.whispersystems.signalservice.api.messages.multidevice.ReadMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.RequestMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
+import org.whispersystems.signalservice.api.messages.multidevice.StickerPackOperationMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage;
 import org.whispersystems.signalservice.api.messages.shared.SharedContact;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
@@ -118,6 +128,7 @@ import org.whispersystems.signalservice.loki.messaging.LokiThreadFriendRequestSt
 import org.whispersystems.signalservice.loki.messaging.LokiThreadSessionResetStatus;
 
 import java.security.MessageDigest;
+import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedList;
@@ -198,7 +209,7 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
   }
 
   @Override
-  public boolean onShouldRetry(Exception exception) {
+  public boolean onShouldRetry(@NonNull Exception exception) {
     return false;
   }
 
@@ -287,7 +298,7 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
 
       if (content.getDataMessage().isPresent()) {
         SignalServiceDataMessage message        = content.getDataMessage().get();
-        boolean                  isMediaMessage = message.getAttachments().isPresent() || message.getQuote().isPresent() || message.getSharedContacts().isPresent() || message.getPreviews().isPresent();
+        boolean                  isMediaMessage = message.getAttachments().isPresent() || message.getQuote().isPresent() || message.getSharedContacts().isPresent() || message.getPreviews().isPresent() || message.getSticker().isPresent();
 
         if      (message.isEndSession())        handleEndSessionMessage(content, smsMessageId);
         else if (message.isGroupUpdate())       handleGroupMessage(content, message, smsMessageId);
@@ -314,11 +325,12 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
 
         SignalServiceSyncMessage syncMessage = content.getSyncMessage().get();
 
-        if      (syncMessage.getSent().isPresent())     handleSynchronizeSentMessage(content, syncMessage.getSent().get());
-        else if (syncMessage.getRequest().isPresent())  handleSynchronizeRequestMessage(syncMessage.getRequest().get());
-        else if (syncMessage.getRead().isPresent())     handleSynchronizeReadMessage(syncMessage.getRead().get(), content.getTimestamp());
-        else if (syncMessage.getVerified().isPresent()) handleSynchronizeVerifiedMessage(syncMessage.getVerified().get());
-        else                                           Log.w(TAG, "Contains no known sync types...");
+        if      (syncMessage.getSent().isPresent())                  handleSynchronizeSentMessage(content, syncMessage.getSent().get());
+        else if (syncMessage.getRequest().isPresent())               handleSynchronizeRequestMessage(syncMessage.getRequest().get());
+        else if (syncMessage.getRead().isPresent())                  handleSynchronizeReadMessage(syncMessage.getRead().get(), content.getTimestamp());
+        else if (syncMessage.getVerified().isPresent())              handleSynchronizeVerifiedMessage(syncMessage.getVerified().get());
+        else if (syncMessage.getStickerPackOperations().isPresent()) handleSynchronizeStickerPackOperation(syncMessage.getStickerPackOperations().get());
+        else                                                         Log.w(TAG, "Contains no known sync types...");
       } else if (content.getCallMessage().isPresent()) {
         Log.i(TAG, "Got call message...");
         SignalServiceCallMessage message = content.getCallMessage().get();
@@ -566,6 +578,7 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
                                                                    Optional.absent(),
                                                                    Optional.absent(),
                                                                    Optional.absent(),
+                                                                   Optional.absent(),
                                                                    Optional.absent());
 
         database.insertSecureDecryptedMessageInbox(mediaMessage, -1);
@@ -584,6 +597,28 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
     IdentityUtil.processVerifiedMessage(context, verifiedMessage);
   }
 
+  private void handleSynchronizeStickerPackOperation(@NonNull List<StickerPackOperationMessage> stickerPackOperations) {
+    JobManager jobManager = ApplicationContext.getInstance(context).getJobManager();
+
+    for (StickerPackOperationMessage operation : stickerPackOperations) {
+      if (operation.getPackId().isPresent() && operation.getPackKey().isPresent() && operation.getType().isPresent()) {
+        String packId  = Hex.toStringCondensed(operation.getPackId().get());
+        String packKey = Hex.toStringCondensed(operation.getPackKey().get());
+
+        switch (operation.getType().get()) {
+          case INSTALL:
+            jobManager.add(new StickerPackDownloadJob(packId, packKey, false));
+            break;
+          case REMOVE:
+            DatabaseFactory.getStickerDatabase(context).uninstallPack(packId);
+            break;
+        }
+      } else {
+        Log.w(TAG, "Received incomplete sticker pack operation sync.");
+      }
+    }
+  }
+
   private void handleSynchronizeSentMessage(@NonNull SignalServiceContent content,
                                             @NonNull SentTranscriptMessage message)
       throws StorageFailedException
@@ -600,7 +635,7 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
         threadId = GroupMessageProcessor.process(context, content, message.getMessage(), true);
       } else if (message.getMessage().isExpirationUpdate()) {
         threadId = handleSynchronizeSentExpirationUpdate(message);
-      } else if (message.getMessage().getAttachments().isPresent() || message.getMessage().getQuote().isPresent() || message.getMessage().getPreviews().isPresent()) {
+      } else if (message.getMessage().getAttachments().isPresent() || message.getMessage().getQuote().isPresent() || message.getMessage().getPreviews().isPresent() || message.getMessage().getSticker().isPresent()) {
         threadId = handleSynchronizeSentMediaMessage(message);
       } else {
         threadId = handleSynchronizeSentTextMessage(message);
@@ -664,6 +699,10 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
                                                                    TextSecurePreferences.isTypingIndicatorsEnabled(context),
                                                                    TextSecurePreferences.isShowUnidentifiedDeliveryIndicatorsEnabled(context),
                                                                    TextSecurePreferences.isLinkPreviewsEnabled(context)));
+
+      ApplicationContext.getInstance(context)
+                        .getJobManager()
+                        .add(new MultiDeviceStickerPackSyncJob());
     }
   }
 
@@ -698,12 +737,17 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
   {
     notifyTypingStoppedFromIncomingMessage(getMessageDestination(content, message), content.getSender(), content.getSenderDevice());
 
+    Optional<InsertResult> insertResult;
+
+    MmsDatabase database = DatabaseFactory.getMmsDatabase(context);
+    database.beginTransaction();
+
     try {
-      MmsDatabase                 database       = DatabaseFactory.getMmsDatabase(context);
       Optional<QuoteModel>        quote          = getValidatedQuote(message.getQuote());
       Optional<List<Contact>>     sharedContacts = getContacts(message.getSharedContacts());
       Optional<List<LinkPreview>> linkPreviews   = getLinkPreviews(message.getPreviews(), message.getBody().or(""));
-      IncomingMediaMessage        mediaMessage   = new IncomingMediaMessage(Address.fromSerialized(content.getSender()),
+      Optional<Attachment>        sticker        = getStickerAttachment(message.getSticker());
+      IncomingMediaMessage        mediaMessage   = new IncomingMediaMessage(Address.fromExternal(context, content.getSender()),
                                                                             message.getTimestamp(), -1,
                                                                             message.getExpiresInSeconds() * 1000L, false,
                                                                             content.isNeedsReceipt(),
@@ -712,12 +756,18 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
                                                                             message.getAttachments(),
                                                                             quote,
                                                                             sharedContacts,
-                                                                            linkPreviews);
+                                                                            linkPreviews,
+                                                                            sticker);
 
-      Optional<InsertResult> insertResult = database.insertSecureDecryptedMessageInbox(mediaMessage, -1);
+
+      insertResult = database.insertSecureDecryptedMessageInbox(mediaMessage, -1);
 
       if (insertResult.isPresent()) {
-        List<DatabaseAttachment> attachments = DatabaseFactory.getAttachmentDatabase(context).getAttachmentsForMessage(insertResult.get().getMessageId());
+        List<DatabaseAttachment> allAttachments     = DatabaseFactory.getAttachmentDatabase(context).getAttachmentsForMessage(insertResult.get().getMessageId());
+        List<DatabaseAttachment> stickerAttachments = Stream.of(allAttachments).filter(Attachment::isSticker).toList();
+        List<DatabaseAttachment> attachments        = Stream.of(allAttachments).filterNot(Attachment::isSticker).toList();
+
+        forceStickerDownloadIfNecessary(stickerAttachments);
 
         for (DatabaseAttachment attachment : attachments) {
           ApplicationContext.getInstance(context)
@@ -729,10 +779,16 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
           DatabaseFactory.getSmsDatabase(context).deleteMessage(smsMessageId.get());
         }
 
-        MessageNotifier.updateNotification(context, insertResult.get().getThreadId());
+        database.setTransactionSuccessful();
       }
     } catch (MmsException e) {
       throw new StorageFailedException(e, content.getSender(), content.getSenderDevice());
+    } finally {
+      database.endTransaction();
+    }
+
+    if (insertResult.isPresent()) {
+      MessageNotifier.updateNotification(context, insertResult.get().getThreadId());
     }
   }
 
@@ -757,19 +813,26 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
   private long handleSynchronizeSentMediaMessage(@NonNull SentTranscriptMessage message)
       throws MmsException
   {
-    MmsDatabase                 database       = DatabaseFactory.getMmsDatabase(context);
-    Recipient                   recipients     = getSyncMessageDestination(message);
-    Optional<QuoteModel>        quote          = getValidatedQuote(message.getMessage().getQuote());
-    Optional<List<Contact>>     sharedContacts = getContacts(message.getMessage().getSharedContacts());
-    Optional<List<LinkPreview>> previews       = getLinkPreviews(message.getMessage().getPreviews(), message.getMessage().getBody().or(""));
-    OutgoingMediaMessage        mediaMessage   = new OutgoingMediaMessage(recipients, message.getMessage().getBody().orNull(),
-                                                                          PointerAttachment.forPointers(message.getMessage().getAttachments()),
-                                                                          message.getTimestamp(), -1,
-                                                                          message.getMessage().getExpiresInSeconds() * 1000,
-                                                                          ThreadDatabase.DistributionTypes.DEFAULT, quote.orNull(),
-                                                                          sharedContacts.or(Collections.emptyList()),
-                                                                          previews.or(Collections.emptyList()),
-                                                                          Collections.emptyList(), Collections.emptyList());
+    MmsDatabase                 database        = DatabaseFactory.getMmsDatabase(context);
+    Recipient                   recipients      = getSyncMessageDestination(message);
+    Optional<QuoteModel>        quote           = getValidatedQuote(message.getMessage().getQuote());
+    Optional<Attachment>        sticker         = getStickerAttachment(message.getMessage().getSticker());
+    Optional<List<Contact>>     sharedContacts  = getContacts(message.getMessage().getSharedContacts());
+    Optional<List<LinkPreview>> previews        = getLinkPreviews(message.getMessage().getPreviews(), message.getMessage().getBody().or(""));
+    List<Attachment>            syncAttachments = PointerAttachment.forPointers(message.getMessage().getAttachments());
+
+    if (sticker.isPresent()) {
+      syncAttachments.add(sticker.get());
+    }
+
+    OutgoingMediaMessage mediaMessage = new OutgoingMediaMessage(recipients, message.getMessage().getBody().orNull(),
+                                                                 syncAttachments,
+                                                                 message.getTimestamp(), -1,
+                                                                 message.getMessage().getExpiresInSeconds() * 1000,
+                                                                 ThreadDatabase.DistributionTypes.DEFAULT, quote.orNull(),
+                                                                 sharedContacts.or(Collections.emptyList()),
+                                                                 previews.or(Collections.emptyList()),
+                                                                 Collections.emptyList(), Collections.emptyList());
 
     mediaMessage = new OutgoingSecureMediaMessage(mediaMessage);
 
@@ -778,41 +841,55 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
     }
 
     long threadId  = DatabaseFactory.getThreadDatabase(context).getThreadIdFor(recipients);
-    long messageId = database.insertMessageOutbox(mediaMessage, threadId, false, null);
 
-    if (recipients.getAddress().isGroup()) {
-      GroupReceiptDatabase receiptDatabase = DatabaseFactory.getGroupReceiptDatabase(context);
-      List<Recipient>      members         = DatabaseFactory.getGroupDatabase(context).getGroupMembers(recipients.getAddress().toGroupString(), false);
+    database.beginTransaction();
 
-      for (Recipient member : members) {
-        receiptDatabase.setUnidentified(member.getAddress(), messageId, message.isUnidentified(member.getAddress().serialize()));
+    try {
+      long messageId = database.insertMessageOutbox(mediaMessage, threadId, false, null);
+
+      if (recipients.getAddress().isGroup()) {
+        GroupReceiptDatabase receiptDatabase = DatabaseFactory.getGroupReceiptDatabase(context);
+        List<Recipient>      members         = DatabaseFactory.getGroupDatabase(context).getGroupMembers(recipients.getAddress().toGroupString(), false);
+
+        for (Recipient member : members) {
+          receiptDatabase.setUnidentified(member.getAddress(), messageId, message.isUnidentified(member.getAddress().serialize()));
+        }
       }
+
+      database.markAsSent(messageId, true);
+      database.markUnidentified(messageId, message.isUnidentified(recipients.getAddress().serialize()));
+
+      List<DatabaseAttachment> allAttachments     = DatabaseFactory.getAttachmentDatabase(context).getAttachmentsForMessage(messageId);
+      List<DatabaseAttachment> stickerAttachments = Stream.of(allAttachments).filter(Attachment::isSticker).toList();
+      List<DatabaseAttachment> attachments        = Stream.of(allAttachments).filterNot(Attachment::isSticker).toList();
+
+      forceStickerDownloadIfNecessary(stickerAttachments);
+
+      for (DatabaseAttachment attachment : attachments) {
+        ApplicationContext.getInstance(context)
+                          .getJobManager()
+                          .add(new AttachmentDownloadJob(messageId, attachment.getAttachmentId(), false));
+      }
+
+      if (message.getMessage().getExpiresInSeconds() > 0) {
+        database.markExpireStarted(messageId, message.getExpirationStartTimestamp());
+        ApplicationContext.getInstance(context)
+                          .getExpiringMessageManager()
+                          .scheduleDeletion(messageId, true,
+                                            message.getExpirationStartTimestamp(),
+                                            message.getMessage().getExpiresInSeconds() * 1000L);
+      }
+
+      if (recipients.isLocalNumber()) {
+        SyncMessageId id = new SyncMessageId(recipients.getAddress(), message.getTimestamp());
+        DatabaseFactory.getMmsSmsDatabase(context).incrementDeliveryReceiptCount(id, System.currentTimeMillis());
+        DatabaseFactory.getMmsSmsDatabase(context).incrementReadReceiptCount(id, System.currentTimeMillis());
+      }
+
+      database.setTransactionSuccessful();
+    } finally {
+      database.endTransaction();
     }
-
-    database.markAsSent(messageId, true);
-    database.markUnidentified(messageId, message.isUnidentified(recipients.getAddress().serialize()));
-
-    for (DatabaseAttachment attachment : DatabaseFactory.getAttachmentDatabase(context).getAttachmentsForMessage(messageId)) {
-      ApplicationContext.getInstance(context)
-                        .getJobManager()
-                        .add(new AttachmentDownloadJob(messageId, attachment.getAttachmentId(), false));
-    }
-
-    if (message.getMessage().getExpiresInSeconds() > 0) {
-      database.markExpireStarted(messageId, message.getExpirationStartTimestamp());
-      ApplicationContext.getInstance(context)
-                        .getExpiringMessageManager()
-                        .scheduleDeletion(messageId, true,
-                                          message.getExpirationStartTimestamp(),
-                                          message.getMessage().getExpiresInSeconds() * 1000L);
-    }
-
-    if (recipients.isLocalNumber()) {
-      SyncMessageId id = new SyncMessageId(recipients.getAddress(), message.getTimestamp());
-      DatabaseFactory.getMmsSmsDatabase(context).incrementDeliveryReceiptCount(id, System.currentTimeMillis());
-      DatabaseFactory.getMmsSmsDatabase(context).incrementReadReceiptCount(id, System.currentTimeMillis());
-    }
-
     return threadId;
   }
 
@@ -1194,6 +1271,42 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
                                       PointerAttachment.forPointers(quote.get().getAttachments())));
   }
 
+  private Optional<Attachment> getStickerAttachment(Optional<SignalServiceDataMessage.Sticker> sticker) {
+    if (!sticker.isPresent()) {
+      return Optional.absent();
+    }
+
+    if (sticker.get().getPackId() == null || sticker.get().getPackKey() == null || sticker.get().getAttachment() == null) {
+      Log.w(TAG, "Malformed sticker!");
+      return Optional.absent();
+    }
+
+    String          packId          = Hex.toStringCondensed(sticker.get().getPackId());
+    String          packKey         = Hex.toStringCondensed(sticker.get().getPackKey());
+    int             stickerId       = sticker.get().getStickerId();
+    StickerLocator  stickerLocator  = new StickerLocator(packId, packKey, stickerId);
+    StickerDatabase stickerDatabase = DatabaseFactory.getStickerDatabase(context);
+    StickerRecord   stickerRecord   = stickerDatabase.getSticker(stickerLocator.getPackId(), stickerLocator.getStickerId(), false);
+
+    if (stickerRecord != null) {
+      return Optional.of(new UriAttachment(stickerRecord.getUri(),
+                                           stickerRecord.getUri(),
+                                           MediaUtil.IMAGE_WEBP,
+                                           AttachmentDatabase.TRANSFER_PROGRESS_DONE,
+                                           stickerRecord.getSize(),
+                                           StickerSlide.WIDTH,
+                                           StickerSlide.HEIGHT,
+                                           null,
+                                           String.valueOf(new SecureRandom().nextLong()),
+                                           false,
+                                           false,
+                                           null,
+                                           stickerLocator));
+    } else {
+      return Optional.of(PointerAttachment.forPointer(Optional.of(sticker.get().getAttachment()), stickerLocator).get());
+    }
+  }
+
   private Optional<List<Contact>> getContacts(Optional<List<SharedContact>> sharedContacts) {
     if (!sharedContacts.isPresent()) return Optional.absent();
 
@@ -1313,6 +1426,25 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
     }
   }
 
+  private void forceStickerDownloadIfNecessary(List<DatabaseAttachment> stickerAttachments) {
+    if (stickerAttachments.isEmpty()) return;
+
+    DatabaseAttachment stickerAttachment = stickerAttachments.get(0);
+
+    if (stickerAttachment.getTransferState() != AttachmentDatabase.TRANSFER_PROGRESS_DONE) {
+      AttachmentDownloadJob downloadJob = new AttachmentDownloadJob(messageId, stickerAttachment.getAttachmentId(), true);
+
+      try {
+        ApplicationContext.getInstance(context).injectDependencies(downloadJob);
+        downloadJob.setContext(context);
+        downloadJob.doWork();
+      } catch (Exception e) {
+        Log.w(TAG, "Failed to download sticker inline. Scheduling.");
+        ApplicationContext.getInstance(context).getJobManager().add(downloadJob);
+      }
+    }
+  }
+
   @SuppressWarnings("WeakerAccess")
   private static class StorageFailedException extends Exception {
     private final String sender;
diff --git a/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java b/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
index e378135c6..d82779b6b 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
@@ -212,7 +212,7 @@ public class PushGroupSendJob extends PushSendJob implements InjectableType {
   }
 
   @Override
-  public boolean onShouldRetry(Exception exception) {
+  public boolean onShouldRetry(@NonNull Exception exception) {
     if (exception instanceof IOException)         return true;
     if (exception instanceof RetryLaterException) return true;
     return false;
@@ -227,13 +227,15 @@ public class PushGroupSendJob extends PushSendJob implements InjectableType {
       throws IOException, UntrustedIdentityException, UndeliverableMessageException {
     rotateSenderCertificateIfNecessary();
 
-    String                        groupId            = message.getRecipient().getAddress().toGroupString();
-    Optional<byte[]>              profileKey         = getProfileKey(message.getRecipient());
-    Optional<Quote>               quote              = getQuoteFor(message);
-    List<SharedContact>           sharedContacts     = getSharedContactsFor(message);
-    List<Preview>                 previews           = getPreviewsFor(message);
-    List<SignalServiceAddress>    addresses          = Stream.of(destinations).map(this::getPushAddress).toList();
-    List<SignalServiceAttachment> attachmentPointers = getAttachmentPointersFor(message.getAttachments());
+    String                                     groupId            = message.getRecipient().getAddress().toGroupString();
+    Optional<byte[]>                           profileKey         = getProfileKey(message.getRecipient());
+    Optional<Quote>                            quote              = getQuoteFor(message);
+    Optional<SignalServiceDataMessage.Sticker> sticker            = getStickerFor(message);
+    List<SharedContact>                        sharedContacts     = getSharedContactsFor(message);
+    List<Preview>                              previews           = getPreviewsFor(message);
+    List<SignalServiceAddress>                 addresses          = Stream.of(destinations).map(this::getPushAddress).toList();
+    List<Attachment>                           attachments        = Stream.of(message.getAttachments()).filterNot(Attachment::isSticker).toList();
+    List<SignalServiceAttachment>              attachmentPointers = getAttachmentPointersFor(attachments);
 
     List<Optional<UnidentifiedAccessPair>> unidentifiedAccess = Stream.of(addresses)
                                                                       .map(address -> Address.fromSerialized(address.getNumber()))
@@ -266,6 +268,7 @@ public class PushGroupSendJob extends PushSendJob implements InjectableType {
                                                                       .asExpirationUpdate(message.isExpirationUpdate())
                                                                       .withProfileKey(profileKey.orNull())
                                                                       .withQuote(quote.orNull())
+                                                                      .withSticker(sticker.orNull())
                                                                       .withSharedContacts(sharedContacts)
                                                                       .withPreviews(previews)
                                                                       .build();
diff --git a/src/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java
index 5e85d1781..e12d094c1 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java
@@ -125,7 +125,7 @@ public class PushGroupUpdateJob extends BaseJob implements InjectableType {
   }
 
   @Override
-  public boolean onShouldRetry(Exception e) {
+  public boolean onShouldRetry(@NonNull Exception e) {
     Log.w(TAG, e);
     return e instanceof PushNetworkException;
   }
diff --git a/src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java b/src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
index 95503591e..9558af26a 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
@@ -178,7 +178,7 @@ public class PushMediaSendJob extends PushSendJob implements InjectableType {
   }
 
   @Override
-  public boolean onShouldRetry(Exception exception) {
+  public boolean onShouldRetry(@NonNull Exception exception) {
     if (exception instanceof RetryLaterException) return true;
     return false;
   }
@@ -200,19 +200,22 @@ public class PushMediaSendJob extends PushSendJob implements InjectableType {
     try {
 //      rotateSenderCertificateIfNecessary();
 
-      SignalServiceAddress                     address            = getPushAddress(message.getRecipient().getAddress());
-      List<SignalServiceAttachment>            serviceAttachments = getAttachmentPointersFor(message.getAttachments());
-      Optional<byte[]>                         profileKey         = getProfileKey(message.getRecipient());
-      Optional<SignalServiceDataMessage.Quote> quote              = getQuoteFor(message);
-      List<SharedContact>                      sharedContacts     = getSharedContactsFor(message);
-      List<Preview>                            previews           = getPreviewsFor(message);
-      SignalServiceDataMessage                 mediaMessage       = SignalServiceDataMessage.newBuilder()
+      SignalServiceAddress                       address            = getPushAddress(message.getRecipient().getAddress());
+      List<Attachment>                           attachments        = Stream.of(message.getAttachments()).filterNot(Attachment::isSticker).toList();
+      List<SignalServiceAttachment>              serviceAttachments = getAttachmentPointersFor(attachments);
+      Optional<byte[]>                           profileKey         = getProfileKey(message.getRecipient());
+      Optional<SignalServiceDataMessage.Quote>   quote              = getQuoteFor(message);
+      Optional<SignalServiceDataMessage.Sticker> sticker            = getStickerFor(message);
+      List<SharedContact>                        sharedContacts     = getSharedContactsFor(message);
+      List<Preview>                              previews           = getPreviewsFor(message);
+      SignalServiceDataMessage                   mediaMessage       = SignalServiceDataMessage.newBuilder()
                                                                                             .withBody(message.getBody())
                                                                                             .withAttachments(serviceAttachments)
                                                                                             .withTimestamp(message.getSentTimeMillis())
                                                                                             .withExpiration((int)(message.getExpiresIn() / 1000))
                                                                                             .withProfileKey(profileKey.orNull())
                                                                                             .withQuote(quote.orNull())
+                                                                                            .withSticker(sticker.orNull())
                                                                                             .withSharedContacts(sharedContacts)
                                                                                             .withPreviews(previews)
                                                                                             .asExpirationUpdate(message.isExpirationUpdate())
diff --git a/src/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java b/src/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java
index fd1af3f61..dcc5c706c 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java
@@ -64,7 +64,7 @@ public class PushNotificationReceiveJob extends PushReceivedJob implements Injec
     }
   }
   @Override
-  public boolean onShouldRetry(Exception e) {
+  public boolean onShouldRetry(@NonNull Exception e) {
     Log.w(TAG, e);
     return e instanceof PushNetworkException;
   }
diff --git a/src/org/thoughtcrime/securesms/jobs/PushSendJob.java b/src/org/thoughtcrime/securesms/jobs/PushSendJob.java
index ac0ea2afc..d272f2676 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushSendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushSendJob.java
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.jobs;
 
 import android.content.Context;
+import android.graphics.Bitmap;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
@@ -30,6 +31,7 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.BitmapDecodingException;
 import org.thoughtcrime.securesms.util.BitmapUtil;
+import org.thoughtcrime.securesms.util.Hex;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
@@ -197,17 +199,21 @@ public abstract class PushSendJob extends SendJob {
     for (Attachment attachment : message.getOutgoingQuote().getAttachments()) {
       BitmapUtil.ScaleResult  thumbnailData = null;
       SignalServiceAttachment thumbnail     = null;
+      String                  thumbnailType = MediaUtil.IMAGE_JPEG;
 
       try {
         if (MediaUtil.isImageType(attachment.getContentType()) && attachment.getDataUri() != null) {
-          thumbnailData = BitmapUtil.createScaledBytes(context, new DecryptableStreamUriLoader.DecryptableUri(attachment.getDataUri()), 100, 100, 500 * 1024);
+          Bitmap.CompressFormat format = BitmapUtil.getCompressFormatForContentType(attachment.getContentType());
+
+          thumbnailData = BitmapUtil.createScaledBytes(context, new DecryptableStreamUriLoader.DecryptableUri(attachment.getDataUri()), 100, 100, 500 * 1024, format);
+          thumbnailType = attachment.getContentType();
         } else if (MediaUtil.isVideoType(attachment.getContentType()) && attachment.getThumbnailUri() != null) {
           thumbnailData = BitmapUtil.createScaledBytes(context, new DecryptableStreamUriLoader.DecryptableUri(attachment.getThumbnailUri()), 100, 100, 500 * 1024);
         }
 
         if (thumbnailData != null) {
           thumbnail = SignalServiceAttachment.newStreamBuilder()
-                                             .withContentType("image/jpeg")
+                                             .withContentType(thumbnailType)
                                              .withWidth(thumbnailData.getWidth())
                                              .withHeight(thumbnailData.getHeight())
                                              .withLength(thumbnailData.getBitmap().length)
@@ -226,6 +232,26 @@ public abstract class PushSendJob extends SendJob {
     return Optional.of(new SignalServiceDataMessage.Quote(quoteId, new SignalServiceAddress(quoteAuthor.serialize()), quoteBody, quoteAttachments));
   }
 
+  protected Optional<SignalServiceDataMessage.Sticker> getStickerFor(OutgoingMediaMessage message) {
+    Attachment stickerAttachment = Stream.of(message.getAttachments()).filter(Attachment::isSticker).findFirst().orElse(null);
+
+    if (stickerAttachment == null) {
+      return Optional.absent();
+    }
+
+    try {
+      byte[]                  packId     = Hex.fromStringCondensed(stickerAttachment.getSticker().getPackId());
+      byte[]                  packKey    = Hex.fromStringCondensed(stickerAttachment.getSticker().getPackKey());
+      int                     stickerId  = stickerAttachment.getSticker().getStickerId();
+      SignalServiceAttachment attachment = getAttachmentPointerFor(stickerAttachment);
+
+      return Optional.of(new SignalServiceDataMessage.Sticker(packId, packKey, stickerId, attachment));
+    } catch (IOException e) {
+      Log.w(TAG, "Failed to decode sticker id/key", e);
+      return Optional.absent();
+    }
+  }
+
   List<SharedContact> getSharedContactsFor(OutgoingMediaMessage mediaMessage) {
     List<SharedContact> sharedContacts = new LinkedList<>();
 
diff --git a/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java b/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java
index c1481e65b..619385bc1 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java
@@ -60,9 +60,8 @@ public class PushTextSendJob extends PushSendJob implements InjectableType {
     return new Data.Builder().putLong(KEY_MESSAGE_ID, messageId).build();
   }
 
-  @NonNull
   @Override
-  public String getFactoryKey() {
+  public @NonNull String getFactoryKey() {
     return KEY;
   }
 
@@ -134,7 +133,7 @@ public class PushTextSendJob extends PushSendJob implements InjectableType {
   }
 
   @Override
-  public boolean onShouldRetry(Exception exception) {
+  public boolean onShouldRetry(@NonNull Exception exception) {
     if (exception instanceof RetryLaterException) return true;
 
     return false;
diff --git a/src/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java b/src/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java
index 058960a8b..9ed163918 100644
--- a/src/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java
@@ -65,7 +65,7 @@ public class RefreshAttributesJob extends BaseJob implements InjectableType {
   }
 
   @Override
-  public boolean onShouldRetry(Exception e) {
+  public boolean onShouldRetry(@NonNull Exception e) {
     return e instanceof NetworkFailureException;
   }
 
diff --git a/src/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java b/src/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java
index 38532d0d5..8afc28032 100644
--- a/src/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java
@@ -95,7 +95,7 @@ public class RefreshPreKeysJob extends BaseJob implements InjectableType {
    */
 
   @Override
-  public boolean onShouldRetry(Exception exception) {
+  public boolean onShouldRetry(@NonNull Exception exception) {
     if (exception instanceof NonSuccessfulResponseCodeException) return false;
     if (exception instanceof PushNetworkException)               return true;
 
diff --git a/src/org/thoughtcrime/securesms/jobs/RefreshUnidentifiedDeliveryAbilityJob.java b/src/org/thoughtcrime/securesms/jobs/RefreshUnidentifiedDeliveryAbilityJob.java
index b3977a07c..1b6c87599 100644
--- a/src/org/thoughtcrime/securesms/jobs/RefreshUnidentifiedDeliveryAbilityJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/RefreshUnidentifiedDeliveryAbilityJob.java
@@ -68,7 +68,7 @@ public class RefreshUnidentifiedDeliveryAbilityJob extends BaseJob implements In
   }
 
   @Override
-  protected boolean onShouldRetry(Exception exception) {
+  protected boolean onShouldRetry(@NonNull Exception exception) {
     return exception instanceof PushNetworkException;
   }
 
diff --git a/src/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java b/src/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java
index e591c24f9..380aeadc9 100644
--- a/src/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java
@@ -86,7 +86,7 @@ public class RequestGroupInfoJob extends BaseJob implements InjectableType {
   }
 
   @Override
-  public boolean onShouldRetry(Exception e) {
+  public boolean onShouldRetry(@NonNull Exception e) {
     return e instanceof PushNetworkException;
   }
 
diff --git a/src/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java b/src/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java
index 443c11ea3..45f551d5a 100644
--- a/src/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java
@@ -112,7 +112,7 @@ public class RetrieveProfileAvatarJob extends BaseJob implements InjectableType
   }
 
   @Override
-  public boolean onShouldRetry(Exception e) {
+  public boolean onShouldRetry(@NonNull Exception e) {
     if (e instanceof PushNetworkException) return true;
     return false;
   }
diff --git a/src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java b/src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
index c9d7dd3c3..e7effa2eb 100644
--- a/src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
@@ -86,7 +86,7 @@ public class RetrieveProfileJob extends BaseJob implements InjectableType {
   }
 
   @Override
-  public boolean onShouldRetry(Exception e) {
+  public boolean onShouldRetry(@NonNull Exception e) {
     return false;
   }
 
diff --git a/src/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java b/src/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java
index 3a0270f80..66c94aab8 100644
--- a/src/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java
@@ -47,7 +47,7 @@ public class RotateCertificateJob extends BaseJob implements InjectableType {
   }
 
   @Override
-  public String getFactoryKey() {
+  public @NonNull String getFactoryKey() {
     return KEY;
   }
 
@@ -63,7 +63,7 @@ public class RotateCertificateJob extends BaseJob implements InjectableType {
   }
 
   @Override
-  public boolean onShouldRetry(Exception e) {
+  public boolean onShouldRetry(@NonNull Exception e) {
     return e instanceof PushNetworkException;
   }
 
diff --git a/src/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java b/src/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java
index 3124ad4d2..6f65e2107 100644
--- a/src/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java
@@ -69,7 +69,7 @@ public class RotateProfileKeyJob extends BaseJob implements InjectableType {
   }
 
   @Override
-  protected boolean onShouldRetry(Exception exception) {
+  protected boolean onShouldRetry(@NonNull Exception exception) {
     return exception instanceof PushNetworkException;
   }
 
diff --git a/src/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java b/src/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java
index 62335d9e1..363fb2c8b 100644
--- a/src/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java
@@ -67,7 +67,7 @@ public class RotateSignedPreKeyJob extends BaseJob implements InjectableType {
   }
 
   @Override
-  public boolean onShouldRetry(Exception exception) {
+  public boolean onShouldRetry(@NonNull Exception exception) {
     return exception instanceof PushNetworkException;
   }
 
diff --git a/src/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java b/src/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java
index 2fcec3404..1ffc2f7c8 100644
--- a/src/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java
@@ -90,7 +90,7 @@ public class SendDeliveryReceiptJob extends BaseJob implements InjectableType {
   }
 
   @Override
-  public boolean onShouldRetry(Exception e) {
+  public boolean onShouldRetry(@NonNull Exception e) {
     if (e instanceof PushNetworkException) return true;
     return false;
   }
diff --git a/src/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java b/src/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java
index 9328a3304..85bbe65d4 100644
--- a/src/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java
@@ -95,7 +95,7 @@ public class SendReadReceiptJob extends BaseJob implements InjectableType {
   }
 
   @Override
-  public boolean onShouldRetry(Exception e) {
+  public boolean onShouldRetry(@NonNull Exception e) {
     if (e instanceof PushNetworkException) return true;
     return false;
   }
diff --git a/src/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java b/src/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java
index 8892f1cd4..e5d912004 100644
--- a/src/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java
@@ -81,7 +81,7 @@ public class ServiceOutageDetectionJob extends BaseJob {
   }
 
   @Override
-  public boolean onShouldRetry(Exception e) {
+  public boolean onShouldRetry(@NonNull Exception e) {
     return e instanceof RetryLaterException;
   }
 
diff --git a/src/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java b/src/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java
index fceeaae38..69a6e5c12 100644
--- a/src/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java
@@ -94,7 +94,7 @@ public class SmsReceiveJob extends BaseJob {
   }
 
   @Override
-  public boolean onShouldRetry(Exception exception) {
+  public boolean onShouldRetry(@NonNull Exception exception) {
     return exception instanceof MigrationPendingException;
   }
 
diff --git a/src/org/thoughtcrime/securesms/jobs/SmsSendJob.java b/src/org/thoughtcrime/securesms/jobs/SmsSendJob.java
index 0e49d60aa..0f3357937 100644
--- a/src/org/thoughtcrime/securesms/jobs/SmsSendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/SmsSendJob.java
@@ -93,7 +93,7 @@ public class SmsSendJob extends SendJob {
   }
 
   @Override
-  public boolean onShouldRetry(Exception throwable) {
+  public boolean onShouldRetry(@NonNull Exception throwable) {
     return false;
   }
 
diff --git a/src/org/thoughtcrime/securesms/jobs/SmsSentJob.java b/src/org/thoughtcrime/securesms/jobs/SmsSentJob.java
index fa765b7c9..cadecd0b8 100644
--- a/src/org/thoughtcrime/securesms/jobs/SmsSentJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/SmsSentJob.java
@@ -78,7 +78,7 @@ public class SmsSentJob extends BaseJob {
   }
 
   @Override
-  public boolean onShouldRetry(Exception throwable) {
+  public boolean onShouldRetry(@NonNull Exception throwable) {
     return false;
   }
 
diff --git a/src/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java b/src/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java
new file mode 100644
index 000000000..b9e1bbc38
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java
@@ -0,0 +1,118 @@
+package org.thoughtcrime.securesms.jobs;
+
+import android.support.annotation.NonNull;
+
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.StickerDatabase;
+import org.thoughtcrime.securesms.database.model.IncomingSticker;
+import org.thoughtcrime.securesms.dependencies.InjectableType;
+import org.thoughtcrime.securesms.jobmanager.Data;
+import org.thoughtcrime.securesms.jobmanager.Job;
+import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.util.Hex;
+import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
+import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
+
+import java.io.InputStream;
+import java.util.concurrent.TimeUnit;
+
+import javax.inject.Inject;
+
+public class StickerDownloadJob extends BaseJob implements InjectableType {
+
+  public static final String KEY = "StickerDownloadJob";
+
+  private static final String TAG = Log.tag(StickerDownloadJob.class);
+
+  private static final String KEY_PACK_ID     = "pack_id";
+  private static final String KEY_PACK_KEY    = "pack_key";
+  private static final String KEY_PACK_TITLE  = "pack_title";
+  private static final String KEY_PACK_AUTHOR = "pack_author";
+  private static final String KEY_STICKER_ID  = "sticker_id";
+  private static final String KEY_EMOJI       = "emoji";
+  private static final String KEY_COVER       = "cover";
+  private static final String KEY_INSTALLED   = "installed";
+
+  private final IncomingSticker sticker;
+
+  @Inject SignalServiceMessageReceiver receiver;
+
+  public StickerDownloadJob(@NonNull IncomingSticker sticker) {
+    this(new Job.Parameters.Builder()
+                           .addConstraint(NetworkConstraint.KEY)
+                           .setLifespan(TimeUnit.DAYS.toMillis(1))
+                           .build(),
+        sticker);
+  }
+
+  private StickerDownloadJob(@NonNull Job.Parameters parameters, @NonNull IncomingSticker sticker) {
+    super(parameters);
+    this.sticker = sticker;
+  }
+
+  @Override
+  protected void onRun() throws Exception {
+    StickerDatabase db = DatabaseFactory.getStickerDatabase(context);
+
+    if (db.getSticker(sticker.getPackId(), sticker.getStickerId(), sticker.isCover()) != null) {
+      Log.w(TAG, "Sticker already downloaded.");
+      return;
+    }
+
+    if (!db.isPackInstalled(sticker.getPackId()) && !sticker.isCover()) {
+      Log.w(TAG, "Pack is no longer installed.");
+      return;
+    }
+
+    byte[]      packIdBytes  = Hex.fromStringCondensed(sticker.getPackId());
+    byte[]      packKeyBytes = Hex.fromStringCondensed(sticker.getPackKey());
+    InputStream stream       = receiver.retrieveSticker(packIdBytes, packKeyBytes, sticker.getStickerId());
+
+    db.insertSticker(sticker, stream);
+  }
+
+  @Override
+  protected boolean onShouldRetry(@NonNull Exception e) {
+    return e instanceof PushNetworkException;
+  }
+
+  @Override
+  public @NonNull Data serialize() {
+    return new Data.Builder().putString(KEY_PACK_ID, sticker.getPackId())
+                             .putString(KEY_PACK_KEY, sticker.getPackKey())
+                             .putString(KEY_PACK_TITLE, sticker.getPackTitle())
+                             .putString(KEY_PACK_AUTHOR, sticker.getPackAuthor())
+                             .putInt(KEY_STICKER_ID, sticker.getStickerId())
+                             .putString(KEY_EMOJI, sticker.getEmoji())
+                             .putBoolean(KEY_COVER, sticker.isCover())
+                             .putBoolean(KEY_INSTALLED, sticker.isInstalled())
+                             .build();
+  }
+
+  @Override
+  public @NonNull String getFactoryKey() {
+    return KEY;
+  }
+
+  @Override
+  public void onCanceled() {
+    Log.w(TAG, "Failed to download sticker!");
+  }
+
+  public static final class Factory implements Job.Factory<StickerDownloadJob> {
+    @Override
+    public @NonNull StickerDownloadJob create(@NonNull Parameters parameters, @NonNull Data data) {
+      IncomingSticker sticker = new IncomingSticker(data.getString(KEY_PACK_ID),
+                                                    data.getString(KEY_PACK_KEY),
+                                                    data.getString(KEY_PACK_TITLE),
+                                                    data.getString(KEY_PACK_AUTHOR),
+                                                    data.getInt(KEY_STICKER_ID),
+                                                    data.getString(KEY_EMOJI),
+                                                    data.getBoolean(KEY_COVER),
+                                                    data.getBoolean(KEY_INSTALLED));
+
+      return new StickerDownloadJob(parameters, sticker);
+    }
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java b/src/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java
new file mode 100644
index 000000000..6e7b6d703
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java
@@ -0,0 +1,160 @@
+package org.thoughtcrime.securesms.jobs;
+
+import android.support.annotation.NonNull;
+
+import org.thoughtcrime.securesms.ApplicationContext;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.StickerDatabase;
+import org.thoughtcrime.securesms.database.model.IncomingSticker;
+import org.thoughtcrime.securesms.dependencies.InjectableType;
+import org.thoughtcrime.securesms.jobmanager.Data;
+import org.thoughtcrime.securesms.jobmanager.Job;
+import org.thoughtcrime.securesms.jobmanager.JobManager;
+import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.util.Hex;
+import org.whispersystems.libsignal.InvalidMessageException;
+import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
+import org.whispersystems.signalservice.api.messages.SignalServiceStickerManifest;
+import org.whispersystems.signalservice.api.messages.SignalServiceStickerManifest.StickerInfo;
+import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import javax.inject.Inject;
+
+public class StickerPackDownloadJob extends BaseJob implements InjectableType {
+
+  public static final String KEY = "StickerPackDownloadJob";
+
+  private static final String TAG = Log.tag(StickerPackDownloadJob.class);
+
+  private static final String KEY_PACK_ID        = "pack_key";
+  private static final String KEY_PACK_KEY       = "pack_id";
+  private static final String KEY_REFERENCE_PACK = "reference_pack";
+
+  private final String  packId;
+  private final String  packKey;
+  private final boolean isReferencePack;
+
+  @Inject SignalServiceMessageReceiver receiver;
+
+  public StickerPackDownloadJob(@NonNull String packId, @NonNull String packKey, boolean isReferencePack)
+  {
+    this(new Parameters.Builder()
+                           .addConstraint(NetworkConstraint.KEY)
+                           .setLifespan(TimeUnit.DAYS.toMillis(1))
+                           .setQueue("StickerPackDownloadJob_" + packKey)
+                           .build(),
+        packId,
+        packKey,
+        isReferencePack);
+  }
+
+  private StickerPackDownloadJob(@NonNull Parameters parameters,
+                                 @NonNull String packId,
+                                 @NonNull String packKey,
+                                 boolean isReferencePack)
+  {
+    super(parameters);
+    this.packId          = packId;
+    this.packKey         = packKey;
+    this.isReferencePack = isReferencePack;
+  }
+
+  @Override
+  protected void onRun() throws IOException, InvalidMessageException {
+    if (isReferencePack && !DatabaseFactory.getAttachmentDatabase(context).containsStickerPackId(packId)) {
+      Log.w(TAG, "There are no attachments with the requested packId present for this reference pack. Skipping.");
+      return;
+    }
+
+    if (isReferencePack && DatabaseFactory.getStickerDatabase(context).isPackAvailableAsReference(packId)) {
+      Log.i(TAG, "Sticker pack already available for reference. Skipping.");
+      return;
+    }
+
+    JobManager                   jobManager      = ApplicationContext.getInstance(context).getJobManager();
+    StickerDatabase              stickerDatabase = DatabaseFactory.getStickerDatabase(context);
+    byte[]                       packIdBytes     = Hex.fromStringCondensed(packId);
+    byte[]                       packKeyBytes    = Hex.fromStringCondensed(packKey);
+    SignalServiceStickerManifest manifest        = receiver.retrieveStickerManifest(packIdBytes, packKeyBytes);
+
+    if (manifest.getStickers().isEmpty()) {
+      Log.w(TAG, "No stickers in  pack!");
+      return;
+    }
+
+    if (!isReferencePack && stickerDatabase.isPackAvailableAsReference(packId)) {
+      stickerDatabase.markPackAsInstalled(packId);
+    }
+
+    StickerInfo      cover = manifest.getCover().or(manifest.getStickers().get(0));
+    JobManager.Chain chain = jobManager.startChain(new StickerDownloadJob(new IncomingSticker(packId,
+                                                                                              packKey,
+                                                                                              manifest.getTitle().or(""),
+                                                                                              manifest.getAuthor().or(""),
+                                                                                              cover.getId(),
+                                                                                              "",
+                                                                                              true,
+                                                                                              !isReferencePack)));
+
+
+
+    if (!isReferencePack) {
+      List<Job> jobs = new ArrayList<>(manifest.getStickers().size());
+
+      for (StickerInfo stickerInfo : manifest.getStickers()) {
+        jobs.add(new StickerDownloadJob(new IncomingSticker(packId,
+                                                            packKey,
+                                                            manifest.getTitle().or(""),
+                                                            manifest.getAuthor().or(""),
+                                                            stickerInfo.getId(),
+                                                            stickerInfo.getEmoji(),
+                                                            false,
+                                                            true)));
+      }
+
+      chain.then(jobs);
+    }
+
+    chain.enqueue();
+  }
+
+  @Override
+  protected boolean onShouldRetry(@NonNull Exception e) {
+    return e instanceof PushNetworkException;
+  }
+
+  @Override
+  public @NonNull Data serialize() {
+    return new Data.Builder().putString(KEY_PACK_ID, packId)
+                             .putString(KEY_PACK_KEY, packKey)
+                             .putBoolean(KEY_REFERENCE_PACK, isReferencePack)
+                             .build();
+  }
+
+  @Override
+  public @NonNull String getFactoryKey() {
+    return KEY;
+  }
+
+  @Override
+  public void onCanceled() {
+    Log.w(TAG, "Failed to download manifest with pack_id: " + packId);
+  }
+
+  public static final class Factory implements Job.Factory<StickerPackDownloadJob> {
+    @Override
+    public @NonNull
+    StickerPackDownloadJob create(@NonNull Parameters parameters, @NonNull Data data) {
+      return new StickerPackDownloadJob(parameters,
+                                            data.getString(KEY_PACK_ID),
+                                            data.getString(KEY_PACK_KEY),
+                                            data.getBoolean(KEY_REFERENCE_PACK));
+    }
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/jobs/TrimThreadJob.java b/src/org/thoughtcrime/securesms/jobs/TrimThreadJob.java
index 818cbac63..95be3090b 100644
--- a/src/org/thoughtcrime/securesms/jobs/TrimThreadJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/TrimThreadJob.java
@@ -65,7 +65,7 @@ public class TrimThreadJob extends BaseJob {
   }
 
   @Override
-  public boolean onShouldRetry(Exception exception) {
+  public boolean onShouldRetry(@NonNull Exception exception) {
     return false;
   }
 
diff --git a/src/org/thoughtcrime/securesms/jobs/TypingSendJob.java b/src/org/thoughtcrime/securesms/jobs/TypingSendJob.java
index 728a5b6ad..a803671e5 100644
--- a/src/org/thoughtcrime/securesms/jobs/TypingSendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/TypingSendJob.java
@@ -105,7 +105,7 @@ public class TypingSendJob extends BaseJob implements InjectableType {
   }
 
   @Override
-  protected boolean onShouldRetry(Exception exception) {
+  protected boolean onShouldRetry(@NonNull Exception exception) {
     return false;
   }
 
diff --git a/src/org/thoughtcrime/securesms/jobs/UpdateApkJob.java b/src/org/thoughtcrime/securesms/jobs/UpdateApkJob.java
index 0c592bb59..f67381d56 100644
--- a/src/org/thoughtcrime/securesms/jobs/UpdateApkJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/UpdateApkJob.java
@@ -97,7 +97,7 @@ public class UpdateApkJob extends BaseJob {
   }
 
   @Override
-  public boolean onShouldRetry(Exception e) {
+  public boolean onShouldRetry(@NonNull Exception e) {
     return e instanceof  IOException;
   }
 
@@ -229,7 +229,7 @@ public class UpdateApkJob extends BaseJob {
       return url;
     }
 
-    public String toString() {
+    public @NonNull String toString() {
       return "["  + versionCode + ", " + versionName + ", " + url + "]";
     }
 
diff --git a/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewDomains.java b/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewDomains.java
index 95eaaeb9e..6e99f84ac 100644
--- a/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewDomains.java
+++ b/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewDomains.java
@@ -5,6 +5,8 @@ import java.util.HashSet;
 import java.util.Set;
 
 public class LinkPreviewDomains {
+  public static final String STICKERS = "signal.org";
+
   public static final Set<String> LINKS = new HashSet<>(Arrays.asList(
       "youtube.com",
       "www.youtube.com",
diff --git a/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java b/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java
index bda1461a4..1e9fff7f6 100644
--- a/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java
+++ b/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java
@@ -10,9 +10,11 @@ import android.text.TextUtils;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.FutureTarget;
 
+import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.attachments.UriAttachment;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
+import org.thoughtcrime.securesms.dependencies.InjectableType;
 import org.thoughtcrime.securesms.giph.model.ChunkedImageUrl;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.GlideApp;
@@ -22,9 +24,17 @@ import org.thoughtcrime.securesms.net.ContentProxySafetyInterceptor;
 import org.thoughtcrime.securesms.net.ContentProxySelector;
 import org.thoughtcrime.securesms.net.RequestController;
 import org.thoughtcrime.securesms.providers.BlobProvider;
+import org.thoughtcrime.securesms.stickers.StickerRemoteUri;
+import org.thoughtcrime.securesms.stickers.StickerUrl;
+import org.thoughtcrime.securesms.util.Hex;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
+import org.whispersystems.libsignal.InvalidMessageException;
+import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.libsignal.util.guava.Optional;
+import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
+import org.whispersystems.signalservice.api.messages.SignalServiceStickerManifest;
+import org.whispersystems.signalservice.api.messages.SignalServiceStickerManifest.StickerInfo;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -33,13 +43,15 @@ import java.util.concurrent.ExecutionException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.inject.Inject;
+
 import okhttp3.CacheControl;
 import okhttp3.Call;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 
-public class LinkPreviewRepository {
+public class LinkPreviewRepository implements InjectableType {
 
   private static final String TAG = LinkPreviewRepository.class.getSimpleName();
 
@@ -47,12 +59,16 @@ public class LinkPreviewRepository {
 
   private final OkHttpClient client;
 
-  public LinkPreviewRepository() {
+  @Inject SignalServiceMessageReceiver messageReceiver;
+
+  public LinkPreviewRepository(@NonNull Context context) {
     this.client = new OkHttpClient.Builder()
                                   .proxySelector(new ContentProxySelector())
                                   .addNetworkInterceptor(new ContentProxySafetyInterceptor())
                                   .cache(null)
                                   .build();
+
+    ApplicationContext.getInstance(context).injectDependencies(this);
   }
 
   RequestController getLinkPreview(@NonNull Context context, @NonNull String url, @NonNull Callback<Optional<LinkPreview>> callback) {
@@ -64,27 +80,33 @@ public class LinkPreviewRepository {
       return compositeController;
     }
 
-    RequestController metadataController = fetchMetadata(url, metadata -> {
-      if (metadata.isEmpty()) {
-        callback.onComplete(Optional.absent());
-        return;
-      }
+    RequestController metadataController;
 
-      if (!metadata.getImageUrl().isPresent()) {
-        callback.onComplete(Optional.of(new LinkPreview(url, metadata.getTitle().get(), Optional.absent())));
-        return;
-      }
-
-      RequestController imageController = fetchThumbnail(context, metadata.getImageUrl().get(), attachment -> {
-        if (!metadata.getTitle().isPresent() && !attachment.isPresent()) {
+    if (StickerUrl.isValidShareLink(url)) {
+      metadataController = fetchStickerPackLinkPreview(context, url, callback);
+    } else {
+      metadataController = fetchMetadata(url, metadata -> {
+        if (metadata.isEmpty()) {
           callback.onComplete(Optional.absent());
-        } else {
-          callback.onComplete(Optional.of(new LinkPreview(url, metadata.getTitle().or(""), attachment)));
+          return;
         }
-      });
 
-      compositeController.addController(imageController);
-    });
+        if (!metadata.getImageUrl().isPresent()) {
+          callback.onComplete(Optional.of(new LinkPreview(url, metadata.getTitle().get(), Optional.absent())));
+          return;
+        }
+
+        RequestController imageController = fetchThumbnail(context, metadata.getImageUrl().get(), attachment -> {
+          if (!metadata.getTitle().isPresent() && !attachment.isPresent()) {
+            callback.onComplete(Optional.absent());
+          } else {
+            callback.onComplete(Optional.of(new LinkPreview(url, metadata.getTitle().or(""), attachment)));
+          }
+        });
+
+        compositeController.addController(imageController);
+      });
+    }
 
     compositeController.addController(metadataController);
     return compositeController;
@@ -95,13 +117,13 @@ public class LinkPreviewRepository {
 
     call.enqueue(new okhttp3.Callback() {
       @Override
-      public void onFailure(Call call, IOException e) {
+      public void onFailure(@NonNull Call call, @NonNull IOException e) {
         Log.w(TAG, "Request failed.", e);
         callback.onComplete(Metadata.empty());
       }
 
       @Override
-      public void onResponse(Call call, Response response) throws IOException {
+      public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException {
         if (!response.isSuccessful()) {
           Log.w(TAG, "Non-successful response. Code: " + response.code());
           callback.onComplete(Metadata.empty());
@@ -138,7 +160,7 @@ public class LinkPreviewRepository {
 
     RequestController controller = () -> bitmapFuture.cancel(false);
 
-    SignalExecutors.IO.execute(() -> {
+    SignalExecutors.UNBOUNDED.execute(() -> {
       try {
         Bitmap                bitmap = bitmapFuture.get();
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -158,6 +180,7 @@ public class LinkPreviewRepository {
                                                                        null,
                                                                        false,
                                                                        false,
+                                                                       null,
                                                                        null));
 
         callback.onComplete(thumbnail);
@@ -184,6 +207,66 @@ public class LinkPreviewRepository {
     return Optional.absent();
   }
 
+  private RequestController fetchStickerPackLinkPreview(@NonNull Context context,
+                                                        @NonNull String packUrl,
+                                                        @NonNull Callback<Optional<LinkPreview>> callback)
+  {
+    SignalExecutors.UNBOUNDED.execute(() -> {
+      try {
+        Pair<String, String> stickerParams = StickerUrl.parseShareLink(packUrl).or(new Pair<>("", ""));
+        String               packIdString  = stickerParams.first();
+        String               packKeyString = stickerParams.second();
+        byte[]               packIdBytes   = Hex.fromStringCondensed(packIdString);
+        byte[]               packKeyBytes  = Hex.fromStringCondensed(packKeyString);
+
+        SignalServiceStickerManifest manifest = messageReceiver.retrieveStickerManifest(packIdBytes, packKeyBytes);
+
+        String                title        = manifest.getTitle().or(manifest.getAuthor()).or("");
+        Optional<StickerInfo> firstSticker = Optional.fromNullable(manifest.getStickers().size() > 0 ? manifest.getStickers().get(0) : null);
+        Optional<StickerInfo> cover        = manifest.getCover().or(firstSticker);
+
+        if (cover.isPresent()) {
+          Bitmap bitmap = GlideApp.with(context).asBitmap()
+                                                .load(new StickerRemoteUri(packIdString, packKeyString, cover.get().getId()))
+                                                .skipMemoryCache(true)
+                                                .diskCacheStrategy(DiskCacheStrategy.NONE)
+                                                .centerInside()
+                                                .submit(512, 512)
+                                                .get();
+
+          ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+          bitmap.compress(Bitmap.CompressFormat.WEBP, 80, baos);
+
+          byte[]               bytes     = baos.toByteArray();
+          Uri                  uri       = BlobProvider.getInstance().forData(bytes).createForSingleSessionInMemory();
+          Optional<Attachment> thumbnail = Optional.of(new UriAttachment(uri,
+                                                       uri,
+                                                       MediaUtil.IMAGE_WEBP,
+                                                       AttachmentDatabase.TRANSFER_PROGRESS_STARTED,
+                                                       bytes.length,
+                                                       bitmap.getWidth(),
+                                                       bitmap.getHeight(),
+                                                       null,
+                                                       null,
+                                                       false,
+                                                       false,
+                                                       null,
+                                                       null));
+
+          callback.onComplete(Optional.of(new LinkPreview(packUrl, title, thumbnail)));
+        } else {
+          callback.onComplete(Optional.absent());
+        }
+      } catch (IOException | InvalidMessageException | ExecutionException | InterruptedException e) {
+        Log.w(TAG, "Failed to fetch sticker pack link preview.");
+        callback.onComplete(Optional.absent());
+      }
+    });
+
+    return () -> Log.i(TAG, "Cancelled sticker pack link preview fetch -- no effect.");
+  }
+
   private static class Metadata {
     private final Optional<String> title;
     private final Optional<String> imageUrl;
diff --git a/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java b/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java
index 81697c7cd..9eab5a1e0 100644
--- a/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java
+++ b/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java
@@ -9,6 +9,8 @@ import android.text.util.Linkify;
 
 import com.annimon.stream.Stream;
 
+import org.thoughtcrime.securesms.stickers.StickerUrl;
+
 import java.util.Collections;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -21,6 +23,7 @@ public final class LinkPreviewUtil {
   private static final Pattern DOMAIN_PATTERN        = Pattern.compile("^(https?://)?([^/]+).*$");
   private static final Pattern ALL_ASCII_PATTERN     = Pattern.compile("^[\\x00-\\x7F]*$");
   private static final Pattern ALL_NON_ASCII_PATTERN = Pattern.compile("^[^\\x00-\\x7F]*$");
+  private static final Pattern STICKER_URL_PATTERN   = Pattern.compile("^.*#pack_id=(.*)&pack_key=(.*)$");
 
   /**
    * @return All whitelisted URLs in the source text.
@@ -43,7 +46,8 @@ public final class LinkPreviewUtil {
    * @return True if the host is present in the link whitelist.
    */
   public static boolean isWhitelistedLinkUrl(@Nullable String linkUrl) {
-    if (linkUrl == null) return false;
+    if (linkUrl == null)                      return false;
+    if (StickerUrl.isValidShareLink(linkUrl)) return true;
 
     HttpUrl url = HttpUrl.parse(linkUrl);
     return url != null                                   &&
diff --git a/src/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java b/src/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java
index 452b5f56d..ae8408e24 100644
--- a/src/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java
+++ b/src/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java
@@ -72,7 +72,7 @@ public class RegistrationLockDialog {
 
     ClickableSpan clickableSpan = new ClickableSpan() {
       @Override
-      public void onClick(View widget) {
+      public void onClick(@NonNull View widget) {
         dialog.dismiss();
         new AlertDialog.Builder(context).setTitle(R.string.RegistrationLockDialog_forgotten_pin)
                                         .setMessage(R.string.RegistrationLockDialog_registration_lock_helps_protect_your_phone_number_from_unauthorized_registration_attempts)
diff --git a/src/org/thoughtcrime/securesms/logsubmit/ShareIntentListAdapter.java b/src/org/thoughtcrime/securesms/logsubmit/ShareIntentListAdapter.java
index 79dedc8c8..ef008c3db 100644
--- a/src/org/thoughtcrime/securesms/logsubmit/ShareIntentListAdapter.java
+++ b/src/org/thoughtcrime/securesms/logsubmit/ShareIntentListAdapter.java
@@ -23,6 +23,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.ResolveInfo;
+import android.support.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -49,7 +50,7 @@ public class ShareIntentListAdapter extends ArrayAdapter<ResolveInfo> {
   }
 
   @Override
-  public View getView(int position, View convertView, ViewGroup parent) {
+  public @NonNull View getView(int position, View convertView, @NonNull ViewGroup parent) {
     LayoutInflater  inflater    = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
     View            rowView     = inflater.inflate(R.layout.share_intent_row, parent, false);
     ImageView       intentImage = (ImageView) rowView.findViewById(R.id.share_intent_image);
diff --git a/src/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java b/src/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java
index 1dfdec23c..2b591de79 100644
--- a/src/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java
+++ b/src/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java
@@ -139,14 +139,14 @@ public class SubmitLogFragment extends Fragment {
   }
 
   @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup container,
+  public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                            Bundle savedInstanceState) {
     // Inflate the layout for this fragment
     return inflater.inflate(R.layout.fragment_submit_log, container, false);
   }
 
   @Override
-  public void onViewCreated(View view, Bundle savedInstanceState) {
+  public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
     super.onViewCreated(view, savedInstanceState);
     initializeResources();
   }
@@ -199,7 +199,7 @@ public class SubmitLogFragment extends Fragment {
 
     logPreview.addOnScrollListener(new RecyclerView.OnScrollListener() {
       @Override
-      public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+      public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
         if (((LinearLayoutManager) recyclerView.getLayoutManager()).findLastVisibleItemPosition() < logPreviewAdapter.getItemCount() - 10) {
           scrollButton.setVisibility(View.VISIBLE);
         } else {
@@ -506,7 +506,9 @@ public class SubmitLogFragment extends Fragment {
       builder.append(pm.getApplicationLabel(pm.getApplicationInfo(context.getPackageName(), 0)))
              .append(" ")
              .append(pm.getPackageInfo(context.getPackageName(), 0).versionName)
-             .append("\n");
+             .append(" (")
+             .append(Util.getManifestApkVersion(context))
+             .append(")\n");
     } catch (PackageManager.NameNotFoundException nnfe) {
       builder.append("Unknown\n");
     }
diff --git a/src/org/thoughtcrime/securesms/loki/FriendRequestView.kt b/src/org/thoughtcrime/securesms/loki/FriendRequestView.kt
index 5d72e7911..8db494bd3 100644
--- a/src/org/thoughtcrime/securesms/loki/FriendRequestView.kt
+++ b/src/org/thoughtcrime/securesms/loki/FriendRequestView.kt
@@ -112,7 +112,7 @@ class FriendRequestView(context: Context, attrs: AttributeSet?, defStyleAttr: In
         if (message is MediaMmsMessageRecord && message.quote != null) { visibility = View.GONE; return }
         val isTextMessage = message is SmsMessageRecord
         if (!isTextMessage) return
-        val friendRequestStatus = database.getFriendRequestStatus(message!!.id)
+        val friendRequestStatus = database.getFriendRequestStatus(message.id)
         if (!message.isOutgoing) {
             visibility = if (friendRequestStatus == LokiMessageFriendRequestStatus.NONE) View.GONE else View.VISIBLE
             buttonLinearLayout.visibility = if (friendRequestStatus != LokiMessageFriendRequestStatus.REQUEST_PENDING) View.GONE else View.VISIBLE
diff --git a/src/org/thoughtcrime/securesms/loki/LokiThreadDatabase.kt b/src/org/thoughtcrime/securesms/loki/LokiThreadDatabase.kt
index 38f52a3f6..b291bdad1 100644
--- a/src/org/thoughtcrime/securesms/loki/LokiThreadDatabase.kt
+++ b/src/org/thoughtcrime/securesms/loki/LokiThreadDatabase.kt
@@ -24,8 +24,8 @@ class LokiThreadDatabase(context: Context, helper: SQLCipherOpenHelper) : Databa
         @JvmStatic val createSessionResetTableCommand = "CREATE TABLE $sessionResetTableName ($threadID INTEGER PRIMARY KEY, $sessionResetStatus INTEGER DEFAULT 0);"
     }
 
-    override fun getThreadID(hexEncodePubKey: String): Long {
-        val address = Address.fromSerialized(hexEncodePubKey)
+    override fun getThreadID(hexEncodedPublicKey: String): Long {
+        val address = Address.fromSerialized(hexEncodedPublicKey)
         val recipient = Recipient.from(context, address, false)
         return DatabaseFactory.getThreadDatabase(context).getThreadIdFor(recipient)
     }
diff --git a/src/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java b/src/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java
index a39faaf79..2b296eca1 100644
--- a/src/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java
+++ b/src/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java
@@ -1,11 +1,8 @@
 package org.thoughtcrime.securesms.longmessage;
 
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
 import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.support.annotation.NonNull;
 import android.support.annotation.WorkerThread;
 
@@ -18,6 +15,7 @@ import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.mms.TextSlide;
 import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
 import org.whispersystems.libsignal.util.guava.Optional;
 
 import java.io.IOException;
@@ -36,7 +34,7 @@ class LongMessageRepository {
   }
 
   void getMessage(@NonNull Context context, long messageId, boolean isMms, @NonNull Callback<Optional<LongMessage>> callback) {
-    AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
+    SignalExecutors.BOUNDED.execute(() -> {
       if (isMms) {
         callback.onComplete(getMmsLongMessage(context, mmsDatabase, messageId));
       } else {
diff --git a/src/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java b/src/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java
index 681874c0e..fc5f6c247 100644
--- a/src/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java
+++ b/src/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java
@@ -7,6 +7,7 @@ import android.arch.lifecycle.ViewModel;
 import android.arch.lifecycle.ViewModelProvider;
 
 import android.database.ContentObserver;
+import android.net.Uri;
 import android.os.Handler;
 import android.support.annotation.NonNull;
 
@@ -30,15 +31,18 @@ class LongMessageViewModel extends ViewModel {
     this.isMms           = isMms;
     this.message         = new MutableLiveData<>();
     this.messageObserver = new MessageObserver(new Handler());
+
+    repository.getMessage(application, messageId, isMms, longMessage -> {
+      if (longMessage.isPresent()) {
+        Uri uri = DatabaseContentProviders.Conversation.getUriForThread(longMessage.get().getMessageRecord().getThreadId());
+        application.getContentResolver().registerContentObserver(uri, true, messageObserver);
+      }
+
+      message.postValue(longMessage);
+    });
   }
 
   LiveData<Optional<LongMessage>> getMessage() {
-    repository.getMessage(application, messageId, isMms, longMessage -> {
-      if (longMessage.isPresent()) {
-        application.getContentResolver().registerContentObserver(DatabaseContentProviders.Conversation.getUriForThread(longMessage.get().getMessageRecord().getThreadId()), true, messageObserver);
-      }
-      message.postValue(longMessage);
-    });
     return message;
   }
 
@@ -54,7 +58,7 @@ class LongMessageViewModel extends ViewModel {
 
     @Override
     public void onChange(boolean selfChange) {
-      getMessage();
+      repository.getMessage(application, messageId, isMms, message::postValue);
     }
   }
 
diff --git a/src/org/thoughtcrime/securesms/mediasend/Camera1Controller.java b/src/org/thoughtcrime/securesms/mediasend/Camera1Controller.java
index ba6530e91..1bc0da102 100644
--- a/src/org/thoughtcrime/securesms/mediasend/Camera1Controller.java
+++ b/src/org/thoughtcrime/securesms/mediasend/Camera1Controller.java
@@ -243,7 +243,7 @@ class Camera1Controller {
     }
 
     @Override
-    public String toString() {
+    public @NonNull String toString() {
       return "cameraCount: " + cameraCount + "  previewWidth: " + previewWidth + "  previewHeight: " + previewHeight;
     }
   }
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
index 62f5ef768..6c26338b9 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
@@ -28,17 +28,18 @@ import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
 import android.widget.TextView;
 
-import org.thoughtcrime.securesms.imageeditor.model.EditorModel;
 import network.loki.messenger.R;
 import org.thoughtcrime.securesms.TransportOption;
 import org.thoughtcrime.securesms.components.ComposeText;
 import org.thoughtcrime.securesms.components.ControllableViewPager;
 import org.thoughtcrime.securesms.components.InputAwareLayout;
 import org.thoughtcrime.securesms.components.SendButton;
-import org.thoughtcrime.securesms.components.emoji.EmojiDrawer;
 import org.thoughtcrime.securesms.components.emoji.EmojiEditText;
+import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider;
 import org.thoughtcrime.securesms.components.emoji.EmojiToggle;
+import org.thoughtcrime.securesms.components.emoji.MediaKeyboard;
 import org.thoughtcrime.securesms.contactshare.SimpleTextWatcher;
+import org.thoughtcrime.securesms.imageeditor.model.EditorModel;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mediapreview.MediaRailAdapter;
 import org.thoughtcrime.securesms.mms.GlideApp;
@@ -87,7 +88,7 @@ public class MediaSendFragment extends Fragment implements ViewTreeObserver.OnGl
   private ViewGroup         composeContainer;
   private EmojiEditText     captionText;
   private EmojiToggle       emojiToggle;
-  private Stub<EmojiDrawer> emojiDrawer;
+  private Stub<MediaKeyboard> emojiDrawer;
   private ViewGroup         playbackControlsContainer;
   private TextView          charactersLeft;
 
@@ -401,8 +402,7 @@ public class MediaSendFragment extends Fragment implements ViewTreeObserver.OnGl
 
   private void onEmojiToggleClicked(View v) {
     if (!emojiDrawer.resolved()) {
-      emojiToggle.attach(emojiDrawer.get());
-      emojiDrawer.get().setEmojiEventListener(new EmojiDrawer.EmojiEventListener() {
+      emojiDrawer.get().setProviders(0, new EmojiKeyboardProvider(requireContext(), new EmojiKeyboardProvider.EmojiEventListener() {
         @Override
         public void onKeyEvent(KeyEvent keyEvent) {
           getActiveInputField().dispatchKeyEvent(keyEvent);
@@ -412,7 +412,8 @@ public class MediaSendFragment extends Fragment implements ViewTreeObserver.OnGl
         public void onEmojiSelected(String emoji) {
           getActiveInputField().insertEmoji(emoji);
         }
-      });
+      }));
+      emojiToggle.attach(emojiDrawer.get());
     }
 
     if (hud.getCurrentInput() == emojiDrawer.get()) {
diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java b/src/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java
index 53056eef3..b033f70a4 100644
--- a/src/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java
+++ b/src/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java
@@ -1,12 +1,12 @@
 package org.thoughtcrime.securesms.mms;
 
 import android.support.annotation.NonNull;
-import org.thoughtcrime.securesms.logging.Log;
 
 import com.bumptech.glide.Priority;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.data.DataFetcher;
 
+import org.thoughtcrime.securesms.logging.Log;
 import org.whispersystems.libsignal.InvalidMessageException;
 import org.whispersystems.libsignal.util.guava.Optional;
 import org.whispersystems.signalservice.api.crypto.AttachmentCipherInputStream;
@@ -34,7 +34,7 @@ class AttachmentStreamLocalUriFetcher implements DataFetcher<InputStream> {
   }
 
   @Override
-  public void loadData(Priority priority, DataCallback<? super InputStream> callback) {
+  public void loadData(@NonNull Priority priority, @NonNull DataCallback<? super InputStream> callback) {
     try {
       if (!digest.isPresent()) throw new InvalidMessageException("No attachment digest!");
       is = AttachmentCipherInputStream.createForAttachment(attachment, plaintextLength, key, digest.get());
@@ -57,15 +57,13 @@ class AttachmentStreamLocalUriFetcher implements DataFetcher<InputStream> {
   @Override
   public void cancel() {}
 
-  @NonNull
   @Override
-  public Class<InputStream> getDataClass() {
+  public @NonNull Class<InputStream> getDataClass() {
     return InputStream.class;
   }
 
-  @NonNull
   @Override
-  public DataSource getDataSource() {
+  public @NonNull DataSource getDataSource() {
     return DataSource.LOCAL;
   }
 
diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java b/src/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java
index 4005936b3..d98c68c00 100644
--- a/src/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java
+++ b/src/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java
@@ -18,21 +18,20 @@ import java.security.MessageDigest;
 
 public class AttachmentStreamUriLoader implements ModelLoader<AttachmentModel, InputStream> {
 
-  @Nullable
   @Override
-  public LoadData<InputStream> buildLoadData(AttachmentModel attachmentModel, int width, int height, Options options) {
+  public @Nullable LoadData<InputStream> buildLoadData(@NonNull AttachmentModel attachmentModel, int width, int height, @NonNull Options options) {
     return new LoadData<>(attachmentModel, new AttachmentStreamLocalUriFetcher(attachmentModel.attachment, attachmentModel.plaintextLength, attachmentModel.key, attachmentModel.digest));
   }
 
   @Override
-  public boolean handles(AttachmentModel attachmentModel) {
+  public boolean handles(@NonNull AttachmentModel attachmentModel) {
     return true;
   }
 
   static class Factory implements ModelLoaderFactory<AttachmentModel, InputStream> {
 
     @Override
-    public ModelLoader<AttachmentModel, InputStream> build(MultiModelLoaderFactory multiFactory) {
+    public @NonNull ModelLoader<AttachmentModel, InputStream> build(@NonNull MultiModelLoaderFactory multiFactory) {
       return new AttachmentStreamUriLoader();
     }
 
@@ -58,7 +57,7 @@ public class AttachmentStreamUriLoader implements ModelLoader<AttachmentModel, I
     }
 
     @Override
-    public void updateDiskCacheKey(MessageDigest messageDigest) {
+    public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
       messageDigest.update(attachment.toString().getBytes());
     }
 
diff --git a/src/org/thoughtcrime/securesms/mms/AudioSlide.java b/src/org/thoughtcrime/securesms/mms/AudioSlide.java
index d5ab390d5..fb6e9a1ea 100644
--- a/src/org/thoughtcrime/securesms/mms/AudioSlide.java
+++ b/src/org/thoughtcrime/securesms/mms/AudioSlide.java
@@ -34,11 +34,11 @@ import org.thoughtcrime.securesms.util.ResUtil;
 public class AudioSlide extends Slide {
 
   public AudioSlide(Context context, Uri uri, long dataSize, boolean voiceNote) {
-    super(context, constructAttachmentFromUri(context, uri, MediaUtil.AUDIO_UNSPECIFIED, dataSize, 0, 0, false, null, null, voiceNote, false));
+    super(context, constructAttachmentFromUri(context, uri, MediaUtil.AUDIO_UNSPECIFIED, dataSize, 0, 0, false, null, null, null, voiceNote, false));
   }
 
   public AudioSlide(Context context, Uri uri, long dataSize, String contentType, boolean voiceNote) {
-    super(context,  new UriAttachment(uri, null, contentType, AttachmentDatabase.TRANSFER_PROGRESS_STARTED, dataSize, 0, 0, null, null, voiceNote, false, null));
+    super(context,  new UriAttachment(uri, null, contentType, AttachmentDatabase.TRANSFER_PROGRESS_STARTED, dataSize, 0, 0, null, null, voiceNote, false, null, null));
   }
 
   public AudioSlide(Context context, Attachment attachment) {
diff --git a/src/org/thoughtcrime/securesms/mms/DocumentSlide.java b/src/org/thoughtcrime/securesms/mms/DocumentSlide.java
index 25e72cfd0..33e6e6fb4 100644
--- a/src/org/thoughtcrime/securesms/mms/DocumentSlide.java
+++ b/src/org/thoughtcrime/securesms/mms/DocumentSlide.java
@@ -19,7 +19,7 @@ public class DocumentSlide extends Slide {
                        @NonNull String contentType,  long size,
                        @Nullable String fileName)
   {
-    super(context, constructAttachmentFromUri(context, uri, contentType, size, 0, 0, true, StorageUtil.getCleanFileName(fileName), null, false, false));
+    super(context, constructAttachmentFromUri(context, uri, contentType, size, 0, 0, true, StorageUtil.getCleanFileName(fileName), null, null, false, false));
   }
 
   @Override
diff --git a/src/org/thoughtcrime/securesms/mms/GifSlide.java b/src/org/thoughtcrime/securesms/mms/GifSlide.java
index 060859f4c..7253e28bc 100644
--- a/src/org/thoughtcrime/securesms/mms/GifSlide.java
+++ b/src/org/thoughtcrime/securesms/mms/GifSlide.java
@@ -19,7 +19,7 @@ public class GifSlide extends ImageSlide {
   }
 
   public GifSlide(Context context, Uri uri, long size, int width, int height, @Nullable String caption) {
-    super(context, constructAttachmentFromUri(context, uri, MediaUtil.IMAGE_GIF, size, width, height, true, null, caption, false, false));
+    super(context, constructAttachmentFromUri(context, uri, MediaUtil.IMAGE_GIF, size, width, height, true, null, caption, null, false, false));
   }
 
   @Override
diff --git a/src/org/thoughtcrime/securesms/mms/ImageSlide.java b/src/org/thoughtcrime/securesms/mms/ImageSlide.java
index ed1410846..412ef1d64 100644
--- a/src/org/thoughtcrime/securesms/mms/ImageSlide.java
+++ b/src/org/thoughtcrime/securesms/mms/ImageSlide.java
@@ -41,7 +41,7 @@ public class ImageSlide extends Slide {
   }
 
   public ImageSlide(Context context, Uri uri, long size, int width, int height, @Nullable String caption) {
-    super(context, constructAttachmentFromUri(context, uri, MediaUtil.IMAGE_JPEG, size, width, height, true, null, caption, false, false));
+    super(context, constructAttachmentFromUri(context, uri, MediaUtil.IMAGE_JPEG, size, width, height, true, null, caption, null, false, false));
   }
 
   @Override
diff --git a/src/org/thoughtcrime/securesms/mms/IncomingMediaMessage.java b/src/org/thoughtcrime/securesms/mms/IncomingMediaMessage.java
index 10d372f83..8d0c19962 100644
--- a/src/org/thoughtcrime/securesms/mms/IncomingMediaMessage.java
+++ b/src/org/thoughtcrime/securesms/mms/IncomingMediaMessage.java
@@ -66,7 +66,8 @@ public class IncomingMediaMessage {
                               Optional<List<SignalServiceAttachment>> attachments,
                               Optional<QuoteModel> quote,
                               Optional<List<Contact>> sharedContacts,
-                              Optional<List<LinkPreview>> linkPreviews)
+                              Optional<List<LinkPreview>> linkPreviews,
+                              Optional<Attachment> sticker)
   {
     this.push             = true;
     this.from             = from;
@@ -84,6 +85,10 @@ public class IncomingMediaMessage {
     this.attachments.addAll(PointerAttachment.forPointers(attachments));
     this.sharedContacts.addAll(sharedContacts.or(Collections.emptyList()));
     this.linkPreviews.addAll(linkPreviews.or(Collections.emptyList()));
+
+    if (sticker.isPresent()) {
+      this.attachments.add(sticker.get());
+    }
   }
 
   public int getSubscriptionId() {
diff --git a/src/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java b/src/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java
index 7068c3795..3acf87d31 100644
--- a/src/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java
+++ b/src/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java
@@ -301,7 +301,7 @@ public abstract class LegacyMmsConnection {
     }
 
     @Override
-    public String toString() {
+    public @NonNull String toString() {
       return Apn.class.getSimpleName() +
           "{ mmsc: \"" + mmsc + "\"" +
           ", proxy: " + (proxy == null ? "none" : '"' + proxy + '"') +
diff --git a/src/org/thoughtcrime/securesms/mms/MmsRadio.java b/src/org/thoughtcrime/securesms/mms/MmsRadio.java
index 1d5325631..2ae17f5d0 100644
--- a/src/org/thoughtcrime/securesms/mms/MmsRadio.java
+++ b/src/org/thoughtcrime/securesms/mms/MmsRadio.java
@@ -44,7 +44,7 @@ public class MmsRadio {
     PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
     this.context             = context;
     this.connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-    this.wakeLock            = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "MMS Connection");
+    this.wakeLock            = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "signal:mms");
     this.wakeLock.setReferenceCounted(true);
   }
 
diff --git a/src/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java b/src/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java
index f2f0cf478..091c2e81f 100644
--- a/src/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java
+++ b/src/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java
@@ -58,7 +58,8 @@ public class OutgoingMediaMessage {
   public OutgoingMediaMessage(Recipient recipient, SlideDeck slideDeck, String message,
                               long sentTimeMillis, int subscriptionId, long expiresIn,
                               int distributionType, @Nullable QuoteModel outgoingQuote,
-                              @NonNull List<Contact> contacts, @NonNull List<LinkPreview> linkPreviews)
+                              @NonNull List<Contact> contacts,
+                              @NonNull List<LinkPreview> linkPreviews)
   {
     this(recipient,
          buildMessage(slideDeck, message),
diff --git a/src/org/thoughtcrime/securesms/mms/PartAuthority.java b/src/org/thoughtcrime/securesms/mms/PartAuthority.java
index 513d8a8ef..28fe6f6fd 100644
--- a/src/org/thoughtcrime/securesms/mms/PartAuthority.java
+++ b/src/org/thoughtcrime/securesms/mms/PartAuthority.java
@@ -19,15 +19,18 @@ import java.io.InputStream;
 
 public class PartAuthority {
 
-  private static final String PART_URI_STRING   = "content://network.loki.provider.securesms/part";
-  private static final String THUMB_URI_STRING  = "content://network.loki.provider.securesms/thumb";
-  private static final Uri    PART_CONTENT_URI  = Uri.parse(PART_URI_STRING);
-  private static final Uri    THUMB_CONTENT_URI = Uri.parse(THUMB_URI_STRING);
+  private static final String PART_URI_STRING     = "content://network.loki.provider.securesms/part";
+  private static final String THUMB_URI_STRING    = "content://network.loki.provider.securesms/thumb";
+  private static final String STICKER_URI_STRING  = "content://network.loki.provider.securesms/sticker";
+  private static final Uri    PART_CONTENT_URI    = Uri.parse(PART_URI_STRING);
+  private static final Uri    THUMB_CONTENT_URI   = Uri.parse(THUMB_URI_STRING);
+  private static final Uri    STICKER_CONTENT_URI = Uri.parse(STICKER_URI_STRING);
 
   private static final int PART_ROW       = 1;
   private static final int THUMB_ROW      = 2;
   private static final int PERSISTENT_ROW = 3;
   private static final int BLOB_ROW       = 4;
+  private static final int STICKER_ROW    = 5;
 
   private static final UriMatcher uriMatcher;
 
@@ -35,6 +38,7 @@ public class PartAuthority {
     uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
     uriMatcher.addURI("org.thoughtcrime.securesms", "part/*/#", PART_ROW);
     uriMatcher.addURI("org.thoughtcrime.securesms", "thumb/*/#", THUMB_ROW);
+    uriMatcher.addURI("org.thoughtcrime.securesms", "sticker/#", STICKER_ROW);
     uriMatcher.addURI(DeprecatedPersistentBlobProvider.AUTHORITY, DeprecatedPersistentBlobProvider.EXPECTED_PATH_OLD, PERSISTENT_ROW);
     uriMatcher.addURI(DeprecatedPersistentBlobProvider.AUTHORITY, DeprecatedPersistentBlobProvider.EXPECTED_PATH_NEW, PERSISTENT_ROW);
     uriMatcher.addURI(BlobProvider.AUTHORITY, BlobProvider.PATH, BLOB_ROW);
@@ -48,6 +52,7 @@ public class PartAuthority {
       switch (match) {
       case PART_ROW:       return DatabaseFactory.getAttachmentDatabase(context).getAttachmentStream(new PartUriParser(uri).getPartId(), 0);
       case THUMB_ROW:      return DatabaseFactory.getAttachmentDatabase(context).getThumbnailStream(new PartUriParser(uri).getPartId());
+      case STICKER_ROW:    return DatabaseFactory.getStickerDatabase(context).getStickerStream(ContentUris.parseId(uri));
       case PERSISTENT_ROW: return DeprecatedPersistentBlobProvider.getInstance(context).getStream(context, ContentUris.parseId(uri));
       case BLOB_ROW:       return BlobProvider.getInstance().getStream(context, uri);
       default:             return context.getContentResolver().openInputStream(uri);
@@ -129,6 +134,10 @@ public class PartAuthority {
     return ContentUris.withAppendedId(uri, attachmentId.getRowId());
   }
 
+  public static Uri getStickerUri(long id) {
+    return ContentUris.withAppendedId(STICKER_CONTENT_URI, id);
+  }
+
   public static boolean isLocalUri(final @NonNull Uri uri) {
     int match = uriMatcher.match(uri);
     switch (match) {
diff --git a/src/org/thoughtcrime/securesms/mms/SignalGlideModule.java b/src/org/thoughtcrime/securesms/mms/SignalGlideModule.java
index 6524a96eb..808b54c93 100644
--- a/src/org/thoughtcrime/securesms/mms/SignalGlideModule.java
+++ b/src/org/thoughtcrime/securesms/mms/SignalGlideModule.java
@@ -24,16 +24,18 @@ import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
 import org.thoughtcrime.securesms.crypto.AttachmentSecret;
 import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider;
 import org.thoughtcrime.securesms.giph.model.ChunkedImageUrl;
+import org.thoughtcrime.securesms.glide.ChunkedImageUrlLoader;
 import org.thoughtcrime.securesms.glide.ContactPhotoLoader;
+import org.thoughtcrime.securesms.glide.OkHttpUrlLoader;
 import org.thoughtcrime.securesms.glide.cache.EncryptedBitmapCacheDecoder;
+import org.thoughtcrime.securesms.glide.cache.EncryptedBitmapResourceEncoder;
 import org.thoughtcrime.securesms.glide.cache.EncryptedCacheEncoder;
 import org.thoughtcrime.securesms.glide.cache.EncryptedGifCacheDecoder;
-import org.thoughtcrime.securesms.glide.cache.EncryptedBitmapResourceEncoder;
 import org.thoughtcrime.securesms.glide.cache.EncryptedGifDrawableResourceEncoder;
-import org.thoughtcrime.securesms.glide.ChunkedImageUrlLoader;
-import org.thoughtcrime.securesms.glide.OkHttpUrlLoader;
 import org.thoughtcrime.securesms.mms.AttachmentStreamUriLoader.AttachmentModel;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
+import org.thoughtcrime.securesms.stickers.StickerRemoteUri;
+import org.thoughtcrime.securesms.stickers.StickerRemoteUriLoader;
 
 import java.io.File;
 import java.io.InputStream;
@@ -69,6 +71,7 @@ public class SignalGlideModule extends AppGlideModule {
     registry.append(DecryptableUri.class, InputStream.class, new DecryptableStreamUriLoader.Factory(context));
     registry.append(AttachmentModel.class, InputStream.class, new AttachmentStreamUriLoader.Factory());
     registry.append(ChunkedImageUrl.class, InputStream.class, new ChunkedImageUrlLoader.Factory());
+    registry.append(StickerRemoteUri.class, InputStream.class, new StickerRemoteUriLoader.Factory(context));
     registry.replace(GlideUrl.class, InputStream.class, new OkHttpUrlLoader.Factory());
   }
 
diff --git a/src/org/thoughtcrime/securesms/mms/Slide.java b/src/org/thoughtcrime/securesms/mms/Slide.java
index 05ba2ec33..58b693461 100644
--- a/src/org/thoughtcrime/securesms/mms/Slide.java
+++ b/src/org/thoughtcrime/securesms/mms/Slide.java
@@ -26,11 +26,11 @@ import android.support.annotation.Nullable;
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.attachments.UriAttachment;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
+import org.thoughtcrime.securesms.stickers.StickerLocator;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.libsignal.util.guava.Optional;
 
-import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 
 public abstract class Slide {
@@ -85,6 +85,8 @@ public abstract class Slide {
     return false;
   }
 
+  public boolean hasSticker() { return false; }
+
   public boolean hasVideo() {
     return false;
   }
@@ -132,17 +134,18 @@ public abstract class Slide {
     return false;
   }
 
-  protected static Attachment constructAttachmentFromUri(@NonNull  Context context,
-                                                         @NonNull  Uri     uri,
-                                                         @NonNull  String  defaultMime,
-                                                                   long    size,
-                                                                   int     width,
-                                                                   int     height,
-                                                                   boolean hasThumbnail,
-                                                         @Nullable String  fileName,
-                                                         @Nullable String  caption,
-                                                                   boolean voiceNote,
-                                                                   boolean quote)
+  protected static Attachment constructAttachmentFromUri(@NonNull  Context        context,
+                                                         @NonNull  Uri            uri,
+                                                         @NonNull  String         defaultMime,
+                                                                   long           size,
+                                                                   int            width,
+                                                                   int            height,
+                                                                   boolean        hasThumbnail,
+                                                         @Nullable String         fileName,
+                                                         @Nullable String         caption,
+                                                         @Nullable StickerLocator stickerLocator,
+                                                                   boolean        voiceNote,
+                                                                   boolean        quote)
   {
     String                 resolvedType    = Optional.fromNullable(MediaUtil.getMimeType(context, uri)).or(defaultMime);
     String                 fastPreflightId = String.valueOf(new SecureRandom().nextLong());
@@ -157,7 +160,8 @@ public abstract class Slide {
                              fastPreflightId,
                              voiceNote,
                              quote,
-                             caption);
+                             caption,
+                             stickerLocator);
   }
 
   @Override
diff --git a/src/org/thoughtcrime/securesms/mms/SlideDeck.java b/src/org/thoughtcrime/securesms/mms/SlideDeck.java
index caf09bdff..d39c4ec91 100644
--- a/src/org/thoughtcrime/securesms/mms/SlideDeck.java
+++ b/src/org/thoughtcrime/securesms/mms/SlideDeck.java
@@ -88,7 +88,7 @@ public class SlideDeck {
 
   public boolean containsMediaSlide() {
     for (Slide slide : slides) {
-      if (slide.hasImage() || slide.hasVideo() || slide.hasAudio() || slide.hasDocument()) {
+      if (slide.hasImage() || slide.hasVideo() || slide.hasAudio() || slide.hasDocument() || slide.hasSticker()) {
         return true;
       }
     }
@@ -138,4 +138,14 @@ public class SlideDeck {
 
     return null;
   }
+
+  public @Nullable StickerSlide getStickerSlide() {
+    for (Slide slide: slides) {
+      if (slide.hasSticker()) {
+        return (StickerSlide)slide;
+      }
+    }
+
+    return null;
+  }
 }
diff --git a/src/org/thoughtcrime/securesms/mms/StickerSlide.java b/src/org/thoughtcrime/securesms/mms/StickerSlide.java
new file mode 100644
index 000000000..ed49c79f0
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/mms/StickerSlide.java
@@ -0,0 +1,48 @@
+package org.thoughtcrime.securesms.mms;
+
+import android.content.Context;
+import android.content.res.Resources.Theme;
+import android.net.Uri;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import org.thoughtcrime.securesms.attachments.Attachment;
+import org.thoughtcrime.securesms.stickers.StickerLocator;
+import org.thoughtcrime.securesms.util.MediaUtil;
+
+import network.loki.messenger.R;
+
+public class StickerSlide extends Slide {
+
+  public static final int WIDTH  = 512;
+  public static final int HEIGHT = 512;
+
+  public StickerSlide(@NonNull Context context, @NonNull Attachment attachment) {
+    super(context, attachment);
+  }
+
+  public StickerSlide(Context context, Uri uri, long size, @NonNull StickerLocator stickerLocator) {
+    super(context, constructAttachmentFromUri(context, uri, MediaUtil.IMAGE_WEBP, size, WIDTH, HEIGHT, true, null, null, stickerLocator, false, false));
+  }
+
+  @Override
+  public @DrawableRes int getPlaceholderRes(Theme theme) {
+    return 0;
+  }
+
+  @Override
+  public @Nullable Uri getThumbnailUri() {
+    return getUri();
+  }
+
+  @Override
+  public boolean hasSticker() {
+    return true;
+  }
+
+  @Override
+  public @NonNull String getContentDescription() {
+    return context.getString(R.string.Slide_sticker);
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/mms/TextSlide.java b/src/org/thoughtcrime/securesms/mms/TextSlide.java
index e4c20d061..d0b75ea0e 100644
--- a/src/org/thoughtcrime/securesms/mms/TextSlide.java
+++ b/src/org/thoughtcrime/securesms/mms/TextSlide.java
@@ -8,7 +8,6 @@ import android.support.annotation.Nullable;
 
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.util.MediaUtil;
-import org.thoughtcrime.securesms.util.StorageUtil;
 
 public class TextSlide extends Slide {
 
@@ -17,6 +16,6 @@ public class TextSlide extends Slide {
   }
 
   public TextSlide(@NonNull Context context, @NonNull Uri uri, @Nullable String filename, long size) {
-    super(context, constructAttachmentFromUri(context, uri, MediaUtil.LONG_TEXT, size, 0, 0, true, filename, null, false, false));
+    super(context, constructAttachmentFromUri(context, uri, MediaUtil.LONG_TEXT, size, 0, 0, true, filename, null, null, false, false));
   }
 }
diff --git a/src/org/thoughtcrime/securesms/mms/VideoSlide.java b/src/org/thoughtcrime/securesms/mms/VideoSlide.java
index 2b69b2b82..f290f2bd7 100644
--- a/src/org/thoughtcrime/securesms/mms/VideoSlide.java
+++ b/src/org/thoughtcrime/securesms/mms/VideoSlide.java
@@ -35,7 +35,7 @@ public class VideoSlide extends Slide {
   }
 
   public VideoSlide(Context context, Uri uri, long dataSize, @Nullable String caption) {
-    super(context, constructAttachmentFromUri(context, uri, MediaUtil.VIDEO_UNSPECIFIED, dataSize, 0, 0, MediaUtil.hasVideoThumbnail(uri), null, caption, false, false));
+    super(context, constructAttachmentFromUri(context, uri, MediaUtil.VIDEO_UNSPECIFIED, dataSize, 0, 0, MediaUtil.hasVideoThumbnail(uri), null, caption, null, false, false));
   }
 
   public VideoSlide(Context context, Attachment attachment) {
diff --git a/src/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java b/src/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java
index befd397d4..bf7946f90 100644
--- a/src/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java
+++ b/src/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java
@@ -150,7 +150,7 @@ public class ChunkedDataFetcher {
       return;
     }
 
-    SignalExecutors.IO.execute(() -> {
+    SignalExecutors.UNBOUNDED.execute(() -> {
       List<CallRequestController> controllers = Stream.of(requestPattern).map(range -> makeChunkRequest(client, url, range)).toList();
       List<InputStream>           streams     = new ArrayList<>(controllers.size() + (firstChunk.isPresent() ? 1 : 0));
 
diff --git a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
index bfdef47ac..96dfe547c 100644
--- a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
+++ b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
@@ -455,6 +455,9 @@ public class MessageNotifier {
       } else if (record.isMms() && !((MmsMessageRecord) record).getSharedContacts().isEmpty()) {
         Contact contact = ((MmsMessageRecord) record).getSharedContacts().get(0);
         body = ContactUtil.getStringSummary(context, contact);
+      } else if (record.isMms() && ((MmsMessageRecord) record).getSlideDeck().getStickerSlide() != null) {
+        body = SpanUtil.italic(context.getString(R.string.MessageNotifier_sticker));
+        slideDeck = ((MmsMessageRecord) record).getSlideDeck();
       } else if (record.isMms() && TextUtils.isEmpty(body) && !((MmsMessageRecord) record).getSlideDeck().getSlides().isEmpty()) {
         body = SpanUtil.italic(context.getString(R.string.MessageNotifier_media_message));
         slideDeck = ((MediaMmsMessageRecord)record).getSlideDeck();
diff --git a/src/org/thoughtcrime/securesms/notifications/NotificationItem.java b/src/org/thoughtcrime/securesms/notifications/NotificationItem.java
index f3c9bf0b8..3423b3326 100644
--- a/src/org/thoughtcrime/securesms/notifications/NotificationItem.java
+++ b/src/org/thoughtcrime/securesms/notifications/NotificationItem.java
@@ -50,7 +50,7 @@ public class NotificationItem {
     return individualRecipient;
   }
 
-  public CharSequence getText() {
+  public @Nullable CharSequence getText() {
     return text;
   }
 
diff --git a/src/org/thoughtcrime/securesms/providers/BlobProvider.java b/src/org/thoughtcrime/securesms/providers/BlobProvider.java
index b72d81fa5..9cd428dcf 100644
--- a/src/org/thoughtcrime/securesms/providers/BlobProvider.java
+++ b/src/org/thoughtcrime/securesms/providers/BlobProvider.java
@@ -179,7 +179,7 @@ public class BlobProvider {
     File             outputFile       = new File(getOrCreateCacheDirectory(context, directory), buildFileName(blobSpec.id));
     OutputStream     outputStream     = ModernEncryptingPartOutputStream.createFor(attachmentSecret, outputFile, true).second;
 
-    SignalExecutors.IO.execute(() -> {
+    SignalExecutors.UNBOUNDED.execute(() -> {
       try {
         Util.copy(blobSpec.getData(), outputStream);
       } catch (IOException e) {
diff --git a/src/org/thoughtcrime/securesms/providers/MmsBodyProvider.java b/src/org/thoughtcrime/securesms/providers/MmsBodyProvider.java
index 2b045eeea..22bfcc26a 100644
--- a/src/org/thoughtcrime/securesms/providers/MmsBodyProvider.java
+++ b/src/org/thoughtcrime/securesms/providers/MmsBodyProvider.java
@@ -24,6 +24,8 @@ import android.content.UriMatcher;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
+import android.support.annotation.NonNull;
+
 import org.thoughtcrime.securesms.logging.Log;
 
 import java.io.File;
@@ -56,7 +58,7 @@ public class MmsBodyProvider extends ContentProvider {
   }
 
   @Override
-  public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException {
+  public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) throws FileNotFoundException {
     Log.i(TAG, "openFile(" + uri + ", " + mode + ")");
 
     switch (uriMatcher.match(uri)) {
@@ -81,7 +83,7 @@ public class MmsBodyProvider extends ContentProvider {
   }
 
   @Override
-  public int delete(Uri uri, String arg1, String[] arg2) {
+  public int delete(@NonNull Uri uri, String arg1, String[] arg2) {
     switch (uriMatcher.match(uri)) {
     case SINGLE_ROW:
       return getFile(uri).delete() ? 1 : 0;
@@ -90,22 +92,22 @@ public class MmsBodyProvider extends ContentProvider {
   }
 
   @Override
-  public String getType(Uri arg0) {
+  public String getType(@NonNull Uri arg0) {
     return null;
   }
 
   @Override
-  public Uri insert(Uri arg0, ContentValues arg1) {
+  public Uri insert(@NonNull Uri arg0, ContentValues arg1) {
     return null;
   }
 
   @Override
-  public Cursor query(Uri arg0, String[] arg1, String arg2, String[] arg3, String arg4) {
+  public Cursor query(@NonNull Uri arg0, String[] arg1, String arg2, String[] arg3, String arg4) {
     return null;
   }
 
   @Override
-  public int update(Uri arg0, ContentValues arg1, String arg2, String[] arg3) {
+  public int update(@NonNull Uri arg0, ContentValues arg1, String arg2, String[] arg3) {
     return 0;
   }
   public static Pointer makeTemporaryPointer(Context context) {
diff --git a/src/org/thoughtcrime/securesms/recipients/Recipient.java b/src/org/thoughtcrime/securesms/recipients/Recipient.java
index 48198fbc0..49e50c8a9 100644
--- a/src/org/thoughtcrime/securesms/recipients/Recipient.java
+++ b/src/org/thoughtcrime/securesms/recipients/Recipient.java
@@ -660,7 +660,7 @@ public class Recipient implements RecipientModifiedListener {
     notifyListeners();
   }
 
-  public synchronized UnidentifiedAccessMode getUnidentifiedAccessMode() {
+  public @NonNull synchronized UnidentifiedAccessMode getUnidentifiedAccessMode() {
     return unidentifiedAccessMode;
   }
 
diff --git a/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java b/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java
index 88ee77017..159287303 100644
--- a/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java
+++ b/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java
@@ -34,7 +34,7 @@ public class WelcomeActivity extends BaseActionBarActivity {
   private void onContinueClicked() {
     Permissions.with(this)
         .request(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE)
-        .ifNecessary(false)
+        .ifNecessary()
         .withRationaleDialog(getString(R.string.activity_landing_permission_dialog_message), R.drawable.ic_folder_white_48dp)
         .onAnyResult(() -> {
           TextSecurePreferences.setHasSeenWelcomeScreen(WelcomeActivity.this, true);
@@ -46,7 +46,6 @@ public class WelcomeActivity extends BaseActionBarActivity {
           }
 
           startActivity(nextIntent);
-          overridePendingTransition(R.anim.slide_from_right, R.anim.fade_scale_out);
           finish();
         })
         .execute();
diff --git a/src/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java b/src/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java
index 4a139e1f9..53a1a1eea 100644
--- a/src/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java
+++ b/src/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java
@@ -17,7 +17,6 @@
 package org.thoughtcrime.securesms.scribbles;
 
 import android.content.Intent;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.design.widget.TabLayout;
@@ -25,14 +24,9 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.content.ContextCompat;
 import android.support.v4.view.ViewPager;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.style.ImageSpan;
 import android.view.MenuItem;
 
-import org.thoughtcrime.securesms.BaseActionBarActivity;
 import network.loki.messenger.R;
 
 public class StickerSelectActivity extends FragmentActivity implements StickerSelectFragment.StickerSelectionListener {
@@ -54,10 +48,10 @@ public class StickerSelectActivity extends FragmentActivity implements StickerSe
     super.onCreate(savedInstanceState);
     setContentView(R.layout.scribble_select_sticker_activity);
 
-    ViewPager viewPager = (ViewPager) findViewById(R.id.pager);
+    ViewPager viewPager = (ViewPager) findViewById(R.id.camera_sticker_pager);
     viewPager.setAdapter(new StickerPagerAdapter(getSupportFragmentManager(), this));
 
-    TabLayout tabLayout = (TabLayout) findViewById(R.id.tabs);
+    TabLayout tabLayout = (TabLayout) findViewById(R.id.camera_sticker_tabs);
     tabLayout.setupWithViewPager(viewPager);
 
     for (int i=0;i<tabLayout.getTabCount();i++) {
diff --git a/src/org/thoughtcrime/securesms/scribbles/StickerSelectFragment.java b/src/org/thoughtcrime/securesms/scribbles/StickerSelectFragment.java
index f53f55b75..4fb891c81 100644
--- a/src/org/thoughtcrime/securesms/scribbles/StickerSelectFragment.java
+++ b/src/org/thoughtcrime/securesms/scribbles/StickerSelectFragment.java
@@ -54,8 +54,7 @@ public class StickerSelectFragment extends Fragment implements LoaderManager.Loa
     return fragment;
   }
 
-  @Nullable
-  public View onCreateView(LayoutInflater inflater,
+  public @Nullable View onCreateView(@NonNull LayoutInflater inflater,
                            @Nullable ViewGroup container,
                            @Nullable Bundle savedInstanceState)
   {
@@ -77,17 +76,17 @@ public class StickerSelectFragment extends Fragment implements LoaderManager.Loa
   }
 
   @Override
-  public Loader<String[]> onCreateLoader(int id, Bundle args) {
+  public @NonNull Loader<String[]> onCreateLoader(int id, Bundle args) {
     return new StickerLoader(getActivity(), assetDirectory);
   }
 
   @Override
-  public void onLoadFinished(Loader<String[]> loader, String[] data) {
+  public void onLoadFinished(@NonNull Loader<String[]> loader, String[] data) {
     recyclerView.setAdapter(new StickersAdapter(getActivity(), glideRequests, data));
   }
 
   @Override
-  public void onLoaderReset(Loader<String[]> loader) {
+  public void onLoaderReset(@NonNull Loader<String[]> loader) {
     recyclerView.setAdapter(null);
   }
 
@@ -108,12 +107,12 @@ public class StickerSelectFragment extends Fragment implements LoaderManager.Loa
     }
 
     @Override
-    public StickerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+    public @NonNull StickerViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
       return new StickerViewHolder(layoutInflater.inflate(R.layout.scribble_sticker_item, parent, false));
     }
 
     @Override
-    public void onBindViewHolder(StickerViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull StickerViewHolder holder, int position) {
       holder.fileName = stickerFiles[position];
 
       glideRequests.load(Uri.parse("file:///android_asset/" + holder.fileName))
@@ -127,7 +126,7 @@ public class StickerSelectFragment extends Fragment implements LoaderManager.Loa
     }
 
     @Override
-    public void onViewRecycled(StickerViewHolder holder) {
+    public void onViewRecycled(@NonNull StickerViewHolder holder) {
       super.onViewRecycled(holder);
       glideRequests.clear(holder.image);
     }
diff --git a/src/org/thoughtcrime/securesms/scribbles/widget/ColorPaletteAdapter.java b/src/org/thoughtcrime/securesms/scribbles/widget/ColorPaletteAdapter.java
index ce98593bf..105c0e2d5 100644
--- a/src/org/thoughtcrime/securesms/scribbles/widget/ColorPaletteAdapter.java
+++ b/src/org/thoughtcrime/securesms/scribbles/widget/ColorPaletteAdapter.java
@@ -22,12 +22,12 @@ public class ColorPaletteAdapter extends RecyclerView.Adapter<ColorPaletteAdapte
   private EventListener eventListener;
 
   @Override
-  public ColorViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+  public @NonNull ColorViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
     return new ColorViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_color, parent, false));
   }
 
   @Override
-  public void onBindViewHolder(ColorViewHolder holder, int position) {
+  public void onBindViewHolder(@NonNull ColorViewHolder holder, int position) {
     holder.bind(colors.get(position), eventListener);
   }
 
diff --git a/src/org/thoughtcrime/securesms/search/SearchFragment.java b/src/org/thoughtcrime/securesms/search/SearchFragment.java
index 491a46586..ead6cd6c6 100644
--- a/src/org/thoughtcrime/securesms/search/SearchFragment.java
+++ b/src/org/thoughtcrime/securesms/search/SearchFragment.java
@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.search;
 import android.annotation.SuppressLint;
 import android.arch.lifecycle.ViewModelProviders;
 import android.content.Intent;
-import android.content.res.Configuration;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -29,9 +28,9 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.search.model.MessageResult;
 import org.thoughtcrime.securesms.search.model.SearchResult;
 import org.thoughtcrime.securesms.util.StickyHeaderDecoration;
+import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
 
 import java.util.Locale;
-import java.util.concurrent.Executors;
 
 /**
  * A fragment that is displayed to do full-text search of messages, groups, and contacts.
@@ -71,7 +70,7 @@ public class SearchFragment extends Fragment implements SearchListAdapter.EventL
                                                              DatabaseFactory.getContactsDatabase(getContext()),
                                                              DatabaseFactory.getThreadDatabase(getContext()),
                                                              ContactAccessor.getInstance(),
-                                                             Executors.newSingleThreadExecutor());
+                                                             SignalExecutors.SERIAL);
     viewModel = ViewModelProviders.of(this, new SearchViewModel.Factory(searchRepository)).get(SearchViewModel.class);
 
     if (pendingQuery != null) {
diff --git a/src/org/thoughtcrime/securesms/search/SearchListAdapter.java b/src/org/thoughtcrime/securesms/search/SearchListAdapter.java
index e21813df4..0fbba7c31 100644
--- a/src/org/thoughtcrime/securesms/search/SearchListAdapter.java
+++ b/src/org/thoughtcrime/securesms/search/SearchListAdapter.java
@@ -43,9 +43,8 @@ class SearchListAdapter extends    RecyclerView.Adapter<SearchListAdapter.Search
     this.locale        = locale;
   }
 
-  @NonNull
   @Override
-  public SearchResultViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+  public @NonNull SearchResultViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
     return new SearchResultViewHolder(LayoutInflater.from(parent.getContext())
                                                     .inflate(R.layout.conversation_list_item_view, parent, false));
   }
@@ -74,7 +73,7 @@ class SearchListAdapter extends    RecyclerView.Adapter<SearchListAdapter.Search
   }
 
   @Override
-  public void onViewRecycled(SearchResultViewHolder holder) {
+  public void onViewRecycled(@NonNull SearchResultViewHolder holder) {
     holder.recycle();
   }
 
diff --git a/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java b/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java
index 45cd44147..bdae68b20 100644
--- a/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java
+++ b/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java
@@ -149,7 +149,7 @@ public class ApplicationMigrationService extends Service
     public void run() {
       notification              = initializeBackgroundNotification();
       PowerManager powerManager = (PowerManager)getSystemService(Context.POWER_SERVICE);
-      WakeLock     wakeLock     = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "Migration");
+      WakeLock     wakeLock     = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "signal:migration");
 
       try {
         wakeLock.acquire();
diff --git a/src/org/thoughtcrime/securesms/service/WebRtcCallService.java b/src/org/thoughtcrime/securesms/service/WebRtcCallService.java
index 577858b1f..970983406 100644
--- a/src/org/thoughtcrime/securesms/service/WebRtcCallService.java
+++ b/src/org/thoughtcrime/securesms/service/WebRtcCallService.java
@@ -18,6 +18,7 @@ import android.os.ResultReceiver;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.WorkerThread;
+import android.telephony.PhoneStateListener;
 import android.telephony.TelephonyManager;
 import android.util.Pair;
 
@@ -40,6 +41,7 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.FutureTaskListener;
 import org.thoughtcrime.securesms.util.ListenableFutureTask;
 import org.thoughtcrime.securesms.util.ServiceUtil;
+import org.thoughtcrime.securesms.util.TelephonyUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.webrtc.CallNotificationBuilder;
@@ -190,15 +192,21 @@ public class WebRtcCallService extends Service implements InjectableType,
   private ExecutorService          networkExecutor = Executors.newSingleThreadExecutor();
   private ScheduledExecutorService timeoutExecutor = Executors.newScheduledThreadPool(1);
 
+  private final PhoneStateListener hangUpRtcOnDeviceCallAnswered = new HangUpRtcOnPstnCallAnsweredListener();
+
   @Override
   public void onCreate() {
     super.onCreate();
+    Log.d(TAG, "onCreate");
 
     initializeResources();
 
     registerIncomingPstnCallReceiver();
     registerUncaughtExceptionHandler();
     registerWiredHeadsetStateReceiver();
+
+    TelephonyUtil.getManager(this)
+                 .listen(hangUpRtcOnDeviceCallAnswered, PhoneStateListener.LISTEN_CALL_STATE);
   }
 
   @Override
@@ -237,6 +245,7 @@ public class WebRtcCallService extends Service implements InjectableType,
   @Override
   public void onDestroy() {
     super.onDestroy();
+    Log.d(TAG, "onDestroy");
 
     if (callReceiver != null) {
       unregisterReceiver(callReceiver);
@@ -259,6 +268,9 @@ public class WebRtcCallService extends Service implements InjectableType,
       unregisterReceiver(powerButtonReceiver);
       powerButtonReceiver = null;
     }
+
+    TelephonyUtil.getManager(this)
+                 .listen(hangUpRtcOnDeviceCallAnswered, PhoneStateListener.LISTEN_NONE);
   }
 
   @Override
@@ -899,9 +911,7 @@ public class WebRtcCallService extends Service implements InjectableType,
   /// Helper Methods
 
   private boolean isBusy() {
-    TelephonyManager telephonyManager = (TelephonyManager)getSystemService(TELEPHONY_SERVICE);
-
-    return callState != CallState.STATE_IDLE || telephonyManager.getCallState() != TelephonyManager.CALL_STATE_IDLE;
+    return callState != CallState.STATE_IDLE || TelephonyUtil.isAnyPstnLineBusy(this);
   }
 
   private boolean isIdle() {
@@ -1380,4 +1390,23 @@ public class WebRtcCallService extends Service implements InjectableType,
 
     context.startService(intent);
   }
+
+  private class HangUpRtcOnPstnCallAnsweredListener extends PhoneStateListener {
+
+    @Override
+    public void onCallStateChanged(int state, String phoneNumber) {
+      super.onCallStateChanged(state, phoneNumber);
+      if (state == TelephonyManager.CALL_STATE_OFFHOOK) {
+        hangup();
+        Log.i(TAG, "Device phone call ended Signal call.");
+      }
+    }
+
+    private void hangup() {
+      Intent intent = new Intent(WebRtcCallService.this, WebRtcCallService.class);
+      intent.setAction(ACTION_LOCAL_HANGUP);
+
+      startService(intent);
+    }
+  }
 }
diff --git a/src/org/thoughtcrime/securesms/stickers/BlessedPacks.java b/src/org/thoughtcrime/securesms/stickers/BlessedPacks.java
new file mode 100644
index 000000000..b67a45ebc
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/stickers/BlessedPacks.java
@@ -0,0 +1,18 @@
+package org.thoughtcrime.securesms.stickers;
+
+import android.support.annotation.NonNull;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Maintains a list of "blessed" sticker packs that essentially serve as defaults.
+ */
+public final class BlessedPacks {
+
+  private static final Set<String> BLESSED_PACK_IDS = new HashSet<>();
+
+  public static boolean contains(@NonNull String packId) {
+    return BLESSED_PACK_IDS.contains(packId);
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageAdapter.java b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageAdapter.java
new file mode 100644
index 000000000..b53382d86
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageAdapter.java
@@ -0,0 +1,134 @@
+package org.thoughtcrime.securesms.stickers;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.Px;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
+
+import org.thoughtcrime.securesms.database.model.StickerRecord;
+import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
+import org.thoughtcrime.securesms.mms.GlideRequests;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import network.loki.messenger.R;
+
+/**
+ * Adapter for a specific page in the sticker keyboard. Shows the stickers in a grid.
+ * @see StickerKeyboardPageFragment
+ */
+final class StickerKeyboardPageAdapter extends RecyclerView.Adapter<StickerKeyboardPageAdapter.StickerKeyboardPageViewHolder> {
+
+  private final GlideRequests       glideRequests;
+  private final EventListener       eventListener;
+  private final List<StickerRecord> stickers;
+
+  private int stickerSize;
+
+  StickerKeyboardPageAdapter(@NonNull GlideRequests glideRequests, @NonNull EventListener eventListener) {
+    this.glideRequests = glideRequests;
+    this.eventListener = eventListener;
+    this.stickers      = new ArrayList<>();
+
+    setHasStableIds(true);
+  }
+
+  @Override
+  public long getItemId(int position) {
+    return stickers.get(position).getRowId();
+  }
+
+  @Override
+  public @NonNull
+  StickerKeyboardPageViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
+    return new StickerKeyboardPageViewHolder(LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.sticker_keyboard_page_list_item, viewGroup, false));
+  }
+
+  @Override
+  public void onBindViewHolder(@NonNull StickerKeyboardPageViewHolder viewHolder, int i) {
+    viewHolder.bind(glideRequests, eventListener, stickers.get(i), stickerSize);
+  }
+
+  @Override
+  public void onViewRecycled(@NonNull StickerKeyboardPageViewHolder holder) {
+    holder.recycle();
+  }
+
+  @Override
+  public int getItemCount() {
+    return stickers.size();
+  }
+
+  void setStickers(@NonNull List<StickerRecord> stickers, @Px int stickerSize) {
+    this.stickers.clear();
+    this.stickers.addAll(stickers);
+
+    this.stickerSize = stickerSize;
+
+    notifyDataSetChanged();
+  }
+
+  void setStickerSize(@Px int stickerSize) {
+    this.stickerSize = stickerSize;
+    notifyDataSetChanged();
+  }
+
+  static class StickerKeyboardPageViewHolder extends RecyclerView.ViewHolder {
+
+    private final ImageView image;
+
+    private StickerRecord currentSticker;
+
+    public StickerKeyboardPageViewHolder(@NonNull View itemView) {
+      super(itemView);
+      image = itemView.findViewById(R.id.sticker_keyboard_page_image);
+    }
+
+    public void bind(@NonNull GlideRequests glideRequests,
+                     @Nullable EventListener eventListener,
+                     @NonNull StickerRecord sticker,
+                     @Px int size)
+    {
+      currentSticker = sticker;
+
+      itemView.getLayoutParams().height = size;
+      itemView.getLayoutParams().width  = size;
+      itemView.requestLayout();
+
+      glideRequests.load(new DecryptableUri(sticker.getUri()))
+                   .transition(DrawableTransitionOptions.withCrossFade())
+                   .into(image);
+
+      if (eventListener != null) {
+        image.setOnClickListener(v -> eventListener.onStickerClicked(sticker));
+        image.setOnLongClickListener(v -> {
+          eventListener.onStickerLongClicked(v);
+          return true;
+        });
+      } else {
+        image.setOnClickListener(null);
+        image.setOnLongClickListener(null);
+      }
+    }
+
+    void recycle() {
+      image.setOnClickListener(null);
+    }
+
+    @Nullable StickerRecord getCurrentSticker() {
+      return currentSticker;
+    }
+  }
+
+  interface EventListener {
+    void onStickerClicked(@NonNull StickerRecord sticker);
+    void onStickerLongClicked(@NonNull View targetView);
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageFragment.java b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageFragment.java
new file mode 100644
index 000000000..837fa5304
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageFragment.java
@@ -0,0 +1,215 @@
+package org.thoughtcrime.securesms.stickers;
+
+import android.arch.lifecycle.ViewModelProviders;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.graphics.Point;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.Px;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.model.StickerRecord;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.mms.GlideApp;
+import org.thoughtcrime.securesms.mms.GlideRequests;
+import org.thoughtcrime.securesms.stickers.StickerKeyboardPageAdapter.StickerKeyboardPageViewHolder;
+import org.thoughtcrime.securesms.util.ViewUtil;
+
+import network.loki.messenger.R;
+
+/**
+ * An individual page of stickers in the {@link StickerKeyboardProvider}.
+ */
+public final class StickerKeyboardPageFragment extends Fragment implements StickerKeyboardPageAdapter.EventListener {
+
+  private static final String TAG = Log.tag(StickerKeyboardPageFragment.class);
+
+  private static final String KEY_PACK_ID = "pack_id";
+
+  public static final String RECENT_PACK_ID = StickerKeyboardPageViewModel.RECENT_PACK_ID;
+
+  private RecyclerView               list;
+  private StickerKeyboardPageAdapter adapter;
+  private GridLayoutManager          layoutManager;
+
+  private StickerKeyboardPageViewModel viewModel;
+  private EventListener                eventListener;
+  private ListTouchListener            listTouchListener;
+
+  private String                       packId;
+
+  public static StickerKeyboardPageFragment newInstance(@NonNull String packId) {
+    Bundle args = new Bundle();
+    args.putString(KEY_PACK_ID, packId);
+
+    StickerKeyboardPageFragment fragment = new StickerKeyboardPageFragment();
+    fragment.setArguments(args);
+    fragment.packId = packId;
+
+    return fragment;
+  }
+
+  @Override
+  public @Nullable View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    return inflater.inflate(R.layout.sticker_keyboard_page, container, false);
+  }
+
+  @Override
+  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+    GlideRequests glideRequests = GlideApp.with(this);
+
+    this.list              = view.findViewById(R.id.sticker_keyboard_list);
+    this.adapter           = new StickerKeyboardPageAdapter(glideRequests, this);
+    this.layoutManager     = new GridLayoutManager(requireContext(), 2);
+    this.listTouchListener = new ListTouchListener(requireContext(), glideRequests);
+    this.packId            = getArguments().getString(KEY_PACK_ID);
+
+    list.setLayoutManager(layoutManager);
+    list.setAdapter(adapter);
+    list.addOnItemTouchListener(listTouchListener);
+
+    initViewModel(packId);
+    onScreenWidthChanged(getScreenWidth());
+  }
+
+  @Override
+  public void onConfigurationChanged(Configuration newConfig) {
+    super.onConfigurationChanged(newConfig);
+    onScreenWidthChanged(getScreenWidth());
+  }
+
+  @Override
+  public void onStickerClicked(@NonNull StickerRecord sticker) {
+    if (eventListener != null) {
+      eventListener.onStickerSelected(sticker);
+    }
+  }
+
+  @Override
+  public void onStickerLongClicked(@NonNull View targetView) {
+    if (listTouchListener != null) {
+      listTouchListener.enterHoverMode(list, targetView);
+    }
+  }
+
+  public void setEventListener(@NonNull EventListener eventListener) {
+    this.eventListener = eventListener;
+  }
+
+  public @NonNull String getPackId() {
+    return packId;
+  }
+
+  private void initViewModel(@NonNull String packId) {
+    StickerKeyboardRepository repository = new StickerKeyboardRepository(DatabaseFactory.getStickerDatabase(requireContext()));
+    viewModel = ViewModelProviders.of(this, new StickerKeyboardPageViewModel.Factory(requireActivity().getApplication(), repository)).get(StickerKeyboardPageViewModel.class);
+
+    viewModel.getStickers(packId).observe(getViewLifecycleOwner(), stickerRecords -> {
+      if (stickerRecords == null) return;
+
+      adapter.setStickers(stickerRecords, calculateStickerSize(getScreenWidth()));
+    });
+  }
+
+  private void onScreenWidthChanged(@Px int newWidth) {
+    if (layoutManager != null) {
+      layoutManager.setSpanCount(calculateColumnCount(newWidth));
+      adapter.setStickerSize(calculateStickerSize(newWidth));
+    }
+  }
+
+  private int getScreenWidth() {
+    Point size = new Point();
+    requireActivity().getWindowManager().getDefaultDisplay().getSize(size);
+    return size.x;
+  }
+
+  private int calculateColumnCount(@Px int screenWidth) {
+    float modifier = getResources().getDimensionPixelOffset(R.dimen.sticker_page_item_padding);
+    float divisor  = getResources().getDimensionPixelOffset(R.dimen.sticker_page_item_divisor);
+    return (int) ((screenWidth - modifier) / divisor);
+  }
+
+  private int calculateStickerSize(@Px int screenWidth) {
+    float multiplier  = getResources().getDimensionPixelOffset(R.dimen.sticker_page_item_multiplier);
+    int   columnCount = calculateColumnCount(screenWidth);
+
+    return (int) ((screenWidth - ((columnCount + 1) * multiplier)) / columnCount);
+  }
+
+  private final class ListTouchListener implements RecyclerView.OnItemTouchListener {
+
+    private final StickerPreviewPopup popup;
+
+    private boolean hoverMode;
+
+    ListTouchListener(@NonNull Context context, @NonNull GlideRequests glideRequests) {
+      this.popup = new StickerPreviewPopup(context, glideRequests);
+      popup.setAnimationStyle(R.style.StickerPopupAnimation);
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(@NonNull RecyclerView recyclerView, @NonNull MotionEvent motionEvent) {
+      return hoverMode;
+    }
+
+    @Override
+    public void onTouchEvent(@NonNull RecyclerView recyclerView, @NonNull MotionEvent motionEvent) {
+      switch (motionEvent.getAction()) {
+        case MotionEvent.ACTION_UP:
+        case MotionEvent.ACTION_CANCEL:
+          hoverMode = false;
+          popup.dismiss();
+          eventListener.onStickerPopupEnded();
+          break;
+        default:
+          for (int i = 0, len = recyclerView.getChildCount(); i < len; i++) {
+            View child = recyclerView.getChildAt(i);
+
+            if (ViewUtil.isPointInsideView(recyclerView, motionEvent.getRawX(), motionEvent.getRawY()) &&
+                ViewUtil.isPointInsideView(child, motionEvent.getRawX(), motionEvent.getRawY()))
+            {
+              showStickerForView(recyclerView, child);
+            }
+          }
+      }
+    }
+
+    @Override
+    public void onRequestDisallowInterceptTouchEvent(boolean b) {
+    }
+
+    void enterHoverMode(@NonNull RecyclerView recyclerView, View targetView) {
+      this.hoverMode = true;
+      showStickerForView(recyclerView, targetView);
+    }
+
+    private void showStickerForView(@NonNull RecyclerView recyclerView, @NonNull View view) {
+      StickerKeyboardPageViewHolder holder = (StickerKeyboardPageViewHolder) recyclerView.getChildViewHolder(view);
+
+      if (holder != null && holder.getCurrentSticker() != null) {
+        if (!popup.isShowing()) {
+          popup.showAtLocation(recyclerView, Gravity.NO_GRAVITY, 0, 0);
+          eventListener.onStickerPopupStarted();
+        }
+        popup.presentSticker(holder.getCurrentSticker());
+      }
+    }
+  }
+
+  interface EventListener {
+    void onStickerSelected(@NonNull StickerRecord sticker);
+    void onStickerPopupStarted();
+    void onStickerPopupEnded();
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageViewModel.java b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageViewModel.java
new file mode 100644
index 000000000..b602a9364
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageViewModel.java
@@ -0,0 +1,78 @@
+package org.thoughtcrime.securesms.stickers;
+
+import android.app.Application;
+import android.arch.lifecycle.LiveData;
+import android.arch.lifecycle.MutableLiveData;
+import android.arch.lifecycle.ViewModel;
+import android.arch.lifecycle.ViewModelProvider;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.support.annotation.NonNull;
+
+import org.thoughtcrime.securesms.database.DatabaseContentProviders;
+import org.thoughtcrime.securesms.database.model.StickerRecord;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.util.Throttler;
+
+import java.util.List;
+
+final class StickerKeyboardPageViewModel extends ViewModel {
+
+  static final String RECENT_PACK_ID = "RECENT";
+
+  private final Application                          application;
+  private final StickerKeyboardRepository            repository;
+  private final MutableLiveData<List<StickerRecord>> stickers;
+  private final Throttler                            observerThrottler;
+  private final ContentObserver                      observer;
+
+  private String packId;
+
+  private StickerKeyboardPageViewModel(@NonNull Application application, @NonNull StickerKeyboardRepository repository) {
+    this.application       = application;
+    this.repository        = repository;
+    this.stickers          = new MutableLiveData<>();
+    this.observerThrottler = new Throttler(500);
+    this.observer          = new ContentObserver(new Handler()) {
+      @Override
+      public void onChange(boolean selfChange) {
+        observerThrottler.publish(() -> getStickers(packId));
+      }
+    };
+
+    application.getContentResolver().registerContentObserver(DatabaseContentProviders.Sticker.CONTENT_URI, true, observer);
+  }
+
+  LiveData<List<StickerRecord>> getStickers(@NonNull String packId) {
+    this.packId = packId;
+
+    if (RECENT_PACK_ID.equals(packId)) {
+      repository.getRecentStickers(stickers::postValue);
+    } else {
+      repository.getStickersForPack(packId, stickers::postValue);
+    }
+
+    return stickers;
+  }
+
+  @Override
+  protected void onCleared() {
+    application.getContentResolver().unregisterContentObserver(observer);
+  }
+
+  static class Factory extends ViewModelProvider.NewInstanceFactory {
+    private final Application               application;
+    private final StickerKeyboardRepository repository;
+
+    Factory(@NonNull Application application, @NonNull StickerKeyboardRepository repository) {
+      this.application = application;
+      this.repository  = repository;
+    }
+
+    @Override
+    public @NonNull<T extends ViewModel> T create(@NonNull Class<T> modelClass) {
+      //noinspection ConstantConditions
+      return modelClass.cast(new StickerKeyboardPageViewModel(application, repository));
+    }
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java
new file mode 100644
index 000000000..0f37fcf12
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java
@@ -0,0 +1,258 @@
+package org.thoughtcrime.securesms.stickers;
+
+import android.arch.lifecycle.ViewModelProviders;
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+import android.support.v7.app.AppCompatActivity;
+import android.widget.ImageView;
+
+import org.thoughtcrime.securesms.components.emoji.MediaKeyboardProvider;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.model.StickerPackRecord;
+import org.thoughtcrime.securesms.database.model.StickerRecord;
+import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader;
+import org.thoughtcrime.securesms.mms.GlideRequests;
+import org.thoughtcrime.securesms.stickers.StickerKeyboardPageFragment.EventListener;
+import org.thoughtcrime.securesms.stickers.StickerKeyboardRepository.PackListResult;
+import org.thoughtcrime.securesms.util.ResUtil;
+import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.thoughtcrime.securesms.util.Throttler;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import network.loki.messenger.R;
+
+/**
+ * A provider to select stickers in the {@link org.thoughtcrime.securesms.components.emoji.MediaKeyboard}.
+ */
+public final class StickerKeyboardProvider implements MediaKeyboardProvider,
+                                                MediaKeyboardProvider.AddObserver,
+                                                StickerKeyboardPageFragment.EventListener
+{
+
+  private final Context              context;
+  private final StickerEventListener eventListener;
+  private final StickerPagerAdapter  pagerAdapter;
+  private final Throttler            stickerThrottler;
+
+  private Controller               controller;
+  private Presenter                presenter;
+  private boolean                  isSoloProvider;
+  private StickerKeyboardViewModel viewModel;
+
+  public StickerKeyboardProvider(@NonNull AppCompatActivity activity,
+                                 @NonNull StickerEventListener eventListener)
+  {
+    this.context          = activity;
+    this.eventListener    = eventListener;
+    this.pagerAdapter     = new StickerPagerAdapter(activity.getSupportFragmentManager(), this);
+    this.stickerThrottler = new Throttler(100);
+
+    initViewModel(activity);
+  }
+
+  @Override
+  public int getProviderIconView(boolean selected) {
+    if (selected) {
+      return ThemeUtil.isDarkTheme(context) ? R.layout.sticker_keyboard_icon_dark_selected : R.layout.sticker_keyboard_icon_light_selected;
+    } else {
+      return ThemeUtil.isDarkTheme(context) ? R.layout.sticker_keyboard_icon_dark : R.layout.sticker_keyboard_icon_light;
+    }
+  }
+
+  @Override
+  public void requestPresentation(@NonNull Presenter presenter, boolean isSoloProvider) {
+    this.presenter      = presenter;
+    this.isSoloProvider = isSoloProvider;
+
+    PackListResult result = viewModel.getPacks().getValue();
+
+    if (result != null) {
+      present(presenter, result, true);
+    }
+  }
+
+  @Override
+  public void setController(@Nullable Controller controller) {
+    this.controller = controller;
+  }
+
+  @Override
+  public void onAddClicked() {
+    eventListener.onStickerManagementClicked();
+  }
+
+  @Override
+  public void onStickerSelected(@NonNull StickerRecord sticker) {
+    stickerThrottler.publish(() -> eventListener.onStickerSelected(sticker));
+  }
+
+  @Override
+  public void onStickerPopupStarted() {
+    if (controller != null) {
+      controller.setViewPagerEnabled(false);
+    }
+  }
+
+  @Override
+  public void onStickerPopupEnded() {
+    if (controller != null) {
+      controller.setViewPagerEnabled(true);
+    }
+  }
+
+  private void initViewModel(@NonNull AppCompatActivity activity) {
+    StickerKeyboardRepository repository = new StickerKeyboardRepository(DatabaseFactory.getStickerDatabase(activity));
+    viewModel = ViewModelProviders.of(activity, new StickerKeyboardViewModel.Factory(activity.getApplication(), repository)).get(StickerKeyboardViewModel.class);
+
+    viewModel.getPacks().observe(activity, result -> {
+      if (result == null) return;
+
+      int previousCount = pagerAdapter.getCount();
+
+      pagerAdapter.setPacks(result.getPacks());
+
+      if (presenter != null) {
+        present(presenter, result, previousCount != pagerAdapter.getCount());
+      }
+    });
+  }
+
+  private void present(@NonNull Presenter presenter, @NonNull PackListResult result, boolean calculateStartingIndex) {
+    if (result.getPacks().isEmpty() && presenter.isVisible()) {
+      context.startActivity(StickerManagementActivity.getIntent(context));
+      presenter.requestDismissal();
+      return;
+    }
+
+    int startingIndex = presenter.getCurrentPosition();
+
+    if (calculateStartingIndex) {
+      startingIndex = !result.hasRecents() && result.getPacks().size() > 0 ? 1 : 0;
+    }
+
+    presenter.present(this, pagerAdapter, new IconProvider(context, result.getPacks()), null, this, null, startingIndex);
+
+    if (isSoloProvider && result.getPacks().isEmpty()) {
+      context.startActivity(StickerManagementActivity.getIntent(context));
+    }
+  }
+
+  @Override
+  public boolean equals(@Nullable Object obj) {
+    return obj instanceof StickerKeyboardProvider;
+  }
+
+  private static class StickerPagerAdapter extends FragmentStatePagerAdapter {
+
+    private final List<StickerPackRecord> packs;
+    private final Map<String, Integer>    itemPositions;
+    private final EventListener           eventListener;
+
+    public StickerPagerAdapter(@NonNull FragmentManager fm, @NonNull EventListener eventListener) {
+      super(fm);
+      this.eventListener = eventListener;
+      this.packs         = new ArrayList<>();
+      this.itemPositions = new HashMap<>();
+    }
+
+    @Override
+    public int getItemPosition(@NonNull Object object) {
+      String packId = ((StickerKeyboardPageFragment) object).getPackId();
+
+      if (itemPositions.containsKey(packId)) {
+        //noinspection ConstantConditions
+        return itemPositions.get(packId);
+      }
+
+      return POSITION_NONE;
+    }
+
+    @Override
+    public Fragment getItem(int i) {
+      StickerKeyboardPageFragment fragment;
+
+      if (i == 0) {
+        fragment = StickerKeyboardPageFragment.newInstance(StickerKeyboardPageFragment.RECENT_PACK_ID);
+      } else {
+        StickerPackRecord pack = packs.get(i - 1);
+        fragment = StickerKeyboardPageFragment.newInstance(pack.getPackId());
+      }
+
+      fragment.setEventListener(eventListener);
+
+      return fragment;
+    }
+
+    @Override
+    public int getCount() {
+      return packs.isEmpty() ? 0 : packs.size() + 1;
+    }
+
+    void setPacks(@NonNull List<StickerPackRecord> packs) {
+      itemPositions.clear();
+
+      if (areListsEqual(this.packs, packs)) {
+        itemPositions.put(StickerKeyboardPageFragment.RECENT_PACK_ID, 0);
+        for (int i = 0; i < packs.size(); i++) {
+          itemPositions.put(packs.get(i).getPackId(), i + 1);
+        }
+      }
+
+      this.packs.clear();
+      this.packs.addAll(packs);
+
+      notifyDataSetChanged();
+    }
+
+    boolean areListsEqual(@NonNull List<StickerPackRecord> a, @NonNull List<StickerPackRecord> b) {
+      if (a.size() != b.size()) return false;
+
+      for (int i = 0; i < a.size(); i++) {
+        if (!a.get(i).equals(b.get(i))) {
+          return false;
+        }
+      }
+
+      return true;
+    }
+  }
+
+  private static class IconProvider implements TabIconProvider {
+
+    private final Context                 context;
+    private final List<StickerPackRecord> packs;
+
+    private IconProvider(@NonNull Context context, List<StickerPackRecord> packs) {
+      this.context    = context;
+      this.packs      = packs;
+    }
+
+    @Override
+    public void loadCategoryTabIcon(@NonNull GlideRequests glideRequests, @NonNull ImageView imageView, int index) {
+      if (index == 0) {
+        Drawable icon = ResUtil.getDrawable(context, R.attr.emoji_category_recent);
+        imageView.setImageDrawable(icon);
+      } else {
+        Uri uri = packs.get(index - 1).getCover().getUri();
+
+        glideRequests.load(new DecryptableStreamUriLoader.DecryptableUri(uri))
+                     .into(imageView);
+      }
+    }
+  }
+
+  public interface StickerEventListener {
+    void onStickerSelected(@NonNull StickerRecord sticker);
+    void onStickerManagementClicked();
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardRepository.java b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardRepository.java
new file mode 100644
index 000000000..891da9481
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardRepository.java
@@ -0,0 +1,99 @@
+package org.thoughtcrime.securesms.stickers;
+
+import android.database.Cursor;
+import android.support.annotation.NonNull;
+
+import org.thoughtcrime.securesms.database.StickerDatabase;
+import org.thoughtcrime.securesms.database.StickerDatabase.StickerPackRecordReader;
+import org.thoughtcrime.securesms.database.StickerDatabase.StickerRecordReader;
+import org.thoughtcrime.securesms.database.model.StickerPackRecord;
+import org.thoughtcrime.securesms.database.model.StickerRecord;
+import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
+
+import java.util.ArrayList;
+import java.util.List;
+
+final class StickerKeyboardRepository {
+
+  private static final int RECENT_LIMIT = 24;
+
+  private final StickerDatabase stickerDatabase;
+
+  StickerKeyboardRepository(@NonNull StickerDatabase stickerDatabase) {
+    this.stickerDatabase = stickerDatabase;
+  }
+
+  void getPackList(@NonNull Callback<PackListResult> callback) {
+    SignalExecutors.BOUNDED.execute(() -> {
+      List<StickerPackRecord> packs = new ArrayList<>();
+
+      try (StickerPackRecordReader reader = new StickerPackRecordReader(stickerDatabase.getInstalledStickerPacks())) {
+        StickerPackRecord pack;
+        while ((pack = reader.getNext()) != null) {
+          packs.add(pack);
+        }
+      }
+
+      boolean hasRecents;
+
+      try (Cursor recentsCursor = stickerDatabase.getRecentlyUsedStickers(1)) {
+        hasRecents = recentsCursor != null && recentsCursor.moveToFirst();
+      }
+
+      callback.onComplete(new PackListResult(packs, hasRecents));
+    });
+  }
+
+  void getStickersForPack(@NonNull String packId, @NonNull Callback<List<StickerRecord>> callback) {
+    SignalExecutors.BOUNDED.execute(() -> {
+      List<StickerRecord> stickers = new ArrayList<>();
+
+      try (StickerRecordReader reader = new StickerRecordReader(stickerDatabase.getStickersForPack(packId))) {
+        StickerRecord sticker;
+        while ((sticker = reader.getNext()) != null) {
+          stickers.add(sticker);
+        }
+      }
+
+      callback.onComplete(stickers);
+    });
+  }
+
+  void getRecentStickers(@NonNull Callback<List<StickerRecord>> callback) {
+    SignalExecutors.BOUNDED.execute(() -> {
+      List<StickerRecord> stickers = new ArrayList<>();
+
+      try (StickerRecordReader reader = new StickerRecordReader(stickerDatabase.getRecentlyUsedStickers(RECENT_LIMIT))) {
+        StickerRecord sticker;
+        while ((sticker = reader.getNext()) != null) {
+          stickers.add(sticker);
+        }
+      }
+
+      callback.onComplete(stickers);
+    });
+  }
+
+  static class PackListResult {
+
+    private final List<StickerPackRecord> packs;
+    private final boolean                 hasRecents;
+
+    PackListResult(List<StickerPackRecord> packs, boolean hasRecents) {
+      this.packs      = packs;
+      this.hasRecents = hasRecents;
+    }
+
+    List<StickerPackRecord> getPacks() {
+      return packs;
+    }
+
+    boolean hasRecents() {
+      return hasRecents;
+    }
+  }
+
+  interface Callback<T> {
+    void onComplete(T result);
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardViewModel.java b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardViewModel.java
new file mode 100644
index 000000000..2833f554a
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardViewModel.java
@@ -0,0 +1,62 @@
+package org.thoughtcrime.securesms.stickers;
+
+import android.app.Application;
+import android.arch.lifecycle.LiveData;
+import android.arch.lifecycle.MutableLiveData;
+import android.arch.lifecycle.ViewModel;
+import android.arch.lifecycle.ViewModelProvider;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.support.annotation.NonNull;
+
+import org.thoughtcrime.securesms.database.DatabaseContentProviders;
+import org.thoughtcrime.securesms.stickers.StickerKeyboardRepository.PackListResult;
+import org.thoughtcrime.securesms.util.Throttler;
+
+final class StickerKeyboardViewModel extends ViewModel {
+
+  private final Application                     application;
+  private final MutableLiveData<PackListResult> packs;
+  private final Throttler                       observerThrottler;
+  private final ContentObserver                 observer;
+
+  private StickerKeyboardViewModel(@NonNull Application application, @NonNull StickerKeyboardRepository repository) {
+    this.application       = application;
+    this.packs             = new MutableLiveData<>();
+    this.observerThrottler = new Throttler(500);
+    this.observer          = new ContentObserver(new Handler()) {
+      @Override
+      public void onChange(boolean selfChange) {
+        observerThrottler.publish(() -> repository.getPackList(packs::postValue));
+      }
+    };
+
+    repository.getPackList(packs::postValue);
+    application.getContentResolver().registerContentObserver(DatabaseContentProviders.StickerPack.CONTENT_URI, true, observer);
+  }
+
+  @NonNull LiveData<PackListResult> getPacks() {
+    return packs;
+  }
+
+  @Override
+  protected void onCleared() {
+    application.getContentResolver().unregisterContentObserver(observer);
+  }
+
+  public static final class Factory extends ViewModelProvider.NewInstanceFactory {
+    private final Application               application;
+    private final StickerKeyboardRepository repository;
+
+    public Factory(@NonNull Application application, @NonNull StickerKeyboardRepository repository) {
+      this.application = application;
+      this.repository  = repository;
+    }
+
+    @Override
+    public @NonNull<T extends ViewModel> T create(@NonNull Class<T> modelClass) {
+      //noinspection ConstantConditions
+      return modelClass.cast(new StickerKeyboardViewModel(application, repository));
+    }
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerLocator.java b/src/org/thoughtcrime/securesms/stickers/StickerLocator.java
new file mode 100644
index 000000000..68a8ed972
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/stickers/StickerLocator.java
@@ -0,0 +1,60 @@
+package org.thoughtcrime.securesms.stickers;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+
+public class StickerLocator implements Parcelable {
+
+  private final String packId;
+  private final String packKey;
+  private final int    stickerId;
+
+  public StickerLocator(@NonNull String packId, @NonNull String packKey, int stickerId) {
+    this.packId    = packId;
+    this.packKey   = packKey;
+    this.stickerId = stickerId;
+  }
+
+  private StickerLocator(Parcel in) {
+    packId    = in.readString();
+    packKey   = in.readString();
+    stickerId = in.readInt();
+  }
+
+  public @NonNull String getPackId() {
+    return packId;
+  }
+
+  public @NonNull String getPackKey() {
+    return packKey;
+  }
+
+  public @NonNull int getStickerId() {
+    return stickerId;
+  }
+
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  @Override
+  public void writeToParcel(Parcel dest, int flags) {
+    dest.writeString(packId);
+    dest.writeString(packKey);
+    dest.writeInt(stickerId);
+  }
+
+  public static final Creator<StickerLocator> CREATOR = new Creator<StickerLocator>() {
+    @Override
+    public StickerLocator createFromParcel(Parcel in) {
+      return new StickerLocator(in);
+    }
+
+    @Override
+    public StickerLocator[] newArray(int size) {
+      return new StickerLocator[size];
+    }
+  };
+}
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerManagementActivity.java b/src/org/thoughtcrime/securesms/stickers/StickerManagementActivity.java
new file mode 100644
index 000000000..e2c579530
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/stickers/StickerManagementActivity.java
@@ -0,0 +1,118 @@
+package org.thoughtcrime.securesms.stickers;
+
+import android.arch.lifecycle.ViewModelProviders;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.MenuItem;
+
+import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity;
+import org.thoughtcrime.securesms.ShareActivity;
+import org.thoughtcrime.securesms.mms.GlideApp;
+import org.thoughtcrime.securesms.util.DynamicTheme;
+
+import network.loki.messenger.R;
+
+/**
+ * Allows the user to view and manage (install, uninstall, etc) their stickers.
+ */
+public final class StickerManagementActivity extends PassphraseRequiredActionBarActivity implements StickerManagementAdapter.EventListener {
+
+  private final DynamicTheme dynamicTheme = new DynamicTheme();
+
+  private RecyclerView             list;
+  private StickerManagementAdapter adapter;
+
+  private StickerManagementViewModel viewModel;
+
+  public static Intent getIntent(@NonNull Context context) {
+    return new Intent(context, StickerManagementActivity.class);
+  }
+
+  @Override
+  protected void onPreCreate() {
+    super.onPreCreate();
+    dynamicTheme.onCreate(this);
+  }
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState, boolean ready) {
+    setContentView(R.layout.sticker_management_activity);
+
+    initView();
+    initToolbar();
+    initViewModel();
+  }
+
+  @Override
+  protected void onStart() {
+    super.onStart();
+    viewModel.onVisible();
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+    dynamicTheme.onResume(this);
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    if (item.getItemId() == android.R.id.home) {
+      onBackPressed();
+      return true;
+    }
+    return super.onOptionsItemSelected(item);
+  }
+
+  @Override
+  public void onStickerPackClicked(@NonNull String packId, @NonNull String packKey) {
+    startActivity(StickerPackPreviewActivity.getIntent(packId, packKey));
+  }
+
+  @Override
+  public void onStickerPackUninstallClicked(@NonNull String packId, @NonNull String packKey) {
+    viewModel.onStickerPackUninstallClicked(packId, packKey);
+  }
+
+  @Override
+  public void onStickerPackInstallClicked(@NonNull String packId, @NonNull String packKey) {
+    viewModel.onStickerPackInstallClicked(packId, packKey);
+  }
+
+  @Override
+  public void onStickerPackShareClicked(@NonNull String packId, @NonNull String packKey) {
+    Intent composeIntent = new Intent(this, ShareActivity.class);
+    composeIntent.putExtra(Intent.EXTRA_TEXT, StickerUrl.createShareLink(packId, packKey));
+    startActivity(composeIntent);
+    finish();
+  }
+
+  private void initView() {
+    this.list    = findViewById(R.id.sticker_management_list);
+    this.adapter = new StickerManagementAdapter(GlideApp.with(this), this);
+
+    list.setLayoutManager(new LinearLayoutManager(this));
+    list.setAdapter(adapter);
+  }
+
+  private void initToolbar() {
+    getSupportActionBar().setTitle(R.string.StickerManagementActivity_stickers);
+    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+  }
+
+  private void initViewModel() {
+    StickerManagementRepository repository = new StickerManagementRepository(this);
+    viewModel = ViewModelProviders.of(this, new StickerManagementViewModel.Factory(getApplication(), repository)).get(StickerManagementViewModel.class);
+
+    viewModel.init();
+    viewModel.getStickerPacks().observe(this, packResult -> {
+      if (packResult == null) return;
+
+      adapter.setPackLists(packResult.getInstalledPacks(), packResult.getAvailablePacks(), packResult.getBlessedPacks());
+    });
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java b/src/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java
new file mode 100644
index 000000000..6670ade31
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java
@@ -0,0 +1,329 @@
+package org.thoughtcrime.securesms.stickers;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.StringRes;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.annimon.stream.Stream;
+import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
+
+import org.thoughtcrime.securesms.database.model.StickerPackRecord;
+import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
+import org.thoughtcrime.securesms.mms.GlideRequests;
+import org.thoughtcrime.securesms.util.StableIdGenerator;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import network.loki.messenger.R;
+
+final class StickerManagementAdapter extends RecyclerView.Adapter {
+
+  private static final int TYPE_HEADER = 1;
+  private static final int TYPE_EMPTY  = 2;
+  private static final int TYPE_PACK   = 3;
+
+  private static final String TAG_YOUR_STICKERS    = "YourStickers";
+  private static final String TAG_MESSAGE_STICKERS = "MessageStickers";
+  private static final String TAG_BLESSED_STICKERS = "BlessedStickers";
+
+  private final GlideRequests             glideRequests;
+  private final EventListener             eventListener;
+  private final StableIdGenerator<String> stableIdGenerator;
+
+  private final List<Section> sections = new ArrayList<Section>(3) {{
+    Section yourStickers    = new Section(TAG_YOUR_STICKERS,
+                                          R.string.StickerManagementAdapter_installed_stickers,
+                                          R.string.StickerManagementAdapter_no_stickers_installed,
+                                          new ArrayList<>(),
+                                          0);
+    Section messageStickers = new Section(TAG_MESSAGE_STICKERS,
+                                          R.string.StickerManagementAdapter_stickers_you_received,
+                                          R.string.StickerManagementAdapter_stickers_from_incoming_messages_will_appear_here,
+                                          new ArrayList<>(),
+                                          yourStickers.size());
+
+    add(yourStickers);
+    add(messageStickers);
+  }};
+
+  StickerManagementAdapter(@NonNull GlideRequests glideRequests, @NonNull EventListener eventListener) {
+    this.glideRequests     = glideRequests;
+    this.eventListener     = eventListener;
+    this.stableIdGenerator = new StableIdGenerator<>();
+
+    setHasStableIds(true);
+  }
+
+  @Override
+  public long getItemId(int position) {
+    for (Section section : sections) {
+      if (section.handles(position)) {
+        return section.getItemId(stableIdGenerator, position);
+      }
+    }
+    throw new NoSectionException();
+  }
+
+  @Override
+  public int getItemViewType(int position) {
+    for (Section section : sections) {
+      if (section.handles(position)) {
+        return section.getViewType(position);
+      }
+    }
+    throw new NoSectionException();
+  }
+
+  @Override
+  public @NonNull RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int viewType) {
+    switch (viewType) {
+      case TYPE_HEADER:
+        return new HeaderViewHolder(LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.sticker_management_header_item, viewGroup, false));
+      case TYPE_EMPTY:
+        return new EmptyViewHolder(LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.sticker_management_empty_item, viewGroup, false));
+      case TYPE_PACK:
+        return new StickerViewHolder(LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.sticker_management_sticker_item, viewGroup, false));
+      default:
+        throw new AssertionError("Unexpected viewType! " + viewType);
+    }
+  }
+
+  @Override
+  public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int position) {
+    for (Section section : sections) {
+      if (section.handles(position)) {
+        section.bindViewHolder(viewHolder, position, glideRequests, eventListener);
+        return;
+      }
+    }
+    throw new NoSectionException();
+  }
+
+  @Override
+  public void onViewRecycled(@NonNull RecyclerView.ViewHolder holder) {
+    if (holder instanceof StickerViewHolder) {
+      ((StickerViewHolder) holder).recycle();
+    }
+  }
+
+  @Override
+  public int getItemCount() {
+    return Stream.of(sections).reduce(0, (sum, section) -> sum + section.size());
+  }
+
+  void setPackLists(@NonNull List<StickerPackRecord> installedPacks,
+                    @NonNull List<StickerPackRecord> availablePacks,
+                    @NonNull List<StickerPackRecord> blessedPacks)
+  {
+    Section yourStickers    = new Section(TAG_YOUR_STICKERS,
+                                          R.string.StickerManagementAdapter_installed_stickers,
+                                          R.string.StickerManagementAdapter_no_stickers_installed,
+                                          installedPacks,
+                                          0);
+    Section blessedStickers = new Section(TAG_BLESSED_STICKERS,
+                                          R.string.StickerManagementAdapter_signal_artist_series,
+                                          0,
+                                          blessedPacks,
+                                          yourStickers.size());
+    Section messageStickers = new Section(TAG_MESSAGE_STICKERS,
+                                          R.string.StickerManagementAdapter_stickers_you_received,
+                                          R.string.StickerManagementAdapter_stickers_from_incoming_messages_will_appear_here,
+                                          availablePacks,
+                                          yourStickers.size() + (blessedPacks.isEmpty() ? 0 : blessedStickers.size()));
+
+    sections.clear();
+    sections.add(yourStickers);
+
+    if (!blessedPacks.isEmpty()) {
+      sections.add(blessedStickers);
+    }
+
+    sections.add(messageStickers);
+
+    notifyDataSetChanged();
+  }
+
+  private static class Section {
+    private static final String STABLE_ID_HEADER = "header";
+    private static final String STABLE_ID_TEXT   = "text";
+
+    private final String                  tag;
+    private final int                     titleResId;
+    private final int                     emptyResId;
+    private final List<StickerPackRecord> records;
+    private final int                     offset;
+
+    Section(@NonNull String tag,
+            @StringRes int titleResId,
+            @StringRes int emptyResId,
+            @NonNull List<StickerPackRecord> records,
+            int offset)
+    {
+      this.tag        = tag;
+      this.titleResId = titleResId;
+      this.emptyResId = emptyResId;
+      this.records    = records;
+      this.offset     = offset;
+    }
+
+    int getViewType(int globalPosition) {
+      int localPosition = globalPosition - offset;
+
+      if (localPosition == 0) {
+        return TYPE_HEADER;
+      } else if (records.isEmpty()) {
+        return TYPE_EMPTY;
+      } else {
+        return TYPE_PACK;
+      }
+    }
+
+    long getItemId(@NonNull StableIdGenerator<String> idGenerator, int globalPosition) {
+      int localPosition = globalPosition - offset;
+
+      if (localPosition == 0) {
+        return idGenerator.getId(tag + "_" + STABLE_ID_HEADER);
+      } else if (records.isEmpty()) {
+        return idGenerator.getId(tag + "_" + STABLE_ID_TEXT);
+      } else {
+        return idGenerator.getId(records.get(localPosition - 1).getPackId());
+      }
+    }
+
+    void bindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder,
+                        int globalPosition,
+                        @NonNull GlideRequests glideRequests,
+                        @NonNull EventListener eventListener)
+    {
+      int localPosition = globalPosition - offset;
+
+      if (localPosition == 0) {
+        ((HeaderViewHolder) viewHolder).bind(titleResId);
+      } else if (records.isEmpty()) {
+        ((EmptyViewHolder) viewHolder).bind(emptyResId);
+      } else {
+        ((StickerViewHolder) viewHolder).bind(glideRequests, eventListener, records.get(localPosition - 1), localPosition == records.size());
+      }
+    }
+
+    boolean handles(int globalPosition) {
+      int localPosition = globalPosition - offset;
+      return localPosition >= 0 && localPosition < size();
+    }
+
+    int size() {
+      return records.isEmpty() ? 2 : records.size() + 1;
+    }
+  }
+
+  static class StickerViewHolder extends RecyclerView.ViewHolder {
+
+    private final ImageView cover;
+    private final TextView  title;
+    private final TextView  author;
+    private final View      badge;
+    private final View      divider;
+    private final View      actionButton;
+    private final ImageView actionButtonImage;
+    private final View      shareButton;
+    private final ImageView shareButtonImage;
+
+    StickerViewHolder(@NonNull View itemView) {
+      super(itemView);
+
+      this.cover             = itemView.findViewById(R.id.sticker_management_cover);
+      this.title             = itemView.findViewById(R.id.sticker_management_title);
+      this.author            = itemView.findViewById(R.id.sticker_management_author);
+      this.badge             = itemView.findViewById(R.id.sticker_management_blessed_badge);
+      this.divider           = itemView.findViewById(R.id.sticker_management_divider);
+      this.actionButton      = itemView.findViewById(R.id.sticker_management_action_button);
+      this.actionButtonImage = itemView.findViewById(R.id.sticker_management_action_button_image);
+      this.shareButton       = itemView.findViewById(R.id.sticker_management_share_button);
+      this.shareButtonImage  = itemView.findViewById(R.id.sticker_management_share_button_image);
+    }
+
+    void bind(@NonNull GlideRequests glideRequests,
+              @NonNull EventListener eventListener,
+              @NonNull StickerPackRecord stickerPack,
+              boolean lastInList)
+    {
+      title.setText(stickerPack.getTitle().or(itemView.getResources().getString(R.string.StickerManagementAdapter_untitled)));
+      author.setText(stickerPack.getAuthor().or(itemView.getResources().getString(R.string.StickerManagementAdapter_unknown)));
+      divider.setVisibility(lastInList ? View.GONE : View.VISIBLE);
+      badge.setVisibility(BlessedPacks.contains(stickerPack.getPackId()) ? View.VISIBLE : View.GONE);
+
+      glideRequests.load(new DecryptableUri(stickerPack.getCover().getUri()))
+                   .transition(DrawableTransitionOptions.withCrossFade())
+                   .into(cover);
+
+      if (stickerPack.isInstalled()) {
+        actionButtonImage.setImageResource(R.drawable.ic_x);
+        actionButton.setOnClickListener(v -> eventListener.onStickerPackUninstallClicked(stickerPack.getPackId(), stickerPack.getPackKey()));
+
+        shareButton.setVisibility(View.VISIBLE);
+        shareButtonImage.setVisibility(View.VISIBLE);
+        shareButton.setOnClickListener(v -> eventListener.onStickerPackShareClicked(stickerPack.getPackId(), stickerPack.getPackKey()));
+      } else {
+        actionButtonImage.setImageResource(R.drawable.ic_arrow_down);
+        actionButton.setOnClickListener(v -> eventListener.onStickerPackInstallClicked(stickerPack.getPackId(), stickerPack.getPackKey()));
+
+        shareButton.setVisibility(View.GONE);
+        shareButtonImage.setVisibility(View.GONE);
+        shareButton.setOnClickListener(null);
+      }
+
+      itemView.setOnClickListener(v -> eventListener.onStickerPackClicked(stickerPack.getPackId(), stickerPack.getPackKey()));
+    }
+
+    void recycle() {
+      actionButton.setOnClickListener(null);
+      shareButton.setOnClickListener(null);
+      itemView.setOnClickListener(null);
+    }
+  }
+
+  static class HeaderViewHolder extends RecyclerView.ViewHolder {
+
+    private final TextView titleView;
+
+    HeaderViewHolder(@NonNull View itemView) {
+      super(itemView);
+
+      this.titleView = itemView.findViewById(R.id.sticker_management_header);
+    }
+
+    void bind(@StringRes int title) {
+      titleView.setText(title);
+    }
+  }
+
+  static class EmptyViewHolder extends RecyclerView.ViewHolder {
+
+    private final TextView text;
+
+    EmptyViewHolder(@NonNull View itemView) {
+      super(itemView);
+
+      this.text = itemView.findViewById(R.id.sticker_management_empty_text);
+    }
+
+    void bind(@StringRes int title) {
+      text.setText(title);
+    }
+  }
+
+  interface EventListener {
+    void onStickerPackClicked(@NonNull String packId, @NonNull String packKey);
+    void onStickerPackUninstallClicked(@NonNull String packId, @NonNull String packKey);
+    void onStickerPackInstallClicked(@NonNull String packId, @NonNull String packKey);
+    void onStickerPackShareClicked(@NonNull String packId, @NonNull String packKey);
+  }
+
+  private static class NoSectionException extends IllegalStateException {}
+}
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerManagementRepository.java b/src/org/thoughtcrime/securesms/stickers/StickerManagementRepository.java
new file mode 100644
index 000000000..4208ac0cf
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/stickers/StickerManagementRepository.java
@@ -0,0 +1,135 @@
+package org.thoughtcrime.securesms.stickers;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.support.annotation.NonNull;
+
+import org.thoughtcrime.securesms.ApplicationContext;
+import org.thoughtcrime.securesms.database.AttachmentDatabase;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.StickerDatabase;
+import org.thoughtcrime.securesms.database.StickerDatabase.StickerPackRecordReader;
+import org.thoughtcrime.securesms.database.model.StickerPackRecord;
+import org.thoughtcrime.securesms.jobmanager.JobManager;
+import org.thoughtcrime.securesms.jobs.MultiDeviceStickerPackOperationJob;
+import org.thoughtcrime.securesms.jobs.StickerPackDownloadJob;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
+
+import java.util.ArrayList;
+import java.util.List;
+
+final class StickerManagementRepository {
+
+  private final Context            context;
+  private final StickerDatabase    stickerDatabase;
+  private final AttachmentDatabase attachmentDatabase;
+
+  StickerManagementRepository(@NonNull Context context) {
+    this.context            = context.getApplicationContext();
+    this.stickerDatabase    = DatabaseFactory.getStickerDatabase(context);
+    this.attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context);
+  }
+
+  void deleteOrphanedStickerPacks() {
+    SignalExecutors.SERIAL.execute(stickerDatabase::deleteOrphanedPacks);
+  }
+
+  void fetchUnretrievedReferencePacks() {
+    SignalExecutors.SERIAL.execute(() -> {
+      JobManager jobManager = ApplicationContext.getInstance(context).getJobManager();
+
+      try (Cursor cursor = attachmentDatabase.getUnavailableStickerPacks()) {
+        while (cursor != null && cursor.moveToNext()) {
+          String packId  = cursor.getString(cursor.getColumnIndexOrThrow(AttachmentDatabase.STICKER_PACK_ID));
+          String packKey = cursor.getString(cursor.getColumnIndexOrThrow(AttachmentDatabase.STICKER_PACK_KEY));
+
+          jobManager.add(new StickerPackDownloadJob(packId, packKey, true));
+        }
+      }
+    });
+  }
+
+  void getStickerPacks(@NonNull Callback<PackResult> callback) {
+    SignalExecutors.SERIAL.execute(() -> {
+      List<StickerPackRecord> installedPacks = new ArrayList<>();
+      List<StickerPackRecord> availablePacks = new ArrayList<>();
+      List<StickerPackRecord> blessedPacks   = new ArrayList<>();
+
+      try (StickerPackRecordReader reader = new StickerPackRecordReader(stickerDatabase.getAllStickerPacks())) {
+        StickerPackRecord record;
+        while ((record = reader.getNext()) != null) {
+          if (record.isInstalled()) {
+            installedPacks.add(record);
+          } else if (BlessedPacks.contains(record.getPackId())) {
+            blessedPacks.add(record);
+          } else {
+            availablePacks.add(record);
+          }
+        }
+      }
+
+      callback.onComplete(new PackResult(installedPacks, availablePacks, blessedPacks));
+    });
+  }
+
+  void uninstallStickerPack(@NonNull String packId, @NonNull String packKey) {
+    SignalExecutors.SERIAL.execute(() -> {
+      stickerDatabase.uninstallPack(packId);
+
+      if (TextSecurePreferences.isMultiDevice(context)) {
+        ApplicationContext.getInstance(context)
+                          .getJobManager()
+                          .add(new MultiDeviceStickerPackOperationJob(packId, packKey, MultiDeviceStickerPackOperationJob.Type.REMOVE));
+      }
+    });
+  }
+
+  void installStickerPack(@NonNull String packId, @NonNull String packKey) {
+    SignalExecutors.SERIAL.execute(() -> {
+      JobManager jobManager = ApplicationContext.getInstance(context).getJobManager();
+
+      if (stickerDatabase.isPackAvailableAsReference(packId)) {
+        stickerDatabase.markPackAsInstalled(packId);
+      }
+
+      jobManager.add(new StickerPackDownloadJob(packId, packKey, false));
+
+      if (TextSecurePreferences.isMultiDevice(context)) {
+        jobManager.add(new MultiDeviceStickerPackOperationJob(packId, packKey, MultiDeviceStickerPackOperationJob.Type.INSTALL));
+      }
+    });
+  }
+
+  static class PackResult {
+
+    private final List<StickerPackRecord> installedPacks;
+    private final List<StickerPackRecord> availablePacks;
+    private final List<StickerPackRecord> blessedPacks;
+
+    PackResult(@NonNull List<StickerPackRecord> installedPacks,
+               @NonNull List<StickerPackRecord> availablePacks,
+               @NonNull List<StickerPackRecord> blessedPacks)
+    {
+      this.installedPacks = installedPacks;
+      this.availablePacks = availablePacks;
+      this.blessedPacks   = blessedPacks;
+    }
+
+    @NonNull List<StickerPackRecord> getInstalledPacks() {
+      return installedPacks;
+    }
+
+    @NonNull List<StickerPackRecord> getAvailablePacks() {
+      return availablePacks;
+    }
+
+    @NonNull List<StickerPackRecord> getBlessedPacks() {
+      return blessedPacks;
+    }
+  }
+
+  interface Callback<T> {
+    void onComplete(T result);
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.java b/src/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.java
new file mode 100644
index 000000000..062954bd4
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.java
@@ -0,0 +1,80 @@
+package org.thoughtcrime.securesms.stickers;
+
+import android.app.Application;
+import android.arch.lifecycle.LiveData;
+import android.arch.lifecycle.MutableLiveData;
+import android.arch.lifecycle.ViewModel;
+import android.arch.lifecycle.ViewModelProvider;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.support.annotation.NonNull;
+
+import org.thoughtcrime.securesms.database.DatabaseContentProviders;
+import org.thoughtcrime.securesms.stickers.StickerManagementRepository.PackResult;
+
+final class StickerManagementViewModel extends ViewModel {
+
+  private final Application                 application;
+  private final StickerManagementRepository repository;
+  private final MutableLiveData<PackResult> packs;
+  private final ContentObserver             observer;
+
+  private StickerManagementViewModel(@NonNull Application application, @NonNull StickerManagementRepository repository) {
+    this.application = application;
+    this.repository  = repository;
+    this.packs       = new MutableLiveData<>();
+    this.observer    = new ContentObserver(new Handler()) {
+      @Override
+      public void onChange(boolean selfChange) {
+        repository.deleteOrphanedStickerPacks();
+        repository.getStickerPacks(packs::postValue);
+      }
+    };
+
+    application.getContentResolver().registerContentObserver(DatabaseContentProviders.StickerPack.CONTENT_URI, true, observer);
+  }
+
+  void init() {
+    repository.deleteOrphanedStickerPacks();
+    repository.fetchUnretrievedReferencePacks();
+  }
+
+  void onVisible() {
+    repository.deleteOrphanedStickerPacks();
+  }
+
+  @NonNull LiveData<PackResult> getStickerPacks() {
+    repository.getStickerPacks(packs::postValue);
+    return packs;
+  }
+
+  void onStickerPackUninstallClicked(@NonNull String packId, @NonNull String packKey) {
+    repository.uninstallStickerPack(packId, packKey);
+  }
+
+  void onStickerPackInstallClicked(@NonNull String packId, @NonNull String packKey) {
+    repository.installStickerPack(packId, packKey);
+  }
+
+  @Override
+  protected void onCleared() {
+    application.getContentResolver().unregisterContentObserver(observer);
+  }
+
+  static class Factory extends ViewModelProvider.NewInstanceFactory {
+
+    private final Application                 application;
+    private final StickerManagementRepository repository;
+
+    Factory(@NonNull Application application, @NonNull StickerManagementRepository repository) {
+      this.application = application;
+      this.repository  = repository;
+    }
+
+    @Override
+    public @NonNull <T extends ViewModel> T create(@NonNull Class<T> modelClass) {
+      //noinspection ConstantConditions
+      return modelClass.cast(new StickerManagementViewModel(application, repository));
+    }
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerManifest.java b/src/org/thoughtcrime/securesms/stickers/StickerManifest.java
new file mode 100644
index 000000000..63444a87f
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/stickers/StickerManifest.java
@@ -0,0 +1,103 @@
+package org.thoughtcrime.securesms.stickers;
+
+import android.net.Uri;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import org.whispersystems.libsignal.util.guava.Optional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Local model that represents the data present in the libsignal model
+ * {@link org.whispersystems.signalservice.api.messages.SignalServiceStickerManifest}.
+ */
+public final class StickerManifest {
+
+  private final String            packId;
+  private final String            packKey;
+  private final Optional<String>  title;
+  private final Optional<String>  author;
+  private final Optional<Sticker> cover;
+  private final List<Sticker>     stickers;
+
+  public StickerManifest(@NonNull String packId,
+                         @NonNull String packKey,
+                         @NonNull Optional<String> title,
+                         @NonNull Optional<String> author,
+                         @NonNull Optional<Sticker> cover,
+                         @NonNull List<Sticker> stickers)
+  {
+    this.packId   = packId;
+    this.packKey  = packKey;
+    this.title    = title;
+    this.author   = author;
+    this.cover    = cover;
+    this.stickers = new ArrayList<>(stickers);
+  }
+
+  public @NonNull String getPackId() {
+    return packId;
+  }
+
+  public @NonNull String getPackKey() {
+    return packKey;
+  }
+
+  public @NonNull Optional<String> getTitle() {
+    return title;
+  }
+
+  public @NonNull Optional<String> getAuthor() {
+    return author;
+  }
+
+  public @NonNull Optional<Sticker> getCover() {
+    return cover;
+  }
+
+  public @NonNull List<Sticker> getStickers() {
+    return stickers;
+  }
+
+  public static class Sticker {
+    private final String        packId;
+    private final String        packKey;
+    private final int           id;
+    private final String        emoji;
+    private final Optional<Uri> uri;
+
+    public Sticker(@NonNull String packId, @NonNull String packKey, int id, @NonNull String emoji) {
+      this(packId, packKey, id, emoji, null);
+    }
+
+    public Sticker(@NonNull String packId, @NonNull String packKey, int id, @NonNull String emoji, @Nullable Uri uri) {
+      this.packId  = packId;
+      this.packKey = packKey;
+      this.id      = id;
+      this.emoji   = emoji;
+      this.uri     = Optional.fromNullable(uri);
+    }
+
+    public @NonNull String getPackId() {
+      return packId;
+    }
+
+    public @NonNull String getPackKey() {
+      return packKey;
+    }
+
+    public int getId() {
+      return id;
+    }
+
+    public String getEmoji() {
+      return emoji;
+    }
+
+    public Optional<Uri> getUri() {
+      return uri;
+    }
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerPackInstallEvent.java b/src/org/thoughtcrime/securesms/stickers/StickerPackInstallEvent.java
new file mode 100644
index 000000000..b315d6752
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/stickers/StickerPackInstallEvent.java
@@ -0,0 +1,15 @@
+package org.thoughtcrime.securesms.stickers;
+
+import android.support.annotation.NonNull;
+
+public class StickerPackInstallEvent {
+  private final Object iconGlideModel;
+
+  public StickerPackInstallEvent(@NonNull Object iconGlideModel) {
+    this.iconGlideModel = iconGlideModel;
+  }
+
+  public @NonNull Object getIconGlideModel() {
+    return iconGlideModel;
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java
new file mode 100644
index 000000000..5072aae05
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java
@@ -0,0 +1,240 @@
+package org.thoughtcrime.securesms.stickers;
+
+import android.arch.lifecycle.ViewModelProviders;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.graphics.Point;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.Toolbar;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
+
+import org.thoughtcrime.securesms.ApplicationContext;
+import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity;
+import org.thoughtcrime.securesms.ShareActivity;
+import org.thoughtcrime.securesms.jobs.StickerPackDownloadJob;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader;
+import org.thoughtcrime.securesms.mms.GlideApp;
+import org.thoughtcrime.securesms.stickers.StickerManifest.Sticker;
+import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
+import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.whispersystems.libsignal.util.Pair;
+import org.whispersystems.libsignal.util.guava.Optional;
+
+import network.loki.messenger.R;
+
+/**
+ * Shows the contents of a pack and allows the user to install it (if not installed) or remove it
+ * (if installed). This is also the handler for sticker pack deep links.
+ */
+public final class StickerPackPreviewActivity extends PassphraseRequiredActionBarActivity {
+
+  private static final String TAG = Log.tag(StickerPackPreviewActivity.class);
+
+  private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme();
+
+  private StickerPackPreviewViewModel viewModel;
+
+  private ImageView    coverImage;
+  private TextView     stickerTitle;
+  private TextView     stickerAuthor;
+  private View         installButton;
+  private View         removeButton;
+  private RecyclerView stickerList;
+  private View         shareButton;
+  private View         shareButtonImage;
+
+  private StickerPackPreviewAdapter adapter;
+  private GridLayoutManager         layoutManager;
+
+  public static Intent getIntent(@NonNull String packId, @NonNull String packKey) {
+    Intent intent = new Intent(Intent.ACTION_VIEW, StickerUrl.createActionUri(packId, packKey));
+    intent.addCategory(Intent.CATEGORY_DEFAULT);
+    intent.addCategory(Intent.CATEGORY_BROWSABLE);
+    return intent;
+  }
+
+  @Override
+  protected void onPreCreate() {
+    super.onPreCreate();
+    dynamicTheme.onCreate(this);
+  }
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState, boolean ready) {
+    setContentView(R.layout.sticker_preview_activity);
+
+    Optional<Pair<String, String>> stickerParams = StickerUrl.parseActionUri(getIntent().getData());
+
+    if (!stickerParams.isPresent()) {
+      Log.w(TAG, "Invalid URI!");
+      finish();
+      return;
+    }
+
+    String packId  = stickerParams.get().first();
+    String packKey = stickerParams.get().second();
+
+    initToolbar();
+    initView();
+    initViewModel(packId, packKey);
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+    dynamicTheme.onResume(this);
+  }
+
+  @Override
+  public void onConfigurationChanged(Configuration newConfig) {
+    super.onConfigurationChanged(newConfig);
+    onScreenWidthChanged(getScreenWidth());
+  }
+
+  private void initView() {
+    this.coverImage       = findViewById(R.id.sticker_install_cover);
+    this.stickerTitle     = findViewById(R.id.sticker_install_title);
+    this.stickerAuthor    = findViewById(R.id.sticker_install_author);
+    this.installButton    = findViewById(R.id.sticker_install_button);
+    this.removeButton     = findViewById(R.id.sticker_install_remove_button);
+    this.stickerList      = findViewById(R.id.sticker_install_list);
+    this.shareButton      = findViewById(R.id.sticker_install_share_button);
+    this.shareButtonImage = findViewById(R.id.sticker_install_share_button_image);
+
+    this.adapter       = new StickerPackPreviewAdapter(GlideApp.with(this));
+    this.layoutManager = new GridLayoutManager(this, 2);
+    onScreenWidthChanged(getScreenWidth());
+
+    stickerList.setLayoutManager(layoutManager);
+    stickerList.setAdapter(adapter);
+  }
+
+  private void initToolbar() {
+    Toolbar toolbar = findViewById(R.id.sticker_install_toolbar);
+
+    setSupportActionBar(toolbar);
+    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    getSupportActionBar().setTitle(R.string.StickerPackPreviewActivity_stickers);
+
+    toolbar.setNavigationOnClickListener(v -> onBackPressed());
+
+    if (!ThemeUtil.isDarkTheme(this) && Build.VERSION.SDK_INT >= 23) {
+      setStatusBarColor(ThemeUtil.getThemedColor(this, R.attr.sticker_preview_status_bar_color));
+      getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+    }
+  }
+
+  private void initViewModel(@NonNull String packId, @NonNull String packKey) {
+    viewModel = ViewModelProviders.of(this, new StickerPackPreviewViewModel.Factory(getApplication(),
+                                                                                    new StickerPackPreviewRepository(this),
+                                                                                    new StickerManagementRepository(this)))
+                                  .get(StickerPackPreviewViewModel.class);
+
+    viewModel.getStickerManifest(packId, packKey).observe(this, manifest -> {
+      if (manifest == null) return;
+
+      if (manifest.isPresent()) {
+        presentManifest(manifest.get().getManifest());
+        presentButton(manifest.get().isInstalled());
+        presentShareButton(manifest.get().isInstalled(), manifest.get().getManifest().getPackId(), manifest.get().getManifest().getPackKey());
+      } else {
+        presentError();
+      }
+    });
+  }
+
+  private void presentManifest(@NonNull StickerManifest manifest) {
+    stickerTitle.setText(manifest.getTitle().or(getString(R.string.StickerPackPreviewActivity_untitled)));
+    stickerAuthor.setText(manifest.getAuthor().or(getString(R.string.StickerPackPreviewActivity_unknown)));
+    adapter.setStickers(manifest.getStickers());
+
+    installButton.setOnClickListener(v -> {
+      SimpleTask.run(() -> {
+        ApplicationContext.getInstance(this)
+                          .getJobManager()
+                          .add(new StickerPackDownloadJob(manifest.getPackId(), manifest.getPackKey(), false));
+
+        return null;
+      }, (nothing) -> finish());
+    });
+
+    Sticker first = manifest.getStickers().isEmpty() ? null : manifest.getStickers().get(0);
+    Sticker cover = manifest.getCover().or(Optional.fromNullable(first)).orNull();
+
+    if (cover != null) {
+      Object  model = cover.getUri().isPresent() ? new DecryptableStreamUriLoader.DecryptableUri(cover.getUri().get())
+                                                 : new StickerRemoteUri(cover.getPackId(), cover.getPackKey(), cover.getId());
+      GlideApp.with(this).load(model)
+                         .transition(DrawableTransitionOptions.withCrossFade())
+                         .into(coverImage);
+    } else {
+      coverImage.setImageDrawable(null);
+    }
+  }
+
+  private void presentButton(boolean installed) {
+    if (installed) {
+      removeButton.setVisibility(View.VISIBLE);
+      removeButton.setOnClickListener(v -> {
+        viewModel.onRemoveClicked();
+        finish();
+      });
+      installButton.setVisibility(View.GONE);
+      installButton.setOnClickListener(null);
+    } else {
+      installButton.setVisibility(View.VISIBLE);
+      installButton.setOnClickListener(v -> {
+        viewModel.onInstallClicked();
+        finish();
+      });
+      removeButton.setVisibility(View.GONE);
+      removeButton.setOnClickListener(null);
+    }
+  }
+
+  private void presentShareButton(boolean installed, @NonNull String packId, @NonNull String packKey) {
+    if (installed) {
+      shareButton.setVisibility(View.VISIBLE);
+      shareButtonImage.setVisibility(View.VISIBLE);
+      shareButton.setOnClickListener(v -> {
+        Intent composeIntent = new Intent(this, ShareActivity.class);
+        composeIntent.putExtra(Intent.EXTRA_TEXT, StickerUrl.createShareLink(packId, packKey));
+        startActivity(composeIntent);
+        finish();
+      });
+    } else {
+      shareButton.setVisibility(View.GONE);
+      shareButtonImage.setVisibility(View.GONE);
+      shareButton.setOnClickListener(null);
+    }
+  }
+
+  private void presentError() {
+    Toast.makeText(this, R.string.StickerPackPreviewActivity_failed_to_load_sticker_pack, Toast.LENGTH_SHORT).show();
+    finish();
+  }
+
+  private void onScreenWidthChanged(int newWidth) {
+    if (layoutManager != null) {
+      layoutManager.setSpanCount(newWidth / getResources().getDimensionPixelOffset(R.dimen.sticker_preview_sticker_size));
+    }
+  }
+
+  private int getScreenWidth() {
+    Point size = new Point();
+    getWindowManager().getDefaultDisplay().getSize(size);
+    return size.x;
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewAdapter.java b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewAdapter.java
new file mode 100644
index 000000000..5ba235ef6
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewAdapter.java
@@ -0,0 +1,68 @@
+package org.thoughtcrime.securesms.stickers;
+
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
+
+import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader;
+import org.thoughtcrime.securesms.mms.GlideRequests;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import network.loki.messenger.R;
+
+public final class StickerPackPreviewAdapter extends RecyclerView.Adapter<StickerPackPreviewAdapter.StickerViewHolder>  {
+
+  private final GlideRequests                 glideRequests;
+  private final List<StickerManifest.Sticker> list;
+
+  public StickerPackPreviewAdapter(@NonNull GlideRequests glideRequests) {
+    this.glideRequests = glideRequests;
+    this.list          = new ArrayList<>();
+  }
+
+  @Override
+  public @NonNull StickerViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
+    return new StickerViewHolder(LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.sticker_preview_list_item, viewGroup, false));
+  }
+
+  @Override
+  public void onBindViewHolder(@NonNull StickerViewHolder stickerViewHolder, int i) {
+    stickerViewHolder.bind(glideRequests, list.get(i));
+  }
+
+  @Override
+  public int getItemCount() {
+    return list.size();
+  }
+
+  void setStickers(List<StickerManifest.Sticker> stickers) {
+    list.clear();
+    list.addAll(stickers);
+    notifyDataSetChanged();
+  }
+
+  static class StickerViewHolder extends RecyclerView.ViewHolder {
+
+    private final ImageView image;
+
+    private StickerViewHolder(@NonNull View itemView) {
+      super(itemView);
+      this.image = itemView.findViewById(R.id.sticker_install_item_image);
+    }
+
+    void bind(@NonNull GlideRequests glideRequests, @NonNull StickerManifest.Sticker sticker) {
+      Object model = sticker.getUri().isPresent() ? new DecryptableStreamUriLoader.DecryptableUri(sticker.getUri().get())
+                                                  : new StickerRemoteUri(sticker.getPackId(), sticker.getPackKey(), sticker.getId());
+      glideRequests.load(model)
+                   .transition(DrawableTransitionOptions.withCrossFade())
+                   .into(image);
+    }
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java
new file mode 100644
index 000000000..da2371aa4
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java
@@ -0,0 +1,161 @@
+package org.thoughtcrime.securesms.stickers;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.support.annotation.NonNull;
+import android.support.annotation.WorkerThread;
+
+import com.annimon.stream.Stream;
+import com.google.android.gms.common.util.Hex;
+
+import org.thoughtcrime.securesms.ApplicationContext;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.StickerDatabase;
+import org.thoughtcrime.securesms.database.model.StickerPackRecord;
+import org.thoughtcrime.securesms.database.model.StickerRecord;
+import org.thoughtcrime.securesms.dependencies.InjectableType;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
+import org.whispersystems.libsignal.InvalidMessageException;
+import org.whispersystems.libsignal.util.guava.Optional;
+import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
+import org.whispersystems.signalservice.api.messages.SignalServiceStickerManifest;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+public final class StickerPackPreviewRepository implements InjectableType {
+
+  private static final String TAG = Log.tag(StickerPackPreviewRepository.class);
+
+  private final StickerDatabase stickerDatabase;
+
+  @Inject SignalServiceMessageReceiver receiver;
+
+  public StickerPackPreviewRepository(@NonNull Context context) {
+    ApplicationContext.getInstance(context).injectDependencies(this);
+    this.stickerDatabase = DatabaseFactory.getStickerDatabase(context);
+  }
+
+  public void getStickerManifest(@NonNull String packId,
+                                 @NonNull String packKey,
+                                 @NonNull Callback<Optional<StickerManifestResult>> callback)
+  {
+    SignalExecutors.UNBOUNDED.execute(() -> {
+      Optional<StickerManifestResult> localManifest = getManifestFromDatabase(packId);
+
+      if (localManifest.isPresent()) {
+        Log.d(TAG, "Found manifest locally.");
+        callback.onComplete(localManifest);
+      } else {
+        Log.d(TAG, "Looking for manifest remotely.");
+        callback.onComplete(getManifestRemote(packId, packKey));
+      }
+    });
+  }
+
+  @WorkerThread
+  private Optional<StickerManifestResult> getManifestFromDatabase(@NonNull String packId) {
+    StickerPackRecord record = stickerDatabase.getStickerPack(packId);
+
+    if (record != null && record.isInstalled()) {
+      StickerManifest.Sticker       cover    = toSticker(record.getCover());
+      List<StickerManifest.Sticker> stickers = getStickersFromDatabase(packId);
+
+      StickerManifest manifest = new StickerManifest(record.getPackId(),
+                                                     record.getPackKey(),
+                                                     record.getTitle(),
+                                                     record.getAuthor(),
+                                                     Optional.of(cover),
+                                                     stickers);
+
+      return Optional.of(new StickerManifestResult(manifest, record.isInstalled()));
+    }
+
+    return Optional.absent();
+  }
+
+  @WorkerThread
+  private Optional<StickerManifestResult> getManifestRemote(@NonNull String packId, @NonNull String packKey) {
+    try {
+      byte[]                       packIdBytes    = Hex.stringToBytes(packId);
+      byte[]                       packKeyBytes   = Hex.stringToBytes(packKey);
+      SignalServiceStickerManifest remoteManifest = receiver.retrieveStickerManifest(packIdBytes, packKeyBytes);
+      StickerManifest              localManifest  = new StickerManifest(packId,
+                                                                        packKey,
+                                                                        remoteManifest.getTitle(),
+                                                                        remoteManifest.getAuthor(),
+                                                                        toOptionalSticker(packId, packKey, remoteManifest.getCover()),
+                                                                        Stream.of(remoteManifest.getStickers())
+                                                                              .map(s -> toSticker(packId, packKey, s))
+                                                                              .toList());
+
+      return Optional.of(new StickerManifestResult(localManifest, false));
+    } catch (IOException | InvalidMessageException e) {
+      Log.w(TAG, "Failed to retrieve pack manifest.", e);
+    }
+
+    return Optional.absent();
+  }
+
+  @WorkerThread
+  private List<StickerManifest.Sticker> getStickersFromDatabase(@NonNull String packId) {
+    List<StickerManifest.Sticker> stickers = new ArrayList<>();
+
+    try (Cursor cursor = stickerDatabase.getStickersForPack(packId)) {
+      StickerDatabase.StickerRecordReader reader = new StickerDatabase.StickerRecordReader(cursor);
+
+      StickerRecord record;
+      while ((record = reader.getNext()) != null) {
+        stickers.add(toSticker(record));
+      }
+    }
+
+    return stickers;
+  }
+
+
+  private Optional<StickerManifest.Sticker> toOptionalSticker(@NonNull String packId,
+                                                              @NonNull String packKey,
+                                                              @NonNull Optional<SignalServiceStickerManifest.StickerInfo> remoteSticker)
+  {
+    return remoteSticker.isPresent() ? Optional.of(toSticker(packId, packKey, remoteSticker.get()))
+                                     : Optional.absent();
+  }
+
+  private StickerManifest.Sticker toSticker(@NonNull String packId,
+                                            @NonNull String packKey,
+                                            @NonNull SignalServiceStickerManifest.StickerInfo remoteSticker)
+  {
+    return new StickerManifest.Sticker(packId, packKey, remoteSticker.getId(), remoteSticker.getEmoji());
+  }
+
+  private StickerManifest.Sticker toSticker(@NonNull StickerRecord record) {
+    return new StickerManifest.Sticker(record.getPackId(), record.getPackKey(), record.getStickerId(), record.getEmoji(), record.getUri());
+  }
+
+  static class StickerManifestResult {
+    private final StickerManifest manifest;
+    private final boolean         isInstalled;
+
+    StickerManifestResult(StickerManifest manifest, boolean isInstalled) {
+      this.manifest    = manifest;
+      this.isInstalled = isInstalled;
+    }
+
+    public StickerManifest getManifest() {
+      return manifest;
+    }
+
+    public boolean isInstalled() {
+      return isInstalled;
+    }
+  }
+
+  interface Callback<T> {
+    void onComplete(T result);
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java
new file mode 100644
index 000000000..cf95b28ca
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java
@@ -0,0 +1,90 @@
+package org.thoughtcrime.securesms.stickers;
+
+import android.app.Application;
+import android.arch.lifecycle.LiveData;
+import android.arch.lifecycle.MutableLiveData;
+import android.arch.lifecycle.ViewModel;
+import android.arch.lifecycle.ViewModelProvider;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.support.annotation.NonNull;
+import android.text.TextUtils;
+
+import org.thoughtcrime.securesms.database.DatabaseContentProviders;
+import org.thoughtcrime.securesms.stickers.StickerPackPreviewRepository.StickerManifestResult;
+import org.whispersystems.libsignal.util.guava.Optional;
+
+final class StickerPackPreviewViewModel extends ViewModel {
+
+  private final Application                                      application;
+  private final StickerPackPreviewRepository                     previewRepository;
+  private final StickerManagementRepository                      managementRepository;
+  private final MutableLiveData<Optional<StickerManifestResult>> stickerManifest;
+  private final ContentObserver                                  packObserver;
+
+  private String packId;
+  private String packKey;
+
+  private StickerPackPreviewViewModel(@NonNull Application application,
+                                      @NonNull StickerPackPreviewRepository previewRepository,
+                                      @NonNull StickerManagementRepository  managementRepository)
+  {
+    this.application          = application;
+    this.previewRepository    = previewRepository;
+    this.managementRepository = managementRepository;
+    this.stickerManifest      = new MutableLiveData<>();
+    this.packObserver         = new ContentObserver(new Handler()) {
+      @Override
+      public void onChange(boolean selfChange) {
+        if (!TextUtils.isEmpty(packId) && !TextUtils.isEmpty(packKey)) {
+          previewRepository.getStickerManifest(packId, packKey, stickerManifest::postValue);
+        }
+      }
+    };
+
+    application.getContentResolver().registerContentObserver(DatabaseContentProviders.StickerPack.CONTENT_URI, true, packObserver);
+  }
+
+  LiveData<Optional<StickerManifestResult>> getStickerManifest(@NonNull String packId, @NonNull String packKey) {
+    this.packId  = packId;
+    this.packKey = packKey;
+
+    previewRepository.getStickerManifest(packId, packKey, stickerManifest::postValue);
+
+    return stickerManifest;
+  }
+
+  void onInstallClicked() {
+    managementRepository.installStickerPack(packId, packKey);
+  }
+
+  void onRemoveClicked() {
+    managementRepository.uninstallStickerPack(packId, packKey);
+  }
+
+  @Override
+  protected void onCleared() {
+    application.getContentResolver().unregisterContentObserver(packObserver);
+  }
+
+  static class Factory extends ViewModelProvider.NewInstanceFactory {
+    private final Application                  application;
+    private final StickerPackPreviewRepository previewRepository;
+    private final StickerManagementRepository  managementRepository;
+
+    Factory(@NonNull Application application,
+            @NonNull StickerPackPreviewRepository previewRepository,
+            @NonNull StickerManagementRepository managementRepository)
+    {
+      this.application          = application;
+      this.previewRepository    = previewRepository;
+      this.managementRepository = managementRepository;
+    }
+
+    @Override
+    public @NonNull<T extends ViewModel> T create(@NonNull Class<T> modelClass) {
+      //noinspection ConstantConditions
+      return modelClass.cast(new StickerPackPreviewViewModel(application, previewRepository, managementRepository));
+    }
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerPreviewPopup.java b/src/org/thoughtcrime/securesms/stickers/StickerPreviewPopup.java
new file mode 100644
index 000000000..a13fe3c2e
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/stickers/StickerPreviewPopup.java
@@ -0,0 +1,39 @@
+package org.thoughtcrime.securesms.stickers;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.PopupWindow;
+
+import org.thoughtcrime.securesms.database.model.StickerRecord;
+import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
+import org.thoughtcrime.securesms.mms.GlideRequests;
+
+import network.loki.messenger.R;
+
+
+/**
+ * A popup that shows a given sticker fullscreen.
+ */
+final class StickerPreviewPopup extends PopupWindow {
+
+  private final GlideRequests glideRequests;
+  private final ImageView     image;
+
+  StickerPreviewPopup(@NonNull Context context, @NonNull GlideRequests glideRequests) {
+    super(LayoutInflater.from(context).inflate(R.layout.sticker_preview_popup, null),
+          ViewGroup.LayoutParams.MATCH_PARENT,
+          ViewGroup.LayoutParams.MATCH_PARENT);
+    this.glideRequests = glideRequests;
+    this.image         = getContentView().findViewById(R.id.sticker_popup_image);
+
+    setTouchable(false);
+  }
+
+  void presentSticker(@NonNull StickerRecord stickerRecord) {
+    glideRequests.load(new DecryptableUri(stickerRecord.getUri()))
+                 .into(image);
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerRemoteUri.java b/src/org/thoughtcrime/securesms/stickers/StickerRemoteUri.java
new file mode 100644
index 000000000..b4845c2e4
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/stickers/StickerRemoteUri.java
@@ -0,0 +1,59 @@
+package org.thoughtcrime.securesms.stickers;
+
+import android.support.annotation.NonNull;
+
+import com.bumptech.glide.load.Key;
+
+import java.nio.ByteBuffer;
+import java.security.MessageDigest;
+import java.util.Objects;
+
+/**
+ * Used as a model to be given to Glide for a sticker that isn't present locally.
+ */
+public final class StickerRemoteUri implements Key {
+
+  private final String packId;
+  private final String packKey;
+  private final int    stickerId;
+
+  public StickerRemoteUri(@NonNull String packId, @NonNull String packKey, int stickerId) {
+    this.packId    = packId;
+    this.packKey   = packKey;
+    this.stickerId = stickerId;
+  }
+
+  public @NonNull String getPackId() {
+    return packId;
+  }
+
+  public @NonNull String getPackKey() {
+    return packKey;
+  }
+
+  public int getStickerId() {
+    return stickerId;
+  }
+
+  @Override
+  public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
+    messageDigest.update(packId.getBytes());
+    messageDigest.update(packKey.getBytes());
+    messageDigest.update(ByteBuffer.allocate(4).putInt(stickerId).array());
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    StickerRemoteUri that = (StickerRemoteUri) o;
+    return stickerId == that.stickerId &&
+        Objects.equals(packId, that.packId) &&
+        Objects.equals(packKey, that.packKey);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(packId, packKey, stickerId);
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerRemoteUriFetcher.java b/src/org/thoughtcrime/securesms/stickers/StickerRemoteUriFetcher.java
new file mode 100644
index 000000000..fcb30af9b
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/stickers/StickerRemoteUriFetcher.java
@@ -0,0 +1,64 @@
+package org.thoughtcrime.securesms.stickers;
+
+import android.support.annotation.NonNull;
+
+import com.bumptech.glide.Priority;
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.data.DataFetcher;
+import com.google.android.gms.common.util.Hex;
+
+import org.thoughtcrime.securesms.logging.Log;
+import org.whispersystems.libsignal.InvalidMessageException;
+import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Downloads a sticker remotely. Used with Glide.
+ */
+public final class StickerRemoteUriFetcher implements DataFetcher<InputStream> {
+
+  private static final String TAG = Log.tag(StickerRemoteUriFetcher.class);
+
+  private final SignalServiceMessageReceiver receiver;
+  private final StickerRemoteUri stickerUri;
+
+  public StickerRemoteUriFetcher(@NonNull SignalServiceMessageReceiver receiver, @NonNull StickerRemoteUri stickerUri) {
+    this.receiver   = receiver;
+    this.stickerUri = stickerUri;
+  }
+
+  @Override
+  public void loadData(@NonNull Priority priority, @NonNull DataCallback<? super InputStream> callback) {
+    try {
+      byte[]      packIdBytes  = Hex.stringToBytes(stickerUri.getPackId());
+      byte[]      packKeyBytes = Hex.stringToBytes(stickerUri.getPackKey());
+      InputStream stream       = receiver.retrieveSticker(packIdBytes, packKeyBytes, stickerUri.getStickerId());
+
+      callback.onDataReady(stream);
+    } catch (IOException | InvalidMessageException e) {
+      callback.onLoadFailed(e);
+    }
+  }
+
+  @Override
+  public void cleanup() {
+
+  }
+
+  @Override
+  public void cancel() {
+    Log.d(TAG, "Canceled.");
+  }
+
+  @Override
+  public @NonNull Class<InputStream> getDataClass() {
+    return InputStream.class;
+  }
+
+  @Override
+  public @NonNull DataSource getDataSource() {
+    return DataSource.REMOTE;
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerRemoteUriLoader.java b/src/org/thoughtcrime/securesms/stickers/StickerRemoteUriLoader.java
new file mode 100644
index 000000000..b17772f87
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/stickers/StickerRemoteUriLoader.java
@@ -0,0 +1,59 @@
+package org.thoughtcrime.securesms.stickers;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import com.bumptech.glide.load.Options;
+import com.bumptech.glide.load.model.ModelLoader;
+import com.bumptech.glide.load.model.ModelLoaderFactory;
+import com.bumptech.glide.load.model.MultiModelLoaderFactory;
+
+import org.thoughtcrime.securesms.ApplicationContext;
+import org.thoughtcrime.securesms.dependencies.InjectableType;
+import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
+
+import java.io.InputStream;
+
+import javax.inject.Inject;
+
+/**
+ * Glide loader to fetch a sticker remotely.
+ */
+public final class StickerRemoteUriLoader implements ModelLoader<StickerRemoteUri, InputStream> {
+
+  private final SignalServiceMessageReceiver receiver;
+
+  public StickerRemoteUriLoader(@NonNull SignalServiceMessageReceiver receiver) {
+    this.receiver = receiver;
+  }
+
+
+  @Override
+  public @Nullable LoadData<InputStream> buildLoadData(@NonNull StickerRemoteUri sticker, int width, int height, @NonNull Options options) {
+    return new LoadData<>(sticker, new StickerRemoteUriFetcher(receiver, sticker));
+  }
+
+  @Override
+  public boolean handles(@NonNull StickerRemoteUri sticker) {
+    return true;
+  }
+
+  public static class Factory implements ModelLoaderFactory<StickerRemoteUri, InputStream>, InjectableType {
+
+    @Inject SignalServiceMessageReceiver receiver;
+
+    public Factory(@NonNull Context context) {
+      ApplicationContext.getInstance(context).injectDependencies(this);
+    }
+
+    @Override
+    public @NonNull ModelLoader<StickerRemoteUri, InputStream> build(@NonNull MultiModelLoaderFactory multiFactory) {
+      return new StickerRemoteUriLoader(receiver);
+    }
+
+    @Override
+    public void teardown() {
+    }
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerSearchRepository.java b/src/org/thoughtcrime/securesms/stickers/StickerSearchRepository.java
new file mode 100644
index 000000000..eea9cba3e
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/stickers/StickerSearchRepository.java
@@ -0,0 +1,66 @@
+package org.thoughtcrime.securesms.stickers;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.support.annotation.NonNull;
+
+import org.thoughtcrime.securesms.database.AttachmentDatabase;
+import org.thoughtcrime.securesms.database.CursorList;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.StickerDatabase;
+import org.thoughtcrime.securesms.database.model.StickerPackRecord;
+import org.thoughtcrime.securesms.database.model.StickerRecord;
+import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
+
+public final class StickerSearchRepository {
+
+  private final StickerDatabase    stickerDatabase;
+  private final AttachmentDatabase attachmentDatabase;
+
+  public StickerSearchRepository(@NonNull Context context) {
+    this.stickerDatabase    = DatabaseFactory.getStickerDatabase(context);
+    this.attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context);
+  }
+
+  public void searchByEmoji(@NonNull String emoji, @NonNull Callback<CursorList<StickerRecord>> callback) {
+    SignalExecutors.BOUNDED.execute(() -> {
+      Cursor cursor = stickerDatabase.getStickersByEmoji(emoji);
+
+      if (cursor != null) {
+        callback.onResult(new CursorList<>(cursor, new StickerModelBuilder()));
+      } else {
+        callback.onResult(CursorList.emptyList());
+      }
+    });
+  }
+
+  public void getStickerFeatureAvailability(@NonNull Callback<Boolean> callback) {
+    SignalExecutors.BOUNDED.execute(() -> {
+      try (Cursor cursor = stickerDatabase.getAllStickerPacks("1")) {
+        if (cursor != null && cursor.moveToFirst()) {
+          callback.onResult(true);
+        } else {
+          callback.onResult(attachmentDatabase.hasStickerAttachments());
+        }
+      }
+    });
+  }
+
+  private static class StickerModelBuilder implements CursorList.ModelBuilder<StickerRecord> {
+    @Override
+    public StickerRecord build(@NonNull Cursor cursor) {
+      return new StickerDatabase.StickerRecordReader(cursor).getCurrent();
+    }
+  }
+
+  private static class StickerPackModelBuilder implements CursorList.ModelBuilder<StickerPackRecord> {
+    @Override
+    public StickerPackRecord build(@NonNull Cursor cursor) {
+      return new StickerDatabase.StickerPackRecordReader(cursor).getCurrent();
+    }
+  }
+
+  public interface Callback<T> {
+    void onResult(T result);
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerUrl.java b/src/org/thoughtcrime/securesms/stickers/StickerUrl.java
new file mode 100644
index 000000000..ac47f5223
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/stickers/StickerUrl.java
@@ -0,0 +1,57 @@
+package org.thoughtcrime.securesms.stickers;
+
+import android.net.Uri;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+
+import org.whispersystems.libsignal.util.Pair;
+import org.whispersystems.libsignal.util.guava.Optional;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Manages creating and parsing the various sticker pack URLs.
+ */
+public class StickerUrl {
+
+  private static final Pattern STICKER_URL_PATTERN = Pattern.compile("^https://signal\\.org/addstickers/#pack_id=(.*)&pack_key=(.*)$");
+
+  public static Optional<Pair<String, String>> parseActionUri(@Nullable Uri uri) {
+    if (uri == null) return Optional.absent();
+
+    String packId  = uri.getQueryParameter("pack_id");
+    String packKey = uri.getQueryParameter("pack_key");
+
+    if (TextUtils.isEmpty(packId) || TextUtils.isEmpty(packKey)) {
+      return Optional.absent();
+    }
+
+    return Optional.of(new Pair<>(packId, packKey));
+  }
+
+  public static @NonNull Uri createActionUri(@NonNull String packId, @NonNull String packKey) {
+    return Uri.parse(String.format("sgnl://addstickers?pack_id=%s&pack_key=%s", packId, packKey));
+  }
+
+  public static boolean isValidShareLink(@Nullable String url) {
+    return parseShareLink(url).isPresent();
+  }
+
+  public static @NonNull Optional<Pair<String, String>> parseShareLink(@Nullable String url) {
+    if (url == null) return Optional.absent();
+
+    Matcher matcher = STICKER_URL_PATTERN.matcher(url);
+
+    if (matcher.matches() && matcher.groupCount() == 2) {
+      return Optional.of(new Pair<>(matcher.group(1), matcher.group(2)));
+    }
+
+    return Optional.absent();
+  }
+
+  public static String createShareLink(@NonNull String packId, @NonNull String packKey) {
+    return "https://signal.org/addstickers/#pack_id=" + packId + "&pack_key=" + packKey;
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/util/AttachmentUtil.java b/src/org/thoughtcrime/securesms/util/AttachmentUtil.java
index 8fbb68783..81c338b37 100644
--- a/src/org/thoughtcrime/securesms/util/AttachmentUtil.java
+++ b/src/org/thoughtcrime/securesms/util/AttachmentUtil.java
@@ -9,12 +9,12 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.WorkerThread;
 import android.text.TextUtils;
-import org.thoughtcrime.securesms.logging.Log;
 
 import org.thoughtcrime.securesms.attachments.AttachmentId;
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
+import org.thoughtcrime.securesms.logging.Log;
 
 import java.util.Collections;
 import java.util.Set;
@@ -37,7 +37,11 @@ public class AttachmentUtil {
     Set<String> allowedTypes = getAllowedAutoDownloadTypes(context);
     String      contentType  = attachment.getContentType();
 
-    if (attachment.isVoiceNote() || (MediaUtil.isAudio(attachment) && TextUtils.isEmpty(attachment.getFileName())) || MediaUtil.isLongTextType(attachment.getContentType())) {
+    if (attachment.isVoiceNote()                                                       ||
+        (MediaUtil.isAudio(attachment) && TextUtils.isEmpty(attachment.getFileName())) ||
+        MediaUtil.isLongTextType(attachment.getContentType())                          ||
+        attachment.isSticker())
+    {
       return true;
     } else if (isNonDocumentType(contentType)) {
       return allowedTypes.contains(MediaUtil.getDiscreteMimeType(contentType));
diff --git a/src/org/thoughtcrime/securesms/util/BitmapUtil.java b/src/org/thoughtcrime/securesms/util/BitmapUtil.java
index 1fd89864b..4423405d7 100644
--- a/src/org/thoughtcrime/securesms/util/BitmapUtil.java
+++ b/src/org/thoughtcrime/securesms/util/BitmapUtil.java
@@ -64,7 +64,19 @@ public class BitmapUtil {
                                                   final int maxImageSize)
       throws BitmapDecodingException
   {
-    return createScaledBytes(context, model, maxImageWidth, maxImageHeight, maxImageSize, 1, 0);
+    return createScaledBytes(context, model, maxImageWidth, maxImageHeight, maxImageSize, CompressFormat.JPEG);
+  }
+
+  @WorkerThread
+  public static <T> ScaleResult createScaledBytes(Context context,
+                                                  T model,
+                                                  int maxImageWidth,
+                                                  int maxImageHeight,
+                                                  int maxImageSize,
+                                                  @NonNull CompressFormat format)
+      throws BitmapDecodingException
+  {
+    return createScaledBytes(context, model, maxImageWidth, maxImageHeight, maxImageSize, format, 1, 0);
   }
 
   @WorkerThread
@@ -73,6 +85,7 @@ public class BitmapUtil {
                                                    final int maxImageWidth,
                                                    final int maxImageHeight,
                                                    final int maxImageSize,
+                                                   @NonNull CompressFormat format,
                                                    final int sizeAttempt,
                                                    int totalAttempts)
       throws BitmapDecodingException
@@ -102,7 +115,7 @@ public class BitmapUtil {
         do {
           totalAttempts++;
           ByteArrayOutputStream baos = new ByteArrayOutputStream();
-          scaledBitmap.compress(CompressFormat.JPEG, quality, baos);
+          scaledBitmap.compress(format, quality, baos);
           bytes = baos.toByteArray();
 
           Log.d(TAG, "iteration with quality " + quality + " size " + bytes.length + " bytes.");
@@ -122,7 +135,7 @@ public class BitmapUtil {
             scaledBitmap = null;
 
             Log.i(TAG, "Halving dimensions and retrying.");
-            return createScaledBytes(context, model, maxImageWidth / 2, maxImageHeight / 2, maxImageSize, sizeAttempt + 1, totalAttempts);
+            return createScaledBytes(context, model, maxImageWidth / 2, maxImageHeight / 2, maxImageSize, format, sizeAttempt + 1, totalAttempts);
           } else {
             throw new BitmapDecodingException("Unable to scale image below " + bytes.length + " bytes.");
           }
@@ -184,6 +197,17 @@ public class BitmapUtil {
     return Bitmap.createScaledBitmap(bitmap, newWidth, newHeight, true);
   }
 
+  public static @NonNull CompressFormat getCompressFormatForContentType(@Nullable String contentType) {
+    if (contentType == null) return CompressFormat.JPEG;
+
+    switch (contentType) {
+      case MediaUtil.IMAGE_JPEG: return CompressFormat.JPEG;
+      case MediaUtil.IMAGE_PNG:  return CompressFormat.PNG;
+      case MediaUtil.IMAGE_WEBP: return CompressFormat.WEBP;
+      default:                   return CompressFormat.JPEG;
+    }
+  }
+
   private static BitmapFactory.Options getImageDimensions(InputStream inputStream)
       throws BitmapDecodingException
   {
diff --git a/src/org/thoughtcrime/securesms/util/CommunicationActions.java b/src/org/thoughtcrime/securesms/util/CommunicationActions.java
index a0d3f5c67..9cbd256ba 100644
--- a/src/org/thoughtcrime/securesms/util/CommunicationActions.java
+++ b/src/org/thoughtcrime/securesms/util/CommunicationActions.java
@@ -25,6 +25,14 @@ import org.thoughtcrime.securesms.service.WebRtcCallService;
 public class CommunicationActions {
 
   public static void startVoiceCall(@NonNull Activity activity, @NonNull Recipient recipient) {
+    if (TelephonyUtil.isAnyPstnLineBusy(activity)) {
+      Toast.makeText(activity,
+                     R.string.CommunicationActions_a_cellular_call_is_already_in_progress,
+                     Toast.LENGTH_SHORT
+                    ).show();
+      return;
+    }
+
     Permissions.with(activity)
         .request(Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA)
         .ifNecessary()
diff --git a/src/org/thoughtcrime/securesms/util/Debouncer.java b/src/org/thoughtcrime/securesms/util/Debouncer.java
index 9389728ff..9daf2c1cb 100644
--- a/src/org/thoughtcrime/securesms/util/Debouncer.java
+++ b/src/org/thoughtcrime/securesms/util/Debouncer.java
@@ -4,7 +4,7 @@ import android.os.Handler;
 
 /**
  * A class that will throttle the number of runnables executed to be at most once every specified
- * interval.
+ * interval. However, it could be longer if events are published consistently.
  *
  * Useful for performing actions in response to rapid user input, such as inputting text, where you
  * don't necessarily want to perform an action after <em>every</em> input.
diff --git a/src/org/thoughtcrime/securesms/util/DirectoryHelper.java b/src/org/thoughtcrime/securesms/util/DirectoryHelper.java
index ccb50a155..7b0fa1c71 100644
--- a/src/org/thoughtcrime/securesms/util/DirectoryHelper.java
+++ b/src/org/thoughtcrime/securesms/util/DirectoryHelper.java
@@ -283,7 +283,7 @@ public class DirectoryHelper {
                                                                   @NonNull RecipientDatabase recipientDatabase,
                                                                   @NonNull Set<String> eligibleContactNumbers)
   {
-    return SignalExecutors.IO.submit(() -> {
+    return SignalExecutors.UNBOUNDED.submit(() -> {
       List<ContactTokenDetails> activeTokens = accountManager.getContacts(eligibleContactNumbers);
 
       if (activeTokens != null) {
@@ -329,7 +329,7 @@ public class DirectoryHelper {
                                                                   @NonNull RecipientDatabase           recipientDatabase,
                                                                   @NonNull Recipient                   recipient)
   {
-    return SignalExecutors.IO.submit(() -> {
+    return SignalExecutors.UNBOUNDED.submit(() -> {
       boolean                       activeUser    = recipient.resolve().getRegistered() == RegisteredState.REGISTERED;
       boolean                       systemContact = recipient.isSystemContact();
       String                        number        = recipient.getAddress().serialize();
@@ -368,7 +368,7 @@ public class DirectoryHelper {
     KeyStore                  iasKeyStore      = getIasKeyStore(context);
 
     for (Set<String> batch : batches) {
-      Future<Set<String>> future = SignalExecutors.IO.submit(() -> {
+      Future<Set<String>> future = SignalExecutors.UNBOUNDED.submit(() -> {
         return new HashSet<>(accountManager.getRegisteredUsers(iasKeyStore, batch, BuildConfig.MRENCLAVE));
       });
       futures.add(future);
diff --git a/src/org/thoughtcrime/securesms/util/LongClickCopySpan.java b/src/org/thoughtcrime/securesms/util/LongClickCopySpan.java
index f8dc6a977..93f59a1c2 100644
--- a/src/org/thoughtcrime/securesms/util/LongClickCopySpan.java
+++ b/src/org/thoughtcrime/securesms/util/LongClickCopySpan.java
@@ -4,6 +4,7 @@ import android.annotation.TargetApi;
 import android.content.ClipData;
 import android.content.Context;
 import android.support.annotation.ColorInt;
+import android.support.annotation.NonNull;
 import android.text.TextPaint;
 import android.text.style.URLSpan;
 import android.view.View;
@@ -32,7 +33,7 @@ public class LongClickCopySpan extends URLSpan {
   }
 
   @Override
-  public void updateDrawState(TextPaint ds) {
+  public void updateDrawState(@NonNull TextPaint ds) {
     super.updateDrawState(ds);
     ds.bgColor = highlightColor;
     ds.setUnderlineText(!isHighlighted);
diff --git a/src/org/thoughtcrime/securesms/util/MediaUtil.java b/src/org/thoughtcrime/securesms/util/MediaUtil.java
index afddb45e1..9142f2dc8 100644
--- a/src/org/thoughtcrime/securesms/util/MediaUtil.java
+++ b/src/org/thoughtcrime/securesms/util/MediaUtil.java
@@ -9,7 +9,6 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.WorkerThread;
 import android.text.TextUtils;
-import org.thoughtcrime.securesms.logging.Log;
 import android.util.Pair;
 import android.webkit.MimeTypeMap;
 
@@ -17,6 +16,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.load.resource.gif.GifDrawable;
 
 import org.thoughtcrime.securesms.attachments.Attachment;
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.AudioSlide;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
 import org.thoughtcrime.securesms.mms.DocumentSlide;
@@ -26,6 +26,7 @@ import org.thoughtcrime.securesms.mms.ImageSlide;
 import org.thoughtcrime.securesms.mms.MmsSlide;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.mms.Slide;
+import org.thoughtcrime.securesms.mms.StickerSlide;
 import org.thoughtcrime.securesms.mms.TextSlide;
 import org.thoughtcrime.securesms.mms.VideoSlide;
 
@@ -40,6 +41,7 @@ public class MediaUtil {
 
   public static final String IMAGE_PNG         = "image/png";
   public static final String IMAGE_JPEG        = "image/jpeg";
+  public static final String IMAGE_WEBP        = "image/webp";
   public static final String IMAGE_GIF         = "image/gif";
   public static final String AUDIO_AAC         = "audio/aac";
   public static final String AUDIO_UNSPECIFIED = "audio/*";
@@ -50,7 +52,9 @@ public class MediaUtil {
 
   public static Slide getSlideForAttachment(Context context, Attachment attachment) {
     Slide slide = null;
-    if (isGif(attachment.getContentType())) {
+    if (attachment.isSticker()) {
+      slide = new StickerSlide(context, attachment);
+    } else if (isGif(attachment.getContentType())) {
       slide = new GifSlide(context, attachment);
     } else if (isImageType(attachment.getContentType())) {
       slide = new ImageSlide(context, attachment);
diff --git a/src/org/thoughtcrime/securesms/util/ObservingLiveData.java b/src/org/thoughtcrime/securesms/util/ObservingLiveData.java
new file mode 100644
index 000000000..e0fd8a11c
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/util/ObservingLiveData.java
@@ -0,0 +1,45 @@
+package org.thoughtcrime.securesms.util;
+
+import android.arch.lifecycle.MutableLiveData;
+import android.database.ContentObserver;
+import android.support.annotation.NonNull;
+
+import org.thoughtcrime.securesms.database.ObservableContent;
+
+import java.io.Closeable;
+
+/**
+ * Implementation of {@link android.arch.lifecycle.LiveData} that will handle closing the contained
+ * {@link Closeable} when the value changes.
+ */
+public class ObservingLiveData<E extends ObservableContent> extends MutableLiveData<E> {
+
+  private ContentObserver observer;
+
+  @Override
+  public void setValue(E value) {
+    E previous = getValue();
+
+    if (previous != null) {
+      previous.unregisterContentObserver(observer);
+      Util.close(previous);
+    }
+
+    value.registerContentObserver(observer);
+
+    super.setValue(value);
+  }
+
+  public void close() {
+    E value = getValue();
+
+    if (value != null) {
+      value.unregisterContentObserver(observer);
+      Util.close(value);
+    }
+  }
+
+  public void registerContentObserver(@NonNull ContentObserver observer) {
+    this.observer = observer;
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/util/ResUtil.java b/src/org/thoughtcrime/securesms/util/ResUtil.java
index 7cd6ea8ca..75b8f707c 100644
--- a/src/org/thoughtcrime/securesms/util/ResUtil.java
+++ b/src/org/thoughtcrime/securesms/util/ResUtil.java
@@ -21,11 +21,10 @@ import android.content.Context;
 import android.content.res.Resources.Theme;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.support.annotation.ArrayRes;
 import android.support.annotation.AttrRes;
-import android.support.annotation.DrawableRes;
+import android.support.annotation.DimenRes;
+import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
 import android.util.TypedValue;
 
@@ -61,4 +60,10 @@ public class ResUtil {
     typedArray.recycle();
     return resourceIds;
   }
+
+  public static float getFloat(@NonNull Context context, @DimenRes int resId) {
+    TypedValue value = new TypedValue();
+    context.getResources().getValue(resId, value, true);
+    return value.getFloat();
+  }
 }
diff --git a/src/org/thoughtcrime/securesms/util/ServiceUtil.java b/src/org/thoughtcrime/securesms/util/ServiceUtil.java
index 8cb1111c6..348df1fd6 100644
--- a/src/org/thoughtcrime/securesms/util/ServiceUtil.java
+++ b/src/org/thoughtcrime/securesms/util/ServiceUtil.java
@@ -12,7 +12,6 @@ import android.os.Vibrator;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
-import android.support.v4.content.ContextCompat;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.view.WindowManager;
@@ -57,6 +56,6 @@ public class ServiceUtil {
 
   @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP_MR1)
   public static @Nullable SubscriptionManager getSubscriptionManager(@NonNull Context context) {
-    return ContextCompat.getSystemService(context, SubscriptionManager.class);
+    return (SubscriptionManager) context.getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE);
   }
 }
diff --git a/src/org/thoughtcrime/securesms/util/SoftHashMap.java b/src/org/thoughtcrime/securesms/util/SoftHashMap.java
index 64553f596..539682626 100644
--- a/src/org/thoughtcrime/securesms/util/SoftHashMap.java
+++ b/src/org/thoughtcrime/securesms/util/SoftHashMap.java
@@ -19,6 +19,8 @@
 
 package org.thoughtcrime.securesms.util;
 
+import android.support.annotation.NonNull;
+
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.SoftReference;
 import java.util.*;
@@ -210,7 +212,7 @@ public class SoftHashMap<K, V> implements Map<K, V> {
     return values != null && values.contains(value);
   }
 
-  public void putAll(Map<? extends K, ? extends V> m) {
+  public void putAll(@NonNull Map<? extends K, ? extends V> m) {
     if (m == null || m.isEmpty()) {
       processQueue();
       return;
@@ -220,12 +222,12 @@ public class SoftHashMap<K, V> implements Map<K, V> {
     }
   }
 
-  public Set<K> keySet() {
+  public @NonNull Set<K> keySet() {
     processQueue();
     return map.keySet();
   }
 
-  public Collection<V> values() {
+  public @NonNull Collection<V> values() {
     processQueue();
     Collection<K> keys = map.keySet();
     if (keys.isEmpty()) {
@@ -245,7 +247,7 @@ public class SoftHashMap<K, V> implements Map<K, V> {
   /**
    * Creates a new entry, but wraps the value in a SoftValue instance to enable auto garbage collection.
    */
-  public V put(K key, V value) {
+  public V put(@NonNull K key, @NonNull V value) {
     processQueue(); // throw out garbage collected values first
     SoftValue<V, K> sv = new SoftValue<V, K>(value, key, queue);
     SoftValue<V, K> previous = map.put(key, sv);
@@ -275,7 +277,7 @@ public class SoftHashMap<K, V> implements Map<K, V> {
     return map.size();
   }
 
-  public Set<Map.Entry<K, V>> entrySet() {
+  public @NonNull Set<Map.Entry<K, V>> entrySet() {
     processQueue(); // throw out garbage collected values first
     Collection<K> keys = map.keySet();
     if (keys.isEmpty()) {
diff --git a/src/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java b/src/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java
index e0540b9d5..337052825 100644
--- a/src/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java
+++ b/src/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java
@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.util;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.os.Build.VERSION;
+import android.support.annotation.NonNull;
 import android.support.v4.view.ViewCompat;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -42,8 +43,8 @@ public class StickyHeaderDecoration extends RecyclerView.ItemDecoration {
    * {@inheritDoc}
    */
   @Override
-  public void getItemOffsets(Rect outRect, View view, RecyclerView parent,
-                             RecyclerView.State state)
+  public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent,
+                             @NonNull RecyclerView.State state)
   {
     int position     = parent.getChildAdapterPosition(view);
     int headerHeight = 0;
@@ -106,7 +107,7 @@ public class StickyHeaderDecoration extends RecyclerView.ItemDecoration {
    * {@inheritDoc}
    */
   @Override
-  public void onDrawOver(Canvas c, RecyclerView parent, RecyclerView.State state) {
+  public void onDrawOver(@NonNull Canvas c, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
     final int count = parent.getChildCount();
 
     for (int layoutPos = 0; layoutPos < count; layoutPos++) {
diff --git a/src/org/thoughtcrime/securesms/util/TelephonyUtil.java b/src/org/thoughtcrime/securesms/util/TelephonyUtil.java
index 949ef46ca..3609cc7c7 100644
--- a/src/org/thoughtcrime/securesms/util/TelephonyUtil.java
+++ b/src/org/thoughtcrime/securesms/util/TelephonyUtil.java
@@ -3,7 +3,9 @@ package org.thoughtcrime.securesms.util;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.net.ConnectivityManager;
+import android.support.annotation.NonNull;
 import android.telephony.TelephonyManager;
+
 import org.thoughtcrime.securesms.logging.Log;
 
 import java.util.Locale;
@@ -39,4 +41,8 @@ public class TelephonyUtil {
     final ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
     return cm.getNetworkInfo(ConnectivityManager.TYPE_MOBILE_MMS).getExtraInfo();
   }
+
+  public static boolean isAnyPstnLineBusy(@NonNull Context context) {
+    return getManager(context).getCallState() != TelephonyManager.CALL_STATE_IDLE;
+  }
 }
diff --git a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
index b8bbc48e2..31e1908c3 100644
--- a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
+++ b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
@@ -180,6 +180,10 @@ public class TextSecurePreferences {
 
   private static final String GIF_GRID_LAYOUT = "pref_gif_grid_layout";
 
+  private static final String SEEN_STICKER_INTRO_TOOLTIP = "pref_seen_sticker_intro_tooltip";
+
+  private static final String MEDIA_KEYBOARD_MODE = "pref_media_keyboard_mode";
+
   public static boolean isScreenLockEnabled(@NonNull Context context) {
     return getBooleanPreference(context, SCREEN_LOCK, false);
   }
@@ -509,13 +513,13 @@ public class TextSecurePreferences {
 
   public static void setFcmToken(Context context, String registrationId) {
     setStringPreference(context, GCM_REGISTRATION_ID_PREF, registrationId);
-    setIntegerPrefrence(context, GCM_REGISTRATION_ID_VERSION_PREF, Util.getCurrentApkReleaseVersion(context));
+    setIntegerPrefrence(context, GCM_REGISTRATION_ID_VERSION_PREF, Util.getCanonicalVersionCode());
   }
 
   public static String getFcmToken(Context context) {
     int storedRegistrationIdVersion = getIntegerPreference(context, GCM_REGISTRATION_ID_VERSION_PREF, 0);
 
-    if (storedRegistrationIdVersion != Util.getCurrentApkReleaseVersion(context)) {
+    if (storedRegistrationIdVersion != Util.getCanonicalVersionCode()) {
       return null;
     } else {
       return getStringPreference(context, GCM_REGISTRATION_ID_PREF, null);
@@ -1078,6 +1082,23 @@ public class TextSecurePreferences {
     setBooleanPreference(context, NEEDS_MESSAGE_PULL, needsMessagePull);
   }
 
+  public static boolean hasSeenStickerIntroTooltip(Context context) {
+    return getBooleanPreference(context, SEEN_STICKER_INTRO_TOOLTIP, false);
+  }
+
+  public static void setHasSeenStickerIntroTooltip(Context context, boolean seenStickerTooltip) {
+    setBooleanPreference(context, SEEN_STICKER_INTRO_TOOLTIP, seenStickerTooltip);
+  }
+
+  public static void setMediaKeyboardMode(Context context, MediaKeyboardMode mode) {
+    setStringPreference(context, MEDIA_KEYBOARD_MODE, mode.name());
+  }
+
+  public static MediaKeyboardMode getMediaKeyboardMode(Context context) {
+    String name = getStringPreference(context, MEDIA_KEYBOARD_MODE, MediaKeyboardMode.EMOJI.name());
+    return MediaKeyboardMode.valueOf(name);
+  }
+
   public static void setBooleanPreference(Context context, String key, boolean value) {
     PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean(key, value).apply();
   }
@@ -1127,6 +1148,11 @@ public class TextSecurePreferences {
     }
   }
 
+  // NEVER rename these -- they're persisted by name
+  public enum MediaKeyboardMode {
+    EMOJI, STICKER
+  }
+
   // region Loki
   public static long getBackgroundPollTime(Context context) {
     return getLongPreference(context, "background_poll_time", 0L);
diff --git a/src/org/thoughtcrime/securesms/util/ThemeUtil.java b/src/org/thoughtcrime/securesms/util/ThemeUtil.java
index ad182b454..ccf53cc1c 100644
--- a/src/org/thoughtcrime/securesms/util/ThemeUtil.java
+++ b/src/org/thoughtcrime/securesms/util/ThemeUtil.java
@@ -37,9 +37,12 @@ public class ThemeUtil {
     TypedValue outValue = new TypedValue();
 
     if (context.getTheme().resolveAttribute(attribute, outValue, true)) {
-      return outValue.coerceToString().toString();
-    } else {
-      return defaultValue;
+      CharSequence charSequence = outValue.coerceToString();
+      if (charSequence != null) {
+        return charSequence.toString();
+      }
     }
+
+    return defaultValue;
   }
 }
diff --git a/src/org/thoughtcrime/securesms/util/Throttler.java b/src/org/thoughtcrime/securesms/util/Throttler.java
new file mode 100644
index 000000000..0c26946b4
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/util/Throttler.java
@@ -0,0 +1,45 @@
+package org.thoughtcrime.securesms.util;
+
+import android.os.Handler;
+
+/**
+ * A class that will throttle the number of runnables executed to be at most once every specified
+ * interval.
+ *
+ * Useful for performing actions in response to rapid user input where you want to take action on
+ * the initial input but prevent follow-up spam.
+ *
+ * This is different from {@link Debouncer} in that it will run the first runnable immediately
+ * instead of waiting for input to die down.
+ *
+ * See http://rxmarbles.com/#throttle
+ */
+public class Throttler {
+
+  private static final int WHAT = 8675309;
+
+  private final Handler handler;
+  private final long    threshold;
+
+  /**
+   * @param threshold Only one runnable will be executed via {@link #publish(Runnable)} every
+   *                  {@code threshold} milliseconds.
+   */
+  public Throttler(long threshold) {
+    this.handler   = new Handler();
+    this.threshold = threshold;
+  }
+
+  public void publish(Runnable runnable) {
+    if (handler.hasMessages(WHAT)) {
+      return;
+    }
+
+    runnable.run();
+    handler.sendMessageDelayed(handler.obtainMessage(WHAT), threshold);
+  }
+
+  public void clear() {
+    handler.removeCallbacksAndMessages(null);
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/util/Util.java b/src/org/thoughtcrime/securesms/util/Util.java
index 10383e73b..24cfc6ba1 100644
--- a/src/org/thoughtcrime/securesms/util/Util.java
+++ b/src/org/thoughtcrime/securesms/util/Util.java
@@ -25,7 +25,6 @@ import android.content.Context;
 import android.content.pm.PackageManager;
 import android.graphics.Typeface;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.Handler;
@@ -39,7 +38,6 @@ import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.style.StyleSpan;
-import org.thoughtcrime.securesms.logging.Log;
 
 import com.google.android.mms.pdu_alt.CharacterSets;
 import com.google.android.mms.pdu_alt.EncodedStringValue;
@@ -50,6 +48,7 @@ import com.google.i18n.phonenumbers.Phonenumber;
 import network.loki.messenger.BuildConfig;
 import org.thoughtcrime.securesms.components.ComposeText;
 import org.thoughtcrime.securesms.database.Address;
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.OutgoingLegacyMmsConnection;
 import org.whispersystems.libsignal.util.guava.Optional;
 
@@ -60,7 +59,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
-import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
@@ -370,7 +368,24 @@ public class Util {
     return context.getPackageName().equals(Telephony.Sms.getDefaultSmsPackage(context));
   }
 
-  public static int getCurrentApkReleaseVersion(Context context) {
+  /**
+   * The app version.
+   * <p>
+   * This code should be used in all places that compare app versions rather than
+   * {@link #getManifestApkVersion(Context)} or {@link BuildConfig#VERSION_CODE}.
+   */
+  public static int getCanonicalVersionCode() {
+    return BuildConfig.CANONICAL_VERSION_CODE;
+  }
+
+  /**
+   * {@link BuildConfig#VERSION_CODE} may not be the actual version due to ABI split code adding a
+   * postfix after BuildConfig is generated.
+   * <p>
+   * However, in most cases you want to use {@link BuildConfig#CANONICAL_VERSION_CODE} via
+   * {@link #getCanonicalVersionCode()}
+   */
+  public static int getManifestApkVersion(Context context) {
     try {
       return context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionCode;
     } catch (PackageManager.NameNotFoundException e) {
diff --git a/src/org/thoughtcrime/securesms/util/VerifySpan.java b/src/org/thoughtcrime/securesms/util/VerifySpan.java
index 697ff24dd..0df463de5 100644
--- a/src/org/thoughtcrime/securesms/util/VerifySpan.java
+++ b/src/org/thoughtcrime/securesms/util/VerifySpan.java
@@ -31,7 +31,7 @@ public class VerifySpan extends ClickableSpan {
   }
 
   @Override
-  public void onClick(View widget) {
+  public void onClick(@NonNull View widget) {
     Intent intent = new Intent(context, VerifyIdentityActivity.class);
     intent.putExtra(VerifyIdentityActivity.ADDRESS_EXTRA, address);
     intent.putExtra(VerifyIdentityActivity.IDENTITY_EXTRA, new IdentityKeyParcelable(identityKey));
diff --git a/src/org/thoughtcrime/securesms/util/VersionTracker.java b/src/org/thoughtcrime/securesms/util/VersionTracker.java
index 7bfd042a7..3c8d06b33 100644
--- a/src/org/thoughtcrime/securesms/util/VersionTracker.java
+++ b/src/org/thoughtcrime/securesms/util/VersionTracker.java
@@ -1,20 +1,19 @@
 package org.thoughtcrime.securesms.util;
 
 import android.content.Context;
-import android.content.pm.PackageManager;
+import android.support.annotation.NonNull;
 
 import java.io.IOException;
 
 public class VersionTracker {
 
-
-  public static int getLastSeenVersion(Context context) {
+  public static int getLastSeenVersion(@NonNull Context context) {
     return TextSecurePreferences.getLastVersionCode(context);
   }
 
-  public static void updateLastSeenVersion(Context context) {
+  public static void updateLastSeenVersion(@NonNull Context context) {
     try {
-      int currentVersionCode = Util.getCurrentApkReleaseVersion(context);
+      int currentVersionCode = Util.getCanonicalVersionCode();
       TextSecurePreferences.setLastVersionCode(context, currentVersionCode);
     } catch (IOException ioe) {
       throw new AssertionError(ioe);
diff --git a/src/org/thoughtcrime/securesms/util/ViewUtil.java b/src/org/thoughtcrime/securesms/util/ViewUtil.java
index 988027012..d599a8aef 100644
--- a/src/org/thoughtcrime/securesms/util/ViewUtil.java
+++ b/src/org/thoughtcrime/securesms/util/ViewUtil.java
@@ -240,4 +240,16 @@ public class ViewUtil {
   public static void setPaddingBottom(@NonNull View view, int padding) {
     view.setPadding(view.getPaddingLeft(), view.getPaddingTop(), view.getPaddingRight(), padding);
   }
+
+  public static boolean isPointInsideView(@NonNull View view, float x, float y) {
+    int[] location = new int[2];
+
+    view.getLocationOnScreen(location);
+
+    int viewX = location[0];
+    int viewY = location[1];
+
+    return x > viewX && x < viewX + view.getWidth() &&
+           y > viewY && y < viewY + view.getHeight();
+  }
 }
diff --git a/src/org/thoughtcrime/securesms/util/WakeLockUtil.java b/src/org/thoughtcrime/securesms/util/WakeLockUtil.java
index f5ed6d13f..6d16e354c 100644
--- a/src/org/thoughtcrime/securesms/util/WakeLockUtil.java
+++ b/src/org/thoughtcrime/securesms/util/WakeLockUtil.java
@@ -13,6 +13,8 @@ public class WakeLockUtil {
 
   /**
    * Run a runnable with a wake lock. Ensures that the lock is safely acquired and released.
+   *
+   * @param tag will be prefixed with "signal:" if it does not already start with it.
    */
   public static void runWithLock(@NonNull Context context, int lockType, long timeout, @NonNull String tag, @NonNull Runnable task) {
     WakeLock wakeLock = null;
@@ -26,7 +28,11 @@ public class WakeLockUtil {
     }
   }
 
+  /**
+   * @param tag will be prefixed with "signal:" if it does not already start with it.
+   */
   public static WakeLock acquire(@NonNull Context context, int lockType, long timeout, @NonNull String tag) {
+    tag = prefixTag(tag);
     try {
       PowerManager powerManager = ServiceUtil.getPowerManager(context);
       WakeLock     wakeLock     = powerManager.newWakeLock(lockType, tag);
@@ -41,7 +47,11 @@ public class WakeLockUtil {
     }
   }
 
+  /**
+   * @param tag will be prefixed with "signal:" if it does not already start with it.
+   */
   public static void release(@NonNull WakeLock wakeLock, @NonNull String tag) {
+    tag = prefixTag(tag);
     try {
       if (wakeLock.isHeld()) {
         wakeLock.release();
@@ -53,4 +63,8 @@ public class WakeLockUtil {
       Log.w(TAG, "Failed to release wakelock with tag: " + tag, e);
     }
   }
+
+  private static String prefixTag(@NonNull String tag) {
+    return tag.startsWith("signal:") ? tag : "signal:" + tag;
+  }
 }
diff --git a/src/org/thoughtcrime/securesms/util/concurrent/SignalExecutors.java b/src/org/thoughtcrime/securesms/util/concurrent/SignalExecutors.java
index 62dba0b54..4c315843d 100644
--- a/src/org/thoughtcrime/securesms/util/concurrent/SignalExecutors.java
+++ b/src/org/thoughtcrime/securesms/util/concurrent/SignalExecutors.java
@@ -12,18 +12,29 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 public class SignalExecutors {
 
-  public static final ExecutorService IO = Executors.newCachedThreadPool(new ThreadFactory() {
-    private final AtomicInteger counter = new AtomicInteger();
-    @Override
-    public Thread newThread(@NonNull Runnable r) {
-      return new Thread(r, "signal-io-" + counter.getAndIncrement());
-    }
-  });
-
+  public static final ExecutorService UNBOUNDED = Executors.newCachedThreadPool(new NumberedThreadFactory("signal-unbounded"));
+  public static final ExecutorService BOUNDED   = Executors.newFixedThreadPool(Math.max(2, Math.min(Runtime.getRuntime().availableProcessors() - 1, 4)), new NumberedThreadFactory("signal-bounded"));
+  public static final ExecutorService SERIAL    = Executors.newSingleThreadExecutor(new NumberedThreadFactory("signal-serial"));
 
   public static ExecutorService newCachedSingleThreadExecutor(final String name) {
     ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 1, 15, TimeUnit.SECONDS, new LinkedBlockingQueue<>(), r -> new Thread(r, name));
     executor.allowCoreThreadTimeOut(true);
     return executor;
   }
+
+  private static class NumberedThreadFactory implements ThreadFactory {
+
+    private final String        baseName;
+    private final AtomicInteger counter;
+
+    NumberedThreadFactory(@NonNull String baseName) {
+      this.baseName = baseName;
+      this.counter  = new AtomicInteger();
+    }
+
+    @Override
+    public Thread newThread(@NonNull Runnable r) {
+      return new Thread(r, baseName + "-" + counter.getAndIncrement());
+    }
+  }
 }
diff --git a/src/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java b/src/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java
index b15c96137..62bd3874e 100644
--- a/src/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java
+++ b/src/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.util.spans;
 
 
+import android.support.annotation.NonNull;
 import android.text.TextPaint;
 import android.text.style.MetricAffectingSpan;
 
@@ -13,7 +14,7 @@ public class CenterAlignedRelativeSizeSpan extends MetricAffectingSpan {
   }
 
   @Override
-  public void updateMeasureState(TextPaint p) {
+  public void updateMeasureState(@NonNull TextPaint p) {
     updateDrawState(p);
   }
 
diff --git a/src/org/thoughtcrime/securesms/webrtc/locks/LockManager.java b/src/org/thoughtcrime/securesms/webrtc/locks/LockManager.java
index 0eb278a0f..20a6edeba 100644
--- a/src/org/thoughtcrime/securesms/webrtc/locks/LockManager.java
+++ b/src/org/thoughtcrime/securesms/webrtc/locks/LockManager.java
@@ -44,12 +44,12 @@ public class LockManager {
 
   public LockManager(Context context) {
     PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
-    fullLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP, "RedPhone Full");
-    partialLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "RedPhone Partial");
+    fullLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP, "signal:full");
+    partialLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "signal:partial");
     proximityLock = new ProximityLock(pm);
 
     WifiManager wm = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-    wifiLock = wm.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, "RedPhone Wifi");
+    wifiLock = wm.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, "signal:wifi");
 
     fullLock.setReferenceCounted(false);
     partialLock.setReferenceCounted(false);
diff --git a/src/org/thoughtcrime/securesms/webrtc/locks/ProximityLock.java b/src/org/thoughtcrime/securesms/webrtc/locks/ProximityLock.java
index 938381e7e..323db13dc 100644
--- a/src/org/thoughtcrime/securesms/webrtc/locks/ProximityLock.java
+++ b/src/org/thoughtcrime/securesms/webrtc/locks/ProximityLock.java
@@ -32,14 +32,13 @@ class ProximityLock {
   private Optional<PowerManager.WakeLock> getProximityLock(PowerManager pm) {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
       if (pm.isWakeLockLevelSupported(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK)) {
-        return Optional.fromNullable(pm.newWakeLock(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK,
-                                                    "Signal Proximity Lock"));
+        return Optional.fromNullable(pm.newWakeLock(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK, "signal:proximity"));
       } else {
         return Optional.absent();
       }
     } else {
       try {
-        return Optional.fromNullable(pm.newWakeLock(PROXIMITY_SCREEN_OFF_WAKE_LOCK, "RedPhone Incall"));
+        return Optional.fromNullable(pm.newWakeLock(PROXIMITY_SCREEN_OFF_WAKE_LOCK, "signal:incall"));
       } catch (Throwable t) {
         Log.e(TAG, "Failed to create proximity lock", t);
         return Optional.absent();
diff --git a/test/unitTest/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtilTest.java b/test/unitTest/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtilTest.java
index b5c2fde30..e45d5b389 100644
--- a/test/unitTest/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtilTest.java
+++ b/test/unitTest/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtilTest.java
@@ -2,6 +2,10 @@ package org.thoughtcrime.securesms.linkpreview;
 
 import org.junit.Test;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertTrue;