diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a65c1bdfb0..166b896dc6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -342,7 +342,8 @@
         <activity
             android:name="org.thoughtcrime.securesms.PassphrasePromptActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:launchMode="singleTask" />
+            android:launchMode="singleTask"
+            android:theme="@style/Theme.Session.DayNight.NoActionBar"/>
         <activity
             android:name="org.thoughtcrime.securesms.NewConversationActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
diff --git a/build.gradle b/build.gradle
index ea141a6d88..c7dbb48acd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,16 +1,15 @@
-import java.security.MessageDigest
-
 buildscript {
-    ext.kotlin_version = "1.3.31"
+    ext.kotlin_version = "1.4.0"
     ext.kovenant_version = "3.3.0"
 
     repositories {
         mavenLocal()
         google()
         mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:3.4.1"
+        classpath "com.android.tools.build:gradle:4.0.1"
         classpath files('libs/gradle-witness.jar')
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.google.gms:google-services:4.3.3"
@@ -18,8 +17,8 @@ buildscript {
 }
 
 apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 apply plugin: 'witness'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'com.google.gms.google-services'
@@ -73,14 +72,15 @@ configurations.all {
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'com.google.android.material:material:1.2.0'
+    implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.preference:preference:1.1.1'
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation 'androidx.exifinterface:exifinterface:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0'
 
@@ -89,7 +89,6 @@ dependencies {
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
         exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
     }
-
     implementation 'com.google.android.exoplayer:exoplayer-core:2.9.1'
     implementation 'com.google.android.exoplayer:exoplayer-ui:2.9.1'
     implementation 'org.conscrypt:conscrypt-android:2.0.0'
@@ -141,28 +140,6 @@ dependencies {
         exclude group: 'com.fasterxml.jackson.core'
         exclude group: 'org.freemarker'
     }
-
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.assertj:assertj-core:3.11.1'
-    testImplementation 'org.mockito:mockito-core:1.9.5'
-    testImplementation 'org.powermock:powermock-api-mockito:1.6.1'
-    testImplementation 'org.powermock:powermock-module-junit4:1.6.1'
-    testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.1'
-    testImplementation 'org.powermock:powermock-classloading-xstream:1.6.1'
-
-    testImplementation 'androidx.test:core:1.3.0-rc03'
-    androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
-    androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
-    androidTestImplementation ('org.assertj:assertj-core:1.7.1') {
-        exclude group: 'org.hamcrest', module: 'hamcrest-core'
-    }
-    androidTestImplementation ('com.squareup.assertj:assertj-android:1.1.1') {
-        exclude group: 'org.hamcrest',        module: 'hamcrest-core'
-        exclude group: 'com.android.support', module: 'support-annotations'
-    }
-    testImplementation 'org.robolectric:robolectric:4.2'
-    testImplementation 'org.robolectric:shadows-multidex:4.2'
-
     // Loki
     // Local:
     implementation "org.whispersystems:signal-service-android:2.13.2" // Run ./gradlew install from session-android-service to install
@@ -180,10 +157,32 @@ dependencies {
     implementation "com.github.tbruyelle:rxpermissions:0.10.2"
     implementation "com.github.ybq:Android-SpinKit:1.4.0"
     implementation "com.opencsv:opencsv:4.6"
+
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.assertj:assertj-core:3.11.1'
+    testImplementation 'org.mockito:mockito-core:1.9.5'
+    testImplementation 'org.powermock:powermock-api-mockito:1.6.1'
+    testImplementation 'org.powermock:powermock-module-junit4:1.6.1'
+    testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.1'
+    testImplementation 'org.powermock:powermock-classloading-xstream:1.6.1'
+    testImplementation 'androidx.test:core:1.3.0'
+    androidTestImplementation 'androidx.multidex:multidex:2.0.1'
+    androidTestImplementation 'androidx.multidex:multidex-instrumentation:2.0.0'
+    androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
+    androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
+    androidTestImplementation ('org.assertj:assertj-core:1.7.1') {
+        exclude group: 'org.hamcrest', module: 'hamcrest-core'
+    }
+    androidTestImplementation ('com.squareup.assertj:assertj-android:1.1.1') {
+        exclude group: 'org.hamcrest',        module: 'hamcrest-core'
+        exclude group: 'com.android.support', module: 'support-annotations'
+    }
+    testImplementation 'org.robolectric:robolectric:4.2'
+    testImplementation 'org.robolectric:shadows-multidex:4.2'
 }
 
-def canonicalVersionCode = 84
-def canonicalVersionName = "1.5.0"
+def canonicalVersionCode = 95
+def canonicalVersionName = "1.5.3"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,
@@ -208,9 +207,10 @@ android {
 
         minSdkVersion 21
         targetSdkVersion 29
+        multiDexEnabled true // Even though we're running API 21+, this is still needed for release builds
 
         vectorDrawables.useSupportLibrary = true
-        project.ext.set("archivesBaseName", "Signal")
+        project.ext.set("archivesBaseName", "session")
 
         buildConfigField "long", "BUILD_TIMESTAMP", getLastCommitTimestamp() + "L"
         buildConfigField "String", "SIGNAL_URL", "\"\""
@@ -279,7 +279,7 @@ android {
                           'proguard-ez-vcard.pro',
                           'proguard.cfg'
             testProguardFiles 'proguard-automation.pro',
-                          'proguard.cfg'
+                              'proguard.cfg'
         }
         release {
             minifyEnabled true
@@ -349,6 +349,7 @@ android {
     }
 }
 
+/*
 def assembleWebsiteDescriptor = { variant, file ->
     if (file.exists()) {
         MessageDigest md = MessageDigest.getInstance("SHA-256")
@@ -372,7 +373,7 @@ def assembleWebsiteDescriptor = { variant, file ->
         descriptorFile.write(descriptor)
     }
 }
-/*
+
 def signProductionRelease = { variant ->
     variant.outputs.collect { output ->
         String apkName    = output.outputFile.name
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 889ee1d68a..f05084afb7 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -5,5 +5,5 @@ repositories {
 }
 
 dependencies {
-    compile 'com.android.tools.build:apksig:3.3.2'
+    implementation 'com.android.tools.build:apksig:4.0.1'
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1b2b07cfb0..33682bbbf9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/res/drawable-hdpi/ic_arrow_forward_dark.png b/res/drawable-hdpi/ic_arrow_forward_dark.png
deleted file mode 100644
index 03568e6a08..0000000000
Binary files a/res/drawable-hdpi/ic_arrow_forward_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_arrow_forward_light.png b/res/drawable-hdpi/ic_arrow_forward_light.png
deleted file mode 100644
index b55688a81f..0000000000
Binary files a/res/drawable-hdpi/ic_arrow_forward_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_folder_white_48dp.png b/res/drawable-hdpi/ic_folder_white_48dp.png
deleted file mode 100644
index b93d5a1e4a..0000000000
Binary files a/res/drawable-hdpi/ic_folder_white_48dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_visibility_grey600_24dp.png b/res/drawable-hdpi/ic_visibility_grey600_24dp.png
deleted file mode 100644
index 619b076ea4..0000000000
Binary files a/res/drawable-hdpi/ic_visibility_grey600_24dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_visibility_off_grey600_24dp.png b/res/drawable-hdpi/ic_visibility_off_grey600_24dp.png
deleted file mode 100644
index e6bddf2ef7..0000000000
Binary files a/res/drawable-hdpi/ic_visibility_off_grey600_24dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_visibility_off_white_24dp.png b/res/drawable-hdpi/ic_visibility_off_white_24dp.png
deleted file mode 100644
index e03a5d2349..0000000000
Binary files a/res/drawable-hdpi/ic_visibility_off_white_24dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_visibility_white_24dp.png b/res/drawable-hdpi/ic_visibility_white_24dp.png
deleted file mode 100644
index d531d666fc..0000000000
Binary files a/res/drawable-hdpi/ic_visibility_white_24dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_arrow_forward_dark.png b/res/drawable-mdpi/ic_arrow_forward_dark.png
deleted file mode 100644
index 92b6aebeca..0000000000
Binary files a/res/drawable-mdpi/ic_arrow_forward_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_arrow_forward_light.png b/res/drawable-mdpi/ic_arrow_forward_light.png
deleted file mode 100644
index 1df381e4b5..0000000000
Binary files a/res/drawable-mdpi/ic_arrow_forward_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_folder_white_48dp.png b/res/drawable-mdpi/ic_folder_white_48dp.png
deleted file mode 100644
index 71a5a137c4..0000000000
Binary files a/res/drawable-mdpi/ic_folder_white_48dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_visibility_grey600_24dp.png b/res/drawable-mdpi/ic_visibility_grey600_24dp.png
deleted file mode 100644
index 9d554fe3de..0000000000
Binary files a/res/drawable-mdpi/ic_visibility_grey600_24dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_visibility_off_grey600_24dp.png b/res/drawable-mdpi/ic_visibility_off_grey600_24dp.png
deleted file mode 100644
index 08dcac59fa..0000000000
Binary files a/res/drawable-mdpi/ic_visibility_off_grey600_24dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_visibility_off_white_24dp.png b/res/drawable-mdpi/ic_visibility_off_white_24dp.png
deleted file mode 100644
index fb21efe6d9..0000000000
Binary files a/res/drawable-mdpi/ic_visibility_off_white_24dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_visibility_white_24dp.png b/res/drawable-mdpi/ic_visibility_white_24dp.png
deleted file mode 100644
index 0e8e507f21..0000000000
Binary files a/res/drawable-mdpi/ic_visibility_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_arrow_forward_dark.png b/res/drawable-xhdpi/ic_arrow_forward_dark.png
deleted file mode 100644
index 70057432f3..0000000000
Binary files a/res/drawable-xhdpi/ic_arrow_forward_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_arrow_forward_light.png b/res/drawable-xhdpi/ic_arrow_forward_light.png
deleted file mode 100644
index ad50cf2741..0000000000
Binary files a/res/drawable-xhdpi/ic_arrow_forward_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_folder_white_48dp.png b/res/drawable-xhdpi/ic_folder_white_48dp.png
deleted file mode 100644
index a1afbe9daf..0000000000
Binary files a/res/drawable-xhdpi/ic_folder_white_48dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_visibility_grey600_24dp.png b/res/drawable-xhdpi/ic_visibility_grey600_24dp.png
deleted file mode 100644
index b121c9ae29..0000000000
Binary files a/res/drawable-xhdpi/ic_visibility_grey600_24dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_visibility_off_grey600_24dp.png b/res/drawable-xhdpi/ic_visibility_off_grey600_24dp.png
deleted file mode 100644
index a666da5cd6..0000000000
Binary files a/res/drawable-xhdpi/ic_visibility_off_grey600_24dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_visibility_off_white_24dp.png b/res/drawable-xhdpi/ic_visibility_off_white_24dp.png
deleted file mode 100644
index 03d0e65b18..0000000000
Binary files a/res/drawable-xhdpi/ic_visibility_off_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_visibility_white_24dp.png b/res/drawable-xhdpi/ic_visibility_white_24dp.png
deleted file mode 100644
index a42cab7109..0000000000
Binary files a/res/drawable-xhdpi/ic_visibility_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_arrow_forward_dark.png b/res/drawable-xxhdpi/ic_arrow_forward_dark.png
deleted file mode 100644
index 67c757ae26..0000000000
Binary files a/res/drawable-xxhdpi/ic_arrow_forward_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_arrow_forward_light.png b/res/drawable-xxhdpi/ic_arrow_forward_light.png
deleted file mode 100644
index 44956477ad..0000000000
Binary files a/res/drawable-xxhdpi/ic_arrow_forward_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_folder_white_48dp.png b/res/drawable-xxhdpi/ic_folder_white_48dp.png
deleted file mode 100644
index 0f95c75501..0000000000
Binary files a/res/drawable-xxhdpi/ic_folder_white_48dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_visibility_grey600_24dp.png b/res/drawable-xxhdpi/ic_visibility_grey600_24dp.png
deleted file mode 100644
index 503497dda8..0000000000
Binary files a/res/drawable-xxhdpi/ic_visibility_grey600_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_visibility_off_grey600_24dp.png b/res/drawable-xxhdpi/ic_visibility_off_grey600_24dp.png
deleted file mode 100644
index 63914559f4..0000000000
Binary files a/res/drawable-xxhdpi/ic_visibility_off_grey600_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_visibility_off_white_24dp.png b/res/drawable-xxhdpi/ic_visibility_off_white_24dp.png
deleted file mode 100644
index f88d24ff5f..0000000000
Binary files a/res/drawable-xxhdpi/ic_visibility_off_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_visibility_white_24dp.png b/res/drawable-xxhdpi/ic_visibility_white_24dp.png
deleted file mode 100644
index 987af79f8b..0000000000
Binary files a/res/drawable-xxhdpi/ic_visibility_white_24dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_folder_white_48dp.png b/res/drawable-xxxhdpi/ic_folder_white_48dp.png
deleted file mode 100644
index 862a359c65..0000000000
Binary files a/res/drawable-xxxhdpi/ic_folder_white_48dp.png and /dev/null differ
diff --git a/res/drawable/ic_baseline_add_24.xml b/res/drawable/ic_baseline_add_24.xml
new file mode 100644
index 0000000000..eb232541d8
--- /dev/null
+++ b/res/drawable/ic_baseline_add_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/res/drawable/ic_baseline_arrow_forward_24.xml b/res/drawable/ic_baseline_arrow_forward_24.xml
new file mode 100644
index 0000000000..702e70c537
--- /dev/null
+++ b/res/drawable/ic_baseline_arrow_forward_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z"/>
+</vector>
diff --git a/res/drawable/ic_baseline_folder_24.xml b/res/drawable/ic_baseline_folder_24.xml
new file mode 100644
index 0000000000..dc6b080235
--- /dev/null
+++ b/res/drawable/ic_baseline_folder_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
+</vector>
diff --git a/res/drawable/ic_baseline_mic_24.xml b/res/drawable/ic_baseline_mic_24.xml
new file mode 100644
index 0000000000..791b475704
--- /dev/null
+++ b/res/drawable/ic_baseline_mic_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,14c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM17.3,11c0,3 -2.54,5.1 -5.3,5.1S6.7,14 6.7,11L5,11c0,3.41 2.72,6.23 6,6.72L11,21h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z"/>
+</vector>
diff --git a/res/drawable/ic_baseline_visibility_24.xml b/res/drawable/ic_baseline_visibility_24.xml
new file mode 100644
index 0000000000..a3e222a2d1
--- /dev/null
+++ b/res/drawable/ic_baseline_visibility_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
+</vector>
diff --git a/res/drawable/ic_baseline_visibility_off_24.xml b/res/drawable/ic_baseline_visibility_off_24.xml
new file mode 100644
index 0000000000..92c48569fd
--- /dev/null
+++ b/res/drawable/ic_baseline_visibility_off_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
+</vector>
diff --git a/res/drawable/profile_picture_view_large_background.xml b/res/drawable/profile_picture_view_large_background.xml
index bfc404e25f..c5f6d91a0d 100644
--- a/res/drawable/profile_picture_view_large_background.xml
+++ b/res/drawable/profile_picture_view_large_background.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid  android:color="@color/unimportant" />
+    <solid  android:color="@color/profile_picture_background" />
 
     <corners android:radius="38dp" />
 
diff --git a/res/drawable/profile_picture_view_large_foreground.xml b/res/drawable/profile_picture_view_large_foreground.xml
index 18cac49b38..7d6f94a2b4 100644
--- a/res/drawable/profile_picture_view_large_foreground.xml
+++ b/res/drawable/profile_picture_view_large_foreground.xml
@@ -7,5 +7,5 @@
 
     <corners android:radius="38dp" />
 
-    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/border" />
+    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/profile_picture_border" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/profile_picture_view_medium_background.xml b/res/drawable/profile_picture_view_medium_background.xml
index 287d6298e2..2b379dec4e 100644
--- a/res/drawable/profile_picture_view_medium_background.xml
+++ b/res/drawable/profile_picture_view_medium_background.xml
@@ -3,9 +3,9 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid  android:color="@color/unimportant" />
+    <solid  android:color="@color/profile_picture_background" />
 
     <corners android:radius="23dp" />
 
-    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/border" />
+    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/profile_picture_border" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/profile_picture_view_medium_foreground.xml b/res/drawable/profile_picture_view_medium_foreground.xml
index e62cfbe3fb..e05dd6aaba 100644
--- a/res/drawable/profile_picture_view_medium_foreground.xml
+++ b/res/drawable/profile_picture_view_medium_foreground.xml
@@ -7,5 +7,5 @@
 
     <corners android:radius="23dp" />
 
-    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/border" />
+    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/profile_picture_border" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/profile_picture_view_rss_medium_background.xml b/res/drawable/profile_picture_view_rss_medium_background.xml
index b060c41b4b..9496e53ed0 100644
--- a/res/drawable/profile_picture_view_rss_medium_background.xml
+++ b/res/drawable/profile_picture_view_rss_medium_background.xml
@@ -3,9 +3,9 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid  android:color="#353535" />
+    <solid android:color="@color/profile_picture_background" />
 
     <corners android:radius="23dp" />
 
-    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/border" />
+    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/profile_picture_border" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/profile_picture_view_small_background.xml b/res/drawable/profile_picture_view_small_background.xml
index 2f44fefe9f..d01f12f77a 100644
--- a/res/drawable/profile_picture_view_small_background.xml
+++ b/res/drawable/profile_picture_view_small_background.xml
@@ -3,9 +3,9 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid  android:color="@color/unimportant" />
+    <solid  android:color="@color/profile_picture_background" />
 
     <corners android:radius="18dp" />
 
-    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/border" />
+    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/profile_picture_border" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/profile_picture_view_small_foreground.xml b/res/drawable/profile_picture_view_small_foreground.xml
index 98d2b0a4e7..6a46584bf8 100644
--- a/res/drawable/profile_picture_view_small_foreground.xml
+++ b/res/drawable/profile_picture_view_small_foreground.xml
@@ -7,5 +7,5 @@
 
     <corners android:radius="18dp" />
 
-    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/border" />
+    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/profile_picture_border" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/prominent_outline_button_medium_background.xml b/res/drawable/prominent_outline_button_medium_background.xml
index 183ed83282..f595e4f38b 100644
--- a/res/drawable/prominent_outline_button_medium_background.xml
+++ b/res/drawable/prominent_outline_button_medium_background.xml
@@ -7,5 +7,5 @@
 
     <corners android:radius="@dimen/medium_button_corner_radius" />
 
-    <stroke android:width="@dimen/border_thickness" android:color="?colorAccent" />
+    <stroke android:width="@dimen/border_thickness" android:color="@color/accent" />
 </shape>
\ No newline at end of file
diff --git a/res/layout-sw400dp/activity_pn_mode.xml b/res/layout-sw400dp/activity_pn_mode.xml
index 649ef31eae..66431151b8 100644
--- a/res/layout-sw400dp/activity_pn_mode.xml
+++ b/res/layout-sw400dp/activity_pn_mode.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/contentView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -30,7 +31,7 @@
         android:textColor="@color/text"
         android:text="There are two ways Session can notify you of new messages." />
 
-    <LinearLayout
+    <org.thoughtcrime.securesms.loki.views.PNModeView
         android:id="@+id/fcmOptionView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -66,9 +67,9 @@
             android:textStyle="bold"
             android:text="@string/activity_pn_mode_recommended_option_tag" />
 
-    </LinearLayout>
+    </org.thoughtcrime.securesms.loki.views.PNModeView>
 
-    <LinearLayout
+    <org.thoughtcrime.securesms.loki.views.PNModeView
         android:id="@+id/backgroundPollingOptionView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -95,7 +96,7 @@
             android:textColor="@color/text"
             android:text="Session will occasionally check for new messages in the background. Full metadata protection is guaranteed, but message notifications will be unreliable." />
 
-    </LinearLayout>
+    </org.thoughtcrime.securesms.loki.views.PNModeView>
 
     <View
         android:layout_width="match_parent"
diff --git a/res/layout-sw400dp/fragment_enter_chat_url.xml b/res/layout-sw400dp/fragment_enter_chat_url.xml
index 564580c481..7e81c7dd7b 100644
--- a/res/layout-sw400dp/fragment_enter_chat_url.xml
+++ b/res/layout-sw400dp/fragment_enter_chat_url.xml
@@ -7,6 +7,12 @@
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?android:dividerHorizontal"
+        android:elevation="1dp" />
+
     <EditText
         style="@style/SessionEditText"
         android:id="@+id/chatURLEditText"
@@ -23,7 +29,7 @@
         android:layout_weight="1" />
 
     <Button
-        style="@style/Widget.Session.Button.Common.ProminentFilled"
+        style="@style/Widget.Session.Button.Common.ProminentOutline"
         android:id="@+id/joinPublicChatButton"
         android:layout_width="196dp"
         android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout-sw400dp/fragment_enter_public_key.xml b/res/layout-sw400dp/fragment_enter_public_key.xml
index ae996d2411..9acdc7e6db 100644
--- a/res/layout-sw400dp/fragment_enter_public_key.xml
+++ b/res/layout-sw400dp/fragment_enter_public_key.xml
@@ -8,6 +8,12 @@
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?android:dividerHorizontal"
+        android:elevation="1dp" />
+
     <EditText
         style="@style/SessionEditText"
         android:id="@+id/publicKeyEditText"
@@ -90,7 +96,7 @@
         android:layout_weight="1" />
 
     <Button
-        style="@style/Widget.Session.Button.Common.ProminentFilled"
+        style="@style/Widget.Session.Button.Common.ProminentOutline"
         android:id="@+id/createPrivateChatButton"
         android:layout_width="196dp"
         android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout/activity_create_closed_group.xml b/res/layout/activity_create_closed_group.xml
index 6778a17915..a965ae8551 100644
--- a/res/layout/activity_create_closed_group.xml
+++ b/res/layout/activity_create_closed_group.xml
@@ -73,7 +73,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:layout_centerInParent="true"
-            app:SpinKit_Color="?android:colorControlNormal" />
+            app:SpinKit_Color="@android:color/white" />
 
     </RelativeLayout>
 
diff --git a/res/layout/activity_home.xml b/res/layout/activity_home.xml
index 13eb8bda5e..cea2157d5e 100644
--- a/res/layout/activity_home.xml
+++ b/res/layout/activity_home.xml
@@ -14,7 +14,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?colorPrimary"
-        android:elevation="1dp"
         app:contentInsetStart="0dp">
 
         <LinearLayout
@@ -65,6 +64,12 @@
 
             </RelativeLayout>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="?android:dividerHorizontal"
+                android:elevation="1dp" />
+
             <org.thoughtcrime.securesms.loki.views.SeedReminderView
                 android:id="@+id/seedReminderView"
                 android:layout_width="match_parent"
@@ -76,7 +81,8 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:clipChildren="false">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
@@ -94,8 +100,8 @@
 
         <org.thoughtcrime.securesms.loki.views.NewConversationButtonSetView
             android:id="@+id/newConversationButtonSet"
-            android:layout_width="252dp"
-            android:layout_height="212dp"
+            android:layout_width="276dp"
+            android:layout_height="236dp"
             android:layout_centerHorizontal="true"
             android:layout_alignParentBottom="true" />
 
diff --git a/res/layout/activity_join_public_chat.xml b/res/layout/activity_join_public_chat.xml
index 8ad81ba3de..d437a230fc 100644
--- a/res/layout/activity_join_public_chat.xml
+++ b/res/layout/activity_join_public_chat.xml
@@ -32,7 +32,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:layout_centerInParent="true"
-            app:SpinKit_Color="@color/text" />
+            app:SpinKit_Color="@android:color/white" />
 
     </RelativeLayout>
 
diff --git a/res/layout/activity_path.xml b/res/layout/activity_path.xml
index a0fa1c20a8..6c2db06239 100644
--- a/res/layout/activity_path.xml
+++ b/res/layout/activity_path.xml
@@ -23,7 +23,8 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:layout_margin="@dimen/large_spacing">
+        android:layout_margin="@dimen/large_spacing"
+        android:clipChildren="false">
 
         <LinearLayout
             android:id="@+id/pathRowsContainer"
diff --git a/res/layout/activity_pn_mode.xml b/res/layout/activity_pn_mode.xml
index 559c78d1f3..2ab9cc8602 100644
--- a/res/layout/activity_pn_mode.xml
+++ b/res/layout/activity_pn_mode.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/contentView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -30,7 +31,7 @@
         android:textColor="@color/text"
         android:text="There are two ways Session can notify you of new messages." />
 
-    <LinearLayout
+    <org.thoughtcrime.securesms.loki.views.PNModeView
         android:id="@+id/fcmOptionView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -66,9 +67,9 @@
             android:textStyle="bold"
             android:text="@string/activity_pn_mode_recommended_option_tag" />
 
-    </LinearLayout>
+    </org.thoughtcrime.securesms.loki.views.PNModeView>
 
-    <LinearLayout
+    <org.thoughtcrime.securesms.loki.views.PNModeView
         android:id="@+id/backgroundPollingOptionView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -95,7 +96,7 @@
             android:textColor="@color/text"
             android:text="Session will occasionally check for new messages in the background. Full metadata protection is guaranteed, but message notifications will be unreliable." />
 
-    </LinearLayout>
+    </org.thoughtcrime.securesms.loki.views.PNModeView>
 
     <View
         android:layout_width="match_parent"
diff --git a/res/layout/activity_settings.xml b/res/layout/activity_settings.xml
index b1e5f4df2b..38a27f7168 100644
--- a/res/layout/activity_settings.xml
+++ b/res/layout/activity_settings.xml
@@ -248,7 +248,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:layout_centerInParent="true"
-            app:SpinKit_Color="@color/text" />
+            app:SpinKit_Color="@android:color/white" />
 
     </RelativeLayout>
 
diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 5a3f3aaed3..de99e57802 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -20,9 +20,15 @@
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
+            <org.thoughtcrime.securesms.loki.views.ProfilePictureView
+                android:id="@+id/profilePictureView"
+                android:layout_width="@dimen/medium_profile_picture_size"
+                android:layout_height="@dimen/medium_profile_picture_size" />
+
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/medium_spacing"
                 android:orientation="vertical">
 
                 <TextView
@@ -102,6 +108,12 @@
                 android:indeterminate="false"
                 android:progress="0" />
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="?android:dividerHorizontal"
+                android:elevation="1dp" />
+
             <org.thoughtcrime.securesms.loki.views.SessionRestoreBannerView
                 android:id="@+id/sessionRestoreBannerView"
                 android:layout_width="match_parent"
diff --git a/res/layout/conversation_item_sent_document.xml b/res/layout/conversation_item_sent_document.xml
index ce627e27a6..2145cfdbf2 100644
--- a/res/layout/conversation_item_sent_document.xml
+++ b/res/layout/conversation_item_sent_document.xml
@@ -9,5 +9,5 @@
         android:visibility="gone"
         app:doc_titleColor="?conversation_item_sent_text_primary_color"
         app:doc_captionColor="?conversation_item_sent_text_secondary_color"
-        app:doc_downloadButtonTint="?conversation_item_sent_download_icon_color"
+        app:doc_downloadButtonTint="?android:colorControlNormal"
         tools:visibility="visible"/>
diff --git a/res/layout/dialog_seed.xml b/res/layout/dialog_seed.xml
index 718f902507..35fe564c20 100644
--- a/res/layout/dialog_seed.xml
+++ b/res/layout/dialog_seed.xml
@@ -21,10 +21,12 @@
         android:textSize="@dimen/medium_font_size" />
 
     <TextView
+        style="@style/SessionIDTextView"
         android:id="@+id/seedTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/large_spacing"
+        android:padding="@dimen/small_spacing"
         android:text="habitat kiwi amply iceberg dog nerves spiderman soft match partial awakened maximum degrees"
         android:textColor="@color/text"
         android:textSize="@dimen/small_font_size"
@@ -70,9 +72,9 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/large_spacing"
         android:text="@string/dialog_seed_disclaimer"
-        android:textStyle="bold"
         android:textColor="@color/text"
-        android:textSize="@dimen/very_small_font_size"
+        android:alpha="0.6"
+        android:textSize="10sp"
         android:textAlignment="center" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/expiration_timer_menu.xml b/res/layout/expiration_timer_menu.xml
index 4e146fea64..b281a5afca 100644
--- a/res/layout/expiration_timer_menu.xml
+++ b/res/layout/expiration_timer_menu.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                style="?android:attr/actionButtonStyle"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clickable="true"
-                android:focusable="true"
-                android:gravity="center">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="?android:attr/actionButtonStyle"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clickable="true"
+    android:focusable="true"
+    android:gravity="center">
 
     <ImageView
             android:id="@+id/menu_badge_icon"
@@ -25,6 +26,6 @@
             android:paddingBottom="3dp"
             android:paddingTop="1dp"
             android:background="@color/transparent"
-            android:textColor="@android:color/white"
+            android:textColor="@color/text"
             android:textSize="10sp" />
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/fragment_conversation_bottom_sheet.xml b/res/layout/fragment_conversation_bottom_sheet.xml
index 274417418a..4cd4708573 100644
--- a/res/layout/fragment_conversation_bottom_sheet.xml
+++ b/res/layout/fragment_conversation_bottom_sheet.xml
@@ -9,13 +9,20 @@
     app:behavior_hideable="true"
     app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
+    <TextView
+        android:id="@+id/detailsTextView"
+        style="@style/BottomSheetActionItem"
+        android:drawableStart="@drawable/ic_info_outline_white_24dp"
+        android:drawableTint="?attr/colorControlNormal"
+        android:text="@string/details" />
+
     <TextView
         android:id="@+id/blockTextView"
         style="@style/BottomSheetActionItem"
         android:drawableStart="?attr/menu_block_icon"
         android:text="@string/RecipientPreferenceActivity_block"
         android:visibility="gone"
-        tools:visibility="visible"/>
+        tools:visibility="visible" />
 
     <TextView
         android:id="@+id/unblockTextView"
@@ -23,7 +30,7 @@
         android:drawableStart="?attr/menu_accept_icon"
         android:text="@string/RecipientPreferenceActivity_unblock"
         android:visibility="gone"
-        tools:visibility="visible"/>
+        tools:visibility="visible" />
 
     <TextView
         android:id="@+id/deleteTextView"
diff --git a/res/layout/fragment_enter_chat_url.xml b/res/layout/fragment_enter_chat_url.xml
index a477981590..4a1cc2a505 100644
--- a/res/layout/fragment_enter_chat_url.xml
+++ b/res/layout/fragment_enter_chat_url.xml
@@ -7,6 +7,12 @@
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?android:dividerHorizontal"
+        android:elevation="1dp" />
+
     <EditText
         style="@style/SmallSessionEditText"
         android:id="@+id/chatURLEditText"
diff --git a/res/layout/fragment_enter_public_key.xml b/res/layout/fragment_enter_public_key.xml
index 92e27cf260..ffd53dd34e 100644
--- a/res/layout/fragment_enter_public_key.xml
+++ b/res/layout/fragment_enter_public_key.xml
@@ -7,6 +7,12 @@
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?android:dividerHorizontal"
+        android:elevation="1dp" />
+
     <EditText
         style="@style/SmallSessionEditText"
         android:id="@+id/publicKeyEditText"
diff --git a/res/layout/fragment_search.xml b/res/layout/fragment_search.xml
index ae8401c6e8..18766af64e 100644
--- a/res/layout/fragment_search.xml
+++ b/res/layout/fragment_search.xml
@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="center"
-        android:background="?attr/search_background"
+        android:background="?android:windowBackground"
         android:visibility="gone" />
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/res/layout/fragment_user_details_bottom_sheet.xml b/res/layout/fragment_user_details_bottom_sheet.xml
new file mode 100644
index 0000000000..705317e32d
--- /dev/null
+++ b/res/layout/fragment_user_details_bottom_sheet.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:gravity="center_horizontal"
+    android:paddingLeft="@dimen/large_spacing"
+    android:paddingRight="@dimen/large_spacing"
+    android:paddingBottom="@dimen/large_spacing"
+    app:behavior_hideable="true"
+    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
+
+    <org.thoughtcrime.securesms.loki.views.ProfilePictureView
+        android:id="@+id/profilePictureView"
+        android:layout_width="@dimen/large_profile_picture_size"
+        android:layout_height="@dimen/large_profile_picture_size"
+        android:layout_marginTop="@dimen/large_spacing" />
+
+    <TextView
+        android:id="@+id/nameTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/medium_spacing"
+        android:textSize="@dimen/massive_font_size"
+        android:textStyle="bold"
+        android:textColor="@color/text"
+        android:text="Spiderman" />
+
+    <TextView
+        style="@style/SessionIDTextView"
+        android:id="@+id/publicKeyTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="@dimen/large_font_size"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:textIsSelectable="true"
+        android:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
+
+    <Button
+        style="@style/Widget.Session.Button.Common.ProminentOutline"
+        android:id="@+id/copyButton"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/medium_button_height"
+        android:layout_marginTop="@dimen/medium_spacing"
+        android:paddingLeft="@dimen/large_spacing"
+        android:paddingRight="@dimen/large_spacing"
+        android:text="@string/copy" />
+
+</LinearLayout>
diff --git a/res/layout/fragment_view_my_qr_code.xml b/res/layout/fragment_view_my_qr_code.xml
index 95379f3885..a1f276511a 100644
--- a/res/layout/fragment_view_my_qr_code.xml
+++ b/res/layout/fragment_view_my_qr_code.xml
@@ -4,6 +4,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?android:dividerHorizontal"
+        android:elevation="1dp" />
+
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/res/layout/invite_activity.xml b/res/layout/invite_activity.xml
index fccfa91128..e7f574cca3 100644
--- a/res/layout/invite_activity.xml
+++ b/res/layout/invite_activity.xml
@@ -13,8 +13,7 @@
                       android:layout_height="wrap_content"
                       android:layout_width="match_parent"
                       android:orientation="vertical"
-                      android:padding="10dp"
-                      android:background="?attr/invite_background">
+                      android:padding="10dp">
 
             <ImageView android:id="@+id/heart"
                        android:layout_width="wrap_content"
diff --git a/res/layout/media_keyboard.xml b/res/layout/media_keyboard.xml
index 8203d8f6c7..76a6281074 100644
--- a/res/layout/media_keyboard.xml
+++ b/res/layout/media_keyboard.xml
@@ -17,7 +17,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
             android:padding="6dp"
-            android:src="@drawable/ic_search_white_24dp"
+            android:src="@drawable/ic_baseline_search_24"
             android:tint="?media_keyboard_button_color"
             android:background="?selectableItemBackgroundBorderless"
             android:visibility="invisible"
@@ -98,7 +98,7 @@
             android:tint="?media_keyboard_button_color"
             android:visibility="gone"
             android:background="?selectableItemBackground"
-            app:srcCompat="@drawable/ic_plus_24"
+            app:srcCompat="@drawable/ic_baseline_add_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"
diff --git a/res/layout/mediapicker_folder_item.xml b/res/layout/mediapicker_folder_item.xml
index 9d1d729ebe..b52ace6f4a 100644
--- a/res/layout/mediapicker_folder_item.xml
+++ b/res/layout/mediapicker_folder_item.xml
@@ -33,7 +33,8 @@
             android:layout_width="20dp"
             android:layout_height="20dp"
             android:layout_marginEnd="6dp"
-            android:src="@drawable/ic_folder_white_48dp"/>
+            android:tint="@android:color/white"
+            android:src="@drawable/ic_baseline_folder_24"/>
 
         <TextView
             android:id="@+id/mediapicker_folder_item_title"
diff --git a/res/layout/prompt_passphrase_activity.xml b/res/layout/prompt_passphrase_activity.xml
index 32e1069959..372a67663b 100644
--- a/res/layout/prompt_passphrase_activity.xml
+++ b/res/layout/prompt_passphrase_activity.xml
@@ -6,7 +6,8 @@
                 android:id="@+id/prompt_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                tools:context="org.thoughtcrime.securesms.PassphrasePromptActivity">
 
     <View android:id="@+id/shim"
           android:layout_width="match_parent"
@@ -25,7 +26,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:layout_marginTop="20dp">
+            android:layout_alignParentTop="true">
 
         <ImageView
             android:layout_width="wrap_content"
@@ -78,7 +79,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="60dp"
-                        tools:visibility="gone">
+                        tools:visibility="visible">
 
             <EditText android:id="@+id/passphrase_edit"
                       android:layout_width="match_parent"
@@ -88,7 +89,8 @@
                       android:layout_marginEnd="50dp"
                       android:singleLine="true"
                       android:paddingStart="10dp"
-                      android:paddingEnd="40dp"/>
+                      android:paddingEnd="40dp"
+                      tools:text="password"/>
 
             <org.thoughtcrime.securesms.components.AnimatingToggle
                     android:id="@+id/button_toggle"
@@ -100,7 +102,7 @@
                     android:gravity="center">
 
                 <ImageButton android:id="@+id/passphrase_visibility"
-                             android:src="?ic_visibility"
+                             android:src="?ic_visibility_on"
                              android:background="@drawable/touch_highlight_background"
                              android:layout_width="wrap_content"
                              android:layout_height="wrap_content"
diff --git a/res/layout/view_fake_chat.xml b/res/layout/view_fake_chat.xml
index 5680186dc2..654cbd86bf 100644
--- a/res/layout/view_fake_chat.xml
+++ b/res/layout/view_fake_chat.xml
@@ -5,6 +5,7 @@
     android:layout_height="wrap_content"
     android:paddingLeft="@dimen/very_large_spacing"
     android:paddingRight="@dimen/very_large_spacing"
+    android:paddingBottom="@dimen/medium_spacing"
     android:orientation="vertical">
 
     <TextView
diff --git a/res/layout/view_profile_picture.xml b/res/layout/view_profile_picture.xml
index 2cae135b49..ba9c55df02 100644
--- a/res/layout/view_profile_picture.xml
+++ b/res/layout/view_profile_picture.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <RelativeLayout
         android:id="@+id/doubleModeImageViewContainer"
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 21dc6dd1ea..f0c1ef47e9 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -1252,5 +1252,184 @@ Diterima pesan pertukaran kunci untuk versi protokol yang tidak valid.
   <string name="prompt_passphrase_activity__tap_to_unlock">KETUK UNTUK MEMBUKA</string>
   <string name="RegistrationLockDialog_reminder">Peringatan:</string>
   <string name="recipient_preferences__about">Tentang</string>
-  <!--EOF-->
+
+
+
+
+
+  <!-- Session -->
+  <string name="continue_2">Lanjut</string>
+  <string name="copy">Salin</string>
+  <string name="invalid_url">URL salah</string>
+  <string name="copied_to_clipboard">Salin ke clipboard</string>
+  <string name="device_linking_failed">Gagal menyambungkan perangkat</string>
+  <string name="next">Selanjutnya</string>
+  <string name="share">Bagikan</string>
+  <string name="invalid_session_id">Session salah</string>
+  <string name="cancel">Batal</string>
+  <string name="your_session_id">Session ID anda</string>
+
+  <string name="activity_landing_title_2">Session anda dimulai di sini</string>
+  <string name="activity_landing_register_button_title">Buat Session ID</string>
+  <string name="activity_landing_restore_button_title">Lanjutkan Session</string>
+  <string name="activity_landing_link_button_title">Tautkan dengan akun</string>
+  <string name="activity_landing_device_unlinked_dialog_title">Sukses memutus koneksi perangkat</string>
+
+  <string name="view_fake_chat_bubble_1">Apa itu Session?</string>
+  <string name="view_fake_chat_bubble_2">Session adalah aplikasi pesan terenkripsi yang terdesentralisasi</string>
+  <string name="view_fake_chat_bubble_3">Bagaimana dengan pengumpulan informasi personal atau metadata percakapan? Bagaimana cara kerjanya?</string>
+  <string name="view_fake_chat_bubble_4">Menggunakan kombinasi routing yang anonim canggih dan teknologi enkripsi ujung-ke-ujung (end-to-end encryption)</string>
+  <string name="view_fake_chat_bubble_5">Rekan yang baik tak membiarkan rekannya menggunakan aplikasi bertukar pesan yang tak aman. Terima kasih kembali.</string>
+
+  <string name="activity_register_title">Ucapkan halo pada Session ID anda</string>
+  <string name="activity_register_explanation">Session ID adalah alamat unik yang bisa digunakan untuk mengontak anda. Tanpa koneksi dengan identitas asli, Session ID anda didesain bersifat anonim dan rahasia.</string>
+  <string name="activity_register_public_key_copied_message">Salin ke clipboard</string>
+
+  <string name="activity_restore_title">Kembalikan akun</string>
+  <string name="activity_restore_explanation">Masukkan kata pemulihan yang diberikan saat anda mencoba masuk ke akun</string>
+  <string name="activity_restore_seed_edit_text_hint">masukan kata pemulihan</string>
+
+  <string name="activity_link_device_title">Tautkan perangkat</string>
+  <string name="activity_link_device_enter_session_id_tab_title">Masuk ke Session ID</string>
+  <string name="activity_link_device_scan_qr_code_tab_title">Pindai kode QR</string>
+  <string name="activity_link_device_scan_qr_code_explanation">Tautkan Perangkat" di perangkat anda, kemudian pindai QR code yang muncul untuk mulai proses menautkan</string>
+
+  <string name="fragment_enter_session_id_title">Tautkan perangkat</string>
+  <string name="fragment_enter_session_id_explanation">Tautkan perangkat" di perangkat lain dan masuk ke Session ID anda untuk memulai proses menautkan</string>
+  <string name="fragment_enter_session_id_edit_text_hint">Masuk ke Session ID</string>
+
+  <string name="activity_display_name_title_2">Pilih nama yang ditampilkan</string>
+  <string name="activity_display_name_explanation">Ini akan menjadi nama anda ketika menggunakan Session. Bisa merupakan nama asli, alias, atau apapun yang anda suka</string>
+  <string name="activity_display_name_edit_text_hint">Masukkan nama</string>
+  <string name="activity_display_name_display_name_missing_error">Pilih nama yang ditampilkan</string>
+  <string name="activity_display_name_display_name_invalid_error">Masukkan nama yang terdiri dari karakter 1-z, A-Z, 0-9, dan _</string>
+  <string name="activity_display_name_display_name_too_long_error">Nama yang dibuat terlalu panjang</string>
+
+  <string name="activity_pn_mode_recommended_option_tag">Direkomendasikan</string>
+  <string name="activity_pn_mode_no_option_picked_dialog_title">Pilih salah satu opsi</string>
+
+  <string name="activity_home_empty_state_message">Anda belum memiliki kontak</string>
+  <string name="activity_home_empty_state_button_title">Mulai sebuah Session</string>
+  <string name="activity_home_leave_group_dialog_message">Apakah anda yakin ingin meninggalkan grup ini?</string>
+  <string name="activity_home_leaving_group_failed_message">Tak bisa meninggalkan grup</string>
+  <string name="activity_home_delete_conversation_dialog_message">Apakah anda yakin ingin menghapus percakapan ini?</string>
+  <string name="activity_home_conversation_deleted_message">Percakapan terhapus</string>
+
+  <string name="activity_seed_title">Kata pemulihan anda</string>
+  <string name="activity_seed_title_2">Inilah kata pemulihan anda</string>
+  <string name="activity_seed_explanation">Kata pemulihan adalah kunci Session ID -- bisa digunakan untuk mengembalikan Session ID ketika anda kehilangan perangkat. Simpan kata pemulihan di tempat yang aman dan jangan berikan kepada siapapun</string>
+  <string name="activity_seed_reveal_button_title">Tekan untuk melihat</string>
+
+  <string name="view_seed_reminder_subtitle_1">Amankan akun anda dengan menyimpan kata pemulihan</string>
+  <string name="view_seed_reminder_subtitle_2">Ketuk dan tekan kata yang disensor untuk mengetahui kata pemulihan anda, lalu simpan baik-baik untuk mengamnkan Session ID anda</string>
+  <string name="view_seed_reminder_subtitle_3">Pastikan untuk menyimpan kata pemulihan di tempat yang aman</string>
+
+  <string name="activity_path_title">Path</string>
+  <string name="activity_path_explanation">Session menyembunyikan IP dengan memantulkan pesan melalui berbagai simpul layanan di jaringan Session yang terdesentralisasi. Ini adalah negara yang menjadi lokasi pesan anda dipantulkan</string>
+  <string name="activity_path_device_row_title">Anda</string>
+  <string name="activity_path_guard_node_row_title">Simpul masuk</string>
+  <string name="activity_path_service_node_row_title">Simpul layanan</string>
+  <string name="activity_path_destination_row_title">Tujuan</string>
+  <string name="activity_path_learn_more_button_title">Pelajari lebih lanjut</string>
+
+  <string name="activity_create_private_chat_title">Session baru</string>
+  <string name="activity_create_private_chat_enter_session_id_tab_title">Masukkan Session ID</string>
+  <string name="activity_create_private_chat_scan_qr_code_tab_title">Pindai kode QR</string>
+  <string name="activity_create_private_chat_scan_qr_code_explanation">Pindai kode QR pengguna lain untuk memulai Session. Kode QR bisa ditemukan dengan mengetukan gambar kode QR di pengaturan akun</string>
+
+  <string name="fragment_enter_public_key_edit_text_hint">Masukkan Session ID penerima</string>
+  <string name="fragment_enter_public_key_explanation">Pengguna bisa membagikan Session ID miliknya dengan masuk ke pengaturan akun dan mengetuk "Bagikan Session ID" atau dengan membagikan kode QR mereka</string>
+
+  <string name="fragment_scan_qr_code_camera_access_explanation">Session membutuhkan akses kamera untuk memindai kode QR</string>
+  <string name="fragment_scan_qr_code_grant_camera_access_button_title">Berikan akses kamera</string>
+
+  <string name="activity_create_closed_group_title">Grup tertutup baru</string>
+  <string name="activity_create_closed_group_edit_text_hint">Masukkan nama grup</string>
+  <string name="activity_create_closed_group_explanation">Grup tertutup maksimal berisi 10 anggota dan memiliki perlindungan privasi yang sama dengan Session antara dua pengguna</string>
+  <string name="activity_create_closed_group_empty_state_message">anda belum memiliki kontak</string>
+  <string name="activity_create_closed_group_empty_state_button_title">Mulai sebuah Session</string>
+  <string name="activity_create_closed_group_group_name_missing_error">Masukkan nama grup</string>
+  <string name="activity_create_closed_group_group_name_too_long_error">Masukkan nama grup yang lebih pendek</string>
+  <string name="activity_create_closed_group_not_enough_group_members_error">Pilih setidaknya 2 anggota grup</string>
+  <string name="activity_create_closed_group_too_many_group_members_error">Grup tertutup maksimal berisi 10 anggota</string>
+  <string name="activity_create_closed_group_invalid_session_id_error">Salah satu anggota di grup memiliki Session ID yang salah</string>
+
+  <string name="activity_join_public_chat_title">Gabung ke grup terbuka</string>
+  <string name="activity_join_public_chat_error">Tak bisa bergabung dengan grup</string>
+  <string name="activity_join_public_chat_enter_group_url_tab_title">Buka URL grup</string>
+  <string name="activity_join_public_chat_scan_qr_code_tab_title">Pindai kode QR</string>
+  <string name="activity_join_public_chat_scan_qr_code_explanation">Pindai kode QR grup terbuka yang ingin anda masuki</string>
+
+  <string name="fragment_enter_chat_url_edit_text_hint">Masukkan sebuah URL grup terbuka</string>
+
+  <string name="activity_settings_title">Pengaturan</string>
+  <string name="activity_settings_display_name_edit_text_hint">Masukkan nama</string>
+  <string name="activity_settings_display_name_missing_error">Pilih sebuah nama</string>
+  <string name="activity_settings_invalid_display_name_error">Masukkan nama yang terdiri dari karakter 1-z, A-Z, 0-9, dan _</string>
+  <string name="activity_settings_display_name_too_long_error">Nama yang dibuat terlalu panjang</string>
+  <string name="activity_settings_privacy_button_title">Privasi</string>
+  <string name="activity_settings_notifications_button_title">Notifikasi</string>
+  <string name="activity_settings_chats_button_title">Percakapan</string>
+  <string name="activity_settings_devices_button_title">Perangkat</string>
+  <string name="activity_settings_recovery_phrase_button_title">Kata pemulihan</string>
+  <string name="activity_settings_clear_all_data_button_title">Hapus data</string>
+
+  <string name="activity_notification_settings_title">Notifikasi</string>
+  <string name="activity_notification_settings_style_section_title">Gaya notifikasi</string>
+  <string name="activity_notification_settings_content_section_title">Isi notifikasi</string>
+
+  <string name="activity_privacy_settings_title">Privasi</string>
+
+  <string name="activity_chat_settings_title">Percakapan</string>
+
+  <string name="activity_linked_devices_title">Perangkat</string>
+  <string name="activity_linked_devices_multi_device_limit_reached_dialog_explanation">Saat ini anda tak diperbolehkan menautkan lebih dari satu perangkat</string>
+  <string name="activity_linked_devices_unlinking_failed_message">Tak bisa memutus perangkat</string>
+  <string name="activity_linked_devices_unlinking_successful_message">Sukses memutus perangkat</string>
+  <string name="activity_linked_devices_linking_failed_message">Tidak bisa menautkan perangkat</string>
+  <string name="activity_linked_devices_empty_state_message">anda belum menautkan satupun perangkat</string>
+  <string name="activity_linked_devices_empty_state_button_title">tautkan perangkat (beta)</string>
+
+  <string name="preferences_notifications_strategy_category_title">Strategi notofikasi</string>
+
+  <string name="dialog_link_device_slave_mode_title_1">Menunggu otorisasi</string>
+  <string name="dialog_link_device_slave_mode_title_2">Menautkan perangkat diotorisasi</string>
+  <string name="dialog_link_device_slave_mode_explanation_1">Pastikan kata di bawah sama dengan kata yang muncul di perangkat lainnya</string>
+  <string name="dialog_link_device_slave_mode_explanation_2">Perangkat sukses ditautkan</string>
+
+  <string name="dialog_link_device_master_mode_title_1">Menunggu perangkat</string>
+  <string name="dialog_link_device_master_mode_title_2">Permintaan penautan diterima</string>
+  <string name="dialog_link_device_master_mode_title_3">Mengotorisasi tautan perangkat</string>
+  <string name="dialog_link_device_master_mode_explanation_1">Unduh Session di perangkat baru anda lalu ketuk "Tautkan ke akun yang sudah ada" di bagian bawah layar. Jika ada akun lain di perangkat baru tersebut, anda harus menghapusnya terlebih dahulu</string>
+  <string name="dialog_link_device_master_mode_explanation_2">Pastikan kata di bawah sama dengan kata yang muncul di perangkat lainnya</string>
+  <string name="dialog_link_device_master_mode_explanation_3">Mohon tunggu, tautan perangkat sedang dibuat. Proses ini mungkin berlangsung hingga beberapa menit</string>
+  <string name="dialog_link_device_master_mode_authorize_button_title">Otorisasi</string>
+
+  <string name="fragment_device_list_bottom_sheet_change_name_button_title">Ubah nama</string>
+  <string name="fragment_device_list_bottom_sheet_unlink_device_button_title">Putuskan koneksi dengan perangkat</string>
+
+  <string name="dialog_edit_device_name_edit_text_hint">Masukkan nama</string>
+
+  <string name="dialog_seed_title">Kata pemulihan anda</string>
+  <string name="dialog_seed_explanation">Ini adalah kata pemulihan anda. Gunakan untuk mengembalikan atau memindahkan Session ID anda ke perangkat lain</string>
+
+  <string name="dialog_clear_all_data_title">Hapus semua data</string>
+  <string name="dialog_clear_all_data_explanation">Pesan, Session, dan kontak anda akan dihapus secara permanen</string>
+
+  <string name="activity_qr_code_title">Kode QR</string>
+  <string name="activity_qr_code_view_my_qr_code_tab_title">Lihat kode QR saya</string>
+  <string name="activity_qr_code_view_scan_qr_code_tab_title">Pindai kode QR</string>
+  <string name="activity_qr_code_view_scan_qr_code_explanation">Pindai kode QR pengguna lain untuk memulai percakapan</string>
+
+  <string name="fragment_view_my_qr_code_explanation">Ini adalah kode QR anda. Pengguna lain bisa memindainya untuk memulai percakapan dengan anda</string>
+  <string name="fragment_view_my_qr_code_share_title">Bagikan kode QR</string>
+
+  <string name="session_reset_banner_message">Apakah anda ingin mengembalikan session dengan %1$s</string>
+  <string name="session_reset_banner_dismiss_button_title">Batalkan</string>
+  <string name="session_reset_banner_restore_button_title">Kembalikan</string>
+
+  <string name="fragment_contact_selection_contacts_title">Kontak</string>
+  <string name="fragment_contact_selection_closed_groups_title">Grup tertutup</string>
+  <string name="fragment_contact_selection_open_groups_title">Grup terbuka</string>
+
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index d06e2432ab..83173305a4 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1258,5 +1258,185 @@
   <string name="prompt_passphrase_activity__tap_to_unlock">タップしてロック解除</string>
   <string name="RegistrationLockDialog_reminder">備忘:</string>
   <string name="recipient_preferences__about">Sessionについて</string>
-  <!--EOF-->
+
+
+
+
+
+  <!-- Session -->
+  <string name="continue_2">続行する</string>
+  <string name="copy">コピーする</string>
+  <string name="invalid_url">URL が無効です</string>
+  <string name="copied_to_clipboard">クリップボードにコピーされました</string>
+  <string name="device_linking_failed">デバイスをリンクできませんでした。</string>
+  <string name="next">次</string>
+  <string name="share">共有する</string>
+  <string name="invalid_session_id">Session ID が無効です</string>
+  <string name="cancel">取り消す</string>
+  <string name="your_session_id">あなたの Session ID</string>
+
+  <string name="activity_landing_title_2">ここから Session が始まります...</string>
+  <string name="activity_landing_register_button_title">Session ID を作成する</string>
+  <string name="activity_landing_restore_button_title">Session を続ける</string>
+  <string name="activity_landing_link_button_title">既存のアカウントにリンクする</string>
+  <string name="activity_landing_device_unlinked_dialog_title">デバイスは正常にリンク解除されました</string>
+
+  <string name="view_fake_chat_bubble_1">Session とは？</string>
+  <string name="view_fake_chat_bubble_2">分散型の暗号化されたメッセージングアプリです</string>
+  <string name="view_fake_chat_bubble_3">個人情報や会話のメタデータは収集されませんか？どのように機能しますか？</string>
+  <string name="view_fake_chat_bubble_4">高度な匿名ルーティングとエンドツーエンドの暗号化テクノロジーを組み合わせて使用します。</string>
+  <string name="view_fake_chat_bubble_5">友人は、セキュリティ侵害されたメッセンジャーを自らの友人に使用させません。どういたしまして。</string>
+
+  <string name="activity_register_title">Session ID をご紹介します</string>
+  <string name="activity_register_explanation">Session ID は、Session で連絡を取るために使用できる一意のアドレスです。本当のアイデンティティに関係なく、あなたの Session ID は設計上完全に匿名でプライベートです。</string>
+  <string name="activity_register_public_key_copied_message">クリップボードにコピーされました</string>
+
+  <string name="activity_restore_title">アカウントを復元する</string>
+  <string name="activity_restore_explanation">アカウントを復元するためにサインアップしたときに与えられたリカバリーフレーズを入力します。</string>
+  <string name="activity_restore_seed_edit_text_hint">リカバリーフレーズを入力してください</string>
+
+  <string name="activity_link_device_title">デバイスをリンクする</string>
+  <string name="activity_link_device_enter_session_id_tab_title">Session ID を入力してください</string>
+  <string name="activity_link_device_scan_qr_code_tab_title">QR コードをスキャンする</string>
+  <string name="activity_link_device_scan_qr_code_explanation">他のデバイスで [設定]&gt; [デバイス]&gt; [デバイスのリンク] に移動し、表示される QR コードをスキャンして、リンクプロセスを開始します。</string>
+
+  <string name="fragment_enter_session_id_title">デバイスをリンクする</string>
+  <string name="fragment_enter_session_id_explanation">[設定]&gt; [デバイス]&gt; [他のデバイスのデバイスをリンク] に移動し、Session ID を入力して、リンクプロセスを開始します。</string>
+  <string name="fragment_enter_session_id_edit_text_hint">Session ID を入力してください</string>
+
+  <string name="activity_display_name_title_2">表示名を選択してください</string>
+  <string name="activity_display_name_explanation">これは、Session を使用するときの名前になります。あなたの本当の名前、エイリアス、またはあなたが好きな他のものに設定することができます。</string>
+  <string name="activity_display_name_edit_text_hint">表示名を入力してください</string>
+  <string name="activity_display_name_display_name_missing_error">表示名を選択してください</string>
+  <string name="activity_display_name_display_name_invalid_error">AZ、AZ、0-9、_ の文字のみで構成される表示名を選択してください</string>
+  <string name="activity_display_name_display_name_too_long_error">短い表示名を選択してください</string>
+
+  <string name="activity_pn_mode_recommended_option_tag">オススメ</string>
+  <string name="activity_pn_mode_no_option_picked_dialog_title">オプションを選択してください</string>
+
+  <string name="activity_home_empty_state_message">まだ連絡先がありません</string>
+  <string name="activity_home_empty_state_button_title">Session を開始する</string>
+  <string name="activity_home_leave_group_dialog_message">このグループを退会しますか？</string>
+  <string name="activity_home_leaving_group_failed_message">グループを脱退できませんでした</string>
+  <string name="activity_home_delete_conversation_dialog_message">この会話を削除してもよろしいですか？</string>
+  <string name="activity_home_conversation_deleted_message">会話を削除しました</string>
+
+  <string name="activity_seed_title">あなたのリカバリーフレーズ</string>
+  <string name="activity_seed_title_2">リカバリーフレーズに合致する</string>
+  <string name="activity_seed_explanation">リカバリーフレーズは、Session ID のマスターキーです。デバイスにアクセスできなくなった場合、これを使用して Session ID を復元できます。リカバリーフレーズを安全な場所に保管し、誰にも教えないでください。</string>
+  <string name="activity_seed_reveal_button_title">明らかにする</string>
+
+  <string name="view_seed_reminder_subtitle_1">リカバリーフレーズを保存してアカウントを保護する</string>
+  <string name="view_seed_reminder_subtitle_2">編集された単語をタップして長押ししてリカバリーフレーズを表示し、それを安全に保管して Session ID を保護します。</string>
+  <string name="view_seed_reminder_subtitle_3">リカバリーフレーズは安全な場所に保管してください</string>
+
+  <string name="activity_path_title">パス</string>
+  <string name="activity_path_explanation">Session は、Sessionの分散型ネットワークの複数のサービスノードを介してメッセージをバウンスすることにより、IP を隠します。これらは、接続が現在バウンスされている国です。</string>
+  <string name="activity_path_device_row_title">あなた</string>
+  <string name="activity_path_guard_node_row_title">エントリーノード</string>
+  <string name="activity_path_service_node_row_title">サービスノード</string>
+  <string name="activity_path_destination_row_title">目的先</string>
+  <string name="activity_path_learn_more_button_title">詳細</string>
+
+  <string name="activity_create_private_chat_title">新しい Session</string>
+  <string name="activity_create_private_chat_enter_session_id_tab_title">Session ID を入力してください</string>
+  <string name="activity_create_private_chat_scan_qr_code_tab_title">QR コードをスキャンする</string>
+  <string name="activity_create_private_chat_scan_qr_code_explanation">ユーザーの QR コードをスキャンして、Session を開始します。QR コードは、アカウント設定の QR コードアイコンをタップすると見つかります。</string>
+
+  <string name="fragment_enter_public_key_edit_text_hint">受信者の Session ID を入力してください</string>
+  <string name="fragment_enter_public_key_explanation">ユーザーは、アカウント設定に移動して [Session ID を共有] をタップするか、QR コードを共有することで、Session ID を共有できます。</string>
+
+  <string name="fragment_scan_qr_code_camera_access_explanation">Session で QR コードをスキャンするにはカメラへのアクセスが必要です</string>
+  <string name="fragment_scan_qr_code_grant_camera_access_button_title">カメラへのアクセスを許可する</string>
+
+  <string name="activity_create_closed_group_title">新しいクローズドグループ</string>
+  <string name="activity_create_closed_group_edit_text_hint">グループ名を入力してください</string>
+  <string name="activity_create_closed_group_explanation">クローズドグループは最大 10 人のメンバーをサポートし、1 対 1 の Session と同じプライバシー保護を提供します。</string>
+  <string name="activity_create_closed_group_empty_state_message">まだ連絡先がありません</string>
+  <string name="activity_create_closed_group_empty_state_button_title">Session を開始する</string>
+  <string name="activity_create_closed_group_group_name_missing_error">グループ名を入力してください</string>
+  <string name="activity_create_closed_group_group_name_too_long_error">短いグループ名を入力してください</string>
+  <string name="activity_create_closed_group_not_enough_group_members_error">グループメンバーを少なくとも 2 人選択してください</string>
+  <string name="activity_create_closed_group_too_many_group_members_error">閉じたグループは 10 人を超えるメンバーを抱えることはできません</string>
+  <string name="activity_create_closed_group_invalid_session_id_error">グループのメンバーの 1 人の Session ID が無効です</string>
+
+  <string name="activity_join_public_chat_title">オープングループに参加する</string>
+  <string name="activity_join_public_chat_error">グループに参加できませんでした</string>
+  <string name="activity_join_public_chat_enter_group_url_tab_title">グループの URL を開く</string>
+  <string name="activity_join_public_chat_scan_qr_code_tab_title">QR コードをスキャンする</string>
+  <string name="activity_join_public_chat_scan_qr_code_explanation">参加したいオープングループの QR コードをスキャンする</string>
+
+  <string name="fragment_enter_chat_url_edit_text_hint">オープングループの URL を入力する</string>
+
+  <string name="activity_settings_title">設定</string>
+  <string name="activity_settings_display_name_edit_text_hint">表示名を入力してください</string>
+  <string name="activity_settings_display_name_missing_error">表示名を選択してください</string>
+  <string name="activity_settings_invalid_display_name_error">AZ、AZ、0-9、_ の文字のみで構成される表示名を選択してください</string>
+  <string name="activity_settings_display_name_too_long_error">短い表示名を選択してください</string>
+  <string name="activity_settings_privacy_button_title">プライバシー</string>
+  <string name="activity_settings_notifications_button_title">お知らせ</string>
+  <string name="activity_settings_chats_button_title">チャット</string>
+  <string name="activity_settings_devices_button_title">デバイス</string>
+  <string name="activity_settings_recovery_phrase_button_title">リカバリーフレーズ</string>
+  <string name="activity_settings_clear_all_data_button_title">データを消去する</string>
+
+  <string name="activity_notification_settings_title">お知らせ</string>
+  <string name="activity_notification_settings_style_section_title">通知スタイル</string>
+  <string name="activity_notification_settings_content_section_title">通知内容</string>
+
+  <string name="activity_privacy_settings_title">プライバシー</string>
+
+  <string name="activity_chat_settings_title">チャット</string>
+
+  <string name="activity_linked_devices_title">デバイス</string>
+  <string name="activity_linked_devices_multi_device_limit_reached_dialog_title">デバイス制限に達しました</string>
+  <string name="activity_linked_devices_multi_device_limit_reached_dialog_explanation">現在、複数のデバイスをリンクすることはできません。</string>
+  <string name="activity_linked_devices_unlinking_failed_message">デバイスのリンクを解除できませんでした。</string>
+  <string name="activity_linked_devices_unlinking_successful_message">デバイスは正常にリンク解除されました</string>
+  <string name="activity_linked_devices_linking_failed_message">デバイスをリンクできませんでした。</string>
+  <string name="activity_linked_devices_empty_state_message">まだデバイスをリンクしていません</string>
+  <string name="activity_linked_devices_empty_state_button_title">デバイスをリンクする（ベータ）</string>
+
+  <string name="preferences_notifications_strategy_category_title">通知戦略</string>
+
+  <string name="dialog_link_device_slave_mode_title_1">承認待ち</string>
+  <string name="dialog_link_device_slave_mode_title_2">承認されたデバイスリンク</string>
+  <string name="dialog_link_device_slave_mode_explanation_1">以下の単語が、他のデバイスに表示されている単語と一致することを確認してください。</string>
+  <string name="dialog_link_device_slave_mode_explanation_2">デバイスが正常にリンクされました</string>
+
+  <string name="dialog_link_device_master_mode_title_1">デバイス待ち</string>
+  <string name="dialog_link_device_master_mode_title_2">リンクリクエストを受け取りました</string>
+  <string name="dialog_link_device_master_mode_title_3">デバイスリンクの認証</string>
+  <string name="dialog_link_device_master_mode_explanation_1">他のデバイスでセッションをダウンロードし、ランディング画面の下部にある [既存のアカウントにリンク] をタップします。他のデバイスに既存のアカウントがある場合は、最初にそのアカウントを削除する必要があります。</string>
+  <string name="dialog_link_device_master_mode_explanation_2">以下の単語が、他のデバイスに表示されている単語と一致することを確認してください。</string>
+  <string name="dialog_link_device_master_mode_explanation_3">デバイスリンクが作成されるまでお待ちください。これには 1 分ほどかかる場合があります。</string>
+  <string name="dialog_link_device_master_mode_authorize_button_title">承認する</string>
+
+  <string name="fragment_device_list_bottom_sheet_change_name_button_title">名前を変更する</string>
+  <string name="fragment_device_list_bottom_sheet_unlink_device_button_title">デバイスのリンクを解除する</string>
+
+  <string name="dialog_edit_device_name_edit_text_hint">名前を入力する</string>
+
+  <string name="dialog_seed_title">あなたのリカバリーフレーズ</string>
+  <string name="dialog_seed_explanation">これはあなたのリカバリーフレーズです。これにより、Session ID を新しいデバイスに復元または移行できます。</string>
+
+  <string name="dialog_clear_all_data_title">すべてのデータを消去する</string>
+  <string name="dialog_clear_all_data_explanation">これにより、メッセージ、Session、連絡先が完全に削除されます。</string>
+
+  <string name="activity_qr_code_title">QR コード</string>
+  <string name="activity_qr_code_view_my_qr_code_tab_title">私の QR コードを表示する</string>
+  <string name="activity_qr_code_view_scan_qr_code_tab_title">QR コードをスキャンする</string>
+  <string name="activity_qr_code_view_scan_qr_code_explanation">誰かの QR コードをスキャンして、会話を始めましょう</string>
+
+  <string name="fragment_view_my_qr_code_explanation">これはあなたの QR コードです。他のユーザーはそれをスキャンして、あなたとの Session を開始できます。</string>
+  <string name="fragment_view_my_qr_code_share_title">QR コードを共有する</string>
+
+  <string name="session_reset_banner_message">...%sとの Session を復元しますか？</string>
+  <string name="session_reset_banner_dismiss_button_title">はねつける</string>
+  <string name="session_reset_banner_restore_button_title">戻す</string>
+
+  <string name="fragment_contact_selection_contacts_title">連絡先</string>
+  <string name="fragment_contact_selection_closed_groups_title">閉じたグループ</string>
+  <string name="fragment_contact_selection_open_groups_title">オープングループ</string>
+
 </resources>
diff --git a/res/values-notnight-v21/colors.xml b/res/values-notnight-v21/colors.xml
index b9ab4d5c39..ea63430e14 100644
--- a/res/values-notnight-v21/colors.xml
+++ b/res/values-notnight-v21/colors.xml
@@ -7,6 +7,8 @@
     <color name="text">#000000</color>
     <color name="destructive">#f26f55</color>
     <color name="unimportant">#606060</color>
+    <color name="profile_picture_border">#23000000</color>
+    <color name="profile_picture_background">#B0B0B0</color>
     <color name="cell_background">#FCFCFC</color>
     <color name="cell_selected">#DFDFDF</color>
     <color name="navigation_bar_background">#FCFCFC</color>
@@ -28,7 +30,7 @@
 
 
     <color name="app_icon_background">#333132</color>
-    <color name="progress_bar_background">#0AFFFFFF</color>
+    <color name="progress_bar_background">#0A000000</color>
     <color name="quote_not_found_background">#99FFFFFF</color>
 
 </resources>
\ No newline at end of file
diff --git a/res/values-notnight-v21/styles.xml b/res/values-notnight-v21/styles.xml
index 6bcd395e17..2cb9066705 100644
--- a/res/values-notnight-v21/styles.xml
+++ b/res/values-notnight-v21/styles.xml
@@ -11,4 +11,14 @@
         <item name="android:textColor">@android:color/white</item>
     </style>
 
+    <style name="FakeChatViewMessageBubble.Incoming">
+        <item name="android:background">@drawable/fake_chat_view_incoming_message_background</item>
+        <item name="android:elevation">4dp</item>
+    </style>
+
+    <style name="FakeChatViewMessageBubble.Outgoing">
+        <item name="android:background">@drawable/fake_chat_view_outgoing_message_background</item>
+        <item name="android:elevation">4dp</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/res/values-notnight-v21/themes.xml b/res/values-notnight-v21/themes.xml
index 5b2bb7ee65..3743b4fc5a 100644
--- a/res/values-notnight-v21/themes.xml
+++ b/res/values-notnight-v21/themes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
 
     <style name="Theme.Session.Light" parent="Base.Theme.Session">
         <item name="android:navigationBarColor">?android:navigationBarColor</item>
@@ -23,6 +23,8 @@
         <item name="conversation_input_background">@drawable/compose_background_light</item>
 
         <item name="quick_camera_icon">@drawable/ic_outline_photo_camera_24</item>
+
+        <item name="media_keyboard_button_color">@color/core_grey_60</item>
     </style>
 
     <style name="Theme.Session.DayNight" parent="Theme.Session.Light">
@@ -39,8 +41,6 @@
         <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleLight</item>
         <item name="android:alertDialogTheme">@style/AppCompatDialogStyleLight</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>
@@ -74,8 +74,6 @@
         <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/cell_background</item>
@@ -101,21 +99,13 @@
         <item name="conversation_item_sent_text_primary_color">@color/core_grey_90</item>
         <item name="conversation_item_sent_text_secondary_color">@color/transparent_black_90</item>
         <item name="conversation_item_sent_icon_color">@color/core_grey_60</item>
-        <item name="conversation_item_sent_download_icon_color">@color/core_grey_60</item>
         <item name="conversation_item_sent_text_indicator_tab_color">#99000000</item>
         <item name="conversation_item_received_text_primary_color">@color/text</item>
         <item name="conversation_item_received_text_secondary_color">@color/text</item>
-        <item name="conversation_item_update_text_color">@color/core_grey_60</item>
-        <item name="conversation_item_last_seen_text_color">@color/core_grey_90</item>
-        <item name="conversation_item_last_seen_line_color">@color/core_grey_60</item>
-        <item name="conversation_item_date_line_color">@color/core_grey_25</item>
-        <item name="conversation_item_quote_text_color">@color/core_grey_90</item>
         <item name="conversation_item_sticky_date_background">@drawable/sticky_date_header_background_light</item>
         <item name="conversation_item_sticky_date_text_color">@color/core_grey_60</item>
         <item name="conversation_item_image_outline_color">@color/transparent_black_30</item>
 
-        <item name="quick_mic_icon">@drawable/ic_mic_grey600_24dp</item>
-
         <item name="conversation_item_sent_indicator_text_background">@drawable/conversation_item_sent_indicator_text_shape</item>
 
         <item name="dialog_info_icon">@drawable/ic_info_outline_light</item>
@@ -124,34 +114,14 @@
 
         <item name="device_link_item_card_background">@color/device_link_item_background_light</item>
 
-        <item name="mediapicker_image_outline">@drawable/mediapicker_item_border_light</item>
-
-        <item name="import_export_item_background_color">@color/import_export_item_background_light</item>
-        <item name="import_export_item_background_shadow_color">@color/import_export_item_background_shadow_light</item>
-        <item name="import_export_item_card_background">@drawable/clickable_card_light</item>
-
         <item name="linkpreview_background_color">@color/core_white</item>
         <item name="linkpreview_primary_text_color">@color/core_black</item>
         <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>
-        <item name="menu_call_icon">@drawable/ic_call_white_24dp</item>
-        <item name="menu_unlock_icon">@drawable/ic_unlocked_white_24dp</item>
-        <item name="menu_lock_icon">@drawable/ic_lock_white_24dp</item>
-        <item name="menu_lock_icon_small">@drawable/ic_lock_white_18dp</item>
-        <item name="menu_refresh_directory">@drawable/ic_refresh_white_24dp</item>
-        <item name="menu_info_icon">@drawable/ic_info_outline_white_24dp</item>
-
         <item name="conversation_icon_attach_audio">@drawable/ic_audio_light</item>
         <item name="conversation_icon_attach_video">@drawable/ic_video_light</item>
 
-        <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>
@@ -165,17 +135,9 @@
 
         <item name="pref_icon_tint">@color/textsecure_primary_dark</item>
 
-        <item name="pref_divider">@drawable/preference_divider_light</item>
-
-        <item name="quote_missing_icon_color">@color/core_grey_60</item>
-
         <item name="group_members_dialog_icon">@drawable/ic_group_grey600_24dp</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.Fix</item>
 
-        <item name="search_toolbar_background">@color/white</item>
-        <item name="search_background">@color/white</item>
-        <item name="invite_background">@color/signal_primary</item>
-
         <item name="shared_contact_details_header_background">@color/grey_100</item>
         <item name="shared_contact_details_titlebar">@color/grey_400</item>
         <item name="shared_contact_item_button_color">@color/core_grey_02</item>
diff --git a/res/values-notnight-v23/themes.xml b/res/values-notnight-v23/themes.xml
index 69b65c8699..bc819dec94 100644
--- a/res/values-notnight-v23/themes.xml
+++ b/res/values-notnight-v23/themes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
 
     <style name="Theme.Session.DayNight" parent="Theme.Session.Light">
         <item name="android:statusBarColor">@color/transparent</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 4f1d243de7..747a189e96 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1357,7 +1357,6 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
 
 
   <!-- Session -->
-  <!--
   <string name="continue_2">Kontyntynuj</string>
   <string name="copy">Kopiuj</string>
   <string name="invalid_url">nieprawidłowy URL</string>
@@ -1405,12 +1404,6 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
   <string name="activity_display_name_display_name_invalid_error">Wybierz wyświetlaną nazwę, która składa się tylko z znaków az, AZ, 0–9 i _</string>
   <string name="activity_display_name_display_name_too_long_error">Wybierz krótszą nazwę wyświetlaną</string>
 
-  <string name="activity_pn_mode_title">Powiadomienia push</string>
-  <string name="activity_pn_mode_explanation">Istnieją dwa sposoby obsługi powiadomień wypychanych przez sesję. Przeczytaj uważnie opisy, zanim wybierzesz.</string>
-  <string name="activity_pn_mode_fcm_option_title">Firebase Cloud Messaging</string>
-  <string name="activity_pn_mode_fcm_option_explanation">Sesja będzie korzystała z usługi Firebase Cloud Messaging do otrzymywania powiadomień push. Będziesz powiadamiany o nowych wiadomościach niezawodnie i natychmiast. Korzystanie z FCM oznacza, że Twój adres IP i token urządzenia zostaną udostępnione Google. Jeśli używasz powiadomień push dla innych aplikacji, tak już będzie. Twój adres IP i token urządzenia będą również narażone na działanie Lokiego, ale wiadomości będą nadal kierowane do cebuli i szyfrowane od końca do końca, więc zawartość wiadomości pozostanie całkowicie prywatna.</string>
-  <string name="activity_pn_mode_background_polling_option_title">Sondowanie w tle</string>
-  <string name="activity_pn_mode_background_polling_option_explanation">Sesja od czasu do czasu sprawdza nowe wiadomości w tle. Gwarantuje to pełną ochronę metadanych, ale powiadomienia mogą być znacznie opóźnione.</string>
   <string name="activity_pn_mode_recommended_option_tag">Zalecana</string>
   <string name="activity_pn_mode_no_option_picked_dialog_title">Wybierz opcję</string>
 
@@ -1421,17 +1414,6 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
   <string name="activity_home_delete_conversation_dialog_message">Czy na pewno chcesz usunąć tę rozmowę?</string>
   <string name="activity_home_conversation_deleted_message">Rozmowa usunięta</string>
 
-  <string name="sheet_pn_mode_title">Powiadomienia push</string>
-  <string name="sheet_pn_mode_explanation">Sesja oferuje teraz dwa sposoby obsługi powiadomień wypychanych. Przeczytaj uważnie opisy, zanim wybierzesz.</string>
-  <string name="sheet_pn_mode_fcm_option_title">Firebase Cloud Messaging</string>
-  <string name="sheet_pn_mode_fcm_option_explanation">Sesja będzie korzystała z usługi Firebase Cloud Messaging do otrzymywania powiadomień push. Będziesz powiadamiany o nowych wiadomościach niezawodnie i natychmiast. Korzystanie z FCM oznacza, że Twój adres IP i token urządzenia zostaną udostępnione Google. Jeśli używasz powiadomień push dla innych aplikacji, tak już będzie. Twój adres IP i token urządzenia będą również narażone na działanie Lokiego, ale wiadomości będą nadal kierowane do cebuli i szyfrowane od końca do końca, więc zawartość wiadomości pozostanie całkowicie prywatna.</string>
-  <string name="sheet_pn_mode_background_polling_option_title">Sondowanie w tle</string>
-  <string name="sheet_pn_mode_background_polling_option_explanation">Sesja od czasu do czasu sprawdza nowe wiadomości w tle. Gwarantuje to pełną ochronę metadanych, ale powiadomienia mogą być znacznie opóźnione.</string>
-  <string name="sheet_pn_mode_recommended_option_tag">Zalecana</string>
-  <string name="sheet_pn_mode_no_option_picked_dialog_title">Wybierz opcję</string>
-  <string name="sheet_pn_mode_confirm_button_title">Potwierdzać</string>
-  <string name="sheet_pn_mode_skip_button_title">Pominąć</string>
-
   <string name="activity_seed_title">Twoja fraza odzyskiwania</string>
   <string name="activity_seed_title_2">Poznaj swoją frazę odzyskiwania</string>
   <string name="activity_seed_explanation">Twoja fraza odzyskiwania jest kluczem głównym do identyfikatora Session - możesz go użyć do przywrócenia identyfikatora Session, jeśli stracisz dostęp do urządzenia. Przechowuj swoją frazę odzyskiwania w bezpiecznym miejscu i nikomu jej nie udostępniaj.</string>
@@ -1477,7 +1459,6 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
   <string name="activity_join_public_chat_scan_qr_code_explanation">Zeskanuj kod QR otwartej grupy, do której chcesz dołączyć</string>
 
   <string name="fragment_enter_chat_url_edit_text_hint">Wprowadź adres URL otwartej grupy</string>
-  <string name="fragment_enter_chat_url_privacy_warning">Do otwartych grup może dołączyć każdy i nie zapewniają pełnej ochrony prywatności</string>
 
   <string name="activity_settings_title">Ustawienia</string>
   <string name="activity_settings_display_name_edit_text_hint">Wprowadź wyświetlaną nazwe</string>
@@ -1509,8 +1490,6 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
   <string name="activity_linked_devices_empty_state_button_title">Połącz urządzenie (Beta)</string>
 
   <string name="preferences_notifications_strategy_category_title">Strategia powiadomień</string>
-  <string name="preferences_notifications_use_fcm_option_title">Użyj FCM</string>
-  <string name="preferences_notifications_use_fcm_option_explanation">Korzystanie z Firebase Cloud Messaging pozwala na bardziej niezawodne powiadomienia wypychane, ale udostępnia adres IP i token urządzenia Google i Lokiemu.</string>
 
   <string name="dialog_link_device_slave_mode_title_1">Oczekiwanie na autoryzację</string>
   <string name="dialog_link_device_slave_mode_title_2">Link do urządzenia autoryzowany</string>
@@ -1544,16 +1523,6 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
   <string name="fragment_view_my_qr_code_explanation">To jest twój kod QR. Inni użytkownicy mogą go zeskanować, aby rozpocząć z tobą sesję.</string>
   <string name="fragment_view_my_qr_code_share_title">Udostępnij kod QR</string>
 
-  <string name="view_friend_request_accept_button_title">Zaakceptować</string>
-  <string name="view_friend_request_reject_button_title">Upadek</string>
-  <string name="view_friend_request_incoming_pending_message">%1$s wysłał Ci prośbę o sesję</string>
-  <string name="view_friend_request_incoming_accepted_message">Zaakceptowałeś prośbę o sesję %1$s</string>
-  <string name="view_friend_request_incoming_declined_message">Odrzuciłeś żądanie Session %1$s</string>
-  <string name="view_friend_request_incoming_expired_message">Żądanie Session %1$s wygasło</string>
-  <string name="view_friend_request_outgoing_pending_message">Wysłano %1$s żądanie Session</string>
-  <string name="view_friend_request_outgoing_accepted_message">%1$s zaakceptował Twoje żądanie Session</string>
-  <string name="view_friend_request_outgoing_expired_message">Twoje żądanie Session do %1$s wygasło</string>
-
   <string name="session_reset_banner_message">Czy chcesz przywrócić sesję za pomocą %s?</string>
   <string name="session_reset_banner_dismiss_button_title">Oddalić</string>
   <string name="session_reset_banner_restore_button_title">Przywracać</string>
@@ -1561,6 +1530,5 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
   <string name="fragment_contact_selection_contacts_title">Łączność</string>
   <string name="fragment_contact_selection_closed_groups_title">Grupy zamknięte</string>
   <string name="fragment_contact_selection_open_groups_title">Otwórz grupy</string>
-  -->
 
 </resources>
diff --git a/res/values-small/dimens.xml b/res/values-small/dimens.xml
index 4775251f06..81c5c4100b 100644
--- a/res/values-small/dimens.xml
+++ b/res/values-small/dimens.xml
@@ -8,7 +8,7 @@
     <dimen name="small_font_size">13sp</dimen>
     <dimen name="medium_font_size">15sp</dimen>
     <dimen name="large_font_size">20sp</dimen>
-    <dimen name="very_large_font_size">25sp</dimen>
+    <dimen name="very_large_font_size">24sp</dimen>
     <dimen name="massive_font_size">50sp</dimen>
 
     <!-- Session -->
diff --git a/res/values-v23/themes.xml b/res/values-v23/themes.xml
index b01826f0e3..e3b453170b 100644
--- a/res/values-v23/themes.xml
+++ b/res/values-v23/themes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
 
     <style name="Theme.Session.ForceDark" parent="Base.Theme.Session.ForceDark">
         <item name="android:windowLightStatusBar">false</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 0389d43999..0d5b10d157 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -746,5 +746,185 @@ Các tin nhắn và cuộc gọi riêng tư miễn phí đến người dùng Si
   <string name="AppProtectionPreferenceFragment_none">Không</string>
   <string name="RegistrationActivity_too_many_attempts">Thử quá nhiều lần</string>
   <string name="RegistrationLockDialog_disable">Tắt</string>
-  <!--EOF-->
+
+
+
+
+
+  <!-- Session -->
+  <string name="continue_2">Tiếp tục</string>
+  <string name="copy">Sao chép</string>
+  <string name="invalid_url">URL không hợp lệ</string>
+  <string name="copied_to_clipboard">Sao chép vào bộ nhớ tạm</string>
+  <string name="device_linking_failed">Không thể liên kết thiết bị.</string>
+  <string name="next">Tiếp</string>
+  <string name="share">Chia sẻ</string>
+  <string name="invalid_session_id">Session ID không hợp lệ</string>
+  <string name="cancel">Huỷ</string>
+  <string name="your_session_id">Session ID của bạn</string>
+
+  <string name="activity_landing_title_2">Session của bạn bắt đầu từ đây...</string>
+  <string name="activity_landing_register_button_title">Tạo Session ID</string>
+  <string name="activity_landing_restore_button_title">Tiếp tục Session của bạn</string>
+  <string name="activity_landing_link_button_title">Liên kết với một tài khoản đã tồn tại</string>
+  <string name="activity_landing_device_unlinked_dialog_title">Thiết bị của bạn đã được ngắt liên kết thành công</string>
+
+  <string name="view_fake_chat_bubble_1">Session là gì?</string>
+  <string name="view_fake_chat_bubble_2">Đây là một ứng dụng nhắn tin phân cấp và mã hoá</string>
+  <string name="view_fake_chat_bubble_3">Vậy ứng dụng có thu thập dữ liệu cá nhân của tôi hoặc siêu dữ liệu về cuộc hội thoại của tôi không? Ứng dụng hoạt động như thế nào?</string>
+  <string name="view_fake_chat_bubble_4">Sử dụng kết hợp công nghệ định tuyến ẩn danh nâng cao và công nghệ mã hoá đầu cuối.</string>
+  <string name="view_fake_chat_bubble_5">Đừng để bạn bè sử dụng những ứng dụng nhắn tin dễ bị tấn công.</string>
+
+  <string name="activity_register_title">Bắt đầu với Session ID của bạn</string>
+  <string name="activity_register_explanation">Session ID của bạn là địa chỉ duy nhất mà mọi người có thể dùng để liên lạc với bạn trên ứng dụng Session. Session ID của bạn được thiết kế đảm bảo tuyệt đối ẩn danh và riêng tư vì nó không liên kết với danh tính thật của bạn.</string>
+  <string name="activity_register_public_key_copied_message">Sao chép vào bộ nhớ tạm</string>
+
+  <string name="activity_restore_title">Khôi phục lại tài khoản của bạn</string>
+  <string name="activity_restore_explanation">Nhập cụm từ khôi phục mà bạn nhận được khi đăng ký khôi phục tài khoản.</string>
+  <string name="activity_restore_seed_edit_text_hint">Nhập cụm từ khôi phục của bạn.</string>
+
+  <string name="activity_link_device_title">Liên kết Thiết bị</string>
+  <string name="activity_link_device_enter_session_id_tab_title">Nhập Session ID</string>
+  <string name="activity_link_device_scan_qr_code_tab_title">Quét mã QR</string>
+  <string name="activity_link_device_scan_qr_code_explanation">Đi đến mục "Cài đặt" > "Thiết bị" > "Liên kết với một Thiết bị" trên thiết bị khác của bạn và quét mã QR hiện lên để bắt đầu quá trình liên kết.</string>
+
+  <string name="fragment_enter_session_id_title">Liên kết thiết bị của bạn</string>
+  <string name="fragment_enter_session_id_explanation"> Đi đến mục "Cài đặt" > "Thiết bị" > "Liên kết với một Thiết bị" trên thiết bị khác của bạn và quét mã QR hiện lên để bắt đầu quá trình liên kết.</string>
+  <string name="fragment_enter_session_id_edit_text_hint">Nhập Session ID của bạn</string>
+
+  <string name="activity_display_name_title_2">Chọn tên hiển thị của bạn</string>
+  <string name="activity_display_name_explanation">Đây là tên của bạn khi sử dụng Session. Nó có thể là tên thật, tên gọi khác của bạn hoặc bất kì tên nào bạn thích.</string>
+  <string name="activity_display_name_edit_text_hint">Nhập một tên hiển thị</string>
+  <string name="activity_display_name_display_name_missing_error">Vui lòng chọn một tên hiển thị</string>
+  <string name="activity_display_name_display_name_invalid_error">Vui lòng chọn tên hiện thị chỉ chứa các kí tự a-z, A-Z, 0-9 and _ </string>
+  <string name="activity_display_name_display_name_too_long_error">Vui lòng chọn tên hiển thị ngắn hơn</string>
+
+  <string name="activity_pn_mode_recommended_option_tag">Khuyến nghị</string>
+  <string name="activity_pn_mode_no_option_picked_dialog_title">Vui lòng lựa chọn </string>
+
+  <string name="activity_home_empty_state_message">Bạn chưa có danh bạ </string>
+  <string name="activity_home_empty_state_button_title">Bắt đầu một Session</string>
+  <string name="activity_home_leave_group_dialog_message">Bạn có chắc chắn rằng bạn muốn rời nhóm này không?</string>
+  <string name="activity_home_leaving_group_failed_message">"Không thể rời nhóm"</string>
+  <string name="activity_home_delete_conversation_dialog_message">Bạn có chắc chắn rằng bạn muốn xoá cuộc hội thoại này không?</string>
+  <string name="activity_home_conversation_deleted_message">Cuộc hội thoại đã được xoá </string>
+
+  <string name="activity_seed_title">Cụm từ khôi phục của bạn</string>
+  <string name="activity_seed_title_2">Làm quen với cụm từ khôi phục của bạn</string>
+  <string name="activity_seed_explanation">Cụm từ khôi phục của bạn là chìa khoá chủ cho Session ID của bạn — bạn có thể sử dụng nó để khôi phục Session ID khi bị mất tiếp cận với thiết bị của bạn. Hãy lưu cụm từ khôi phục của bạn ở một nơi an toàn và không cung cấp cho bất kì ai.</string>
+  <string name="activity_seed_reveal_button_title">Giữ để hiển thị.</string>
+
+  <string name="view_seed_reminder_subtitle_1">Bảo vệ tài khoản của bạn bằng việc bảo vệ cụm từ khôi phục của bạn</string>
+  <string name="view_seed_reminder_subtitle_2">Chạm và giữ cụm từ bị che để hiển thị cụm từ khôi phục của bạn, sau đó lưu nó cẩn thận để bảo vệ Session ID của bạn.</string>
+  <string name="view_seed_reminder_subtitle_3">Hãy lưu cụm từ khôi phục của bạn ở một nơi an toàn</string>
+
+  <string name="activity_path_title">Đường đi</string>
+  <string name="activity_path_explanation">Session ẩn IP của bạn bằng cách luân chuyển tin nhắn của bạn qua một số Nút Dịch vụ trong mạng lưới phân cấp của Session. Đây là các nước mà kết nối của bạn đang được luân chuyển: </string>
+  <string name="activity_path_device_row_title">Bạn</string>
+  <string name="activity_path_guard_node_row_title">Nút khởi đầu</string>
+  <string name="activity_path_service_node_row_title">Nút Dịch vụ</string>
+  <string name="activity_path_destination_row_title">Điểm đến</string>
+  <string name="activity_path_learn_more_button_title">Tìm hiểu thêm</string>
+
+  <string name="activity_create_private_chat_title">Session mới</string>
+  <string name="activity_create_private_chat_enter_session_id_tab_title">Nhập Session ID</string>
+  <string name="activity_create_private_chat_scan_qr_code_tab_title">Quét mã QR</string>
+  <string name="activity_create_private_chat_scan_qr_code_explanation">Quét mã QR của người dùng để bắt đầu session. Tìm mã QR bằng cách chạm vào biểu tượng mã QR trong mục cài đặt tài khoản.</string>
+
+  <string name="fragment_enter_public_key_edit_text_hint">Nhập Session ID của người nhận</string>
+  <string name="fragment_enter_public_key_explanation">Người dùng có thể chia sẻ Session ID của mình bằng cách tới mục cài đặt tài khoản và chạm vào “Chia sẻ Session ID”, hoặc bằng cách chia sẻ mã QR của họ.</string>
+
+  <string name="fragment_scan_qr_code_camera_access_explanation">Session cần truy cập máy ảnh để quét mã QR </string>
+  <string name="fragment_scan_qr_code_grant_camera_access_button_title">Cho phép truy cập máy ảnh</string>
+
+  <string name="activity_create_closed_group_title">Nhóm kín mới </string>
+  <string name="activity_create_closed_group_edit_text_hint">Nhập tên nhóm</string>
+  <string name="activity_create_closed_group_explanation">Nhóm kín hỗ trợ tối đa 10 thành viên và cung cấp dịch vụ bảo mật giống như các session một-một</string>
+  <string name="activity_create_closed_group_empty_state_message">Bạn chưa có danh bạ nào </string>
+  <string name="activity_create_closed_group_empty_state_button_title">Bắt đầu Session</string>
+  <string name="activity_create_closed_group_group_name_missing_error">Vui lòng nhập tên nhóm</string>
+  <string name="activity_create_closed_group_group_name_too_long_error">Vui lòng nhập một tên nhóm ngắn hơn </string>
+  <string name="activity_create_closed_group_not_enough_group_members_error">Vui lòng chọn ít nhất 2 thành viên trong nhóm </string>
+  <string name="activity_create_closed_group_too_many_group_members_error">Một nhóm kín không thể có nhiều hơn 10 thành viên </string>
+  <string name="activity_create_closed_group_invalid_session_id_error">Một trong các thành viên trong nhóm của bạn có Session ID không hợp lệ </string>
+
+  <string name="activity_join_public_chat_title">Tham gia nhóm mở</string>
+  <string name="activity_join_public_chat_error">Không thể tham gia nhóm</string>
+  <string name="activity_join_public_chat_enter_group_url_tab_title">URL của nhóm mở</string>
+  <string name="activity_join_public_chat_scan_qr_code_tab_title">Quét mã QR</string>
+  <string name="activity_join_public_chat_scan_qr_code_explanation"> Quét mã QR của nhóm mở mà bạn muốn tham gia</string>
+
+  <string name="fragment_enter_chat_url_edit_text_hint">Nhập URL của nhóm mở</string>
+
+  <string name="activity_settings_title">Cài đặt</string>
+  <string name="activity_settings_display_name_edit_text_hint">Nhập tên hiển thị</string>
+  <string name="activity_settings_display_name_missing_error">Vui lòng chọn một tên hiển thị </string>
+  <string name="activity_settings_invalid_display_name_error">Vui lòng chọn một tên hiển thị chỉ bao gồm các ký tự a-z, A-Z, 0-9 và _ </string>
+  <string name="activity_settings_display_name_too_long_error">Vui lòng chọn một tên hiển thị ngắn hơn </string>
+  <string name="activity_settings_privacy_button_title">Riêng tư</string>
+  <string name="activity_settings_notifications_button_title">Thông báo</string>
+  <string name="activity_settings_chats_button_title">Trò chuyện</string>
+  <string name="activity_settings_devices_button_title">Thiết bị</string>
+  <string name="activity_settings_recovery_phrase_button_title">Cụm từ khôi phục</string>
+  <string name="activity_settings_clear_all_data_button_title">Xóa dữ liệu</string>
+
+  <string name="activity_notification_settings_title">Thông báo</string>
+  <string name="activity_notification_settings_style_section_title">Kiểu thông báo</string>
+  <string name="activity_notification_settings_content_section_title">Nội dung thông báo</string>
+
+  <string name="activity_privacy_settings_title">Riêng tưy</string>
+
+  <string name="activity_chat_settings_title">Trò chuyện</string>
+
+  <string name="activity_linked_devices_title">Thiết bị</string>
+  <string name="activity_linked_devices_multi_device_limit_reached_dialog_title">Đã đạt tới giới hạn thiết bị</string>
+  <string name="activity_linked_devices_multi_device_limit_reached_dialog_explanation">Hiện tại không cho phép kết nối với nhiều hơn một thiết bị.</string>
+  <string name="activity_linked_devices_unlinking_failed_message">Không thể hủy liên kết thiết bị.</string>
+  <string name="activity_linked_devices_unlinking_successful_message">Thiết bị của bạn đã được hủy liên kết thành công</string>
+  <string name="activity_linked_devices_linking_failed_message">Không thể liên kết thiết bị.</string>
+  <string name="activity_linked_devices_empty_state_message">Bạn chưa liên kết thiết bị nào</string>
+  <string name="activity_linked_devices_empty_state_button_title">Kết nối một thiết bị (Beta)</string>
+
+  <string name="preferences_notifications_strategy_category_title">Chiến lược thông báo</string>
+
+  <string name="dialog_link_device_slave_mode_title_1">Đang chờ được cho phép</string>
+  <string name="dialog_link_device_slave_mode_title_2">Liên kết thiết bị được cho phép </string>
+  <string name="dialog_link_device_slave_mode_explanation_1">Hãy kiểm tra xem các từ bên dưới có khớp với các từ được hiển thị trên thiết bị khác của bạn không.</string>
+  <string name="dialog_link_device_slave_mode_explanation_2">Thiết bị của bạn đã được liên kết thành công </string>
+
+  <string name="dialog_link_device_master_mode_title_1">Đang đợi thiết bị </string>
+  <string name="dialog_link_device_master_mode_title_2">Đã nhận được yêu cầu liên kết</string>
+  <string name="dialog_link_device_master_mode_title_3">Đang cho phép liên kết thiết bị</string>
+  <string name="dialog_link_device_master_mode_explanation_1">Tải Session về thiết bị khác của bạn và chọn "Liên kết với một tài khoản đã tồn tại" ở phía cuối của màn hình đích. Nếu tại khoản hiện tại của bạn đang ở một thiết bị khác, bạn cần phải xóa tài khoản đó trước.</string>
+  <string name="dialog_link_device_master_mode_explanation_2"> Hãy kiểm tra xem các từ bên dưới có khớp với các từ được hiển thị trên thiết bị khác của bạn không.</string>
+  <string name="dialog_link_device_master_mode_explanation_3">Liên kết thiết bị đang được tạo, vui lòng chờ đợi. Quá trình này có thể mất khoảng một phút.</string>
+  <string name="dialog_link_device_master_mode_authorize_button_title">Cho phép</string>
+
+  <string name="fragment_device_list_bottom_sheet_change_name_button_title">Đổi tên</string>
+  <string name="fragment_device_list_bottom_sheet_unlink_device_button_title">Hủy liên kết thiết bị</string>
+
+  <string name="dialog_edit_device_name_edit_text_hint">Nhập tên</string>
+
+  <string name="dialog_seed_title">Cụm từ khôi phục của bạn</string>
+  <string name="dialog_seed_explanation">Đây là cụm từ khôi phục của bạn. Bạn có thể dùng nó để khôi phục hoặc chuyển Session ID của mình sang một thiết bị mới.</string>
+
+  <string name="dialog_clear_all_data_title">Xóa tất cả dữ liệu</string>
+  <string name="dialog_clear_all_data_explanation">Thao tác này sẽ xóa vĩnh viễn các tin nhắn, sessions, và danh bạ của bạn.</string>
+
+  <string name="activity_qr_code_title">Mã QR</string>
+  <string name="activity_qr_code_view_my_qr_code_tab_title">Xem mã QR của tôi</string>
+  <string name="activity_qr_code_view_scan_qr_code_tab_title">Quét mã QR</string>
+  <string name="activity_qr_code_view_scan_qr_code_explanation">Quét mã QR của ai đó để bắt đầu trò chuyện với họ</string>
+
+  <string name="fragment_view_my_qr_code_explanation">Đây là mã QR của bạn. Những người dùng khác có thể quét mã này và bắt đầu session với bạn.</string>
+  <string name="fragment_view_my_qr_code_share_title">Chia sẻ mã QR </string>
+
+  <string name="session_reset_banner_message">Bạn có muốn khôi phục lại session của bạn với %s không?</string>
+  <string name="session_reset_banner_dismiss_button_title">Bỏ qua</string>
+  <string name="session_reset_banner_restore_button_title">Khôi phục</string>
+
+  <string name="fragment_contact_selection_contacts_title">Danh bạ</string>
+  <string name="fragment_contact_selection_closed_groups_title">Nhóm kín</string>
+  <string name="fragment_contact_selection_open_groups_title">Nhóm mở</string>
+
 </resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index f4239b0104..1f6b2e1635 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -19,16 +19,13 @@
     <attr name="conversation_list_toolbar_background" format="reference"/>
     <attr name="conversation_list_typing_tint" format="color"/>
 
-    <attr name="conversation_sent_card_background" format="reference|color"/>
     <attr name="conversation_group_member_name" format="reference|color"/>
-    <attr name="conversation_received_card_background" format="reference|color"/>
 
     <attr name="fab_color" format="reference|color" />
     <attr name="lower_right_divet" format="reference" />
 
-    <attr name="centered_app_title_color" format="reference|color" />
     <attr name="ic_arrow_forward" format="reference" />
-    <attr name="ic_visibility" format="reference" />
+    <attr name="ic_visibility_on" format="reference" />
     <attr name="ic_visibility_off" format="reference" />
 
     <attr name="conversation_background" format="reference|color"/>
@@ -76,9 +73,6 @@
     <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"/>
     <attr name="conversation_item_sent_text_secondary_color" format="reference|color"/>
@@ -87,12 +81,6 @@
     <attr name="conversation_item_sent_text_indicator_tab_color" format="reference|color"/>
     <attr name="conversation_item_sent_indicator_text_background" format="reference" />
     <attr name="conversation_item_sent_icon_color" format="color" />
-    <attr name="conversation_item_sent_download_icon_color" format="reference|color"/>
-    <attr name="conversation_item_update_text_color" format="reference"/>
-    <attr name="conversation_item_last_seen_text_color" format="reference"/>
-    <attr name="conversation_item_last_seen_line_color" format="reference"/>
-    <attr name="conversation_item_date_line_color" format="reference"/>
-    <attr name="conversation_item_quote_text_color" format="reference"/>
     <attr name="conversation_item_sticky_date_background" format="reference" />
     <attr name="conversation_item_sticky_date_text_color" format="color" />
     <attr name="conversation_item_image_outline_color" format="color" />
@@ -104,45 +92,21 @@
     <attr name="conversation_icon_attach_audio" format="reference"/>
     <attr name="conversation_icon_attach_video" format="reference" />
 
-    <attr name="contact_selection_push_user" format="reference|color" />
-    <attr name="contact_selection_lay_user" format="reference|color" />
-    <attr name="contact_selection_label_text" format="reference|color" />
-    <attr name="contact_selection_header_text" format="reference|color" />
-
     <attr name="device_link_item_card_background" format="reference|color" />
 
-    <attr name="mediapicker_image_outline" format="reference" />
-
-    <attr name="import_export_item_background_color" format="reference|color" />
-    <attr name="import_export_item_background_shadow_color" format="reference|color" />
-    <attr name="import_export_item_card_background" format="reference" />
-
-    <attr name="invite_background" format="color"/>
-
     <attr name="linkpreview_background_color" format="color" />
     <attr name="linkpreview_primary_text_color" format="color" />
     <attr name="linkpreview_secondary_text_color" format="color" />
     <attr name="linkpreview_divider_color" format="color" />
 
-    <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" />
     <attr name="menu_popup_expand" format="reference"/>
-    <attr name="menu_unlock_icon" format="reference" />
-    <attr name="menu_lock_icon" format="reference" />
-    <attr name="menu_lock_icon_small" format="reference" />
     <attr name="menu_trash_icon" format="reference" />
     <attr name="menu_selectall_icon" format="reference" />
-    <attr name="menu_group_icon" format="reference" />
     <attr name="menu_split_icon" format="reference" />
     <attr name="menu_accept_icon" format="reference" />
-    <attr name="menu_refresh_directory" format="reference" />
     <attr name="menu_copy_icon" format="reference" />
-    <attr name="menu_info_icon" format="reference" />
     <attr name="menu_forward_icon" format="reference" />
     <attr name="menu_save_icon" format="reference" />
     <attr name="menu_reply_icon" format="reference" />
@@ -152,40 +116,23 @@
 
     <attr name="pref_icon_tint" format="color"/>
 
-    <attr name="pref_divider" format="reference" />
-
-    <attr name="quote_missing_icon_color" format="color" />
-
     <attr name="home_gradient_start" format="color|reference" />
     <attr name="home_gradient_end" format="color|reference" />
 
     <attr name="message_received_background_color" format="color|reference" />
     <attr name="message_sent_background_color" format="color|reference" />
 
-    <declare-styleable name="CustomDefaultPreference">
-        <attr name="custom_pref_toggle" format="string"/>
-    </declare-styleable>
-
     <attr name="group_members_dialog_icon" format="reference"/>
-    <attr name="lockscreen_watermark" format="reference" />
-
-    <attr name="recipient_preference_blocked" format="color"/>
 
     <attr name="verification_background" format="color"/>
 
     <attr name="media_overview_toolbar_background" format="color"/>
-    <attr name="media_overview_toolbar_foreground" format="color"/>
     <attr name="media_overview_header_foreground" format="color"/>
-    <attr name="media_overview_document_primary" format="color"/>
-    <attr name="media_overview_document_secondary" format="color"/>
 
     <attr name="shared_contact_details_header_background" format="color"/>
     <attr name="shared_contact_details_titlebar" format="color"/>
     <attr name="shared_contact_item_button_color" format="color"/>
 
-    <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" />
@@ -197,15 +144,8 @@
 
     <attr name="tooltip_default_color" format="reference|color" />
 
-    <attr name="contact_list_divider" format="reference"/>
-
-    <attr name="login_top_background" format="color"/>
-    <attr name="login_floating_background" format="reference"/>
-
-    <declare-styleable name="ColorPreference">
-        <attr name="itemLayout" format="reference" />
-        <attr name="choices" format="reference" />
-        <attr name="numColumns" format="integer" />
+    <declare-styleable name="CustomDefaultPreference">
+        <attr name="custom_pref_toggle" format="string"/>
     </declare-styleable>
 
     <declare-styleable name="AvatarImageView">
@@ -270,22 +210,12 @@
         <attr name="emoji_maxLength" format="integer" />
     </declare-styleable>
 
-    <declare-styleable name="RingtonePreference">
-        <attr name="showAdd" format="boolean" />
-        <attr name="summaryHasRingtone" format="string|reference" />
-    </declare-styleable>
-
     <declare-styleable name="ColorPickerPreference">
         <attr name="currentColor" format="reference" />
-
         <attr name="colors" format="reference" />
-
         <attr name="sortColors" format="boolean|reference" />
-
         <attr name="colorDescriptions" format="reference" />
-
         <attr name="columns" format="integer|reference" />
-
         <attr name="colorSize" format="enum|reference">
             <enum name="large" value="1" />
             <enum name="small" value="2" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index c9356d308b..ca2a48f500 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -7,6 +7,8 @@
     <color name="text">#FFFFFF</color>
     <color name="destructive">#FF453A</color>
     <color name="unimportant">#D8D8D8</color>
+    <color name="profile_picture_border">#23FFFFFF</color>
+    <color name="profile_picture_background">#353535</color>
     <color name="border">#979797</color>
     <color name="cell_background">#1B1B1B</color>
     <color name="cell_selected">#0C0C0C</color>
@@ -25,9 +27,17 @@
     <color name="compose_text_view_background">#141414</color>
     <color name="quote_not_found_background">#99FFFFFF</color>
     <color name="new_conversation_button_collapsed_background">#1F1F1F</color>
+    <color name="new_conversation_button_shadow">#077C44</color>
     <color name="pn_option_background">#1B1B1B</color>
     <color name="pn_option_border">#212121</color>
     <color name="paths_building">#FFCE3A</color>
+
+    <array name="profile_picture_placeholder_colors">
+        <item>#5ff8b0</item>
+        <item>#26cdb9</item>
+        <item>#f3c615</item>
+        <item>#fcac5a</item>
+    </array>
     <!-- Session -->
 
     <!-- Loki -->
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d255ee2585..ec41c48aec 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -8,7 +8,7 @@
     <dimen name="small_font_size">15sp</dimen>
     <dimen name="medium_font_size">17sp</dimen>
     <dimen name="large_font_size">22sp</dimen>
-    <dimen name="very_large_font_size">27sp</dimen>
+    <dimen name="very_large_font_size">26sp</dimen>
     <dimen name="massive_font_size">50sp</dimen>
 
     <!-- Element Sizes -->
@@ -29,9 +29,9 @@
     <dimen name="text_view_corner_radius">8dp</dimen>
     <dimen name="fake_chat_view_bubble_width">224dp</dimen>
     <dimen name="fake_chat_view_bubble_corner_radius">10dp</dimen>
-    <dimen name="fake_chat_view_height">234dp</dimen>
+    <dimen name="fake_chat_view_height">250dp</dimen>
     <dimen name="setting_button_height">56dp</dimen>
-    <dimen name="dialog_corner_radius">12dp</dimen>
+    <dimen name="dialog_corner_radius">8dp</dimen>
     <dimen name="dialog_button_corner_radius">4dp</dimen>
     <dimen name="pn_option_corner_radius">8dp</dimen>
     <dimen name="path_status_view_size">8dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 674ce114f2..70b662aba8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1830,11 +1830,11 @@
     <string name="fragment_contact_selection_closed_groups_title">Closed Groups</string>
     <string name="fragment_contact_selection_open_groups_title">Open Groups</string>
 
+    <!-- Next round of translation -->
+
     <string name="menu_apply_button">Apply</string>
     <string name="menu_done_button">Done</string>
 
-    <!-- Next round of translation -->
-
     <string name="activity_edit_closed_group_title">Edit Group</string>
     <string name="activity_edit_closed_group_edit_text_hint">Enter a new group name</string>
     <string name="activity_edit_closed_group_edit_members">Members</string>
@@ -1851,7 +1851,7 @@
 
     <string name="activity_select_contacts_title">Select Contacts</string>
 
-    <string name="dialog_seed_disclaimer">*Please note that it is not possible to use the same Session ID on multiple devices simultaneously</string>
+    <string name="dialog_seed_disclaimer">It is not possible to use the same Session ID on multiple devices simultaneously</string>
 
     <string name="view_reset_secure_session_done_message">Secure session reset done</string>
     
@@ -1864,5 +1864,6 @@
 
     <string name="attachment">Attachment</string>
     <string name="attachment_type_voice_message">Voice Message</string>
+    <string name="details">Details</string>
 
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 478bdc22b4..5abf51aee4 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -6,7 +6,6 @@
         <item name="android:background">?colorPrimary</item>
         <item name="elevation">1dp</item>
         <item name="titleTextStyle">@style/TextAppearance.Session.DarkActionBar.TitleTextStyle</item>
-        <item name="popupTheme">@style/Widget.Session.ActionBar</item>
     </style>
 
     <style name="Widget.Session.ActionBar.Flat">
@@ -184,10 +183,12 @@
 
     <style name="FakeChatViewMessageBubble.Incoming">
         <item name="android:background">@drawable/fake_chat_view_incoming_message_background</item>
+        <item name="android:elevation">10dp</item>
     </style>
 
     <style name="FakeChatViewMessageBubble.Outgoing">
         <item name="android:background">@drawable/fake_chat_view_outgoing_message_background</item>
+        <item name="android:elevation">10dp</item>
     </style>
     <!-- Session -->
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 8a8e9e240a..1aa70bf8fe 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <resources>
 
     <!-- Session -->
@@ -43,16 +42,14 @@
         <item name="dividerHorizontal">?dividerVertical</item>
 
         <!-- App specific attributes -->
-        <item name="search_toolbar_background">@color/black</item>
-        <item name="search_background">@color/black</item>
+        <item name="ic_visibility_on">@drawable/ic_baseline_visibility_24</item>
+        <item name="ic_visibility_off">@drawable/ic_baseline_visibility_off_24</item>
+        <item name="ic_arrow_forward">@drawable/ic_baseline_arrow_forward_24</item>
 
         <item name="dialog_background_color">@color/dialog_background</item>
 
         <item name="media_overview_toolbar_background">@color/transparent</item>
-        <item name="media_overview_toolbar_foreground">@color/white</item>
         <item name="media_overview_header_foreground">@color/text</item>
-        <item name="media_overview_document_primary">@color/core_grey_05</item>
-        <item name="media_overview_document_secondary">#99FFFFFF</item>
         <item name="media_keyboard_button_color">@color/core_grey_25</item>
         <item name="searchViewStyle">@style/TextSecure.BaseDarkTheme.SearchView</item>
 
@@ -87,6 +84,7 @@
         <item name="conversation_input_background">@drawable/compose_background_dark</item>
 
         <item name="quick_camera_icon">@drawable/ic_baseline_photo_camera_24</item>
+        <item name="quick_mic_icon">@drawable/ic_baseline_mic_24</item>
     </style>
 
     <!-- This should be the default theme for the application. -->
@@ -158,14 +156,7 @@
         <item name="colorPrimary">@color/action_bar_background</item>
         <item name="colorPrimaryDark">@color/action_bar_background</item>
 
-        <item name="recipient_preference_blocked">#d00000</item>
-        <item name="contact_selection_label_text">#66eeeeee</item>
-        <item name="contact_selection_push_user">#ffeeeeee</item>
-        <item name="contact_selection_lay_user">#afeeeeee</item>
-        <item name="contact_selection_header_text">#66eeeeee</item>
-
         <item name="media_overview_toolbar_background">@color/transparent</item>
-        <item name="media_overview_toolbar_foreground">@color/white</item>
         <item name="media_overview_header_foreground">@color/text</item>
 
         <item name="theme_type">dark</item>
@@ -175,8 +166,6 @@
         <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>
@@ -194,22 +183,14 @@
         <item name="conversation_item_sent_text_primary_color">@color/core_grey_05</item>
         <item name="conversation_item_sent_text_secondary_color">@color/core_grey_25</item>
         <item name="conversation_item_sent_icon_color">@color/core_grey_25</item>
-        <item name="conversation_item_sent_download_icon_color">@color/core_white</item>
         <item name="conversation_item_sent_text_indicator_tab_color">#99ffffff</item>
         <item name="conversation_item_received_text_primary_color">@color/text</item>
         <item name="conversation_item_received_text_secondary_color">@color/text</item>
         <item name="conversation_item_sent_indicator_text_background">@drawable/conversation_item_sent_indicator_text_shape_dark</item>
-        <item name="conversation_item_update_text_color">@color/core_grey_45</item>
-        <item name="conversation_item_last_seen_text_color">@color/core_grey_25</item>
-        <item name="conversation_item_last_seen_line_color">@color/core_grey_25</item>
-        <item name="conversation_item_date_line_color">@color/core_grey_45</item>
-        <item name="conversation_item_quote_text_color">@color/core_grey_05</item>
         <item name="conversation_item_sticky_date_background">@drawable/sticky_date_header_background_dark</item>
         <item name="conversation_item_sticky_date_text_color">@color/core_grey_45</item>
         <item name="conversation_item_image_outline_color">@color/transparent_white_30</item>
 
-        <item name="contact_list_divider">@drawable/contact_list_divider_dark</item>
-
         <item name="verification_background">@color/core_grey_95</item>
 
         <item name="dialog_info_icon">@drawable/ic_info_outline_dark</item>
@@ -217,12 +198,6 @@
 
         <item name="device_link_item_card_background">@color/device_link_item_background_dark</item>
 
-        <item name="mediapicker_image_outline">@drawable/mediapicker_item_border_dark</item>
-
-        <item name="import_export_item_background_color">@color/import_export_item_background_dark</item>
-        <item name="import_export_item_background_shadow_color">@color/import_export_item_background_shadow_dark</item>
-        <item name="import_export_item_card_background">@drawable/clickable_card_dark</item>
-
         <item name="fab_color">@color/textsecure_primary_dark</item>
         <item name="lower_right_divet">@drawable/divet_lower_right_light</item>
 
@@ -269,27 +244,9 @@
         <item name="linkpreview_secondary_text_color">@color/text</item>
         <item name="linkpreview_divider_color">@color/transparent</item>
 
-<!--        <item name="quick_camera_icon">@drawable/ic_baseline_photo_camera_24</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>
-        <item name="menu_call_icon">@drawable/ic_call_white_24dp</item>
-        <item name="menu_unlock_icon">@drawable/ic_unlocked_white_24dp</item>
-        <item name="menu_lock_icon">@drawable/ic_lock_white_24dp</item>
-        <item name="menu_lock_icon_small">@drawable/ic_lock_white_18dp</item>
-        <item name="menu_accept_icon">@drawable/ic_check_white_24dp</item>
-        <item name="menu_refresh_directory">@drawable/ic_refresh_white_24dp</item>
-        <item name="menu_info_icon">@drawable/ic_info_outline_white_24dp</item>
-
         <item name="conversation_icon_attach_audio">@drawable/ic_audio_dark</item>
         <item name="conversation_icon_attach_video">@drawable/ic_video_dark</item>
 
-        <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>
@@ -303,15 +260,8 @@
 
         <item name="pref_icon_tint">#FFFFFF</item>
 
-        <item name="pref_divider">@drawable/preference_divider_dark</item>
-
-        <item name="quote_missing_icon_color">@color/core_grey_05</item>
-
         <item name="group_members_dialog_icon">@drawable/ic_group_white_24dp</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.Fix</item>
-        <item name="search_toolbar_background">@color/black</item>
-        <item name="search_background">@color/black</item>
-        <item name="invite_background">@color/black</item>
 
         <item name="shared_contact_details_header_background">@color/grey_800</item>
         <item name="shared_contact_details_titlebar">@color/grey_900</item>
diff --git a/res/xml/file_provider_paths.xml b/res/xml/file_provider_paths.xml
index c913a472c9..c05fbc994e 100644
--- a/res/xml/file_provider_paths.xml
+++ b/res/xml/file_provider_paths.xml
@@ -8,4 +8,6 @@
     <external-path name="external_video" path="Movies"/>
     <external-path name="external_audio" path="Music"/>
     <external-path name="external_download" path="Download"/>
+
+    <cache-path name="internal_cache" path="." />
 </paths>
\ No newline at end of file
diff --git a/res/xml/recipient_preferences.xml b/res/xml/recipient_preferences.xml
index 0b90fb0901..0dbeaf492f 100644
--- a/res/xml/recipient_preferences.xml
+++ b/res/xml/recipient_preferences.xml
@@ -44,7 +44,7 @@
                 android:negativeButtonText="@null"
                 android:positiveButtonText="@null"
                 android:persistent="false"
-                app:numColumns="5" />
+                app:columns="5" />
     </PreferenceCategory>
 
     <PreferenceCategory android:layout="@layout/preference_divider"/>
diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java
index e1d44b7ceb..685894dcd9 100644
--- a/src/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/src/org/thoughtcrime/securesms/ApplicationContext.java
@@ -16,18 +16,17 @@
  */
 package org.thoughtcrime.securesms;
 
-import android.app.Application;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.ProcessLifecycleOwner;
 import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Handler;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.lifecycle.DefaultLifecycleObserver;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.ProcessLifecycleOwner;
+import androidx.multidex.MultiDexApplication;
 
 import com.google.firebase.iid.FirebaseInstanceId;
 
@@ -116,10 +115,10 @@ import org.whispersystems.signalservice.loki.protocol.closedgroups.SharedSenderK
 import org.whispersystems.signalservice.loki.protocol.mentions.MentionsManager;
 import org.whispersystems.signalservice.loki.protocol.meta.SessionMetaProtocol;
 import org.whispersystems.signalservice.loki.protocol.meta.TTLUtilities;
-import org.whispersystems.signalservice.loki.protocol.sessionmanagement.SessionManagementProtocol;
-import org.whispersystems.signalservice.loki.protocol.sessionmanagement.SessionManagementProtocolDelegate;
 import org.whispersystems.signalservice.loki.protocol.shelved.multidevice.DeviceLink;
 import org.whispersystems.signalservice.loki.protocol.shelved.multidevice.MultiDeviceProtocol;
+import org.whispersystems.signalservice.loki.protocol.sessionmanagement.SessionManagementProtocol;
+import org.whispersystems.signalservice.loki.protocol.sessionmanagement.SessionManagementProtocolDelegate;
 import org.whispersystems.signalservice.loki.protocol.shelved.syncmessages.SyncMessagesProtocol;
 
 import java.io.File;
@@ -145,10 +144,11 @@ import static nl.komponents.kovenant.android.KovenantAndroid.stopKovenant;
  *
  * @author Moxie Marlinspike
  */
-public class ApplicationContext extends Application implements DependencyInjector, DefaultLifecycleObserver, LokiP2PAPIDelegate,
+public class ApplicationContext extends MultiDexApplication implements DependencyInjector, DefaultLifecycleObserver, LokiP2PAPIDelegate,
       SessionManagementProtocolDelegate, SharedSenderKeysImplementationDelegate {
 
   private static final String TAG = ApplicationContext.class.getSimpleName();
+  private final static int OK_HTTP_CACHE_SIZE = 10 * 1024 * 1024; // 10 MB
 
   private ExpiringMessageManager  expiringMessageManager;
   private TypingStatusRepository  typingStatusRepository;
diff --git a/src/org/thoughtcrime/securesms/CreateProfileActivity.java b/src/org/thoughtcrime/securesms/CreateProfileActivity.java
index 1c9af4f4c6..9be993d218 100644
--- a/src/org/thoughtcrime/securesms/CreateProfileActivity.java
+++ b/src/org/thoughtcrime/securesms/CreateProfileActivity.java
@@ -215,7 +215,6 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Inje
 
     this.avatar.setOnClickListener(view -> Permissions.with(this)
                                                       .request(Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                                                      .ifNecessary()
                                                       .onAnyResult(this::startAvatarSelection)
                                                       .execute());
 
diff --git a/src/org/thoughtcrime/securesms/DeviceActivity.java b/src/org/thoughtcrime/securesms/DeviceActivity.java
index 5b68a6b478..c3c750c58b 100644
--- a/src/org/thoughtcrime/securesms/DeviceActivity.java
+++ b/src/org/thoughtcrime/securesms/DeviceActivity.java
@@ -98,7 +98,6 @@ public class DeviceActivity extends PassphraseRequiredActionBarActivity
   public void onClick(View v) {
     Permissions.with(this)
                .request(Manifest.permission.CAMERA)
-               .ifNecessary()
                .withPermanentDenialDialog(getString(R.string.DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code))
                .onAllGranted(() -> {
                  getSupportFragmentManager().beginTransaction()
diff --git a/src/org/thoughtcrime/securesms/MediaOverviewActivity.java b/src/org/thoughtcrime/securesms/MediaOverviewActivity.java
index 2b3f12012c..3bb2b6eb77 100644
--- a/src/org/thoughtcrime/securesms/MediaOverviewActivity.java
+++ b/src/org/thoughtcrime/securesms/MediaOverviewActivity.java
@@ -16,7 +16,6 @@
  */
 package org.thoughtcrime.securesms;
 
-import android.Manifest;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
@@ -324,47 +323,48 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity {
     }
 
     @SuppressWarnings("CodeBlock2Expr")
-    @SuppressLint({"InlinedApi","StaticFieldLeak"})
+    @SuppressLint({"InlinedApi", "StaticFieldLeak"})
     private void handleSaveMedia(@NonNull Collection<MediaDatabase.MediaRecord> mediaRecords) {
       final Context context = getContext();
+
       SaveAttachmentTask.showWarningDialog(context, (dialogInterface, which) -> {
         Permissions.with(this)
-                   .request(android.Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE)
-                   .ifNecessary()
-                   .withPermanentDenialDialog(getString(R.string.MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied))
-                   .onAnyDenied(() -> Toast.makeText(getContext(), R.string.MediaPreviewActivity_unable_to_write_to_external_storage_without_permission, Toast.LENGTH_LONG).show())
-                   .onAllGranted(() -> {
-                     new ProgressDialogAsyncTask<Void, Void, List<SaveAttachmentTask.Attachment>>(context,
-                                                                                                  R.string.MediaOverviewActivity_collecting_attachments,
-                                                                                                  R.string.please_wait) {
-                       @Override
-                       protected List<SaveAttachmentTask.Attachment> doInBackground(Void... params) {
-                         List<SaveAttachmentTask.Attachment> attachments = new LinkedList<>();
+                .request(android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                .maxSdkVersion(Build.VERSION_CODES.P)
+                .withPermanentDenialDialog(getString(R.string.MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied))
+                .onAnyDenied(() -> Toast.makeText(getContext(), R.string.MediaPreviewActivity_unable_to_write_to_external_storage_without_permission, Toast.LENGTH_LONG).show())
+                .onAllGranted(() -> {
+                  new ProgressDialogAsyncTask<Void, Void, List<SaveAttachmentTask.Attachment>>(
+                          context,
+                          R.string.MediaOverviewActivity_collecting_attachments,
+                          R.string.please_wait) {
+                    @Override
+                    protected List<SaveAttachmentTask.Attachment> doInBackground(Void... params) {
+                      List<SaveAttachmentTask.Attachment> attachments = new LinkedList<>();
 
-                         for (MediaDatabase.MediaRecord mediaRecord : mediaRecords) {
-                           if (mediaRecord.getAttachment().getDataUri() != null) {
-                             attachments.add(new SaveAttachmentTask.Attachment(mediaRecord.getAttachment().getDataUri(),
-                                                                               mediaRecord.getContentType(),
-                                                                               mediaRecord.getDate(),
-                                                                               mediaRecord.getAttachment().getFileName()));
-                           }
-                         }
+                      for (MediaDatabase.MediaRecord mediaRecord : mediaRecords) {
+                        if (mediaRecord.getAttachment().getDataUri() != null) {
+                          attachments.add(new SaveAttachmentTask.Attachment(mediaRecord.getAttachment().getDataUri(),
+                                  mediaRecord.getContentType(),
+                                  mediaRecord.getDate(),
+                                  mediaRecord.getAttachment().getFileName()));
+                        }
+                      }
 
-                         return attachments;
-                       }
+                      return attachments;
+                    }
 
-                       @Override
-                       protected void onPostExecute(List<SaveAttachmentTask.Attachment> attachments) {
-                         super.onPostExecute(attachments);
-                         SaveAttachmentTask saveTask = new SaveAttachmentTask(context,
-                                                                              attachments.size());
-                         saveTask.executeOnExecutor(THREAD_POOL_EXECUTOR,
-                                                    attachments.toArray(new SaveAttachmentTask.Attachment[attachments.size()]));
-                         actionMode.finish();
-                       }
-                     }.execute();
-                   })
-                   .execute();
+                    @Override
+                    protected void onPostExecute(List<SaveAttachmentTask.Attachment> attachments) {
+                      super.onPostExecute(attachments);
+                      SaveAttachmentTask saveTask = new SaveAttachmentTask(context, attachments.size());
+                      saveTask.executeOnExecutor(THREAD_POOL_EXECUTOR,
+                              attachments.toArray(new SaveAttachmentTask.Attachment[attachments.size()]));
+                      actionMode.finish();
+                    }
+                  }.execute();
+                })
+                .execute();
       }, mediaRecords.size());
     }
 
diff --git a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java b/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
index 4593382bbe..429b39c00e 100644
--- a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
+++ b/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
@@ -16,17 +16,16 @@
  */
 package org.thoughtcrime.securesms;
 
-import android.Manifest;
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 
-import androidx.appcompat.widget.Toolbar;
 import androidx.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
@@ -341,22 +340,23 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im
   @SuppressLint("InlinedApi")
   private void saveToDisk() {
     MediaItem mediaItem = getCurrentMediaItem();
+    if (mediaItem == null) return;
 
-    if (mediaItem != null) {
-      SaveAttachmentTask.showWarningDialog(this, (dialogInterface, i) -> {
-        Permissions.with(this)
-                   .request(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE)
-                   .ifNecessary()
-                   .withPermanentDenialDialog(getString(R.string.MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied))
-                   .onAnyDenied(() -> Toast.makeText(this, R.string.MediaPreviewActivity_unable_to_write_to_external_storage_without_permission, Toast.LENGTH_LONG).show())
-                   .onAllGranted(() -> {
-                     SaveAttachmentTask saveTask = new SaveAttachmentTask(MediaPreviewActivity.this);
-                     long saveDate = (mediaItem.date > 0) ? mediaItem.date : System.currentTimeMillis();
-                     saveTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Attachment(mediaItem.uri, mediaItem.type, saveDate, null));
-                   })
-                   .execute();
-      });
-    }
+    SaveAttachmentTask.showWarningDialog(this, (dialogInterface, i) -> {
+      Permissions.with(this)
+              .request(android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
+              .maxSdkVersion(Build.VERSION_CODES.P)
+              .withPermanentDenialDialog(getString(R.string.MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied))
+              .onAnyDenied(() -> Toast.makeText(this, R.string.MediaPreviewActivity_unable_to_write_to_external_storage_without_permission, Toast.LENGTH_LONG).show())
+              .onAllGranted(() -> {
+                SaveAttachmentTask saveTask = new SaveAttachmentTask(MediaPreviewActivity.this);
+                long saveDate = (mediaItem.date > 0) ? mediaItem.date : System.currentTimeMillis();
+                saveTask.executeOnExecutor(
+                        AsyncTask.THREAD_POOL_EXECUTOR,
+                        new Attachment(mediaItem.uri, mediaItem.type, saveDate, null));
+              })
+              .execute();
+    });
   }
 
   @SuppressLint("StaticFieldLeak")
diff --git a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
index 1e8f089d72..475c097647 100644
--- a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
+++ b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
@@ -23,9 +23,6 @@ import android.content.Intent;
 import android.graphics.PorterDuff;
 import android.os.Build;
 import android.os.Bundle;
-import androidx.core.hardware.fingerprint.FingerprintManagerCompat;
-import androidx.core.os.CancellationSignal;
-import androidx.appcompat.widget.Toolbar;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.SpannableString;
@@ -49,6 +46,9 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.core.hardware.fingerprint.FingerprintManagerCompat;
+import androidx.core.os.CancellationSignal;
+
 import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
 import org.thoughtcrime.securesms.components.AnimatingToggle;
 import org.thoughtcrime.securesms.crypto.InvalidPassphraseException;
@@ -91,8 +91,6 @@ public class PassphrasePromptActivity extends PassphraseActivity {
   public void onCreate(Bundle savedInstanceState) {
     Log.i(TAG, "onCreate()");
     dynamicLanguage.onCreate(this);
-    getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-    getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
     super.onCreate(savedInstanceState);
 
     setContentView(R.layout.prompt_passphrase_activity);
@@ -204,7 +202,6 @@ public class PassphrasePromptActivity extends PassphraseActivity {
   private void initializeResources() {
 
     ImageButton okButton = findViewById(R.id.ok_button);
-    Toolbar     toolbar  = findViewById(R.id.toolbar);
 
     showButton                    = findViewById(R.id.passphrase_visibility);
     hideButton                    = findViewById(R.id.passphrase_visibility_off);
@@ -217,9 +214,6 @@ public class PassphrasePromptActivity extends PassphraseActivity {
     fingerprintCancellationSignal = new CancellationSignal();
     fingerprintListener           = new FingerprintListener();
 
-    setSupportActionBar(toolbar);
-    getSupportActionBar().setTitle("");
-
     SpannableString hint = new SpannableString("  " + getString(R.string.PassphrasePromptActivity_enter_passphrase));
     hint.setSpan(new RelativeSizeSpan(0.9f), 0, hint.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
     hint.setSpan(new TypefaceSpan("sans-serif"), 0, hint.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
@@ -229,8 +223,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
     showButton.setOnClickListener(new ShowButtonOnClickListener());
     hideButton.setOnClickListener(new HideButtonOnClickListener());
     passphraseText.setOnEditorActionListener(new PassphraseActionListener());
-    passphraseText.setImeActionLabel(getString(R.string.prompt_passphrase_activity__unlock),
-                                     EditorInfo.IME_ACTION_DONE);
+    passphraseText.setImeActionLabel(getString(R.string.prompt_passphrase_activity__unlock), EditorInfo.IME_ACTION_DONE);
 
     fingerprintPrompt.setImageResource(R.drawable.ic_fingerprint_white_48dp);
     fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.signal_primary), PorterDuff.Mode.SRC_IN);
diff --git a/src/org/thoughtcrime/securesms/RegistrationActivity.java b/src/org/thoughtcrime/securesms/RegistrationActivity.java
index 29ca7d34d9..fdabe5d229 100644
--- a/src/org/thoughtcrime/securesms/RegistrationActivity.java
+++ b/src/org/thoughtcrime/securesms/RegistrationActivity.java
@@ -76,6 +76,7 @@ import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 import org.whispersystems.signalservice.internal.push.LockedException;
 
 import java.io.IOException;
+import java.lang.ref.WeakReference;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
@@ -267,7 +268,7 @@ public class RegistrationActivity extends BaseActionBarActivity implements Verif
 
   @SuppressLint("StaticFieldLeak")
   private void initializeBackupDetection() {
-    if (!Permissions.hasAll(this, Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
+    if (!Permissions.hasAll(this, Manifest.permission.READ_EXTERNAL_STORAGE)) {
       Log.i(TAG, "Skipping backup detection. We don't have the permission.");
       return;
     }
@@ -278,7 +279,7 @@ public class RegistrationActivity extends BaseActionBarActivity implements Verif
       @Override
       protected @Nullable BackupUtil.BackupInfo doInBackground(Void... voids) {
         try {
-          return BackupUtil.getLatestBackup();
+          return BackupUtil.getLatestBackup(RegistrationActivity.this);
         } catch (NoExternalStorageException e) {
           Log.w(TAG, e);
           return null;
diff --git a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
index f78de0ac53..981a76ca50 100644
--- a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
+++ b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
@@ -172,7 +172,6 @@ public class VerifyIdentityActivity extends PassphraseRequiredActionBarActivity
   public void onClick(View v) {
     Permissions.with(this)
                .request(Manifest.permission.CAMERA)
-               .ifNecessary()
                .withPermanentDenialDialog(getString(R.string.VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied))
                .onAllGranted(() -> {
                  FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
diff --git a/src/org/thoughtcrime/securesms/WebRtcCallActivity.java b/src/org/thoughtcrime/securesms/WebRtcCallActivity.java
index 311698578c..e17e4f631a 100644
--- a/src/org/thoughtcrime/securesms/WebRtcCallActivity.java
+++ b/src/org/thoughtcrime/securesms/WebRtcCallActivity.java
@@ -164,7 +164,6 @@ public class WebRtcCallActivity extends Activity {
     if (event != null) {
       Permissions.with(this)
                  .request(Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA)
-                 .ifNecessary()
                  .withRationaleDialog(getString(R.string.WebRtcCallActivity_to_answer_the_call_from_s_give_signal_access_to_your_microphone, event.getRecipient().toShortString()),
                                       R.drawable.ic_mic_white_48dp, R.drawable.ic_videocam_white_48dp)
                  .withPermanentDenialDialog(getString(R.string.WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls))
diff --git a/src/org/thoughtcrime/securesms/avatar/AvatarSelection.java b/src/org/thoughtcrime/securesms/avatar/AvatarSelection.java
index b54c9e6cc4..4a4f65883e 100644
--- a/src/org/thoughtcrime/securesms/avatar/AvatarSelection.java
+++ b/src/org/thoughtcrime/securesms/avatar/AvatarSelection.java
@@ -4,9 +4,11 @@ import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.provider.MediaStore;
+
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.core.content.ContextCompat;
@@ -14,9 +16,9 @@ import androidx.core.content.ContextCompat;
 import com.theartofdev.edmodo.cropper.CropImage;
 import com.theartofdev.edmodo.cropper.CropImageView;
 
-import network.loki.messenger.R;
+import org.thoughtcrime.securesms.database.NoExternalStorageException;
 import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.permissions.Permissions;
+import org.thoughtcrime.securesms.util.ExternalStorageUtil;
 import org.thoughtcrime.securesms.util.FileProviderUtil;
 import org.thoughtcrime.securesms.util.IntentUtils;
 
@@ -25,18 +27,20 @@ import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
 
+import network.loki.messenger.R;
+
 import static android.provider.MediaStore.EXTRA_OUTPUT;
 
 public final class AvatarSelection {
 
   private static final String TAG = AvatarSelection.class.getSimpleName();
 
+  public static final int REQUEST_CODE_CROP_IMAGE = CropImage.CROP_IMAGE_ACTIVITY_REQUEST_CODE;
+  public static final int REQUEST_CODE_AVATAR = REQUEST_CODE_CROP_IMAGE + 1;
+
   private AvatarSelection() {
   }
 
-  public static final int REQUEST_CODE_CROP_IMAGE = CropImage.CROP_IMAGE_ACTIVITY_REQUEST_CODE;
-  public static final int REQUEST_CODE_AVATAR     = REQUEST_CODE_CROP_IMAGE + 1;
-
   /**
    * Returns result on {@link #REQUEST_CODE_CROP_IMAGE}
    */
@@ -63,16 +67,14 @@ public final class AvatarSelection {
    * @return Temporary capture file if created.
    */
   public static File startAvatarSelection(Activity activity, boolean includeClear, boolean attemptToIncludeCamera) {
-    File    captureFile  = null;
-
-    if (attemptToIncludeCamera) {
-      if (Permissions.hasAll(activity, Manifest.permission.CAMERA)) {
-        try {
-          captureFile = File.createTempFile("capture", "jpg", activity.getExternalCacheDir());
-        } catch (IOException e) {
-          Log.w(TAG, e);
-          captureFile = null;
-        }
+    File captureFile = null;
+    boolean hasCameraPermission = ContextCompat
+            .checkSelfPermission(activity, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED;
+    if (attemptToIncludeCamera && hasCameraPermission) {
+      try {
+        captureFile = File.createTempFile("avatar-capture", ".jpg", ExternalStorageUtil.getImageDir(activity));
+      } catch (IOException | NoExternalStorageException e) {
+        Log.e("Cannot reserve a temporary avatar capture file.", e);
       }
     }
 
@@ -83,8 +85,7 @@ public final class AvatarSelection {
 
   private static Intent createAvatarSelectionIntent(Context context, @Nullable File tempCaptureFile, boolean includeClear) {
     List<Intent> extraIntents  = new LinkedList<>();
-    Intent       galleryIntent = new Intent(Intent.ACTION_PICK);
-
+    Intent galleryIntent = new Intent(Intent.ACTION_PICK);
     galleryIntent.setDataAndType(android.provider.MediaStore.Images.Media.INTERNAL_CONTENT_URI, "image/*");
 
     if (!IntentUtils.isResolvable(context, galleryIntent)) {
@@ -93,12 +94,11 @@ public final class AvatarSelection {
     }
 
     if (tempCaptureFile != null) {
+      Uri uri = FileProviderUtil.getUriFor(context, tempCaptureFile);
       Intent cameraIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-
-      if (cameraIntent.resolveActivity(context.getPackageManager()) != null) {
-        cameraIntent.putExtra(EXTRA_OUTPUT, FileProviderUtil.getUriFor(context, tempCaptureFile));
-        extraIntents.add(cameraIntent);
-      }
+      cameraIntent.putExtra(EXTRA_OUTPUT, uri);
+      cameraIntent.setFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+      extraIntents.add(cameraIntent);
     }
 
     if (includeClear) {
@@ -113,4 +113,4 @@ public final class AvatarSelection {
 
     return chooserIntent;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/backup/BackupDialog.java b/src/org/thoughtcrime/securesms/backup/BackupDialog.java
index 11ca52a688..1da08039f8 100644
--- a/src/org/thoughtcrime/securesms/backup/BackupDialog.java
+++ b/src/org/thoughtcrime/securesms/backup/BackupDialog.java
@@ -77,7 +77,7 @@ public class BackupDialog {
                    .setPositiveButton(R.string.BackupDialog_delete_backups_statement, (dialog, which) -> {
                      BackupPassphrase.set(context, null);
                      TextSecurePreferences.setBackupEnabled(context, false);
-                     BackupUtil.deleteAllBackups();
+                     BackupUtil.deleteAllBackups(context);
                      preference.setChecked(false);
                    })
                    .create()
diff --git a/src/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java b/src/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java
index 86dfa8b6ec..67d6405d3f 100644
--- a/src/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java
+++ b/src/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java
@@ -110,7 +110,7 @@ public class AttachmentTypeSelector extends PopupWindow {
   public void show(@NonNull Activity activity, final @NonNull View anchor) {
     updateHeight();
 
-    if (Permissions.hasAll(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
+    if (Permissions.hasAll(activity, Manifest.permission.READ_EXTERNAL_STORAGE)) {
       recentRail.setVisibility(View.VISIBLE);
       loaderManager.restartLoader(1, null, recentRail);
     } else {
diff --git a/src/org/thoughtcrime/securesms/components/QuoteView.java b/src/org/thoughtcrime/securesms/components/QuoteView.java
index 2354b88959..112f522ce8 100644
--- a/src/org/thoughtcrime/securesms/components/QuoteView.java
+++ b/src/org/thoughtcrime/securesms/components/QuoteView.java
@@ -6,9 +6,6 @@ import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.os.Build;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
@@ -17,11 +14,16 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
 import com.annimon.stream.Stream;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.loki.utilities.UiModeUtilities;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.Slide;
@@ -209,7 +211,8 @@ public class QuoteView extends FrameLayout implements RecipientModifiedListener
     authorView.setText(isOwnNumber ? getContext().getString(R.string.QuoteView_you) : quoteeDisplayName);
 
     // We use the raw color resource because Android 4.x was struggling with tints here
-    quoteBarView.setImageResource(R.color.accent);
+    int colorID = UiModeUtilities.isDayUiMode(getContext()) ? R.color.black : R.color.accent;
+    quoteBarView.setImageResource(colorID);
     mainView.setBackgroundColor(ThemeUtil.getThemedColor(getContext(),
             outgoing ? R.attr.message_received_background_color : R.attr.message_sent_background_color));
   }
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 4a06575a30..8a98e52361 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -30,6 +30,8 @@ import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
 import android.hardware.Camera;
 import android.net.Uri;
 import android.os.AsyncTask;
@@ -61,6 +63,7 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
@@ -158,8 +161,10 @@ import org.thoughtcrime.securesms.loki.database.LokiThreadDatabaseDelegate;
 import org.thoughtcrime.securesms.loki.database.LokiUserDatabase;
 import org.thoughtcrime.securesms.loki.protocol.ClosedGroupsProtocol;
 import org.thoughtcrime.securesms.loki.protocol.SessionManagementProtocol;
+import org.thoughtcrime.securesms.loki.utilities.GeneralUtilitiesKt;
 import org.thoughtcrime.securesms.loki.utilities.MentionManagerUtilities;
 import org.thoughtcrime.securesms.loki.views.MentionCandidateSelectionView;
+import org.thoughtcrime.securesms.loki.views.ProfilePictureView;
 import org.thoughtcrime.securesms.loki.views.SessionRestoreBannerView;
 import org.thoughtcrime.securesms.mediasend.Media;
 import org.thoughtcrime.securesms.mediasend.MediaSendActivity;
@@ -300,6 +305,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private   AnimatingToggle             buttonToggle;
   private   SendButton                  sendButton;
   private   ImageButton                 attachButton;
+  private   ProfilePictureView          profilePictureView;
   private   TextView                    titleTextView;
   private   TextView                    charactersLeft;
   private   ConversationFragment        fragment;
@@ -527,6 +533,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     composeText.setTransport(sendButton.getSelectedTransport());
 
     updateTitleTextView(recipient);
+    updateProfilePicture();
     updateSubtitleTextView();
     setActionBarColor(recipient.getColor());
     updateInputUI(recipient, isSecureText, isDefaultSms);
@@ -621,6 +628,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       recipient = Recipient.from(this, data.getParcelableExtra(GroupCreateActivity.GROUP_ADDRESS_EXTRA), true);
       recipient.addListener(this);
       updateTitleTextView(recipient);
+      updateProfilePicture();
       updateSubtitleTextView();
       NotificationChannels.updateContactChannelName(this, recipient);
       updateInputUI(recipient, isSecureText, isDefaultSms);
@@ -732,10 +740,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       if (recipient.getExpireMessages() > 0) {
         inflater.inflate(R.menu.conversation_expiring_on, menu);
 
-        final MenuItem item       = menu.findItem(R.id.menu_expiring_messages);
-        final View     actionView = MenuItemCompat.getActionView(item);
-        final TextView badgeView  = actionView.findViewById(R.id.expiration_badge);
+        final MenuItem  item       = menu.findItem(R.id.menu_expiring_messages);
+        final View      actionView = MenuItemCompat.getActionView(item);
+        final ImageView iconView   = actionView.findViewById(R.id.menu_badge_icon);
+        final TextView  badgeView  = actionView.findViewById(R.id.expiration_badge);
 
+        @ColorInt int color = GeneralUtilitiesKt.getColorWithID(getResources(), R.color.text, getTheme());
+        iconView.setColorFilter(new PorterDuffColorFilter(color, PorterDuff.Mode.MULTIPLY));
         badgeView.setText(ExpirationUtil.getExpirationAbbreviatedDisplayValue(this, recipient.getExpireMessages()));
         actionView.setOnClickListener(v -> onOptionsItemSelected(item));
       } else {
@@ -1654,6 +1665,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void initializeViews() {
+    profilePictureView                     = findViewById(R.id.profilePictureView);
     titleTextView                          = findViewById(R.id.titleTextView);
     buttonToggle                           = ViewUtil.findById(this, R.id.button_toggle);
     sendButton                             = ViewUtil.findById(this, R.id.send_button);
@@ -1872,6 +1884,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     Util.runOnMain(() -> {
       Log.i(TAG, "onModifiedRun(): " + recipient.getRegistered());
       updateTitleTextView(recipient);
+      updateProfilePicture();
       updateSubtitleTextView();
 //      titleView.setVerified(identityRecords.isVerified());
       updateInputUI(recipient, isSecureText, isDefaultSms);
@@ -2551,7 +2564,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   public void onRecorderPermissionRequired() {
     Permissions.with(this)
                .request(Manifest.permission.RECORD_AUDIO)
-               .ifNecessary()
                .withRationaleDialog(getString(R.string.ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone), R.drawable.ic_baseline_mic_48)
                .withPermanentDenialDialog(getString(R.string.ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages))
                .execute();
@@ -2752,7 +2764,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     public void onClick(View v) {
       Permissions.with(ConversationActivity.this)
                  .request(Manifest.permission.CAMERA)
-                 .ifNecessary()
                  .withRationaleDialog(getString(R.string.ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera), R.drawable.ic_baseline_photo_camera_48)
                  .withPermanentDenialDialog(getString(R.string.ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video))
                  .onAllGranted(() -> {
@@ -3100,18 +3111,15 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     }
   }
 
+  private void updateProfilePicture() {
+    profilePictureView.glide = GlideApp.with(this);
+    profilePictureView.update(recipient, threadId);
+  }
+
   private void updateSubtitleTextView() {
     muteIndicatorImageView.setVisibility(View.GONE);
     subtitleTextView.setVisibility(View.VISIBLE);
-    if (messageStatus != null) {
-      switch (messageStatus) {
-        case "calculatingPoW": subtitleTextView.setText("Encrypting message"); break;
-        case "contactingNetwork": subtitleTextView.setText("Tracing a path"); break;
-        case "sendingMessage": subtitleTextView.setText("Sending message"); break;
-        case "messageSent": subtitleTextView.setText("Message sent securely"); break;
-        case "messageFailed": subtitleTextView.setText("Message failed to send"); break;
-      }
-    } else if (recipient.isMuted()) {
+    if (recipient.isMuted()) {
       muteIndicatorImageView.setVisibility(View.VISIBLE);
       subtitleTextView.setText("Muted until " + DateUtils.getFormattedDateTime(recipient.mutedUntil, "EEE, MMM d, yyyy HH:mm", Locale.getDefault()));
     } else if (recipient.isGroupRecipient() && recipient.getName() != null && !recipient.getName().equals("Session Updates") && !recipient.getName().equals("Loki News")) {
@@ -3125,10 +3133,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       } else {
         subtitleTextView.setVisibility(View.GONE);
       }
-    } else if (PublicKeyValidation.isValid(recipient.getAddress().toString())) {
-      String ourMasterHexEncodedPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(this);
-      String hexEncodedPublicKey = (recipient.isLocalNumber() && ourMasterHexEncodedPublicKey != null) ? ourMasterHexEncodedPublicKey : recipient.getAddress().toPhoneString();
-      subtitleTextView.setText(hexEncodedPublicKey);
     } else {
       subtitleTextView.setVisibility(View.GONE);
     }
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
index eeb1c3cc0a..8ee693adff 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -85,6 +85,7 @@ import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.OutgoingMediaMessage;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.mms.Slide;
+import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.profiles.UnknownSenderView;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.sms.MessageSender;
@@ -658,23 +659,30 @@ public class ConversationFragment extends Fragment
   }
 
   private void handleSaveAttachment(final MediaMmsMessageRecord message) {
-    SaveAttachmentTask.showWarningDialog(getActivity(), new DialogInterface.OnClickListener() {
-      public void onClick(DialogInterface dialog, int which) {
-        List<SaveAttachmentTask.Attachment> attachments = Stream.of(message.getSlideDeck().getSlides())
-                                                                .filter(s -> s.getUri() != null && (s.hasImage() || s.hasVideo() || s.hasAudio() || s.hasDocument()))
-                                                                .map(s -> new SaveAttachmentTask.Attachment(s.getUri(), s.getContentType(), message.getDateReceived(), s.getFileName().orNull()))
-                                                                .toList();
-        if (!Util.isEmpty(attachments)) {
-          SaveAttachmentTask saveTask = new SaveAttachmentTask(getActivity());
-          saveTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, attachments.toArray(new SaveAttachmentTask.Attachment[0]));
-          return;
-        }
+    SaveAttachmentTask.showWarningDialog(getActivity(), (dialog, which) -> {
+      Permissions.with(this)
+              .request(android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
+              .maxSdkVersion(Build.VERSION_CODES.P)
+              .withPermanentDenialDialog(getString(R.string.MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied))
+              .onAnyDenied(() -> Toast.makeText(getContext(), R.string.MediaPreviewActivity_unable_to_write_to_external_storage_without_permission, Toast.LENGTH_LONG).show())
+              .onAllGranted(() -> {
+                List<SaveAttachmentTask.Attachment> attachments =
+                        Stream.of(message.getSlideDeck().getSlides())
+                                .filter(s -> s.getUri() != null && (s.hasImage() || s.hasVideo() || s.hasAudio() || s.hasDocument()))
+                                .map(s -> new SaveAttachmentTask.Attachment(s.getUri(), s.getContentType(), message.getDateReceived(), s.getFileName().orNull()))
+                                .toList();
+                if (!Util.isEmpty(attachments)) {
+                  SaveAttachmentTask saveTask = new SaveAttachmentTask(getActivity());
+                  saveTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, attachments.toArray(new SaveAttachmentTask.Attachment[0]));
+                  return;
+                }
 
-        Log.w(TAG, "No slide with attachable media found, failing nicely.");
-        Toast.makeText(getActivity(),
-                       getResources().getQuantityString(R.plurals.ConversationFragment_error_while_saving_attachments_to_sd_card, 1),
-                       Toast.LENGTH_LONG).show();
-      }
+                Log.w(TAG, "No slide with attachable media found, failing nicely.");
+                Toast.makeText(getActivity(),
+                        getResources().getQuantityString(R.plurals.ConversationFragment_error_while_saving_attachments_to_sd_card, 1),
+                        Toast.LENGTH_LONG).show();
+              })
+              .execute();
     });
   }
 
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
index ca3d10db17..a86f02e073 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -797,13 +797,21 @@ public class ConversationItem extends LinearLayout
     LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams)bodyBubble.getLayoutParams();
     int groupThreadMargin = (int)((12 * getResources().getDisplayMetrics().density) + getResources().getDimension(R.dimen.small_profile_picture_size));
     int defaultMargin = 0;
-    Recipient r = DatabaseFactory.getThreadDatabase(context).getRecipientForThreadId(messageRecord.getThreadId());
+    long threadID = messageRecord.getThreadId();
+    Recipient r = DatabaseFactory.getThreadDatabase(context).getRecipientForThreadId(threadID);
     String threadName = r != null ? r.getName() : "";
     boolean isRSSFeed = threadName != null && (threadName.equals("Loki News") || threadName.equals("Session Updates"));
     layoutParams.setMarginStart((groupThread && !isRSSFeed) ? groupThreadMargin : defaultMargin);
     bodyBubble.setLayoutParams(layoutParams);
     if (profilePictureView == null) return;
-    profilePictureView.setPublicKey(recipient.getAddress().toString());
+    String publicKey = recipient.getAddress().toString();
+    profilePictureView.setPublicKey(publicKey);
+    String displayName = recipient.getName();
+    PublicChat publicChat = DatabaseFactory.getLokiThreadDatabase(context).getPublicChat(threadID);
+    if (displayName == null && publicChat != null) {
+      displayName = DatabaseFactory.getLokiUserDatabase(context).getServerDisplayName(publicChat.getId(), publicKey);
+    }
+    profilePictureView.setDisplayName(displayName);
     profilePictureView.setAdditionalPublicKey(null);
     profilePictureView.setRSSFeed(false);
     profilePictureView.setGlide(glideRequests);
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java b/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
index b7e61d34b8..39a4212909 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
@@ -5,14 +5,16 @@ import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.thoughtcrime.securesms.BindableConversationItem;
 import org.thoughtcrime.securesms.VerifyIdentityActivity;
 import org.thoughtcrime.securesms.crypto.IdentityKeyParcelable;
@@ -20,6 +22,7 @@ import org.thoughtcrime.securesms.database.IdentityDatabase;
 import org.thoughtcrime.securesms.database.IdentityDatabase.IdentityRecord;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.loki.utilities.GeneralUtilitiesKt;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientModifiedListener;
@@ -135,12 +138,13 @@ public class ConversationUpdateItem extends LinearLayout
   }
 
   private void setTimerRecord(final MessageRecord messageRecord) {
+    @ColorInt int color = GeneralUtilitiesKt.getColorWithID(getResources(), R.color.text, getContext().getTheme());
     if (messageRecord.getExpiresIn() > 0) {
       icon.setImageResource(R.drawable.ic_timer);
-      icon.setColorFilter(new PorterDuffColorFilter(Color.WHITE, PorterDuff.Mode.MULTIPLY));
+      icon.setColorFilter(new PorterDuffColorFilter(color, PorterDuff.Mode.MULTIPLY));
     } else {
       icon.setImageResource(R.drawable.ic_timer_disabled);
-      icon.setColorFilter(new PorterDuffColorFilter(Color.WHITE, PorterDuff.Mode.MULTIPLY));
+      icon.setColorFilter(new PorterDuffColorFilter(color, PorterDuff.Mode.MULTIPLY));
     }
 
     title.setText(ExpirationUtil.getExpirationDisplayValue(getContext(), (int)(messageRecord.getExpiresIn() / 1000)));
diff --git a/src/org/thoughtcrime/securesms/database/AttachmentDatabase.java b/src/org/thoughtcrime/securesms/database/AttachmentDatabase.java
index 8f6f663fe6..63bdd4ca70 100644
--- a/src/org/thoughtcrime/securesms/database/AttachmentDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/AttachmentDatabase.java
@@ -54,7 +54,7 @@ import org.thoughtcrime.securesms.util.BitmapUtil;
 import org.thoughtcrime.securesms.util.JsonUtils;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.MediaUtil.ThumbnailData;
-import org.thoughtcrime.securesms.util.StorageUtil;
+import org.thoughtcrime.securesms.util.ExternalStorageUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.video.EncryptedMediaDataSource;
 
@@ -473,7 +473,7 @@ public class AttachmentDatabase extends Database {
     SQLiteDatabase database = databaseHelper.getWritableDatabase();
 
     ContentValues contentValues = new ContentValues(1);
-    contentValues.put(FILE_NAME, StorageUtil.getCleanFileName(fileName));
+    contentValues.put(FILE_NAME, ExternalStorageUtil.getCleanFileName(fileName));
 
     database.update(TABLE_NAME, contentValues, PART_ID_WHERE, attachmentId.toStrings());
   }
@@ -724,7 +724,7 @@ public class AttachmentDatabase extends Database {
     contentValues.put(DIGEST, attachment.getDigest());
     contentValues.put(CONTENT_DISPOSITION, attachment.getKey());
     contentValues.put(NAME, attachment.getRelay());
-    contentValues.put(FILE_NAME, StorageUtil.getCleanFileName(attachment.getFileName()));
+    contentValues.put(FILE_NAME, ExternalStorageUtil.getCleanFileName(attachment.getFileName()));
     contentValues.put(SIZE, attachment.getSize());
     contentValues.put(FAST_PREFLIGHT_ID, attachment.getFastPreflightId());
     contentValues.put(VOICE_NOTE, attachment.isVoiceNote() ? 1 : 0);
diff --git a/src/org/thoughtcrime/securesms/database/ThreadDatabase.java b/src/org/thoughtcrime/securesms/database/ThreadDatabase.java
index 41903ae23e..f58471b9ba 100644
--- a/src/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -528,6 +528,7 @@ public class ThreadDatabase extends Database {
       if (cursor != null && cursor.moveToFirst()) {
         return cursor.getLong(cursor.getColumnIndexOrThrow(ID));
       } else {
+        DatabaseFactory.getRecipientDatabase(context).setProfileSharing(recipient, true);
         return createThreadForRecipient(recipient.getAddress(), recipient.isGroupRecipient(), distributionType);
       }
     } finally {
diff --git a/src/org/thoughtcrime/securesms/database/loaders/RecentPhotosLoader.java b/src/org/thoughtcrime/securesms/database/loaders/RecentPhotosLoader.java
index 7ed0184e8e..21ed07ac66 100644
--- a/src/org/thoughtcrime/securesms/database/loaders/RecentPhotosLoader.java
+++ b/src/org/thoughtcrime/securesms/database/loaders/RecentPhotosLoader.java
@@ -35,7 +35,7 @@ public class RecentPhotosLoader extends CursorLoader {
 
   @Override
   public Cursor loadInBackground() {
-    if (Permissions.hasAll(context, Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
+    if (Permissions.hasAll(context, Manifest.permission.READ_EXTERNAL_STORAGE)) {
       return context.getContentResolver().query(MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
                                                 PROJECTION, null, null,
                                                 MediaStore.Images.ImageColumns.DATE_MODIFIED + " DESC");
diff --git a/src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java b/src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java
index dc0d8b1f4b..ba19d8e2a5 100644
--- a/src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java
@@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.service.GenericForegroundService;
 import org.thoughtcrime.securesms.util.BackupUtil;
-import org.thoughtcrime.securesms.util.StorageUtil;
+import org.thoughtcrime.securesms.util.ExternalStorageUtil;
 
 import java.io.File;
 import java.io.IOException;
@@ -26,6 +26,7 @@ import java.util.Locale;
 
 import network.loki.messenger.R;
 
+//TODO AC: Needs to be refactored to use Storage Access Framework or Media Store API.
 public class LocalBackupJob extends BaseJob {
 
   public static final String KEY = "LocalBackupJob";
@@ -71,7 +72,7 @@ public class LocalBackupJob extends BaseJob {
 
     try {
       String backupPassword  = BackupPassphrase.get(context);
-      File   backupDirectory = StorageUtil.getBackupDirectory();
+      File   backupDirectory = ExternalStorageUtil.getBackupDir(context);
       String timestamp       = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.US).format(new Date());
       String fileName        = String.format("session-%s.backup", timestamp);
       File   backupFile      = new File(backupDirectory, fileName);
@@ -84,7 +85,7 @@ public class LocalBackupJob extends BaseJob {
         throw new IOException("Backup password is null");
       }
 
-      File tempFile = File.createTempFile("backup", "tmp", StorageUtil.getBackupCacheDirectory(context));
+      File tempFile = File.createTempFile("backup", "tmp", ExternalStorageUtil.getCacheDir(context));
 
       FullBackupExporter.export(context,
                                 AttachmentSecretProvider.getInstance(context).getOrCreateAttachmentSecret(),
@@ -97,7 +98,7 @@ public class LocalBackupJob extends BaseJob {
         throw new IOException("Renaming temporary backup file failed!");
       }
 
-      BackupUtil.deleteOldBackups();
+      BackupUtil.deleteOldBackups(context);
     } finally {
       GenericForegroundService.stopForegroundTask(context);
     }
diff --git a/src/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java b/src/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java
index 48bc091e97..168a6630a3 100644
--- a/src/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java
@@ -96,11 +96,11 @@ public class RetrieveProfileAvatarJob extends BaseJob implements InjectableType
       return;
     }
 
-    File downloadDestination = File.createTempFile("avatar", "jpg", context.getCacheDir());
+    File downloadDestination = File.createTempFile("avatar", ".jpg", context.getCacheDir());
 
     try {
       InputStream avatarStream       = receiver.retrieveProfileAvatar(profileAvatar, downloadDestination, profileKey, MAX_PROFILE_SIZE_BYTES);
-      File        decryptDestination = File.createTempFile("avatar", "jpg", context.getCacheDir());
+      File        decryptDestination = File.createTempFile("avatar", ".jpg", context.getCacheDir());
 
       Util.copy(avatarStream, new FileOutputStream(decryptDestination));
       decryptDestination.renameTo(AvatarHelper.getAvatarFile(context, recipient.getAddress()));
diff --git a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
index 43e0647d2d..e0bba59ccf 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.loki.activities
 
 import android.app.AlertDialog
-import androidx.lifecycle.Observer
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
@@ -11,10 +10,6 @@ import android.net.Uri
 import android.os.AsyncTask
 import android.os.Bundle
 import android.os.Handler
-import androidx.loader.app.LoaderManager
-import androidx.loader.content.Loader
-import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import androidx.recyclerview.widget.LinearLayoutManager
 import android.text.Spannable
 import android.text.SpannableString
 import android.text.style.ForegroundColorSpan
@@ -22,6 +17,11 @@ import android.util.DisplayMetrics
 import android.view.View
 import android.widget.RelativeLayout
 import android.widget.Toast
+import androidx.lifecycle.Observer
+import androidx.loader.app.LoaderManager
+import androidx.loader.content.Loader
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
+import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.android.synthetic.main.activity_home.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.ApplicationContext
@@ -34,6 +34,7 @@ import org.thoughtcrime.securesms.jobs.MultiDeviceBlockedUpdateJob
 import org.thoughtcrime.securesms.loki.dialogs.ConversationOptionsBottomSheet
 import org.thoughtcrime.securesms.loki.dialogs.LightThemeFeatureIntroBottomSheet
 import org.thoughtcrime.securesms.loki.dialogs.MultiDeviceRemovalBottomSheet
+import org.thoughtcrime.securesms.loki.dialogs.UserDetailsBottomSheet
 import org.thoughtcrime.securesms.loki.protocol.ClosedGroupsProtocol
 import org.thoughtcrime.securesms.loki.protocol.SessionResetImplementation
 import org.thoughtcrime.securesms.loki.utilities.*
@@ -42,16 +43,16 @@ import org.thoughtcrime.securesms.loki.views.NewConversationButtonSetViewDelegat
 import org.thoughtcrime.securesms.loki.views.SeedReminderViewDelegate
 import org.thoughtcrime.securesms.mms.GlideApp
 import org.thoughtcrime.securesms.mms.GlideRequests
-import org.thoughtcrime.securesms.util.GroupUtil
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.Util
 import org.whispersystems.signalservice.loki.api.fileserver.FileServerAPI
 import org.whispersystems.signalservice.loki.protocol.mentions.MentionsManager
 import org.whispersystems.signalservice.loki.protocol.meta.SessionMetaProtocol
-import org.whispersystems.signalservice.loki.protocol.shelved.multidevice.MultiDeviceProtocol
 import org.whispersystems.signalservice.loki.protocol.sessionmanagement.SessionManagementProtocol
+import org.whispersystems.signalservice.loki.protocol.shelved.multidevice.MultiDeviceProtocol
 import org.whispersystems.signalservice.loki.protocol.shelved.syncmessages.SyncMessagesProtocol
 import org.whispersystems.signalservice.loki.utilities.toHexString
+import java.io.IOException
 
 class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListener, SeedReminderViewDelegate, NewConversationButtonSetViewDelegate {
     private lateinit var glide: GlideRequests
@@ -98,8 +99,10 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
         // Set up toolbar buttons
         profileButton.glide = glide
         profileButton.publicKey = publicKey
+        profileButton.displayName = TextSecurePreferences.getProfileName(this)
         profileButton.update()
         profileButton.setOnClickListener { openSettings() }
+        pathStatusViewContainer.disableClipping()
         pathStatusViewContainer.setOnClickListener { showPath() }
         // Set up seed reminder view
         val isMasterDevice = (TextSecurePreferences.getMasterHexEncodedPublicKey(this) == null)
@@ -202,7 +205,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
             seedReminderView.visibility = View.GONE
         }
 
-        // Multiple device removal notification
+        // Multi device removal sheet
         if (!TextSecurePreferences.getHasSeenMultiDeviceRemovalSheet(this)) {
             TextSecurePreferences.setHasSeenMultiDeviceRemovalSheet(this)
             val userPublicKey = TextSecurePreferences.getLocalNumber(this)
@@ -223,7 +226,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
             }
         }
 
-        // Light theme introduction
+        // Light theme introduction sheet
         if (!TextSecurePreferences.hasSeenLightThemeIntroSheet(this) &&
                 UiModeUtilities.isDayUiMode(this)) {
             TextSecurePreferences.setHasSeenLightThemeIntroSheet(this)
@@ -271,6 +274,14 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
         val thread = view.thread ?: return
         val bottomSheet = ConversationOptionsBottomSheet()
         bottomSheet.recipient = thread.recipient
+        bottomSheet.onViewDetailsTapped = {
+            bottomSheet.dismiss()
+            val userDetailsBottomSheet = UserDetailsBottomSheet()
+            val bundle = Bundle()
+            bundle.putString("publicKey", thread.recipient.address.toPhoneString())
+            userDetailsBottomSheet.arguments = bundle
+            userDetailsBottomSheet.show(supportFragmentManager, userDetailsBottomSheet.tag)
+        }
         bottomSheet.onBlockTapped = {
             bottomSheet.dismiss()
             if (!thread.recipient.isBlocked) {
@@ -351,10 +362,17 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
             val isClosedGroup = recipient.address.isClosedGroup
             // Send a leave group message if this is an active closed group
             if (isClosedGroup && DatabaseFactory.getGroupDatabase(this).isActive(recipient.address.toGroupString())) {
-                val groupPublicKey = ClosedGroupsProtocol.doubleDecodeGroupID(recipient.address.toString()).toHexString()
-                val isSSKBasedClosedGroup = DatabaseFactory.getSSKDatabase(this).isSSKBasedClosedGroup(groupPublicKey)
+                var isSSKBasedClosedGroup: Boolean
+                var groupPublicKey: String?
+                try {
+                    groupPublicKey = ClosedGroupsProtocol.doubleDecodeGroupID(recipient.address.toString()).toHexString()
+                    isSSKBasedClosedGroup = DatabaseFactory.getSSKDatabase(this).isSSKBasedClosedGroup(groupPublicKey)
+                } catch (e: IOException) {
+                    groupPublicKey = null
+                    isSSKBasedClosedGroup = false
+                }
                 if (isSSKBasedClosedGroup) {
-                    ClosedGroupsProtocol.leave(this, groupPublicKey)
+                    ClosedGroupsProtocol.leave(this, groupPublicKey!!)
                 } else if (!ClosedGroupsProtocol.leaveLegacyGroup(this, recipient)) {
                     Toast.makeText(this, R.string.activity_home_leaving_group_failed_message, Toast.LENGTH_LONG).show()
                     return@setPositiveButton
diff --git a/src/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt
index c36c92b5c7..75102938b9 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt
@@ -1,5 +1,7 @@
 package org.thoughtcrime.securesms.loki.activities
 
+import android.animation.ArgbEvaluator
+import android.animation.ValueAnimator
 import android.app.AlertDialog
 import android.content.Intent
 import android.graphics.drawable.TransitionDrawable
@@ -9,27 +11,36 @@ import androidx.annotation.DrawableRes
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import android.widget.LinearLayout
 import android.widget.Toast
+import androidx.annotation.ColorRes
 import kotlinx.android.synthetic.main.activity_display_name.registerButton
 import kotlinx.android.synthetic.main.activity_pn_mode.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.BaseActionBarActivity
+import org.thoughtcrime.securesms.loki.utilities.disableClipping
+import org.thoughtcrime.securesms.loki.utilities.getColorWithID
 import org.thoughtcrime.securesms.loki.utilities.setUpActionBarSessionLogo
 import org.thoughtcrime.securesms.loki.utilities.show
+import org.thoughtcrime.securesms.loki.views.GlowViewUtilities
+import org.thoughtcrime.securesms.loki.views.PNModeView
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 
 class PNModeActivity : BaseActionBarActivity() {
-    private var selectedOptionView: LinearLayout? = null
+    private var selectedOptionView: PNModeView? = null
 
     // region Lifecycle
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setUpActionBarSessionLogo()
         setContentView(R.layout.activity_pn_mode)
+        contentView.disableClipping()
         fcmOptionView.setOnClickListener { toggleFCM() }
+        fcmOptionView.mainColor = resources.getColorWithID(R.color.pn_option_background, theme)
+        fcmOptionView.strokeColor = resources.getColorWithID(R.color.pn_option_border, theme)
         backgroundPollingOptionView.setOnClickListener { toggleBackgroundPolling() }
+        backgroundPollingOptionView.mainColor = resources.getColorWithID(R.color.pn_option_background, theme)
+        backgroundPollingOptionView.strokeColor = resources.getColorWithID(R.color.pn_option_border, theme)
         registerButton.setOnClickListener { register() }
     }
 
@@ -71,15 +82,23 @@ class PNModeActivity : BaseActionBarActivity() {
         when (selectedOptionView) {
             null -> {
                 performTransition(R.drawable.pn_option_background_select_transition, fcmOptionView)
+                GlowViewUtilities.animateShadowColorChange(this, fcmOptionView, R.color.transparent, R.color.accent)
+                animateStrokeColorChange(fcmOptionView, R.color.pn_option_border, R.color.accent)
                 selectedOptionView = fcmOptionView
             }
             fcmOptionView -> {
                 performTransition(R.drawable.pn_option_background_deselect_transition, fcmOptionView)
+                GlowViewUtilities.animateShadowColorChange(this, fcmOptionView, R.color.accent, R.color.transparent)
+                animateStrokeColorChange(fcmOptionView, R.color.accent, R.color.pn_option_border)
                 selectedOptionView = null
             }
             backgroundPollingOptionView -> {
                 performTransition(R.drawable.pn_option_background_select_transition, fcmOptionView)
+                GlowViewUtilities.animateShadowColorChange(this, fcmOptionView, R.color.transparent, R.color.accent)
+                animateStrokeColorChange(fcmOptionView, R.color.pn_option_border, R.color.accent)
                 performTransition(R.drawable.pn_option_background_deselect_transition, backgroundPollingOptionView)
+                GlowViewUtilities.animateShadowColorChange(this, backgroundPollingOptionView, R.color.accent, R.color.transparent)
+                animateStrokeColorChange(backgroundPollingOptionView, R.color.accent, R.color.pn_option_border)
                 selectedOptionView = fcmOptionView
             }
         }
@@ -89,20 +108,40 @@ class PNModeActivity : BaseActionBarActivity() {
         when (selectedOptionView) {
             null -> {
                 performTransition(R.drawable.pn_option_background_select_transition, backgroundPollingOptionView)
+                GlowViewUtilities.animateShadowColorChange(this, backgroundPollingOptionView, R.color.transparent, R.color.accent)
+                animateStrokeColorChange(backgroundPollingOptionView, R.color.pn_option_border, R.color.accent)
                 selectedOptionView = backgroundPollingOptionView
             }
             backgroundPollingOptionView -> {
                 performTransition(R.drawable.pn_option_background_deselect_transition, backgroundPollingOptionView)
+                GlowViewUtilities.animateShadowColorChange(this, backgroundPollingOptionView, R.color.accent, R.color.transparent)
+                animateStrokeColorChange(backgroundPollingOptionView, R.color.accent, R.color.pn_option_border)
                 selectedOptionView = null
             }
             fcmOptionView -> {
                 performTransition(R.drawable.pn_option_background_select_transition, backgroundPollingOptionView)
+                GlowViewUtilities.animateShadowColorChange(this, backgroundPollingOptionView, R.color.transparent, R.color.accent)
+                animateStrokeColorChange(backgroundPollingOptionView, R.color.pn_option_border, R.color.accent)
                 performTransition(R.drawable.pn_option_background_deselect_transition, fcmOptionView)
+                GlowViewUtilities.animateShadowColorChange(this, fcmOptionView, R.color.accent, R.color.transparent)
+                animateStrokeColorChange(fcmOptionView, R.color.accent, R.color.pn_option_border)
                 selectedOptionView = backgroundPollingOptionView
             }
         }
     }
 
+    private fun animateStrokeColorChange(bubble: PNModeView, @ColorRes startColorID: Int, @ColorRes endColorID: Int) {
+        val startColor = resources.getColorWithID(startColorID, theme)
+        val endColor = resources.getColorWithID(endColorID, theme)
+        val animation = ValueAnimator.ofObject(ArgbEvaluator(), startColor, endColor)
+        animation.duration = 250
+        animation.addUpdateListener { animator ->
+            val color = animator.animatedValue as Int
+            bubble.strokeColor = color
+        }
+        animation.start()
+    }
+
     private fun register() {
         if (selectedOptionView == null) {
             val dialog = AlertDialog.Builder(this)
@@ -111,7 +150,6 @@ class PNModeActivity : BaseActionBarActivity() {
             dialog.create().show()
             return
         }
-        val displayName = TextSecurePreferences.getProfileName(this)
         TextSecurePreferences.setHasSeenWelcomeScreen(this, true)
         TextSecurePreferences.setPromptedPushRegistration(this, true)
         TextSecurePreferences.setIsUsingFCM(this, (selectedOptionView == fcmOptionView))
diff --git a/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
index 7e3b641b12..fa96d6b2a1 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
@@ -16,10 +16,13 @@ import android.widget.LinearLayout
 import android.widget.RelativeLayout
 import android.widget.TextView
 import android.widget.Toast
+import androidx.annotation.ColorRes
 import kotlinx.android.synthetic.main.activity_path.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.loki.utilities.*
+import org.thoughtcrime.securesms.loki.views.GlowViewUtilities
+import org.thoughtcrime.securesms.loki.views.PathDotView
 import org.whispersystems.signalservice.loki.api.Snode
 import org.whispersystems.signalservice.loki.api.onionrequests.OnionRequestAPI
 
@@ -31,6 +34,7 @@ class PathActivity : PassphraseRequiredActionBarActivity() {
         super.onCreate(savedInstanceState, isReady)
         setContentView(R.layout.activity_path)
         supportActionBar!!.title = resources.getString(R.string.activity_path_title)
+        pathRowsContainer.disableClipping()
         learnMoreButton.setOnClickListener { learnMore() }
         update(false)
         registerObservers()
@@ -111,6 +115,7 @@ class PathActivity : PassphraseRequiredActionBarActivity() {
         val mainContainer = LinearLayout(this)
         mainContainer.orientation = LinearLayout.HORIZONTAL
         mainContainer.gravity = Gravity.CENTER_VERTICAL
+        mainContainer.disableClipping()
         val mainContainerLayoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT)
         mainContainer.layoutParams = mainContainerLayoutParams
         val lineView = LineView(this, location, dotAnimationStartDelay, dotAnimationRepeatInterval)
@@ -170,8 +175,9 @@ class PathActivity : PassphraseRequiredActionBarActivity() {
         private var dotAnimationRepeatInterval: Long = 0
 
         private val dotView by lazy {
-            val result = View(context)
+            val result = PathDotView(context)
             result.setBackgroundResource(R.drawable.accent_dot)
+            result.mainColor = resources.getColorWithID(R.color.accent, context.theme)
             result
         }
 
@@ -203,6 +209,7 @@ class PathActivity : PassphraseRequiredActionBarActivity() {
         }
 
         private fun setUpViewHierarchy() {
+            disableClipping()
             val lineView = View(context)
             lineView.setBackgroundColor(resources.getColorWithID(R.color.text, context.theme))
             val lineViewHeight = when (location) {
@@ -239,10 +246,14 @@ class PathActivity : PassphraseRequiredActionBarActivity() {
 
         private fun expand() {
             dotView.animateSizeChange(R.dimen.path_row_dot_size, R.dimen.path_row_expanded_dot_size)
+            @ColorRes val startColorID = if (UiModeUtilities.isDayUiMode(context)) R.color.transparent_black_30 else R.color.black
+            GlowViewUtilities.animateShadowColorChange(context, dotView, startColorID, R.color.accent)
         }
 
         private fun collapse() {
             dotView.animateSizeChange(R.dimen.path_row_expanded_dot_size, R.dimen.path_row_dot_size)
+            @ColorRes val endColorID = if (UiModeUtilities.isDayUiMode(context)) R.color.transparent_black_30 else R.color.black
+            GlowViewUtilities.animateShadowColorChange(context, dotView, R.color.accent, endColorID)
         }
     }
     // endregion
diff --git a/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
index 1a88113784..7e84023c17 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.loki.activities
 
+import android.Manifest
 import android.app.Activity
 import android.content.ClipData
 import android.content.ClipboardManager
@@ -38,6 +39,7 @@ import org.thoughtcrime.securesms.loki.utilities.fadeOut
 import org.thoughtcrime.securesms.loki.utilities.push
 import org.thoughtcrime.securesms.mms.GlideApp
 import org.thoughtcrime.securesms.mms.GlideRequests
+import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.profiles.AvatarHelper
 import org.thoughtcrime.securesms.profiles.ProfileMediaConstraints
 import org.thoughtcrime.securesms.util.BitmapDecodingException
@@ -52,10 +54,8 @@ import java.security.SecureRandom
 import java.util.*
 
 class SettingsActivity : PassphraseRequiredActionBarActivity() {
-
     private var displayNameEditActionMode: ActionMode? = null
         set(value) { field = value; handleDisplayNameEditActionModeChanged() }
-
     private lateinit var glide: GlideRequests
     private var displayNameToBeUploaded: String? = null
     private var profilePictureToBeUploaded: ByteArray? = null
@@ -71,17 +71,17 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
     // region Lifecycle
     override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
         super.onCreate(savedInstanceState, isReady)
-
         setContentView(R.layout.activity_settings)
-
+        val displayName = DatabaseFactory.getLokiUserDatabase(this).getDisplayName(hexEncodedPublicKey)
         glide = GlideApp.with(this)
         profilePictureView.glide = glide
         profilePictureView.publicKey = hexEncodedPublicKey
+        profilePictureView.displayName = displayName
         profilePictureView.isLarge = true
         profilePictureView.update()
         profilePictureView.setOnClickListener { showEditProfilePictureUI() }
         ctnGroupNameSection.setOnClickListener { startActionMode(DisplayNameEditActionModeCallback()) }
-        btnGroupNameDisplay.text = DatabaseFactory.getLokiUserDatabase(this).getDisplayName(hexEncodedPublicKey)
+        btnGroupNameDisplay.text = displayName
         publicKeyTextView.text = hexEncodedPublicKey
         copyButton.setOnClickListener { copyPublicKey() }
         shareButton.setOnClickListener { sharePublicKey() }
@@ -103,12 +103,9 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.settings_general, menu)
-
-        // Update UI mode menu icon.
-        // It uses three-level selector where each level corresponds to the related UiMode ordinal value.
+        // Update UI mode menu icon
         val uiMode = UiModeUtilities.getUserSelectedUiMode(this)
         menu.findItem(R.id.action_change_theme).icon!!.level = uiMode.ordinal
-
         return true
     }
 
@@ -153,6 +150,11 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
             }
         }
     }
+
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults)
+    }
     // endregion
 
     // region Updating
@@ -246,7 +248,13 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
     }
 
     private fun showEditProfilePictureUI() {
-        tempFile = AvatarSelection.startAvatarSelection(this, false, true)
+        // Ask for an optional camera permission.
+        Permissions.with(this)
+                .request(Manifest.permission.CAMERA)
+                .onAnyResult {
+                    tempFile = AvatarSelection.startAvatarSelection(this, false, true)
+                }
+                .execute()
     }
 
     private fun copyPublicKey() {
diff --git a/src/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt b/src/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt
index e4eb12df94..1cd4cce00f 100644
--- a/src/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt
+++ b/src/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt
@@ -15,7 +15,7 @@ import java.util.concurrent.TimeUnit
 class BackgroundPollWorker : PersistentAlarmManagerListener() {
 
     companion object {
-        private val pollInterval = TimeUnit.MINUTES.toMillis(15)
+        private val pollInterval = TimeUnit.MINUTES.toMillis(30)
 
         @JvmStatic
         fun schedule(context: Context) {
diff --git a/src/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt b/src/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt
index 236ffb6fe3..634ec24556 100644
--- a/src/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt
+++ b/src/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt
@@ -33,8 +33,14 @@ class LokiUserDatabase(context: Context, helper: SQLCipherOpenHelper) : Database
             return TextSecurePreferences.getProfileName(context)
         } else {
             val database = databaseHelper.readableDatabase
-            return database.get(displayNameTable, "${Companion.publicKey} = ?", arrayOf( publicKey )) { cursor ->
+            val result = database.get(displayNameTable, "${Companion.publicKey} = ?", arrayOf( publicKey )) { cursor ->
                 cursor.getString(cursor.getColumnIndexOrThrow(displayName))
+            } ?: return null
+            val suffix = " (...${publicKey.substring(publicKey.count() - 8)})"
+            if (result.endsWith(suffix)) {
+                return result.substring(0..(result.count() - suffix.count()))
+            } else {
+                return result
             }
         }
     }
diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt b/src/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt
index 828a67fa87..f803e0fced 100644
--- a/src/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt
+++ b/src/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt
@@ -20,6 +20,7 @@ public class ConversationOptionsBottomSheet : BottomSheetDialogFragment() {
     // if we want to use dialog fragments properly.
     lateinit var recipient: Recipient
 
+    var onViewDetailsTapped: (() -> Unit?)? = null
     var onBlockTapped: (() -> Unit)? = null
     var onUnblockTapped: (() -> Unit)? = null
     var onDeleteTapped: (() -> Unit)? = null
@@ -30,18 +31,16 @@ public class ConversationOptionsBottomSheet : BottomSheetDialogFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-
-        if (!this::recipient.isInitialized) {
-            dismiss()
-            return
-        }
-
+        if (!this::recipient.isInitialized) { return dismiss() }
         if (!recipient.isGroupRecipient && !recipient.isLocalNumber) {
+            detailsTextView.visibility = View.VISIBLE
             unblockTextView.visibility = if (recipient.isBlocked) View.VISIBLE else View.GONE
             blockTextView.visibility = if (recipient.isBlocked) View.GONE else View.VISIBLE
-
+            detailsTextView.setOnClickListener { onViewDetailsTapped?.invoke() }
             blockTextView.setOnClickListener { onBlockTapped?.invoke() }
             unblockTextView.setOnClickListener { onUnblockTapped?.invoke() }
+        } else {
+            detailsTextView.visibility = View.GONE
         }
         deleteTextView.setOnClickListener { onDeleteTapped?.invoke() }
     }
diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt b/src/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt
index a52e08f606..097342332c 100644
--- a/src/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt
+++ b/src/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt
@@ -7,17 +7,18 @@ import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
-import androidx.fragment.app.DialogFragment
-import androidx.appcompat.app.AlertDialog
 import android.view.LayoutInflater
+import android.view.WindowManager
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
 import kotlinx.android.synthetic.main.dialog_seed.view.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
 import org.thoughtcrime.securesms.loki.utilities.MnemonicUtilities
 import org.whispersystems.signalservice.loki.crypto.MnemonicCodec
 import org.whispersystems.signalservice.loki.utilities.hexEncodedPrivateKey
-import java.io.File
+
 
 class SeedDialog : DialogFragment() {
 
diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt b/src/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt
new file mode 100644
index 0000000000..3d884f7440
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt
@@ -0,0 +1,40 @@
+package org.thoughtcrime.securesms.loki.dialogs
+
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.os.Bundle
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import kotlinx.android.synthetic.main.fragment_user_details_bottom_sheet.*
+import kotlinx.android.synthetic.main.view_conversation.view.*
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.mms.GlideApp
+
+public class UserDetailsBottomSheet : BottomSheetDialogFragment() {
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_user_details_bottom_sheet, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        val publicKey = arguments?.getString("publicKey") ?: return dismiss()
+        profilePictureView.publicKey = publicKey
+        profilePictureView.glide = GlideApp.with(this)
+        profilePictureView.isLarge = true
+        profilePictureView.update()
+        nameTextView.text = DatabaseFactory.getLokiUserDatabase(requireContext()).getDisplayName(publicKey) ?: "Anonymous"
+        publicKeyTextView.text = publicKey
+        copyButton.setOnClickListener {
+            val clipboard = requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+            val clip = ClipData.newPlainText("Session ID", publicKey)
+            clipboard.setPrimaryClip(clip)
+            Toast.makeText(requireContext(), R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupUpdateMessageSendJob.kt b/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupUpdateMessageSendJob.kt
index 2c0f4ef702..57310ee18d 100644
--- a/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupUpdateMessageSendJob.kt
+++ b/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupUpdateMessageSendJob.kt
@@ -132,7 +132,6 @@ class ClosedGroupUpdateMessageSendJob private constructor(parameters: Parameters
                     useFallbackEncryption, false, false)
         } catch (e: Exception) {
             Log.d("Loki", "Failed to send closed group update message to: $destination due to error: $e.")
-            throw e
         }
     }
 
diff --git a/src/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt b/src/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt
index a7acaa25fe..9f9a38427d 100644
--- a/src/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt
+++ b/src/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt
@@ -10,7 +10,6 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.whispersystems.signalservice.api.messages.SignalServiceContent
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage
-import org.whispersystems.signalservice.loki.protocol.shelved.multidevice.MultiDeviceProtocol
 import java.security.MessageDigest
 
 object SessionMetaProtocol {
@@ -37,24 +36,16 @@ object SessionMetaProtocol {
 
     @JvmStatic
     fun handleProfileUpdateIfNeeded(context: Context, content: SignalServiceContent) {
-        val rawDisplayName = content.senderDisplayName.orNull() ?: return
-        if (rawDisplayName.isBlank()) { return }
+        val displayName = content.senderDisplayName.orNull() ?: return
+        if (displayName.isBlank()) { return }
         val userPublicKey = TextSecurePreferences.getLocalNumber(context)
         val userMasterPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(context)
         val sender = content.sender.toLowerCase()
         if (userMasterPublicKey == sender) {
             // Update the user's local name if the message came from their master device
-            TextSecurePreferences.setProfileName(context, rawDisplayName)
-        }
-        // Don't overwrite if the message came from a linked device; the device name is
-        // stored as a user name
-        val allUserDevices = MultiDeviceProtocol.shared.getAllLinkedDevices(userPublicKey)
-        if (!allUserDevices.contains(sender)) {
-            val displayName = rawDisplayName + " (..." + sender.substring(sender.length - 8) + ")"
-            DatabaseFactory.getLokiUserDatabase(context).setDisplayName(sender, displayName)
-        } else {
-            DatabaseFactory.getLokiUserDatabase(context).setDisplayName(sender, rawDisplayName)
+            TextSecurePreferences.setProfileName(context, displayName)
         }
+        DatabaseFactory.getLokiUserDatabase(context).setDisplayName(sender, displayName)
     }
 
     @JvmStatic
diff --git a/src/org/thoughtcrime/securesms/loki/todo/IdenticonDrawable.kt b/src/org/thoughtcrime/securesms/loki/todo/IdenticonDrawable.kt
deleted file mode 100644
index bbc6ee088e..0000000000
--- a/src/org/thoughtcrime/securesms/loki/todo/IdenticonDrawable.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.thoughtcrime.securesms.loki.todo
-
-import android.graphics.*
-import android.graphics.drawable.Drawable
-
-/**
- * Basically a [Bitmap] wrapper, the [Bitmap] size must be known when instantiating it
- * but when drawing it will draw the [Bitmap] to fit the canvas.
- */
-abstract class IdenticonDrawable(width: Int, height: Int, hash: Long) : Drawable() {
-  private val bitmapRect: Rect = Rect(0, 0, width, height)
-  private val destinationRect: Rect = Rect(0, 0, width, height)
-  private val bitmap: Bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
-  private val canvas: Canvas = Canvas(bitmap)
-  private val bitmapPaint = Paint(Paint.ANTI_ALIAS_FLAG)
-
-  var hash: Long = hash
-    set(value) {
-      field = value
-      onSetHash(value)
-      invalidateBitmap()
-    }
-
-  protected fun invalidateBitmap() {
-    drawBitmap(canvas)
-    invalidateSelf()
-  }
-
-  protected abstract fun drawBitmap(canvas: Canvas)
-
-  protected open fun onSetHash(newHash: Long) = Unit
-
-  override fun draw(canvas: Canvas) {
-    destinationRect.set(0, 0, canvas.width, canvas.height)
-    canvas.drawBitmap(bitmap, bitmapRect, destinationRect, bitmapPaint)
-  }
-
-  override fun setAlpha(i: Int) {
-    bitmapPaint.alpha = i
-  }
-
-  override fun setColorFilter(colorFilter: ColorFilter?) {
-    bitmapPaint.colorFilter = colorFilter
-  }
-
-  override fun getOpacity(): Int {
-    return bitmapPaint.alpha
-  }
-}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/todo/JazzIdenticonContactPhoto.kt b/src/org/thoughtcrime/securesms/loki/todo/JazzIdenticonContactPhoto.kt
deleted file mode 100644
index a26751ad48..0000000000
--- a/src/org/thoughtcrime/securesms/loki/todo/JazzIdenticonContactPhoto.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.thoughtcrime.securesms.loki.todo
-
-import android.content.Context
-import android.graphics.drawable.Drawable
-import androidx.appcompat.content.res.AppCompatResources
-import network.loki.messenger.R
-import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto
-
-class JazzIdenticonContactPhoto(val hexEncodedPublicKey: String) : FallbackContactPhoto {
-  override fun asDrawable(context: Context, color: Int): Drawable {
-    return asDrawable(context, color, false)
-  }
-
-  override fun asDrawable(context: Context, color: Int, inverted: Boolean): Drawable {
-    val targetSize = context.resources.getDimensionPixelSize(R.dimen.contact_photo_target_size)
-    return JazzIdenticonDrawable(targetSize, targetSize, hexEncodedPublicKey)
-  }
-
-  override fun asCallCard(context: Context): Drawable? {
-    return AppCompatResources.getDrawable(context, R.drawable.ic_person_large)
-  }
-}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/todo/JazzIdenticonDrawable.kt b/src/org/thoughtcrime/securesms/loki/todo/JazzIdenticonDrawable.kt
deleted file mode 100644
index d3cb71ccb3..0000000000
--- a/src/org/thoughtcrime/securesms/loki/todo/JazzIdenticonDrawable.kt
+++ /dev/null
@@ -1,132 +0,0 @@
-package org.thoughtcrime.securesms.loki.todo
-
-import android.graphics.Canvas
-import android.graphics.Color
-import android.graphics.Paint
-import kotlin.math.*
-
-class JazzIdenticonDrawable(width: Int, height: Int, hash: Long) : IdenticonDrawable(width, height, hash) {
-
-  constructor(width: Int, height: Int, hashString: String): this(width, height, 0) {
-    val hexRegex = Regex("^[0-9A-Fa-f]+\$")
-    if (hashString.length >= 12 && hashString.matches(hexRegex)) {
-      hash = hashString.substring(0 until 12).toLong(16)
-    }
-  }
-
-  companion object {
-    var colors = listOf(
-            "#01888c", // teal
-            "#fc7500", // bright orange
-            "#034f5d", // dark teal
-            "#E784BA", // light pink
-            "#81C8B6", // bright green
-            "#c7144c", // raspberry
-            "#f3c100", // goldenrod
-            "#1598f2", // lightning blue
-            "#2465e1", // sail blue
-            "#f19e02"  // gold
-    ).map{ Color.parseColor(it) }
-  }
-
-  private var generator: RNG = RNG(hash)
-  private val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.FILL }
-
-  // Settings
-  private val wobble: Float = 30f
-  private val shapeCount = 4
-
-  init {
-    invalidateBitmap()
-  }
-
-  override fun onSetHash(newHash: Long) {
-    super.onSetHash(newHash)
-    generator = RNG(newHash)
-    invalidateBitmap()
-  }
-
-  override fun drawBitmap(canvas: Canvas) {
-    generator.reset()
-
-    val newColors = hueShift(colors)
-    val shuffled = shuffleList(newColors)
-
-    canvas.drawColor(shuffled[0])
-    for (i in 0 until shapeCount) {
-      drawSquare(canvas, shuffled[i + 1], i, shapeCount - 1)
-    }
-  }
-
-  private fun drawSquare(canvas: Canvas, color: Int, index: Int, total: Int) {
-    val size = min(canvas.width, canvas.height)
-    val center = (size / 2).toFloat()
-    val firstRotation = generator.nextFloat()
-    val angle = PI * 2 * firstRotation
-
-    val a = size / total.toFloat()
-    val b = generator.nextFloat()
-    val c = index.toFloat() * a
-    val velocity = a * b + c
-
-    val tx = cos(angle) * velocity
-    val ty = sin(angle) * velocity
-
-    // Third random is a shape rotation on top of all that
-    val secondRotation = generator.nextFloat()
-    val rotation = (firstRotation * 360f) + (secondRotation * 180f)
-
-    // Paint it!
-    canvas.save()
-
-    paint.color = color
-    canvas.translate(tx.toFloat(), ty.toFloat())
-    canvas.rotate(rotation.round(1), center, center)
-    canvas.drawRect(0f, 0f, canvas.width.toFloat(), canvas.height.toFloat(), paint)
-
-    canvas.restore()
-  }
-
-  private fun hueShift(colors: List<Int>): List<Int> {
-    val amount = generator.nextFloat() * 30 - wobble / 2
-
-    return colors.map { color ->
-      val red = Color.red(color)
-      val green = Color.green(color)
-      val blue = Color.blue(color)
-
-      val hsv = FloatArray(3)
-      Color.RGBToHSV(red, green, blue, hsv)
-
-      // Normalise between 0 and 360
-      var newHue = hsv[0] + round(amount)
-      if (newHue < 0) { newHue += 360 }
-      if (newHue > 360) { newHue -= 360 }
-
-      hsv[0] = newHue
-      Color.HSVToColor(hsv)
-    }
-  }
-
-  private fun <T> shuffleList(list: List<T>): List<T> {
-    var currentIndex = list.count()
-    val newList = list.toMutableList()
-    while (currentIndex > 0) {
-      val randomIndex = generator.next().toInt() % currentIndex
-      currentIndex -= 1
-
-      // Swap
-      val temp = newList[currentIndex]
-      newList[currentIndex] = newList[randomIndex]
-      newList[randomIndex] = temp
-    }
-
-    return newList
-  }
-}
-
-private fun Float.round(decimals: Int): Float {
-  var multiplier = 1f
-  repeat(decimals) { multiplier *= 10 }
-  return round(this * multiplier) / multiplier
-}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/todo/RNG.kt b/src/org/thoughtcrime/securesms/loki/todo/RNG.kt
deleted file mode 100644
index e9e3dee898..0000000000
--- a/src/org/thoughtcrime/securesms/loki/todo/RNG.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.thoughtcrime.securesms.loki.todo
-
-class RNG(hash: Long) {
-  private var seed: Long
-  private val initial: Long
-
-  private val maxInt32 = Int.MAX_VALUE.toLong()
-
-  init {
-    seed = hash % maxInt32
-    if (seed <= 0) {
-      seed = maxInt32 - 1
-    }
-    initial = seed
-  }
-
-  fun next(): Long {
-    val newSeed = (seed * 16807) % maxInt32
-    seed = newSeed
-    return seed
-  }
-
-  fun nextFloat(): Float {
-    return (next() - 1).toFloat() / (maxInt32 - 1)
-  }
-
-  fun reset() {
-    seed = initial
-  }
-}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/utilities/AvatarPlaceholderGenerator.kt b/src/org/thoughtcrime/securesms/loki/utilities/AvatarPlaceholderGenerator.kt
new file mode 100644
index 0000000000..da4347af9f
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/utilities/AvatarPlaceholderGenerator.kt
@@ -0,0 +1,79 @@
+package org.thoughtcrime.securesms.loki.utilities
+
+import android.content.Context
+import android.graphics.*
+import android.graphics.drawable.BitmapDrawable
+import android.text.TextPaint
+import android.text.TextUtils
+import androidx.annotation.ColorInt
+import androidx.core.graphics.ColorUtils
+import network.loki.messenger.R
+import java.util.*
+
+object AvatarPlaceholderGenerator {
+    private val tmpFloatArray = FloatArray(3)
+
+    private const val EMPTY_LABEL = "0";
+
+    fun generate(context: Context, pixelSize: Int, hashString: String, displayName: String?): BitmapDrawable {
+        //TODO That should be replaced with a proper hash extraction code.
+        val hash: Long
+        if (hashString.length >= 12 && hashString.matches(Regex("^[0-9A-Fa-f]+\$"))) {
+            hash = hashString.substring(0 until 12).toLong(16)
+        } else {
+            hash = 0
+        }
+
+        // Do not cache color array, it may be different depends on the current theme.
+        val colorArray = context.resources.getIntArray(R.array.profile_picture_placeholder_colors)
+        val colorPrimary = colorArray[(hash % colorArray.size).toInt()]
+        val colorSecondary = changeColorHueBy(colorPrimary, 12f)
+
+        val labelText = when {
+            !TextUtils.isEmpty(displayName) -> extractLabel(displayName!!.capitalize())
+            !TextUtils.isEmpty(hashString) -> extractLabel(hashString)
+            else -> EMPTY_LABEL
+        }
+
+        val bitmap = Bitmap.createBitmap(pixelSize, pixelSize, Bitmap.Config.ARGB_8888)
+        val canvas = Canvas(bitmap)
+
+        // Draw background/frame
+        val paint = Paint(Paint.ANTI_ALIAS_FLAG)
+        paint.shader = LinearGradient(0f, 0f, 0f, pixelSize.toFloat(),
+                colorPrimary,
+                colorPrimary,
+                Shader.TileMode.REPEAT)
+        canvas.drawCircle(pixelSize.toFloat() / 2, pixelSize.toFloat() / 2, pixelSize.toFloat() / 2, paint)
+
+        // Draw text
+        val textPaint = TextPaint(Paint.ANTI_ALIAS_FLAG)
+        textPaint.typeface = Typeface.create(Typeface.DEFAULT, Typeface.NORMAL)
+        textPaint.textSize = pixelSize * 0.5f
+        textPaint.color = Color.WHITE
+        val areaRect = Rect(0, 0, pixelSize, pixelSize)
+        val textBounds = RectF(areaRect)
+        textBounds.right = textPaint.measureText(labelText)
+        textBounds.bottom = textPaint.descent() - textPaint.ascent()
+        textBounds.left += (areaRect.width() - textBounds.right) * 0.5f
+        textBounds.top += (areaRect.height() - textBounds.bottom) * 0.5f
+        canvas.drawText(labelText, textBounds.left, textBounds.top - textPaint.ascent(), textPaint)
+
+        return BitmapDrawable(context.resources, bitmap)
+    }
+
+    @ColorInt
+    private fun changeColorHueBy(@ColorInt color: Int, hueDelta: Float): Int {
+        val hslColor = tmpFloatArray
+        ColorUtils.colorToHSL(color, hslColor)
+        hslColor[0] = (hslColor[0] + hueDelta) % 360f
+        return ColorUtils.HSLToColor(hslColor)
+    }
+
+    private fun extractLabel(content: String): String {
+        var content = content.trim()
+        if (content.isEmpty()) return EMPTY_LABEL
+
+        return content.first().toString().toUpperCase(Locale.ROOT)
+    }
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/utilities/MentionUtilities.kt b/src/org/thoughtcrime/securesms/loki/utilities/MentionUtilities.kt
index 203e74a478..bf32a41183 100644
--- a/src/org/thoughtcrime/securesms/loki/utilities/MentionUtilities.kt
+++ b/src/org/thoughtcrime/securesms/loki/utilities/MentionUtilities.kt
@@ -53,7 +53,9 @@ object MentionUtilities {
         }
         val result = SpannableString(text)
         for (mention in mentions) {
-            result.setSpan(ForegroundColorSpan(context.resources.getColorWithID(R.color.accent, context.theme)), mention.first.lower, mention.first.upper, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+            val isLightMode = UiModeUtilities.isDayUiMode(context)
+            val colorID = if (isLightMode && isOutgoingMessage) R.color.black else R.color.accent
+            result.setSpan(ForegroundColorSpan(context.resources.getColorWithID(colorID, context.theme)), mention.first.lower, mention.first.upper, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
             result.setSpan(StyleSpan(Typeface.BOLD), mention.first.lower, mention.first.upper, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
         }
         return result
diff --git a/src/org/thoughtcrime/securesms/loki/views/ConversationView.kt b/src/org/thoughtcrime/securesms/loki/views/ConversationView.kt
index 382ac63a84..f51850db6f 100644
--- a/src/org/thoughtcrime/securesms/loki/views/ConversationView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/ConversationView.kt
@@ -2,12 +2,14 @@ package org.thoughtcrime.securesms.loki.views
 
 import android.content.Context
 import android.graphics.Typeface
+import android.text.TextUtils
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.LinearLayout
 import kotlinx.android.synthetic.main.view_conversation.view.*
 import network.loki.messenger.R
+import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.model.ThreadRecord
 import org.thoughtcrime.securesms.loki.utilities.MentionManagerUtilities.populateUserPublicKeyCacheIfNeeded
 import org.thoughtcrime.securesms.loki.utilities.MentionUtilities.highlightMentions
@@ -55,30 +57,8 @@ class ConversationView : LinearLayout {
             accentView.setBackgroundResource(R.color.accent)
             accentView.visibility = if (thread.unreadCount > 0) View.VISIBLE else View.INVISIBLE
         }
-        if (thread.recipient.isGroupRecipient) {
-            if ("Session Public Chat" == thread.recipient.name) {
-                profilePictureView.publicKey = ""
-                profilePictureView.additionalPublicKey = null
-                profilePictureView.isRSSFeed = true
-            } else {
-                val users = MentionsManager.shared.userPublicKeyCache[thread.threadId]?.toMutableList() ?: mutableListOf()
-                users.remove(TextSecurePreferences.getLocalNumber(context))
-                val masterPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(context)
-                if (masterPublicKey != null) {
-                    users.remove(masterPublicKey)
-                }
-                val randomUsers = users.sorted() // Sort to provide a level of stability
-                profilePictureView.publicKey = randomUsers.getOrNull(0) ?: ""
-                profilePictureView.additionalPublicKey = randomUsers.getOrNull(1) ?: ""
-                profilePictureView.isRSSFeed = thread.recipient.name == "Loki News" || thread.recipient.name == "Session Updates"
-            }
-        } else {
-            profilePictureView.publicKey = thread.recipient.address.toString()
-            profilePictureView.additionalPublicKey = null
-            profilePictureView.isRSSFeed = false
-        }
         profilePictureView.glide = glide
-        profilePictureView.update()
+        profilePictureView.update(thread.recipient, thread.threadId)
         val senderDisplayName = if (thread.recipient.isLocalNumber) context.getString(R.string.note_to_self) else if (!thread.recipient.name.isNullOrEmpty()) thread.recipient.name else thread.recipient.address.toString()
         btnGroupNameDisplay.text = senderDisplayName
         timestampTextView.text = DateUtils.getBriefRelativeTimeSpanString(context, Locale.getDefault(), thread.date)
@@ -103,5 +83,10 @@ class ConversationView : LinearLayout {
             else -> statusIndicatorImageView.setImageResource(R.drawable.ic_circle_check)
         }
     }
+
+    private fun getUserDisplayName(publicKey: String?): String? {
+        if (TextUtils.isEmpty(publicKey)) return null
+        return DatabaseFactory.getLokiUserDatabase(context).getDisplayName(publicKey!!)
+    }
     // endregion
 }
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/views/FakeChatView.kt b/src/org/thoughtcrime/securesms/loki/views/FakeChatView.kt
index 60b0585715..017f55d353 100644
--- a/src/org/thoughtcrime/securesms/loki/views/FakeChatView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/FakeChatView.kt
@@ -1,14 +1,18 @@
 package org.thoughtcrime.securesms.loki.views
 
+import android.animation.FloatEvaluator
+import android.animation.ValueAnimator
 import android.content.Context
 import android.content.Context.LAYOUT_INFLATER_SERVICE
 import android.os.Handler
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
+import android.widget.LinearLayout
 import android.widget.ScrollView
 import kotlinx.android.synthetic.main.view_fake_chat.view.*
 import network.loki.messenger.R
+import org.thoughtcrime.securesms.loki.utilities.disableClipping
 
 class FakeChatView : ScrollView {
 
@@ -38,7 +42,8 @@ class FakeChatView : ScrollView {
 
     private fun setUpViewHierarchy() {
         val inflater = context.getSystemService(LAYOUT_INFLATER_SERVICE) as LayoutInflater
-        val contentView = inflater.inflate(R.layout.view_fake_chat, null)
+        val contentView = inflater.inflate(R.layout.view_fake_chat, null) as LinearLayout
+        contentView.disableClipping()
         addView(contentView)
         isVerticalScrollBarEnabled = false
     }
@@ -47,8 +52,13 @@ class FakeChatView : ScrollView {
     // region Animation
     fun startAnimating() {
         listOf( bubble1, bubble2, bubble3, bubble4, bubble5 ).forEach { it.alpha = 0.0f }
-        fun show(view: View) {
-            view.animate().alpha(1.0f).setDuration(animationDuration).start()
+        fun show(bubble: View) {
+            val animation = ValueAnimator.ofObject(FloatEvaluator(), 0.0f, 1.0f)
+            animation.duration = animationDuration
+            animation.addUpdateListener { animator ->
+                bubble.alpha = animator.animatedValue as Float
+            }
+            animation.start()
         }
         Handler().postDelayed({
             show(bubble1)
diff --git a/src/org/thoughtcrime/securesms/loki/views/GlowView.kt b/src/org/thoughtcrime/securesms/loki/views/GlowView.kt
new file mode 100644
index 0000000000..e48a67fbc9
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/views/GlowView.kt
@@ -0,0 +1,158 @@
+package org.thoughtcrime.securesms.loki.views
+
+import android.animation.ArgbEvaluator
+import android.animation.ValueAnimator
+import android.content.Context
+import android.graphics.*
+import android.util.AttributeSet
+import android.view.View
+import android.view.ViewOutlineProvider
+import android.widget.LinearLayout
+import androidx.annotation.ColorInt
+import androidx.annotation.ColorRes
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.loki.utilities.getColorWithID
+import org.thoughtcrime.securesms.loki.utilities.toPx
+
+interface GlowView {
+    var mainColor: Int
+    var sessionShadowColor: Int
+}
+
+object GlowViewUtilities {
+
+    fun animateColorChange(context: Context, view: GlowView, @ColorRes startColorID: Int, @ColorRes endColorID: Int) {
+        val startColor = context.resources.getColorWithID(startColorID, context.theme)
+        val endColor = context.resources.getColorWithID(endColorID, context.theme)
+        val animation = ValueAnimator.ofObject(ArgbEvaluator(), startColor, endColor)
+        animation.duration = 250
+        animation.addUpdateListener { animator ->
+            val color = animator.animatedValue as Int
+            view.mainColor = color
+        }
+        animation.start()
+    }
+
+    fun animateShadowColorChange(context: Context, view: GlowView, @ColorRes startColorID: Int, @ColorRes endColorID: Int) {
+        val startColor = context.resources.getColorWithID(startColorID, context.theme)
+        val endColor = context.resources.getColorWithID(endColorID, context.theme)
+        val animation = ValueAnimator.ofObject(ArgbEvaluator(), startColor, endColor)
+        animation.duration = 250
+        animation.addUpdateListener { animator ->
+            val color = animator.animatedValue as Int
+            view.sessionShadowColor = color
+        }
+        animation.start()
+    }
+}
+
+class PNModeView : LinearLayout, GlowView {
+    @ColorInt override var mainColor: Int = 0
+        set(newValue) { field = newValue; paint.color = newValue }
+    @ColorInt var strokeColor: Int = 0
+        set(newValue) { field = newValue; strokePaint.color = newValue }
+    @ColorInt override var sessionShadowColor: Int = 0
+        set(newValue) { field = newValue; paint.setShadowLayer(toPx(4, resources).toFloat(), 0.0f, 0.0f, newValue) }
+
+    private val paint: Paint by lazy {
+        val result = Paint()
+        result.style = Paint.Style.FILL
+        result.isAntiAlias = true
+        result
+    }
+
+    private val strokePaint: Paint by lazy {
+        val result = Paint()
+        result.style = Paint.Style.STROKE
+        result.isAntiAlias = true
+        result.strokeWidth = toPx(1, resources).toFloat()
+        result
+    }
+
+    // region Lifecycle
+    constructor(context: Context) : super(context) { }
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) { }
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) { }
+
+    init {
+        setWillNotDraw(false)
+    }
+    // endregion
+
+    // region Updating
+    override fun onDraw(c: Canvas) {
+        val w = width.toFloat()
+        val h = height.toFloat()
+        val r = resources.getDimension(R.dimen.pn_option_corner_radius)
+        c.drawRoundRect(0.0f, 0.0f, w, h, r, r, paint)
+        c.drawRoundRect(0.0f, 0.0f, w, h, r, r, strokePaint)
+        super.onDraw(c)
+    }
+    // endregion
+}
+
+class NewConversationButtonImageView : androidx.appcompat.widget.AppCompatImageView, GlowView {
+    @ColorInt override var mainColor: Int = 0
+    set(newValue) { field = newValue; paint.color = newValue }
+    @ColorInt override var sessionShadowColor: Int = 0
+    set(newValue) { field = newValue; paint.setShadowLayer(toPx(6, resources).toFloat(), 0.0f, 0.0f, newValue) }
+
+    private val paint: Paint by lazy {
+        val result = Paint()
+        result.style = Paint.Style.FILL
+        result.isAntiAlias = true
+        result
+    }
+
+    // region Lifecycle
+    constructor(context: Context) : super(context) { }
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) { }
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) { }
+
+    init {
+        setWillNotDraw(false)
+    }
+    // endregion
+
+    // region Updating
+    override fun onDraw(c: Canvas) {
+        val w = width.toFloat()
+        val h = height.toFloat()
+        c.drawCircle(w / 2, h / 2, w / 2, paint)
+        super.onDraw(c)
+    }
+    // endregion
+}
+
+class PathDotView : View, GlowView {
+    @ColorInt override var mainColor: Int = 0
+        set(newValue) { field = newValue; paint.color = newValue }
+    @ColorInt override var sessionShadowColor: Int = 0
+        set(newValue) { field = newValue; paint.setShadowLayer(toPx(4, resources).toFloat(), 0.0f, 0.0f, newValue) }
+
+    private val paint: Paint by lazy {
+        val result = Paint()
+        result.style = Paint.Style.FILL
+        result.isAntiAlias = true
+        result
+    }
+
+    // region Lifecycle
+    constructor(context: Context) : super(context) { }
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) { }
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) { }
+
+    init {
+        setWillNotDraw(false)
+    }
+    // endregion
+
+    // region Updating
+    override fun onDraw(c: Canvas) {
+        val w = width.toFloat()
+        val h = height.toFloat()
+        c.drawCircle(w / 2, h / 2, w / 2, paint)
+        super.onDraw(c)
+    }
+    // endregion
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/views/LabeledSeparatorView.kt b/src/org/thoughtcrime/securesms/loki/views/LabeledSeparatorView.kt
index 028dd34a49..4cbc83dc7b 100644
--- a/src/org/thoughtcrime/securesms/loki/views/LabeledSeparatorView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/LabeledSeparatorView.kt
@@ -16,7 +16,7 @@ class LabeledSeparatorView : RelativeLayout {
 
     private val path = Path()
 
-    private val paint: Paint by lazy{
+    private val paint: Paint by lazy {
         val result = Paint()
         result.style = Paint.Style.STROKE
         result.color = ThemeUtil.getThemedColor(context, R.attr.dividerHorizontal)
diff --git a/src/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt b/src/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt
index 1e6a0d057c..a9b62a5fd9 100644
--- a/src/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt
@@ -32,6 +32,7 @@ class MentionCandidateView(context: Context, attrs: AttributeSet?, defStyleAttr:
     private fun update() {
         btnGroupNameDisplay.text = mentionCandidate.displayName
         profilePictureView.publicKey = mentionCandidate.publicKey
+        profilePictureView.displayName = mentionCandidate.displayName
         profilePictureView.additionalPublicKey = null
         profilePictureView.isRSSFeed = false
         profilePictureView.glide = glide!!
diff --git a/src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt b/src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt
index e46f82e376..e4578e5fa9 100644
--- a/src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt
@@ -7,9 +7,7 @@ import android.animation.ValueAnimator
 import android.content.Context
 import android.content.Context.VIBRATOR_SERVICE
 import android.content.res.ColorStateList
-import android.graphics.Color
 import android.graphics.PointF
-import android.graphics.drawable.GradientDrawable
 import android.os.Build
 import android.os.VibrationEffect
 import android.os.VibrationEffect.DEFAULT_AMPLITUDE
@@ -31,10 +29,10 @@ class NewConversationButtonSetView : RelativeLayout {
     var delegate: NewConversationButtonSetViewDelegate? = null
 
     // region Convenience
-    private val sessionButtonExpandedPosition: PointF get() { return PointF(width.toFloat() / 2 - sessionButton.expandedSize / 2, 0.0f) }
-    private val closedGroupButtonExpandedPosition: PointF get() { return PointF(width.toFloat() - closedGroupButton.expandedSize, height.toFloat() - bottomMargin - closedGroupButton.expandedSize) }
-    private val openGroupButtonExpandedPosition: PointF get() { return PointF(0.0f, height.toFloat() - bottomMargin - openGroupButton.expandedSize) }
-    private val buttonRestPosition: PointF get() { return PointF(width.toFloat() / 2 - mainButton.expandedSize / 2, height.toFloat() - bottomMargin - mainButton.expandedSize) }
+    private val sessionButtonExpandedPosition: PointF get() { return PointF(width.toFloat() / 2 - sessionButton.expandedSize / 2 - sessionButton.shadowMargin, 0.0f) }
+    private val closedGroupButtonExpandedPosition: PointF get() { return PointF(width.toFloat() - closedGroupButton.expandedSize - 2 * closedGroupButton.shadowMargin, height.toFloat() - bottomMargin - closedGroupButton.expandedSize - 2 * closedGroupButton.shadowMargin) }
+    private val openGroupButtonExpandedPosition: PointF get() { return PointF(0.0f, height.toFloat() - bottomMargin - openGroupButton.expandedSize - 2 * openGroupButton.shadowMargin) }
+    private val buttonRestPosition: PointF get() { return PointF(width.toFloat() / 2 - mainButton.expandedSize / 2 - mainButton.shadowMargin, height.toFloat() - bottomMargin - mainButton.expandedSize - 2 * mainButton.shadowMargin) }
     // endregion
 
     // region Settings
@@ -62,28 +60,30 @@ class NewConversationButtonSetView : RelativeLayout {
 
         val expandedSize by lazy { resources.getDimension(R.dimen.new_conversation_button_expanded_size) }
         val collapsedSize by lazy { resources.getDimension(R.dimen.new_conversation_button_collapsed_size) }
-        private val expandedImageViewPosition by lazy { PointF(0.0f, 0.0f) }
-        private val collapsedImageViewPosition by lazy { PointF((expandedSize - collapsedSize) / 2, (expandedSize - collapsedSize) / 2) }
+        val shadowMargin by lazy { toPx(6, resources).toFloat() }
+        private val expandedImageViewPosition by lazy { PointF(shadowMargin, shadowMargin) }
+        private val collapsedImageViewPosition by lazy { PointF(shadowMargin + (expandedSize - collapsedSize) / 2, shadowMargin + (expandedSize - collapsedSize) / 2) }
 
         private val imageView by lazy {
-            val result = ImageView(context)
+            val result = NewConversationButtonImageView(context)
             val size = collapsedSize.toInt()
             result.layoutParams = LayoutParams(size, size)
             result.setBackgroundResource(R.drawable.new_conversation_button_background)
-            val background = result.background as GradientDrawable
-            @ColorRes val backgroundColorID = if (isMain)
-                R.color.accent else
-                R.color.new_conversation_button_collapsed_background
-            background.color = ColorStateList.valueOf(resources.getColorWithID(backgroundColorID, context.theme))
+            @ColorRes val backgroundColorID = if (isMain) R.color.accent else R.color.new_conversation_button_collapsed_background
+            @ColorRes val shadowColorID = if (isMain) {
+                R.color.new_conversation_button_shadow
+            } else {
+                if (UiModeUtilities.isDayUiMode(context)) R.color.transparent_black_30 else R.color.black
+            }
+            result.mainColor = resources.getColorWithID(backgroundColorID, context.theme)
+            result.sessionShadowColor = resources.getColorWithID(shadowColorID, context.theme)
             result.scaleType = ImageView.ScaleType.CENTER
             result.setImageResource(iconID)
-
-            result.imageTintList = if (isMain)
-                // Always use white icon for the main button.
+            result.imageTintList = if (isMain) {
                 ColorStateList.valueOf(resources.getColorWithID(android.R.color.white, context.theme))
-            else
+            } else {
                 ColorStateList.valueOf(resources.getColorWithID(R.color.text, context.theme))
-
+            }
             result
         }
 
@@ -96,7 +96,7 @@ class NewConversationButtonSetView : RelativeLayout {
             this.iconID = iconID
             this.isMain = isMain
             disableClipping()
-            val size = resources.getDimension(R.dimen.new_conversation_button_expanded_size).toInt()
+            val size = resources.getDimension(R.dimen.new_conversation_button_expanded_size).toInt() + 2 * shadowMargin.toInt()
             val layoutParams = LayoutParams(size, size)
             this.layoutParams = layoutParams
             addView(imageView)
@@ -106,30 +106,21 @@ class NewConversationButtonSetView : RelativeLayout {
         }
 
         fun expand() {
-            animateImageViewColorChange(R.color.new_conversation_button_collapsed_background, R.color.accent)
+            GlowViewUtilities.animateColorChange(context, imageView, R.color.new_conversation_button_collapsed_background, R.color.accent)
+            @ColorRes val startShadowColorID = if (UiModeUtilities.isDayUiMode(context)) R.color.transparent_black_30 else R.color.black
+            GlowViewUtilities.animateShadowColorChange(context, imageView, startShadowColorID, R.color.new_conversation_button_shadow)
             imageView.animateSizeChange(R.dimen.new_conversation_button_collapsed_size, R.dimen.new_conversation_button_expanded_size, animationDuration)
             animateImageViewPositionChange(collapsedImageViewPosition, expandedImageViewPosition)
         }
 
         fun collapse() {
-            animateImageViewColorChange(R.color.accent, R.color.new_conversation_button_collapsed_background)
+            GlowViewUtilities.animateColorChange(context, imageView, R.color.accent, R.color.new_conversation_button_collapsed_background)
+            @ColorRes val endShadowColorID = if (UiModeUtilities.isDayUiMode(context)) R.color.transparent_black_30 else R.color.black
+            GlowViewUtilities.animateShadowColorChange(context, imageView, R.color.new_conversation_button_shadow, endShadowColorID)
             imageView.animateSizeChange(R.dimen.new_conversation_button_expanded_size, R.dimen.new_conversation_button_collapsed_size, animationDuration)
             animateImageViewPositionChange(expandedImageViewPosition, collapsedImageViewPosition)
         }
 
-        private fun animateImageViewColorChange(@ColorRes startColorID: Int, @ColorRes endColorID: Int) {
-            val drawable = imageView.background as GradientDrawable
-            val startColor = resources.getColorWithID(startColorID, context.theme)
-            val endColor = resources.getColorWithID(endColorID, context.theme)
-            val animation = ValueAnimator.ofObject(ArgbEvaluator(), startColor, endColor)
-            animation.duration = animationDuration
-            animation.addUpdateListener { animator ->
-                val color = animator.animatedValue as Int
-                drawable.color = ColorStateList.valueOf(color)
-            }
-            animation.start()
-        }
-
         private fun animateImageViewPositionChange(startPosition: PointF, endPosition: PointF) {
             val animation = ValueAnimator.ofObject(PointFEvaluator(), startPosition, endPosition)
             animation.duration = animationDuration
@@ -170,6 +161,7 @@ class NewConversationButtonSetView : RelativeLayout {
     constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) { setUpViewHierarchy() }
 
     private fun setUpViewHierarchy() {
+        disableClipping()
         // Set up session button
         addView(sessionButton)
         sessionButton.alpha = 0.0f
diff --git a/src/org/thoughtcrime/securesms/loki/views/PathStatusView.kt b/src/org/thoughtcrime/securesms/loki/views/PathStatusView.kt
index 3fd4158b89..e65630c144 100644
--- a/src/org/thoughtcrime/securesms/loki/views/PathStatusView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/PathStatusView.kt
@@ -4,14 +4,30 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import android.graphics.Canvas
+import android.graphics.Paint
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import android.util.AttributeSet
 import android.view.View
+import androidx.annotation.ColorInt
 import network.loki.messenger.R
+import org.thoughtcrime.securesms.loki.utilities.getColorWithID
+import org.thoughtcrime.securesms.loki.utilities.toPx
 import org.whispersystems.signalservice.loki.api.onionrequests.OnionRequestAPI
 
 class PathStatusView : View {
     private val broadcastReceivers = mutableListOf<BroadcastReceiver>()
+    @ColorInt var mainColor: Int = 0
+        set(newValue) { field = newValue; paint.color = newValue }
+    @ColorInt var sessionShadowColor: Int = 0
+        set(newValue) { field = newValue; paint.setShadowLayer(toPx(8, resources).toFloat(), 0.0f, 0.0f, newValue) }
+
+    private val paint: Paint by lazy {
+        val result = Paint()
+        result.style = Paint.Style.FILL
+        result.isAntiAlias = true
+        result
+    }
 
     constructor(context: Context) : super(context) {
         initialize()
@@ -31,6 +47,7 @@ class PathStatusView : View {
 
     private fun initialize() {
         update()
+        setWillNotDraw(false)
     }
 
     override fun onAttachedToWindow() {
@@ -70,8 +87,19 @@ class PathStatusView : View {
     private fun update() {
         if (OnionRequestAPI.paths.count() >= OnionRequestAPI.pathCount) {
             setBackgroundResource(R.drawable.accent_dot)
+            mainColor = resources.getColorWithID(R.color.accent, context.theme)
+            sessionShadowColor = resources.getColorWithID(R.color.accent, context.theme)
         } else {
             setBackgroundResource(R.drawable.paths_building_dot)
+            mainColor = resources.getColorWithID(R.color.paths_building, context.theme)
+            sessionShadowColor = resources.getColorWithID(R.color.paths_building, context.theme)
         }
     }
+
+    override fun onDraw(c: Canvas) {
+        val w = width.toFloat()
+        val h = height.toFloat()
+        c.drawCircle(w / 2, h / 2, w / 2, paint)
+        super.onDraw(c)
+    }
 }
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt b/src/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
index 362f5ff35d..9a7b9f0c11 100644
--- a/src/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
@@ -1,28 +1,32 @@
 package org.thoughtcrime.securesms.loki.views
 
 import android.content.Context
-import androidx.annotation.DimenRes
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.ImageView
 import android.widget.RelativeLayout
+import androidx.annotation.DimenRes
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import kotlinx.android.synthetic.main.view_profile_picture.view.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto
 import org.thoughtcrime.securesms.database.Address
-import org.thoughtcrime.securesms.loki.todo.JazzIdenticonDrawable
+import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.loki.utilities.AvatarPlaceholderGenerator
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.TextSecurePreferences
+import org.whispersystems.signalservice.loki.protocol.mentions.MentionsManager
 
 // TODO: Look into a better way of handling different sizes. Maybe an enum (with associated values) encapsulating the different modes?
 
 class ProfilePictureView : RelativeLayout {
     lateinit var glide: GlideRequests
     var publicKey: String? = null
+    var displayName: String? = null
     var additionalPublicKey: String? = null
+    var additionalDisplayName: String? = null
     var isRSSFeed = false
     var isLarge = false
 
@@ -51,6 +55,50 @@ class ProfilePictureView : RelativeLayout {
     // endregion
 
     // region Updating
+    fun update(recipient: Recipient, threadID: Long) {
+        fun getUserDisplayName(publicKey: String?): String? {
+            if (publicKey == null || publicKey.isBlank()) {
+                return null
+            } else {
+                var result = DatabaseFactory.getLokiUserDatabase(context).getDisplayName(publicKey)
+                val publicChat = DatabaseFactory.getLokiThreadDatabase(context).getPublicChat(threadID)
+                if (result == null && publicChat != null) {
+                    result = DatabaseFactory.getLokiUserDatabase(context).getServerDisplayName(publicChat.id, publicKey)
+                }
+                return result
+            }
+        }
+        if (recipient.isGroupRecipient) {
+            if ("Session Public Chat" == recipient.name) {
+                publicKey = ""
+                displayName = ""
+                additionalPublicKey = null
+                isRSSFeed = true
+            } else {
+                val users = MentionsManager.shared.userPublicKeyCache[threadID]?.toMutableList() ?: mutableListOf()
+                users.remove(TextSecurePreferences.getLocalNumber(context))
+                val masterPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(context)
+                if (masterPublicKey != null) {
+                    users.remove(masterPublicKey)
+                }
+                val randomUsers = users.sorted() // Sort to provide a level of stability
+                val pk = randomUsers.getOrNull(0) ?: ""
+                publicKey = pk
+                displayName = getUserDisplayName(pk)
+                val apk = randomUsers.getOrNull(1) ?: ""
+                additionalPublicKey = apk
+                additionalDisplayName = getUserDisplayName(apk)
+                isRSSFeed = recipient.name == "Loki News" || recipient.name == "Session Updates"
+            }
+        } else {
+            publicKey = recipient.address.toString()
+            displayName = recipient.name
+            additionalPublicKey = null
+            isRSSFeed = false
+        }
+        update()
+    }
+
     fun update() {
         val publicKey = publicKey ?: return
         val additionalPublicKey = additionalPublicKey
@@ -58,28 +106,50 @@ class ProfilePictureView : RelativeLayout {
         singleModeImageViewContainer.visibility = if (additionalPublicKey == null && !isRSSFeed && !isLarge) View.VISIBLE else View.INVISIBLE
         largeSingleModeImageViewContainer.visibility = if (additionalPublicKey == null && !isRSSFeed && isLarge) View.VISIBLE else View.INVISIBLE
         rssImageView.visibility = if (isRSSFeed) View.VISIBLE else View.INVISIBLE
-        fun setProfilePictureIfNeeded(imageView: ImageView, hexEncodedPublicKey: String, @DimenRes sizeID: Int) {
-            glide.clear(imageView)
-            if (hexEncodedPublicKey.isNotEmpty()) {
-                val recipient = Recipient.from(context, Address.fromSerialized(hexEncodedPublicKey), false);
-                val signalProfilePicture = recipient.contactPhoto
-                if (signalProfilePicture != null && (signalProfilePicture as? ProfileContactPhoto)?.avatarObject != "0" && (signalProfilePicture as? ProfileContactPhoto)?.avatarObject != "") {
-                    glide.load(signalProfilePicture).diskCacheStrategy(DiskCacheStrategy.ALL).circleCrop().into(imageView)
-                } else {
-                    val size = resources.getDimensionPixelSize(sizeID)
-                    val masterHexEncodedPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(context)
-                    val hepk = if (recipient.isLocalNumber && masterHexEncodedPublicKey != null) masterHexEncodedPublicKey else hexEncodedPublicKey
-                    val jazzIcon = JazzIdenticonDrawable(size, size, hepk)
-                    glide.load(jazzIcon).diskCacheStrategy(DiskCacheStrategy.ALL).circleCrop().into(imageView)
-                }
+        setProfilePictureIfNeeded(
+                doubleModeImageView1,
+                publicKey,
+                displayName,
+                R.dimen.small_profile_picture_size)
+        setProfilePictureIfNeeded(
+                doubleModeImageView2,
+                additionalPublicKey ?: "",
+                additionalDisplayName,
+                R.dimen.small_profile_picture_size)
+        setProfilePictureIfNeeded(
+                singleModeImageView,
+                publicKey,
+                displayName,
+                R.dimen.medium_profile_picture_size)
+        setProfilePictureIfNeeded(
+                largeSingleModeImageView,
+                publicKey,
+                displayName,
+                R.dimen.large_profile_picture_size)
+    }
+
+    private fun setProfilePictureIfNeeded(imageView: ImageView, publicKey: String, displayName: String?, @DimenRes sizeResId: Int) {
+        glide.clear(imageView)
+        if (publicKey.isNotEmpty()) {
+            val recipient = Recipient.from(context, Address.fromSerialized(publicKey), false);
+            val signalProfilePicture = recipient.contactPhoto
+            if (signalProfilePicture != null && (signalProfilePicture as? ProfileContactPhoto)?.avatarObject != "0"
+                && (signalProfilePicture as? ProfileContactPhoto)?.avatarObject != "") {
+                glide.load(signalProfilePicture).diskCacheStrategy(DiskCacheStrategy.ALL).circleCrop().into(imageView)
             } else {
-                imageView.setImageDrawable(null)
+                val sizeInPX = resources.getDimensionPixelSize(sizeResId)
+                val masterPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(context)
+                val hepk = if (recipient.isLocalNumber && masterPublicKey != null) masterPublicKey else publicKey
+                glide.load(AvatarPlaceholderGenerator.generate(
+                        context,
+                        sizeInPX,
+                        hepk,
+                        displayName
+                )).diskCacheStrategy(DiskCacheStrategy.ALL).circleCrop().into(imageView)
             }
+        } else {
+            imageView.setImageDrawable(null)
         }
-        setProfilePictureIfNeeded(doubleModeImageView1, publicKey, R.dimen.small_profile_picture_size)
-        setProfilePictureIfNeeded(doubleModeImageView2, additionalPublicKey ?: "", R.dimen.small_profile_picture_size)
-        setProfilePictureIfNeeded(singleModeImageView, publicKey, R.dimen.medium_profile_picture_size)
-        setProfilePictureIfNeeded(largeSingleModeImageView, publicKey, R.dimen.large_profile_picture_size)
     }
     // endregion
 }
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/views/UserView.kt b/src/org/thoughtcrime/securesms/loki/views/UserView.kt
index 9619a90389..96c1de080a 100644
--- a/src/org/thoughtcrime/securesms/loki/views/UserView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/UserView.kt
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.loki.views
 
 import android.content.Context
+import android.text.TextUtils
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
@@ -8,6 +9,7 @@ import android.widget.LinearLayout
 import kotlinx.android.synthetic.main.view_conversation.view.profilePictureView
 import kotlinx.android.synthetic.main.view_user.view.*
 import network.loki.messenger.R
+import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.groups.GroupManager
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -47,22 +49,35 @@ class UserView : LinearLayout {
 
     // region Updating
     fun bind(user: Recipient, glide: GlideRequests, actionIndicator: ActionIndicator, isSelected: Boolean = false) {
+        fun getUserDisplayName(publicKey: String?): String? {
+            if (publicKey == null || publicKey.isBlank()) {
+                return null
+            } else {
+                return DatabaseFactory.getLokiUserDatabase(context).getDisplayName(publicKey!!)
+            }
+        }
         val address = user.address.serialize()
         if (user.isGroupRecipient) {
             if ("Session Public Chat" == user.name || user.address.isRSSFeed) {
                 profilePictureView.publicKey = ""
+                profilePictureView.displayName = null
                 profilePictureView.additionalPublicKey = null
                 profilePictureView.isRSSFeed = true
             } else {
                 val threadID = GroupManager.getThreadIDFromGroupID(address, context)
                 val users = MentionsManager.shared.userPublicKeyCache[threadID]?.toList() ?: listOf()
                 val randomUsers = users.sorted() // Sort to provide a level of stability
-                profilePictureView.publicKey = randomUsers.getOrNull(0) ?: ""
-                profilePictureView.additionalPublicKey = randomUsers.getOrNull(1) ?: ""
+                val pk = randomUsers.getOrNull(0) ?: ""
+                profilePictureView.publicKey = pk
+                profilePictureView.displayName = getUserDisplayName(pk)
+                val apk = randomUsers.getOrNull(1) ?: ""
+                profilePictureView.additionalPublicKey = apk
+                profilePictureView.additionalDisplayName = getUserDisplayName(apk)
                 profilePictureView.isRSSFeed = false
             }
         } else {
             profilePictureView.publicKey = address
+            profilePictureView.displayName = getUserDisplayName(address)
             profilePictureView.additionalPublicKey = null
             profilePictureView.isRSSFeed = false
         }
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaFolder.java b/src/org/thoughtcrime/securesms/mediasend/MediaFolder.java
index ab53c1204a..b84ebfd276 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaFolder.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaFolder.java
@@ -12,14 +12,12 @@ public class MediaFolder {
   private final String     title;
   private final int        itemCount;
   private final String     bucketId;
-  private final FolderType folderType;
 
-  MediaFolder(@NonNull Uri thumbnailUri, @NonNull String title, int itemCount, @NonNull String bucketId, @NonNull FolderType folderType) {
+  MediaFolder(@NonNull Uri thumbnailUri, @NonNull String title, int itemCount, @NonNull String bucketId) {
     this.thumbnailUri = thumbnailUri;
     this.title        = title;
     this.itemCount    = itemCount;
     this.bucketId     = bucketId;
-    this.folderType   = folderType;
   }
 
   Uri getThumbnailUri() {
@@ -38,10 +36,6 @@ public class MediaFolder {
     return bucketId;
   }
 
-  FolderType getFolderType() {
-    return folderType;
-  }
-
   enum FolderType {
     NORMAL, CAMERA
   }
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderAdapter.java b/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderAdapter.java
index de7bb04607..adaf54d00b 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderAdapter.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderAdapter.java
@@ -75,7 +75,6 @@ class MediaPickerFolderAdapter extends RecyclerView.Adapter<MediaPickerFolderAda
     void bind(@NonNull MediaFolder folder, @NonNull GlideRequests glideRequests, @NonNull EventListener eventListener) {
       title.setText(folder.getTitle());
       count.setText(String.valueOf(folder.getItemCount()));
-      icon.setImageResource(folder.getFolderType() == MediaFolder.FolderType.CAMERA ? R.drawable.ic_camera_alt_white_24dp : R.drawable.ic_folder_white_48dp);
 
       glideRequests.load(folder.getThumbnailUri())
                    .diskCacheStrategy(DiskCacheStrategy.NONE)
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaRepository.java b/src/org/thoughtcrime/securesms/mediasend/MediaRepository.java
index d63bfbdb38..401ecabeab 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaRepository.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaRepository.java
@@ -5,18 +5,17 @@ import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.os.Environment;
 import android.provider.MediaStore.Images;
 import android.provider.MediaStore.Video;
 import android.provider.OpenableColumns;
+import android.util.Pair;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
-import android.util.Pair;
 
 import com.annimon.stream.Stream;
 
-import network.loki.messenger.R;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.Util;
@@ -31,6 +30,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import network.loki.messenger.R;
+
 /**
  * Handles the retrieval of media present on the user's device.
  */
@@ -77,30 +78,17 @@ class MediaRepository {
       }
     }
 
-    String            cameraBucketId = imageFolders.getCameraBucketId() != null ? imageFolders.getCameraBucketId() : videoFolders.getCameraBucketId();
-    FolderData        cameraFolder   = cameraBucketId != null ? folders.remove(cameraBucketId) : null;
-    List<MediaFolder> mediaFolders   = Stream.of(folders.values()).map(folder -> new MediaFolder(folder.getThumbnail(),
+    List<MediaFolder> mediaFolders = Stream.of(folders.values()).map(folder -> new MediaFolder(folder.getThumbnail(),
                                                                                                  folder.getTitle(),
                                                                                                  folder.getCount(),
-                                                                                                 folder.getBucketId(),
-                                                                                                 MediaFolder.FolderType.NORMAL))
+                                                                                                 folder.getBucketId()))
                                                                   .sorted((o1, o2) -> o1.getTitle().toLowerCase().compareTo(o2.getTitle().toLowerCase()))
                                                                   .toList();
 
     Uri allMediaThumbnail = imageFolders.getThumbnailTimestamp() > videoFolders.getThumbnailTimestamp() ? imageFolders.getThumbnail() : videoFolders.getThumbnail();
-
     if (allMediaThumbnail != null) {
       int allMediaCount = Stream.of(mediaFolders).reduce(0, (count, folder) -> count + folder.getItemCount());
-
-      if (cameraFolder != null) {
-        allMediaCount += cameraFolder.getCount();
-      }
-
-      mediaFolders.add(0, new MediaFolder(allMediaThumbnail, context.getString(R.string.MediaRepository_all_media), allMediaCount, Media.ALL_MEDIA_BUCKET_ID, MediaFolder.FolderType.NORMAL));
-    }
-
-    if (cameraFolder != null) {
-      mediaFolders.add(0, new MediaFolder(cameraFolder.getThumbnail(), cameraFolder.getTitle(), cameraFolder.getCount(), cameraFolder.getBucketId(), MediaFolder.FolderType.CAMERA));
+      mediaFolders.add(0, new MediaFolder(allMediaThumbnail, context.getString(R.string.MediaRepository_all_media), allMediaCount, Media.ALL_MEDIA_BUCKET_ID));
     }
 
     return mediaFolders;
@@ -108,8 +96,6 @@ class MediaRepository {
 
   @WorkerThread
   private @NonNull FolderResult getFolders(@NonNull Context context, @NonNull Uri contentUri) {
-    String                  cameraPath         = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).getAbsolutePath() + File.separator + "Camera";
-    String                  cameraBucketId     = null;
     Uri                     globalThumbnail    = null;
     long                    thumbnailTimestamp = 0;
     Map<String, FolderData> folders            = new HashMap<>();
@@ -130,10 +116,6 @@ class MediaRepository {
         folder.incrementCount();
         folders.put(bucketId, folder);
 
-        if (cameraBucketId == null && path.startsWith(cameraPath)) {
-          cameraBucketId = bucketId;
-        }
-
         if (timestamp > thumbnailTimestamp) {
           globalThumbnail    = thumbnail;
           thumbnailTimestamp = timestamp;
@@ -141,7 +123,7 @@ class MediaRepository {
       }
     }
 
-    return new FolderResult(cameraBucketId, globalThumbnail, thumbnailTimestamp, folders);
+    return new FolderResult(globalThumbnail, thumbnailTimestamp, folders);
   }
 
   @WorkerThread
@@ -158,7 +140,7 @@ class MediaRepository {
   }
 
   @WorkerThread
-  private @NonNull List<Media> getMediaInBucket(@NonNull Context context, @NonNull String bucketId, @NonNull Uri contentUri, boolean hasOrienation) {
+  private @NonNull List<Media> getMediaInBucket(@NonNull Context context, @NonNull String bucketId, @NonNull Uri contentUri, boolean hasOrientation) {
     List<Media> media         = new LinkedList<>();
     String      selection     = Images.Media.BUCKET_ID + " = ? AND " + Images.Media.DATA + " NOT NULL";
     String[]    selectionArgs = new String[] { bucketId };
@@ -166,7 +148,7 @@ class MediaRepository {
 
     String[] projection;
 
-    if (hasOrienation) {
+    if (hasOrientation) {
       projection = new String[]{Images.Media._ID, Images.Media.MIME_TYPE, Images.Media.DATE_TAKEN, Images.Media.ORIENTATION, Images.Media.WIDTH, Images.Media.HEIGHT, Images.Media.SIZE};
     } else {
       projection = new String[]{Images.Media._ID, Images.Media.MIME_TYPE, Images.Media.DATE_TAKEN, Images.Media.WIDTH, Images.Media.HEIGHT, Images.Media.SIZE};
@@ -182,7 +164,7 @@ class MediaRepository {
         Uri    uri         = Uri.withAppendedPath(contentUri, cursor.getString(cursor.getColumnIndexOrThrow(Images.Media._ID)));
         String mimetype    = cursor.getString(cursor.getColumnIndexOrThrow(Images.Media.MIME_TYPE));
         long   dateTaken   = cursor.getLong(cursor.getColumnIndexOrThrow(Images.Media.DATE_TAKEN));
-        int    orientation = hasOrienation ? cursor.getInt(cursor.getColumnIndexOrThrow(Images.Media.ORIENTATION)) : 0;
+        int    orientation = hasOrientation ? cursor.getInt(cursor.getColumnIndexOrThrow(Images.Media.ORIENTATION)) : 0;
         int    width       = cursor.getInt(cursor.getColumnIndexOrThrow(getWidthColumn(orientation)));
         int    height      = cursor.getInt(cursor.getColumnIndexOrThrow(getHeightColumn(orientation)));
         long   size        = cursor.getLong(cursor.getColumnIndexOrThrow(Images.Media.SIZE));
@@ -279,26 +261,19 @@ class MediaRepository {
   }
 
   private static class FolderResult {
-    private final String                  cameraBucketId;
     private final Uri                     thumbnail;
     private final long                    thumbnailTimestamp;
     private final Map<String, FolderData> folderData;
 
-    private FolderResult(@Nullable String cameraBucketId,
-                         @Nullable Uri thumbnail,
+    private FolderResult(@Nullable Uri thumbnail,
                          long thumbnailTimestamp,
                          @NonNull Map<String, FolderData> folderData)
     {
-      this.cameraBucketId     = cameraBucketId;
       this.thumbnail          = thumbnail;
       this.thumbnailTimestamp = thumbnailTimestamp;
       this.folderData         = folderData;
     }
 
-    @Nullable String getCameraBucketId() {
-      return cameraBucketId;
-    }
-
     @Nullable Uri getThumbnail() {
       return thumbnail;
     }
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
index 41324d4e61..ff1792ec1a 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
@@ -1,6 +1,8 @@
 package org.thoughtcrime.securesms.mediasend;
 
 import android.Manifest;
+
+import androidx.lifecycle.ViewModelProvider;
 import androidx.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.content.Intent;
@@ -133,7 +135,7 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple
     countButtonText = findViewById(R.id.mediasend_count_button_text);
     cameraButton    = findViewById(R.id.mediasend_camera_button);
 
-    viewModel = ViewModelProviders.of(this, new MediaSendViewModel.Factory(getApplication(), new MediaRepository())).get(MediaSendViewModel.class);
+    viewModel = new ViewModelProvider(this, new MediaSendViewModel.Factory(getApplication(), new MediaRepository())).get(MediaSendViewModel.class);
     recipient = Recipient.from(this, Address.fromSerialized(getIntent().getStringExtra(KEY_ADDRESS)), true);
     transport = getIntent().getParcelableExtra(KEY_TRANSPORT);
 
@@ -375,7 +377,6 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple
   private void navigateToCamera() {
     Permissions.with(this)
                .request(Manifest.permission.CAMERA)
-               .ifNecessary()
                .withRationaleDialog(getString(R.string.ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera), R.drawable.ic_baseline_photo_camera_48)
                .withPermanentDenialDialog(getString(R.string.ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video))
                .onAllGranted(() -> {
diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java
index 5f13c13e6c..80af560c00 100644
--- a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java
+++ b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java
@@ -30,13 +30,14 @@ import android.os.AsyncTask;
 import android.provider.ContactsContract;
 import android.provider.MediaStore;
 import android.provider.OpenableColumns;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Pair;
 import android.view.View;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.thoughtcrime.securesms.MediaPreviewActivity;
 import org.thoughtcrime.securesms.TransportOption;
 import org.thoughtcrime.securesms.attachments.Attachment;
@@ -46,6 +47,7 @@ import org.thoughtcrime.securesms.components.RemovableEditableMediaView;
 import org.thoughtcrime.securesms.components.ThumbnailView;
 import org.thoughtcrime.securesms.components.location.SignalMapView;
 import org.thoughtcrime.securesms.components.location.SignalPlace;
+import org.thoughtcrime.securesms.database.NoExternalStorageException;
 import org.thoughtcrime.securesms.giph.ui.GiphyActivity;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mediasend.MediaSendActivity;
@@ -54,6 +56,8 @@ import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.providers.DeprecatedPersistentBlobProvider;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.BitmapUtil;
+import org.thoughtcrime.securesms.util.ExternalStorageUtil;
+import org.thoughtcrime.securesms.util.FileProviderUtil;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.Util;
@@ -65,6 +69,7 @@ import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
 import org.thoughtcrime.securesms.util.views.Stub;
 import org.whispersystems.libsignal.util.guava.Optional;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -73,6 +78,8 @@ import java.util.concurrent.ExecutionException;
 
 import network.loki.messenger.R;
 
+import static android.provider.MediaStore.EXTRA_OUTPUT;
+
 
 public class AttachmentManager {
 
@@ -112,7 +119,6 @@ public class AttachmentManager {
       thumbnail.setOnClickListener(new ThumbnailClickListener());
       documentView.getBackground().setColorFilter(ThemeUtil.getThemedColor(context, R.attr.conversation_item_bubble_background), PorterDuff.Mode.MULTIPLY);
     }
-
   }
 
   public void clear(@NonNull GlideRequests glideRequests, boolean animate) {
@@ -366,37 +372,24 @@ public class AttachmentManager {
   }
 
   public static void selectDocument(Activity activity, int requestCode) {
-    Permissions.with(activity)
-               .request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-               .ifNecessary()
-               .withPermanentDenialDialog(activity.getString(R.string.AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio))
-               .onAllGranted(() -> selectMediaType(activity, "*/*", null, requestCode))
-               .execute();
+    selectMediaType(activity, "*/*", null, requestCode);
   }
 
   public static void selectGallery(Activity activity, int requestCode, @NonNull Recipient recipient, @NonNull String body, @NonNull TransportOption transport) {
     Permissions.with(activity)
-               .request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-               .ifNecessary()
+               .request(Manifest.permission.READ_EXTERNAL_STORAGE)
                .withPermanentDenialDialog(activity.getString(R.string.AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio))
-               .onAllGranted(() -> selectMediaType(activity, "image/*", new String[] {"image/*", "video/*"}, requestCode))
                .onAllGranted(() -> activity.startActivityForResult(MediaSendActivity.buildGalleryIntent(activity, recipient, body, transport), requestCode))
                .execute();
   }
 
   public static void selectAudio(Activity activity, int requestCode) {
-    Permissions.with(activity)
-               .request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-               .ifNecessary()
-               .withPermanentDenialDialog(activity.getString(R.string.AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio))
-               .onAllGranted(() -> selectMediaType(activity, "audio/*", null, requestCode))
-               .execute();
+    selectMediaType(activity, "audio/*", null, requestCode);
   }
 
   public static void selectContactInfo(Activity activity, int requestCode) {
     Permissions.with(activity)
                .request(Manifest.permission.WRITE_CONTACTS)
-               .ifNecessary()
                .withPermanentDenialDialog(activity.getString(R.string.AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information))
                .onAllGranted(() -> {
                  Intent intent = new Intent(Intent.ACTION_PICK, ContactsContract.Contacts.CONTENT_URI);
@@ -409,7 +402,6 @@ public class AttachmentManager {
     /* Loki - Enable again once we have location sharing
     Permissions.with(activity)
                .request(Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION)
-               .ifNecessary()
                .withPermanentDenialDialog(activity.getString(R.string.AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location))
                .onAllGranted(() -> {
                  try {
@@ -438,25 +430,28 @@ public class AttachmentManager {
 
   public void capturePhoto(Activity activity, int requestCode) {
     Permissions.with(activity)
-               .request(Manifest.permission.CAMERA)
-               .ifNecessary()
-               .withPermanentDenialDialog(activity.getString(R.string.AttachmentManager_signal_requires_the_camera_permission_in_order_to_take_photos_but_it_has_been_permanently_denied))
-               .onAllGranted(() -> {
-                 try {
-                   Intent captureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-                   if (captureIntent.resolveActivity(activity.getPackageManager()) != null) {
-                     if (captureUri == null) {
-                       captureUri = DeprecatedPersistentBlobProvider.getInstance(context).createForExternal(context, MediaUtil.IMAGE_JPEG);
-                     }
-                     Log.d(TAG, "captureUri path is " + captureUri.getPath());
-                     captureIntent.putExtra(MediaStore.EXTRA_OUTPUT, captureUri);
-                     activity.startActivityForResult(captureIntent, requestCode);
-                   }
-                 } catch (IOException ioe) {
-                   Log.w(TAG, ioe);
-                 }
-               })
-               .execute();
+            .request(Manifest.permission.CAMERA)
+            .withPermanentDenialDialog(activity.getString(R.string.AttachmentManager_signal_requires_the_camera_permission_in_order_to_take_photos_but_it_has_been_permanently_denied))
+            .onAllGranted(() -> {
+              try {
+                File captureFile = File.createTempFile(
+                        "conversation-capture",
+                        ".jpg",
+                        ExternalStorageUtil.getImageDir(activity));
+                Uri captureUri = FileProviderUtil.getUriFor(context, captureFile);
+                Intent captureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+                captureIntent.putExtra(EXTRA_OUTPUT, captureUri);
+                captureIntent.setFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+                if (captureIntent.resolveActivity(activity.getPackageManager()) != null) {
+                  Log.d(TAG, "captureUri path is " + captureUri.getPath());
+                  this.captureUri = captureUri;
+                  activity.startActivityForResult(captureIntent, requestCode);
+                }
+              } catch (IOException | NoExternalStorageException e) {
+                throw new RuntimeException("Error creating image capture intent.", e);
+              }
+            })
+            .execute();
   }
 
   private static void selectMediaType(Activity activity, @NonNull String type, @Nullable String[] extraMimeType, int requestCode) {
diff --git a/src/org/thoughtcrime/securesms/mms/DocumentSlide.java b/src/org/thoughtcrime/securesms/mms/DocumentSlide.java
index 24d6ceb133..968e8dd441 100644
--- a/src/org/thoughtcrime/securesms/mms/DocumentSlide.java
+++ b/src/org/thoughtcrime/securesms/mms/DocumentSlide.java
@@ -7,7 +7,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.attachments.Attachment;
-import org.thoughtcrime.securesms.util.StorageUtil;
+import org.thoughtcrime.securesms.util.ExternalStorageUtil;
 
 public class DocumentSlide extends Slide {
 
@@ -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, null, false, false));
+    super(context, constructAttachmentFromUri(context, uri, contentType, size, 0, 0, true, ExternalStorageUtil.getCleanFileName(fileName), null, null, false, false));
   }
 
   @Override
diff --git a/src/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/src/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
index 974667cb6f..f9ae25c19d 100644
--- a/src/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
+++ b/src/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
@@ -222,9 +222,9 @@ public class DefaultMessageNotifier implements MessageNotifier {
     Recipient      recipients = DatabaseFactory.getThreadDatabase(context)
                                                .getRecipientForThreadId(threadId);
 
-    if (isVisible && recipients != null && SessionMetaProtocol.shouldSendReadReceipt(recipients.getAddress())) {
+    if (isVisible && recipients != null) {
       List<MarkedMessageInfo> messageIds = threads.setRead(threadId, false);
-      MarkReadReceiver.process(context, messageIds);
+      if (SessionMetaProtocol.shouldSendReadReceipt(recipients.getAddress())) { MarkReadReceiver.process(context, messageIds); }
     }
 
     if (!TextSecurePreferences.isNotificationsEnabled(context) ||
diff --git a/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java b/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
index bc5f695a35..40ade81932 100644
--- a/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
+++ b/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
@@ -14,21 +14,22 @@ import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
+import android.text.SpannableStringBuilder;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationCompat.Action;
 import androidx.core.app.RemoteInput;
-import android.text.SpannableStringBuilder;
 
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
 import org.thoughtcrime.securesms.contacts.avatars.ContactColors;
 import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
-import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.GeneratedContactPhoto;
 import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.loki.utilities.AvatarPlaceholderGenerator;
 import org.thoughtcrime.securesms.loki.utilities.NotificationUtilities;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader;
 import org.thoughtcrime.securesms.mms.GlideApp;
@@ -80,9 +81,7 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
         addPerson(recipient.getContactUri().toString());
       }
 
-      ContactPhoto         contactPhoto         = recipient.getContactPhoto();
-      FallbackContactPhoto fallbackContactPhoto = recipient.getFallbackContactPhoto();
-
+      ContactPhoto contactPhoto = recipient.getContactPhoto();
       if (contactPhoto != null) {
         try {
           setLargeIcon(GlideApp.with(context.getApplicationContext())
@@ -94,10 +93,10 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
                                .get());
         } catch (InterruptedException | ExecutionException e) {
           Log.w(TAG, e);
-          setLargeIcon(fallbackContactPhoto.asDrawable(context, recipient.getColor().toConversationColor(context)));
+          setLargeIcon(getPlaceholderDrawable(context, recipient));
         }
       } else {
-        setLargeIcon(fallbackContactPhoto.asDrawable(context, recipient.getColor().toConversationColor(context)));
+        setLargeIcon(getPlaceholderDrawable(context, recipient));
       }
 
     } else {
@@ -321,4 +320,12 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
     return content;
   }
 
+  private static Drawable getPlaceholderDrawable(Context context, Recipient recipient) {
+    String publicKey = recipient.getAddress().serialize();
+    String hepk = (recipient.isLocalNumber() && publicKey != null)
+            ? TextSecurePreferences.getMasterHexEncodedPublicKey(context)
+            : publicKey;
+    String displayName = recipient.getName();
+    return AvatarPlaceholderGenerator.INSTANCE.generate(context, 128, hepk, displayName);
+  }
 }
diff --git a/src/org/thoughtcrime/securesms/permissions/Permissions.java b/src/org/thoughtcrime/securesms/permissions/Permissions.java
index 70e2da80fb..638c9512e8 100644
--- a/src/org/thoughtcrime/securesms/permissions/Permissions.java
+++ b/src/org/thoughtcrime/securesms/permissions/Permissions.java
@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.permissions;
 
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
@@ -9,20 +8,20 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.provider.Settings;
-import androidx.annotation.DrawableRes;
-import androidx.annotation.NonNull;
-import androidx.core.app.ActivityCompat;
-import androidx.fragment.app.Fragment;
-import androidx.core.content.ContextCompat;
 import android.util.DisplayMetrics;
 import android.view.Display;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+
 import com.annimon.stream.Stream;
 import com.annimon.stream.function.Consumer;
 
-import network.loki.messenger.R;
 import org.thoughtcrime.securesms.util.LRUCache;
 import org.thoughtcrime.securesms.util.ServiceUtil;
 
@@ -32,6 +31,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+import network.loki.messenger.R;
+
 public class Permissions {
 
   private static final Map<Integer, PermissionsRequest> OUTSTANDING = new LRUCache<>(2);
@@ -63,9 +64,8 @@ public class Permissions {
     private @DrawableRes int[]  rationalDialogHeader;
     private              String rationaleDialogMessage;
 
-    private boolean ifNecesary;
-
-    private boolean condition = true;
+    private int minSdkVersion = 0;
+    private int maxSdkVersion = Integer.MAX_VALUE;
 
     PermissionsBuilder(PermissionObject permissionObject) {
       this.permissionObject = permissionObject;
@@ -76,17 +76,6 @@ public class Permissions {
       return this;
     }
 
-    public PermissionsBuilder ifNecessary() {
-      this.ifNecesary = true;
-      return this;
-    }
-
-    public PermissionsBuilder ifNecessary(boolean condition) {
-      this.ifNecesary = true;
-      this.condition  = condition;
-      return this;
-    }
-
     public PermissionsBuilder withRationaleDialog(@NonNull String message, @NonNull @DrawableRes int... headers) {
       this.rationalDialogHeader   = headers;
       this.rationaleDialogMessage = message;
@@ -133,11 +122,29 @@ public class Permissions {
       return this;
     }
 
+    /**
+     * Min Android SDK version to request the permissions for (inclusive).
+     */
+    public PermissionsBuilder minSdkVersion(int minSdkVersion) {
+      this.minSdkVersion = minSdkVersion;
+      return this;
+    }
+
+    /**
+     * Max Android SDK version to request the permissions for (inclusive).
+     */
+    public PermissionsBuilder maxSdkVersion(int maxSdkVersion) {
+      this.maxSdkVersion = maxSdkVersion;
+      return this;
+    }
+
     public void execute() {
       PermissionsRequest request = new PermissionsRequest(allGrantedListener, anyDeniedListener, anyPermanentlyDeniedListener, anyResultListener,
                                                           someGrantedListener, someDeniedListener, somePermanentlyDeniedListener);
 
-      if (ifNecesary && (permissionObject.hasAll(requestedPermissions) || !condition)) {
+      boolean isInTargetSDKRange = (Build.VERSION.SDK_INT >= minSdkVersion && Build.VERSION.SDK_INT <= maxSdkVersion);
+
+      if (!isInTargetSDKRange || permissionObject.hasAll(requestedPermissions)) {
         executePreGrantedPermissionsRequest(request);
       } else if (rationaleDialogMessage != null && rationalDialogHeader != null) {
         executePermissionsRequestWithRationale(request);
@@ -171,7 +178,7 @@ public class Permissions {
       }
 
       for (String permission : requestedPermissions) {
-        request.addMapping(permission, permissionObject.shouldShouldPermissionRationale(permission));
+        request.addMapping(permission, permissionObject.shouldShowPermissionRationale(permission));
       }
 
       permissionObject.requestPermissions(requestCode, requestedPermissions);
@@ -240,7 +247,7 @@ public class Permissions {
 
     for (int i=0;i<permissions.length;i++) {
       if (grantResults[i] != PackageManager.PERMISSION_GRANTED) {
-        shouldShowRationaleDialog[i] = context.shouldShouldPermissionRationale(permissions[i]);
+        shouldShowRationaleDialog[i] = context.shouldShowPermissionRationale(permissions[i]);
       }
     }
 
@@ -259,7 +266,7 @@ public class Permissions {
   private abstract static class PermissionObject {
 
     abstract Context getContext();
-    abstract boolean shouldShouldPermissionRationale(String permission);
+    abstract boolean shouldShowPermissionRationale(String permission);
     abstract boolean hasAll(String... permissions);
     abstract void requestPermissions(int requestCode, String... permissions);
 
@@ -287,7 +294,7 @@ public class Permissions {
     }
 
     @Override
-    public boolean shouldShouldPermissionRationale(String permission) {
+    public boolean shouldShowPermissionRationale(String permission) {
       return ActivityCompat.shouldShowRequestPermissionRationale(activity, permission);
     }
 
@@ -316,7 +323,7 @@ public class Permissions {
     }
 
     @Override
-    public boolean shouldShouldPermissionRationale(String permission) {
+    public boolean shouldShowPermissionRationale(String permission) {
       return fragment.shouldShowRequestPermissionRationale(permission);
     }
 
diff --git a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java
index 877da0506d..97c14b4279 100644
--- a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java
@@ -139,7 +139,6 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment {
     public boolean onPreferenceClick(Preference preference) {
       Permissions.with(ChatsPreferenceFragment.this)
                  .request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                 .ifNecessary()
                  .onAllGranted(() -> {
                    if (!((SwitchPreferenceCompat)preference).isChecked()) {
                      BackupDialog.showEnableBackupDialog(getActivity(), (SwitchPreferenceCompat)preference);
@@ -160,7 +159,6 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment {
     public boolean onPreferenceClick(Preference preference) {
       Permissions.with(ChatsPreferenceFragment.this)
                  .request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                 .ifNecessary()
                  .onAllGranted(() -> {
                    Log.i(TAG, "Queing backup...");
                    ApplicationContext.getInstance(getContext())
diff --git a/src/org/thoughtcrime/securesms/recipients/Recipient.java b/src/org/thoughtcrime/securesms/recipients/Recipient.java
index 37fb87eaf0..530aa6ecb1 100644
--- a/src/org/thoughtcrime/securesms/recipients/Recipient.java
+++ b/src/org/thoughtcrime/securesms/recipients/Recipient.java
@@ -20,6 +20,7 @@ package org.thoughtcrime.securesms.recipients;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -43,7 +44,6 @@ import org.thoughtcrime.securesms.database.RecipientDatabase.RegisteredState;
 import org.thoughtcrime.securesms.database.RecipientDatabase.UnidentifiedAccessMode;
 import org.thoughtcrime.securesms.database.RecipientDatabase.VibrateState;
 import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.loki.todo.JazzIdenticonContactPhoto;
 import org.thoughtcrime.securesms.loki.utilities.ProfilePictureModifiedEvent;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.recipients.RecipientProvider.RecipientDetails;
@@ -465,15 +465,10 @@ public class Recipient implements RecipientModifiedListener {
   }
 
   public synchronized @NonNull FallbackContactPhoto getFallbackContactPhoto() {
+    // TODO: I believe this is now completely unused
     if      (isResolving())            return new TransparentContactPhoto();
     else if (isGroupRecipient())       return new GeneratedContactPhoto(name, R.drawable.ic_profile_default);
-    else {
-      String userPublicKey = TextSecurePreferences.getLocalNumber(context);
-      String publicKey = address.serialize();
-      String userMasterPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(context);
-      String publicKeyToUse = (publicKey.equalsIgnoreCase(userPublicKey) && userMasterPublicKey != null) ? userMasterPublicKey : publicKey;
-      return new JazzIdenticonContactPhoto(publicKeyToUse);
-    }
+    else { return new TransparentContactPhoto(); }
   }
 
   public synchronized @Nullable ContactPhoto getContactPhoto() {
diff --git a/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java b/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java
index e9f8f2e026..d8d7809606 100644
--- a/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java
+++ b/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java
@@ -55,7 +55,6 @@ public class WelcomeActivity extends BaseActionBarActivity {
   private void onContinueClicked() {
     Permissions.with(this)
         .request(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE)
-        .ifNecessary()
         .withRationaleDialog(getString(R.string.activity_landing_permission_dialog_message), R.drawable.ic_baseline_folder_48)
         .onAnyResult(() -> {
           Intent nextIntent = getIntent().getParcelableExtra("next_intent");
diff --git a/src/org/thoughtcrime/securesms/util/BackupUtil.java b/src/org/thoughtcrime/securesms/util/BackupUtil.java
index d3b4f4a112..5df025a3bc 100644
--- a/src/org/thoughtcrime/securesms/util/BackupUtil.java
+++ b/src/org/thoughtcrime/securesms/util/BackupUtil.java
@@ -16,13 +16,14 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Locale;
 
+//TODO AC: Needs to be refactored to use Storage Access Framework or Media Store API.
 public class BackupUtil {
 
   private static final String TAG = BackupUtil.class.getSimpleName();
 
   public static @NonNull String getLastBackupTime(@NonNull Context context, @NonNull Locale locale) {
     try {
-      BackupInfo backup = getLatestBackup();
+      BackupInfo backup = getLatestBackup(context);
 
       if (backup == null) return context.getString(R.string.BackupUtil_never);
       else                return DateUtils.getExtendedRelativeTimeSpanString(context, locale, backup.getTimestamp());
@@ -32,8 +33,8 @@ public class BackupUtil {
     }
   }
 
-  public static @Nullable BackupInfo getLatestBackup() throws NoExternalStorageException {
-    File       backupDirectory = StorageUtil.getBackupDirectory();
+  public static @Nullable BackupInfo getLatestBackup(Context context) throws NoExternalStorageException {
+    File       backupDirectory = ExternalStorageUtil.getBackupDir(context);
     File[]     backups         = backupDirectory.listFiles();
     BackupInfo latestBackup    = null;
 
@@ -49,9 +50,9 @@ public class BackupUtil {
   }
 
   @SuppressWarnings("ResultOfMethodCallIgnored")
-  public static void deleteAllBackups() {
+  public static void deleteAllBackups(Context context) {
     try {
-      File   backupDirectory = StorageUtil.getBackupDirectory();
+      File   backupDirectory = ExternalStorageUtil.getBackupDir(context);
       File[] backups         = backupDirectory.listFiles();
 
       for (File backup : backups) {
@@ -62,9 +63,9 @@ public class BackupUtil {
     }
   }
 
-  public static void deleteOldBackups() {
+  public static void deleteOldBackups(Context context) {
     try {
-      File   backupDirectory = StorageUtil.getBackupDirectory();
+      File   backupDirectory = ExternalStorageUtil.getBackupDir(context);
       File[] backups         = backupDirectory.listFiles();
 
       if (backups != null && backups.length > 2) {
diff --git a/src/org/thoughtcrime/securesms/util/CommunicationActions.java b/src/org/thoughtcrime/securesms/util/CommunicationActions.java
index 2c06f714b5..db66b955cf 100644
--- a/src/org/thoughtcrime/securesms/util/CommunicationActions.java
+++ b/src/org/thoughtcrime/securesms/util/CommunicationActions.java
@@ -35,8 +35,7 @@ public class CommunicationActions {
 
     Permissions.with(activity)
         .request(Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA)
-        .ifNecessary()
-        .withRationaleDialog(activity.getString(R.string.ConversationActivity_to_call_s_signal_needs_access_to_your_microphone_and_camera, recipient.toShortString()),
+        .withRationaleDialog(activity.getString(R.string.ConversationActivity_to_call_s_signal_needs_access_to_your_microphone_and_camera),
                              R.drawable.ic_mic_white_48dp,
                              R.drawable.ic_videocam_white_48dp)
         .withPermanentDenialDialog(activity.getString(R.string.ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s, recipient.toShortString()))
diff --git a/src/org/thoughtcrime/securesms/util/ExternalStorageUtil.java b/src/org/thoughtcrime/securesms/util/ExternalStorageUtil.java
new file mode 100644
index 0000000000..6c701b4501
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/util/ExternalStorageUtil.java
@@ -0,0 +1,66 @@
+package org.thoughtcrime.securesms.util;
+
+import android.content.Context;
+import android.os.Environment;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.thoughtcrime.securesms.database.NoExternalStorageException;
+
+import java.io.File;
+
+public class ExternalStorageUtil {
+
+  public static final String DIRECTORY_BACKUPS = "Backups";
+
+  /** @see Context#getExternalFilesDir(String) */
+  @NonNull
+  public static File getDir(Context context, @Nullable String type) throws NoExternalStorageException {
+    final File dir = context.getExternalFilesDir(type);
+    if (dir == null) {
+      throw new NoExternalStorageException("External storage dir is currently unavailable: " + type);
+    }
+    return dir;
+  }
+
+  @NonNull
+  public static File getBackupDir(Context context) throws NoExternalStorageException {
+    return getDir(context, DIRECTORY_BACKUPS);
+  }
+
+  @NonNull
+  public static File getVideoDir(Context context) throws NoExternalStorageException {
+    return getDir(context, Environment.DIRECTORY_MOVIES);
+  }
+
+  @NonNull
+  public static File getAudioDir(Context context) throws NoExternalStorageException {
+    return getDir(context, Environment.DIRECTORY_MUSIC);
+  }
+
+  @NonNull
+  public static File getImageDir(Context context) throws NoExternalStorageException {
+    return getDir(context, Environment.DIRECTORY_PICTURES);
+  }
+
+  @NonNull
+  public static File getDownloadDir(Context context) throws NoExternalStorageException {
+    return getDir(context, Environment.DIRECTORY_DOWNLOADS);
+  }
+
+  @Nullable
+  public static File getCacheDir(Context context) {
+    return context.getExternalCacheDir();
+  }
+
+  @Nullable
+  public static String getCleanFileName(@Nullable String fileName) {
+    if (fileName == null) return null;
+
+    fileName = fileName.replace('\u202D', '\uFFFD');
+    fileName = fileName.replace('\u202E', '\uFFFD');
+
+    return fileName;
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/util/IntentUtils.java b/src/org/thoughtcrime/securesms/util/IntentUtils.java
index 0eb110ebdc..c01f42c2c2 100644
--- a/src/org/thoughtcrime/securesms/util/IntentUtils.java
+++ b/src/org/thoughtcrime/securesms/util/IntentUtils.java
@@ -1,18 +1,16 @@
 package org.thoughtcrime.securesms.util;
 
-
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ResolveInfo;
-import androidx.annotation.NonNull;
+import android.content.pm.PackageManager;
 
-import java.util.List;
+import androidx.annotation.NonNull;
 
 public class IntentUtils {
 
   public static boolean isResolvable(@NonNull Context context, @NonNull Intent intent) {
-    List<ResolveInfo> resolveInfoList = context.getPackageManager().queryIntentActivities(intent, 0);
-    return resolveInfoList != null && resolveInfoList.size() > 1;
+    return context.getPackageManager()
+            .queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY).size() > 0;
   }
 
 }
diff --git a/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java b/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java
deleted file mode 100644
index f1afec8de8..0000000000
--- a/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java
+++ /dev/null
@@ -1,238 +0,0 @@
-package org.thoughtcrime.securesms.util;
-
-import android.content.Context;
-import android.content.DialogInterface.OnClickListener;
-import android.media.MediaScannerConnection;
-import android.net.Uri;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-import android.text.TextUtils;
-import android.webkit.MimeTypeMap;
-import android.widget.Toast;
-
-import network.loki.messenger.R;
-import org.thoughtcrime.securesms.database.NoExternalStorageException;
-import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.mms.PartAuthority;
-import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
-import org.whispersystems.libsignal.util.Pair;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.ref.WeakReference;
-import java.text.SimpleDateFormat;
-
-public class SaveAttachmentTask extends ProgressDialogAsyncTask<SaveAttachmentTask.Attachment, Void, Pair<Integer, String>> {
-  private static final String TAG = SaveAttachmentTask.class.getSimpleName();
-
-          static final int SUCCESS              = 0;
-  private static final int FAILURE              = 1;
-  private static final int WRITE_ACCESS_FAILURE = 2;
-
-  private final WeakReference<Context>      contextReference;
-
-  private final int attachmentCount;
-
-  public SaveAttachmentTask(Context context) {
-    this(context, 1);
-  }
-
-  public SaveAttachmentTask(Context context, int count) {
-    super(context,
-          context.getResources().getQuantityString(R.plurals.ConversationFragment_saving_n_attachments, count, count),
-          context.getResources().getQuantityString(R.plurals.ConversationFragment_saving_n_attachments_to_sd_card, count, count));
-    this.contextReference      = new WeakReference<>(context);
-    this.attachmentCount       = count;
-  }
-
-  @Override
-  protected Pair<Integer, String> doInBackground(SaveAttachmentTask.Attachment... attachments) {
-    if (attachments == null || attachments.length == 0) {
-      throw new AssertionError("must pass in at least one attachment");
-    }
-
-    try {
-      Context      context      = contextReference.get();
-      String       directory    = null;
-
-      if (!StorageUtil.canWriteInSessionStorageDir()) {
-        return new Pair<>(WRITE_ACCESS_FAILURE, null);
-      }
-
-      if (context == null) {
-        return new Pair<>(FAILURE, null);
-      }
-
-      for (Attachment attachment : attachments) {
-        if (attachment != null) {
-          directory = saveAttachment(context, attachment);
-          if (directory == null) return new Pair<>(FAILURE, null);
-        }
-      }
-
-      if (attachments.length > 1) return new Pair<>(SUCCESS, null);
-      else                        return new Pair<>(SUCCESS, directory);
-    } catch (NoExternalStorageException|IOException ioe) {
-      Log.w(TAG, ioe);
-      return new Pair<>(FAILURE, null);
-    }
-  }
-
-  private @Nullable String saveAttachment(Context context, Attachment attachment)
-      throws NoExternalStorageException, IOException
-  {
-    String      contentType = MediaUtil.getCorrectedMimeType(attachment.contentType);
-    String         fileName = attachment.fileName;
-
-    if (fileName == null) fileName = generateOutputFileName(contentType, attachment.date);
-    fileName = sanitizeOutputFileName(fileName);
-
-    File    outputDirectory = createOutputDirectoryFromContentType(contentType);
-    File          mediaFile = createOutputFile(outputDirectory, fileName);
-    InputStream inputStream = PartAuthority.getAttachmentStream(context, attachment.uri);
-
-    if (inputStream == null) {
-      return null;
-    }
-
-    OutputStream outputStream = new FileOutputStream(mediaFile);
-    Util.copy(inputStream, outputStream);
-
-    MediaScannerConnection.scanFile(context, new String[]{mediaFile.getAbsolutePath()},
-                                    new String[]{contentType}, null);
-
-    return outputDirectory.getName();
-  }
-
-  private File createOutputDirectoryFromContentType(@NonNull String contentType)
-      throws NoExternalStorageException
-  {
-    File outputDirectory;
-
-    if (contentType.startsWith("video/")) {
-      outputDirectory = StorageUtil.getVideoDir();
-    } else if (contentType.startsWith("audio/")) {
-      outputDirectory = StorageUtil.getAudioDir();
-    } else if (contentType.startsWith("image/")) {
-      outputDirectory = StorageUtil.getImageDir();
-    } else {
-      outputDirectory = StorageUtil.getDownloadDir();
-    }
-
-    if (!outputDirectory.mkdirs()) Log.w(TAG, "mkdirs() returned false, attempting to continue");
-    return outputDirectory;
-  }
-
-  private String generateOutputFileName(@NonNull String contentType, long timestamp) {
-    MimeTypeMap      mimeTypeMap   = MimeTypeMap.getSingleton();
-    String           extension     = mimeTypeMap.getExtensionFromMimeType(contentType);
-    SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd-HHmmss");
-    String           base          = "signal-" + dateFormatter.format(timestamp);
-
-    if (extension == null) extension = "attach";
-
-    return base + "." + extension;
-  }
-
-  private String sanitizeOutputFileName(@NonNull String fileName) {
-    return new File(fileName).getName();
-  }
-
-  private File createOutputFile(@NonNull File outputDirectory, @NonNull String fileName)
-      throws IOException
-  {
-    String[] fileParts = getFileNameParts(fileName);
-    String base = fileParts[0];
-    String extension = fileParts[1];
-
-    File outputFile = new File(outputDirectory, base + "." + extension);
-
-    int i = 0;
-    while (outputFile.exists()) {
-      outputFile = new File(outputDirectory, base + "-" + (++i) + "." + extension);
-    }
-
-    if (outputFile.isHidden()) {
-      throw new IOException("Specified name would not be visible");
-    }
-
-    return outputFile;
-  }
-
-  private String[] getFileNameParts(String fileName) {
-    String[] result = new String[2];
-    String[] tokens = fileName.split("\\.(?=[^\\.]+$)");
-
-    result[0] = tokens[0];
-
-    if (tokens.length > 1) result[1] = tokens[1];
-    else                   result[1] = "";
-
-    return result;
-  }
-
-  @Override
-  protected void onPostExecute(final Pair<Integer, String> result) {
-    super.onPostExecute(result);
-    final Context context = contextReference.get();
-    if (context == null) return;
-
-    switch (result.first()) {
-      case FAILURE:
-        Toast.makeText(context,
-                       context.getResources().getQuantityText(R.plurals.ConversationFragment_error_while_saving_attachments_to_sd_card,
-                                                              attachmentCount),
-                       Toast.LENGTH_LONG).show();
-        break;
-      case SUCCESS:
-        String message = !TextUtils.isEmpty(result.second())  ? context.getResources().getString(R.string.SaveAttachmentTask_saved_to, result.second())
-                                                              : context.getResources().getString(R.string.SaveAttachmentTask_saved);
-        Toast.makeText(context, message, Toast.LENGTH_LONG).show();
-        break;
-      case WRITE_ACCESS_FAILURE:
-        Toast.makeText(context, R.string.ConversationFragment_unable_to_write_to_sd_card_exclamation,
-            Toast.LENGTH_LONG).show();
-        break;
-    }
-  }
-
-  public static class Attachment {
-    public Uri    uri;
-    public String fileName;
-    public String contentType;
-    public long   date;
-
-    public Attachment(@NonNull Uri uri, @NonNull String contentType,
-                      long date, @Nullable String fileName)
-    {
-      if (uri == null || contentType == null || date < 0) {
-        throw new AssertionError("uri, content type, and date must all be specified");
-      }
-      this.uri         = uri;
-      this.fileName    = fileName;
-      this.contentType = contentType;
-      this.date        = date;
-    }
-  }
-
-  public static void showWarningDialog(Context context, OnClickListener onAcceptListener) {
-    showWarningDialog(context, onAcceptListener, 1);
-  }
-
-  public static void showWarningDialog(Context context, OnClickListener onAcceptListener, int count) {
-    AlertDialog.Builder builder = new AlertDialog.Builder(context);
-    builder.setTitle(R.string.ConversationFragment_save_to_sd_card);
-    builder.setIconAttribute(R.attr.dialog_alert_icon);
-    builder.setCancelable(true);
-    builder.setMessage(context.getResources().getQuantityString(R.plurals.ConversationFragment_saving_n_media_to_storage_warning,
-                                                                count, count));
-    builder.setPositiveButton(R.string.yes, onAcceptListener);
-    builder.setNegativeButton(R.string.no, null);
-    builder.show();
-  }
-}
-
diff --git a/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt b/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt
new file mode 100644
index 0000000000..d4dc58eb7b
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt
@@ -0,0 +1,196 @@
+package org.thoughtcrime.securesms.util
+
+import android.content.ContentValues
+import android.content.Context
+import android.content.DialogInterface.OnClickListener
+import android.net.Uri
+import android.os.Build
+import android.provider.MediaStore
+import android.text.TextUtils
+import android.webkit.MimeTypeMap
+import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.logging.Log
+import org.thoughtcrime.securesms.mms.PartAuthority
+import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask
+import java.io.File
+import java.io.IOException
+import java.lang.ref.WeakReference
+import java.text.SimpleDateFormat
+
+/**
+ * Saves attachment files to an external storage using [MediaStore] API.
+ */
+class SaveAttachmentTask : ProgressDialogAsyncTask<SaveAttachmentTask.Attachment, Void, Pair<Int, String?>> {
+
+    companion object {
+        @JvmStatic
+        private val TAG = SaveAttachmentTask::class.simpleName
+
+        private const val RESULT_SUCCESS = 0
+        private const val RESULT_FAILURE = 1
+
+        @JvmStatic
+        @JvmOverloads
+        fun showWarningDialog(context: Context, onAcceptListener: OnClickListener, count: Int = 1) {
+            val builder = AlertDialog.Builder(context)
+            builder.setTitle(R.string.ConversationFragment_save_to_sd_card)
+            builder.setIconAttribute(R.attr.dialog_alert_icon)
+            builder.setCancelable(true)
+            builder.setMessage(context.resources.getQuantityString(
+                    R.plurals.ConversationFragment_saving_n_media_to_storage_warning,
+                    count,
+                    count))
+            builder.setPositiveButton(R.string.yes, onAcceptListener)
+            builder.setNegativeButton(R.string.no, null)
+            builder.show()
+        }
+    }
+
+    private val contextReference: WeakReference<Context>
+    private val attachmentCount: Int
+
+    @JvmOverloads
+    constructor(context: Context, count: Int = 1): super(context,
+            context.resources.getQuantityString(R.plurals.ConversationFragment_saving_n_attachments, count, count),
+            context.resources.getQuantityString(R.plurals.ConversationFragment_saving_n_attachments_to_sd_card, count, count)) {
+        this.contextReference = WeakReference(context)
+        this.attachmentCount = count
+    }
+
+    override fun doInBackground(vararg attachments: Attachment?): Pair<Int, String?> {
+        if (attachments.isEmpty()) {
+            throw IllegalArgumentException("Must pass in at least one attachment")
+        }
+
+        try {
+            val context = contextReference.get()
+            var directory: String? = null
+
+            if (context == null) {
+                return Pair(RESULT_FAILURE, null)
+            }
+
+            for (attachment in attachments) {
+                if (attachment != null) {
+                    directory = saveAttachment(context, attachment)
+                    if (directory == null) return Pair(RESULT_FAILURE, null)
+                }
+            }
+
+            return if (attachments.size > 1)
+                Pair(RESULT_SUCCESS, null)
+            else
+                Pair(RESULT_SUCCESS, directory)
+        } catch (e: IOException) {
+            Log.w(TAG, e)
+            return Pair(RESULT_FAILURE, null)
+        }
+    }
+
+    @Throws(IOException::class)
+    private fun saveAttachment(context: Context, attachment: Attachment): String? {
+        val resolver = context.contentResolver
+
+        val contentType = MediaUtil.getCorrectedMimeType(attachment.contentType)!!
+        val fileName = attachment.fileName
+                ?: sanitizeOutputFileName(generateOutputFileName(contentType, attachment.date))
+
+        val mediaRecord = ContentValues()
+        val mediaVolume = if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) {
+            MediaStore.VOLUME_EXTERNAL
+        } else {
+            MediaStore.VOLUME_EXTERNAL_PRIMARY
+        }
+        val collectionUri: Uri
+
+        when {
+            contentType.startsWith("video/") -> {
+                collectionUri = MediaStore.Video.Media.getContentUri(mediaVolume)
+                mediaRecord.put(MediaStore.Video.Media.DISPLAY_NAME, fileName)
+                mediaRecord.put(MediaStore.Video.Media.MIME_TYPE, contentType)
+                // Add the date meta data to ensure the image is added at the front of the gallery
+                mediaRecord.put(MediaStore.Video.Media.DATE_ADDED, System.currentTimeMillis())
+                mediaRecord.put(MediaStore.Video.Media.DATE_TAKEN, System.currentTimeMillis())
+
+            }
+            contentType.startsWith("audio/") -> {
+                collectionUri = MediaStore.Audio.Media.getContentUri(mediaVolume)
+                mediaRecord.put(MediaStore.Audio.Media.DISPLAY_NAME, fileName)
+                mediaRecord.put(MediaStore.Audio.Media.MIME_TYPE, contentType)
+                mediaRecord.put(MediaStore.Audio.Media.DATE_ADDED, System.currentTimeMillis())
+                mediaRecord.put(MediaStore.Audio.Media.DATE_TAKEN, System.currentTimeMillis())
+
+            }
+            contentType.startsWith("image/") -> {
+                collectionUri = MediaStore.Images.Media.getContentUri(mediaVolume)
+                mediaRecord.put(MediaStore.Images.Media.TITLE, fileName)
+                mediaRecord.put(MediaStore.Images.Media.DISPLAY_NAME, fileName)
+                mediaRecord.put(MediaStore.Images.Media.MIME_TYPE, contentType)
+                mediaRecord.put(MediaStore.Images.Media.DATE_ADDED, System.currentTimeMillis())
+                mediaRecord.put(MediaStore.Images.Media.DATE_TAKEN, System.currentTimeMillis())
+
+            }
+            else -> {
+                mediaRecord.put(MediaStore.Files.FileColumns.DISPLAY_NAME, fileName)
+                collectionUri = MediaStore.Files.getContentUri(mediaVolume)
+            }
+        }
+
+        val mediaFileUri = resolver.insert(collectionUri, mediaRecord)
+        if (mediaFileUri == null) return null
+
+        val inputStream = PartAuthority.getAttachmentStream(context, attachment.uri)
+        if (inputStream == null) return null
+
+        inputStream.use {
+            resolver.openOutputStream(mediaFileUri).use {
+                Util.copy(inputStream, it)
+            }
+        }
+
+        return mediaFileUri.toString()
+    }
+
+    private fun generateOutputFileName(contentType: String, timestamp: Long): String {
+        val mimeTypeMap = MimeTypeMap.getSingleton()
+        val extension = mimeTypeMap.getExtensionFromMimeType(contentType) ?: "attach"
+        val dateFormatter = SimpleDateFormat("yyyy-MM-dd-HHmmss")
+        val base = "session-${dateFormatter.format(timestamp)}"
+
+        return "${base}.${extension}";
+    }
+
+    private fun sanitizeOutputFileName(fileName: String): String {
+        return File(fileName).name
+    }
+
+    override fun onPostExecute(result: Pair<Int, String?>) {
+        super.onPostExecute(result)
+        val context = contextReference.get()
+        if (context == null) return
+
+        when (result.first) {
+            RESULT_FAILURE -> {
+                val message = context.resources.getQuantityText(
+                        R.plurals.ConversationFragment_error_while_saving_attachments_to_sd_card,
+                        attachmentCount)
+                Toast.makeText(context, message, Toast.LENGTH_LONG).show()
+            }
+
+            RESULT_SUCCESS -> {
+                val message = if (!TextUtils.isEmpty(result.second)) {
+                    context.resources.getString(R.string.SaveAttachmentTask_saved_to, result.second)
+                } else {
+                    context.resources.getString(R.string.SaveAttachmentTask_saved)
+                }
+                Toast.makeText(context, message, Toast.LENGTH_LONG).show()
+            }
+
+            else -> throw IllegalStateException("Unexpected result value: " + result.first)
+        }
+    }
+
+    data class Attachment(val uri: Uri, val contentType: String, val date: Long, val fileName: String?)
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/util/StorageUtil.java b/src/org/thoughtcrime/securesms/util/StorageUtil.java
deleted file mode 100644
index 2fbc6c482f..0000000000
--- a/src/org/thoughtcrime/securesms/util/StorageUtil.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.thoughtcrime.securesms.util;
-
-import android.content.Context;
-import android.os.Environment;
-import androidx.annotation.Nullable;
-
-import org.thoughtcrime.securesms.database.NoExternalStorageException;
-
-import java.io.File;
-
-public class StorageUtil {
-
-  public static File getBackupDirectory() throws NoExternalStorageException {
-    File storage = Environment.getExternalStorageDirectory();
-
-    if (!storage.canWrite()) {
-      throw new NoExternalStorageException();
-    }
-
-    File session = new File(storage, "Session");
-    File backups = new File(session, "Backups");
-
-    if (!backups.exists()) {
-      if (!backups.mkdirs()) {
-        throw new NoExternalStorageException("Unable to create backup directory...");
-      }
-    }
-
-    return backups;
-  }
-
-  public static File getBackupCacheDirectory(Context context) {
-    return context.getExternalCacheDir();
-  }
-
-  private static File getSessionStorageDir() throws NoExternalStorageException {
-    final File storage = Environment.getExternalStorageDirectory();
-
-    if (!storage.canWrite()) {
-      throw new NoExternalStorageException();
-    }
-
-    return storage;
-  }
-
-  public static boolean canWriteInSessionStorageDir() {
-    File storage;
-
-    try {
-      storage = getSessionStorageDir();
-    } catch (NoExternalStorageException e) {
-      return false;
-    }
-
-    return storage.canWrite();
-  }
-
-  public static File getLegacyBackupDirectory() throws NoExternalStorageException {
-    return getSessionStorageDir();
-  }
-
-  public static File getVideoDir() throws NoExternalStorageException {
-    return new File(getSessionStorageDir(), Environment.DIRECTORY_MOVIES);
-  }
-
-  public static File getAudioDir() throws NoExternalStorageException {
-    return new File(getSessionStorageDir(), Environment.DIRECTORY_MUSIC);
-  }
-
-  public static File getImageDir() throws NoExternalStorageException {
-    return new File(getSessionStorageDir(), Environment.DIRECTORY_PICTURES);
-  }
-
-  public static File getDownloadDir() throws NoExternalStorageException {
-    return new File(getSessionStorageDir(), Environment.DIRECTORY_DOWNLOADS);
-  }
-
-  public static @Nullable String getCleanFileName(@Nullable String fileName) {
-    if (fileName == null) return null;
-
-    fileName = fileName.replace('\u202D', '\uFFFD');
-    fileName = fileName.replace('\u202E', '\uFFFD');
-
-    return fileName;
-  }
-}
diff --git a/src/org/thoughtcrime/securesms/util/task/ProgressDialogAsyncTask.java b/src/org/thoughtcrime/securesms/util/task/ProgressDialogAsyncTask.java
index e862d5d4f5..4c343bcf00 100644
--- a/src/org/thoughtcrime/securesms/util/task/ProgressDialogAsyncTask.java
+++ b/src/org/thoughtcrime/securesms/util/task/ProgressDialogAsyncTask.java
@@ -4,6 +4,8 @@ import android.app.ProgressDialog;
 import android.content.Context;
 import android.os.AsyncTask;
 
+import androidx.annotation.NonNull;
+
 import java.lang.ref.WeakReference;
 
 public abstract class ProgressDialogAsyncTask<Params, Progress, Result> extends AsyncTask<Params, Progress, Result> {
@@ -13,14 +15,14 @@ public abstract class ProgressDialogAsyncTask<Params, Progress, Result> extends
   private final String                 title;
   private final String                 message;
 
-  public ProgressDialogAsyncTask(Context context, String title, String message) {
+  public ProgressDialogAsyncTask(@NonNull Context context, @NonNull String title, @NonNull String message) {
     super();
     this.contextReference = new WeakReference<>(context);
     this.title            = title;
     this.message          = message;
   }
 
-  public ProgressDialogAsyncTask(Context context, int title, int message) {
+  public ProgressDialogAsyncTask(@NonNull Context context, int title, int message) {
     this(context, context.getString(title), context.getString(message));
   }
 
@@ -35,7 +37,7 @@ public abstract class ProgressDialogAsyncTask<Params, Progress, Result> extends
     if (progress != null) progress.dismiss();
   }
 
-  protected Context getContext() {
+  protected @NonNull Context getContext() {
     return contextReference.get();
   }
 }