diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7dfcd2cb5b..087d944da2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -98,7 +98,7 @@
         android:largeHeap="true"
         android:networkSecurityConfig="@xml/network_security_configuration"
         android:supportsRtl="true"
-        android:theme="@style/TextSecure.DarkTheme"
+        android:theme="@style/Session.DarkTheme"
         tools:replace="android:allowBackup">
 
         <meta-data
@@ -124,6 +124,45 @@
             android:name="firebase_messaging_auto_init_enabled"
             android:value="false" />
 
+        <!-- Session -->
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.LandingActivity" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.RegisterActivity" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.RestoreActivity"
+            android:windowSoftInputMode="adjustResize" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.LinkDeviceActivity"
+            android:windowSoftInputMode="adjustResize" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.DisplayNameActivity"
+            android:windowSoftInputMode="adjustResize" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.HomeActivity"
+            android:launchMode="singleTask"
+            android:theme="@style/Session.DarkTheme.NoActionBar" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.SettingsActivity"
+            android:theme="@style/Session.DarkTheme.NoActionBar" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.QRCodeActivity" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.CreatePrivateChatActivity" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.JoinPublicChatActivity"
+            android:windowSoftInputMode="adjustResize" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.SeedActivity" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.PrivacySettingsActivity" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.NotificationSettingsActivity" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.ChatSettingsActivity" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.redesign.activities.LinkedDevicesActivity" />
+        <!-- Session -->
         <activity android:name="org.thoughtcrime.securesms.loki.LinkedDevicesActivity" />
         <activity
             android:name="org.thoughtcrime.securesms.WebRtcCallActivity"
@@ -202,7 +241,7 @@
         <activity-alias
             android:name=".RoutingActivity"
             android:exported="true"
-            android:targetActivity="org.thoughtcrime.securesms.ConversationListActivity">
+            android:targetActivity="org.thoughtcrime.securesms.loki.redesign.activities.HomeActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -250,6 +289,7 @@
             android:name="org.thoughtcrime.securesms.conversation.ConversationActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
             android:launchMode="singleTask"
+            android:theme="@style/Session.DarkTheme.NoActionBar"
             android:parentActivityName="org.thoughtcrime.securesms.ConversationListActivity"
             android:windowSoftInputMode="stateUnchanged">
             <meta-data
@@ -268,7 +308,8 @@
         <activity
             android:name="org.thoughtcrime.securesms.MessageDetailsActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:label="@string/AndroidManifest__message_details"
+            android:label="Message Details"
+            android:theme="@style/Session.DarkTheme"
             android:launchMode="singleTask"
             android:windowSoftInputMode="stateHidden" />
         <activity
@@ -320,7 +361,7 @@
         <activity
             android:name="org.thoughtcrime.securesms.mediasend.MediaSendActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:theme="@style/TextSecure.DarkNoActionBar"
+            android:theme="@style/Session.DarkTheme.NoActionBar"
             android:windowSoftInputMode="stateHidden" />
         <activity
             android:name="org.thoughtcrime.securesms.PassphraseChangeActivity"
@@ -375,13 +416,14 @@
             android:name="org.thoughtcrime.securesms.MediaPreviewActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
             android:label="@string/AndroidManifest__media_preview"
+            android:theme="@style/Session.DarkTheme.SubtitleActionBar"
             android:launchMode="singleTask"
             android:windowSoftInputMode="stateHidden" />
         <activity
             android:name="org.thoughtcrime.securesms.MediaOverviewActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
             android:launchMode="singleTask"
-            android:theme="@style/TextSecure.LightNoActionBar"
+            android:theme="@style/Session.DarkTheme.NoActionBar"
             android:windowSoftInputMode="stateHidden" />
         <activity
             android:name="org.thoughtcrime.securesms.DummyActivity"
@@ -447,7 +489,7 @@
             android:theme="@style/TextSecure.DarkTheme" />
         <activity
             android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
-            android:theme="@style/TextSecure.DarkTheme" />
+            android:theme="@style/Session.DarkTheme" />
         <activity
             android:name="org.thoughtcrime.securesms.CreateProfileActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
diff --git a/build.gradle b/build.gradle
index 5ad5cc9103..ea4d2068e4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,6 +27,7 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-android'
 apply plugin: 'witness'
 apply plugin: 'io.fabric'
+apply plugin: 'kotlin-kapt'
 
 repositories {
     mavenLocal()
@@ -112,6 +113,7 @@ dependencies {
     implementation 'com.github.chrisbanes:PhotoView:2.1.3'
     implementation 'com.github.bumptech.glide:glide:4.5.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.5.0'
+    kapt 'com.github.bumptech.glide:compiler:4.5.0'
     implementation 'com.makeramen:roundedimageview:2.1.0'
     implementation 'com.pnikosis:materialish-progress:1.5'
     implementation 'org.greenrobot:eventbus:3.0.0'
@@ -193,6 +195,9 @@ dependencies {
     implementation("com.crashlytics.sdk.android:crashlytics:$crashlytics_version@aar") {
         transitive = true
     }
+    implementation "com.jakewharton.rxbinding3:rxbinding:3.1.0"
+    implementation "com.github.tbruyelle:rxpermissions:0.10.2"
+    implementation "com.github.ybq:Android-SpinKit:1.4.0"
 }
 
 def canonicalVersionCode = 23
diff --git a/ic_launcher-web.png b/ic_launcher-web.png
index a1eea7c1a4..82a5d5d97c 100644
Binary files a/ic_launcher-web.png and b/ic_launcher-web.png differ
diff --git a/res/anim/fade_scale_out.xml b/res/anim/fade_scale_out.xml
index 2ee729071b..7a48373a4e 100644
--- a/res/anim/fade_scale_out.xml
+++ b/res/anim/fade_scale_out.xml
@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<set xmlns:android="http://schemas.android.com/apk/res/android"
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:interpolator="@android:anim/decelerate_interpolator">
+
     <scale
-        android:duration="150"
+        android:duration="250"
         android:fromXScale="1.0"
         android:fromYScale="1.0"
         android:toXScale="0.85"
         android:toYScale="0.85"
         android:pivotX="50%"
         android:pivotY="50%" />
+
     <alpha
-        android:duration="150"
+        android:duration="250"
         android:fromAlpha="1.0"
         android:toAlpha="0.6" />
+
 </set>
\ No newline at end of file
diff --git a/res/anim/slide_from_bottom.xml b/res/anim/slide_from_bottom.xml
index a6febc21e1..1cdf41e2c7 100644
--- a/res/anim/slide_from_bottom.xml
+++ b/res/anim/slide_from_bottom.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android" >
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/decelerate_interpolator">
+
     <translate
-            android:duration="350"
-            android:fromYDelta="100%"
-            android:toYDelta="0%" />
+        android:duration="250"
+        android:fromYDelta="100%"
+        android:toYDelta="0%" />
+
 </set>
\ No newline at end of file
diff --git a/res/anim/slide_from_left.xml b/res/anim/slide_from_left.xml
index 7e00a0272f..0253917658 100644
--- a/res/anim/slide_from_left.xml
+++ b/res/anim/slide_from_left.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-     android:interpolator="@android:anim/decelerate_interpolator">
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/decelerate_interpolator">
+
     <translate
         android:duration="250"
         android:fromXDelta="-100%"
         android:toXDelta="0%" />
+
 </set>
\ No newline at end of file
diff --git a/res/anim/slide_from_right.xml b/res/anim/slide_from_right.xml
index feeaaf7513..18de5567f5 100644
--- a/res/anim/slide_from_right.xml
+++ b/res/anim/slide_from_right.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/decelerate_interpolator">
 
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-     android:interpolator="@android:anim/decelerate_interpolator">
     <translate
         android:duration="250"
         android:fromXDelta="100%"
         android:toXDelta="0%" />
+
 </set>
\ No newline at end of file
diff --git a/res/drawable-anydpi-v24/ic_notification.xml b/res/drawable-anydpi-v24/ic_notification.xml
index 16a8f44ff8..3394e4180f 100644
--- a/res/drawable-anydpi-v24/ic_notification.xml
+++ b/res/drawable-anydpi-v24/ic_notification.xml
@@ -1,15 +1,19 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="1109.6405"
-    android:viewportHeight="1109.7455"
+    android:viewportWidth="487.39856"
+    android:viewportHeight="487.39856"
     android:tint="#FFFFFF">
-  <group android:translateX="-466.04904"
-      android:translateY="-466.09314">
-    <group android:translateX="492.4193"
-        android:translateY="520.9659">
-        <path android:fillColor="#FFFFFF" android:pathData="M480,730.8l-358.6,-358.5l371.8,-371.8l99,99.1l-272.6,272.7l259.4,259.5z"/>
-        <path android:fillColor="#FFFFFF" android:pathData="M563.7,999.5l-99.1,-99.1l272.7,-272.7l-259.5,-259.5l99.1,-99l358.5,358.5z"/>
+  <group android:translateX="41.656616"
+      android:translateY="19.495943">
+    <group>
+      <clip-path android:pathData="M0,0L404.085,0L404.085,448.407L0,448.407Z M 0,0"/>
+      <path
+          android:pathData="m288.607,420.376l-196.335,-0c-33.576,-0 -62.508,-25.748 -64.164,-59.281 -1.771,-35.847 26.883,-65.576 62.353,-65.576l113.072,-0c6.919,-0 12.527,-5.608 12.527,-12.525l0,-92.305L327.307,252.333C356.723,268.633 375.241,299.335 376.027,332.848 377.161,380.975 336.746,420.376 288.607,420.376m-211.829,-224.303c-29.416,-16.3 -47.933,-47.001 -48.721,-80.515 -1.132,-48.127 39.283,-87.528 87.42,-87.528L311.811,28.031c33.576,-0 62.508,25.748 64.165,59.283 1.771,35.845 -26.883,65.575 -62.352,65.575 0,-0 -81.316,0.013 -113.077,0.019 -6.915,0.001 -12.499,5.608 -12.501,12.523l-0.021,92.289zM340.891,227.816 L256.254,180.919l57.371,-0c49.877,-0 90.46,-40.579 90.46,-90.457 0,-49.877 -40.583,-90.461 -90.46,-90.461l-200.299,-0c-62.485,-0 -113.327,50.841 -113.327,113.327 0,44.567 24.216,85.664 63.195,107.265l84.636,46.896l-57.368,-0c-49.88,-0 -90.463,40.58 -90.463,90.457 0,49.877 40.583,90.461 90.463,90.461L290.758,448.407c62.488,-0 113.327,-50.84 113.327,-113.327 0,-44.567 -24.216,-85.664 -63.193,-107.264"
+          android:fillColor="#00f782"
+          android:strokeColor="#00000000"
+          android:fillType="nonZero"
+          android:fillAlpha="1"/>
     </group>
   </group>
 </vector>
diff --git a/res/drawable-hdpi/ic_arrow_up.png b/res/drawable-hdpi/ic_arrow_up.png
new file mode 100644
index 0000000000..049dfa4e81
Binary files /dev/null and b/res/drawable-hdpi/ic_arrow_up.png differ
diff --git a/res/drawable-hdpi/ic_notification.png b/res/drawable-hdpi/ic_notification.png
index 533399d126..6ef38a0b8a 100644
Binary files a/res/drawable-hdpi/ic_notification.png and b/res/drawable-hdpi/ic_notification.png differ
diff --git a/res/drawable-mdpi/ic_arrow_up.png b/res/drawable-mdpi/ic_arrow_up.png
new file mode 100644
index 0000000000..f1303d14d9
Binary files /dev/null and b/res/drawable-mdpi/ic_arrow_up.png differ
diff --git a/res/drawable-mdpi/ic_notification.png b/res/drawable-mdpi/ic_notification.png
index e8598325dd..276e9268f2 100644
Binary files a/res/drawable-mdpi/ic_notification.png and b/res/drawable-mdpi/ic_notification.png differ
diff --git a/res/drawable-xhdpi/ic_arrow_up.png b/res/drawable-xhdpi/ic_arrow_up.png
new file mode 100644
index 0000000000..58525ede27
Binary files /dev/null and b/res/drawable-xhdpi/ic_arrow_up.png differ
diff --git a/res/drawable-xhdpi/ic_notification.png b/res/drawable-xhdpi/ic_notification.png
index cf00d2407a..ebcd1d56af 100644
Binary files a/res/drawable-xhdpi/ic_notification.png and b/res/drawable-xhdpi/ic_notification.png differ
diff --git a/res/drawable-xxhdpi/ic_arrow_up.png b/res/drawable-xxhdpi/ic_arrow_up.png
new file mode 100644
index 0000000000..7c0c106380
Binary files /dev/null and b/res/drawable-xxhdpi/ic_arrow_up.png differ
diff --git a/res/drawable-xxhdpi/ic_notification.png b/res/drawable-xxhdpi/ic_notification.png
index b2da66255e..eac022bd0b 100644
Binary files a/res/drawable-xxhdpi/ic_notification.png and b/res/drawable-xxhdpi/ic_notification.png differ
diff --git a/res/drawable-xxxhdpi/ic_arrow_up.png b/res/drawable-xxxhdpi/ic_arrow_up.png
new file mode 100644
index 0000000000..e44b0815c9
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_arrow_up.png differ
diff --git a/res/drawable/compose_background_dark.xml b/res/drawable/compose_background_dark.xml
index e4a6237f43..56859db153 100644
--- a/res/drawable/compose_background_dark.xml
+++ b/res/drawable/compose_background_dark.xml
@@ -4,11 +4,11 @@
     android:shape="rectangle">
 
     <stroke
-        android:width="1dp"
-        android:color="@color/core_grey_75" />
+        android:width="1px"
+        android:color="@color/separator" />
 
     <solid
-        android:color="@color/core_grey_90" />
+        android:color="@color/compose_text_view_background" />
 
     <corners
         android:radius="20dp" />
diff --git a/res/drawable/conversation_view_background.xml b/res/drawable/conversation_view_background.xml
new file mode 100644
index 0000000000..ee5f321c99
--- /dev/null
+++ b/res/drawable/conversation_view_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/cell_selected">
+
+    <item>
+        <color android:color="@color/cell_background" />
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/res/drawable/default_dialog_background.xml b/res/drawable/default_dialog_background.xml
new file mode 100644
index 0000000000..b97c837b83
--- /dev/null
+++ b/res/drawable/default_dialog_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/dialog_background" />
+
+    <corners android:radius="@dimen/dialog_corner_radius" />
+
+    <stroke android:width="@dimen/border_thickness" android:color="@color/dialog_border" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/default_dialog_background_inset.xml b/res/drawable/default_dialog_background_inset.xml
new file mode 100644
index 0000000000..b67cfb0b73
--- /dev/null
+++ b/res/drawable/default_dialog_background_inset.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/default_dialog_background"
+    android:insetRight="@dimen/medium_spacing"
+    android:insetLeft="@dimen/medium_spacing">
+</inset>
\ No newline at end of file
diff --git a/res/drawable/default_session_background.xml b/res/drawable/default_session_background.xml
new file mode 100644
index 0000000000..c6e75f86e6
--- /dev/null
+++ b/res/drawable/default_session_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <gradient
+        android:angle="90"
+        android:startColor="#121212"
+        android:endColor="#171717"
+        android:type="linear" />
+
+</shape>
\ No newline at end of file
diff --git a/res/drawable/default_session_progress.xml b/res/drawable/default_session_progress.xml
new file mode 100644
index 0000000000..bfef55831b
--- /dev/null
+++ b/res/drawable/default_session_progress.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/accent" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/destructive_dialog_button_background.xml b/res/drawable/destructive_dialog_button_background.xml
new file mode 100644
index 0000000000..9d3ac00b07
--- /dev/null
+++ b/res/drawable/destructive_dialog_button_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/destructive" />
+
+    <corners android:radius="@dimen/dialog_button_corner_radius" />
+
+    <stroke android:width="@dimen/border_thickness" android:color="@color/destructive" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/fake_chat_view_incoming_message_background.xml b/res/drawable/fake_chat_view_incoming_message_background.xml
new file mode 100644
index 0000000000..69acee1173
--- /dev/null
+++ b/res/drawable/fake_chat_view_incoming_message_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/accent" />
+
+    <corners android:radius="@dimen/fake_chat_view_bubble_corner_radius" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/fake_chat_view_outgoing_message_background.xml b/res/drawable/fake_chat_view_outgoing_message_background.xml
new file mode 100644
index 0000000000..fe79c4b40f
--- /dev/null
+++ b/res/drawable/fake_chat_view_outgoing_message_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/fake_chat_bubble_background" />
+
+    <corners android:radius="@dimen/fake_chat_view_bubble_corner_radius" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/ic_circle_check.xml b/res/drawable/ic_circle_check.xml
new file mode 100644
index 0000000000..a258b5c30c
--- /dev/null
+++ b/res/drawable/ic_circle_check.xml
@@ -0,0 +1,7 @@
+<vector android:height="24dp" android:viewportHeight="15"
+    android:viewportWidth="15" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000"
+        android:pathData="M7.5,7.5m-6.5,0a6.5,6.5 0,1 1,13 0a6.5,6.5 0,1 1,-13 0"
+        android:strokeColor="#FFFFFF" android:strokeWidth="1"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M4.77,7.61c-0.15,-0.15 -0.38,-0.15 -0.53,0c-0.15,0.15 -0.15,0.38 0,0.53l1.88,1.88c0.15,0.15 0.38,0.15 0.53,0l4.13,-4.12c0.15,-0.15 0.15,-0.38 0,-0.53c-0.15,-0.15 -0.38,-0.15 -0.53,0L6.38,9.22L4.77,7.61z"/>
+</vector>
diff --git a/res/drawable/ic_circle_dot_dot_dot.xml b/res/drawable/ic_circle_dot_dot_dot.xml
new file mode 100644
index 0000000000..28ecaa1fbe
--- /dev/null
+++ b/res/drawable/ic_circle_dot_dot_dot.xml
@@ -0,0 +1,7 @@
+<vector android:height="24dp" android:viewportHeight="15"
+    android:viewportWidth="15" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000"
+        android:pathData="M7.5,7.5m-6.5,0a6.5,6.5 0,1 1,13 0a6.5,6.5 0,1 1,-13 0"
+        android:strokeColor="#FFFFFF" android:strokeWidth="1"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M4.76,7.47c0,-0.32 0.26,-0.57 0.57,-0.57c0.32,0 0.57,0.25 0.57,0.57c0,0.31 -0.25,0.57 -0.57,0.57C5.02,8.04 4.76,7.78 4.76,7.47zM7.04,7.47c0,-0.32 0.26,-0.57 0.57,-0.57c0.32,0 0.57,0.25 0.57,0.57c0,0.31 -0.25,0.57 -0.57,0.57C7.3,8.04 7.04,7.78 7.04,7.47zM9.32,7.47c0,-0.32 0.26,-0.57 0.57,-0.57c0.32,0 0.57,0.25 0.57,0.57c0,0.31 -0.25,0.57 -0.57,0.57C9.58,8.04 9.32,7.78 9.32,7.47z"/>
+</vector>
diff --git a/res/drawable/ic_circle_plus.xml b/res/drawable/ic_circle_plus.xml
new file mode 100644
index 0000000000..b222f9a9ae
--- /dev/null
+++ b/res/drawable/ic_circle_plus.xml
@@ -0,0 +1,36 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="27dp"
+    android:height="27dp"
+    android:viewportWidth="27"
+    android:viewportHeight="27">
+  <group>
+    <clip-path android:pathData="M-19,-756h375v812h-375z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-3,-3h33v33h-33z M 0,0"/>
+      <group>
+        <clip-path android:pathData="M13.51,8.82c-0.35,0 -0.63,0.28 -0.62,0.62v3.43H9.46c-0.35,0 -0.63,0.28 -0.62,0.62c0,0.35 0.28,0.63 0.62,0.62h3.43v3.43c-0.02,0.35 0.27,0.63 0.61,0.63c0.17,0 0.33,-0.07 0.44,-0.18c0.11,-0.11 0.18,-0.27 0.18,-0.44v-3.43h3.43c0.17,0 0.33,-0.07 0.44,-0.18c0.11,-0.11 0.18,-0.27 0.18,-0.44c0,-0.35 -0.28,-0.63 -0.62,-0.62h-3.43V9.44C14.13,9.09 13.85,8.81 13.51,8.82zM21.46,5.54c4.39,4.39 4.39,11.53 0,15.92c-4.39,4.39 -11.53,4.39 -15.92,0s-4.39,-11.53 0,-15.92C9.93,1.15 17.07,1.15 21.46,5.54zM22.34,22.34c4.88,-4.88 4.88,-12.81 0,-17.69s-12.81,-4.88 -17.69,0s-4.88,12.81 0,17.69S17.47,27.22 22.34,22.34z M 0,0"/>
+        <group>
+          <clip-path android:pathData="M0,0h27v27h-27z M 0,0"/>
+          <path
+              android:pathData="M-4,-4h35v35h-35z"
+              android:strokeAlpha="0.9"
+              android:fillColor="#FFFFFF"
+              android:fillAlpha="0.9"/>
+        </group>
+      </group>
+    </group>
+    <group>
+      <clip-path android:pathData="M-3,-3h33v33h-33z M 0,0"/>
+      <group>
+        <clip-path android:pathData="M0,0h27v27h-27z M 0,0"/>
+        <path
+            android:pathData="M13.51,8.82c-0.35,0 -0.63,0.28 -0.62,0.62v3.43H9.46c-0.35,0 -0.63,0.28 -0.62,0.62c0,0.35 0.28,0.63 0.62,0.62h3.43v3.43c-0.02,0.35 0.27,0.63 0.61,0.63c0.17,0 0.33,-0.07 0.44,-0.18c0.11,-0.11 0.18,-0.27 0.18,-0.44v-3.43h3.43c0.17,0 0.33,-0.07 0.44,-0.18c0.11,-0.11 0.18,-0.27 0.18,-0.44c0,-0.35 -0.28,-0.63 -0.62,-0.62h-3.43V9.44C14.13,9.09 13.85,8.81 13.51,8.82zM21.46,5.54c4.39,4.39 4.39,11.53 0,15.92c-4.39,4.39 -11.53,4.39 -15.92,0c-4.39,-4.39 -4.39,-11.53 0,-15.92C9.93,1.15 17.07,1.15 21.46,5.54zM22.34,22.34c4.88,-4.88 4.88,-12.81 0,-17.69s-12.81,-4.88 -17.69,0s-4.88,12.81 0,17.69S17.47,27.22 22.34,22.34z"
+            android:strokeAlpha="0.9"
+            android:strokeWidth="0.5"
+            android:fillColor="#00000000"
+            android:strokeColor="#FFFFFF"
+            android:fillAlpha="0.9"/>
+      </group>
+    </group>
+  </group>
+</vector>
diff --git a/res/drawable/ic_filled_circle_check.xml b/res/drawable/ic_filled_circle_check.xml
new file mode 100644
index 0000000000..c45e603d4c
--- /dev/null
+++ b/res/drawable/ic_filled_circle_check.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:viewportHeight="13"
+    android:viewportWidth="13" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M6.5,6.5m-6.5,0a6.5,6.5 0,1 1,13 0a6.5,6.5 0,1 1,-13 0"/>
+    <path android:fillColor="#231F20" android:pathData="M3.77,6.61c-0.15,-0.15 -0.38,-0.15 -0.53,0c-0.15,0.15 -0.15,0.38 0,0.53l1.88,1.88c0.15,0.15 0.38,0.15 0.53,0L9.78,4.9c0.15,-0.15 0.15,-0.38 0,-0.53c-0.15,-0.15 -0.38,-0.15 -0.53,0L5.38,8.22L3.77,6.61z"/>
+</vector>
diff --git a/res/drawable/ic_gear.xml b/res/drawable/ic_gear.xml
new file mode 100644
index 0000000000..8c53726c5a
--- /dev/null
+++ b/res/drawable/ic_gear.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+  <path
+      android:pathData="M12.5,7.48c-2.77,0 -5.02,2.25 -5.02,5.02c0,2.77 2.25,5.02 5.02,5.02s5.02,-2.25 5.02,-5.02C17.52,9.73 15.27,7.48 12.5,7.48zM12.5,15.82c-1.83,0 -3.32,-1.49 -3.32,-3.32c0,-1.83 1.49,-3.32 3.32,-3.32s3.32,1.49 3.32,3.32C15.82,14.33 14.33,15.82 12.5,15.82z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M23.57,9.88l-2.25,-0.24c-0.15,-0.47 -0.34,-0.92 -0.56,-1.36l1.42,-1.76c0.41,-0.51 0.37,-1.24 -0.09,-1.7l-1.91,-1.91c-0.46,-0.46 -1.2,-0.5 -1.7,-0.09l-1.76,1.42c-0.44,-0.22 -0.89,-0.41 -1.36,-0.56l-0.24,-2.25c-0.07,-0.65 -0.62,-1.14 -1.27,-1.14h-2.7c-0.65,0 -1.2,0.49 -1.27,1.14L9.64,3.67C9.17,3.83 8.72,4.01 8.28,4.24L6.52,2.82c-0.51,-0.41 -1.24,-0.37 -1.7,0.09L2.91,4.82c-0.46,0.46 -0.5,1.19 -0.09,1.7l1.42,1.76C4.01,8.72 3.83,9.17 3.67,9.64L1.42,9.88c-0.65,0.07 -1.14,0.62 -1.14,1.27v2.7c0,0.65 0.49,1.2 1.14,1.27l2.25,0.24c0.15,0.46 0.34,0.92 0.56,1.36l-1.42,1.76c-0.41,0.51 -0.37,1.24 0.09,1.7l1.91,1.91c0.46,0.46 1.19,0.5 1.7,0.09l1.76,-1.42c0.44,0.22 0.89,0.41 1.36,0.56l0.24,2.25c0.07,0.65 0.61,1.14 1.27,1.14h2.7c0.65,0 1.2,-0.49 1.27,-1.14l0.24,-2.25c0.46,-0.15 0.92,-0.34 1.36,-0.56l1.76,1.42c0.51,0.41 1.24,0.37 1.7,-0.09l1.91,-1.91c0.46,-0.46 0.5,-1.19 0.09,-1.7l-1.42,-1.76c0.22,-0.44 0.41,-0.89 0.56,-1.36l2.25,-0.24c0.65,-0.07 1.14,-0.62 1.14,-1.27v-2.7C24.71,10.5 24.22,9.95 23.57,9.88zM23.01,13.47l-2.15,0.23c-0.51,0.06 -0.94,0.41 -1.08,0.91c-0.16,0.53 -0.37,1.05 -0.64,1.53c-0.25,0.46 -0.21,1.01 0.12,1.41l1.36,1.69l-1.37,1.37l-1.69,-1.36c-0.4,-0.32 -0.96,-0.37 -1.41,-0.12c-0.49,0.27 -1,0.48 -1.53,0.64c-0.5,0.14 -0.86,0.57 -0.91,1.08l-0.23,2.15h-1.94l-0.23,-2.15c-0.06,-0.51 -0.41,-0.94 -0.91,-1.08c-0.53,-0.15 -1.05,-0.37 -1.53,-0.64c-0.46,-0.25 -1.01,-0.21 -1.41,0.12l-1.69,1.36l-1.37,-1.37l1.36,-1.69c0.33,-0.4 0.37,-0.96 0.12,-1.42c-0.27,-0.49 -0.48,-1 -0.64,-1.53c-0.14,-0.5 -0.57,-0.86 -1.08,-0.91l-2.15,-0.23v-1.94l2.15,-0.23c0.51,-0.05 0.94,-0.41 1.08,-0.91c0.15,-0.53 0.37,-1.05 0.64,-1.54c0.25,-0.46 0.2,-1.01 -0.12,-1.41L4.38,5.75l1.37,-1.37l1.69,1.36c0.4,0.32 0.96,0.37 1.41,0.12c0.49,-0.27 1,-0.48 1.53,-0.64c0.5,-0.15 0.86,-0.57 0.91,-1.08l0.23,-2.15h1.94l0.23,2.15c0.06,0.51 0.41,0.94 0.91,1.08c0.53,0.15 1.05,0.37 1.53,0.64c0.45,0.25 1.01,0.21 1.41,-0.12l1.69,-1.36l1.37,1.37l-1.36,1.69c-0.32,0.4 -0.37,0.96 -0.12,1.41c0.27,0.48 0.48,1 0.64,1.53c0.14,0.5 0.57,0.86 1.08,0.92l2.15,0.23V13.47z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/res/drawable/ic_globe.xml b/res/drawable/ic_globe.xml
new file mode 100644
index 0000000000..3d3d6500a8
--- /dev/null
+++ b/res/drawable/ic_globe.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="25"
+    android:viewportWidth="25" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M12.5,0.61C5.94,0.61 0.61,5.94 0.61,12.5S5.94,24.39 12.5,24.39s11.89,-5.34 11.89,-11.89S19.06,0.61 12.5,0.61zM2.35,13.35h3.41c0.05,1.35 0.22,2.64 0.5,3.82H3.45C2.85,16.01 2.46,14.72 2.35,13.35zM13.35,6.13V2.47c1.22,0.44 2.3,1.78 3.07,3.66H13.35zM16.98,7.83c0.31,1.17 0.51,2.46 0.57,3.82h-4.19V7.83H16.98zM11.65,2.47v3.66H8.58C9.35,4.24 10.43,2.9 11.65,2.47zM11.65,7.83v3.82H7.46C7.52,10.29 7.72,9 8.02,7.83H11.65zM5.76,11.65H2.35c0.11,-1.37 0.5,-2.66 1.1,-3.82h2.81C5.98,9.01 5.81,10.3 5.76,11.65zM7.46,13.35h4.19v3.82H8.02C7.72,16 7.52,14.71 7.46,13.35zM11.65,18.87v3.66c-1.22,-0.44 -2.3,-1.78 -3.07,-3.66H11.65zM13.35,22.53v-3.66h3.07C15.65,20.76 14.57,22.1 13.35,22.53zM13.35,17.17v-3.82h4.19c-0.06,1.36 -0.26,2.65 -0.57,3.82H13.35zM19.24,13.35h3.41c-0.11,1.37 -0.5,2.66 -1.1,3.82h-2.81C19.02,15.99 19.19,14.7 19.24,13.35zM19.24,11.65c-0.05,-1.35 -0.22,-2.64 -0.5,-3.82h2.81c0.6,1.16 0.99,2.45 1.1,3.82H19.24zM20.45,6.13h-2.21c-0.38,-1.08 -0.86,-2.05 -1.42,-2.85C18.23,3.94 19.47,4.92 20.45,6.13zM8.18,3.28c-0.56,0.8 -1.03,1.77 -1.42,2.85H4.56C5.53,4.92 6.77,3.94 8.18,3.28zM4.55,18.87h2.21c0.38,1.08 0.86,2.05 1.42,2.85C6.77,21.06 5.53,20.08 4.55,18.87zM16.82,21.72c0.56,-0.8 1.03,-1.77 1.42,-2.85h2.21C19.47,20.08 18.23,21.06 16.82,21.72z"/>
+</vector>
diff --git a/res/drawable/ic_launcher_foreground.xml b/res/drawable/ic_launcher_foreground.xml
index 6f3372527e..a3203d25e9 100644
--- a/res/drawable/ic_launcher_foreground.xml
+++ b/res/drawable/ic_launcher_foreground.xml
@@ -1,11 +1,15 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="108dp"
     android:height="108dp"
-    android:viewportWidth="2041.7386"
-    android:viewportHeight="2041.9318">
-  <group android:translateX="492.4193"
-      android:translateY="520.9659">
-      <path android:fillColor="#FFFFFF" android:pathData="M480,730.8l-358.6,-358.5l371.8,-371.8l99,99.1l-272.6,272.7l259.4,259.5z"/>
-      <path android:fillColor="#FFFFFF" android:pathData="M563.7,999.5l-99.1,-99.1l272.7,-272.7l-259.5,-259.5l99.1,-99l358.5,358.5z"/>
+    android:viewportWidth="1018.39685"
+    android:viewportHeight="1019.1061">
+  <group android:translateX="307.15576"
+      android:translateY="285.3497">
+      <group>
+          <clip-path android:pathData="M0,0L404.085,0L404.085,448.407L0,448.407Z M 0,0"/>
+          <path android:fillAlpha="1" android:fillColor="#00f782"
+              android:fillType="nonZero"
+              android:pathData="m288.607,420.376l-196.335,-0c-33.576,-0 -62.508,-25.748 -64.164,-59.281 -1.771,-35.847 26.883,-65.576 62.353,-65.576l113.072,-0c6.919,-0 12.527,-5.608 12.527,-12.525l0,-92.305L327.307,252.333C356.723,268.633 375.241,299.335 376.027,332.848 377.161,380.975 336.746,420.376 288.607,420.376m-211.829,-224.303c-29.416,-16.3 -47.933,-47.001 -48.721,-80.515 -1.132,-48.127 39.283,-87.528 87.42,-87.528L311.811,28.031c33.576,-0 62.508,25.748 64.165,59.283 1.771,35.845 -26.883,65.575 -62.352,65.575 0,-0 -81.316,0.013 -113.077,0.019 -6.915,0.001 -12.499,5.608 -12.501,12.523l-0.021,92.289zM340.891,227.816 L256.254,180.919l57.371,-0c49.877,-0 90.46,-40.579 90.46,-90.457 0,-49.877 -40.583,-90.461 -90.46,-90.461l-200.299,-0c-62.485,-0 -113.327,50.841 -113.327,113.327 0,44.567 24.216,85.664 63.195,107.265l84.636,46.896l-57.368,-0c-49.88,-0 -90.463,40.58 -90.463,90.457 0,49.877 40.583,90.461 90.463,90.461L290.758,448.407c62.488,-0 113.327,-50.84 113.327,-113.327 0,-44.567 -24.216,-85.664 -63.193,-107.264" android:strokeColor="#00000000"/>
+      </group>
   </group>
 </vector>
diff --git a/res/drawable/ic_microphone.xml b/res/drawable/ic_microphone.xml
new file mode 100644
index 0000000000..ec9f8e76f2
--- /dev/null
+++ b/res/drawable/ic_microphone.xml
@@ -0,0 +1,36 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="27dp"
+    android:viewportWidth="18"
+    android:viewportHeight="27">
+  <group>
+    <clip-path android:pathData="M-54,-756h375v812h-375z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-2,-2h23v31h-23z M 0,0"/>
+      <group>
+        <clip-path android:pathData="M9.36,2.25c2.02,0 3.67,1.64 3.67,3.65v6.65c0,2.01 -1.65,3.65 -3.67,3.65s-3.67,-1.64 -3.67,-3.65V5.9C5.69,3.89 7.34,2.25 9.36,2.25zM17.09,11.92c0.35,0 0.63,0.28 0.63,0.63c0,4.37 -3.41,7.97 -7.73,8.29v3.91h3.27c0.35,0 0.63,0.28 0.63,0.63S13.61,26 13.26,26H5.46c-0.35,0 -0.63,-0.28 -0.63,-0.63s0.28,-0.63 0.63,-0.63h3.27v-3.91C4.41,20.53 1,16.92 1,12.55c0,-0.35 0.28,-0.63 0.63,-0.63c0.35,0 0.62,0.28 0.61,0.63c0,3.9 3.19,7.07 7.11,7.07s7.11,-3.17 7.11,-7.07C16.46,12.2 16.74,11.92 17.09,11.92zM9.36,17.44c2.71,0 4.92,-2.2 4.92,-4.9V5.9c0,-2.7 -2.21,-4.9 -4.92,-4.9S4.44,3.2 4.44,5.9v6.65C4.44,15.25 6.65,17.44 9.36,17.44z M 0,0"/>
+        <group>
+          <clip-path android:pathData="M0,0h18v27h-18z M 0,0"/>
+          <path
+              android:pathData="M-4,-4h26.72v35h-26.72z"
+              android:strokeAlpha="0.9"
+              android:fillColor="#FFFFFF"
+              android:fillAlpha="0.9"/>
+        </group>
+      </group>
+    </group>
+    <group>
+      <clip-path android:pathData="M-2,-2h23v31h-23z M 0,0"/>
+      <group>
+        <clip-path android:pathData="M0,0h18v27h-18z M 0,0"/>
+        <path
+            android:pathData="M9.36,2.25c2.02,0 3.67,1.64 3.67,3.65v6.65c0,2.01 -1.65,3.65 -3.67,3.65s-3.67,-1.64 -3.67,-3.65V5.9C5.69,3.89 7.34,2.25 9.36,2.25zM17.09,11.92c0.35,0 0.63,0.28 0.63,0.63c0,4.37 -3.41,7.97 -7.73,8.29v3.91h3.27c0.35,0 0.63,0.28 0.63,0.63S13.61,26 13.26,26H5.46c-0.35,0 -0.63,-0.28 -0.63,-0.63s0.28,-0.63 0.63,-0.63h3.27v-3.91C4.41,20.53 1,16.92 1,12.55c0,-0.35 0.28,-0.63 0.63,-0.63s0.62,0.28 0.61,0.63c0,3.9 3.19,7.07 7.11,7.07s7.11,-3.17 7.11,-7.07C16.46,12.2 16.74,11.92 17.09,11.92zM9.36,17.44c2.71,0 4.92,-2.2 4.92,-4.9V5.9c0,-2.7 -2.21,-4.9 -4.92,-4.9S4.44,3.2 4.44,5.9v6.65C4.44,15.25 6.65,17.44 9.36,17.44z"
+            android:strokeAlpha="0.9"
+            android:strokeWidth="0.5"
+            android:fillColor="#00000000"
+            android:strokeColor="#FFFFFF"
+            android:fillAlpha="0.9"/>
+      </group>
+    </group>
+  </group>
+</vector>
diff --git a/res/drawable/ic_mute.xml b/res/drawable/ic_mute.xml
new file mode 100644
index 0000000000..2f6d3c2950
--- /dev/null
+++ b/res/drawable/ic_mute.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+  <path
+      android:pathData="M215.03,71.05L126.06,160H24c-13.26,0 -24,10.74 -24,24v144c0,13.25 10.74,24 24,24h102.06l88.97,88.95c15.03,15.03 40.97,4.47 40.97,-16.97V88.02c0,-21.46 -25.96,-31.98 -40.97,-16.97zM461.64,256l45.64,-45.64c6.3,-6.3 6.3,-16.52 0,-22.82l-22.82,-22.82c-6.3,-6.3 -16.52,-6.3 -22.82,0L416,210.36l-45.64,-45.64c-6.3,-6.3 -16.52,-6.3 -22.82,0l-22.82,22.82c-6.3,6.3 -6.3,16.52 0,22.82L370.36,256l-45.63,45.63c-6.3,6.3 -6.3,16.52 0,22.82l22.82,22.82c6.3,6.3 16.52,6.3 22.82,0L416,301.64l45.64,45.64c6.3,6.3 16.52,6.3 22.82,0l22.82,-22.82c6.3,-6.3 6.3,-16.52 0,-22.82L461.64,256z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/res/drawable/ic_plus_24.xml b/res/drawable/ic_plus_24.xml
index d287574e12..68e2e9571a 100644
--- a/res/drawable/ic_plus_24.xml
+++ b/res/drawable/ic_plus_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#FFFFFF"
       android:pathData="M22,11.2l-9.2,0l0,-9.2l-1.6,0l0,9.2l-9.2,0l0,1.6l9.2,0l0,9.2l1.6,0l0,-9.2l9.2,0z"/>
 </vector>
diff --git a/res/drawable/ic_qr_code.xml b/res/drawable/ic_qr_code.xml
new file mode 100644
index 0000000000..00ab0f639f
--- /dev/null
+++ b/res/drawable/ic_qr_code.xml
@@ -0,0 +1,240 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+  <group>
+    <clip-path android:pathData="M7.81,7.81H1.56V1.56h6.25V7.81zM9.38,0H0v9.38h9.38V0z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M-5,-5h19.38v19.38h-19.38z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M3.12,3.12h3.12v3.12h-3.12z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M-1.88,-1.88h13.12v13.12h-13.12z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M1.56,17.19h6.25v6.25H1.56V17.19zM0,25h9.38v-9.38H0V25z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M-5,10.62h19.38v19.38h-19.38z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M3.12,18.75h3.12v3.12h-3.12z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M-1.88,13.75h13.12v13.12h-13.12z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M23.44,7.81h-6.25V1.56h6.25V7.81zM15.62,0v9.38H25V0H15.62z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M10.62,-5h19.38v19.38h-19.38z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M18.75,3.12h3.12v3.12h-3.12z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M13.75,-1.88h13.12v13.12h-13.12z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M3.12,10.94l-3.12,0l0,3.12l4.69,0l0,-1.56l-1.57,0z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M-5,5.94h14.69v13.12h-14.69z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M10.94,14.06h3.12v3.12h-3.12z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M5.94,9.06h13.12v13.12h-13.12z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M4.69,10.94h3.12v1.56h-3.12z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M-0.31,5.94h13.12v11.56h-13.12z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M14.06,18.75l-3.12,0l0,1.56l1.56,0l0,1.57l1.56,0l0,-1.57z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M5.94,13.75h13.12v13.12h-13.12z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M9.38,10.94l0,1.56l-1.57,0l0,1.56l3.13,0l0,-3.12z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M2.81,5.94h13.12v13.12h-13.12z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M12.5,6.25h1.56v3.12h-1.56z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M7.5,1.25h11.56v13.12h-11.56z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M14.06,12.5l0,1.56l3.13,0l0,-3.12l-4.69,0l0,1.56z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M7.5,5.94h14.69v13.12h-14.69z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M10.94,9.38h1.56v1.56h-1.56z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M5.94,4.38h11.56v11.56h-11.56z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M14.06,21.88h3.12v3.12h-3.12z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M9.06,16.88h13.12v13.12h-13.12z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M10.94,21.88h1.56v3.12h-1.56z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M5.94,16.88h11.56v13.12h-11.56z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M14.06,17.19h1.56v1.56h-1.56z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M9.06,12.19h11.56v11.56h-11.56z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M14.06,4.69l0,-3.13l-1.56,0l0,-1.56l-1.56,0l0,6.25l1.56,0l0,-1.56z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M5.94,-5h13.12v16.25h-13.12z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M18.75,21.88h1.56v3.12h-1.56z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M13.75,16.88h11.56v13.12h-11.56z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M18.75,18.75h3.12v1.56h-3.12z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M13.75,13.75h13.12v11.56h-13.12z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M17.19,20.31h1.56v1.56h-1.56z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M12.19,15.31h11.56v11.56h-11.56z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M15.62,18.75h1.56v1.56h-1.56z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M10.62,13.75h11.56v11.56h-11.56z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M21.88,15.62l0,1.57l1.56,0l0,1.56l1.56,0l0,-3.13l-1.56,0z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M16.88,10.62h13.12v13.12h-13.12z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M23.44,20.31l-1.56,0l0,4.69l3.12,0l0,-3.12l-1.56,0z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M16.88,15.31h13.12v14.69h-13.12z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M15.62,15.62l0,1.57l4.69,0l0,-3.13l-3.12,0l0,1.56z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M10.62,9.06h14.69v13.12h-14.69z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+  <group>
+    <clip-path android:pathData="M18.75,10.94l0,1.56l3.13,0l0,1.56l3.12,0l0,-3.12l-3.12,0z M 0,0"/>
+    <group>
+      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
+      <path
+          android:pathData="M13.75,5.94h16.25v13.12h-16.25z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+</vector>
diff --git a/res/drawable/media_count_button_background.xml b/res/drawable/media_count_button_background.xml
index be4d965cfc..57cfd3a85c 100644
--- a/res/drawable/media_count_button_background.xml
+++ b/res/drawable/media_count_button_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="1000dp" />
-    <solid android:color="@color/signal_primary" />
+    <solid android:color="@color/accent" />
 </shape>
diff --git a/res/drawable/mediarail_media_outline.xml b/res/drawable/mediarail_media_outline.xml
index 8b6e4ec97f..6b6f5a68a2 100644
--- a/res/drawable/mediarail_media_outline.xml
+++ b/res/drawable/mediarail_media_outline.xml
@@ -4,5 +4,5 @@
 
     <stroke
         android:width="3dp"
-        android:color="@color/signal_primary"/>
+        android:color="@color/accent"/>
 </shape>
\ No newline at end of file
diff --git a/res/drawable/mention_candidate_view_background.xml b/res/drawable/mention_candidate_view_background.xml
new file mode 100644
index 0000000000..af9549d111
--- /dev/null
+++ b/res/drawable/mention_candidate_view_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/cell_selected">
+
+    <item>
+        <color android:color="@color/compose_view_background" />
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/res/drawable/new_conversation_button_background.xml b/res/drawable/new_conversation_button_background.xml
new file mode 100644
index 0000000000..be48173893
--- /dev/null
+++ b/res/drawable/new_conversation_button_background.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <gradient android:type="radial" android:gradientRadius="36dp" android:startColor="@color/accent" android:endColor="@android:color/transparent" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/new_conversation_button_foreground.xml b/res/drawable/new_conversation_button_foreground.xml
new file mode 100644
index 0000000000..44bb8f9675
--- /dev/null
+++ b/res/drawable/new_conversation_button_foreground.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid android:color="@color/accent" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/permission_rationale_dialog_corners.xml b/res/drawable/permission_rationale_dialog_corners.xml
index 749c9a74bc..cce2c87f18 100644
--- a/res/drawable/permission_rationale_dialog_corners.xml
+++ b/res/drawable/permission_rationale_dialog_corners.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-    <solid android:color="?attr/dialog_background_color"/>
-    <corners android:radius="20dp"/>
+
+    <solid android:color="@color/compose_view_background"/>
+
+    <corners android:radius="12dp"/>
 </shape>
\ No newline at end of file
diff --git a/res/drawable/pill.xml b/res/drawable/pill.xml
index be4d965cfc..57cfd3a85c 100644
--- a/res/drawable/pill.xml
+++ b/res/drawable/pill.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="1000dp" />
-    <solid android:color="@color/signal_primary" />
+    <solid android:color="@color/accent" />
 </shape>
diff --git a/res/drawable/profile_picture_view_large_background.xml b/res/drawable/profile_picture_view_large_background.xml
new file mode 100644
index 0000000000..bfc404e25f
--- /dev/null
+++ b/res/drawable/profile_picture_view_large_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/unimportant" />
+
+    <corners android:radius="38dp" />
+
+    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/border" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/profile_picture_view_large_foreground.xml b/res/drawable/profile_picture_view_large_foreground.xml
new file mode 100644
index 0000000000..18cac49b38
--- /dev/null
+++ b/res/drawable/profile_picture_view_large_foreground.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/transparent" />
+
+    <corners android:radius="38dp" />
+
+    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/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
new file mode 100644
index 0000000000..287d6298e2
--- /dev/null
+++ b/res/drawable/profile_picture_view_medium_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/unimportant" />
+
+    <corners android:radius="23dp" />
+
+    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/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
new file mode 100644
index 0000000000..e62cfbe3fb
--- /dev/null
+++ b/res/drawable/profile_picture_view_medium_foreground.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/transparent" />
+
+    <corners android:radius="23dp" />
+
+    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/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
new file mode 100644
index 0000000000..b060c41b4b
--- /dev/null
+++ b/res/drawable/profile_picture_view_rss_medium_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="#353535" />
+
+    <corners android:radius="23dp" />
+
+    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/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
new file mode 100644
index 0000000000..2f44fefe9f
--- /dev/null
+++ b/res/drawable/profile_picture_view_small_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/unimportant" />
+
+    <corners android:radius="18dp" />
+
+    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/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
new file mode 100644
index 0000000000..98d2b0a4e7
--- /dev/null
+++ b/res/drawable/profile_picture_view_small_foreground.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/transparent" />
+
+    <corners android:radius="18dp" />
+
+    <stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/border" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/prominent_dialog_button_background.xml b/res/drawable/prominent_dialog_button_background.xml
new file mode 100644
index 0000000000..de3409d482
--- /dev/null
+++ b/res/drawable/prominent_dialog_button_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/accent" />
+
+    <corners android:radius="@dimen/dialog_button_corner_radius" />
+
+    <stroke android:width="@dimen/border_thickness" android:color="@color/accent" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/prominent_filled_button_medium_background.xml b/res/drawable/prominent_filled_button_medium_background.xml
new file mode 100644
index 0000000000..9e4eeed50c
--- /dev/null
+++ b/res/drawable/prominent_filled_button_medium_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/accent" />
+
+    <corners android:radius="22dp" />
+
+    <stroke android:width="@dimen/border_thickness" android:color="@color/accent" />
+</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
new file mode 100644
index 0000000000..b5f3dc5355
--- /dev/null
+++ b/res/drawable/prominent_outline_button_medium_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/transparent" />
+
+    <corners android:radius="22dp" />
+
+    <stroke android:width="@dimen/border_thickness" android:color="@color/accent" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/scroll_to_bottom_button_background.xml b/res/drawable/scroll_to_bottom_button_background.xml
new file mode 100644
index 0000000000..68e512346c
--- /dev/null
+++ b/res/drawable/scroll_to_bottom_button_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@color/compose_view_background" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/session_edit_text_background.xml b/res/drawable/session_edit_text_background.xml
new file mode 100644
index 0000000000..3d6f49d7aa
--- /dev/null
+++ b/res/drawable/session_edit_text_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <stroke
+        android:color="@color/text"
+        android:width="@dimen/border_thickness" />
+
+    <corners android:radius="@dimen/text_view_corner_radius" />
+
+</shape>
\ No newline at end of file
diff --git a/res/drawable/session_edit_text_cursor.xml b/res/drawable/session_edit_text_cursor.xml
new file mode 100644
index 0000000000..af3edcf4de
--- /dev/null
+++ b/res/drawable/session_edit_text_cursor.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <size android:width="2dp" />
+
+    <solid android:color="@color/accent"  />
+
+</shape>
\ No newline at end of file
diff --git a/res/drawable/session_id_text_view_background.xml b/res/drawable/session_id_text_view_background.xml
new file mode 100644
index 0000000000..3d6f49d7aa
--- /dev/null
+++ b/res/drawable/session_id_text_view_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <stroke
+        android:color="@color/text"
+        android:width="@dimen/border_thickness" />
+
+    <corners android:radius="@dimen/text_view_corner_radius" />
+
+</shape>
\ No newline at end of file
diff --git a/res/drawable/session_logo.xml b/res/drawable/session_logo.xml
new file mode 100644
index 0000000000..f88a4f21a9
--- /dev/null
+++ b/res/drawable/session_logo.xml
@@ -0,0 +1,9 @@
+<vector android:height="24dp" android:viewportHeight="448.40668"
+    android:viewportWidth="404.08533" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <group>
+        <clip-path android:pathData="M0,0L404.085,0L404.085,448.407L0,448.407Z M 0,0"/>
+        <path android:fillAlpha="1" android:fillColor="#00f782"
+            android:fillType="nonZero"
+            android:pathData="m288.607,420.376l-196.335,-0c-33.576,-0 -62.508,-25.748 -64.164,-59.281 -1.771,-35.847 26.883,-65.576 62.353,-65.576l113.072,-0c6.919,-0 12.527,-5.608 12.527,-12.525l0,-92.305L327.307,252.333C356.723,268.633 375.241,299.335 376.027,332.848 377.161,380.975 336.746,420.376 288.607,420.376m-211.829,-224.303c-29.416,-16.3 -47.933,-47.001 -48.721,-80.515 -1.132,-48.127 39.283,-87.528 87.42,-87.528L311.811,28.031c33.576,-0 62.508,25.748 64.165,59.283 1.771,35.845 -26.883,65.575 -62.352,65.575 0,-0 -81.316,0.013 -113.077,0.019 -6.915,0.001 -12.499,5.608 -12.501,12.523l-0.021,92.289zM340.891,227.816 L256.254,180.919l57.371,-0c49.877,-0 90.46,-40.579 90.46,-90.457 0,-49.877 -40.583,-90.461 -90.46,-90.461l-200.299,-0c-62.485,-0 -113.327,50.841 -113.327,113.327 0,44.567 24.216,85.664 63.195,107.265l84.636,46.896l-57.368,-0c-49.88,-0 -90.463,40.58 -90.463,90.457 0,49.877 40.583,90.461 90.463,90.461L290.758,448.407c62.488,-0 113.327,-50.84 113.327,-113.327 0,-44.567 -24.216,-85.664 -63.193,-107.264" android:strokeColor="#00000000"/>
+    </group>
+</vector>
diff --git a/res/drawable/setting_button_background.xml b/res/drawable/setting_button_background.xml
new file mode 100644
index 0000000000..ee5f321c99
--- /dev/null
+++ b/res/drawable/setting_button_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/cell_selected">
+
+    <item>
+        <color android:color="@color/cell_background" />
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/res/drawable/sticky_date_header_background_dark.xml b/res/drawable/sticky_date_header_background_dark.xml
index 554dd74efa..d17517d372 100644
--- a/res/drawable/sticky_date_header_background_dark.xml
+++ b/res/drawable/sticky_date_header_background_dark.xml
@@ -4,5 +4,6 @@
     android:shape="rectangle">
 
     <corners android:radius="4dp" />
-    <solid android:color="@color/core_grey_90" />
+
+    <solid android:color="@color/compose_view_background" />
 </shape>
\ No newline at end of file
diff --git a/res/drawable/unimportant_dialog_button_background.xml b/res/drawable/unimportant_dialog_button_background.xml
new file mode 100644
index 0000000000..a1d03bb009
--- /dev/null
+++ b/res/drawable/unimportant_dialog_button_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/unimportant_dialog_button_background" />
+
+    <corners android:radius="@dimen/dialog_button_corner_radius" />
+
+    <stroke android:width="@dimen/border_thickness" android:color="@color/unimportant_dialog_button_background" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/unimportant_filled_button_medium_background.xml b/res/drawable/unimportant_filled_button_medium_background.xml
new file mode 100644
index 0000000000..4880fd4fed
--- /dev/null
+++ b/res/drawable/unimportant_filled_button_medium_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/unimportant_button_background" />
+
+    <corners android:radius="22dp" />
+
+    <stroke android:width="@dimen/border_thickness" android:color="@color/unimportant_button_background" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/unimportant_outline_button_medium_background.xml b/res/drawable/unimportant_outline_button_medium_background.xml
new file mode 100644
index 0000000000..81471826c3
--- /dev/null
+++ b/res/drawable/unimportant_outline_button_medium_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="@color/transparent" />
+
+    <corners android:radius="22dp" />
+
+    <stroke android:width="@dimen/border_thickness" android:color="@color/text" />
+</shape>
\ No newline at end of file
diff --git a/res/font/roboto_light.ttf b/res/font/roboto_light.ttf
new file mode 100644
index 0000000000..13bf13af00
Binary files /dev/null and b/res/font/roboto_light.ttf differ
diff --git a/res/font/space_mono_bold.ttf b/res/font/space_mono_bold.ttf
new file mode 100644
index 0000000000..4acd36ac38
Binary files /dev/null and b/res/font/space_mono_bold.ttf differ
diff --git a/res/font/space_mono_regular.ttf b/res/font/space_mono_regular.ttf
new file mode 100644
index 0000000000..28d7ff7177
Binary files /dev/null and b/res/font/space_mono_regular.ttf differ
diff --git a/res/layout-sw400dp/activity_display_name_v2.xml b/res/layout-sw400dp/activity_display_name_v2.xml
new file mode 100644
index 0000000000..00bafed0aa
--- /dev/null
+++ b/res/layout-sw400dp/activity_display_name_v2.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/default_session_background"
+    android:orientation="vertical">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:textSize="@dimen/very_large_font_size"
+        android:textStyle="bold"
+        android:textColor="@color/text"
+        android:text="Pick your display name" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginTop="10dp"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:textSize="@dimen/medium_font_size"
+        android:textColor="@color/text"
+        android:text="This is how others will be able to recognize you." />
+
+    <EditText
+        style="@style/SessionEditText"
+        android:id="@+id/displayNameEditText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginTop="@dimen/medium_spacing"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:hint="Enter a display name" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <Button
+        style="@style/MediumProminentFilledButton"
+        android:id="@+id/registerButton"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/medium_button_height"
+        android:layout_marginLeft="@dimen/massive_spacing"
+        android:layout_marginRight="@dimen/massive_spacing"
+        android:layout_marginBottom="@dimen/medium_spacing"
+        android:text="Continue" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw400dp/activity_landing.xml b/res/layout-sw400dp/activity_landing.xml
new file mode 100644
index 0000000000..42d38fa3f9
--- /dev/null
+++ b/res/layout-sw400dp/activity_landing.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/default_session_background"
+    android:orientation="vertical">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:textSize="@dimen/very_large_font_size"
+        android:textStyle="bold"
+        android:textColor="@color/text"
+        android:text="Your Session begins here..." />
+    
+    <org.thoughtcrime.securesms.loki.redesign.views.FakeChatView
+        android:id="@+id/fakeChatView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/fake_chat_view_height"
+        android:layout_marginTop="@dimen/medium_spacing" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <Button
+        style="@style/MediumProminentFilledButton"
+        android:id="@+id/registerButton"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/medium_button_height"
+        android:layout_marginLeft="@dimen/massive_spacing"
+        android:layout_marginRight="@dimen/massive_spacing"
+        android:text="Create Account" />
+
+    <Button
+        style="@style/MediumProminentOutlineButton"
+        android:id="@+id/restoreButton"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/medium_button_height"
+        android:layout_marginLeft="@dimen/massive_spacing"
+        android:layout_marginTop="@dimen/medium_spacing"
+        android:layout_marginRight="@dimen/massive_spacing"
+        android:text="Continue Your Session" />
+
+    <Button
+        android:id="@+id/linkButton"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/onboarding_button_bottom_offset"
+        android:layout_marginLeft="@dimen/massive_spacing"
+        android:layout_marginRight="@dimen/massive_spacing"
+        android:gravity="center"
+        android:background="@color/transparent"
+        android:textAllCaps="false"
+        android:textSize="@dimen/medium_font_size"
+        android:textColor="@color/text"
+        android:text="Link to an existing account" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw400dp/activity_register.xml b/res/layout-sw400dp/activity_register.xml
new file mode 100644
index 0000000000..e04c544fae
--- /dev/null
+++ b/res/layout-sw400dp/activity_register.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/default_session_background"
+    android:orientation="vertical">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:textSize="@dimen/very_large_font_size"
+        android:textStyle="bold"
+        android:textColor="@color/text"
+        android:text="Say hello to your Session ID" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginTop="10dp"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:textSize="@dimen/medium_font_size"
+        android:textColor="@color/text"
+        android:text="Your Session ID is the unique address that people can use to contact you on Session. With no connection to your real identity, your Session ID is totally anonymous and private by design." />
+
+    <TextView
+        style="@style/SessionIDTextView"
+        android:id="@+id/publicKeyTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginTop="@dimen/medium_spacing"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <Button
+        style="@style/MediumProminentFilledButton"
+        android:id="@+id/registerButton"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/medium_button_height"
+        android:layout_marginLeft="@dimen/massive_spacing"
+        android:layout_marginRight="@dimen/massive_spacing"
+        android:text="Continue" />
+
+    <Button
+        style="@style/MediumProminentOutlineButton"
+        android:id="@+id/copyButton"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/medium_button_height"
+        android:layout_marginLeft="@dimen/massive_spacing"
+        android:layout_marginTop="@dimen/medium_spacing"
+        android:layout_marginRight="@dimen/massive_spacing"
+        android:text="Copy" />
+
+    <Button
+        android:id="@+id/termsButton"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/onboarding_button_bottom_offset"
+        android:layout_marginLeft="@dimen/massive_spacing"
+        android:layout_marginRight="@dimen/massive_spacing"
+        android:gravity="center"
+        android:background="@color/transparent"
+        android:textAllCaps="false"
+        android:textSize="@dimen/very_small_font_size"
+        android:textColor="@color/text"
+        android:text="By using this service, you agree to our Terms and Conditions and Privacy Statement" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw400dp/activity_restore.xml b/res/layout-sw400dp/activity_restore.xml
new file mode 100644
index 0000000000..1697ebc224
--- /dev/null
+++ b/res/layout-sw400dp/activity_restore.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/default_session_background"
+    android:orientation="vertical">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:textSize="@dimen/very_large_font_size"
+        android:textStyle="bold"
+        android:textColor="@color/text"
+        android:text="Restore your account" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginTop="10dp"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:textSize="@dimen/medium_font_size"
+        android:textColor="@color/text"
+        android:text="Enter the recovery phrase that was given to you when you signed up to restore your account." />
+
+    <EditText
+        style="@style/SessionEditText"
+        android:id="@+id/mnemonicEditText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginTop="@dimen/medium_spacing"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:hint="Enter your recovery phrase" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <Button
+        style="@style/MediumProminentFilledButton"
+        android:id="@+id/restoreButton"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/medium_button_height"
+        android:layout_marginLeft="@dimen/massive_spacing"
+        android:layout_marginRight="@dimen/massive_spacing"
+        android:text="Continue" />
+
+    <Button
+        android:id="@+id/termsButton"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/onboarding_button_bottom_offset"
+        android:layout_marginLeft="@dimen/massive_spacing"
+        android:layout_marginRight="@dimen/massive_spacing"
+        android:gravity="center"
+        android:background="@color/transparent"
+        android:textAllCaps="false"
+        android:textSize="@dimen/very_small_font_size"
+        android:textColor="@color/text"
+        android:text="By using this service, you agree to our Terms and Conditions and Privacy Statement" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw400dp/activity_seed_v2.xml b/res/layout-sw400dp/activity_seed_v2.xml
new file mode 100644
index 0000000000..d0adaaef01
--- /dev/null
+++ b/res/layout-sw400dp/activity_seed_v2.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/default_session_background"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <org.thoughtcrime.securesms.loki.redesign.views.SeedReminderView
+        android:id="@+id/seedReminderView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:textSize="@dimen/very_large_font_size"
+        android:textStyle="bold"
+        android:textColor="@color/text"
+        android:text="Meet your recovery phrase" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginTop="10dp"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:textSize="@dimen/medium_font_size"
+        android:textColor="@color/text"
+        android:text="Think of this as the crypto-equivalent of a social security number. This allows whomever has it complete access to your account." />
+
+    <TextView
+        style="@style/SessionIDTextView"
+        android:id="@+id/seedTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginTop="@dimen/medium_spacing"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:gravity="center"
+        android:textSize="@dimen/medium_font_size"
+        android:textAlignment="center"
+        android:text="nautical novelty populate onion awkward bent etiquette plant submarine itches vipers september axis maximum populate" />
+
+    <TextView
+        android:id="@+id/revealButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:textAlignment="center"
+        android:textSize="@dimen/medium_font_size"
+        android:textColor="@color/text"
+        android:alpha="0.6"
+        android:text="Hold to reveal" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <Button
+        style="@style/MediumProminentOutlineButton"
+        android:id="@+id/copyButton"
+        android:layout_width="196dp"
+        android:layout_height="@dimen/medium_button_height"
+        android:layout_marginBottom="@dimen/medium_spacing"
+        android:text="Copy" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw400dp/fragment_enter_chat_url.xml b/res/layout-sw400dp/fragment_enter_chat_url.xml
new file mode 100644
index 0000000000..7f914aa915
--- /dev/null
+++ b/res/layout-sw400dp/fragment_enter_chat_url.xml
@@ -0,0 +1,46 @@
+<?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:background="@drawable/default_session_background"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <EditText
+        style="@style/SessionEditText"
+        android:id="@+id/chatURLEditText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/large_spacing"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:layout_marginRight="@dimen/large_spacing"
+        android:hint="https://chat.lokinet.org" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/large_spacing"
+        android:layout_marginTop="@dimen/medium_spacing"
+        android:layout_marginRight="@dimen/large_spacing"
+        android:textSize="@dimen/small_font_size"
+        android:textColor="@color/text"
+        android:alpha="0.6"
+        android:textAlignment="center"
+        android:text="Enter the URL of the channel you'd like to join" />
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <Button
+        style="@style/MediumProminentOutlineButton"
+        android:id="@+id/joinPublicChatButton"
+        android:layout_width="196dp"
+        android:layout_height="@dimen/medium_button_height"
+        android:layout_marginBottom="@dimen/medium_spacing"
+        android:text="Next" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw400dp/fragment_enter_public_key.xml b/res/layout-sw400dp/fragment_enter_public_key.xml
new file mode 100644
index 0000000000..a2e53ce92d
--- /dev/null
+++ b/res/layout-sw400dp/fragment_enter_public_key.xml
@@ -0,0 +1,94 @@
+<?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:background="@drawable/default_session_background"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <EditText
+        style="@style/SessionEditText"
+        android:id="@+id/publicKeyEditText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/large_spacing"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:layout_marginRight="@dimen/large_spacing"
+        android:hint="Enter Session ID of recipient" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/large_spacing"
+        android:layout_marginTop="@dimen/medium_spacing"
+        android:layout_marginRight="@dimen/large_spacing"
+        android:textSize="@dimen/small_font_size"
+        android:textColor="@color/text"
+        android:alpha="0.6"
+        android:textAlignment="center"
+        android:text="Users can share their Session ID by going into their account settings and tapping &quot;Share Session ID&quot;, or by sharing their QR code." />
+    
+    <org.thoughtcrime.securesms.loki.redesign.views.SeparatorView
+        android:id="@+id/separatorView"
+        android:layout_width="match_parent"
+        android:layout_height="32dp"
+        android:layout_marginLeft="@dimen/large_spacing"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:layout_marginRight="@dimen/large_spacing" />
+
+    <TextView
+        android:id="@+id/publicKeyTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/large_spacing"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:layout_marginRight="@dimen/large_spacing"
+        android:textSize="@dimen/medium_font_size"
+        android:textColor="@color/text"
+        android:fontFamily="@font/space_mono_regular"
+        android:textAlignment="center"
+        android:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/large_spacing"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:layout_marginRight="@dimen/large_spacing"
+        android:orientation="horizontal">
+
+        <Button
+            style="@style/MediumUnimportantFilledButton"
+            android:id="@+id/copyButton"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/medium_button_height"
+            android:layout_weight="1"
+            android:text="Copy" />
+
+        <Button
+            style="@style/MediumUnimportantFilledButton"
+            android:id="@+id/shareButton"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/medium_button_height"
+            android:layout_weight="1"
+            android:layout_marginLeft="@dimen/medium_spacing"
+            android:text="Share" />
+
+    </LinearLayout>
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <Button
+        style="@style/MediumProminentOutlineButton"
+        android:id="@+id/createPrivateChatButton"
+        android:layout_width="196dp"
+        android:layout_height="@dimen/medium_button_height"
+        android:layout_marginBottom="@dimen/medium_spacing"
+        android:text="Next" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw400dp/fragment_enter_session_id.xml b/res/layout-sw400dp/fragment_enter_session_id.xml
new file mode 100644
index 0000000000..3eb2aff559
--- /dev/null
+++ b/res/layout-sw400dp/fragment_enter_session_id.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/default_session_background"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/large_spacing"
+        android:layout_marginRight="@dimen/large_spacing"
+        android:textSize="@dimen/very_large_font_size"
+        android:textStyle="bold"
+        android:textColor="@color/text"
+        android:text="Link your device" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/large_spacing"
+        android:layout_marginTop="10dp"
+        android:layout_marginRight="@dimen/large_spacing"
+        android:textSize="@dimen/medium_font_size"
+        android:textColor="@color/text"
+        android:text="Enter your Session ID to start the linking process." />
+
+    <EditText
+        style="@style/SessionEditText"
+        android:id="@+id/sessionIDEditText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/large_spacing"
+        android:layout_marginTop="@dimen/medium_spacing"
+        android:layout_marginRight="@dimen/large_spacing"
+        android:hint="Enter your session ID" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <Button
+        style="@style/MediumProminentOutlineButton"
+        android:id="@+id/requestDeviceLinkButton"
+        android:layout_width="196dp"
+        android:layout_height="@dimen/medium_button_height"
+        android:layout_marginBottom="@dimen/medium_spacing"
+        android:text="Next" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw420dp/attachment_type_selector.xml b/res/layout-sw420dp/attachment_type_selector.xml
new file mode 100644
index 0000000000..c17d36400c
--- /dev/null
+++ b/res/layout-sw420dp/attachment_type_selector.xml
@@ -0,0 +1,267 @@
+<?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:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="4dp"
+        android:background="@drawable/attachment_selector_shadow"/>
+
+    <LinearLayout
+        android:id="@+id/contentView"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attachment_type_selector_background">
+
+        <org.thoughtcrime.securesms.components.RecentPhotoViewRail
+            android:id="@+id/recent_photos"
+            android:layout_width="match_parent"
+            android:layout_height="90dp"
+            android:padding="4dp"/>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="2dp"
+            android:layout_marginEnd="16dp"
+            android:weightSum="3">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <org.thoughtcrime.securesms.components.CircleColorImageView
+                    android:id="@+id/gallery_button"
+                    android:layout_width="53dp"
+                    android:layout_height="53dp"
+                    android:src="@drawable/ic_image_white_24dp"
+                    android:scaleType="center"
+                    android:contentDescription="@string/attachment_type_selector__gallery_description"
+                    app:circleColor="@color/purple_400"/>
+
+                <TextView
+                    android:layout_marginTop="10dp"
+                    style="@style/AttachmentTypeLabel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/attachment_type_selector__gallery"/>
+
+            </LinearLayout>
+
+            <LinearLayout android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <org.thoughtcrime.securesms.components.CircleColorImageView
+                    android:id="@+id/camera_button"
+                    android:layout_width="53dp"
+                    android:layout_height="53dp"
+                    android:src="@drawable/ic_camera_white_24dp"
+                    android:scaleType="center"
+                    android:contentDescription="@string/attachment_type_selector__camera_description"
+                    app:circleColor="@color/green_400"/>
+
+                <TextView
+                    android:layout_marginTop="10dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    style="@style/AttachmentTypeLabel"
+                    android:text="@string/attachment_type_selector__camera"/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+                <org.thoughtcrime.securesms.components.CircleColorImageView
+                    android:id="@+id/audio_button"
+                    android:layout_width="53dp"
+                    android:layout_height="53dp"
+                    android:contentDescription="@string/attachment_type_selector__audio_description"
+                    android:scaleType="center"
+                    android:src="@drawable/ic_headset_white_24dp"
+                    app:circleColor="@color/orange_400" />
+
+                <TextView
+                    style="@style/AttachmentTypeLabel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:text="@string/attachment_type_selector__audio" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <org.thoughtcrime.securesms.components.CircleColorImageView
+                    android:id="@+id/document_button"
+                    android:layout_width="53dp"
+                    android:layout_height="53dp"
+                    android:contentDescription="@string/attachment_type_selector__file_description"
+                    android:scaleType="center"
+                    android:src="@drawable/ic_insert_drive_file_white_24dp"
+                    app:circleColor="@color/red_400" />
+
+                <TextView
+                    style="@style/AttachmentTypeLabel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:text="@string/attachment_type_selector__file" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:layout_weight="1"
+                android:visibility="gone">
+
+                <org.thoughtcrime.securesms.components.CircleColorImageView
+                    android:id="@+id/contact_button"
+                    android:layout_width="53dp"
+                    android:layout_height="53dp"
+                    android:src="@drawable/ic_person_white_24dp"
+                    android:scaleType="center"
+                    android:contentDescription="@string/attachment_type_selector__contact_description"
+                    app:circleColor="@color/blue_400"/>
+
+                <TextView
+                    android:layout_marginTop="10dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/AttachmentTypeLabel"
+                    android:text="@string/attachment_type_selector__contact"/>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            android:weightSum="3">
+
+            <LinearLayout
+                android:id="@+id/location_linear_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:visibility="invisible">
+
+                <org.thoughtcrime.securesms.components.CircleColorImageView
+                    android:id="@+id/location_button"
+                    android:layout_width="53dp"
+                    android:layout_height="53dp"
+                    android:contentDescription="@string/attachment_type_selector__location_description"
+                    android:scaleType="center"
+                    android:src="@drawable/ic_location_on_white_24dp"
+                    app:circleColor="@color/blue_grey_400" />
+
+                <TextView
+                    style="@style/AttachmentTypeLabel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:text="@string/attachment_type_selector__location" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <org.thoughtcrime.securesms.components.CircleColorImageView
+                    android:id="@+id/giphy_button"
+                    android:layout_width="53dp"
+                    android:layout_height="53dp"
+                    android:src="@drawable/ic_gif_white_24dp"
+                    android:scaleType="center"
+                    android:contentDescription="@string/attachment_type_selector__gif_description"
+                    app:circleColor="@color/cyan_400"/>
+
+                <TextView
+                    android:layout_marginTop="10dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/AttachmentTypeLabel"
+                    android:text="@string/attachment_type_selector__gif"/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <org.thoughtcrime.securesms.components.CircleColorImageView
+                    android:id="@+id/close_button"
+                    android:layout_width="53dp"
+                    android:layout_height="53dp"
+                    android:paddingTop="4dp"
+                    android:src="@drawable/ic_keyboard_arrow_down_white_24dp"
+                    android:scaleType="center"
+                    android:contentDescription="@string/attachment_type_selector__drawer_description"
+                    app:circleColor="@color/gray50"/>
+
+                <TextView
+                    android:layout_marginTop="10dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/AttachmentTypeLabel"
+                    android:text=""/>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/activity_create_private_chat.xml b/res/layout/activity_create_private_chat.xml
new file mode 100644
index 0000000000..d6bf8f66d7
--- /dev/null
+++ b/res/layout/activity_create_private_chat.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.view.ViewPager
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/viewPager"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <android.support.design.widget.TabLayout
+        style="@style/Session.DarkTabLayout"
+        android:id="@+id/tabLayout"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/tab_bar_height" />
+
+</android.support.v4.view.ViewPager>
\ No newline at end of file
diff --git a/res/layout/activity_display_name_v2.xml b/res/layout/activity_display_name_v2.xml
new file mode 100644
index 0000000000..3d068b6dbd
--- /dev/null
+++ b/res/layout/activity_display_name_v2.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/default_session_background"
+    android:orientation="vertical">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:textSize="@dimen/large_font_size"
+        android:textStyle="bold"
+        android:textColor="@color/text"
+        android:text="Pick your display name" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginTop="6dp"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:textSize="@dimen/small_font_size"
+        android:textColor="@color/text"
+        android:text="This is how others will be able to recognize you." />
+
+    <EditText
+        style="@style/SmallSessionEditText"
+        android:id="@+id/displayNameEditText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginTop="12dp"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:hint="Enter a display name" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <Button
+        style="@style/MediumProminentFilledButton"
+        android:id="@+id/registerButton"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/medium_button_height"
+        android:layout_marginLeft="@dimen/massive_spacing"
+        android:layout_marginRight="@dimen/massive_spacing"
+        android:layout_marginBottom="@dimen/small_spacing"
+        android:text="Continue" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/activity_fragment_wrapper.xml b/res/layout/activity_fragment_wrapper.xml
new file mode 100644
index 0000000000..216b135045
--- /dev/null
+++ b/res/layout/activity_fragment_wrapper.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/fragmentContainer"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/res/layout/activity_home.xml b/res/layout/activity_home.xml
new file mode 100644
index 0000000000..b7e57498f7
--- /dev/null
+++ b/res/layout/activity_home.xml
@@ -0,0 +1,102 @@
+<?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"
+    android:background="@drawable/default_session_background"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:minHeight="?attr/actionBarSize"
+        app:contentInsetLeft="20dp"
+        app:contentInsetRight="20dp"
+        android:theme="?attr/actionBarStyle">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <org.thoughtcrime.securesms.loki.redesign.views.ProfilePictureView
+                android:id="@+id/profileButton"
+                android:layout_width="@dimen/small_profile_picture_size"
+                android:layout_height="@dimen/small_profile_picture_size"
+                android:layout_marginLeft="10dp"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Messages"
+                android:textColor="@color/text"
+                android:textSize="@dimen/very_large_font_size"
+                android:fontFamily="sans-serif-medium"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="64dp" />
+
+            <ImageView
+                android:id="@+id/joinPublicChatButton"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/ic_globe"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true" />
+
+        </RelativeLayout>
+
+    </android.support.v7.widget.Toolbar>
+
+    <org.thoughtcrime.securesms.loki.redesign.views.SeedReminderView
+        android:id="@+id/seedReminderView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/recyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+        <!-- The button below intentionally uses dp for the text size and not sp -->
+
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="@dimen/new_conversation_button_bottom_offset">
+
+            <View
+                android:layout_width="72dp"
+                android:layout_height="72dp"
+                android:background="@drawable/new_conversation_button_background" />
+
+            <Button
+                android:id="@+id/newConversationButton"
+                android:layout_width="@dimen/new_conversation_button_size"
+                android:layout_height="@dimen/new_conversation_button_size"
+                android:layout_centerInParent="true"
+                android:paddingLeft="1dp"
+                android:paddingBottom="2dp"
+                android:background="@drawable/new_conversation_button_foreground"
+                android:fontFamily="@font/roboto_light"
+                android:textSize="40dp"
+                android:textColor="#121212"
+                android:text="+"
+                android:elevation="0dp"
+                android:stateListAnimator="@null" />
+
+        </RelativeLayout>
+
+    </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/activity_join_public_chat.xml b/res/layout/activity_join_public_chat.xml
new file mode 100644
index 0000000000..3ad2c9465d
--- /dev/null
+++ b/res/layout/activity_join_public_chat.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    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="match_parent">
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/viewPager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" >
+
+        <android.support.design.widget.TabLayout
+            style="@style/Session.DarkTabLayout"
+            android:id="@+id/tabLayout"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/tab_bar_height" />
+
+    </android.support.v4.view.ViewPager>
+
+    <RelativeLayout
+        android:id="@+id/loader"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#A4000000"
+        android:visibility="gone"
+        android:alpha="0">
+
+        <com.github.ybq.android.spinkit.SpinKitView
+            style="@style/SpinKitView.Large.ThreeBounce"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_centerInParent="true"
+            app:SpinKit_Color="@color/text" />
+
+    </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/activity_landing.xml b/res/layout/activity_landing.xml
new file mode 100644
index 0000000000..dec625033b
--- /dev/null
+++ b/res/layout/activity_landing.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/default_session_background"
+    android:orientation="vertical">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:textSize="@dimen/large_font_size"
+        android:textStyle="bold"
+        android:textColor="@color/text"
+        android:text="Your Session begins here..." />
+    
+    <org.thoughtcrime.securesms.loki.redesign.views.FakeChatView
+        android:id="@+id/fakeChatView"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/fake_chat_view_height"
+        android:layout_marginTop="@dimen/small_spacing" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <Button
+        style="@style/MediumProminentFilledButton"
+        android:id="@+id/registerButton"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/medium_button_height"
+        android:layout_marginLeft="@dimen/massive_spacing"
+        android:layout_marginRight="@dimen/massive_spacing"
+        android:text="Create Account" />
+
+    <Button
+        style="@style/MediumProminentOutlineButton"
+        android:id="@+id/restoreButton"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/medium_button_height"
+        android:layout_marginLeft="@dimen/massive_spacing"
+        android:layout_marginTop="@dimen/small_spacing"
+        android:layout_marginRight="@dimen/massive_spacing"
+        android:text="Continue Your Session" />
+
+    <Button
+        android:id="@+id/linkButton"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/onboarding_button_bottom_offset"
+        android:layout_marginLeft="@dimen/massive_spacing"
+        android:layout_marginRight="@dimen/massive_spacing"
+        android:gravity="center"
+        android:background="@color/transparent"
+        android:textAllCaps="false"
+        android:textSize="@dimen/medium_font_size"
+        android:textColor="@color/text"
+        android:text="Link to an existing account" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/activity_link_device.xml b/res/layout/activity_link_device.xml
new file mode 100644
index 0000000000..d6bf8f66d7
--- /dev/null
+++ b/res/layout/activity_link_device.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.view.ViewPager
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/viewPager"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <android.support.design.widget.TabLayout
+        style="@style/Session.DarkTabLayout"
+        android:id="@+id/tabLayout"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/tab_bar_height" />
+
+</android.support.v4.view.ViewPager>
\ No newline at end of file
diff --git a/res/layout/activity_linked_devices.xml b/res/layout/activity_linked_devices.xml
new file mode 100644
index 0000000000..c816e18295
--- /dev/null
+++ b/res/layout/activity_linked_devices.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/default_session_background">
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        android:layout_centerInParent="true">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/medium_font_size"
+            android:textColor="@color/text"
+            android:text="You don't have any linked devices yet" />
+
+        <Button
+            style="@style/MediumProminentOutlineButton"
+            android:id="@+id/linkDeviceButton"
+            android:layout_width="196dp"
+            android:layout_height="@dimen/medium_button_height"
+            android:layout_marginTop="@dimen/medium_spacing"
+            android:text="Link a Device" />
+
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/activity_qr_code.xml b/res/layout/activity_qr_code.xml
new file mode 100644
index 0000000000..d6bf8f66d7
--- /dev/null
+++ b/res/layout/activity_qr_code.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.view.ViewPager
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/viewPager"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <android.support.design.widget.TabLayout
+        style="@style/Session.DarkTabLayout"
+        android:id="@+id/tabLayout"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/tab_bar_height" />
+
+</android.support.v4.view.ViewPager>
\ No newline at end of file
diff --git a/res/layout/activity_register.xml b/res/layout/activity_register.xml
new file mode 100644
index 0000000000..3a61f6aa98
--- /dev/null
+++ b/res/layout/activity_register.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/default_session_background"
+    android:orientation="vertical">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:textSize="@dimen/large_font_size"
+        android:textStyle="bold"
+        android:textColor="@color/text"
+        android:text="Say hello to your Session ID" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginTop="6dp"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:textSize="@dimen/small_font_size"
+        android:textColor="@color/text"
+        android:text="Your Session ID is the unique address that people can use to contact you on Session. With no connection to your real identity, your Session ID is totally anonymous and private by design." />
+
+    <TextView
+        style="@style/SessionIDTextView"
+        android:id="@+id/publicKeyTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="18dp"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginTop="12dp"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <Button
+        style="@style/MediumProminentFilledButton"
+        android:id="@+id/registerButton"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/medium_button_height"
+        android:layout_marginLeft="@dimen/massive_spacing"
+        android:layout_marginRight="@dimen/massive_spacing"
+        android:text="Continue" />
+
+    <Button
+        style="@style/MediumProminentOutlineButton"
+        android:id="@+id/copyButton"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/medium_button_height"
+        android:layout_marginLeft="@dimen/massive_spacing"
+        android:layout_marginTop="@dimen/small_spacing"
+        android:layout_marginRight="@dimen/massive_spacing"
+        android:text="Copy" />
+
+    <Button
+        android:id="@+id/termsButton"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/onboarding_button_bottom_offset"
+        android:layout_marginLeft="@dimen/massive_spacing"
+        android:layout_marginRight="@dimen/massive_spacing"
+        android:gravity="center"
+        android:background="@color/transparent"
+        android:textAllCaps="false"
+        android:textSize="@dimen/very_small_font_size"
+        android:textColor="@color/text"
+        android:text="By using this service, you agree to our Terms and Conditions and Privacy Statement" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/activity_restore.xml b/res/layout/activity_restore.xml
new file mode 100644
index 0000000000..eb5db6bf14
--- /dev/null
+++ b/res/layout/activity_restore.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/default_session_background"
+    android:orientation="vertical">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:textSize="@dimen/large_font_size"
+        android:textStyle="bold"
+        android:textColor="@color/text"
+        android:text="Restore your account" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginTop="6dp"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:textSize="@dimen/small_font_size"
+        android:textColor="@color/text"
+        android:text="Enter the recovery phrase that was given to you when you signed up to restore your account." />
+
+    <EditText
+        style="@style/SmallSessionEditText"
+        android:id="@+id/mnemonicEditText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginTop="12dp"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:hint="Enter your recovery phrase" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <Button
+        style="@style/MediumProminentFilledButton"
+        android:id="@+id/restoreButton"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/medium_button_height"
+        android:layout_marginLeft="@dimen/massive_spacing"
+        android:layout_marginRight="@dimen/massive_spacing"
+        android:text="Continue" />
+
+    <Button
+        android:id="@+id/termsButton"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/onboarding_button_bottom_offset"
+        android:layout_marginLeft="@dimen/massive_spacing"
+        android:layout_marginRight="@dimen/massive_spacing"
+        android:gravity="center"
+        android:background="@color/transparent"
+        android:textAllCaps="false"
+        android:textSize="@dimen/very_small_font_size"
+        android:textColor="@color/text"
+        android:text="By using this service, you agree to our Terms and Conditions and Privacy Statement" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/activity_seed_v2.xml b/res/layout/activity_seed_v2.xml
new file mode 100644
index 0000000000..978e31e9ab
--- /dev/null
+++ b/res/layout/activity_seed_v2.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/default_session_background"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <org.thoughtcrime.securesms.loki.redesign.views.SeedReminderView
+        android:id="@+id/seedReminderView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:textSize="@dimen/large_font_size"
+        android:textStyle="bold"
+        android:textColor="@color/text"
+        android:text="Meet your recovery phrase" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginTop="10dp"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:textSize="@dimen/medium_font_size"
+        android:textColor="@color/text"
+        android:text="Think of this as the crypto-equivalent of a social security number. This allows whomever has it complete access to your account." />
+
+    <TextView
+        style="@style/SessionIDTextView"
+        android:id="@+id/seedTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/very_large_spacing"
+        android:layout_marginTop="@dimen/medium_spacing"
+        android:layout_marginRight="@dimen/very_large_spacing"
+        android:gravity="center"
+        android:textSize="@dimen/medium_font_size"
+        android:textAlignment="center"
+        android:text="nautical novelty populate onion awkward bent etiquette plant submarine itches vipers september axis maximum populate" />
+
+    <TextView
+        android:id="@+id/revealButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:textAlignment="center"
+        android:textSize="@dimen/medium_font_size"
+        android:textColor="@color/text"
+        android:alpha="0.6"
+        android:text="Hold to reveal" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <Button
+        style="@style/MediumProminentOutlineButton"
+        android:id="@+id/copyButton"
+        android:layout_width="196dp"
+        android:layout_height="@dimen/medium_button_height"
+        android:layout_marginBottom="@dimen/medium_spacing"
+        android:text="Copy" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/activity_settings.xml b/res/layout/activity_settings.xml
new file mode 100644
index 0000000000..39be8052e0
--- /dev/null
+++ b/res/layout/activity_settings.xml
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    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="match_parent"
+    android:background="@drawable/default_session_background">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scrollbars="none">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:gravity="center_horizontal">
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:minHeight="?attr/actionBarSize"
+                app:contentInsetLeft="20dp"
+                app:contentInsetRight="20dp"
+                android:theme="?attr/actionBarStyle">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:id="@+id/cancelButton"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:src="@drawable/ic_close_white_24dp"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/titleTextView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Settings"
+                        android:textColor="@color/text"
+                        android:textSize="@dimen/very_large_font_size"
+                        android:fontFamily="sans-serif-medium" />
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:id="@+id/saveButton"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:src="@drawable/ic_check_white_24dp"
+                        android:visibility="gone" />
+
+                    <ImageView
+                        android:id="@+id/showQRCodeButton"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:src="@drawable/ic_qr_code" />
+
+                </LinearLayout>
+
+            </android.support.v7.widget.Toolbar>
+
+            <org.thoughtcrime.securesms.loki.redesign.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/medium_spacing" />
+
+            <RelativeLayout
+                android:id="@+id/displayNameContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/large_spacing"
+                android:layout_marginTop="@dimen/small_spacing"
+                android:layout_marginRight="@dimen/large_spacing">
+
+                <EditText
+                    style="@style/SessionEditText"
+                    android:id="@+id/displayNameEditText"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:textAlignment="center"
+                    android:paddingTop="12dp"
+                    android:paddingBottom="12dp"
+                    android:visibility="invisible"
+                    android:hint="Enter a display name" />
+
+                <TextView
+                    android:id="@+id/displayNameTextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:textColor="@color/text"
+                    android:textSize="@dimen/very_large_font_size"
+                    android:textStyle="bold" />
+
+            </RelativeLayout>
+
+            <org.thoughtcrime.securesms.loki.redesign.views.SeparatorView
+                android:id="@+id/separatorView"
+                android:layout_width="match_parent"
+                android:layout_height="32dp"
+                android:layout_marginLeft="@dimen/large_spacing"
+                android:layout_marginTop="20dp"
+                android:layout_marginRight="@dimen/large_spacing"/>
+
+            <TextView
+                android:id="@+id/publicKeyTextView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/large_spacing"
+                android:layout_marginTop="@dimen/large_spacing"
+                android:layout_marginRight="@dimen/large_spacing"
+                android:textSize="@dimen/large_font_size"
+                android:textColor="@color/text"
+                android:fontFamily="@font/space_mono_regular"
+                android:textAlignment="center"
+                android:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/large_spacing"
+                android:layout_marginTop="@dimen/large_spacing"
+                android:layout_marginRight="@dimen/large_spacing"
+                android:orientation="horizontal">
+
+                <Button
+                    style="@style/MediumProminentOutlineButton"
+                    android:id="@+id/copyButton"
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/medium_button_height"
+                    android:layout_weight="1"
+                    android:text="Copy" />
+
+                <Button
+                    style="@style/MediumUnimportantOutlineButton"
+                    android:id="@+id/shareButton"
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/medium_button_height"
+                    android:layout_weight="1"
+                    android:layout_marginLeft="@dimen/medium_spacing"
+                    android:text="Share" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:layout_marginTop="@dimen/large_spacing"
+                android:background="@color/separator" />
+
+            <TextView
+                android:id="@+id/privacyButton"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/setting_button_height"
+                android:background="@drawable/setting_button_background"
+                android:textColor="@color/text"
+                android:textSize="@dimen/medium_font_size"
+                android:textStyle="bold"
+                android:gravity="center"
+                android:text="Privacy" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="@color/separator" />
+
+            <TextView
+                android:id="@+id/notificationsButton"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/setting_button_height"
+                android:background="@drawable/setting_button_background"
+                android:textColor="@color/text"
+                android:textSize="@dimen/medium_font_size"
+                android:textStyle="bold"
+                android:gravity="center"
+                android:text="Notifications" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="@color/separator" />
+
+            <TextView
+                android:id="@+id/chatsButton"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/setting_button_height"
+                android:background="@drawable/setting_button_background"
+                android:textColor="@color/text"
+                android:textSize="@dimen/medium_font_size"
+                android:textStyle="bold"
+                android:gravity="center"
+                android:text="Chats" />
+
+            <View
+                android:id="@+id/linkedDevicesButtonTopSeparator"
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="@color/separator" />
+
+            <TextView
+                android:id="@+id/linkedDevicesButton"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/setting_button_height"
+                android:background="@drawable/setting_button_background"
+                android:textColor="@color/text"
+                android:textSize="@dimen/medium_font_size"
+                android:textStyle="bold"
+                android:gravity="center"
+                android:text="Linked Devices" />
+
+            <View
+                android:id="@+id/seedButtonTopSeparator"
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="@color/separator" />
+
+            <TextView
+                android:id="@+id/seedButton"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/setting_button_height"
+                android:background="@drawable/setting_button_background"
+                android:textColor="@color/text"
+                android:textSize="@dimen/medium_font_size"
+                android:textStyle="bold"
+                android:gravity="center"
+                android:text="Show Recovery Phrase" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="@color/separator" />
+
+            <TextView
+                android:id="@+id/clearAllDataButton"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/setting_button_height"
+                android:background="@drawable/setting_button_background"
+                android:textColor="@color/destructive"
+                android:textSize="@dimen/medium_font_size"
+                android:textStyle="bold"
+                android:gravity="center"
+                android:text="Clear All Data" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:layout_marginBottom="@dimen/large_spacing"
+                android:background="@color/separator" />
+
+        </LinearLayout>
+
+    </ScrollView>
+
+    <RelativeLayout
+        android:id="@+id/loader"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#A4000000"
+        android:visibility="gone"
+        android:alpha="0">
+
+        <com.github.ybq.android.spinkit.SpinKitView
+            style="@style/SpinKitView.Large.ThreeBounce"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_centerInParent="true"
+            app:SpinKit_Color="@color/text" />
+
+    </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/attachment_type_selector.xml b/res/layout/attachment_type_selector.xml
index df5a5b9d3f..bbe1188eeb 100644
--- a/res/layout/attachment_type_selector.xml
+++ b/res/layout/attachment_type_selector.xml
@@ -12,6 +12,7 @@
         android:background="@drawable/attachment_selector_shadow"/>
 
     <LinearLayout
+        android:id="@+id/contentView"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -20,16 +21,21 @@
         <org.thoughtcrime.securesms.components.RecentPhotoViewRail
             android:id="@+id/recent_photos"
             android:layout_width="match_parent"
-            android:layout_height="90dp"
+            android:layout_height="72dp"
             android:padding="4dp"/>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
         <LinearLayout
             android:orientation="horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
+            android:layout_marginTop="2dp"
             android:layout_marginEnd="16dp"
-            android:layout_marginTop="16dp"
             android:weightSum="3">
 
             <LinearLayout
@@ -41,8 +47,8 @@
 
                 <org.thoughtcrime.securesms.components.CircleColorImageView
                     android:id="@+id/gallery_button"
-                    android:layout_width="53dp"
-                    android:layout_height="53dp"
+                    android:layout_width="42dp"
+                    android:layout_height="42dp"
                     android:src="@drawable/ic_image_white_24dp"
                     android:scaleType="center"
                     android:contentDescription="@string/attachment_type_selector__gallery_description"
@@ -65,14 +71,15 @@
 
                 <org.thoughtcrime.securesms.components.CircleColorImageView
                     android:id="@+id/camera_button"
-                    android:layout_width="53dp"
-                    android:layout_height="53dp"
+                    android:layout_width="42dp"
+                    android:layout_height="42dp"
                     android:src="@drawable/ic_camera_white_24dp"
                     android:scaleType="center"
                     android:contentDescription="@string/attachment_type_selector__camera_description"
                     app:circleColor="@color/green_400"/>
 
-                <TextView android:layout_marginTop="10dp"
+                <TextView
+                    android:layout_marginTop="10dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center"
@@ -91,8 +98,8 @@
 
                 <org.thoughtcrime.securesms.components.CircleColorImageView
                     android:id="@+id/audio_button"
-                    android:layout_width="53dp"
-                    android:layout_height="53dp"
+                    android:layout_width="42dp"
+                    android:layout_height="42dp"
                     android:contentDescription="@string/attachment_type_selector__audio_description"
                     android:scaleType="center"
                     android:src="@drawable/ic_headset_white_24dp"
@@ -116,8 +123,8 @@
 
                 <org.thoughtcrime.securesms.components.CircleColorImageView
                     android:id="@+id/document_button"
-                    android:layout_width="53dp"
-                    android:layout_height="53dp"
+                    android:layout_width="42dp"
+                    android:layout_height="42dp"
                     android:contentDescription="@string/attachment_type_selector__file_description"
                     android:scaleType="center"
                     android:src="@drawable/ic_insert_drive_file_white_24dp"
@@ -142,8 +149,8 @@
 
                 <org.thoughtcrime.securesms.components.CircleColorImageView
                     android:id="@+id/contact_button"
-                    android:layout_width="53dp"
-                    android:layout_height="53dp"
+                    android:layout_width="42dp"
+                    android:layout_height="42dp"
                     android:src="@drawable/ic_person_white_24dp"
                     android:scaleType="center"
                     android:contentDescription="@string/attachment_type_selector__contact_description"
@@ -181,8 +188,8 @@
 
                 <org.thoughtcrime.securesms.components.CircleColorImageView
                     android:id="@+id/location_button"
-                    android:layout_width="53dp"
-                    android:layout_height="53dp"
+                    android:layout_width="42dp"
+                    android:layout_height="42dp"
                     android:contentDescription="@string/attachment_type_selector__location_description"
                     android:scaleType="center"
                     android:src="@drawable/ic_location_on_white_24dp"
@@ -206,8 +213,8 @@
 
                 <org.thoughtcrime.securesms.components.CircleColorImageView
                     android:id="@+id/giphy_button"
-                    android:layout_width="53dp"
-                    android:layout_height="53dp"
+                    android:layout_width="42dp"
+                    android:layout_height="42dp"
                     android:src="@drawable/ic_gif_white_24dp"
                     android:scaleType="center"
                     android:contentDescription="@string/attachment_type_selector__gif_description"
@@ -231,8 +238,9 @@
 
                 <org.thoughtcrime.securesms.components.CircleColorImageView
                     android:id="@+id/close_button"
-                    android:layout_width="53dp"
-                    android:layout_height="53dp"
+                    android:layout_width="42dp"
+                    android:layout_height="42dp"
+                    android:paddingTop="4dp"
                     android:src="@drawable/ic_keyboard_arrow_down_white_24dp"
                     android:scaleType="center"
                     android:contentDescription="@string/attachment_type_selector__drawer_description"
@@ -249,6 +257,11 @@
 
         </LinearLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
     </LinearLayout>
 
 </LinearLayout>
diff --git a/res/layout/cell_mention_candidate_selection_view.xml b/res/layout/cell_mention_candidate_selection_view.xml
deleted file mode 100644
index 3ea8ade842..0000000000
--- a/res/layout/cell_mention_candidate_selection_view.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.loki.MentionCandidateSelectionViewCell
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="52dp"
-    android:orientation="horizontal"
-    android:paddingStart="16dp"
-    android:paddingEnd="16dp"
-    android:gravity="center_vertical"
-    android:background="?attr/conversation_list_item_background">
-
-    <RelativeLayout
-        android:layout_width="36dp"
-        android:layout_height="38dp"
-        android:layout_marginTop="1dp">
-
-        <!-- The frame layout below is a workaround for an avatar image view bug -->
-
-        <FrameLayout
-            android:id="@+id/profilePictureImageViewContainer"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" >
-
-            <org.thoughtcrime.securesms.components.AvatarImageView
-                android:id="@+id/profilePictureImageView"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:layout_marginBottom="2dp" />
-
-        </FrameLayout>
-
-        <ImageView
-            android:id="@+id/moderatorIconImageView"
-            android:layout_width="16dp"
-            android:layout_height="16dp"
-            android:layout_marginEnd="1.5dp"
-            android:src="@drawable/icon_crown"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentBottom="true" />
-
-    </RelativeLayout>
-
-    <TextView
-        android:id="@+id/displayNameTextView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        style="@style/Signal.Text.Body"
-        android:ellipsize="end" />
-
-</org.thoughtcrime.securesms.loki.MentionCandidateSelectionViewCell>
\ No newline at end of file
diff --git a/res/layout/contact_selection_list_item.xml b/res/layout/contact_selection_list_item.xml
index e94d8ecead..e639a524f3 100644
--- a/res/layout/contact_selection_list_item.xml
+++ b/res/layout/contact_selection_list_item.xml
@@ -12,20 +12,17 @@
         android:paddingStart="16dp"
         android:paddingEnd="8dp">
 
-    <org.thoughtcrime.securesms.components.AvatarImageView
-            android:id="@+id/contact_photo_image"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:foreground="@drawable/contact_photo_background"
-            android:cropToPadding="true"
-            tools:src="@color/blue_600"
-            android:contentDescription="@string/SingleContactSelectionActivity_contact_photo" />
+    <org.thoughtcrime.securesms.loki.redesign.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="0dp"
                   android:layout_height="wrap_content"
                   android:layout_weight="1"
                   android:layout_marginStart="16dp"
                   android:paddingEnd="16dp"
+                  android:gravity="center_vertical"
                   android:orientation="vertical">
 
         <org.thoughtcrime.securesms.components.emoji.EmojiTextView
@@ -35,14 +32,16 @@
                 android:checkMark="?android:attr/listChoiceIndicatorMultiple"
                 android:singleLine="true"
                 android:ellipsize="marquee"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textSize="16sp"
+                android:textSize="@dimen/medium_font_size"
+                android:textColor="@color/text"
+                android:textStyle="bold"
                 tools:text="Frieeeeeeedrich Nieeeeeeeeeetzsche" />
 
         <LinearLayout android:id="@+id/number_container"
                       android:orientation="horizontal"
                       android:layout_width="wrap_content"
-                      android:layout_height="wrap_content">
+                      android:layout_height="wrap_content"
+                      android:visibility="gone">
 
             <TextView android:id="@+id/number"
                       android:layout_width="wrap_content"
diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 6d2e36cbb8..64525f43cf 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -1,24 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/rootView"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@drawable/default_session_background">
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/conversation_list_toolbar_background"
-        android:theme="?attr/actionBarStyle"
-        app:contentInsetStartWithNavigation="0dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="?homeAsUpIndicator"
-        tools:background="#ff007f00">
+        android:minHeight="?attr/actionBarSize"
+        app:contentInsetLeft="24dp"
+        app:contentInsetRight="20dp"
+        android:background="@color/action_bar_background"
+        android:theme="@style/Session.DarkActionBar"
+        app:popupTheme="@style/Session.DarkActionBar">
 
-        <include layout="@layout/conversation_title_view" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/titleTextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Conversation"
+                    android:textColor="@color/text"
+                    android:textSize="@dimen/large_font_size"
+                    android:fontFamily="sans-serif-medium" />
+
+                <TextView
+                    android:id="@+id/subtitleTextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="26 members"
+                    android:textColor="@color/text"
+                    android:textSize="@dimen/small_font_size" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1" />
+
+        </LinearLayout>
 
     </android.support.v7.widget.Toolbar>
 
@@ -37,6 +72,19 @@
             android:orientation="vertical"
             android:paddingTop="?attr/actionBarSize">
 
+            <ProgressBar
+                android:id="@+id/messageStatusProgressBar"
+                style="?android:attr/progressBarStyleHorizontal"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/accent_line_thickness"
+                android:paddingLeft="-2dp"
+                android:paddingRight="-2dp"
+                android:progressTint="@color/accent"
+                android:progressBackgroundTint="@color/transparent"
+                android:alpha="0"
+                android:indeterminate="false"
+                android:progress="80" />
+
             <ViewStub
                 android:id="@+id/group_share_profile_view_stub"
                 android:layout_width="match_parent"
@@ -74,9 +122,30 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:clipChildren="false"
+                android:clipToPadding="false">
 
-                <include layout="@layout/view_mention_candidate_selection" />
+                <LinearLayout
+                    android:id="@+id/mentionCandidateSelectionViewContainer"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1px"
+                        android:background="@color/separator" />
+
+                    <include layout="@layout/view_mention_candidate_selection" />
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1px"
+                        android:background="@color/separator" />
+
+                </LinearLayout>
 
                 <FrameLayout
                     android:layout_width="match_parent"
diff --git a/res/layout/conversation_fragment.xml b/res/layout/conversation_fragment.xml
index 43d9e6117e..8ad3fc8e42 100644
--- a/res/layout/conversation_fragment.xml
+++ b/res/layout/conversation_fragment.xml
@@ -25,11 +25,10 @@
               android:paddingTop="4dp"
               android:paddingBottom="4dp"
               android:layout_marginTop="8dp"
-              style="@style/Signal.Text.Caption"
-              android:textColor="?attr/conversation_item_sticky_date_text_color"
-              android:textAllCaps="true"
+              android:textSize="@dimen/small_font_size"
+              android:textColor="#99FFFFFF"
               android:background="?attr/conversation_item_sticky_date_background"
-              android:elevation="9dp"
+              android:elevation="10dp"
               android:visibility="gone"
               tools:text="March 1, 2015" />
 
@@ -46,15 +45,17 @@
             android:visibility="gone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
-            android:layout_marginBottom="20dp"
-            android:padding="5dp"
+            android:layout_marginEnd="@dimen/medium_spacing"
+            android:layout_marginBottom="@dimen/medium_spacing"
             android:layout_gravity="bottom|end"
-            android:background="@drawable/circle_tintable"
-            android:tint="@color/grey_600"
-            android:elevation="1dp"
-            android:alpha="0.9"
+            android:background="@drawable/scroll_to_bottom_button_background"
+            android:paddingLeft="@dimen/small_spacing"
+            android:paddingTop="10dp"
+            android:paddingRight="@dimen/small_spacing"
+            android:paddingBottom="6dp"
+            android:tint="@color/text"
+            android:elevation="10dp"
             android:contentDescription="@string/conversation_fragment__scroll_to_the_bottom_content_description"
-            android:src="@drawable/ic_scroll_down"/>
+            android:src="@drawable/ic_keyboard_arrow_down_white_24dp"/>
 
 </FrameLayout>
diff --git a/res/layout/conversation_input_panel.xml b/res/layout/conversation_input_panel.xml
index f400205167..b2f64984b2 100644
--- a/res/layout/conversation_input_panel.xml
+++ b/res/layout/conversation_input_panel.xml
@@ -9,6 +9,7 @@
     android:gravity="center_vertical"
     android:orientation="horizontal"
     android:clickable="true"
+    android:background="@color/compose_view_background"
     android:paddingStart="16dp"
     android:paddingEnd="16dp"
     android:paddingTop="6dp"
@@ -96,8 +97,11 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:layout_weight="1"
+                        android:textColorHint="#99FFFFFF"
+                        android:textSize="@dimen/small_font_size"
                         android:nextFocusForward="@+id/send_button"
                         android:nextFocusRight="@+id/send_button"
+                        android:textCursorDrawable="@drawable/session_edit_text_cursor"
                         tools:visibility="invisible"
                         tools:hint="Send TextSecure message" >
                         <requestFocus />
@@ -178,7 +182,6 @@
         android:layout_width="@dimen/conversation_compose_height"
         android:layout_height="@dimen/conversation_compose_height"
         android:layout_marginStart="12dp"
-        android:background="@drawable/circle_tintable"
         android:layout_gravity="bottom">
 
         <ImageButton
@@ -187,7 +190,7 @@
             android:layout_height="match_parent"
             android:layout_gravity="center"
             android:background="@drawable/circle_touch_highlight_background"
-            android:src="@drawable/ic_add_white_24dp"
+            android:src="@drawable/ic_circle_plus"
             android:contentDescription="@string/ConversationActivity_add_attachment"
             android:nextFocusLeft="@+id/embedded_text_editor" />
 
@@ -195,11 +198,7 @@
             android:id="@+id/send_button"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingTop="6dp"
-            android:paddingEnd="6dp"
-            android:paddingBottom="6dp"
-            android:paddingStart="11dp"
-            android:scaleType="fitCenter"
+            android:scaleType="centerInside"
             android:contentDescription="@string/conversation_activity__send"
             android:nextFocusLeft="@+id/embedded_text_editor"
             android:src="?conversation_transport_sms_indicator"
diff --git a/res/layout/conversation_item_footer.xml b/res/layout/conversation_item_footer.xml
index 685d1c44dc..f2d70188ab 100644
--- a/res/layout/conversation_item_footer.xml
+++ b/res/layout/conversation_item_footer.xml
@@ -21,6 +21,7 @@
             android:autoLink="none"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textSize="@dimen/very_small_font_size"
             android:linksClickable="false"
             style="@style/Signal.Text.Caption.MessageSent"
             android:textColor="?conversation_item_sent_text_secondary_color"
diff --git a/res/layout/conversation_item_header.xml b/res/layout/conversation_item_header.xml
index 395d27cf3a..80721f010f 100644
--- a/res/layout/conversation_item_header.xml
+++ b/res/layout/conversation_item_header.xml
@@ -15,9 +15,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
-        style="@style/Signal.Text.Caption"
-        android:textColor="?conversation_item_update_text_color"
-        android:textAllCaps="true"
+        android:textColor="#99FFFFFF"
+        android:textSize="@dimen/small_font_size"
         tools:text="March 1, 2015" />
 
 </LinearLayout>
diff --git a/res/layout/conversation_item_last_seen.xml b/res/layout/conversation_item_last_seen.xml
index 9a5d18dd24..ced6a1beed 100644
--- a/res/layout/conversation_item_last_seen.xml
+++ b/res/layout/conversation_item_last_seen.xml
@@ -6,15 +6,15 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:paddingTop="24dp"
-    android:paddingBottom="20dp">
+    android:paddingBottom="18dp">
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="4dp"
-        android:layout_marginStart="28dp"
-        android:layout_marginEnd="28dp"
-        android:layout_marginBottom="3dp"
-        android:background="?attr/conversation_item_last_seen_line_color" />
+        android:layout_height="1dp"
+        android:layout_marginStart="@dimen/large_spacing"
+        android:layout_marginEnd="@dimen/large_spacing"
+        android:layout_marginBottom="4dp"
+        android:background="@color/text" />
 
     <TextView
         android:id="@+id/text"
@@ -22,9 +22,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         style="@style/Signal.Text.Caption"
-        android:textAllCaps="true"
-        android:fontFamily="sans-serif-medium"
-        android:textColor="?attr/conversation_item_last_seen_text_color"
+        android:textColor="@color/text"
+        android:textSize="@dimen/small_font_size"
         tools:text="3 unread messages" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index 62d48b1787..207591c0c6 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -18,32 +18,26 @@
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/conversation_individual_right_gutter"
-        android:paddingStart="8dp"
+        android:paddingStart="@dimen/large_spacing"
         android:clipToPadding="false"
         android:clipChildren="false">
 
         <RelativeLayout
             android:id="@+id/contact_photo_container"
             android:layout_width="36dp"
-            android:layout_height="wrap_content"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentBottom="true">
+            android:layout_height="42dp"
+            android:layout_alignParentStart="true">
 
-            <org.thoughtcrime.securesms.components.AvatarImageView
-                android:id="@+id/contact_photo"
-                android:foreground="@drawable/contact_photo_background"
-                android:layout_width="@dimen/conversation_item_avatar_size"
-                android:layout_height="@dimen/conversation_item_avatar_size"
-                android:layout_marginBottom="2dp"
-                android:cropToPadding="true"
-                android:contentDescription="@string/conversation_item_received__contact_photo_description" />
+            <org.thoughtcrime.securesms.loki.redesign.views.ProfilePictureView
+                android:id="@+id/profilePictureView"
+                android:layout_marginTop="2dp"
+                android:layout_width="@dimen/small_profile_picture_size"
+                android:layout_height="@dimen/small_profile_picture_size" />
 
             <ImageView
                 android:id="@+id/moderator_icon_image_view"
-                android:layout_width="16dp"
-                android:layout_height="16dp"
-                android:layout_marginEnd="1.5dp"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
                 android:src="@drawable/icon_crown"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentBottom="true" />
@@ -63,8 +57,10 @@
                 android:id="@+id/body_bubble"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/message_bubble_edge_margin"
-                android:layout_marginStart="8dp"
+                android:layout_marginEnd="@dimen/massive_spacing"
+                android:layout_marginStart="@dimen/large_spacing"
+                android:paddingTop="@dimen/medium_spacing"
+                android:paddingBottom="@dimen/medium_spacing"
                 android:orientation="vertical"
                 android:clipToPadding="false"
                 android:clipChildren="false"
@@ -75,9 +71,8 @@
                     android:id="@+id/group_sender_holder"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/message_bubble_top_padding"
-                    android:layout_marginBottom="2dp"
                     android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginBottom="@dimen/medium_spacing"
                     android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
                     android:orientation="horizontal"
                     android:visibility="gone"
@@ -91,6 +86,8 @@
                         style="@style/Signal.Text.Preview"
                         android:fontFamily="sans-serif-medium"
                         android:textColor="?conversation_item_received_text_primary_color"
+                        android:textSize="@dimen/small_font_size"
+                        android:alpha="0.6"
                         android:maxLines="1"
                         android:ellipsize="end"
                         tools:visibility="visible"
@@ -116,13 +113,13 @@
                     android:id="@+id/quote_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/message_bubble_top_padding"
-                    android:layout_marginStart="6dp"
-                    android:layout_marginEnd="6dp"
+                    android:layout_marginStart="@dimen/large_spacing"
+                    android:layout_marginBottom="@dimen/medium_spacing"
+                    android:layout_marginEnd="@dimen/large_spacing"
                     android:visibility="gone"
                     app:message_type="incoming"
-                    app:quote_colorPrimary="?attr/conversation_item_quote_text_color"
-                    app:quote_colorSecondary="?attr/conversation_item_quote_text_color"
+                    app:quote_colorPrimary="@color/text"
+                    app:quote_colorSecondary="@color/text"
                     tools:visibility="visible"/>
 
                 <ViewStub
@@ -156,9 +153,8 @@
                     android:layout="@layout/conversation_item_received_audio"
                     android:layout_width="210dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/message_bubble_top_padding"
-                    android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
                     android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginBottom="6dp"
                     android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
 
                 <ViewStub
@@ -166,8 +162,7 @@
                     android:layout="@layout/conversation_item_received_document"
                     android:layout_width="210dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/message_bubble_top_padding"
-                    android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
+                    android:layout_marginBottom="4dp"
                     android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
                     android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
 
@@ -175,8 +170,6 @@
                     android:id="@+id/conversation_item_body"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/message_bubble_top_padding"
-                    android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
                     android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
                     android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
                     style="@style/Signal.Text.Body"
@@ -191,13 +184,12 @@
                     android:id="@+id/conversation_item_footer"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="-4dp"
+                    android:layout_marginTop="4dp"
                     android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
                     android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
-                    android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
                     android:clipChildren="false"
                     android:clipToPadding="false"
-                    android:alpha="0.7"
+                    android:alpha="0.6"
                     app:footer_text_color="?conversation_item_received_text_secondary_color"
                     app:footer_icon_color="?conversation_item_received_text_secondary_color"/>
 
@@ -216,7 +208,7 @@
 
             </LinearLayout>
 
-            <org.thoughtcrime.securesms.loki.FriendRequestView
+            <org.thoughtcrime.securesms.loki.redesign.views.FriendRequestView
                 android:id="@+id/friend_request_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml
index 86fdc3eeec..ee911e17d4 100644
--- a/res/layout/conversation_item_sent.xml
+++ b/res/layout/conversation_item_sent.xml
@@ -18,7 +18,7 @@
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/conversation_individual_right_gutter"
+        android:layout_marginEnd="@dimen/large_spacing"
         android:clipToPadding="false"
         android:clipChildren="false">
 
@@ -36,7 +36,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:layout_marginStart="@dimen/message_bubble_edge_margin"
+                android:layout_marginStart="@dimen/massive_spacing"
+                android:paddingTop="@dimen/medium_spacing"
+                android:paddingBottom="@dimen/medium_spacing"
                 android:layout_gravity="end"
                 android:clipToPadding="false"
                 android:clipChildren="false"
@@ -47,13 +49,13 @@
                     android:id="@+id/quote_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/message_bubble_top_padding"
-                    android:layout_marginStart="6dp"
-                    android:layout_marginEnd="6dp"
+                    android:layout_marginStart="@dimen/large_spacing"
+                    android:layout_marginBottom="@dimen/medium_spacing"
+                    android:layout_marginEnd="@dimen/large_spacing"
                     android:visibility="gone"
                     app:message_type="outgoing"
-                    app:quote_colorPrimary="?attr/conversation_item_quote_text_color"
-                    app:quote_colorSecondary="?attr/conversation_item_quote_text_color"
+                    app:quote_colorPrimary="@color/text"
+                    app:quote_colorSecondary="@color/text"
                     tools:visibility="visible"/>
 
                 <ViewStub
@@ -61,7 +63,7 @@
                     android:layout="@layout/conversation_item_sent_shared_contact"
                     android:layout_width="@dimen/media_bubble_default_dimens"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/message_bubble_top_padding"
+                    android:layout_marginBottom="@dimen/medium_spacing"
                     android:visibility="gone"/>
 
                 <ViewStub
@@ -87,9 +89,8 @@
                     android:layout="@layout/conversation_item_sent_audio"
                     android:layout_width="210dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/message_bubble_top_padding"
-                    android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
                     android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginBottom="6dp"
                     android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
 
                 <ViewStub
@@ -97,19 +98,16 @@
                     android:layout="@layout/conversation_item_sent_document"
                     android:layout_width="210dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/message_bubble_top_padding"
-                    android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
                     android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginBottom="4dp"
                     android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
 
                 <org.thoughtcrime.securesms.components.emoji.EmojiTextView
                     android:id="@+id/conversation_item_body"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/message_bubble_top_padding"
                     android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
                     android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
-                    android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
                     style="@style/Signal.Text.Body"
                     android:textColor="?conversation_item_sent_text_primary_color"
                     android:textColorLink="?conversation_item_sent_text_primary_color"
@@ -140,10 +138,9 @@
                     android:id="@+id/conversation_item_footer"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="-4dp"
+                    android:layout_marginTop="4dp"
                     android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
                     android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
-                    android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
                     android:clipChildren="false"
                     android:clipToPadding="false"
                     app:footer_text_color="?attr/conversation_item_sent_text_secondary_color"
@@ -164,7 +161,7 @@
 
             </LinearLayout>
 
-            <org.thoughtcrime.securesms.loki.FriendRequestView
+            <org.thoughtcrime.securesms.loki.redesign.views.FriendRequestView
                 android:id="@+id/friend_request_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/res/layout/conversation_item_sent_audio.xml b/res/layout/conversation_item_sent_audio.xml
index d62fb22f7e..7a191e9bef 100644
--- a/res/layout/conversation_item_sent_audio.xml
+++ b/res/layout/conversation_item_sent_audio.xml
@@ -5,6 +5,6 @@
         android:id="@+id/audio_view"
         android:layout_width="210dp"
         android:layout_height="wrap_content"
-        app:foregroundTintColor="@color/grey_500"
+        app:foregroundTintColor="@color/black"
         app:backgroundTintColor="@color/white"
         android:visibility="gone"/>
diff --git a/res/layout/conversation_item_update.xml b/res/layout/conversation_item_update.xml
index 9a2368a43a..357bab2683 100644
--- a/res/layout/conversation_item_update.xml
+++ b/res/layout/conversation_item_update.xml
@@ -10,8 +10,8 @@
     android:gravity="center"
     android:orientation="vertical"
     android:paddingBottom="6dp"
-    android:paddingStart="28dp"
-    android:paddingEnd="28dp"
+    android:paddingStart="48dp"
+    android:paddingEnd="48dp"
     android:paddingTop="8dp">
 
     <LinearLayout
@@ -34,8 +34,8 @@
             style="@style/Signal.Text.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAllCaps="true"
-            android:textColor="?conversation_item_update_text_color"
+            android:textSize="@dimen/small_font_size"
+            android:textColor="@color/text"
             tools:text="1 hour" />
 
     </LinearLayout>
@@ -56,7 +56,8 @@
             android:autoLink="all"
             android:gravity="center"
             android:linksClickable="true"
-            android:textColor="?attr/conversation_item_update_text_color"
+            android:textSize="@dimen/small_font_size"
+            android:textColor="@color/text"
             tools:text="Gwen Stacy set the disappearing message timer to 1 hour" />
 
         <TextView
@@ -70,8 +71,8 @@
             android:gravity="center"
             android:linksClickable="false"
             android:minWidth="15sp"
-            android:textAllCaps="true"
-            android:textColor="?conversation_item_update_text_color"
+            android:textSize="@dimen/small_font_size"
+            android:textColor="@color/text"
             tools:text="30 min ago" />
 
     </LinearLayout>
diff --git a/res/layout/conversation_search_nav.xml b/res/layout/conversation_search_nav.xml
index 529a3be282..5ce5b5b575 100644
--- a/res/layout/conversation_search_nav.xml
+++ b/res/layout/conversation_search_nav.xml
@@ -6,7 +6,7 @@
     android:id="@+id/conversation_search_nav"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?conversation_background"
+    android:background="@color/compose_view_background"
     android:visibility="gone"
     tools:visibility="visible"
     tools:parentTag="android.support.constraint.ConstraintLayout">
@@ -54,20 +54,16 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <com.pnikosis.materialishprogress.ProgressWheel
+    <com.github.ybq.android.spinkit.SpinKitView
+        style="@style/SpinKitView.DoubleBounce"
         android:id="@+id/conversation_search_progress_wheel"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_gravity="center"
-        android:layout_marginTop="0dp"
-        android:layout_marginBottom="0dp"
-        android:indeterminate="true"
         android:padding="8dp"
-        android:background="?conversation_background"
+        android:background="@color/compose_view_background"
         android:visibility="gone"
+        app:SpinKit_Color="@color/text"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:matProg_barColor="@color/core_grey_25"
-        app:matProg_progressIndeterminate="true" />
+        app:layout_constraintTop_toTopOf="parent" />
 
 </org.thoughtcrime.securesms.components.ConversationSearchBottomBar>
\ No newline at end of file
diff --git a/res/layout/conversation_typing_view.xml b/res/layout/conversation_typing_view.xml
index 8938b83668..4feb065e71 100644
--- a/res/layout/conversation_typing_view.xml
+++ b/res/layout/conversation_typing_view.xml
@@ -4,9 +4,9 @@
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="8dp"
+    android:paddingStart="@dimen/large_spacing"
     android:paddingEnd="8dp"
-    android:paddingTop="2dp"
+    android:paddingBottom="@dimen/small_spacing"
     android:gravity="center_vertical">
 
     <org.thoughtcrime.securesms.components.AvatarImageView
@@ -21,7 +21,6 @@
         android:id="@+id/typing_bubble"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
         android:padding="12dp"
         android:background="@drawable/message_bubble_background">
 
diff --git a/res/layout/create_passphrase_activity.xml b/res/layout/create_passphrase_activity.xml
index 3a7db22d44..2df7ef51aa 100644
--- a/res/layout/create_passphrase_activity.xml
+++ b/res/layout/create_passphrase_activity.xml
@@ -4,7 +4,7 @@
                 android:id="@+id/prompt_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@color/loki_darkest_gray">
+                android:background="@drawable/default_session_background">
 
 
   <ProgressBar android:id="@+id/passphrase_edit"
diff --git a/res/layout/dialog_clear_all_data.xml b/res/layout/dialog_clear_all_data.xml
new file mode 100644
index 0000000000..5decd89406
--- /dev/null
+++ b/res/layout/dialog_clear_all_data.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/default_dialog_background_inset"
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:paddingLeft="32dp"
+    android:paddingTop="@dimen/medium_spacing"
+    android:paddingRight="32dp"
+    android:paddingBottom="@dimen/medium_spacing">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Clear All Data"
+        android:textColor="@color/text"
+        android:textStyle="bold"
+        android:textSize="@dimen/medium_font_size" />
+
+    <TextView
+        android:id="@+id/seedTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:text="This will delete your entire account, including all data, any messages currently linked to your Session ID, as well as your personal key pair."
+        android:textColor="@color/text"
+        android:textSize="@dimen/small_font_size"
+        android:textAlignment="center" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:orientation="horizontal">
+
+        <Button
+            style="@style/UnimportantDialogButton"
+            android:id="@+id/cancelButton"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/small_button_height"
+            android:layout_weight="1"
+            android:text="Cancel" />
+
+        <Button
+            style="@style/DestructiveDialogButton"
+            android:id="@+id/clearAllDataButton"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/small_button_height"
+            android:layout_weight="1"
+            android:layout_marginLeft="@dimen/medium_spacing"
+            android:text="Delete" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/dialog_link_device_master_mode.xml b/res/layout/dialog_link_device_master_mode.xml
new file mode 100644
index 0000000000..04adef415a
--- /dev/null
+++ b/res/layout/dialog_link_device_master_mode.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/default_dialog_background_inset"
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:paddingLeft="32dp"
+    android:paddingTop="@dimen/medium_spacing"
+    android:paddingRight="32dp"
+    android:paddingBottom="@dimen/medium_spacing">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/small_spacing"
+        android:gravity="center">
+
+        <ImageView
+            android:id="@+id/qrCodeImageView"
+            android:layout_width="128dp"
+            android:layout_height="128dp" />
+
+    </RelativeLayout>
+
+    <TextView
+        android:id="@+id/titleTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:text="Waiting for Device"
+        android:textColor="@color/text"
+        android:textStyle="bold"
+        android:textSize="@dimen/medium_font_size" />
+
+    <TextView
+        android:id="@+id/explanationTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:text="Create a new account on your other device and click &quot;Link to an existing account&quot; to start the linking process"
+        android:textColor="@color/text"
+        android:alpha="0.6"
+        android:textSize="@dimen/small_font_size"
+        android:textAlignment="center" />
+
+    <TextView
+        android:id="@+id/mnemonicTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:text="puffin circle idled"
+        android:textColor="@color/text"
+        android:textSize="@dimen/small_font_size"
+        android:textAlignment="center"
+        android:visibility="gone" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:orientation="horizontal">
+
+        <Button
+            style="@style/UnimportantDialogButton"
+            android:id="@+id/cancelButton"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/small_button_height"
+            android:layout_weight="1"
+            android:text="Cancel" />
+
+        <Button
+            style="@style/ProminentDialogButton"
+            android:id="@+id/authorizeButton"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/small_button_height"
+            android:layout_weight="1"
+            android:layout_marginLeft="@dimen/medium_spacing"
+            android:text="Authorize"
+            android:visibility="gone" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/dialog_link_device_slave_mode.xml b/res/layout/dialog_link_device_slave_mode.xml
new file mode 100644
index 0000000000..ea76c63f7f
--- /dev/null
+++ b/res/layout/dialog_link_device_slave_mode.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@drawable/default_dialog_background_inset"
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:paddingLeft="32dp"
+    android:paddingTop="@dimen/medium_spacing"
+    android:paddingRight="32dp"
+    android:paddingBottom="@dimen/medium_spacing">
+
+    <com.github.ybq.android.spinkit.SpinKitView
+        style="@style/SpinKitView.DoubleBounce"
+        android:id="@+id/spinner"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_centerInParent="true"
+        app:SpinKit_Color="@color/text" />
+
+    <TextView
+        android:id="@+id/titleTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:text="Waiting for Authorization"
+        android:textColor="@color/text"
+        android:textStyle="bold"
+        android:textSize="@dimen/medium_font_size" />
+
+    <TextView
+        android:id="@+id/explanationTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:text="Please check that the words below match those shown on your other device."
+        android:textColor="@color/text"
+        android:alpha="0.6"
+        android:textSize="@dimen/small_font_size"
+        android:textAlignment="center" />
+
+    <TextView
+        android:id="@+id/mnemonicTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:text="puffin circle idled"
+        android:textColor="@color/text"
+        android:textSize="@dimen/small_font_size"
+        android:textAlignment="center" />
+
+    <Button
+        style="@style/UnimportantDialogButton"
+        android:id="@+id/cancelButton"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/small_button_height"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:text="Cancel" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/dialog_seed.xml b/res/layout/dialog_seed.xml
new file mode 100644
index 0000000000..f4ef4eb968
--- /dev/null
+++ b/res/layout/dialog_seed.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/default_dialog_background_inset"
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:paddingLeft="32dp"
+    android:paddingTop="@dimen/medium_spacing"
+    android:paddingRight="32dp"
+    android:paddingBottom="@dimen/medium_spacing">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Your Recovery Phrase"
+        android:textColor="@color/text"
+        android:textStyle="bold"
+        android:textSize="@dimen/medium_font_size" />
+
+    <TextView
+        android:id="@+id/seedTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/large_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"
+        android:textAlignment="center" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:text="This is your personal recovery phrase. It can be used to restore your account or migrate your account to a new device."
+        android:textColor="@color/text"
+        android:textSize="@dimen/small_font_size"
+        android:textAlignment="center"
+        android:alpha="0.6" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:orientation="horizontal">
+
+        <Button
+            style="@style/UnimportantDialogButton"
+            android:id="@+id/cancelButton"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/small_button_height"
+            android:layout_weight="1"
+            android:text="Cancel" />
+
+        <Button
+            style="@style/UnimportantDialogButton"
+            android:id="@+id/copyButton"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/small_button_height"
+            android:layout_weight="1"
+            android:layout_marginLeft="@dimen/medium_spacing"
+            android:text="Copy" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/document_view.xml b/res/layout/document_view.xml
index 0178e3882c..5cf4436d27 100644
--- a/res/layout/document_view.xml
+++ b/res/layout/document_view.xml
@@ -82,7 +82,7 @@
 
             <LinearLayout android:layout_width="match_parent"
                           android:layout_height="wrap_content"
-                          android:layout_marginStart="2dp"
+                          android:layout_marginStart="6dp"
                           android:orientation="vertical"
                           android:focusable="false"
                           android:clickable="false">
@@ -91,6 +91,7 @@
                           android:layout_width="match_parent"
                           android:layout_height="wrap_content"
                           style="@style/Signal.Text.Body"
+                          android:textSize="@dimen/medium_font_size"
                           android:singleLine="true"
                           android:maxLines="1"
                           android:clickable="false"
diff --git a/res/layout/expiration_timer_menu.xml b/res/layout/expiration_timer_menu.xml
index f95b562bfb..4e146fea64 100644
--- a/res/layout/expiration_timer_menu.xml
+++ b/res/layout/expiration_timer_menu.xml
@@ -13,6 +13,7 @@
             android:layout_height="20dp"
             android:layout_gravity="center"
             android:src="@drawable/ic_timer"
+            android:background="@color/transparent"
             android:scaleType="fitCenter"/>
 
     <TextView
@@ -23,6 +24,7 @@
             android:gravity="center_horizontal|bottom"
             android:paddingBottom="3dp"
             android:paddingTop="1dp"
+            android:background="@color/transparent"
             android:textColor="@android:color/white"
             android:textSize="10sp" />
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/fragment_enter_chat_url.xml b/res/layout/fragment_enter_chat_url.xml
new file mode 100644
index 0000000000..c08bec5d5f
--- /dev/null
+++ b/res/layout/fragment_enter_chat_url.xml
@@ -0,0 +1,46 @@
+<?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:background="@drawable/default_session_background"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <EditText
+        style="@style/SmallSessionEditText"
+        android:id="@+id/chatURLEditText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/large_spacing"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:layout_marginRight="@dimen/large_spacing"
+        android:hint="https://chat.lokinet.org" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/large_spacing"
+        android:layout_marginTop="@dimen/medium_spacing"
+        android:layout_marginRight="@dimen/large_spacing"
+        android:textSize="@dimen/small_font_size"
+        android:textColor="@color/text"
+        android:alpha="0.6"
+        android:textAlignment="center"
+        android:text="Enter the URL of the channel you'd like to join" />
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <Button
+        style="@style/MediumProminentOutlineButton"
+        android:id="@+id/joinPublicChatButton"
+        android:layout_width="196dp"
+        android:layout_height="@dimen/medium_button_height"
+        android:layout_marginBottom="@dimen/medium_spacing"
+        android:text="Next" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/fragment_enter_public_key.xml b/res/layout/fragment_enter_public_key.xml
new file mode 100644
index 0000000000..99952ed601
--- /dev/null
+++ b/res/layout/fragment_enter_public_key.xml
@@ -0,0 +1,94 @@
+<?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:background="@drawable/default_session_background"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <EditText
+        style="@style/SmallSessionEditText"
+        android:id="@+id/publicKeyEditText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/large_spacing"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:layout_marginRight="@dimen/large_spacing"
+        android:hint="Enter Session ID of recipient" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/large_spacing"
+        android:layout_marginTop="@dimen/medium_spacing"
+        android:layout_marginRight="@dimen/large_spacing"
+        android:textSize="@dimen/small_font_size"
+        android:textColor="@color/text"
+        android:alpha="0.6"
+        android:textAlignment="center"
+        android:text="Users can share their Session ID by going into their account settings and tapping &quot;Share Session ID&quot;, or by sharing their QR code." />
+    
+    <org.thoughtcrime.securesms.loki.redesign.views.SeparatorView
+        android:id="@+id/separatorView"
+        android:layout_width="match_parent"
+        android:layout_height="32dp"
+        android:layout_marginLeft="@dimen/large_spacing"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:layout_marginRight="@dimen/large_spacing" />
+
+    <TextView
+        android:id="@+id/publicKeyTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/large_spacing"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:layout_marginRight="@dimen/large_spacing"
+        android:textSize="@dimen/medium_font_size"
+        android:textColor="@color/text"
+        android:fontFamily="@font/space_mono_regular"
+        android:textAlignment="center"
+        android:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/large_spacing"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:layout_marginRight="@dimen/large_spacing"
+        android:orientation="horizontal">
+
+        <Button
+            style="@style/MediumUnimportantFilledButton"
+            android:id="@+id/copyButton"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/medium_button_height"
+            android:layout_weight="1"
+            android:text="Copy" />
+
+        <Button
+            style="@style/MediumUnimportantFilledButton"
+            android:id="@+id/shareButton"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/medium_button_height"
+            android:layout_weight="1"
+            android:layout_marginLeft="@dimen/medium_spacing"
+            android:text="Share" />
+
+    </LinearLayout>
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <Button
+        style="@style/MediumProminentOutlineButton"
+        android:id="@+id/createPrivateChatButton"
+        android:layout_width="196dp"
+        android:layout_height="@dimen/medium_button_height"
+        android:layout_marginBottom="@dimen/medium_spacing"
+        android:text="Next" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/fragment_enter_session_id.xml b/res/layout/fragment_enter_session_id.xml
new file mode 100644
index 0000000000..0d713731ef
--- /dev/null
+++ b/res/layout/fragment_enter_session_id.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/default_session_background"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/large_spacing"
+        android:layout_marginRight="@dimen/large_spacing"
+        android:textSize="@dimen/large_font_size"
+        android:textStyle="bold"
+        android:textColor="@color/text"
+        android:text="Link your device" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/large_spacing"
+        android:layout_marginTop="6dp"
+        android:layout_marginRight="@dimen/large_spacing"
+        android:textSize="@dimen/small_font_size"
+        android:textColor="@color/text"
+        android:text="Enter your Session ID to start the linking process." />
+
+    <EditText
+        style="@style/SmallSessionEditText"
+        android:id="@+id/sessionIDEditText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/large_spacing"
+        android:layout_marginTop="12dp"
+        android:layout_marginRight="@dimen/large_spacing"
+        android:hint="Enter your session ID" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+
+    <Button
+        style="@style/MediumProminentOutlineButton"
+        android:id="@+id/requestDeviceLinkButton"
+        android:layout_width="196dp"
+        android:layout_height="@dimen/medium_button_height"
+        android:layout_marginBottom="@dimen/small_spacing"
+        android:text="Next" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/fragment_scan_qr_code_placeholder.xml b/res/layout/fragment_scan_qr_code_placeholder.xml
new file mode 100644
index 0000000000..1a3178b485
--- /dev/null
+++ b/res/layout/fragment_scan_qr_code_placeholder.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/default_session_background">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:gravity="center_horizontal"
+        android:layout_centerInParent="true">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/text"
+            android:textSize="@dimen/small_font_size"
+            android:text="Session needs camera access to scan QR codes" />
+
+        <Button
+            style="@style/MediumProminentOutlineButton"
+            android:id="@+id/grantCameraAccessButton"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/medium_button_height"
+            android:layout_marginTop="@dimen/medium_spacing"
+            android:paddingLeft="@dimen/medium_spacing"
+            android:paddingRight="@dimen/medium_spacing"
+            android:text="Grant Camera Access" />
+
+    </LinearLayout>
+
+</RelativeLayout>
diff --git a/res/layout/fragment_scan_qr_code_v2.xml b/res/layout/fragment_scan_qr_code_v2.xml
new file mode 100644
index 0000000000..c71bea8880
--- /dev/null
+++ b/res/layout/fragment_scan_qr_code_v2.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <org.thoughtcrime.securesms.components.camera.CameraView
+        android:id="@+id/cameraView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:camera="0" />
+
+    <LinearLayout
+        android:id="@+id/overlayView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:weightSum="2" >
+
+        <org.thoughtcrime.securesms.components.ShapeScrim
+            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"/>
+
+        <TextView
+            android:id="@+id/messageTextView"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:padding="@dimen/very_large_spacing"
+            android:gravity="center"
+            android:background="@color/navigation_bar_background"
+            android:text="Users can share their QR code by going into their account settings and tapping &quot;Share QR Code&quot;"
+            android:textSize="@dimen/small_font_size"
+            android:textColor="@color/text" />
+
+    </LinearLayout>
+
+</FrameLayout>
diff --git a/res/layout/fragment_scan_qr_code_wrapper.xml b/res/layout/fragment_scan_qr_code_wrapper.xml
new file mode 100644
index 0000000000..216b135045
--- /dev/null
+++ b/res/layout/fragment_scan_qr_code_wrapper.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/fragmentContainer"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/res/layout/fragment_view_my_qr_code.xml b/res/layout/fragment_view_my_qr_code.xml
new file mode 100644
index 0000000000..f0c997548c
--- /dev/null
+++ b/res/layout/fragment_view_my_qr_code.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/default_session_background" >
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scrollbars="none">
+
+        <LinearLayout
+            android:id="@+id/contentView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/large_spacing"
+                android:layout_marginTop="@dimen/medium_spacing"
+                android:layout_marginRight="@dimen/large_spacing"
+                android:textSize="@dimen/massive_font_size"
+                android:textColor="@color/text"
+                android:textStyle="bold"
+                android:textAlignment="center"
+                android:text="Scan Me" />
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/very_large_spacing"
+                android:layout_marginTop="@dimen/small_spacing"
+                android:layout_marginRight="@dimen/very_large_spacing"
+                android:gravity="center">
+
+                <ImageView
+                    android:id="@+id/qrCodeImageView"
+                    android:layout_width="280dp"
+                    android:layout_height="280dp" />
+
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/explanationTextView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/large_spacing"
+                android:layout_marginTop="20dp"
+                android:layout_marginRight="@dimen/large_spacing"
+                android:textSize="@dimen/medium_font_size"
+                android:textColor="@color/text"
+                android:textAlignment="center"
+                android:text="This is your unique public QR code. Other users can scan this to start a conversation with you." />
+
+            <Button
+                style="@style/MediumUnimportantOutlineButton"
+                android:id="@+id/shareButton"
+                android:layout_width="196dp"
+                android:layout_height="@dimen/medium_button_height"
+                android:layout_marginTop="28dp"
+                android:layout_marginBottom="@dimen/medium_spacing"
+                android:text="Share" />
+
+        </LinearLayout>
+
+    </ScrollView>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/giphy_activity.xml b/res/layout/giphy_activity.xml
index d0b7257ff0..eed1cb4ca5 100644
--- a/res/layout/giphy_activity.xml
+++ b/res/layout/giphy_activity.xml
@@ -28,7 +28,9 @@
                     android:id="@+id/tab_layout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:theme="?attr/actionBarTabBarStyle"
+                    android:theme="@style/Session.DarkTabLayout"
+                    app:tabRippleColor="@color/cell_selected"
+                    app:tabIndicatorColor="@color/accent"
                     android:scrollbars="horizontal"/>
 
         </android.support.design.widget.AppBarLayout>
diff --git a/res/layout/giphy_activity_toolbar.xml b/res/layout/giphy_activity_toolbar.xml
index f7e8995007..a98a027630 100644
--- a/res/layout/giphy_activity_toolbar.xml
+++ b/res/layout/giphy_activity_toolbar.xml
@@ -23,11 +23,11 @@
                       android:layout_height="wrap_content"
                       android:layout_width="0px"
                       android:layout_weight="1"
-                      android:layout_marginStart="5dp"
+                      android:layout_marginStart="6dp"
                       android:hint="@string/giphy_activity_toolbar__search_gifs_and_stickers"
-                      android:textColor="@color/white"
-                      android:textColorHint="@color/white"
-                      android:textCursorDrawable="@null"
+                      android:textColor="@color/text"
+                      android:textColorHint="@color/text"
+                      android:textCursorDrawable="@drawable/session_edit_text_cursor"
                       android:maxLines="1"
                       android:singleLine="true"
                       android:ellipsize="end"
diff --git a/res/layout/giphy_fragment.xml b/res/layout/giphy_fragment.xml
index ce14150fa6..b2b435fcf5 100644
--- a/res/layout/giphy_fragment.xml
+++ b/res/layout/giphy_fragment.xml
@@ -1,27 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent">
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <android.support.v7.widget.RecyclerView
-            android:id="@+id/giphy_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scrollbars="vertical"/>
+        android:id="@+id/giphy_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollbars="vertical"/>
 
-    <ProgressBar android:id="@+id/loading_progress"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:layout_gravity="center"
-                 android:visibility="visible"
-                 android:indeterminate="true"/>
+    <com.github.ybq.android.spinkit.SpinKitView
+        style="@style/SpinKitView.Large.ThreeBounce"
+        android:id="@+id/loading_progress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:layout_gravity="center"
+        android:visibility="visible"
+        app:SpinKit_Color="@color/text" />
 
-    <TextView android:id="@+id/no_results"
-              android:text="@string/giphy_fragment__nothing_found"
-              android:gravity="center"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:visibility="gone"
-              android:layout_gravity="center"/>
+    <TextView
+        android:id="@+id/no_results"
+        android:text="@string/giphy_fragment__nothing_found"
+        android:gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="@color/text"
+        android:textSize="@dimen/medium_font_size"
+        android:visibility="gone"
+        android:layout_gravity="center"/>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/giphy_thumbnail.xml b/res/layout/giphy_thumbnail.xml
index eed7e09e1a..0e85800471 100644
--- a/res/layout/giphy_thumbnail.xml
+++ b/res/layout/giphy_thumbnail.xml
@@ -14,6 +14,8 @@
                  android:layout_width="wrap_content"
                  android:layout_height="wrap_content"
                  android:indeterminate="true"
+                 android:indeterminateTint="@color/accent"
+                 android:indeterminateTintMode="src_in"
                  android:visibility="gone"
                  tools:visibility="visible"
                  android:layout_gravity="center"
diff --git a/res/layout/link_preview.xml b/res/layout/link_preview.xml
index 9dd308ee10..56502655bd 100644
--- a/res/layout/link_preview.xml
+++ b/res/layout/link_preview.xml
@@ -8,7 +8,7 @@
         android:id="@+id/linkpreview_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="6dp"
+        android:padding="@dimen/small_spacing"
         android:background="?linkpreview_background_color">
 
         <org.thoughtcrime.securesms.components.OutlinedThumbnailView
@@ -34,6 +34,7 @@
             android:ellipsize="end"
             android:fontFamily="sans-serif-medium"
             android:maxLines="1"
+            android:textSize="@dimen/medium_font_size"
             android:textColor="?linkpreview_primary_text_color"
             app:layout_constraintEnd_toStartOf="@+id/linkpreview_close"
             app:layout_constraintHorizontal_bias="0.0"
@@ -48,8 +49,10 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:layout_marginTop="2dp"
-            android:textAllCaps="true"
+            android:maxLines="1"
+            android:textSize="@dimen/small_font_size"
             android:textColor="?linkpreview_secondary_text_color"
+            android:alpha="0.6"
             app:layout_constraintStart_toEndOf="@+id/linkpreview_thumbnail"
             app:layout_constraintTop_toBottomOf="@+id/linkpreview_title"
             tools:text="dailybugle.com" />
@@ -82,21 +85,19 @@
             app:layout_constraintTop_toTopOf="parent"
             tools:visibility="visible" />
 
-        <com.pnikosis.materialishprogress.ProgressWheel
+        <com.github.ybq.android.spinkit.SpinKitView
+            style="@style/SpinKitView.DoubleBounce"
             android:id="@+id/linkpreview_progress_wheel"
-            android:layout_width="match_parent"
+            android:layout_width="72dp"
             android:layout_height="72dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginBottom="8dp"
-            android:indeterminate="true"
-            android:padding="8dp"
+            android:layout_gravity="center"
+            android:padding="@dimen/small_spacing"
+            app:SpinKit_Color="@color/text"
             android:visibility="gone"
             app:layout_constraintBottom_toTopOf="@+id/linkpreview_divider"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:matProg_barColor="@color/core_blue"
-            app:matProg_progressIndeterminate="true" />
+            app:layout_constraintTop_toTopOf="parent" />
 
     </android.support.constraint.ConstraintLayout>
 
diff --git a/res/layout/media_overview_activity.xml b/res/layout/media_overview_activity.xml
index 2a24f4e760..39b69512ab 100644
--- a/res/layout/media_overview_activity.xml
+++ b/res/layout/media_overview_activity.xml
@@ -3,6 +3,7 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_height="match_parent"
         android:layout_width="match_parent"
+        android:background="@drawable/default_session_background"
         xmlns:tools="http://schemas.android.com/tools"
         xmlns:app="http://schemas.android.com/apk/res-auto">
 
@@ -14,8 +15,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?android:attr/actionBarSize"
-                android:background="?attr/media_overview_toolbar_background"
-                android:titleTextColor="?attr/media_overview_toolbar_foreground"
+                style="@style/Session.DarkActionBar"
                 app:layout_scrollFlags="scroll|enterAlways"/>
 
         <org.thoughtcrime.securesms.components.ControllableTabLayout
@@ -23,6 +23,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="top"
+                style="@style/Session.DarkTabLayout"
                 android:background="?attr/media_overview_toolbar_background"
                 app:tabBackground="?attr/media_overview_toolbar_background"
                 app:tabIndicatorColor="@color/textsecure_primary"
diff --git a/res/layout/media_overview_document_item_header.xml b/res/layout/media_overview_document_item_header.xml
index 6766df9c87..0bbc21e05c 100644
--- a/res/layout/media_overview_document_item_header.xml
+++ b/res/layout/media_overview_document_item_header.xml
@@ -11,8 +11,6 @@
               android:layout_height="wrap_content"
               android:layout_gravity="start|center_vertical"
               android:textColor="?attr/media_overview_header_foreground"
-              android:textSize="14sp"
-              android:textStyle="bold"
-              android:textAllCaps="true"
+              android:textSize="@dimen/small_font_size"
               tools:text="March 1, 2015" />
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/media_overview_documents_fragment.xml b/res/layout/media_overview_documents_fragment.xml
index c3edce10c9..098d28a451 100644
--- a/res/layout/media_overview_documents_fragment.xml
+++ b/res/layout/media_overview_documents_fragment.xml
@@ -3,7 +3,7 @@
                 xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="?attr/media_overview_toolbar_background">
+                android:background="@drawable/default_session_background">
 
     <android.support.v7.widget.RecyclerView
             android:id="@+id/recycler_view"
diff --git a/res/layout/media_overview_gallery_fragment.xml b/res/layout/media_overview_gallery_fragment.xml
index fd33d5301e..d53a1b4a04 100644
--- a/res/layout/media_overview_gallery_fragment.xml
+++ b/res/layout/media_overview_gallery_fragment.xml
@@ -3,7 +3,7 @@
                 xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="?attr/media_overview_toolbar_background">
+                android:background="@drawable/default_session_background">
 
     <android.support.v7.widget.RecyclerView
             android:id="@+id/media_grid"
diff --git a/res/layout/media_overview_gallery_item_header.xml b/res/layout/media_overview_gallery_item_header.xml
index 6766df9c87..0bbc21e05c 100644
--- a/res/layout/media_overview_gallery_item_header.xml
+++ b/res/layout/media_overview_gallery_item_header.xml
@@ -11,8 +11,6 @@
               android:layout_height="wrap_content"
               android:layout_gravity="start|center_vertical"
               android:textColor="?attr/media_overview_header_foreground"
-              android:textSize="14sp"
-              android:textStyle="bold"
-              android:textAllCaps="true"
+              android:textSize="@dimen/small_font_size"
               tools:text="March 1, 2015" />
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/media_preview_activity.xml b/res/layout/media_preview_activity.xml
index 662572b06f..63b5f01369 100644
--- a/res/layout/media_preview_activity.xml
+++ b/res/layout/media_preview_activity.xml
@@ -6,7 +6,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/gray95">
+    android:background="@drawable/default_session_background">
 
     <org.thoughtcrime.securesms.components.viewpager.HackyViewPager
         android:id="@+id/media_pager"
diff --git a/res/layout/media_view_remove_button.xml b/res/layout/media_view_remove_button.xml
index 44bf070aaa..ffe87c4f89 100644
--- a/res/layout/media_view_remove_button.xml
+++ b/res/layout/media_view_remove_button.xml
@@ -4,5 +4,7 @@
            android:layout_width="@dimen/media_bubble_remove_button_size"
            android:layout_height="@dimen/media_bubble_remove_button_size"
            android:layout_gravity="top|end"
-           android:src="@drawable/conversation_attachment_close_circle"
+           android:background="@drawable/circle_alpha"
+           android:src="@drawable/ic_close_white_18dp"
+           android:tint="#99FFFFFF"
            android:visibility="gone"/>
diff --git a/res/layout/mediapicker_folder_fragment.xml b/res/layout/mediapicker_folder_fragment.xml
index 321fd0e642..a430b4604a 100644
--- a/res/layout/mediapicker_folder_fragment.xml
+++ b/res/layout/mediapicker_folder_fragment.xml
@@ -4,18 +4,19 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="?android:windowBackground">
+    android:background="@drawable/default_session_background">
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/mediapicker_toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:minHeight="?attr/actionBarSize"
-        android:background="?attr/conversation_list_toolbar_background"
+        android:background="@color/action_bar_background"
         android:theme="?attr/actionBarStyle" />
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/mediapicker_folder_list"
+        android:background="@drawable/default_session_background"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginStart="2dp"
diff --git a/res/layout/mediapicker_item_fragment.xml b/res/layout/mediapicker_item_fragment.xml
index 58f09437af..faf41c15b6 100644
--- a/res/layout/mediapicker_item_fragment.xml
+++ b/res/layout/mediapicker_item_fragment.xml
@@ -4,18 +4,19 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="?android:windowBackground">
+    android:background="@drawable/default_session_background">
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/mediapicker_toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:minHeight="?attr/actionBarSize"
-        android:background="?attr/conversation_list_toolbar_background"
+        android:background="@color/action_bar_background"
         android:theme="?attr/actionBarStyle" />
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/mediapicker_item_list"
+        android:background="@drawable/default_session_background"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginStart="2dp"
diff --git a/res/layout/mediapicker_media_item.xml b/res/layout/mediapicker_media_item.xml
index 18714dbbcc..1abe625bb8 100644
--- a/res/layout/mediapicker_media_item.xml
+++ b/res/layout/mediapicker_media_item.xml
@@ -20,7 +20,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?mediapicker_image_outline" />
+        android:background="@drawable/mediapicker_item_border_dark" />
 
     <FrameLayout
         android:id="@+id/mediapicker_play_overlay"
diff --git a/res/layout/mediasend_activity.xml b/res/layout/mediasend_activity.xml
index 8285e94b4e..24a25d371e 100644
--- a/res/layout/mediasend_activity.xml
+++ b/res/layout/mediasend_activity.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@drawable/default_session_background">
 
     <FrameLayout
         android:id="@+id/mediasend_fragment_container"
@@ -37,7 +38,7 @@
             android:paddingBottom="2dp"
             android:gravity="center"
             android:background="@drawable/media_count_number_background"
-            android:textColor="@color/signal_primary"
+            android:textColor="@color/accent"
             android:textSize="18sp"
             tools:text="3" />
 
diff --git a/res/layout/mediasend_fragment.xml b/res/layout/mediasend_fragment.xml
index 10e55fdb97..12da7d9fef 100644
--- a/res/layout/mediasend_fragment.xml
+++ b/res/layout/mediasend_fragment.xml
@@ -41,6 +41,7 @@
                 android:paddingTop="6dp"
                 android:paddingBottom="6dp"
                 style="@style/Signal.Text.Body"
+                android:textSize="@dimen/medium_font_size"
                 android:maxLines="3"
                 android:maxLength="240"
                 android:hint="@string/MediaSendActivity_add_a_caption"
@@ -96,6 +97,8 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
+                        android:textSize="@dimen/small_font_size"
+                        android:textCursorDrawable="@drawable/session_edit_text_cursor"
                         android:layout_weight="1"
                         android:nextFocusForward="@+id/send_button"
                         android:nextFocusRight="@+id/send_button"
@@ -118,10 +121,6 @@
                         android:id="@+id/mediasend_send_button"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
-                        android:paddingTop="6dp"
-                        android:paddingEnd="6dp"
-                        android:paddingBottom="6dp"
-                        android:paddingStart="11dp"
                         android:scaleType="fitCenter"
                         android:contentDescription="@string/conversation_activity__send"
                         android:src="?conversation_transport_sms_indicator"
diff --git a/res/layout/message_details_activity.xml b/res/layout/message_details_activity.xml
index 88cfb1061f..6f51965693 100644
--- a/res/layout/message_details_activity.xml
+++ b/res/layout/message_details_activity.xml
@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:tools="http://schemas.android.com/tools"
               android:id="@+id/container"
+              android:background="@drawable/default_session_background"
               android:orientation="vertical"
               android:layout_width="match_parent"
               android:layout_height="match_parent">
diff --git a/res/layout/message_details_header.xml b/res/layout/message_details_header.xml
index 4bef2e26d1..5efb768f05 100644
--- a/res/layout/message_details_header.xml
+++ b/res/layout/message_details_header.xml
@@ -3,22 +3,23 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:tools="http://schemas.android.com/tools"
               android:orientation="vertical"
+              android:background="@color/transparent"
               android:layout_width="match_parent"
               android:layout_height="match_parent">
 
     <FrameLayout android:id="@+id/item_container"
                  android:layout_width="match_parent"
                  android:layout_height="wrap_content"
-                 android:paddingTop="15dp"
-                 android:paddingBottom="15dp"
-                 android:elevation="2dp" />
+                 android:paddingTop="@dimen/medium_spacing"
+                 android:paddingBottom="@dimen/medium_spacing"
+                 android:elevation="10dp" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingStart="10dp"
-        android:paddingEnd="10dp">
+        android:paddingStart="@dimen/medium_spacing"
+        android:paddingEnd="@dimen/medium_spacing">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -30,11 +31,11 @@
                       android:layout_weight="1"
                       android:visibility="gone"
                       android:textSize="16sp"
-                      android:padding="5dp"
+                      android:drawablePadding="12dp"
                       tools:visibility="visible"
                       android:text="@string/message_details_header__issues_need_your_attention"
-                      android:drawableStart="@drawable/ic_info_outline_light"
-                      android:gravity="center_vertical" />
+                      android:drawableStart="@drawable/ic_error"
+                      android:layout_gravity="center_vertical" />
 
             <Button
                 android:id="@+id/resend_button"
diff --git a/res/layout/microphone_recorder_view.xml b/res/layout/microphone_recorder_view.xml
index ace424f178..6fed405950 100644
--- a/res/layout/microphone_recorder_view.xml
+++ b/res/layout/microphone_recorder_view.xml
@@ -7,14 +7,14 @@
     <ImageButton
         android:id="@+id/quick_audio_toggle"
         android:layout_width="24dp"
-        android:layout_height="match_parent"
+        android:layout_height="24dp"
         android:layout_gravity="center_vertical"
         android:layout_marginEnd="2dp"
         android:background="@null"
         android:contentDescription="@string/conversation_activity__quick_attachment_drawer_record_and_send_audio_description"
-        android:scaleType="fitCenter"
-        android:tint="?compose_icon_tint"
-        app:srcCompat="@drawable/ic_mic_filled_24" />
+        android:scaleType="centerInside"
+        android:tint="@color/text"
+        app:srcCompat="@drawable/ic_microphone" />
 
     <LinearLayout
         android:id="@+id/lock_drop_target"
@@ -59,7 +59,7 @@
         android:clickable="false"
         android:visibility="gone"
         android:tint="@color/core_white"
-        app:srcCompat="@drawable/ic_mic_filled_24"
+        app:srcCompat="@drawable/ic_microphone"
         tools:ignore="ContentDescription"
         tools:visibility="visible" />
 </merge>
diff --git a/res/layout/permissions_rationale_dialog.xml b/res/layout/permissions_rationale_dialog.xml
index 20e49d5e32..93a0d7d1db 100644
--- a/res/layout/permissions_rationale_dialog.xml
+++ b/res/layout/permissions_rationale_dialog.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:orientation="vertical"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content">
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
 
-    <LinearLayout android:id="@+id/header_container"
-                  android:background="@color/signal_primary"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="horizontal"
-                  android:gravity="center"
-                  android:padding="40dp">
+    <LinearLayout
+        android:id="@+id/header_container"
+        android:background="@color/accent"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center"
+        android:padding="40dp">
 
     </LinearLayout>
 
-    <TextView android:id="@+id/message"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:paddingTop="40dp"
-              android:paddingBottom="40dp"
-              android:paddingStart="20dp"
-              android:paddingEnd="20dp"
-              android:textSize="15sp"
-              android:lineSpacingMultiplier="1.3"
-              tools:text="Signal needs access to your contacts and media in order to connect with friends, exchange messages, and make secure calls."/>
+    <TextView
+        android:id="@+id/message"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/large_spacing"
+        android:textSize="@dimen/medium_font_size"
+        android:lineSpacingMultiplier="1.3"
+        tools:text="Signal needs access to your contacts and media in order to connect with friends, exchange messages, and make secure calls."/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/preference_divider.xml b/res/layout/preference_divider.xml
index 045cf65e49..0e3053ee9c 100644
--- a/res/layout/preference_divider.xml
+++ b/res/layout/preference_divider.xml
@@ -1,14 +1,12 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:orientation="vertical"
-              android:layout_margin="0dp"
-              android:background="@color/amber_50"
-              android:padding="0dp">
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
     <View
-            android:layout_width="match_parent"
-            android:layout_height="10dp"
-            android:background="?pref_divider"/>
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/medium_spacing"
+        android:background="@color/cell_background" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/preference_right_summary_widget.xml b/res/layout/preference_right_summary_widget.xml
index 56a908e79c..3a05234588 100644
--- a/res/layout/preference_right_summary_widget.xml
+++ b/res/layout/preference_right_summary_widget.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-    <TextView android:id="@+id/right_summary"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_gravity="right|center_vertical"
-              android:gravity="right|center_vertical"
-              android:textSize="16sp"
-              android:textColor="@color/signal_primary_dark"/>
+    <TextView
+        android:id="@+id/right_summary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right|center_vertical"
+        android:gravity="right|center_vertical"
+        android:textSize="@dimen/medium_font_size"
+        android:textColor="@color/accent" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/progress_dialog.xml b/res/layout/progress_dialog.xml
index 993305c094..2cb996cbe9 100644
--- a/res/layout/progress_dialog.xml
+++ b/res/layout/progress_dialog.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<RelativeLayout
     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="match_parent">
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/medium_spacing">
 
-    <com.pnikosis.materialishprogress.ProgressWheel
-        android:id="@+id/mediasend_progress_wheel"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:padding="8dp"
-        android:indeterminate="true"
-        app:matProg_progressIndeterminate="true"
-        app:matProg_barColor="@color/core_grey_25"/>
+    <com.github.ybq.android.spinkit.SpinKitView
+        style="@style/SpinKitView.Large.ThreeBounce"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        app:SpinKit_Color="@color/text" />
 
-</FrameLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/prompt_passphrase_activity.xml b/res/layout/prompt_passphrase_activity.xml
index 1829d3623b..7cec2f521c 100644
--- a/res/layout/prompt_passphrase_activity.xml
+++ b/res/layout/prompt_passphrase_activity.xml
@@ -6,7 +6,7 @@
                 android:id="@+id/prompt_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@color/loki_darkest_gray"
+                android:background="@drawable/default_session_background"
                 android:orientation="vertical">
 
     <View android:id="@+id/shim"
@@ -36,33 +36,32 @@
 
     </android.support.v7.widget.Toolbar>
 
-
     <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="30dp"
             android:layout_marginEnd="30dp"
             android:orientation="vertical"
-            android:background="?login_floating_background"
+            android:gravity="center_horizontal"
             android:layout_centerInParent="true"
-            android:padding="20dp"
-            android:elevation="10dp">
+            android:padding="20dp">
 
         <TextView
             style="@style/Signal.Text.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/prompt_passphrase_activity__signal_is_locked"
+            android:text="Session is Locked"
             android:textStyle="bold"
+            android:textSize="@dimen/large_font_size"
             android:textAlignment="center"
-            android:textColor="@color/white"
+            android:textColor="@color/text"
             android:layout_marginBottom="32dp" />
 
         <ImageView
             android:id="@+id/fingerprint_auth_container"
             android:src="@drawable/ic_fingerprint_white_48dp"
             android:background="@drawable/circle_tintable"
-            android:backgroundTint="@color/signal_primary"
+            android:backgroundTint="@color/accent"
             android:padding="20dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -70,20 +69,12 @@
             android:layout_marginBottom="32dp"
             tools:visibility="visible"/>
 
-        <com.dd.CircularProgressButton
+        <Button
+            style="@style/MediumProminentOutlineButton"
             android:id="@+id/lock_screen_auth_container"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_gravity="center_horizontal"
-            android:background="@color/signal_primary"
-            android:textColor="@color/white"
-            app:cpb_colorIndicator="@color/white"
-            app:cpb_colorProgress="@color/textsecure_primary"
-            app:cpb_cornerRadius="4dp"
-            app:cpb_selectorIdle="@drawable/progress_button_state"
-            app:cpb_textIdle="@string/prompt_passphrase_activity__tap_to_unlock"
-            android:elevation="0dp"
-            android:stateListAnimator="@null" />
+            android:layout_width="196dp"
+            android:layout_height="@dimen/medium_button_height"
+            android:text="Tap to Unlock" />
 
         <RelativeLayout android:id="@+id/password_auth_container"
                         android:layout_width="match_parent"
diff --git a/res/layout/quote_view.xml b/res/layout/quote_view.xml
index af43d40c52..6246371cc6 100644
--- a/res/layout/quote_view.xml
+++ b/res/layout/quote_view.xml
@@ -23,7 +23,7 @@
 
             <ImageView
                 android:id="@+id/quote_bar"
-                android:layout_width="@dimen/quote_corner_radius_bottom"
+                android:layout_width="@dimen/accent_line_thickness"
                 android:layout_height="match_parent"
                 android:src="@color/white"
                 tools:tint="@color/purple_400" />
@@ -43,8 +43,9 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     style="@style/Signal.Text.Caption"
-                    android:textColor="@color/core_black"
-                    android:textStyle="bold"
+                    android:textColor="@color/text"
+                    android:fontFamily="sans-serif-medium"
+                    android:textSize="@dimen/small_font_size"
                     android:maxLines="1"
                     android:ellipsize="end"
                     tools:text="Peter Parker" />
@@ -71,7 +72,8 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         style="@style/Signal.Text.Body"
-                        android:textColor="@color/core_grey_90"
+                        android:textColor="@color/text"
+                        android:textSize="@dimen/medium_font_size"
                         android:maxLines="1"
                         android:ellipsize="end"
                         tools:text="The-Amazing-Spider-Man.cba" />
@@ -95,6 +97,7 @@
                     android:id="@+id/quote_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
                     style="@style/Signal.Text.Body"
                     android:ellipsize="end"
                     android:maxLines="2"
@@ -154,7 +157,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
                 android:src="@drawable/ic_broken_link"
-                android:tint="?attr/quote_missing_icon_color"/>
+                android:tint="@color/text"/>
 
             <TextView
                 android:id="@+id/quote_missing_text"
@@ -162,7 +165,7 @@
                 android:layout_height="wrap_content"
                 style="@style/Signal.Text.Caption"
                 android:text="@string/QuoteView_original_missing"
-                android:textColor="@color/core_grey_90"/>
+                android:textColor="@color/text"/>
 
         </LinearLayout>
 
@@ -178,6 +181,6 @@
         android:layout_gravity="top|end"
         android:background="@drawable/dismiss_background"
         android:src="@drawable/ic_close_white_18dp"
-        android:tint="@color/gray70" />
+        android:tint="#99FFFFFF" />
 
 </merge>
\ No newline at end of file
diff --git a/res/layout/recording_layout.xml b/res/layout/recording_layout.xml
index 0082e30f94..79731c0e67 100644
--- a/res/layout/recording_layout.xml
+++ b/res/layout/recording_layout.xml
@@ -13,13 +13,14 @@
 
     <ImageView
         android:id="@+id/microphone"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
         android:layout_marginStart="14dp"
         android:importantForAccessibility="no"
-        android:tint="@color/red_500"
+        android:tint="@color/destructive"
         android:visibility="invisible"
-        app:srcCompat="@drawable/ic_mic_filled_24"
+        android:scaleType="centerInside"
+        app:srcCompat="@drawable/ic_microphone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -30,11 +31,12 @@
         style="@style/Signal.Text.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="2dp"
+        android:layout_marginStart="4dp"
         android:ellipsize="none"
         android:singleLine="true"
-        android:textColor="@color/core_grey_60"
+        android:textColor="#99FFFFFF"
         android:visibility="gone"
+        android:textSize="@dimen/small_font_size"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@id/microphone"
         app:layout_constraintTop_toTopOf="parent"
@@ -47,17 +49,16 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
+        android:layout_marginEnd="@dimen/medium_spacing"
         android:ellipsize="none"
         android:gravity="center_vertical"
         android:padding="4dp"
         android:text="@string/conversation_input_panel__cancel"
-        android:textAllCaps="true"
-        android:textColor="@color/red_500"
+        android:textSize="@dimen/small_font_size"
+        android:textColor="@color/destructive"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/frameLayout"
         app:layout_constraintTop_toTopOf="parent"
         tools:visibility="visible" />
 
@@ -70,19 +71,33 @@
         app:layout_constraintStart_toEndOf="@+id/record_time"
         app:layout_constraintTop_toTopOf="parent">
 
-        <TextView
+        <LinearLayout
             android:id="@+id/slide_to_cancel"
-            style="@style/Signal.Text.Caption"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:drawableStart="@drawable/ic_keyboard_arrow_left_grey600_24dp"
-            android:ellipsize="none"
+            android:orientation="horizontal"
             android:gravity="center_vertical"
-            android:text="@string/conversation_input_panel__slide_to_cancel"
-            android:textAllCaps="true"
-            android:textColor="@color/core_grey_60"
             android:visibility="gone"
-            tools:visibility="visible" />
+            tools:visibility="visible">
+
+            <ImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_marginTop="1dp"
+                android:src="@drawable/ic_keyboard_arrow_left_grey600_24dp"
+                android:tint="#99FFFFFF"
+                android:scaleType="centerInside" />
+
+            <TextView
+                style="@style/Signal.Text.Caption"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="@dimen/small_font_size"
+                android:ellipsize="none"
+                android:text="@string/conversation_input_panel__slide_to_cancel"
+                android:textColor="#99FFFFFF" />
+
+        </LinearLayout>
 
     </FrameLayout>
 
diff --git a/res/layout/search_toolbar.xml b/res/layout/search_toolbar.xml
index 6a81ae1d5f..20ba8e76e7 100644
--- a/res/layout/search_toolbar.xml
+++ b/res/layout/search_toolbar.xml
@@ -10,10 +10,6 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/search_toolbar_background"/>
-
-    <View android:layout_width="match_parent"
-          android:layout_height="4dp"
-          android:background="@drawable/search_toolbar_shadow"/>
+            android:background="@color/action_bar_background"/>
 
 </merge>
\ No newline at end of file
diff --git a/res/layout/share_activity.xml b/res/layout/share_activity.xml
index 2ff05653f6..a3a9786d79 100644
--- a/res/layout/share_activity.xml
+++ b/res/layout/share_activity.xml
@@ -5,7 +5,8 @@
                 xmlns:tools="http://schemas.android.com/tools"
                 android:orientation="vertical"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="match_parent"
+                android:background="@drawable/default_session_background">
 
     <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
@@ -13,9 +14,9 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:minHeight="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            android:elevation="4dp"
-            android:theme="?attr/actionBarStyle">
+            android:background="@color/action_bar_background"
+            android:elevation="0dp"
+            android:theme="@style/Session.DarkActionBar">
 
         <RelativeLayout
                 android:layout_width="match_parent"
@@ -23,9 +24,10 @@
 
             <TextView android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
-                      android:text="@string/ShareActivity_share_with"
+                      android:text="Share"
                       android:textColor="@color/white"
-                      android:textSize="20sp"
+                      android:fontFamily="sans-serif-medium"
+                      android:textSize="@dimen/very_large_font_size"
                       android:layout_alignParentStart="true"
                       android:layout_centerVertical="true"
                       android:layout_toStartOf="@+id/search_action"/>
@@ -34,6 +36,7 @@
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:src="@drawable/ic_search_white_24dp"
+                       android:visibility="gone"
                        android:layout_alignParentEnd="true"
                        android:layout_centerVertical="true"/>
 
diff --git a/res/layout/view_conversation.xml b/res/layout/view_conversation.xml
new file mode 100644
index 0000000000..b574dcf669
--- /dev/null
+++ b/res/layout/view_conversation.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@drawable/conversation_view_background"
+    android:orientation="horizontal"
+    android:gravity="center_vertical">
+
+    <View
+        android:id="@+id/unreadMessagesIndicatorView"
+        android:layout_width="@dimen/accent_line_thickness"
+        android:layout_height="match_parent"
+        android:background="@color/accent" />
+    
+    <org.thoughtcrime.securesms.loki.redesign.views.ProfilePictureView
+        android:id="@+id/profilePictureView"
+        android:layout_width="@dimen/medium_profile_picture_size"
+        android:layout_height="@dimen/medium_profile_picture_size"
+        android:layout_marginTop="@dimen/medium_spacing"
+        android:layout_marginLeft="@dimen/medium_spacing"
+        android:layout_marginBottom="@dimen/medium_spacing" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/medium_spacing"
+        android:layout_marginRight="@dimen/medium_spacing"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:id="@+id/displayNameTextView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxLines="1"
+                android:ellipsize="end"
+                android:textSize="@dimen/medium_font_size"
+                android:textStyle="bold"
+                android:textColor="@color/text"
+                android:text="Spiderman" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <TextView
+                android:id="@+id/timestampTextView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/medium_spacing"
+                android:maxLines="1"
+                android:ellipsize="end"
+                android:textSize="@dimen/small_font_size"
+                android:textColor="@color/text"
+                android:alpha="0.4"
+                android:text="9:41 AM" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center_vertical">
+
+            <ImageView
+                android:id="@+id/muteIndicatorImageView"
+                android:layout_width="12dp"
+                android:layout_height="12dp"
+                android:src="@drawable/ic_mute"
+                android:layout_marginTop="1dp"
+                android:layout_marginRight="4dp" />
+
+            <RelativeLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/snippetTextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:maxLines="1"
+                    android:ellipsize="end"
+                    android:textSize="@dimen/medium_font_size"
+                    android:textColor="@color/text"
+                    android:text="Sorry, gotta go fight crime again" />
+
+                <org.thoughtcrime.securesms.components.TypingIndicatorView
+                    android:id="@+id/typingIndicatorView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    app:typingIndicator_tint="@color/text" />
+
+            </RelativeLayout>
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <ImageView
+                android:id="@+id/statusIndicatorImageView"
+                android:layout_width="@dimen/conversation_view_status_indicator_size"
+                android:layout_height="@dimen/conversation_view_status_indicator_size"
+                android:layout_marginLeft="@dimen/medium_spacing" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/view_fake_chat.xml b/res/layout/view_fake_chat.xml
new file mode 100644
index 0000000000..1b1d83b65d
--- /dev/null
+++ b/res/layout/view_fake_chat.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingLeft="@dimen/very_large_spacing"
+    android:paddingRight="@dimen/very_large_spacing"
+    android:orientation="vertical">
+
+    <TextView
+        style="@style/FakeChatViewOutgoingMessageBubble"
+        android:id="@+id/bubble1"
+        android:layout_width="@dimen/fake_chat_view_bubble_width"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/medium_spacing"
+        android:text="What's Session?"
+        android:layout_gravity="right" />
+
+    <TextView
+        style="@style/FakeChatViewIncomingMessageBubble"
+        android:id="@+id/bubble2"
+        android:layout_width="@dimen/fake_chat_view_bubble_width"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/medium_spacing"
+        android:text="It's a secure, decentralized private messaging app"
+        android:layout_gravity="left" />
+
+    <TextView
+        style="@style/FakeChatViewOutgoingMessageBubble"
+        android:id="@+id/bubble3"
+        android:layout_width="@dimen/fake_chat_view_bubble_width"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/medium_spacing"
+        android:text="So it doesn't collect my personal information or my conversation metadata? How does it work?"
+        android:layout_gravity="right" />
+
+    <TextView
+        style="@style/FakeChatViewIncomingMessageBubble"
+        android:id="@+id/bubble4"
+        android:layout_width="@dimen/fake_chat_view_bubble_width"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/medium_spacing"
+        android:text="Using a combination of advanced anonymous routing and end-to-end encryption technologies."
+        android:layout_gravity="left" />
+
+    <TextView
+        style="@style/FakeChatViewIncomingMessageBubble"
+        android:id="@+id/bubble5"
+        android:layout_width="@dimen/fake_chat_view_bubble_width"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/medium_spacing"
+        android:text="Friends don't let friends use compromised messengers. You're welcome."
+        android:layout_gravity="left" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/view_mention_candidate.xml b/res/layout/view_mention_candidate.xml
new file mode 100644
index 0000000000..f572ea5549
--- /dev/null
+++ b/res/layout/view_mention_candidate.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.thoughtcrime.securesms.loki.redesign.views.MentionCandidateView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="44dp"
+    android:orientation="horizontal"
+    android:paddingStart="@dimen/medium_spacing"
+    android:paddingEnd="@dimen/medium_spacing"
+    android:gravity="center_vertical"
+    android:background="@drawable/mention_candidate_view_background">
+
+    <RelativeLayout
+        android:layout_width="26dp"
+        android:layout_height="32dp">
+
+        <org.thoughtcrime.securesms.loki.redesign.views.ProfilePictureView
+            android:id="@+id/profilePictureView"
+            android:layout_width="@dimen/very_small_profile_picture_size"
+            android:layout_height="@dimen/very_small_profile_picture_size"
+            android:layout_marginTop="3dp" />
+
+        <ImageView
+            android:id="@+id/moderatorIconImageView"
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:src="@drawable/icon_crown"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentBottom="true" />
+
+    </RelativeLayout>
+
+    <TextView
+        android:id="@+id/displayNameTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/medium_spacing"
+        android:textSize="@dimen/small_font_size"
+        android:textColor="@color/text"
+        android:maxLines="1"
+        android:ellipsize="end" />
+
+</org.thoughtcrime.securesms.loki.redesign.views.MentionCandidateView>
\ No newline at end of file
diff --git a/res/layout/view_mention_candidate_selection.xml b/res/layout/view_mention_candidate_selection.xml
index 152e0d95f9..d96c222d63 100644
--- a/res/layout/view_mention_candidate_selection.xml
+++ b/res/layout/view_mention_candidate_selection.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.loki.MentionCandidateSelectionView
+<org.thoughtcrime.securesms.loki.redesign.views.MentionCandidateSelectionView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/userSelectionView"
     android:layout_width="match_parent"
     android:layout_height="0dp"
-    android:paddingTop="6dp"
     android:listSelector="@color/transparent" />
\ No newline at end of file
diff --git a/res/layout/view_profile_picture.xml b/res/layout/view_profile_picture.xml
new file mode 100644
index 0000000000..1a380db32b
--- /dev/null
+++ b/res/layout/view_profile_picture.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <RelativeLayout
+        android:id="@+id/doubleModeImageViewContainer"
+        android:layout_width="@dimen/medium_profile_picture_size"
+        android:layout_height="@dimen/medium_profile_picture_size">
+
+        <RelativeLayout
+            android:layout_width="@dimen/small_profile_picture_size"
+            android:layout_height="@dimen/small_profile_picture_size"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentTop="true">
+
+            <ImageView
+                android:id="@+id/doubleModeImageView1"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/profile_picture_view_small_background" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/profile_picture_view_small_foreground" />
+
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="@dimen/small_profile_picture_size"
+            android:layout_height="@dimen/small_profile_picture_size"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true">
+
+            <ImageView
+                android:id="@+id/doubleModeImageView2"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/profile_picture_view_small_background" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@drawable/profile_picture_view_small_foreground" />
+
+        </RelativeLayout>
+
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/singleModeImageViewContainer"
+        android:layout_width="@dimen/medium_profile_picture_size"
+        android:layout_height="@dimen/medium_profile_picture_size">
+
+        <ImageView
+            android:id="@+id/singleModeImageView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/profile_picture_view_medium_background" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/profile_picture_view_medium_foreground" />
+
+    </RelativeLayout>
+
+    <TextView
+        android:id="@+id/rssTextView"
+        android:layout_width="@dimen/medium_profile_picture_size"
+        android:layout_height="@dimen/medium_profile_picture_size"
+        android:gravity="center"
+        android:text="RSS"
+        android:textColor="@color/text"
+        android:textSize="@dimen/small_font_size"
+        android:background="@drawable/profile_picture_view_rss_medium_background" />
+
+    <RelativeLayout
+        android:id="@+id/largeSingleModeImageViewContainer"
+        android:layout_width="@dimen/large_profile_picture_size"
+        android:layout_height="@dimen/large_profile_picture_size">
+
+        <ImageView
+            android:id="@+id/largeSingleModeImageView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/profile_picture_view_large_background" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/profile_picture_view_large_foreground" />
+
+    </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/view_seed_reminder.xml b/res/layout/view_seed_reminder.xml
new file mode 100644
index 0000000000..7ea49de182
--- /dev/null
+++ b/res/layout/view_seed_reminder.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/cell_background"
+    android:orientation="vertical">
+
+    <ProgressBar
+        style="@android:style/Widget.ProgressBar.Horizontal"
+        android:id="@+id/progressBar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/accent_line_thickness"
+        android:paddingLeft="-2dp"
+        android:paddingRight="-2dp"
+        android:progressTint="@color/accent"
+        android:progressBackgroundTint="@color/progress_bar_background"
+        android:progress="80" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:padding="@dimen/medium_spacing"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/titleTextView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/text"
+                android:textSize="@dimen/small_font_size"
+                android:textStyle="bold"
+                android:text="You're almost finished! 80%" />
+
+            <TextView
+                android:id="@+id/subtitleTextView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:textColor="@color/text"
+                android:textSize="@dimen/very_small_font_size"
+                android:alpha="0.6"
+                android:text="Secure your account by saving your recovery phrase" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
+        <Button
+            style="@style/MediumProminentOutlineButton"
+            android:id="@+id/button"
+            android:layout_width="wrap_content"
+            android:layout_height="27dp"
+            android:layout_marginLeft="@dimen/small_spacing"
+            android:textStyle="normal"
+            android:text="Continue" />
+
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/separator" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/view_separator.xml b/res/layout/view_separator.xml
new file mode 100644
index 0000000000..16ecb41fe8
--- /dev/null
+++ b/res/layout/view_separator.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/titleTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:gravity="center"
+        android:textColor="@color/text"
+        android:alpha="0.6"
+        android:textSize="@dimen/small_font_size"
+        android:text="Your Session ID" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/menu/conversation.xml b/res/menu/conversation.xml
index cd33628267..4a7bb30912 100644
--- a/res/menu/conversation.xml
+++ b/res/menu/conversation.xml
@@ -8,7 +8,6 @@
     <!-- <item android:title="@string/conversation__menu_conversation_settings"
           android:id="@+id/menu_conversation_settings"/> -->
 
-
     <item android:title="@string/SearchToolbar_search"
           android:id="@+id/menu_search"
           app:actionViewClass="android.support.v7.widget.SearchView"
diff --git a/res/menu/menu_home.xml b/res/menu/menu_home.xml
new file mode 100644
index 0000000000..4f5265b5db
--- /dev/null
+++ b/res/menu/menu_home.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/joinPublicChatItem"
+        android:title="Join Public Chat"
+        android:icon="@drawable/ic_globe"
+        app:showAsAction="always" />
+
+</menu>
\ No newline at end of file
diff --git a/res/menu/menu_linked_devices.xml b/res/menu/menu_linked_devices.xml
new file mode 100644
index 0000000000..85a1a1a57a
--- /dev/null
+++ b/res/menu/menu_linked_devices.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/linkDeviceButton"
+        android:title="Link Device"
+        android:icon="@drawable/ic_plus_24"
+        app:showAsAction="always" />
+
+</menu>
\ No newline at end of file
diff --git a/res/menu/menu_settings.xml b/res/menu/menu_settings.xml
new file mode 100644
index 0000000000..55f56b1233
--- /dev/null
+++ b/res/menu/menu_settings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/showQRCodeItem"
+        android:title="Show QR Code"
+        android:icon="@drawable/ic_qr_code"
+        app:showAsAction="always" />
+
+</menu>
\ No newline at end of file
diff --git a/res/mipmap-hdpi/ic_launcher.png b/res/mipmap-hdpi/ic_launcher.png
index fe2a79fa87..6e73f903c6 100644
Binary files a/res/mipmap-hdpi/ic_launcher.png and b/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/res/mipmap-hdpi/ic_launcher_round.png b/res/mipmap-hdpi/ic_launcher_round.png
index a2e687b7f5..56aa6751b6 100644
Binary files a/res/mipmap-hdpi/ic_launcher_round.png and b/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/res/mipmap-mdpi/ic_launcher.png b/res/mipmap-mdpi/ic_launcher.png
index a0a89b4509..5074ce307a 100644
Binary files a/res/mipmap-mdpi/ic_launcher.png and b/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/res/mipmap-mdpi/ic_launcher_round.png b/res/mipmap-mdpi/ic_launcher_round.png
index 86d0e180d5..78a2aa5a5d 100644
Binary files a/res/mipmap-mdpi/ic_launcher_round.png and b/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/res/mipmap-xhdpi/ic_launcher.png b/res/mipmap-xhdpi/ic_launcher.png
index 7ac6dc5270..e460685434 100644
Binary files a/res/mipmap-xhdpi/ic_launcher.png and b/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/res/mipmap-xhdpi/ic_launcher_round.png b/res/mipmap-xhdpi/ic_launcher_round.png
index bd01db4adf..ac7fe59c88 100644
Binary files a/res/mipmap-xhdpi/ic_launcher_round.png and b/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/res/mipmap-xxhdpi/ic_launcher.png b/res/mipmap-xxhdpi/ic_launcher.png
index ea482d3efe..7a3b9ea8fa 100644
Binary files a/res/mipmap-xxhdpi/ic_launcher.png and b/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_round.png b/res/mipmap-xxhdpi/ic_launcher_round.png
index 88a3b0a832..02730bc43e 100644
Binary files a/res/mipmap-xxhdpi/ic_launcher_round.png and b/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher.png b/res/mipmap-xxxhdpi/ic_launcher.png
index 79397a94ed..532e748324 100644
Binary files a/res/mipmap-xxxhdpi/ic_launcher.png and b/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_round.png b/res/mipmap-xxxhdpi/ic_launcher_round.png
index 14dd8e03c8..050ab2d6ef 100644
Binary files a/res/mipmap-xxxhdpi/ic_launcher_round.png and b/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/res/values-v21/themes.xml b/res/values-v21/themes.xml
index 752864db10..c3189760de 100644
--- a/res/values-v21/themes.xml
+++ b/res/values-v21/themes.xml
@@ -2,11 +2,11 @@
 <resources>
 
     <style name="TextSecure.DarkTheme" parent="@style/TextSecure.BaseDarkTheme">
-        <item name="android:navigationBarColor">@color/core_grey_90</item>
+        <item name="android:navigationBarColor">@color/compose_view_background</item>
     </style>
 
     <style name="TextSecure.DarkNoActionBar" parent="@style/TextSecure.BaseDarkNoActionBar">
-        <item name="android:navigationBarColor">@color/core_grey_90</item>
+        <item name="android:navigationBarColor">@color/compose_view_background</item>
         <item name="android:colorControlActivated">@color/signal_primary_dark</item>
     </style>
 
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 593a27dbd2..ef0d67b98d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,14 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+
+    <!-- Session -->
+    <color name="accent">#00F782</color>
+    <color name="text">#FFFFFF</color>
+    <color name="destructive">#FF453A</color>
+    <color name="unimportant">#D8D8D8</color>
+    <color name="border">#979797</color>
+    <color name="cell_background">#1B1B1B</color>
+    <color name="cell_selected">#0C0C0C</color>
+    <color name="action_bar_background">#171717</color>
+    <color name="navigation_bar_background">#121212</color>
+    <color name="separator">#36383C</color>
+    <color name="unimportant_button_background">#323232</color>
+    <color name="dialog_background">#101011</color>
+    <color name="dialog_border">#212121</color>
+    <color name="unimportant_dialog_button_background">#1B1B1B</color>
+    <color name="fake_chat_bubble_background">#3F4146</color>
+    <color name="fake_chat_bubble_text">#000000</color>
+    <color name="app_icon_background">#333132</color>
+    <color name="progress_bar_background">#0AFFFFFF</color>
+    <color name="compose_view_background">#1B1B1B</color>
+    <color name="compose_text_view_background">#141414</color>
+    <color name="received_message_background">#222325</color>
+    <color name="sent_message_background">#3F4146</color>
+    <color name="quote_not_found_background">#99FFFFFF</color>
+    <!-- Session -->
+
     <!-- Loki -->
     <color name="loki_green">#78be20</color>
     <color name="loki_dark_green">#419B41</color>
     <color name="loki_darkest_gray">#0a0a0a</color>
     <!-- Loki -->
 
-    <color name="signal_primary">@color/loki_green</color>
-    <color name="signal_primary_dark">@color/loki_green</color>
-    <color name="signal_primary_alpha33">#5578be20</color>
+    <color name="signal_primary">@color/accent</color>
+    <color name="signal_primary_dark">@color/accent</color>
+    <color name="signal_primary_alpha33">#5500F782</color>
     <color name="signal_primary_alpha_focus">#882090ea</color>
 
     <color name="textsecure_primary">@color/signal_primary</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4c4c74c055..f8dd2e4723 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -1,5 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
+    <!-- Session -->
+
+    <!-- Font Sizes -->
+    <dimen name="very_small_font_size">10sp</dimen>
+    <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="massive_font_size">50sp</dimen>
+
+    <!-- Element Sizes -->
+    <dimen name="small_button_height">34dp</dimen>
+    <dimen name="medium_button_height">44dp</dimen>
+    <dimen name="accent_line_thickness">4dp</dimen>
+    <dimen name="very_small_profile_picture_size">26dp</dimen>
+    <dimen name="small_profile_picture_size">36dp</dimen>
+    <dimen name="medium_profile_picture_size">46dp</dimen>
+    <dimen name="large_profile_picture_size">76dp</dimen>
+    <dimen name="conversation_view_status_indicator_size">14dp</dimen>
+    <dimen name="border_thickness">1dp</dimen>
+    <dimen name="profile_picture_border_thickness">1dp</dimen>
+    <dimen name="new_conversation_button_size">56dp</dimen>
+    <dimen name="tab_bar_height">48dp</dimen>
+    <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="setting_button_height">72dp</dimen>
+    <dimen name="dialog_corner_radius">8dp</dimen>
+    <dimen name="dialog_button_corner_radius">4dp</dimen>
+
+    <!-- Distances -->
+    <dimen name="small_spacing">8dp</dimen>
+    <dimen name="medium_spacing">16dp</dimen>
+    <dimen name="large_spacing">24dp</dimen>
+    <dimen name="very_large_spacing">35dp</dimen>
+    <dimen name="massive_spacing">64dp</dimen>
+    <dimen name="new_conversation_button_bottom_offset">56dp</dimen>
+    <dimen name="onboarding_button_bottom_offset">40dp</dimen>
+
+    <!-- Session -->
+
     <dimen name="emoji_drawer_size">32sp</dimen>
     <dimen name="min_keyboard_size">50dp</dimen>
     <dimen name="default_custom_keyboard_size">220dp</dimen>
@@ -30,15 +73,15 @@
     <dimen name="album_5_cell_size_big">104dp</dimen>
     <dimen name="album_5_cell_size_small">69dp</dimen>
 
-    <dimen name="message_corner_radius">16dp</dimen>
+    <dimen name="message_corner_radius">10dp</dimen>
     <dimen name="message_corner_collapse_radius">4dp</dimen>
     <dimen name="message_bubble_corner_radius">2dp</dimen>
     <dimen name="message_bubble_shadow_distance">1.5dp</dimen>
-    <dimen name="message_bubble_horizontal_padding">12dp</dimen>
-    <dimen name="message_bubble_top_padding">6dp</dimen>
-    <dimen name="message_bubble_collapsed_footer_padding">6dp</dimen>
+    <dimen name="message_bubble_horizontal_padding">@dimen/medium_spacing</dimen>
+    <dimen name="message_bubble_top_padding">@dimen/medium_spacing</dimen>
+    <dimen name="message_bubble_collapsed_footer_padding">@dimen/small_spacing</dimen>
     <dimen name="message_bubble_edge_margin">32dp</dimen>
-    <dimen name="message_bubble_bottom_padding">8dp</dimen>
+    <dimen name="message_bubble_bottom_padding">@dimen/medium_spacing</dimen>
     <dimen name="media_bubble_remove_button_size">24dp</dimen>
     <dimen name="media_bubble_edit_button_size">24dp</dimen>
     <dimen name="media_bubble_default_dimens">210dp</dimen>
@@ -59,17 +102,17 @@
     <dimen name="thumbnail_default_radius">4dp</dimen>
 
     <dimen name="conversation_compose_height">40dp</dimen>
-    <dimen name="conversation_individual_right_gutter">16dp</dimen>
-    <dimen name="conversation_individual_left_gutter">16dp</dimen>
-    <dimen name="conversation_group_left_gutter">52dp</dimen>
+    <dimen name="conversation_individual_right_gutter">@dimen/large_spacing</dimen>
+    <dimen name="conversation_individual_left_gutter">@dimen/large_spacing</dimen>
+    <dimen name="conversation_group_left_gutter">60dp</dimen>
     <dimen name="conversation_vertical_message_spacing_default">8dp</dimen>
     <dimen name="conversation_vertical_message_spacing_collapse">1dp</dimen>
 
     <dimen name="conversation_item_avatar_size">36dp</dimen>
 
     <dimen name="quote_corner_radius_large">10dp</dimen>
-    <dimen name="quote_corner_radius_bottom">4dp</dimen>
-    <dimen name="quote_corner_radius_preview">18dp</dimen>
+    <dimen name="quote_corner_radius_bottom">2dp</dimen>
+    <dimen name="quote_corner_radius_preview">16dp</dimen>
 
     <integer name="media_overview_cols">3</integer>
     <dimen name="message_details_table_row_pad">10dp</dimen>
@@ -113,7 +156,7 @@
 
     <dimen name="alertview_small_icon_size">14dp</dimen>
 
-    <dimen name="recording_voice_lock_target">-150dp</dimen>
+    <dimen name="recording_voice_lock_target">-96dp</dimen>
 
     <dimen name="default_margin">16dp</dimen>
     <dimen name="drawable_padding">24dp</dimen>
diff --git a/res/values/ic_launcher_background.xml b/res/values/ic_launcher_background.xml
index 635da4bb7b..8e21cacbc4 100644
--- a/res/values/ic_launcher_background.xml
+++ b/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#0A0A0A</color>
+    <color name="ic_launcher_background">#333132</color>
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d850790d91..84ad12fff5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Loki Messenger</string>
+    <string name="app_name">Session</string>
     <string name="install_url" translatable="false">https://signal.org/install</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
@@ -172,13 +172,13 @@
     <string name="ConversationActivity_unable_to_record_audio">Unable to record audio!</string>
     <string name="ConversationActivity_there_is_no_app_available_to_handle_this_link_on_your_device">There is no app available to handle this link on your device.</string>
 
-    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">To send audio messages, allow Loki Messenger access to your microphone.</string>
-    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Loki Messenger requires the Microphone permission in order to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\".</string>
-    <string name="ConversationActivity_to_call_s_signal_needs_access_to_your_microphone_and_camera">To call %s, Loki Messenger needs access to your microphone and camera.</string>
-    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Loki Messenger needs the Microphone and Camera permissions in order to call %s, but they have been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\" and \"Camera\".</string>
-    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">To capture photos and video, allow Loki Messenger access to the camera.</string>
-    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Loki Messenger needs the Camera permission to take photos or video, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
-    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Loki Messenger needs Camera permissions to take photos or video</string>
+    <string name="ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone">Session needs microphone access to send audio messages.</string>
+    <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Session needs microphone access to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\".</string>
+    <string name="ConversationActivity_to_call_s_signal_needs_access_to_your_microphone_and_camera">Session needs microphone and camera access to make calls.</string>
+    <string name="ConversationActivity_signal_needs_the_microphone_and_camera_permissions_in_order_to_call_s">Session needs microphone and camera access to call %s, but they have been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\" and \"Camera\".</string>
+    <string name="ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera">Session needs camera access to take photos and videos.</string>
+    <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Session needs camera access to take photos and videos, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
+    <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Session needs camera access to take photos or videos.</string>
 
     <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
     <string name="ConversationActivity_signal_cannot_sent_sms_mms_messages_because_it_is_not_your_default_sms_app">Loki Messenger cannot send SMS/MMS messages because it is not your default SMS app. Would you like to change this in your Android settings?</string>
@@ -388,8 +388,8 @@
     <string name="GroupMembersDialog_me">Me</string>
 
     <!-- CropImageActivity -->
-    <string name="CropImageActivity_group_avatar">Group avatar</string>
-    <string name="CropImageActivity_profile_avatar">Avatar</string>
+    <string name="CropImageActivity_group_avatar">Group Photo</string>
+    <string name="CropImageActivity_profile_avatar">Photo</string>
 
     <!-- InputPanel -->
     <string name="InputPanel_tap_and_hold_to_record_a_voice_message_release_to_send">Tap and hold to record a voice message, release to send</string>
@@ -496,8 +496,8 @@
     <string name="MessageRecord_s_joined_signal">%s is on Loki Messenger!</string>
     <string name="MessageRecord_you_disabled_disappearing_messages">You disabled disappearing messages.</string>
     <string name="MessageRecord_s_disabled_disappearing_messages">%1$s disabled disappearing messages.</string>
-    <string name="MessageRecord_you_set_disappearing_message_time_to_s">You set the disappearing message timer to %1$s.</string>
-    <string name="MessageRecord_s_set_disappearing_message_time_to_s">%1$s set the disappearing message timer to %2$s.</string>
+    <string name="MessageRecord_you_set_disappearing_message_time_to_s">You set the disappearing message timer to %1$s</string>
+    <string name="MessageRecord_s_set_disappearing_message_time_to_s">%1$s set the disappearing message timer to %2$s</string>
     <string name="MessageRecord_your_safety_number_with_s_has_changed">Your safety number with %s has changed.</string>
     <string name="MessageRecord_you_marked_your_safety_number_with_s_verified">You marked your safety number with %s verified</string>
     <string name="MessageRecord_you_marked_your_safety_number_with_s_verified_from_another_device">You marked your safety number with %s verified from another device</string>
@@ -1611,14 +1611,14 @@
     <string name="fragment_add_public_chat_connection_failed_message">Couldn\'t Connect</string>
     <!-- Friend request view -->
     <string name="view_friend_request_accept_button_title">Accept</string>
-    <string name="view_friend_request_reject_button_title">Reject</string>
-    <string name="view_friend_request_incoming_pending_message">%1$s sent you a friend request</string>
-    <string name="view_friend_request_incoming_accepted_message">You\'ve accepted %1$s\'s friend request</string>
-    <string name="view_friend_request_incoming_declined_message">You\'ve declined %1$s\'s friend request</string>
-    <string name="view_friend_request_incoming_expired_message">%1$s\'s friend request has expired</string>
-    <string name="view_friend_request_outgoing_pending_message">You\'ve sent %1$s a friend request</string>
-    <string name="view_friend_request_outgoing_accepted_message">%1$s accepted your friend request</string>
-    <string name="view_friend_request_outgoing_expired_message">Your friend request to %1$s has expired</string>
+    <string name="view_friend_request_reject_button_title">Decline</string>
+    <string name="view_friend_request_incoming_pending_message">%1$s sent you a message request</string>
+    <string name="view_friend_request_incoming_accepted_message">You\'ve accepted %1$s\'s message request</string>
+    <string name="view_friend_request_incoming_declined_message">You\'ve declined %1$s\'s message request</string>
+    <string name="view_friend_request_incoming_expired_message">%1$s\'s message request has expired</string>
+    <string name="view_friend_request_outgoing_pending_message">You\'ve sent %1$s a message request</string>
+    <string name="view_friend_request_outgoing_accepted_message">%1$s accepted your message request</string>
+    <string name="view_friend_request_outgoing_expired_message">Your message request to %1$s has expired</string>
     <!-- Conversation activity -->
     <string name="activity_conversation_pending_friend_request_hint">Pending Friend Request…</string>
     <string name="activity_conversation_default_hint">New Message</string>
@@ -1652,4 +1652,10 @@
     <string name="dialog_device_unlink_title">Device unlinked</string>
     <string name="dialog_device_unlink_message">This device has been successfully unlinked</string>
 
+    <!-- Loki -->
+
+    <!-- Session -->
+    <string name="activity_register_public_key_copied_message">Copied to clipboard</string>
+    <!-- Session -->
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ecf5dc23a5..d490519ad8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,5 +1,193 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!-- Session -->
+    <style name="Session.DarkActionBar" parent="@style/Widget.AppCompat.ActionBar">
+        <item name="background">@color/action_bar_background</item>
+        <item name="android:background">@color/action_bar_background</item>
+        <item name="titleTextStyle">@style/Session.DarkActionBar.TitleTextStyle</item>
+        <item name="android:titleTextStyle">@style/Session.DarkActionBar.TitleTextStyle</item>
+        <item name="elevation">0dp</item>
+        <item name="android:elevation">0dp</item>
+    </style>
+
+    <style name="Session.DarkSubtitleActionBar" parent="@style/Widget.AppCompat.ActionBar">
+        <item name="background">@color/action_bar_background</item>
+        <item name="android:background">@color/action_bar_background</item>
+        <item name="titleTextStyle">@style/Session.DarkSubtitleActionBar.TitleTextStyle</item>
+        <item name="android:titleTextStyle">@style/Session.DarkSubtitleActionBar.TitleTextStyle</item>
+        <item name="subtitleTextStyle">@style/Session.DarkSubtitleActionBar.SubtitleTextStyle</item>
+        <item name="android:subtitleTextStyle">@style/Session.DarkSubtitleActionBar.SubtitleTextStyle</item>
+        <item name="elevation">0dp</item>
+        <item name="android:elevation">0dp</item>
+    </style>
+
+    <style name="Session.DarkActionBar.TitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
+        <item name="android:textColor">@color/text</item>
+        <item name="android:textSize">@dimen/very_large_font_size</item>
+    </style>
+
+    <style name="Session.DarkSubtitleActionBar.TitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
+        <item name="android:textColor">@color/text</item>
+        <item name="android:textSize">@dimen/large_font_size</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+    </style>
+
+    <style name="Session.DarkSubtitleActionBar.SubtitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
+        <item name="android:textColor">@color/text</item>
+        <item name="android:textSize">@dimen/small_font_size</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textStyle">normal</item>
+    </style>
+
+    <style name="TextSecure.BaseDarkTheme.SearchView" parent="@style/Widget.AppCompat.SearchView">
+        <item name="closeIcon">@drawable/ic_close_white_24dp</item>
+    </style>
+
+    <style name="Session.AlertDialog" parent="ThemeOverlay.AppCompat.Dialog.Alert">
+        <item name="buttonBarNegativeButtonStyle">@style/Session.AlertDialog.NegativeButtonStyle</item>
+        <item name="buttonBarPositiveButtonStyle">@style/Session.AlertDialog.PositiveButtonStyle</item>
+    </style>
+
+    <style name="Session.AlertDialog.NegativeButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
+        <item name="android:textColor">@color/accent</item>
+    </style>
+
+    <style name="Session.AlertDialog.PositiveButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
+        <item name="android:textColor">@color/accent</item>
+    </style>
+
+    <style name="Session.DarkTabLayout" parent="Widget.Design.TabLayout">
+        <item name="tabIndicatorColor">@color/accent</item>
+        <item name="tabIndicatorHeight">@dimen/accent_line_thickness</item>
+        <item name="tabBackground">@color/action_bar_background</item>
+        <item name="tabRippleColor">@color/cell_selected</item>
+        <item name="tabTextAppearance">@style/Session.DarkTabLayout.TextAppearance</item>
+        <item name="tabSelectedTextColor">@color/text</item>
+    </style>
+
+    <style name="Session.DarkTabLayout.TextAppearance" parent="TextAppearance.Design.Tab">
+        <item name="android:textSize">@dimen/medium_font_size</item>
+        <item name="android:textColor">@color/unimportant</item>"
+        <item name="textAllCaps">false</item>
+    </style>
+
+    <style name="MediumProminentFilledButton">
+        <item name="android:background">@drawable/prominent_filled_button_medium_background</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textSize">@dimen/medium_font_size</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textColor">@color/text</item>
+    </style>
+
+    <style name="MediumProminentOutlineButton">
+        <item name="android:background">@drawable/prominent_outline_button_medium_background</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textSize">@dimen/medium_font_size</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textColor">@color/accent</item>
+    </style>
+
+    <style name="MediumUnimportantFilledButton">
+        <item name="android:background">@drawable/unimportant_filled_button_medium_background</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textSize">@dimen/medium_font_size</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textColor">@color/text</item>
+    </style>
+
+    <style name="MediumUnimportantOutlineButton">
+        <item name="android:background">@drawable/unimportant_outline_button_medium_background</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textSize">@dimen/medium_font_size</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textColor">@color/text</item>
+    </style>
+
+    <style name="UnimportantDialogButton">
+        <item name="android:background">@drawable/unimportant_dialog_button_background</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textSize">@dimen/small_font_size</item>
+        <item name="android:textColor">@color/text</item>
+    </style>
+
+    <style name="ProminentDialogButton">
+        <item name="android:background">@drawable/prominent_dialog_button_background</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textSize">@dimen/small_font_size</item>
+        <item name="android:textColor">@color/text</item>
+    </style>
+
+    <style name="DestructiveDialogButton">
+        <item name="android:background">@drawable/destructive_dialog_button_background</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textSize">@dimen/small_font_size</item>
+        <item name="android:textColor">@color/text</item>
+    </style>
+
+    <style name="SessionIDTextView">
+        <item name="android:background">@drawable/session_id_text_view_background</item>
+        <item name="android:padding">@dimen/medium_spacing</item>
+        <item name="android:textSize">@dimen/large_font_size</item>
+        <item name="android:textColor">@color/text</item>
+        <item name="android:fontFamily">@font/space_mono_regular</item>
+    </style>
+
+    <style name="SessionEditText">
+        <item name="android:background">@drawable/session_id_text_view_background</item>
+        <item name="android:paddingLeft">@dimen/medium_spacing</item>
+        <item name="android:paddingTop">30dp</item>
+        <item name="android:paddingRight">@dimen/medium_spacing</item>
+        <item name="android:paddingBottom">30dp</item>
+        <item name="android:textSize">@dimen/small_font_size</item>
+        <item name="android:textColor">@color/text</item>
+        <item name="android:textCursorDrawable">@drawable/session_edit_text_cursor</item>
+        <item name="android:maxLines">1</item>
+    </style>
+
+    <style name="SmallSessionEditText">
+        <item name="android:background">@drawable/session_id_text_view_background</item>
+        <item name="android:paddingLeft">@dimen/medium_spacing</item>
+        <item name="android:paddingTop">@dimen/large_spacing</item>
+        <item name="android:paddingRight">@dimen/medium_spacing</item>
+        <item name="android:paddingBottom">@dimen/large_spacing</item>
+        <item name="android:textSize">@dimen/small_font_size</item>
+        <item name="android:textColor">@color/text</item>
+        <item name="android:textCursorDrawable">@drawable/session_edit_text_cursor</item>
+        <item name="android:maxLines">1</item>
+    </style>
+
+    <style name="FakeChatViewIncomingMessageBubble">
+        <item name="android:background">@drawable/fake_chat_view_incoming_message_background</item>
+        <item name="android:paddingLeft">@dimen/medium_spacing</item>
+        <item name="android:paddingTop">12dp</item>
+        <item name="android:paddingRight">@dimen/medium_spacing</item>
+        <item name="android:paddingBottom">12dp</item>
+        <item name="android:textSize">@dimen/medium_font_size</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textColor">@color/fake_chat_bubble_text</item>
+        <item name="android:elevation">20dp</item>
+    </style>
+
+    <style name="FakeChatViewOutgoingMessageBubble">
+        <item name="android:background">@drawable/fake_chat_view_outgoing_message_background</item>
+        <item name="android:paddingLeft">@dimen/medium_spacing</item>
+        <item name="android:paddingTop">12dp</item>
+        <item name="android:paddingRight">@dimen/medium_spacing</item>
+        <item name="android:paddingBottom">12dp</item>
+        <item name="android:textSize">@dimen/medium_font_size</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textColor">@color/text</item>
+        <item name="android:elevation">20dp</item>
+    </style>
+
+    <style name="Session.SettingsTheme" parent="PreferenceThemeOverlay.v14.Material" >
+        <item name="android:textColor">@color/text</item>
+        <item name="android:textColorSecondary">#99FFFFFF</item>
+        <item name="android:textSize">@dimen/medium_font_size</item>
+    </style>
+    <!-- Session -->
+
     <style name="NoAnimation.Theme.BlackScreen" parent="Theme.AppCompat.NoActionBar">
         <item name="android:windowAnimationStyle">@null</item>
         <item name="android:windowBackground">@android:color/black</item>
@@ -184,8 +372,8 @@
     </style>
 
     <style name="AttachmentTypeLabel">
-        <item name="android:textColor">#ff999999</item>
-        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">#99FFFFFF</item>
+        <item name="android:textSize">@dimen/small_font_size</item>
     </style>
 
     <style name="Button.Primary" parent="Base.Widget.AppCompat.Button.Colored">
@@ -234,7 +422,6 @@
         <item name="android:focusable">false</item>
     </style>
 
-
     <style name="PreferenceThemeOverlay.Fix" parent="PreferenceThemeOverlay.v14.Material">
     </style>
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index f285cde977..edd5adf795 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -2,15 +2,57 @@
 
 <resources>
 
+    <!-- Session -->
+    <style name="Session.DarkTheme" parent="@style/Theme.AppCompat">
+        <item name="actionBarStyle">@style/Session.DarkActionBar</item>
+        <item name="colorPrimary">@color/action_bar_background</item>
+        <item name="colorPrimaryDark">@color/action_bar_background</item>
+        <item name="android:navigationBarColor">@color/navigation_bar_background</item>
+        <item name="alertDialogTheme">@style/Session.AlertDialog</item>
+        <item name="android:windowBackground">@drawable/default_session_background</item>
+        <item name="preferenceTheme">@style/Session.SettingsTheme</item>
+        <item name="colorAccent">@color/accent</item>
+        <item name="actionModeBackground">@color/compose_view_background</item>
+        <item name="windowActionModeOverlay">true</item>
+    </style>
+
+    <style name="Session.DarkTheme.NoActionBar" parent="@style/Theme.AppCompat.NoActionBar">
+        <item name="actionBarStyle">@style/Session.DarkActionBar</item>
+        <item name="colorPrimary">@color/action_bar_background</item>
+        <item name="colorPrimaryDark">@color/action_bar_background</item>
+        <item name="android:navigationBarColor">@color/navigation_bar_background</item>
+        <item name="alertDialogTheme">@style/Session.AlertDialog</item>
+        <item name="android:windowBackground">@drawable/default_session_background</item>
+        <item name="preferenceTheme">@style/Session.SettingsTheme</item>
+        <item name="colorAccent">@color/accent</item>
+        <item name="actionModeBackground">@color/compose_view_background</item>
+        <item name="windowActionModeOverlay">true</item>
+    </style>
+
+    <style name="Session.DarkTheme.SubtitleActionBar" parent="@style/Theme.AppCompat">
+        <item name="actionBarStyle">@style/Session.DarkSubtitleActionBar</item>
+        <item name="colorPrimary">@color/action_bar_background</item>
+        <item name="colorPrimaryDark">@color/action_bar_background</item>
+        <item name="android:navigationBarColor">@color/navigation_bar_background</item>
+        <item name="alertDialogTheme">@style/Session.AlertDialog</item>
+        <item name="android:windowBackground">@drawable/default_session_background</item>
+        <item name="preferenceTheme">@style/Session.SettingsTheme</item>
+        <item name="colorAccent">@color/accent</item>
+        <item name="actionModeBackground">@color/compose_view_background</item>
+        <item name="windowActionModeOverlay">true</item>
+    </style>
+    <!-- Session -->
+
     <style name="TextSecure.LightNoActionBar" parent="@style/TextSecure.LightTheme">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="windowActionModeOverlay">true</item>
 
         <item name="theme_type">light</item>
-        <item name="colorPrimary">@color/textsecure_primary</item>
-        <item name="colorPrimaryDark">@color/textsecure_primary_dark</item>
+        <item name="colorPrimary">@color/action_bar_background</item>
+        <item name="colorPrimaryDark">@color/action_bar_background</item>
         <item name="colorAccent">@color/textsecure_primary_dark</item>
+        <item name="android:navigationBarColor">@color/compose_view_background</item>
 
         <item name="recipient_preference_blocked">#d00000</item>
         <item name="contact_selection_label_text">#66000000</item>
@@ -20,9 +62,9 @@
 
         <item name="media_overview_toolbar_background">@color/white</item>
         <item name="media_overview_toolbar_foreground">@color/gray70</item>
-        <item name="media_overview_header_foreground">@color/gray50</item>
+        <item name="media_overview_header_foreground">@color/text</item>
         <item name="media_overview_document_primary">@color/core_grey_90</item>
-        <item name="media_overview_document_secondary">@color/core_grey_60</item>
+        <item name="media_overview_document_secondary">#99FFFFFF</item>
     </style>
 
     <style name="TextSecure.DarkNoActionBar" parent="@style/TextSecure.BaseDarkNoActionBar">
@@ -36,8 +78,10 @@
 
         <item name="theme_type">dark</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
-        <item name="colorPrimary">@color/gray95</item>
+        <item name="colorPrimary">@color/action_bar_background</item>
+        <item name="colorPrimaryDark">@color/action_bar_background</item>
         <item name="colorAccent">@color/signal_primary_dark</item>
+        <item name="android:navigationBarColor">@color/compose_view_background</item>
 
         <item name="recipient_preference_blocked">#d00000</item>
         <item name="contact_selection_label_text">#66eeeeee</item>
@@ -45,11 +89,11 @@
         <item name="contact_selection_lay_user">#afeeeeee</item>
         <item name="contact_selection_header_text">#66eeeeee</item>
 
-        <item name="media_overview_toolbar_background">@color/black</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/gray10</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">@color/core_grey_25</item>
+        <item name="media_overview_document_secondary">#99FFFFFF</item>
     </style>
 
     <style name="TextSecure.HighlightTheme" parent="@style/TextSecure.LightTheme">
@@ -121,19 +165,22 @@
 
     <style name="TextSecure.LightTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
         <item name="theme_type">light</item>
-        <item name="actionBarStyle">@style/TextSecure.LightActionBar</item>
+        <item name="actionBarStyle">@style/Session.DarkActionBar</item>
+        <item name="searchViewStyle">@style/TextSecure.BaseDarkTheme.SearchView</item>
         <item name="actionBarTabBarStyle">@style/TextSecure.LightActionBar.TabBar</item>
-        <item name="actionModeBackground">@color/gray50</item>
+        <item name="actionModeBackground">@color/compose_view_background</item>
         <item name="actionModeCloseDrawable">@drawable/ic_close_white_24dp</item>
-        <item name="colorPrimary">@color/textsecure_primary</item>
-        <item name="colorPrimaryDark">@color/textsecure_primary_dark</item>
-        <item name="colorAccent">@color/textsecure_primary_dark</item>
-        <item name="colorControlActivated">@color/signal_primary</item>
-        <item name="colorControlHighlight">@color/signal_primary</item>
+        <item name="colorPrimary">@color/action_bar_background</item>
+        <item name="colorPrimaryDark">@color/action_bar_background</item>
+        <item name="colorAccent">@color/accent</item>
+        <item name="colorControlActivated">@color/accent</item>
+        <item name="colorControlNormal">@color/text</item>
+        <item name="colorControlHighlight">@color/accent</item>
         <item name="android:windowBackground">@color/loki_darkest_gray</item>
         <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleLight</item>
         <item name="android:alertDialogTheme">@style/AppCompatDialogStyleLight</item>
         <item name="bottomSheetDialogTheme">@style/Theme.MaterialComponents.Light.BottomSheetDialog</item>
+        <item name="android:navigationBarColor">@color/compose_view_background</item>
         <!--<item name="android:windowContentOverlay">@drawable/compat_actionbar_shadow_background</item>-->
 
         <item name="attachment_type_selector_background">@color/white</item>
@@ -163,8 +210,8 @@
         <item name="conversation_editor_text_color">#ff111111</item>
         <item name="conversation_input_background">@drawable/compose_background_light</item>
         <item name="conversation_input_inline_attach_icon_tint">@color/core_grey_60</item>
-        <item name="conversation_transport_sms_indicator">@drawable/ic_send_sms_insecure</item>
-        <item name="conversation_transport_push_indicator">@drawable/ic_send_push</item>
+        <item name="conversation_transport_sms_indicator">@drawable/ic_arrow_up</item>
+        <item name="conversation_transport_push_indicator">@drawable/ic_arrow_up</item>
         <item name="conversation_transport_popup_background">@color/white</item>
         <item name="conversation_emoji_toggle">@drawable/ic_emoji_filled_keyboard_light</item>
         <item name="conversation_sticker_toggle">@drawable/ic_sticker_filled_keyboard_light</item>
@@ -185,11 +232,11 @@
 
         <item name="verification_background">@color/core_grey_05</item>
 
-        <item name="emoji_tab_strip_background">@color/core_grey_05</item>
+        <item name="emoji_tab_strip_background">@color/cell_background</item>
         <item name="emoji_tab_indicator">#66555555</item>
         <item name="emoji_tab_underline">#44555555</item>
         <item name="emoji_tab_seperator">@color/gray20</item>
-        <item name="emoji_drawer_background">@color/core_grey_02</item>
+        <item name="emoji_drawer_background">@color/compose_view_background</item>
         <item name="emoji_text_color">@color/black</item>
 
         <item name="emoji_category_recent">@drawable/ic_recent_light_20</item>
@@ -204,14 +251,14 @@
         <item name="emoji_category_emoticons">@drawable/ic_emoji_emoticon_light_20</item>
         <item name="emoji_variation_selector_background">@drawable/emoji_variation_selector_background_light</item>
 
-        <item name="conversation_item_bubble_background">@color/core_grey_05</item>
+        <item name="conversation_item_bubble_background">@color/sent_message_background</item>
         <item name="conversation_item_sent_text_primary_color">@color/core_grey_90</item>
         <item name="conversation_item_sent_text_secondary_color">@color/core_grey_60</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/core_white</item>
-        <item name="conversation_item_received_text_secondary_color">@color/core_white</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>
@@ -296,7 +343,7 @@
         <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>
-        <item name="android:statusBarColor">@color/black</item>
+        <item name="android:statusBarColor">@color/action_bar_background</item>
     </style>
 
     <style name="TextSecure.DarkTheme" parent="@style/TextSecure.BaseDarkTheme">
@@ -305,20 +352,23 @@
 
     <style name="TextSecure.BaseDarkTheme" parent="@style/Theme.AppCompat">
         <item name="theme_type">dark</item>
-        <item name="actionBarStyle">@style/TextSecure.DarkActionBar</item>
+        <item name="actionBarStyle">@style/Session.DarkActionBar</item>
+        <item name="searchViewStyle">@style/TextSecure.BaseDarkTheme.SearchView</item>
         <item name="actionBarTabBarStyle">@style/TextSecure.DarkActionBar.TabBar</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
-        <item name="actionModeBackground">@color/gray50</item>
+        <item name="actionModeBackground">@color/compose_view_background</item>
         <item name="actionModeCloseDrawable">@drawable/ic_close_white_24dp</item>
         <item name="android:textColor">@color/text_color_dark_theme</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_dark_theme</item>
-        <item name="colorAccent">@color/textsecure_primary_dark</item>
-        <item name="colorControlActivated">@color/signal_primary_dark</item>
-        <item name="colorControlHighlight">@color/signal_primary_dark</item>
+        <item name="colorAccent">@color/accent</item>
+        <item name="colorControlActivated">@color/accent</item>
+        <item name="colorControlNormal">@color/text</item>
+        <item name="colorControlHighlight">@color/accent</item>
         <item name="android:windowBackground">@color/loki_darkest_gray</item>
         <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleDark</item>
         <item name="android:alertDialogTheme">@style/AppCompatDialogStyleDark</item>
         <item name="bottomSheetDialogTheme">@style/Theme.MaterialComponents.BottomSheetDialog</item>
+        <item name="android:navigationBarColor">@color/compose_view_background</item>
 
         <item name="attachment_type_selector_background">@color/gray95</item>
         <item name="attachment_document_icon_small">@drawable/ic_document_small_dark</item>
@@ -334,19 +384,19 @@
         <item name="conversation_list_item_unread_color">@color/core_white</item>
         <item name="conversation_list_item_unread_background">@drawable/unread_count_background_dark</item>
         <item name="conversation_list_item_divider">@drawable/conversation_list_divider_shape_dark</item>
-        <item name="conversation_list_toolbar_background">@color/core_grey_90</item>
+        <item name="conversation_list_toolbar_background">@color/action_bar_background</item>
         <item name="conversation_list_typing_tint">@color/core_white</item>
 
         <item name="conversation_group_member_name">#99ffffff</item>
 
-        <item name="conversation_item_bubble_background">@color/core_grey_75</item>
+        <item name="conversation_item_bubble_background">@color/sent_message_background</item>
         <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/core_grey_05</item>
-        <item name="conversation_item_received_text_secondary_color">@color/core_grey_25</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>
@@ -399,11 +449,11 @@
         <item name="conversation_sticker_footer_icon_color">@color/core_grey_25</item>
         <item name="conversation_sticker_author_color">@color/core_grey_05</item>
 
-        <item name="emoji_tab_strip_background">@color/core_grey_85</item>
-        <item name="emoji_tab_indicator">@color/gray65</item>
+        <item name="emoji_tab_strip_background">@color/compose_view_background</item>
+        <item name="emoji_tab_indicator">@color/accent</item>
         <item name="emoji_tab_underline">@color/gray78</item>
         <item name="emoji_tab_seperator">@color/gray70</item>
-        <item name="emoji_drawer_background">@color/core_grey_95</item>
+        <item name="emoji_drawer_background">@color/compose_text_view_background</item>
         <item name="emoji_text_color">@color/white</item>
 
         <item name="emoji_category_recent">@drawable/ic_recent_dark_20</item>
@@ -418,10 +468,10 @@
         <item name="emoji_category_emoticons">@drawable/ic_emoji_emoticon_dark_20</item>
         <item name="emoji_variation_selector_background">@drawable/emoji_variation_selector_background_dark</item>
 
-        <item name="linkpreview_background_color">@color/core_grey_95</item>
-        <item name="linkpreview_primary_text_color">@color/core_white</item>
-        <item name="linkpreview_secondary_text_color">@color/core_grey_25</item>
-        <item name="linkpreview_divider_color">@color/core_grey_60</item>
+        <item name="linkpreview_background_color">@color/black</item>
+        <item name="linkpreview_primary_text_color">@color/text</item>
+        <item name="linkpreview_secondary_text_color">@color/text</item>
+        <item name="linkpreview_divider_color">@color/transparent</item>
 
         <item name="quick_camera_icon">@drawable/quick_camera_dark</item>
         <item name="quick_mic_icon">@drawable/ic_mic_white_24dp</item>
@@ -488,7 +538,8 @@
     </style>
 
     <style name="TextSecure.MediaSendProgressDialog" parent="@android:style/Theme.Dialog">
-        <item name="android:background">@color/core_grey_95</item>
+        <item name="android:background">@color/dialog_background</item>
+        <item name="android:windowNoTitle">true</item>
     </style>
 
     <style name="TextSecure.LightRegistrationTheme" parent="TextSecure.LightNoActionBar">
diff --git a/res/xml/preferences_app_protection.xml b/res/xml/preferences_app_protection.xml
index 7f402e4638..488f1c3616 100644
--- a/res/xml/preferences_app_protection.xml
+++ b/res/xml/preferences_app_protection.xml
@@ -1,68 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
     <PreferenceCategory android:title="@string/preferences_app_protection__app_access">
 
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                android:key="pref_android_screen_lock"
-                android:defaultValue="false"
-                android:title="@string/preferences_app_protection__screen_lock"
-                android:summary="@string/preferences_app_protection__lock_signal_access_with_android_screen_lock_or_fingerprint"/>
+            android:key="pref_android_screen_lock"
+            android:defaultValue="false"
+            android:title="@string/preferences_app_protection__screen_lock"
+            android:summary="@string/preferences_app_protection__lock_signal_access_with_android_screen_lock_or_fingerprint" />
 
-        <Preference android:title="@string/preferences_app_protection__screen_lock_inactivity_timeout"
-                    android:key="pref_android_screen_lock_timeout"
-                    android:dependency="pref_android_screen_lock"/>
+        <Preference
+            android:title="@string/preferences_app_protection__screen_lock_inactivity_timeout"
+            android:key="pref_android_screen_lock_timeout"
+            android:dependency="pref_android_screen_lock" />
 
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                            android:key="pref_enable_passphrase_temporary"
-                            android:defaultValue="true"
-                            android:title="@string/preferences__enable_passphrase"
-                            android:summary="@string/preferences__lock_signal_and_message_notifications_with_a_passphrase"/>
+            android:key="pref_enable_passphrase_temporary"
+            android:defaultValue="true"
+            android:title="@string/preferences__enable_passphrase"
+            android:summary="@string/preferences__lock_signal_and_message_notifications_with_a_passphrase" />
 
-        <Preference android:key="pref_change_passphrase"
-                    android:title="@string/preferences__change_passphrase"
-                    android:summary="@string/preferences__change_your_passphrase"
-                    android:dependency="pref_enable_passphrase_temporary"/>
+        <Preference
+            android:key="pref_change_passphrase"
+            android:title="@string/preferences__change_passphrase"
+            android:summary="@string/preferences__change_your_passphrase"
+            android:dependency="pref_enable_passphrase_temporary" />
 
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                android:defaultValue="false"
-                android:key="pref_timeout_passphrase"
-                android:title="@string/preferences__inactivity_timeout_passphrase"
-                android:summary="@string/preferences__auto_lock_signal_after_a_specified_time_interval_of_inactivity"
-                android:dependency="pref_enable_passphrase_temporary"/>
+            android:defaultValue="false"
+            android:key="pref_timeout_passphrase"
+            android:title="@string/preferences__inactivity_timeout_passphrase"
+            android:summary="@string/preferences__auto_lock_signal_after_a_specified_time_interval_of_inactivity"
+            android:dependency="pref_enable_passphrase_temporary" />
 
-        <Preference android:title="@string/preferences__inactivity_timeout_interval"
-                    android:key="pref_timeout_interval"
-                    android:dependency="pref_timeout_passphrase"/>
+        <Preference
+            android:title="@string/preferences__inactivity_timeout_interval"
+            android:key="pref_timeout_interval"
+            android:dependency="pref_timeout_passphrase" />
 
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                            android:defaultValue="false"
-                            android:key="pref_screen_security"
-                            android:title="@string/preferences__screen_security"
-                            android:summary="@string/preferences__disable_screen_security_to_allow_screen_shots" />
+            android:defaultValue="false"
+            android:key="pref_screen_security"
+            android:title="@string/preferences__screen_security"
+            android:summary="@string/preferences__disable_screen_security_to_allow_screen_shots" />
 
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="pref_incognito_keyboard"
             android:title="@string/preferences__incognito_keyboard"
             android:summary="@string/preferences__request_keyboard_to_disable_personalized_learning"/>
+
     </PreferenceCategory>
 
-    <PreferenceCategory android:layout="@layout/preference_divider"/>
+    <PreferenceCategory android:layout="@layout/preference_divider" />
 
     <PreferenceCategory android:title="@string/preferences_app_protection__communication">
 
         <!-- <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                android:defaultValue="false"
-                android:key="pref_turn_only"
-                android:title="@string/preferences_advanced__always_relay_calls"
-                android:summary="@string/preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address"/> -->
+            android:defaultValue="false"
+            android:key="pref_turn_only"
+            android:title="@string/preferences_advanced__always_relay_calls"
+            android:summary="@string/preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address"/> -->
 
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                android:defaultValue="false"
-                android:key="pref_read_receipts"
-                android:title="@string/preferences__read_receipts"
-                android:summary="@string/preferences__if_read_receipts_are_disabled_you_wont_be_able_to_see_read_receipts"/>
+            android:defaultValue="false"
+            android:key="pref_read_receipts"
+            android:title="@string/preferences__read_receipts"
+            android:summary="@string/preferences__if_read_receipts_are_disabled_you_wont_be_able_to_see_read_receipts"/>
 
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
             android:defaultValue="true"
@@ -108,10 +113,10 @@
     <PreferenceCategory android:title="@string/preferences_app_protection__registration_lock">
 
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                android:defaultValue="false"
-                android:key="pref_registration_lock"
-                android:title="@string/preferences_app_protection__registration_lock_pin"
-                android:summary="@string/preferences_app_protection__enable_a_registration_lock_pin_that_will_be_required"/>
+            android:defaultValue="false"
+            android:key="pref_registration_lock"
+            android:title="@string/preferences_app_protection__registration_lock_pin"
+            android:summary="@string/preferences_app_protection__enable_a_registration_lock_pin_that_will_be_required"/>
 
     </PreferenceCategory> -->
 
diff --git a/res/xml/preferences_chats.xml b/res/xml/preferences_chats.xml
index 623b16a03d..9d0cac23f9 100644
--- a/res/xml/preferences_chats.xml
+++ b/res/xml/preferences_chats.xml
@@ -1,100 +1,109 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:tools="http://schemas.android.com/tools">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
     <!-- <PreferenceCategory android:key="media_download" android:title="@string/preferences_chats__media_auto_download">
-        <MultiSelectListPreference
-                android:title="@string/preferences_chats__when_using_mobile_data"
-                android:key="pref_media_download_mobile"
-                android:defaultValue="@array/pref_media_download_mobile_data_default"
-                android:persistent="true"
-                android:entries="@array/pref_media_download_values"
-                android:entryValues="@array/pref_media_download_entries" />
 
         <MultiSelectListPreference
-                android:title="@string/preferences_chats__when_using_wifi"
-                android:key="pref_media_download_wifi"
-                android:defaultValue="@array/pref_media_download_wifi_default"
-                android:persistent="true"
-                android:entries="@array/pref_media_download_values"
-                android:entryValues="@array/pref_media_download_entries" />
+            android:title="@string/preferences_chats__when_using_mobile_data"
+            android:key="pref_media_download_mobile"
+            android:defaultValue="@array/pref_media_download_mobile_data_default"
+            android:persistent="true"
+            android:entries="@array/pref_media_download_values"
+            android:entryValues="@array/pref_media_download_entries" />
 
         <MultiSelectListPreference
-                android:title="@string/preferences_chats__when_roaming"
-                android:key="pref_media_download_roaming"
-                android:defaultValue="@array/pref_media_download_roaming_default"
-                android:persistent="true"
-                android:entries="@array/pref_media_download_values"
-                android:entryValues="@array/pref_media_download_entries" />
+            android:title="@string/preferences_chats__when_using_wifi"
+            android:key="pref_media_download_wifi"
+            android:defaultValue="@array/pref_media_download_wifi_default"
+            android:persistent="true"
+            android:entries="@array/pref_media_download_values"
+            android:entryValues="@array/pref_media_download_entries" />
+
+        <MultiSelectListPreference
+            android:title="@string/preferences_chats__when_roaming"
+            android:key="pref_media_download_roaming"
+            android:defaultValue="@array/pref_media_download_roaming_default"
+            android:persistent="true"
+            android:entries="@array/pref_media_download_values"
+            android:entryValues="@array/pref_media_download_entries" />
+
     </PreferenceCategory>
 
     <PreferenceCategory android:layout="@layout/preference_divider"/> -->
 
     <PreferenceCategory android:title="@string/preferences_chats__chats">
-        <org.thoughtcrime.securesms.preferences.widgets.SignalListPreference
-                android:key="pref_message_body_text_size"
-                android:title="@string/preferences_chats__message_text_size"
-                android:entries="@array/pref_message_font_size_entries"
-                android:entryValues="@array/pref_message_font_size_values"
-                android:defaultValue="16">
-        </org.thoughtcrime.securesms.preferences.widgets.SignalListPreference>
+
+        <!-- <org.thoughtcrime.securesms.preferences.widgets.SignalListPreference
+            android:key="pref_message_body_text_size"
+            android:title="@string/preferences_chats__message_text_size"
+            android:entries="@array/pref_message_font_size_entries"
+            android:entryValues="@array/pref_message_font_size_values"
+            android:defaultValue="16" /> -->
 
         <!-- <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                android:defaultValue="true"
-                android:key="pref_show_invite_reminder"
-                android:title="@string/preferences_chats__show_invitation_prompts"
-                android:summary="@string/preferences_chats__display_invitation_prompts_for_contacts_without_signal" /> -->
+            android:defaultValue="true"
+            android:key="pref_show_invite_reminder"
+            android:title="@string/preferences_chats__show_invitation_prompts"
+            android:summary="@string/preferences_chats__display_invitation_prompts_for_contacts_without_signal" /> -->
 
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                android:defaultValue="false"
-                android:key="pref_system_emoji"
-                android:title="@string/preferences_advanced__use_system_emoji"
-                android:summary="@string/preferences_advanced__disable_signal_built_in_emoji_support" />
+            android:defaultValue="false"
+            android:key="pref_system_emoji"
+            android:title="@string/preferences_advanced__use_system_emoji"
+            android:summary="@string/preferences_advanced__disable_signal_built_in_emoji_support" />
 
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                android:defaultValue="false"
-                android:key="pref_enter_sends"
-                android:summary="@string/preferences__pressing_the_enter_key_will_send_text_messages"
-                android:title="@string/preferences__pref_enter_sends_title"/>
+            android:defaultValue="false"
+            android:key="pref_enter_sends"
+            android:summary="@string/preferences__pressing_the_enter_key_will_send_text_messages"
+            android:title="@string/preferences__pref_enter_sends_title" />
 
     </PreferenceCategory>
 
     <PreferenceCategory android:layout="@layout/preference_divider"/>
 
     <PreferenceCategory android:key="message_trimming" android:title="@string/preferences_chats__message_trimming">
+
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="pref_trim_threads"
             android:summary="@string/preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length"
             android:title="@string/preferences__delete_old_messages" />
 
-        <EditTextPreference android:defaultValue="500"
-                            android:key="pref_trim_length"
-                            android:title="@string/preferences__conversation_length_limit"
-                            android:inputType="number"
-                            android:dependency="pref_trim_threads" />
+        <EditTextPreference
+            android:defaultValue="500"
+            android:key="pref_trim_length"
+            android:title="@string/preferences__conversation_length_limit"
+            android:inputType="number"
+            android:dependency="pref_trim_threads" />
+
+        <Preference
+            android:key="pref_trim_now"
+            android:title="@string/preferences__trim_all_conversations_now"
+            android:summary="@string/preferences__scan_through_all_conversations_and_enforce_conversation_length_limits"
+            android:dependency="pref_trim_threads" />
 
-        <Preference android:key="pref_trim_now"
-                    android:title="@string/preferences__trim_all_conversations_now"
-                    android:summary="@string/preferences__scan_through_all_conversations_and_enforce_conversation_length_limits"
-                    android:dependency="pref_trim_threads" />
     </PreferenceCategory>
 
-    <PreferenceCategory android:layout="@layout/preference_divider"/>
+    <PreferenceCategory android:layout="@layout/preference_divider" />
 
     <PreferenceCategory android:key="backup_category" android:title="@string/preferences_chats__backups">
+
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                android:defaultValue="false"
-                android:key="pref_backup_enabled"
-                android:title="@string/preferences_chats__chat_backups"
-                android:summary="@string/preferences_chats__backup_chats_to_external_storage" />
+            android:defaultValue="false"
+            android:key="pref_backup_enabled"
+            android:title="@string/preferences_chats__chat_backups"
+            android:summary="@string/preferences_chats__backup_chats_to_external_storage" />
 
         <org.thoughtcrime.securesms.preferences.widgets.ProgressPreference
-                android:key="pref_backup_create"
-                android:title="@string/preferences_chats__create_backup"
-                android:persistent="false"
-                android:dependency="pref_backup_enabled"
-                tools:summary="Last backup: 3 days ago"/>
+            android:key="pref_backup_create"
+            android:title="@string/preferences_chats__create_backup"
+            android:persistent="false"
+            android:dependency="pref_backup_enabled"
+            tools:summary="Last backup: 3 days ago" />
 
     </PreferenceCategory>
 
diff --git a/res/xml/preferences_notifications.xml b/res/xml/preferences_notifications.xml
index f337d4fcb2..12dafb675a 100644
--- a/res/xml/preferences_notifications.xml
+++ b/res/xml/preferences_notifications.xml
@@ -2,37 +2,39 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!-- <PreferenceCategory android:title="@string/preferences_notifications__messages"> -->
+    <PreferenceCategory android:title="@string/preferences_notifications__messages">
 
-    <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-        android:key="pref_key_enable_notifications"
-        android:title="@string/preferences__notifications"
-        android:defaultValue="true" />
+        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
+            android:key="pref_key_enable_notifications"
+            android:title="@string/preferences__notifications"
+            android:defaultValue="true" />
 
-    <org.thoughtcrime.securesms.preferences.widgets.SignalListPreference
-        android:key="pref_notification_priority"
-        android:title="@string/preferences_notifications__priority"
-        android:dependency="pref_key_enable_notifications"
-        android:defaultValue="1"
-        android:entries="@array/pref_notification_priority_entries"
-        android:entryValues="@array/pref_notification_priority_values"/>
+        <org.thoughtcrime.securesms.preferences.widgets.SignalListPreference
+            android:key="pref_notification_priority"
+            android:title="@string/preferences_notifications__priority"
+            android:dependency="pref_key_enable_notifications"
+            android:defaultValue="1"
+            android:entries="@array/pref_notification_priority_entries"
+            android:entryValues="@array/pref_notification_priority_values" />
 
-    <PreferenceCategory android:layout="@layout/preference_divider"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory android:layout="@layout/preference_divider" />
 
     <PreferenceCategory android:title="@string/activity_notification_settings_style_section_title">
 
         <org.thoughtcrime.securesms.preferences.widgets.SignalPreference
-                android:dependency="pref_key_enable_notifications"
-                android:key="pref_key_ringtone"
-                android:title="@string/preferences__sound"
-                android:persistent="false"
-                android:defaultValue="content://settings/system/notification_sound" />
+            android:dependency="pref_key_enable_notifications"
+            android:key="pref_key_ringtone"
+            android:title="@string/preferences__sound"
+            android:persistent="false"
+            android:defaultValue="content://settings/system/notification_sound" />
 
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                            android:dependency="pref_key_enable_notifications"
-                            android:key="pref_key_vibrate"
-                            android:defaultValue="true"
-                            android:title="@string/preferences__vibrate"/>
+            android:dependency="pref_key_enable_notifications"
+            android:key="pref_key_vibrate"
+            android:defaultValue="true"
+            android:title="@string/preferences__vibrate" />
 
         <org.thoughtcrime.securesms.preferences.widgets.LEDColorListPreference
             android:key="pref_led_color"
@@ -51,32 +53,32 @@
             android:entryValues="@array/pref_led_blink_pattern_values" />
 
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                            android:key="pref_key_inthread_notifications"
-                            android:title="@string/preferences_notifications__in_chat_sounds"
-                            android:dependency="pref_key_enable_notifications"
-                            android:defaultValue="true" />
+            android:key="pref_key_inthread_notifications"
+            android:title="@string/preferences_notifications__in_chat_sounds"
+            android:dependency="pref_key_enable_notifications"
+            android:defaultValue="true" />
 
         <org.thoughtcrime.securesms.preferences.widgets.SignalListPreference
-                android:key="pref_repeat_alerts"
-                android:defaultValue="0"
-                android:title="@string/preferences__repeat_alerts"
-                android:dependency="pref_key_enable_notifications"
-                android:entries="@array/pref_repeat_alerts_entries"
-                android:entryValues="@array/pref_repeat_alerts_values" />
+            android:key="pref_repeat_alerts"
+            android:defaultValue="0"
+            android:title="@string/preferences__repeat_alerts"
+            android:dependency="pref_key_enable_notifications"
+            android:entries="@array/pref_repeat_alerts_entries"
+            android:entryValues="@array/pref_repeat_alerts_values" />
 
     </PreferenceCategory>
 
-    <PreferenceCategory android:layout="@layout/preference_divider"/>
+    <PreferenceCategory android:layout="@layout/preference_divider" />
 
     <PreferenceCategory android:title="@string/activity_notification_settings_content_section_title">
 
         <org.thoughtcrime.securesms.preferences.widgets.SignalListPreference
-                android:key="pref_notification_privacy"
-                android:title="@string/preferences_notifications__show"
-                android:dependency="pref_key_enable_notifications"
-                android:defaultValue="all"
-                android:entries="@array/pref_notification_privacy_entries"
-                android:entryValues="@array/pref_notification_privacy_values"/>
+            android:key="pref_notification_privacy"
+            android:title="@string/preferences_notifications__show"
+            android:dependency="pref_key_enable_notifications"
+            android:defaultValue="all"
+            android:entries="@array/pref_notification_privacy_entries"
+            android:entryValues="@array/pref_notification_privacy_values" />
 
     </PreferenceCategory>
 
diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java
index 066ea4b519..04289d899f 100644
--- a/src/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/src/org/thoughtcrime/securesms/ApplicationContext.java
@@ -72,6 +72,8 @@ import org.thoughtcrime.securesms.loki.LokiPublicChatManager;
 import org.thoughtcrime.securesms.loki.LokiRSSFeedPoller;
 import org.thoughtcrime.securesms.loki.LokiUserDatabase;
 import org.thoughtcrime.securesms.loki.MultiDeviceUtilities;
+import org.thoughtcrime.securesms.loki.redesign.activities.HomeActivity;
+import org.thoughtcrime.securesms.loki.redesign.utilities.Broadcaster;
 import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.providers.BlobProvider;
@@ -150,6 +152,7 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
   private LokiRSSFeedPoller lokiMessengerUpdatesFeedPoller = null;
   private LokiPublicChatManager lokiPublicChatManager = null;
   private LokiPublicChatAPI lokiPublicChatAPI = null;
+  public Broadcaster broadcaster = null;
   public SignalCommunicationModule communicationModule;
   public MixpanelAPI mixpanel;
 
@@ -163,6 +166,7 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
   public void onCreate() {
     super.onCreate();
     Log.i(TAG, "onCreate()");
+    broadcaster = new Broadcaster(this);
     checkNeedsDatabaseReset();
     startKovenant();
     initializeSecurityProvider();
@@ -503,7 +507,7 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
     if (userHexEncodedPublicKey == null) return;
     LokiAPIDatabase lokiAPIDatabase = DatabaseFactory.getLokiAPIDatabase(this);
     Context context = this;
-    lokiLongPoller = new LokiLongPoller(userHexEncodedPublicKey, lokiAPIDatabase, protos -> {
+    lokiLongPoller = new LokiLongPoller(userHexEncodedPublicKey, lokiAPIDatabase, broadcaster, protos -> {
       for (SignalServiceProtos.Envelope proto : protos) {
         new PushContentReceiveJob(context).processEnvelope(new SignalServiceEnvelope(proto));
       }
@@ -603,7 +607,12 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
 
   public void updatePublicChatProfileAvatarIfNeeded() {
     AsyncTask.execute(() -> {
-      LokiPublicChatAPI publicChatAPI = getLokiPublicChatAPI();
+      LokiPublicChatAPI publicChatAPI = null;
+      try {
+        publicChatAPI = getLokiPublicChatAPI();
+      } catch (Exception e) {
+        // Do nothing
+      }
       if (publicChatAPI != null) {
         byte[] profileKey = ProfileKeyUtil.getProfileKey(this);
         String url = TextSecurePreferences.getProfileAvatarUrl(this);
@@ -646,7 +655,7 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
   }
 
   public void restartApplication() {
-    Intent intent = new Intent(this, ConversationListActivity.class);
+    Intent intent = new Intent(this, HomeActivity.class);
     ComponentName componentName = intent.getComponent();
     Intent mainIntent = Intent.makeRestartActivityTask(componentName);
     this.startActivity(mainIntent);
diff --git a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
index 0bed4c6adb..b15d58ec1f 100644
--- a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
+++ b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
@@ -37,6 +37,7 @@ import android.support.v4.content.ContextCompat;
 import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.preference.Preference;
+import android.util.Log;
 import android.widget.Toast;
 
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
@@ -365,7 +366,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
                     .setNeutralButton(R.string.activity_settings_seed_dialog_ok_button_title, null)
                     .show();
           } catch (Exception e) {
-            // Do nothing
+            Log.d("Loki", e.getMessage());
           }
           break;
         default:
diff --git a/src/org/thoughtcrime/securesms/BaseActionBarActivity.java b/src/org/thoughtcrime/securesms/BaseActionBarActivity.java
index 9c741c33cb..86b0840d3f 100644
--- a/src/org/thoughtcrime/securesms/BaseActionBarActivity.java
+++ b/src/org/thoughtcrime/securesms/BaseActionBarActivity.java
@@ -46,7 +46,7 @@ public abstract class BaseActionBarActivity extends AppCompatActivity {
     DynamicLanguageActivityHelper.recreateIfNotInCorrectLanguage(this, TextSecurePreferences.getLanguage(this));
     String name = getResources().getString(R.string.app_name);
     Bitmap icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_launcher_foreground);
-    int color = getResources().getColor(R.color.loki_darkest_gray);
+    int color = getResources().getColor(R.color.app_icon_background);
     setTaskDescription(new ActivityManager.TaskDescription(name, icon, color));
   }
 
diff --git a/src/org/thoughtcrime/securesms/BaseActivity.java b/src/org/thoughtcrime/securesms/BaseActivity.java
index f1999681bd..56d7547ff2 100644
--- a/src/org/thoughtcrime/securesms/BaseActivity.java
+++ b/src/org/thoughtcrime/securesms/BaseActivity.java
@@ -44,7 +44,7 @@ public abstract class BaseActivity extends FragmentActivity {
     DynamicLanguageActivityHelper.recreateIfNotInCorrectLanguage(this, TextSecurePreferences.getLanguage(this));
     String name = getResources().getString(R.string.app_name);
     Bitmap icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_launcher_foreground);
-    int color = getResources().getColor(R.color.loki_darkest_gray);
+    int color = getResources().getColor(R.color.app_icon_background);
     setTaskDescription(new ActivityManager.TaskDescription(name, icon, color));
   }
 
diff --git a/src/org/thoughtcrime/securesms/ConversationListItem.java b/src/org/thoughtcrime/securesms/ConversationListItem.java
index d2ca8aaa4c..2c5bba6f1b 100644
--- a/src/org/thoughtcrime/securesms/ConversationListItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationListItem.java
@@ -38,7 +38,7 @@ import org.thoughtcrime.securesms.components.ThumbnailView;
 import org.thoughtcrime.securesms.components.TypingIndicatorView;
 import org.thoughtcrime.securesms.database.model.ThreadRecord;
 import org.thoughtcrime.securesms.loki.LokiAPIUtilities;
-import org.thoughtcrime.securesms.loki.MentionUtilities;
+import org.thoughtcrime.securesms.loki.redesign.utilities.MentionUtilities;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientModifiedListener;
diff --git a/src/org/thoughtcrime/securesms/MediaOverviewActivity.java b/src/org/thoughtcrime/securesms/MediaOverviewActivity.java
index 199b52f61e..5c54fd58cf 100644
--- a/src/org/thoughtcrime/securesms/MediaOverviewActivity.java
+++ b/src/org/thoughtcrime/securesms/MediaOverviewActivity.java
@@ -104,6 +104,7 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity {
   @Override
   protected void onCreate(Bundle bundle, boolean ready) {
     setContentView(R.layout.media_overview_activity);
+    getWindow().setNavigationBarColor(getResources().getColor(R.color.navigation_bar_background));
 
     initializeResources();
     initializeToolbar();
@@ -142,7 +143,6 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity {
   private void initializeToolbar() {
     setSupportActionBar(this.toolbar);
     getSupportActionBar().setTitle(recipient.toShortString());
-    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
     this.recipient.addListener(recipient -> {
       Util.runOnMain(() -> getSupportActionBar().setTitle(recipient.toShortString()));
     });
diff --git a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java b/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
index 3a9958ff13..79f697d26f 100644
--- a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
+++ b/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
@@ -47,7 +47,6 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
-import android.view.WindowManager;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -120,16 +119,10 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im
   @SuppressWarnings("ConstantConditions")
   @Override
   protected void onCreate(Bundle bundle, boolean ready) {
-    this.setTheme(R.style.TextSecure_DarkTheme);
     dynamicLanguage.onCreate(this);
 
     viewModel = ViewModelProviders.of(this).get(MediaPreviewViewModel.class);
 
-    setFullscreenIfPossible();
-    getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                         WindowManager.LayoutParams.FLAG_FULLSCREEN);
-
-    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
     setContentView(R.layout.media_preview_activity);
 
     initializeViews();
diff --git a/src/org/thoughtcrime/securesms/MessageDetailsActivity.java b/src/org/thoughtcrime/securesms/MessageDetailsActivity.java
index d7270f20dc..c187af3566 100644
--- a/src/org/thoughtcrime/securesms/MessageDetailsActivity.java
+++ b/src/org/thoughtcrime/securesms/MessageDetailsActivity.java
@@ -114,11 +114,13 @@ public class MessageDetailsActivity extends PassphraseRequiredActionBarActivity
 
   @Override
   public void onCreate(Bundle bundle, boolean ready) {
+    super.onCreate(bundle, ready);
     setContentView(R.layout.message_details_activity);
     running = true;
 
     initializeResources();
     initializeActionBar();
+    getWindow().setNavigationBarColor(getResources().getColor(R.color.navigation_bar_background));
     getSupportLoaderManager().initLoader(0, null, this);
   }
 
@@ -129,7 +131,7 @@ public class MessageDetailsActivity extends PassphraseRequiredActionBarActivity
     dynamicLanguage.onResume(this);
 
     assert getSupportActionBar() != null;
-    getSupportActionBar().setTitle(R.string.AndroidManifest__message_details);
+    getSupportActionBar().setTitle("Message Details");
 
     MessageNotifier.setVisibleThread(threadId);
   }
@@ -148,12 +150,9 @@ public class MessageDetailsActivity extends PassphraseRequiredActionBarActivity
 
   private void initializeActionBar() {
     assert getSupportActionBar() != null;
-    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
     Recipient recipient = Recipient.from(this, getIntent().getParcelableExtra(ADDRESS_EXTRA), true);
     recipient.addListener(this);
-
-    setActionBarColor(recipient.getColor());
   }
 
   private void setActionBarColor(MaterialColor color) {
@@ -161,7 +160,7 @@ public class MessageDetailsActivity extends PassphraseRequiredActionBarActivity
     getSupportActionBar().setBackgroundDrawable(new ColorDrawable(color.toActionBarColor(this)));
 
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      getWindow().setStatusBarColor(color.toStatusBarColor(this));
+      // getWindow().setStatusBarColor(color.toStatusBarColor(this));
     }
   }
 
diff --git a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
index dd9bbb246a..16046287d9 100644
--- a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
+++ b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
@@ -43,13 +43,12 @@ import android.view.animation.Animation;
 import android.view.animation.BounceInterpolator;
 import android.view.animation.TranslateAnimation;
 import android.view.inputmethod.EditorInfo;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.dd.CircularProgressButton;
-
 import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
 import org.thoughtcrime.securesms.components.AnimatingToggle;
 import org.thoughtcrime.securesms.crypto.InvalidPassphraseException;
@@ -76,7 +75,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
 
   private View                   passphraseAuthContainer;
   private ImageView              fingerprintPrompt;
-  private CircularProgressButton lockScreenButton;
+  private Button                 lockScreenButton;
 
   private EditText        passphraseText;
   private ImageButton     showButton;
@@ -278,7 +277,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
       fingerprintManager.authenticate(null, 0, fingerprintCancellationSignal, fingerprintListener, null);
     } else if (Build.VERSION.SDK_INT >= 21){
       Log.i(TAG, "firing intent...");
-      Intent intent = keyguardManager.createConfirmDeviceCredentialIntent("Unlock Loki Messenger", "");
+      Intent intent = keyguardManager.createConfirmDeviceCredentialIntent("Unlock Session", "");
       startActivityForResult(intent, 1);
     } else {
       Log.w(TAG, "Not compatible...");
diff --git a/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java b/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
index 5f24485fac..51653f85a7 100644
--- a/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
+++ b/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
@@ -5,7 +5,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.support.annotation.IdRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -14,9 +13,10 @@ import android.support.v4.app.Fragment;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
 import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
 import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.loki.redesign.activities.HomeActivity;
+import org.thoughtcrime.securesms.loki.redesign.activities.LandingActivity;
 import org.thoughtcrime.securesms.loki.SeedActivity;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
-import org.thoughtcrime.securesms.registration.WelcomeActivity;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
@@ -182,7 +182,7 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
   }
 
   private Intent getWelcomeIntent() {
-    return getRoutedIntent(WelcomeActivity.class, getPushRegistrationIntent());
+    return getRoutedIntent(LandingActivity.class, getPushRegistrationIntent());
   }
 
   private Intent getPushRegistrationIntent() {
@@ -200,7 +200,7 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
   }
 
   private Intent getConversationListIntent() {
-    return new Intent(this, ConversationListActivity.class);
+    return new Intent(this, HomeActivity.class);
   }
 
   private void initializeClearKeyReceiver() {
diff --git a/src/org/thoughtcrime/securesms/ShareActivity.java b/src/org/thoughtcrime/securesms/ShareActivity.java
index a1727f98f3..6138c373fc 100644
--- a/src/org/thoughtcrime/securesms/ShareActivity.java
+++ b/src/org/thoughtcrime/securesms/ShareActivity.java
@@ -30,7 +30,6 @@ import android.provider.OpenableColumns;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.ActionBar;
 import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
@@ -112,6 +111,8 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
     initializeResources();
     initializeSearch();
     initializeMedia();
+
+    getWindow().setNavigationBarColor(getResources().getColor(R.color.navigation_bar_background));
   }
 
   @Override
@@ -161,12 +162,6 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
   private void initializeToolbar() {
     Toolbar toolbar = findViewById(R.id.toolbar);
     setSupportActionBar(toolbar);
-
-    ActionBar actionBar = getSupportActionBar();
-
-    if (actionBar != null) {
-      actionBar.setDisplayHomeAsUpEnabled(true);
-    }
   }
 
   private void initializeResources() {
diff --git a/src/org/thoughtcrime/securesms/TransportOption.java b/src/org/thoughtcrime/securesms/TransportOption.java
index 999808becb..8edd4af97c 100644
--- a/src/org/thoughtcrime/securesms/TransportOption.java
+++ b/src/org/thoughtcrime/securesms/TransportOption.java
@@ -10,6 +10,8 @@ import org.thoughtcrime.securesms.util.CharacterCalculator;
 import org.thoughtcrime.securesms.util.CharacterCalculator.CharacterState;
 import org.whispersystems.libsignal.util.guava.Optional;
 
+import network.loki.messenger.R;
+
 public class TransportOption implements Parcelable {
 
   public enum Type {
@@ -84,7 +86,7 @@ public class TransportOption implements Parcelable {
   }
 
   public @DrawableRes int getDrawable() {
-    return drawable;
+    return R.drawable.ic_arrow_up;
   }
 
   public int getBackgroundColor() {
diff --git a/src/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java b/src/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java
index 3c706d0f48..bdd60ab56a 100644
--- a/src/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java
+++ b/src/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java
@@ -26,10 +26,11 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 
-import network.loki.messenger.R;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
+import network.loki.messenger.R;
+
 public class AttachmentTypeSelector extends PopupWindow {
 
   public static final int ADD_GALLERY       = 1;
@@ -45,6 +46,8 @@ public class AttachmentTypeSelector extends PopupWindow {
   @SuppressWarnings("unused")
   private static final String TAG = AttachmentTypeSelector.class.getSimpleName();
 
+  private final @NonNull Context             context;
+  public                 int                 keyboardHeight;
   private final @NonNull LoaderManager       loaderManager;
   private final @NonNull RecentPhotoViewRail recentRail;
   private final @NonNull ImageView           imageButton;
@@ -59,9 +62,12 @@ public class AttachmentTypeSelector extends PopupWindow {
   private @Nullable View                      currentAnchor;
   private @Nullable AttachmentClickedListener listener;
 
-  public AttachmentTypeSelector(@NonNull Context context, @NonNull LoaderManager loaderManager, @Nullable AttachmentClickedListener listener) {
+  public AttachmentTypeSelector(@NonNull Context context, @NonNull LoaderManager loaderManager, @Nullable AttachmentClickedListener listener, int keyboardHeight) {
     super(context);
 
+    this.context = context;
+    this.keyboardHeight = keyboardHeight;
+
     LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
     LinearLayout   layout   = (LinearLayout) inflater.inflate(R.layout.attachment_type_selector, null, true);
 
@@ -96,10 +102,14 @@ public class AttachmentTypeSelector extends PopupWindow {
     setFocusable(true);
     setTouchable(true);
 
+    updateHeight();
+
     loaderManager.initLoader(1, null, recentRail);
   }
 
   public void show(@NonNull Activity activity, final @NonNull View anchor) {
+    updateHeight();
+
     if (Permissions.hasAll(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
       recentRail.setVisibility(View.VISIBLE);
       loaderManager.restartLoader(1, null, recentRail);
@@ -137,6 +147,16 @@ public class AttachmentTypeSelector extends PopupWindow {
     }
   }
 
+  private void updateHeight() {
+    int thresholdInDP = 120;
+    float scale = context.getResources().getDisplayMetrics().density;
+    int thresholdInPX = (int)(thresholdInDP * scale);
+    View contentView = ViewUtil.findById(getContentView(), R.id.contentView);
+    LinearLayout.LayoutParams contentViewLayoutParams = (LinearLayout.LayoutParams)contentView.getLayoutParams();
+    contentViewLayoutParams.height = keyboardHeight > thresholdInPX ? keyboardHeight : LinearLayout.LayoutParams.WRAP_CONTENT;
+    contentView.setLayoutParams(contentViewLayoutParams);
+  }
+
   @Override
   public void dismiss() {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
diff --git a/src/org/thoughtcrime/securesms/components/AudioView.java b/src/org/thoughtcrime/securesms/components/AudioView.java
index 5156475874..cb5ec9513b 100644
--- a/src/org/thoughtcrime/securesms/components/AudioView.java
+++ b/src/org/thoughtcrime/securesms/components/AudioView.java
@@ -24,7 +24,6 @@ import com.pnikosis.materialishprogress.ProgressWheel;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
-import network.loki.messenger.R;
 import org.thoughtcrime.securesms.audio.AudioSlidePlayer;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.events.PartProgressEvent;
@@ -35,6 +34,8 @@ import org.thoughtcrime.securesms.mms.SlideClickListener;
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
+import network.loki.messenger.R;
+
 
 public class AudioView extends FrameLayout implements AudioSlidePlayer.Listener {
 
diff --git a/src/org/thoughtcrime/securesms/components/ConversationTypingView.java b/src/org/thoughtcrime/securesms/components/ConversationTypingView.java
index c21bef8d8a..8c737e51fc 100644
--- a/src/org/thoughtcrime/securesms/components/ConversationTypingView.java
+++ b/src/org/thoughtcrime/securesms/components/ConversationTypingView.java
@@ -8,12 +8,13 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;
 
-import network.loki.messenger.R;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
 
 import java.util.List;
 
+import network.loki.messenger.R;
+
 public class ConversationTypingView extends LinearLayout {
 
   private AvatarImageView     avatar;
@@ -40,7 +41,7 @@ public class ConversationTypingView extends LinearLayout {
     }
 
     Recipient typist = typists.get(0);
-    bubble.getBackground().setColorFilter(typist.getColor().toConversationColor(getContext()), PorterDuff.Mode.MULTIPLY);
+    bubble.getBackground().setColorFilter(getResources().getColor(R.color.received_message_background), PorterDuff.Mode.MULTIPLY);
 
     if (isGroupThread) {
       avatar.setAvatar(glideRequests, typist, false);
diff --git a/src/org/thoughtcrime/securesms/components/DeliveryStatusView.java b/src/org/thoughtcrime/securesms/components/DeliveryStatusView.java
index d9965fa154..861281c999 100644
--- a/src/org/thoughtcrime/securesms/components/DeliveryStatusView.java
+++ b/src/org/thoughtcrime/securesms/components/DeliveryStatusView.java
@@ -2,22 +2,16 @@ package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.graphics.Color;
-import android.os.Build;
 import android.util.AttributeSet;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.animation.Animation;
 import android.view.animation.LinearInterpolator;
 import android.view.animation.RotateAnimation;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
-import android.widget.TextView;
 
 import network.loki.messenger.R;
 
-import pl.tajchert.sample.DotsTextView;
-
 public class DeliveryStatusView extends FrameLayout {
 
   private static final String TAG = DeliveryStatusView.class.getSimpleName();
@@ -66,7 +60,7 @@ public class DeliveryStatusView extends FrameLayout {
   }
 
   public void setPending() {
-    this.setVisibility(View.VISIBLE);
+    this.setVisibility(View.GONE);
     pendingIndicator.setVisibility(View.VISIBLE);
     pendingIndicator.startAnimation(ROTATION_ANIMATION);
     sentIndicator.setVisibility(View.GONE);
@@ -75,7 +69,7 @@ public class DeliveryStatusView extends FrameLayout {
   }
 
   public void setSent() {
-    this.setVisibility(View.VISIBLE);
+    this.setVisibility(View.GONE);
     pendingIndicator.setVisibility(View.GONE);
     pendingIndicator.clearAnimation();
     sentIndicator.setVisibility(View.VISIBLE);
@@ -84,7 +78,7 @@ public class DeliveryStatusView extends FrameLayout {
   }
 
   public void setDelivered() {
-    this.setVisibility(View.VISIBLE);
+    this.setVisibility(View.GONE);
     pendingIndicator.setVisibility(View.GONE);
     pendingIndicator.clearAnimation();
     sentIndicator.setVisibility(View.GONE);
@@ -93,7 +87,7 @@ public class DeliveryStatusView extends FrameLayout {
   }
 
   public void setRead() {
-    this.setVisibility(View.VISIBLE);
+    this.setVisibility(View.GONE);
     pendingIndicator.setVisibility(View.GONE);
     pendingIndicator.clearAnimation();
     sentIndicator.setVisibility(View.GONE);
diff --git a/src/org/thoughtcrime/securesms/components/InputPanel.java b/src/org/thoughtcrime/securesms/components/InputPanel.java
index f23c2424c4..e00b454f03 100644
--- a/src/org/thoughtcrime/securesms/components/InputPanel.java
+++ b/src/org/thoughtcrime/securesms/components/InputPanel.java
@@ -24,7 +24,6 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import network.loki.messenger.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider;
 import org.thoughtcrime.securesms.components.emoji.EmojiToggle;
 import org.thoughtcrime.securesms.components.emoji.MediaKeyboard;
@@ -32,6 +31,7 @@ import org.thoughtcrime.securesms.conversation.ConversationStickerSuggestionAdap
 import org.thoughtcrime.securesms.database.model.StickerRecord;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
 import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.loki.redesign.utilities.MentionUtilities;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.QuoteModel;
@@ -48,6 +48,8 @@ import org.whispersystems.libsignal.util.guava.Optional;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import network.loki.messenger.R;
+
 public class InputPanel extends LinearLayout
     implements MicrophoneRecorderView.Listener,
                KeyboardAwareLinearLayout.OnKeyboardShownListener,
@@ -108,7 +110,8 @@ public class InputPanel extends LinearLayout
     this.buttonToggle           = findViewById(R.id.button_toggle);
     this.recordingContainer     = findViewById(R.id.recording_container);
     this.recordLockCancel       = findViewById(R.id.record_cancel);
-    this.slideToCancel          = new SlideToCancel(findViewById(R.id.slide_to_cancel));
+    View slideToCancelView      = findViewById(R.id.slide_to_cancel);
+    this.slideToCancel          = new SlideToCancel(slideToCancelView);
     this.microphoneRecorderView = findViewById(R.id.recorder_view);
     this.microphoneRecorderView.setListener(this);
     this.recordTime             = new RecordTime(findViewById(R.id.record_time),
@@ -150,8 +153,8 @@ public class InputPanel extends LinearLayout
     composeText.setMediaListener(listener);
   }
 
-  public void setQuote(@NonNull GlideRequests glideRequests, long id, @NonNull Recipient author, @NonNull String body, @NonNull SlideDeck attachments, @NonNull Recipient conversationRecipient) {
-    this.quoteView.setQuote(glideRequests, id, author, body, false, attachments, conversationRecipient);
+  public void setQuote(@NonNull GlideRequests glideRequests, long id, @NonNull Recipient author, @NonNull String body, @NonNull SlideDeck attachments, @NonNull Recipient conversationRecipient, long threadID) {
+    this.quoteView.setQuote(glideRequests, id, author, MentionUtilities.highlightMentions(body, threadID, getContext()), false, attachments, conversationRecipient);
     this.quoteView.setVisibility(View.VISIBLE);
 
     if (this.linkPreview.getVisibility() == View.VISIBLE) {
@@ -190,8 +193,8 @@ public class InputPanel extends LinearLayout
       this.linkPreview.setVisibility(View.GONE);
     }
 
-    int cornerRadius = quoteView.getVisibility() == VISIBLE ? readDimen(R.dimen.message_corner_collapse_radius)
-                                                            : readDimen(R.dimen.message_corner_radius);
+    int largeCornerRadius = (int)(16 * getResources().getDisplayMetrics().density);
+    int cornerRadius = quoteView.getVisibility() == VISIBLE ? readDimen(R.dimen.message_corner_collapse_radius) : largeCornerRadius;
 
     this.linkPreview.setCorners(cornerRadius, cornerRadius);
   }
diff --git a/src/org/thoughtcrime/securesms/components/LinkPreviewView.java b/src/org/thoughtcrime/securesms/components/LinkPreviewView.java
index 370728fb9a..bbfdbecfb2 100644
--- a/src/org/thoughtcrime/securesms/components/LinkPreviewView.java
+++ b/src/org/thoughtcrime/securesms/components/LinkPreviewView.java
@@ -16,7 +16,6 @@ import org.thoughtcrime.securesms.linkpreview.LinkPreview;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.ImageSlide;
 import org.thoughtcrime.securesms.mms.SlidesClickedListener;
-import org.thoughtcrime.securesms.util.ThemeUtil;
 
 import network.loki.messenger.R;
 import okhttp3.HttpUrl;
@@ -64,7 +63,7 @@ public class LinkPreviewView extends FrameLayout {
     cornerMask    = new CornerMask(this);
     outliner      = new Outliner();
 
-    outliner.setColor(ThemeUtil.getThemedColor(getContext(), R.attr.conversation_item_image_outline_color));
+    outliner.setColor(getResources().getColor(R.color.transparent));
 
     if (attrs != null) {
       TypedArray typedArray   = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.LinkPreviewView, 0, 0);
diff --git a/src/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java b/src/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java
index 428b716b7b..7469cc5254 100644
--- a/src/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java
+++ b/src/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java
@@ -20,10 +20,11 @@ import android.view.animation.TranslateAnimation;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
-import network.loki.messenger.R;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
+import network.loki.messenger.R;
+
 public final class MicrophoneRecorderView extends FrameLayout implements View.OnTouchListener {
 
   enum State {
@@ -156,7 +157,7 @@ public final class MicrophoneRecorderView extends FrameLayout implements View.On
     FloatingRecordButton(Context context, ImageView recordButtonFab) {
       this.recordButtonFab = recordButtonFab;
       this.recordButtonFab.getBackground().setColorFilter(context.getResources()
-                                                                 .getColor(R.color.red_500),
+                                                                 .getColor(R.color.destructive),
                                                           PorterDuff.Mode.SRC_IN);
     }
 
diff --git a/src/org/thoughtcrime/securesms/components/OutlinedThumbnailView.java b/src/org/thoughtcrime/securesms/components/OutlinedThumbnailView.java
index f5b60fd0e8..4f99c461a9 100644
--- a/src/org/thoughtcrime/securesms/components/OutlinedThumbnailView.java
+++ b/src/org/thoughtcrime/securesms/components/OutlinedThumbnailView.java
@@ -1,45 +1,12 @@
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
-import android.content.res.TypedArray;
 import android.graphics.Canvas;
-import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.UiThread;
 import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
 
-import com.bumptech.glide.RequestBuilder;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
-import com.bumptech.glide.load.resource.bitmap.CenterCrop;
-import com.bumptech.glide.load.resource.bitmap.FitCenter;
-import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
-import com.bumptech.glide.request.RequestOptions;
+import org.thoughtcrime.securesms.util.ThemeUtil;
 
 import network.loki.messenger.R;
-import org.thoughtcrime.securesms.database.AttachmentDatabase;
-import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
-import org.thoughtcrime.securesms.mms.GlideRequest;
-import org.thoughtcrime.securesms.mms.GlideRequests;
-import org.thoughtcrime.securesms.mms.Slide;
-import org.thoughtcrime.securesms.mms.SlideClickListener;
-import org.thoughtcrime.securesms.mms.SlidesClickedListener;
-import org.thoughtcrime.securesms.util.ThemeUtil;
-import org.thoughtcrime.securesms.util.Util;
-import org.thoughtcrime.securesms.util.ViewUtil;
-import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
-import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
-import org.whispersystems.libsignal.util.guava.Optional;
-
-import java.util.Collections;
-import java.util.Locale;
-
-import static com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade;
 
 public class OutlinedThumbnailView extends ThumbnailView {
 
diff --git a/src/org/thoughtcrime/securesms/components/QuoteView.java b/src/org/thoughtcrime/securesms/components/QuoteView.java
index cfb6a1bc3b..b4943f9993 100644
--- a/src/org/thoughtcrime/securesms/components/QuoteView.java
+++ b/src/org/thoughtcrime/securesms/components/QuoteView.java
@@ -105,7 +105,7 @@ public class QuoteView extends FrameLayout implements RecipientModifiedListener
     this.dismissView                  = findViewById(R.id.quote_dismiss);
     this.mediaDescriptionText         = findViewById(R.id.media_type);
     this.missingLinkText              = findViewById(R.id.quote_missing_text);
-    this.largeCornerRadius            = getResources().getDimensionPixelSize(R.dimen.quote_corner_radius_large);
+    this.largeCornerRadius            = getResources().getDimensionPixelSize(R.dimen.quote_corner_radius_bottom);
     this.smallCornerRadius            = getResources().getDimensionPixelSize(R.dimen.quote_corner_radius_bottom);
 
     cornerMask = new CornerMask(this);
@@ -209,8 +209,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(author.getColor().toQuoteBarColorResource(getContext(), outgoing));
-    mainView.setBackgroundColor(author.getColor().toQuoteBackgroundColor(getContext(), outgoing));
+    quoteBarView.setImageResource(R.color.accent);
+    mainView.setBackgroundColor(getResources().getColor(outgoing ? R.color.received_message_background : R.color.sent_message_background));
   }
 
   private void setQuoteText(@Nullable String body, @NonNull SlideDeck attachments) {
@@ -278,7 +278,7 @@ public class QuoteView extends FrameLayout implements RecipientModifiedListener
 
   private void setQuoteMissingFooter(boolean missing) {
     footerView.setVisibility(missing ? VISIBLE : GONE);
-    footerView.setBackgroundColor(author.getColor().toQuoteFooterColor(getContext(), messageType != MESSAGE_TYPE_INCOMING));
+    footerView.setBackgroundColor(getResources().getColor(R.color.quote_not_found_background));
   }
 
   public long getQuoteId() {
diff --git a/src/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java b/src/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java
index b3674617e0..d90c18d8e1 100644
--- a/src/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java
+++ b/src/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java
@@ -56,7 +56,7 @@ public class RemovableEditableMediaView extends FrameLayout {
     if (current != null) current.setVisibility(View.GONE);
 
     if (view != null) {
-      view.setPadding(view.getPaddingLeft(), removeSize / 2, removeSize / 2, view.getPaddingRight());
+      view.setPadding(view.getPaddingLeft(), removeSize / 2, removeSize / 2, (int)(8 * getResources().getDisplayMetrics().density));
       edit.setPadding(0, 0, removeSize / 2, 0);
 
       view.setVisibility(View.VISIBLE);
diff --git a/src/org/thoughtcrime/securesms/components/SendButton.java b/src/org/thoughtcrime/securesms/components/SendButton.java
index 476b99fa59..d6fa01746c 100644
--- a/src/org/thoughtcrime/securesms/components/SendButton.java
+++ b/src/org/thoughtcrime/securesms/components/SendButton.java
@@ -108,10 +108,10 @@ public class SendButton extends AppCompatImageButton
 
   @Override
   public boolean onLongClick(View v) {
-    if (isEnabled() && transportOptions.getEnabledTransports().size() > 1) {
-      getTransportOptionsPopup().display(transportOptions.getEnabledTransports());
-      return true;
-    }
+//    if (isEnabled() && transportOptions.getEnabledTransports().size() > 1) {
+//      getTransportOptionsPopup().display(transportOptions.getEnabledTransports());
+//      return true;
+//    }
 
     return false;
   }
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java
index 19c9da5fb8..35d7e7baa9 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java
@@ -1,16 +1,18 @@
 package org.thoughtcrime.securesms.components.emoji;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.AppCompatImageButton;
 import android.util.AttributeSet;
 
-import network.loki.messenger.R;
 import org.thoughtcrime.securesms.stickers.StickerKeyboardProvider;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
+import network.loki.messenger.R;
+
 public class EmojiToggle extends AppCompatImageButton implements MediaKeyboard.MediaKeyboardListener {
 
   private Drawable emojiToggle;
@@ -54,6 +56,8 @@ public class EmojiToggle extends AppCompatImageButton implements MediaKeyboard.M
     this.imeToggle       = drawables.getDrawable(2);
     this.mediaToggle     = emojiToggle;
 
+    setImageTintList(ColorStateList.valueOf(getResources().getColor(R.color.text)));
+
     drawables.recycle();
     setToMedia();
   }
diff --git a/src/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java b/src/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java
index 7d7bec5491..9e84fc776c 100644
--- a/src/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java
+++ b/src/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java
@@ -9,22 +9,30 @@ import android.widget.CheckBox;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import network.loki.messenger.R;
-import org.thoughtcrime.securesms.components.AvatarImageView;
 import org.thoughtcrime.securesms.database.Address;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.loki.redesign.views.ProfilePictureView;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientModifiedListener;
 import org.thoughtcrime.securesms.util.GroupUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
+import org.whispersystems.signalservice.loki.api.LokiAPI;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import network.loki.messenger.R;
 
 public class ContactSelectionListItem extends LinearLayout implements RecipientModifiedListener {
 
   @SuppressWarnings("unused")
   private static final String TAG = ContactSelectionListItem.class.getSimpleName();
 
-  private AvatarImageView contactPhotoImage;
+  private ProfilePictureView profilePictureView;
   private TextView        numberView;
   private TextView        nameView;
   private TextView        labelView;
@@ -33,6 +41,7 @@ public class ContactSelectionListItem extends LinearLayout implements RecipientM
   private String        number;
   private Recipient     recipient;
   private GlideRequests glideRequests;
+  private long          threadID;
 
   public ContactSelectionListItem(Context context) {
     super(context);
@@ -45,7 +54,7 @@ public class ContactSelectionListItem extends LinearLayout implements RecipientM
   @Override
   protected void onFinishInflate() {
     super.onFinishInflate();
-    this.contactPhotoImage = findViewById(R.id.contact_photo_image);
+    this.profilePictureView = findViewById(R.id.profilePictureView);
     this.numberView        = findViewById(R.id.number);
     this.labelView         = findViewById(R.id.label);
     this.nameView          = findViewById(R.id.name);
@@ -60,7 +69,6 @@ public class ContactSelectionListItem extends LinearLayout implements RecipientM
 
     if (type == ContactsDatabase.NEW_TYPE) {
       this.recipient = null;
-      this.contactPhotoImage.setAvatar(glideRequests, Recipient.from(getContext(), Address.UNKNOWN, true), false);
     } else if (!TextUtils.isEmpty(number)) {
       Address address = Address.fromExternal(getContext(), number);
       this.recipient = Recipient.from(getContext(), address, true);
@@ -71,9 +79,10 @@ public class ContactSelectionListItem extends LinearLayout implements RecipientM
       }
     }
 
-    this.nameView.setTextColor(color);
+    threadID = DatabaseFactory.getThreadDatabase(getContext()).getThreadIdFor(recipient);
+
     this.numberView.setTextColor(color);
-    this.contactPhotoImage.setAvatar(glideRequests, recipient, false);
+    updateProfilePicture(glideRequests, name, threadID);
 
     if (!multiSelect && recipient != null && recipient.isLocalNumber()) {
       name = getContext().getString(R.string.note_to_self);
@@ -94,8 +103,6 @@ public class ContactSelectionListItem extends LinearLayout implements RecipientM
       recipient.removeListener(this);
       recipient = null;
     }
-
-    contactPhotoImage.clear(glideRequests);
   }
 
   private void setText(int type, String name, String number, String label) {
@@ -125,9 +132,30 @@ public class ContactSelectionListItem extends LinearLayout implements RecipientM
   public void onModified(final Recipient recipient) {
     if (this.recipient == recipient) {
       Util.runOnMain(() -> {
-        contactPhotoImage.setAvatar(glideRequests, recipient, false);
+        threadID = DatabaseFactory.getThreadDatabase(getContext()).getThreadIdFor(recipient);
+        updateProfilePicture(glideRequests, recipient.getName(), threadID);
         nameView.setText(recipient.toShortString());
       });
     }
   }
+
+  private void updateProfilePicture(GlideRequests glide, String name, long threadID) {
+    if (this.recipient.isGroupRecipient()) {
+      Set<String> usersAsSet = LokiAPI.Companion.getUserHexEncodedPublicKeyCache().get(threadID);
+      if (usersAsSet == null) {
+        usersAsSet = new HashSet<>();
+      }
+      ArrayList<String> users = new ArrayList<>(usersAsSet);
+      Collections.sort(users); // Sort to provide a level of stability
+      profilePictureView.setHexEncodedPublicKey(users.size() > 0 ? users.get(0) : "");
+      profilePictureView.setAdditionalHexEncodedPublicKey(users.size() > 1 ? users.get(1) : "");
+      profilePictureView.setRSSFeed(name.equals("Loki News") || name.equals("Loki Messenger Updates"));
+    } else {
+      profilePictureView.setHexEncodedPublicKey(this.number);
+      profilePictureView.setAdditionalHexEncodedPublicKey(null);
+      profilePictureView.setRSSFeed(false);
+    }
+    profilePictureView.glide = glide;
+    profilePictureView.update();
+  }
 }
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java
index 62f4cd26a6..22c3ea398a 100644
--- a/src/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java
+++ b/src/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java
@@ -8,7 +8,6 @@ import android.support.annotation.Nullable;
 
 import org.thoughtcrime.securesms.database.Address;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
-import org.thoughtcrime.securesms.util.Conversions;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -17,7 +16,7 @@ import java.security.MessageDigest;
 public class ProfileContactPhoto implements ContactPhoto {
 
   private final @NonNull Address address;
-  private final @NonNull String  avatarObject;
+  public  final @NonNull String  avatarObject;
 
   public ProfileContactPhoto(@NonNull Address address, @NonNull String avatarObject) {
     this.address      = address;
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 84f3c11da5..65da3cbd7b 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -31,19 +31,20 @@ import android.content.res.TypedArray;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
-import android.graphics.PorterDuff.Mode;
+import android.graphics.PorterDuff;
 import android.graphics.drawable.ColorDrawable;
 import android.hardware.Camera;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
 import android.os.Vibrator;
 import android.provider.Browser;
-import android.provider.ContactsContract;
 import android.provider.Telephony;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.content.LocalBroadcastManager;
 import android.support.v4.content.pm.ShortcutInfoCompat;
 import android.support.v4.content.pm.ShortcutManagerCompat;
 import android.support.v4.graphics.drawable.IconCompat;
@@ -69,6 +70,7 @@ import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.ImageButton;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -80,8 +82,6 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 import org.jetbrains.annotations.NotNull;
 import org.thoughtcrime.securesms.ApplicationContext;
-import org.thoughtcrime.securesms.ConversationListActivity;
-import org.thoughtcrime.securesms.ConversationListArchiveActivity;
 import org.thoughtcrime.securesms.ExpirationDialog;
 import org.thoughtcrime.securesms.GroupCreateActivity;
 import org.thoughtcrime.securesms.GroupMembersDialog;
@@ -154,14 +154,15 @@ import org.thoughtcrime.securesms.linkpreview.LinkPreviewRepository;
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil;
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewViewModel;
 import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.loki.FriendRequestViewDelegate;
 import org.thoughtcrime.securesms.loki.LokiAPIUtilities;
-import org.thoughtcrime.securesms.loki.LokiThreadDatabase;
 import org.thoughtcrime.securesms.loki.LokiMessageDatabase;
+import org.thoughtcrime.securesms.loki.LokiThreadDatabase;
 import org.thoughtcrime.securesms.loki.LokiThreadDatabaseDelegate;
 import org.thoughtcrime.securesms.loki.LokiUserDatabase;
-import org.thoughtcrime.securesms.loki.MentionCandidateSelectionView;
+import org.thoughtcrime.securesms.loki.redesign.views.MentionCandidateSelectionView;
 import org.thoughtcrime.securesms.loki.MultiDeviceUtilities;
+import org.thoughtcrime.securesms.loki.redesign.activities.HomeActivity;
+import org.thoughtcrime.securesms.loki.redesign.views.FriendRequestViewDelegate;
 import org.thoughtcrime.securesms.mediasend.Media;
 import org.thoughtcrime.securesms.mediasend.MediaSendActivity;
 import org.thoughtcrime.securesms.mms.AttachmentManager;
@@ -231,7 +232,6 @@ import org.whispersystems.signalservice.loki.api.LokiStorageAPI;
 import org.whispersystems.signalservice.loki.messaging.LokiMessageFriendRequestStatus;
 import org.whispersystems.signalservice.loki.messaging.LokiThreadFriendRequestStatus;
 import org.whispersystems.signalservice.loki.messaging.Mention;
-import org.whispersystems.signalservice.loki.utilities.Analytics;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
@@ -248,7 +248,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 import kotlin.Unit;
 import network.loki.messenger.R;
 
-import static nl.komponents.kovenant.KovenantApi.task;
 import static org.thoughtcrime.securesms.TransportOption.Type;
 import static org.thoughtcrime.securesms.database.GroupDatabase.GroupRecord;
 import static org.whispersystems.libsignal.SessionCipher.SESSION_LOCK;
@@ -305,7 +304,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private   AnimatingToggle             buttonToggle;
   private   SendButton                  sendButton;
   private   ImageButton                 attachButton;
-  protected ConversationTitleView       titleView;
+  private   TextView                    titleTextView;
   private   TextView                    charactersLeft;
   private   ConversationFragment        fragment;
   private   Button                      unblockButton;
@@ -320,6 +319,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private   MentionTextWatcher          mentionTextWatcher;
   private   ConversationSearchBottomBar searchNav;
   private   MenuItem                    searchViewItem;
+  private   ProgressBar                 messageStatusProgressBar;
+  private   TextView                    actionBarSubtitleTextView;
 
   private   AttachmentTypeSelector attachmentTypeSelector;
   private   AttachmentManager      attachmentManager;
@@ -339,15 +340,22 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private int        distributionType;
   private boolean    archived;
   private boolean    isSecureText;
-  private boolean    isDefaultSms          = true;
-  private boolean    isMmsEnabled          = true;
-  private boolean    isSecurityInitialized = false;
+  private boolean    isDefaultSms            = true;
+  private boolean    isMmsEnabled            = true;
+  private boolean    isSecurityInitialized   = false;
+  private int        expandedKeyboardHeight  = 0;
+  private int        collapsedKeyboardHeight = Integer.MAX_VALUE;
+  private int        keyboardHeight          = 0;
 
   private final IdentityRecordList      identityRecords = new IdentityRecordList();
   private final DynamicNoActionBarTheme dynamicTheme    = new DynamicNoActionBarTheme();
   private final DynamicLanguage         dynamicLanguage = new DynamicLanguage();
 
+  private ArrayList<BroadcastReceiver> broadcastReceivers = new ArrayList<>();
+  private String messageStatus = null;
+
   // Mentions
+  private View mentionCandidateSelectionViewContainer;
   private MentionCandidateSelectionView mentionCandidateSelectionView;
   private int currentMentionStartIndex = -1;
   private ArrayList<Mention> mentions = new ArrayList<>();
@@ -377,6 +385,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     fragment = initFragment(R.id.fragment_content, new ConversationFragment(), dynamicLanguage.getCurrentLocale());
     fragment.friendRequestViewDelegate = this;
 
+    registerMessageStatusObserver("calculatingPoW");
+    registerMessageStatusObserver("contactingNetwork");
+    registerMessageStatusObserver("sendingMessage");
+    registerMessageStatusObserver("messageSent");
+    registerMessageStatusObserver("messageFailed");
+
     initializeReceivers();
     initializeActionBar();
     initializeViews();
@@ -407,6 +421,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
             }
             composeText.setSelection(composeText.length(), composeText.length());
             composeText.addTextChangedListener(mentionTextWatcher);
+            mentionCandidateSelectionView.setGlide(glideRequests);
             mentionCandidateSelectionView.setOnMentionCandidateSelected( mentionCandidate -> {
               mentions.add(mentionCandidate);
               String oldText = composeText.getText().toString();
@@ -425,15 +440,31 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     LokiAPIUtilities.INSTANCE.populateUserHexEncodedPublicKeyCacheIfNeeded(threadId, this);
 
-    if (this.recipient.isGroupRecipient()) {
-      if (this.recipient.getName().equals("Loki Public Chat")) {
-        Analytics.Companion.getShared().track("Loki Public Chat Opened");
-      } else {
-        Analytics.Companion.getShared().track("RSS Feed Opened");
+    View rootView = findViewById(R.id.rootView);
+    rootView.getViewTreeObserver().addOnGlobalLayoutListener(() -> {
+      int height = rootView.getRootView().getHeight() - rootView.getHeight();
+      int thresholdInDP = 120;
+      float scale = getResources().getDisplayMetrics().density;
+      int thresholdInPX = (int)(thresholdInDP * scale);
+      if (expandedKeyboardHeight == 0 || height > thresholdInPX) {
+        expandedKeyboardHeight = height;
       }
-    } else {
-      Analytics.Companion.getShared().track("Conversation Opened");
-    }
+      collapsedKeyboardHeight = Math.min(collapsedKeyboardHeight, height);
+      keyboardHeight = expandedKeyboardHeight - collapsedKeyboardHeight;
+    });
+  }
+
+  private void registerMessageStatusObserver(String status) {
+    BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
+
+      @Override
+      public void onReceive(Context context, Intent intent) {
+        long timestamp = intent.getLongExtra("long", 0);
+        handleMessageStatusChanged(status, timestamp);
+      }
+    };
+    broadcastReceivers.add(broadcastReceiver);
+    LocalBroadcastManager.getInstance(this).registerReceiver(broadcastReceiver, new IntentFilter(status));
   }
 
   @Override
@@ -479,7 +510,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     initializeIdentityRecords();
     composeText.setTransport(sendButton.getSelectedTransport());
 
-    titleView.setTitle(glideRequests, recipient);
+    updateTitleTextView(glideRequests, recipient);
     setActionBarColor(recipient.getColor());
     setBlockedUserState(recipient, isSecureText, isDefaultSms);
     setGroupShareProfileReminder(recipient);
@@ -531,6 +562,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     saveDraft();
     if (recipient != null)               recipient.removeListener(this);
     if (securityUpdateReceiver != null)  unregisterReceiver(securityUpdateReceiver);
+    for (BroadcastReceiver broadcastReceiver : broadcastReceivers) {
+      LocalBroadcastManager.getInstance(this).unregisterReceiver(broadcastReceiver);
+    }
     super.onDestroy();
   }
 
@@ -566,7 +600,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     case GROUP_EDIT:
       recipient = Recipient.from(this, data.getParcelableExtra(GroupCreateActivity.GROUP_ADDRESS_EXTRA), true);
       recipient.addListener(this);
-      titleView.setTitle(glideRequests, recipient);
+      updateTitleTextView(glideRequests, recipient);
       NotificationChannels.updateContactChannelName(this, recipient);
       setBlockedUserState(recipient, isSecureText, isDefaultSms);
       supportInvalidateOptionsMenu();
@@ -737,7 +771,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     searchViewItem = menu.findItem(R.id.menu_search);
 
-    SearchView                     searchView    = (SearchView) searchViewItem.getActionView();
+    SearchView                     searchView    = (SearchView)searchViewItem.getActionView();
     SearchView.OnQueryTextListener queryListener = new SearchView.OnQueryTextListener() {
       @Override
       public boolean onQueryTextSubmit(String query) {
@@ -842,7 +876,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   //////// Event Handlers
 
   private void handleReturnToConversationList() {
-    Intent intent = new Intent(this, (archived ? ConversationListArchiveActivity.class : ConversationListActivity.class));
+    Intent intent = new Intent(this, HomeActivity.class);
     intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
     startActivity(intent);
     finish();
@@ -1170,11 +1204,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private boolean handleDisplayQuickContact() {
     if (recipient.getAddress().isGroup()) return false;
 
-    if (recipient.getContactUri() != null) {
-      ContactsContract.QuickContact.showQuickContact(ConversationActivity.this, titleView, recipient.getContactUri(), ContactsContract.QuickContact.MODE_LARGE, null);
-    } else {
-      handleAddToContacts();
-    }
+//    if (recipient.getContactUri() != null) {
+//      ContactsContract.QuickContact.showQuickContact(ConversationActivity.this, titleView, recipient.getContactUri(), ContactsContract.QuickContact.MODE_LARGE, null);
+//    } else {
+//      handleAddToContacts();
+//    }
 
     return true;
   }
@@ -1182,8 +1216,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private void handleAddAttachment() {
     if (this.isMmsEnabled || isSecureText) {
       if (attachmentTypeSelector == null) {
-        attachmentTypeSelector = new AttachmentTypeSelector(this, getSupportLoaderManager(), new AttachmentTypeListener());
+        attachmentTypeSelector = new AttachmentTypeSelector(this, getSupportLoaderManager(), new AttachmentTypeListener(), keyboardHeight);
       }
+      attachmentTypeSelector.keyboardHeight = keyboardHeight;
       attachmentTypeSelector.show(this, attachButton);
     } else {
       handleManualMmsRequired();
@@ -1554,7 +1589,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
           unverifiedBannerView.get().hide();
         }
 
-        titleView.setVerified(isSecureText && identityRecords.isVerified());
+//        titleView.setVerified(isSecureText && identityRecords.isVerified());
 
         future.set(true);
       }
@@ -1565,7 +1600,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void initializeViews() {
-    titleView              = findViewById(R.id.conversation_title_view);
+    titleTextView          = findViewById(R.id.titleTextView);
     buttonToggle           = ViewUtil.findById(this, R.id.button_toggle);
     sendButton             = ViewUtil.findById(this, R.id.send_button);
     attachButton           = ViewUtil.findById(this, R.id.attach_button);
@@ -1584,7 +1619,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     inlineAttachmentToggle = ViewUtil.findById(this, R.id.inline_attachment_container);
     inputPanel             = ViewUtil.findById(this, R.id.bottom_panel);
     searchNav              = ViewUtil.findById(this, R.id.conversation_search_nav);
+    mentionCandidateSelectionViewContainer = ViewUtil.findById(this, R.id.mentionCandidateSelectionViewContainer);
     mentionCandidateSelectionView = ViewUtil.findById(this, R.id.userSelectionView);
+    messageStatusProgressBar = ViewUtil.findById(this, R.id.messageStatusProgressBar);
+    actionBarSubtitleTextView = ViewUtil.findById(this, R.id.subtitleTextView);
 
     ImageButton quickCameraToggle      = ViewUtil.findById(this, R.id.quick_camera_toggle);
     ImageButton inlineAttachmentButton = ViewUtil.findById(this, R.id.inline_attachment_button);
@@ -1612,8 +1650,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       calculateCharactersRemaining();
       updateLinkPreviewState();
       composeText.setTransport(newTransport);
-      buttonToggle.getBackground().setColorFilter(newTransport.getBackgroundColor(), Mode.MULTIPLY);
-      buttonToggle.getBackground().invalidateSelf();
       if (manuallySelected) recordTransportPreference(newTransport);
     });
 
@@ -1645,12 +1681,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
   protected void initializeActionBar() {
     Toolbar toolbar = findViewById(R.id.toolbar);
+    toolbar.getOverflowIcon().setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_IN);
     setSupportActionBar(toolbar);
 
     ActionBar supportActionBar = getSupportActionBar();
     if (supportActionBar == null) throw new AssertionError();
 
-    supportActionBar.setDisplayHomeAsUpEnabled(true);
+//    supportActionBar.setDisplayHomeAsUpEnabled(true);
     supportActionBar.setDisplayShowTitleEnabled(false);
   }
 
@@ -1776,8 +1813,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     Log.i(TAG, "onModified(" + recipient.getAddress().serialize() + ")");
     Util.runOnMain(() -> {
       Log.i(TAG, "onModifiedRun(): " + recipient.getRegistered());
-      titleView.setTitle(glideRequests, recipient);
-      titleView.setVerified(identityRecords.isVerified());
+      updateTitleTextView(glideRequests, recipient);
+//      titleView.setVerified(identityRecords.isVerified());
       setBlockedUserState(recipient, isSecureText, isDefaultSms);
       setActionBarColor(recipient.getColor());
       setGroupShareProfileReminder(recipient);
@@ -1973,8 +2010,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private void setActionBarColor(MaterialColor color) {
     ActionBar supportActionBar = getSupportActionBar();
     if (supportActionBar == null) throw new AssertionError();
-    supportActionBar.setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.core_grey_90)));
-    setStatusBarColor(getResources().getColor(R.color.black));
+    supportActionBar.setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.action_bar_background)));
+    setStatusBarColor(getResources().getColor(R.color.action_bar_background));
   }
 
   private void setBlockedUserState(Recipient recipient, boolean isSecureText, boolean isDefaultSms) {
@@ -2245,8 +2282,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private void setInputPanelEnabled(boolean enabled) {
     Util.runOnMain(() -> {
       updateToggleButtonState();
-      int hintID = enabled ? R.string.activity_conversation_default_hint : R.string.activity_conversation_pending_friend_request_hint;
-      inputPanel.setHint(getResources().getString(hintID));
+      String hint = enabled ? "Message" : "Pending message request";
+      inputPanel.setHint(hint);
       inputPanel.setEnabled(enabled);
       if (enabled) {
         inputPanel.composeText.requestFocus();
@@ -2831,6 +2868,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       if (isBackspace) {
         currentMentionStartIndex = -1;
         mentionCandidateSelectionView.hide();
+        mentionCandidateSelectionViewContainer.setVisibility(View.GONE);
         ArrayList<Mention> mentionsToRemove = new ArrayList<>();
         for (Mention mention : mentions) {
           if (!text.contains(mention.getDisplayName())) {
@@ -2855,14 +2893,17 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
         if (lastCharacter == '@' && Character.isWhitespace(secondToLastCharacter)) {
           List<Mention> mentionCandidates = LokiAPI.Companion.getMentionCandidates("", threadId, userHexEncodedPublicKey, threadDatabase, userDatabase);
           currentMentionStartIndex = lastCharacterIndex;
+          mentionCandidateSelectionViewContainer.setVisibility(View.VISIBLE);
           mentionCandidateSelectionView.show(mentionCandidates, threadId);
         } else if (Character.isWhitespace(lastCharacter)) {
           currentMentionStartIndex = -1;
           mentionCandidateSelectionView.hide();
+          mentionCandidateSelectionViewContainer.setVisibility(View.GONE);
         } else {
           if (currentMentionStartIndex != -1) {
             String query = text.substring(currentMentionStartIndex + 1); // + 1 to get rid of the @
             List<Mention> mentionCandidates = LokiAPI.Companion.getMentionCandidates(query, threadId, userHexEncodedPublicKey, threadDatabase, userDatabase);
+            mentionCandidateSelectionViewContainer.setVisibility(View.VISIBLE);
             mentionCandidateSelectionView.show(mentionCandidates, threadId);
           }
         }
@@ -2907,7 +2948,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
               author,
               body,
               slideDeck,
-              recipient);
+              recipient,
+              threadId);
 
     } else if (messageRecord.isMms() && !((MmsMessageRecord) messageRecord).getLinkPreviews().isEmpty()) {
       LinkPreview linkPreview = ((MmsMessageRecord) messageRecord).getLinkPreviews().get(0);
@@ -2922,20 +2964,22 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
               author,
               messageRecord.getBody(),
               slideDeck,
-              recipient);
+              recipient,
+              threadId);
     } else {
       inputPanel.setQuote(GlideApp.with(this),
               messageRecord.getDateSent(),
               author,
               messageRecord.getBody(),
               messageRecord.isMms() ? ((MmsMessageRecord) messageRecord).getSlideDeck() : new SlideDeck(),
-              recipient);
+              recipient,
+              threadId);
     }
   }
 
   @Override
   public void onMessageActionToolbarOpened() {
-    searchViewItem.collapseActionView();
+     searchViewItem.collapseActionView();
   }
 
   @Override
@@ -3045,6 +3089,91 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   // region Loki
+  private void updateTitleTextView(GlideRequests glide, Recipient recipient) {
+
+  }
+
+  private void updateSubtitleTextView() {
+    if (messageStatus != null) {
+      switch (messageStatus) {
+        case "calculatingPoW": actionBarSubtitleTextView.setText("Encrypting message"); break;
+        case "contactingNetwork": actionBarSubtitleTextView.setText("Tracing a path"); break;
+        case "sendingMessage": actionBarSubtitleTextView.setText("Sending message"); break;
+        case "messageSent": actionBarSubtitleTextView.setText("Message sent securely"); break;
+        case "messageFailed": actionBarSubtitleTextView.setText("Message failed to send"); break;
+      }
+    } else {
+      actionBarSubtitleTextView.setText("26 members");
+    }
+  }
+
+  private void setMessageStatusProgressAnimatedIfPossible(int progress) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+      messageStatusProgressBar.setProgress(progress, true);
+    } else {
+      messageStatusProgressBar.setProgress(progress);
+    }
+  }
+
+  private void updateMessageStatusProgressBar() {
+    if (messageStatus != null) {
+        messageStatusProgressBar.setAlpha(1.0f);
+      switch (messageStatus) {
+        case "calculatingPoW": setMessageStatusProgressAnimatedIfPossible(25); break;
+        case "contactingNetwork": setMessageStatusProgressAnimatedIfPossible(50); break;
+        case "sendingMessage": setMessageStatusProgressAnimatedIfPossible(75); break;
+        case "messageSent":
+          setMessageStatusProgressAnimatedIfPossible(100);
+          new Handler().postDelayed(() -> messageStatusProgressBar.animate().alpha(0).setDuration(250).start(), 250);
+          new Handler().postDelayed(() -> messageStatusProgressBar.setProgress(0), 500);
+          break;
+        case "messageFailed":
+          messageStatusProgressBar.animate().alpha(0).setDuration(250).start();
+          new Handler().postDelayed(() -> messageStatusProgressBar.setProgress(0), 250);
+          break;
+      }
+    }
+  }
+
+  private void handleMessageStatusChanged(String newMessageStatus, long timestamp) {
+    if (timestamp == 0) { return; }
+    updateForNewMessageStatusIfNeeded(newMessageStatus, timestamp);
+    if (newMessageStatus.equals("messageFailed") || newMessageStatus.equals("messageSent")) {
+      new Handler().postDelayed(() -> clearMessageStatusIfNeeded(timestamp), 1000);
+    }
+  }
+
+  private int precedence(String messageStatus) {
+    if (messageStatus != null) {
+      switch (messageStatus) {
+        case "calculatingPoW": return 0;
+        case "contactingNetwork": return 1;
+        case "sendingMessage": return 2;
+        case "messageSent": return 3;
+        case "messageFailed": return 4;
+        default: return -1;
+      }
+    } else {
+        return -1;
+    }
+  }
+
+  private void updateForNewMessageStatusIfNeeded(String newMessageStatus, long timestamp) {
+    if (!DatabaseFactory.getSmsDatabase(this).isOutgoingMessage(timestamp) && !DatabaseFactory.getMmsDatabase(this).isOutgoingMessage(timestamp)) { return; }
+    if (precedence(newMessageStatus) > precedence(messageStatus)) {
+      messageStatus = newMessageStatus;
+      updateSubtitleTextView();
+      updateMessageStatusProgressBar();
+    }
+  }
+
+  private void clearMessageStatusIfNeeded(long timestamp) {
+    if (!DatabaseFactory.getSmsDatabase(this).isOutgoingMessage(timestamp) && !DatabaseFactory.getMmsDatabase(this).isOutgoingMessage(timestamp)) { return; }
+    messageStatus = null;
+    updateSubtitleTextView();
+    updateMessageStatusProgressBar();
+  }
+
   @Override
   public void acceptFriendRequest(@NotNull MessageRecord friendRequest) {
     // Send the accept to the original friend request thread id
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationAdapter.java b/src/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
index 2adeae528b..90b0db2fb9 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
@@ -31,7 +31,6 @@ import android.widget.TextView;
 import com.annimon.stream.Stream;
 
 import org.thoughtcrime.securesms.BindableConversationItem;
-import network.loki.messenger.R;
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
 import org.thoughtcrime.securesms.conversation.ConversationAdapter.HeaderViewHolder;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
@@ -41,7 +40,7 @@ import org.thoughtcrime.securesms.database.MmsSmsDatabase;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
 import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.loki.FriendRequestViewDelegate;
+import org.thoughtcrime.securesms.loki.redesign.views.FriendRequestViewDelegate;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.SlideDeck;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -65,6 +64,8 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
+import network.loki.messenger.R;
+
 /**
  * A cursor adapter for a conversation thread.  Ultimately
  * used by ComposeMessageActivity to display a conversation
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
index 46338150f5..0ab5c36206 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -47,6 +47,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.view.Window;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
@@ -79,7 +80,7 @@ import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
 import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
 import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.loki.FriendRequestViewDelegate;
+import org.thoughtcrime.securesms.loki.redesign.views.FriendRequestViewDelegate;
 import org.thoughtcrime.securesms.longmessage.LongMessageActivity;
 import org.thoughtcrime.securesms.mediasend.Media;
 import org.thoughtcrime.securesms.mms.GlideApp;
@@ -966,6 +967,15 @@ public class ConversationFragment extends Fragment
         list.getAdapter().notifyDataSetChanged();
 
         actionMode = ((AppCompatActivity)getActivity()).startSupportActionMode(actionModeCallback);
+
+        View titleTextView = (getActivity().findViewById(R.id.action_bar_title));
+        if (titleTextView != null) {
+          titleTextView.setBackgroundColor(getResources().getColor(R.color.transparent));
+          ViewParent titleTextViewContainerView = titleTextView.getParent();
+          if (titleTextViewContainerView != null) {
+            ((View)titleTextViewContainerView).setBackgroundColor(getResources().getColor(R.color.transparent));
+          }
+        }
       }
     }
 
@@ -1082,7 +1092,6 @@ public class ConversationFragment extends Fragment
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
         Window window = getActivity().getWindow();
         statusBarColor = window.getStatusBarColor();
-        window.setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
       }
 
       setCorrectMenuVisibility(menu);
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
index 7e66fbbcd3..8f20b5b4c6 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -60,7 +60,6 @@ import org.thoughtcrime.securesms.MessageDetailsActivity;
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
 import org.thoughtcrime.securesms.components.AlertView;
 import org.thoughtcrime.securesms.components.AudioView;
-import org.thoughtcrime.securesms.components.AvatarImageView;
 import org.thoughtcrime.securesms.components.ConversationItemFooter;
 import org.thoughtcrime.securesms.components.ConversationItemThumbnail;
 import org.thoughtcrime.securesms.components.DocumentView;
@@ -87,10 +86,11 @@ import org.thoughtcrime.securesms.jobs.SmsSendJob;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil;
 import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.loki.FriendRequestView;
-import org.thoughtcrime.securesms.loki.FriendRequestViewDelegate;
 import org.thoughtcrime.securesms.loki.LokiMessageDatabase;
-import org.thoughtcrime.securesms.loki.MentionUtilities;
+import org.thoughtcrime.securesms.loki.redesign.utilities.MentionUtilities;
+import org.thoughtcrime.securesms.loki.redesign.views.FriendRequestView;
+import org.thoughtcrime.securesms.loki.redesign.views.FriendRequestViewDelegate;
+import org.thoughtcrime.securesms.loki.redesign.views.ProfilePictureView;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.ImageSlide;
 import org.thoughtcrime.securesms.mms.PartAuthority;
@@ -102,7 +102,6 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientModifiedListener;
 import org.thoughtcrime.securesms.stickers.StickerUrl;
 import org.thoughtcrime.securesms.util.DateUtils;
-import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.GroupUtil;
 import org.thoughtcrime.securesms.util.LongClickCopySpan;
 import org.thoughtcrime.securesms.util.LongClickMovementMethod;
@@ -154,7 +153,7 @@ public class ConversationItem extends LinearLayout
   private   TextView               groupSender;
   private   TextView               groupSenderProfileName;
   private   View                   groupSenderHolder;
-  private   AvatarImageView        contactPhoto;
+  private   ProfilePictureView     profilePictureView;
   private   ImageView              moderatorIconImageView;
   private   ViewGroup              contactPhotoHolder;
   private   AlertView              alertView;
@@ -211,7 +210,7 @@ public class ConversationItem extends LinearLayout
     this.groupSender             =            findViewById(R.id.group_message_sender);
     this.groupSenderProfileName  =            findViewById(R.id.group_message_sender_profile);
     this.alertView               =            findViewById(R.id.indicators_parent);
-    this.contactPhoto            =            findViewById(R.id.contact_photo);
+    this.profilePictureView      =            findViewById(R.id.profilePictureView);
     this.moderatorIconImageView  =            findViewById(R.id.moderator_icon_image_view);
     this.contactPhotoHolder      =            findViewById(R.id.contact_photo_container);
     this.bodyBubble              =            findViewById(R.id.body_bubble);
@@ -271,6 +270,7 @@ public class ConversationItem extends LinearLayout
     setMessageSpacing(context, messageRecord, previousMessageRecord, nextMessageRecord, groupThread);
     setFooter(messageRecord, nextMessageRecord, locale, groupThread);
     setFriendRequestView(messageRecord);
+    adjustMarginsIfNeeded(messageRecord);
   }
 
   @Override
@@ -356,9 +356,9 @@ public class ConversationItem extends LinearLayout
 
   private void setBubbleState(MessageRecord messageRecord) {
     if (messageRecord.isOutgoing()) {
-      bodyBubble.getBackground().setColorFilter(defaultBubbleColor, PorterDuff.Mode.MULTIPLY);
+      bodyBubble.getBackground().setColorFilter(getResources().getColor(R.color.sent_message_background), PorterDuff.Mode.MULTIPLY);
     } else {
-      bodyBubble.getBackground().setColorFilter(messageRecord.getRecipient().getColor().toConversationColor(context), PorterDuff.Mode.MULTIPLY);
+      bodyBubble.getBackground().setColorFilter(getResources().getColor(R.color.received_message_background), PorterDuff.Mode.MULTIPLY);
     }
 
     if (audioViewStub.resolved()) {
@@ -367,15 +367,7 @@ public class ConversationItem extends LinearLayout
   }
 
   private void setAudioViewTint(MessageRecord messageRecord, Recipient recipient) {
-    if (messageRecord.isOutgoing()) {
-      if (DynamicTheme.LIGHT.equals(TextSecurePreferences.getTheme(context))) {
-        audioViewStub.get().setTint(getContext().getResources().getColor(R.color.core_grey_60), defaultBubbleColor);
-      } else {
-        audioViewStub.get().setTint(Color.WHITE, defaultBubbleColor);
-      }
-    } else {
-      audioViewStub.get().setTint(Color.WHITE, recipient.getColor().toConversationColor(context));
-    }
+    audioViewStub.get().setTint(Color.WHITE, getResources().getColor(R.color.action_bar_background));
   }
 
   private void setInteractionState(MessageRecord messageRecord, boolean pulseHighlight) {
@@ -432,6 +424,26 @@ public class ConversationItem extends LinearLayout
            !hasSticker(messageRecord);
   }
 
+  private boolean hasOnlyDocument(MessageRecord messageRecord) {
+    return messageRecord.getBody().length() == 0 &&
+           !hasThumbnail(messageRecord)          &&
+           !hasAudio(messageRecord)              &&
+           hasDocument(messageRecord)            &&
+           !hasSharedContact(messageRecord)      &&
+           !hasSticker(messageRecord)            &&
+           !hasQuote(messageRecord);
+  }
+
+  private boolean hasOnlyText(MessageRecord messageRecord) {
+    return messageRecord.getBody().length() != 0 &&
+           !hasThumbnail(messageRecord)          &&
+           !hasAudio(messageRecord)              &&
+           !hasDocument(messageRecord)           &&
+           !hasSharedContact(messageRecord)      &&
+           !hasSticker(messageRecord)            &&
+           !hasQuote(messageRecord);
+  }
+
   private boolean hasDocument(MessageRecord messageRecord) {
     return messageRecord.isMms() && ((MmsMessageRecord)messageRecord).getSlideDeck().getDocumentSlide() != null;
   }
@@ -470,12 +482,11 @@ public class ConversationItem extends LinearLayout
     bodyText.setClickable(false);
     bodyText.setFocusable(false);
     bodyText.setTextSize(TypedValue.COMPLEX_UNIT_SP, TextSecurePreferences.getMessageBodyTextSize(context));
-
     if (isCaptionlessMms(messageRecord)) {
       bodyText.setVisibility(View.GONE);
     } else {
       Spannable text = MentionUtilities.highlightMentions(linkifyMessageBody(messageRecord.getDisplayBody(context), batchSelected.isEmpty()), messageRecord.isOutgoing(), messageRecord.getThreadId(), context);
-      text = SearchUtil.getHighlightedSpan(locale, () -> new BackgroundColorSpan(Color.YELLOW), text, searchQuery);
+      text = SearchUtil.getHighlightedSpan(locale, () -> new BackgroundColorSpan(Color.WHITE), text, searchQuery);
       text = SearchUtil.getHighlightedSpan(locale, () -> new ForegroundColorSpan(Color.BLACK), text, searchQuery);
 
       if (hasExtraText(messageRecord)) {
@@ -489,6 +500,48 @@ public class ConversationItem extends LinearLayout
     }
   }
 
+  private void adjustMarginsIfNeeded(MessageRecord messageRecord) {
+    LinearLayout.LayoutParams bodyTextLayoutParams = (LinearLayout.LayoutParams)bodyText.getLayoutParams();
+    bodyTextLayoutParams.topMargin = 0;
+    if (hasOnlyThumbnail(messageRecord)) {
+      int topPadding = 0;
+      if (groupSenderHolder.getVisibility() == VISIBLE) {
+        topPadding = (int)getResources().getDimension(R.dimen.medium_spacing);
+      }
+      int bottomPadding = 0;
+      if (messageRecord.getBody().length() > 0) {
+        bodyTextLayoutParams.topMargin = (int)getResources().getDimension(R.dimen.medium_spacing);
+        bottomPadding = (int)getResources().getDimension(R.dimen.medium_spacing);
+      }
+      bodyBubble.setPadding(0, topPadding, 0, bottomPadding);
+    } else {
+      bodyBubble.setPadding(0, (int)getResources().getDimension(R.dimen.medium_spacing), 0, (int)getResources().getDimension(R.dimen.medium_spacing));
+    }
+    bodyText.setLayoutParams(bodyTextLayoutParams);
+    LinearLayout.LayoutParams senderHolderLayoutParams = (LinearLayout.LayoutParams)groupSenderHolder.getLayoutParams();
+    if (groupSenderHolder.getVisibility() == VISIBLE && hasOnlyText(messageRecord)) {
+      senderHolderLayoutParams.bottomMargin = (int)(getResources().getDisplayMetrics().density * 4);
+    } else {
+      senderHolderLayoutParams.bottomMargin = (int)getResources().getDimension(R.dimen.medium_spacing);
+    }
+    groupSenderHolder.setLayoutParams(senderHolderLayoutParams);
+    if (documentViewStub.resolved()) {
+      LinearLayout.LayoutParams documentViewLayoutParams = (LinearLayout.LayoutParams)documentViewStub.get().getLayoutParams();
+      int bottomMargin = 0;
+      if (hasOnlyDocument(messageRecord)) {
+        if (footer.getVisibility() == VISIBLE) {
+          bottomMargin = (int)(4 * getResources().getDisplayMetrics().density);
+        } else {
+          bottomMargin = (int)(-4 * getResources().getDisplayMetrics().density);
+        }
+      } else {
+        bottomMargin = (int)(4 * getResources().getDisplayMetrics().density);
+      }
+      documentViewLayoutParams.bottomMargin = bottomMargin;
+      documentViewStub.get().setLayoutParams(documentViewLayoutParams);
+    }
+  }
+
   private void setMediaAttributes(@NonNull MessageRecord           messageRecord,
                                   @NonNull Optional<MessageRecord> previousRecord,
                                   @NonNull Optional<MessageRecord> nextRecord,
@@ -745,13 +798,18 @@ public class ConversationItem extends LinearLayout
 
   private void setContactPhoto(@NonNull Recipient recipient) {
     LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams)bodyBubble.getLayoutParams();
-    float scale = getResources().getDisplayMetrics().density;
-    float marginInDP = groupThread ? 44 : 8;
-    int marginInPX = Math.round(marginInDP * scale);
-    layoutParams.setMarginStart(marginInPX);
+    int groupThreadMargin = (int)(getResources().getDimension(R.dimen.large_spacing) + getResources().getDimension(R.dimen.small_profile_picture_size));
+    int defaultMargin = 0;
+    String threadName = DatabaseFactory.getThreadDatabase(context).getRecipientForThreadId(messageRecord.getThreadId()).getName();
+    boolean isRSSFeed = threadName != null && (threadName.equals("Loki News") || threadName.equals("Loki Messenger Updates"));
+    layoutParams.setMarginStart((groupThread && !isRSSFeed) ? groupThreadMargin : defaultMargin);
     bodyBubble.setLayoutParams(layoutParams);
-    if (contactPhoto == null) return;
-    contactPhoto.setAvatar(glideRequests, recipient, true);
+    if (profilePictureView == null) return;
+    profilePictureView.setHexEncodedPublicKey(recipient.getAddress().toString());
+    profilePictureView.setAdditionalHexEncodedPublicKey(null);
+    profilePictureView.setRSSFeed(false);
+    profilePictureView.setGlide(glideRequests);
+    profilePictureView.update();
   }
 
   private SpannableString linkifyMessageBody(SpannableString messageBody, boolean shouldLinkifyAllLinks) {
@@ -924,7 +982,9 @@ public class ConversationItem extends LinearLayout
   }
 
   private void setAuthor(@NonNull MessageRecord current, @NonNull Optional<MessageRecord> previous, @NonNull Optional<MessageRecord> next, boolean isGroupThread) {
-    if (isGroupThread && !current.isOutgoing()) {
+    String threadName = DatabaseFactory.getThreadDatabase(context).getRecipientForThreadId(current.getThreadId()).getName();
+    boolean isRSSFeed = threadName != null && (threadName.equals("Loki News") || threadName.equals("Loki Messenger Updates"));
+    if (isGroupThread && !isRSSFeed && !current.isOutgoing()) {
       contactPhotoHolder.setVisibility(VISIBLE);
 
       if (!previous.isPresent() || previous.get().isUpdate() || !current.getRecipient().getAddress().equals(previous.get().getRecipient().getAddress()) ||
@@ -935,8 +995,8 @@ public class ConversationItem extends LinearLayout
         groupSenderHolder.setVisibility(GONE);
       }
 
-      if (!next.isPresent() || next.get().isUpdate() || !current.getRecipient().getAddress().equals(next.get().getRecipient().getAddress())) {
-        contactPhoto.setVisibility(VISIBLE);
+      if (!previous.isPresent() || previous.get().isUpdate() || !current.getRecipient().getAddress().equals(previous.get().getRecipient().getAddress())) {
+        profilePictureView.setVisibility(VISIBLE);
         int visibility = View.GONE;
 
         LokiPublicChat publicChat = DatabaseFactory.getLokiThreadDatabase(context).getPublicChat(messageRecord.getThreadId());
@@ -947,7 +1007,7 @@ public class ConversationItem extends LinearLayout
 
         moderatorIconImageView.setVisibility(visibility);
       } else {
-        contactPhoto.setVisibility(GONE);
+        profilePictureView.setVisibility(GONE);
         moderatorIconImageView.setVisibility(GONE);
 
       }
@@ -964,17 +1024,13 @@ public class ConversationItem extends LinearLayout
   private void setMessageShape(@NonNull MessageRecord current, @NonNull Optional<MessageRecord> previous, @NonNull Optional<MessageRecord> next, boolean isGroupThread) {
     int background;
     if (isSingularMessage(current, previous, next, isGroupThread)) {
-      background = current.isOutgoing() ? R.drawable.message_bubble_background_sent_alone
-                                        : R.drawable.message_bubble_background_received_alone;
+      background = current.isOutgoing() ? R.drawable.message_bubble_background_sent_alone : R.drawable.message_bubble_background_received_alone;
     } else if (isStartOfMessageCluster(current, previous, isGroupThread)) {
-      background = current.isOutgoing() ? R.drawable.message_bubble_background_sent_start
-                                        : R.drawable.message_bubble_background_received_start;
+      background = current.isOutgoing() ? R.drawable.message_bubble_background_sent_start : R.drawable.message_bubble_background_received_start;
     } else if (isEndOfMessageCluster(current, next, isGroupThread)) {
-      background = current.isOutgoing() ? R.drawable.message_bubble_background_sent_end
-                                        : R.drawable.message_bubble_background_received_end;
+      background = current.isOutgoing() ? R.drawable.message_bubble_background_sent_end : R.drawable.message_bubble_background_received_end;
     } else {
-      background = current.isOutgoing() ? R.drawable.message_bubble_background_sent_middle
-                                        : R.drawable.message_bubble_background_received_middle;
+      background = current.isOutgoing() ? R.drawable.message_bubble_background_sent_middle : R.drawable.message_bubble_background_received_middle;
     }
 
     bodyBubble.setBackgroundResource(background);
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java
index 966d513d66..c42c6467ef 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java
@@ -5,9 +5,6 @@ import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.support.v4.app.ActivityOptionsCompat;
-
-import network.loki.messenger.R;
-import org.thoughtcrime.securesms.logging.Log;
 import android.view.Display;
 import android.view.Gravity;
 import android.view.Menu;
@@ -16,10 +13,13 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.WindowManager;
 
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
 
 import java.util.concurrent.ExecutionException;
 
+import network.loki.messenger.R;
+
 public class ConversationPopupActivity extends ConversationActivity {
 
   private static final String TAG = ConversationPopupActivity.class.getSimpleName();
@@ -50,7 +50,7 @@ public class ConversationPopupActivity extends ConversationActivity {
 
     super.onCreate(bundle, ready);
 
-    titleView.setOnClickListener(null);
+//    titleView.setOnClickListener(null);
   }
 
   @Override
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java b/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
index 89219d3321..ca2b715c30 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
@@ -14,7 +14,6 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import org.thoughtcrime.securesms.BindableConversationItem;
-import network.loki.messenger.R;
 import org.thoughtcrime.securesms.VerifyIdentityActivity;
 import org.thoughtcrime.securesms.crypto.IdentityKeyParcelable;
 import org.thoughtcrime.securesms.database.IdentityDatabase;
@@ -36,6 +35,8 @@ import java.util.Locale;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 
+import network.loki.messenger.R;
+
 public class ConversationUpdateItem extends LinearLayout
     implements RecipientModifiedListener, BindableConversationItem
 {
@@ -134,10 +135,10 @@ public class ConversationUpdateItem extends LinearLayout
   private void setTimerRecord(final MessageRecord messageRecord) {
     if (messageRecord.getExpiresIn() > 0) {
       icon.setImageResource(R.drawable.ic_timer);
-      icon.setColorFilter(new PorterDuffColorFilter(Color.parseColor("#757575"), PorterDuff.Mode.MULTIPLY));
+      icon.setColorFilter(new PorterDuffColorFilter(Color.WHITE, PorterDuff.Mode.MULTIPLY));
     } else {
       icon.setImageResource(R.drawable.ic_timer_disabled);
-      icon.setColorFilter(new PorterDuffColorFilter(Color.parseColor("#757575"), PorterDuff.Mode.MULTIPLY));
+      icon.setColorFilter(new PorterDuffColorFilter(Color.WHITE, PorterDuff.Mode.MULTIPLY));
     }
 
     title.setText(ExpirationUtil.getExpirationDisplayValue(getContext(), (int)(messageRecord.getExpiresIn() / 1000)));
diff --git a/src/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java b/src/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java
index cf5e3e6c9b..f18fde6ac2 100644
--- a/src/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java
+++ b/src/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java
@@ -49,8 +49,8 @@ public class IdentityKeyUtil {
   private static final String IDENTITY_PUBLIC_KEY_CIPHERTEXT_LEGACY_PREF  = "pref_identity_public_curve25519";
   private static final String IDENTITY_PRIVATE_KEY_CIPHERTEXT_LEGACY_PREF = "pref_identity_private_curve25519";
 
-  private static final String IDENTITY_PUBLIC_KEY_PREF                    = "pref_identity_public_v3";
-  private static final String IDENTITY_PRIVATE_KEY_PREF                   = "pref_identity_private_v3";
+  public static final String IDENTITY_PUBLIC_KEY_PREF                    = "pref_identity_public_v3";
+  public static final String IDENTITY_PRIVATE_KEY_PREF                   = "pref_identity_private_v3";
 
   public static final String lokiSeedKey = "loki_seed";
 
diff --git a/src/org/thoughtcrime/securesms/database/MmsDatabase.java b/src/org/thoughtcrime/securesms/database/MmsDatabase.java
index 5ce830b3b4..3bdb6feae9 100644
--- a/src/org/thoughtcrime/securesms/database/MmsDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/MmsDatabase.java
@@ -236,6 +236,26 @@ public class MmsDatabase extends MessagingDatabase {
     }
   }
 
+  public boolean isOutgoingMessage(long timestamp) {
+    SQLiteDatabase database   = databaseHelper.getWritableDatabase();
+    Cursor         cursor     = null;
+    boolean        isOutgoing = false;
+
+    try {
+      cursor = database.query(TABLE_NAME, new String[] { ID, THREAD_ID, MESSAGE_BOX, ADDRESS }, DATE_SENT + " = ?", new String[] { String.valueOf(timestamp) }, null, null, null, null);
+
+      while (cursor.moveToNext()) {
+        if (Types.isOutgoingMessageType(cursor.getLong(cursor.getColumnIndexOrThrow(MESSAGE_BOX)))) {
+          isOutgoing = true;
+        }
+      }
+    } finally {
+      if (cursor != null)
+        cursor.close();
+    }
+    return isOutgoing;
+  }
+
   public void incrementReceiptCount(SyncMessageId messageId, long timestamp, boolean deliveryReceipt, boolean readReceipt) {
     SQLiteDatabase database = databaseHelper.getWritableDatabase();
     Cursor         cursor   = null;
diff --git a/src/org/thoughtcrime/securesms/database/SmsDatabase.java b/src/org/thoughtcrime/securesms/database/SmsDatabase.java
index 112ddc463b..c86922bd6a 100644
--- a/src/org/thoughtcrime/securesms/database/SmsDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/SmsDatabase.java
@@ -330,6 +330,28 @@ public class SmsDatabase extends MessagingDatabase {
     database.update(TABLE_NAME, contentValues, ID_WHERE, new String[] {String.valueOf(id)});
   }
 
+  public boolean isOutgoingMessage(long timestamp) {
+    SQLiteDatabase database     = databaseHelper.getWritableDatabase();
+    Cursor         cursor       = null;
+    boolean        isOutgoing   = false;
+
+    try {
+      cursor = database.query(TABLE_NAME, new String[] { ID, THREAD_ID, ADDRESS, TYPE },
+              DATE_SENT + " = ?", new String[] { String.valueOf(timestamp) },
+              null, null, null, null);
+
+      while (cursor.moveToNext()) {
+        if (Types.isOutgoingMessageType(cursor.getLong(cursor.getColumnIndexOrThrow(TYPE)))) {
+            isOutgoing = true;
+        }
+      }
+    } finally {
+      if (cursor != null) cursor.close();
+    }
+
+    return isOutgoing;
+  }
+
   public void incrementReceiptCount(SyncMessageId messageId, boolean deliveryReceipt, boolean readReceipt) {
     SQLiteDatabase database     = databaseHelper.getWritableDatabase();
     Cursor         cursor       = null;
diff --git a/src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java b/src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java
index 833c7f895f..b57185dd24 100644
--- a/src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java
+++ b/src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java
@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.dependencies;
 import android.content.Context;
 
 import org.greenrobot.eventbus.EventBus;
+import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.CreateProfileActivity;
 import org.thoughtcrime.securesms.DeviceListFragment;
 import org.thoughtcrime.securesms.crypto.storage.SignalProtocolStoreImpl;
@@ -160,7 +161,8 @@ public class SignalCommunicationModule {
                                                           DatabaseFactory.getLokiMessageDatabase(context),
                                                           DatabaseFactory.getLokiPreKeyBundleDatabase(context),
                                                           new TextSecureSessionStore(context),
-                                                          DatabaseFactory.getLokiUserDatabase(context));
+                                                          DatabaseFactory.getLokiUserDatabase(context),
+                                                          ((ApplicationContext)context.getApplicationContext()).broadcaster);
     } else {
       this.messageSender.setMessagePipe(IncomingMessageObserver.getPipe(), IncomingMessageObserver.getUnidentifiedPipe());
       this.messageSender.setIsMultiDevice(TextSecurePreferences.isMultiDevice(context));
diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java b/src/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java
index 6deed35656..793a06c498 100644
--- a/src/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java
+++ b/src/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java
@@ -14,10 +14,8 @@ import android.support.v7.widget.StaggeredGridLayoutManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import network.loki.messenger.R;
 import org.thoughtcrime.securesms.giph.model.GiphyImage;
 import org.thoughtcrime.securesms.giph.net.GiphyLoader;
 import org.thoughtcrime.securesms.giph.util.InfiniteScrollListener;
@@ -28,13 +26,15 @@ import org.thoughtcrime.securesms.util.ViewUtil;
 import java.util.LinkedList;
 import java.util.List;
 
+import network.loki.messenger.R;
+
 public abstract class GiphyFragment extends Fragment implements LoaderManager.LoaderCallbacks<List<GiphyImage>>, GiphyAdapter.OnItemClickListener {
 
   private static final String TAG = GiphyFragment.class.getSimpleName();
 
   private GiphyAdapter                     giphyAdapter;
   private RecyclerView                     recyclerView;
-  private ProgressBar                      loadingProgress;
+  private View                             loadingProgress;
   private TextView                         noResultsView;
   private GiphyAdapter.OnItemClickListener listener;
 
diff --git a/src/org/thoughtcrime/securesms/loki/BackgroundPollWorker.kt b/src/org/thoughtcrime/securesms/loki/BackgroundPollWorker.kt
index b8b8cd7fe4..6bcd4407f5 100644
--- a/src/org/thoughtcrime/securesms/loki/BackgroundPollWorker.kt
+++ b/src/org/thoughtcrime/securesms/loki/BackgroundPollWorker.kt
@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.loki
 import android.content.Context
 import android.content.Intent
 import nl.komponents.kovenant.functional.map
+import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.jobs.PushContentReceiveJob
 import org.thoughtcrime.securesms.service.PersistentAlarmManagerListener
@@ -33,7 +34,7 @@ class BackgroundPollWorker : PersistentAlarmManagerListener() {
             val userHexEncodedPublicKey = TextSecurePreferences.getLocalNumber(context)
             val lokiAPIDatabase = DatabaseFactory.getLokiAPIDatabase(context)
             try {
-                LokiAPI(userHexEncodedPublicKey, lokiAPIDatabase).getMessages().map { messages ->
+                LokiAPI(userHexEncodedPublicKey, lokiAPIDatabase, (context.applicationContext as ApplicationContext).broadcaster).getMessages().map { messages ->
                     messages.forEach {
                         PushContentReceiveJob(context).processEnvelope(SignalServiceEnvelope(it))
                     }
diff --git a/src/org/thoughtcrime/securesms/loki/DisplayNameActivity.kt b/src/org/thoughtcrime/securesms/loki/DisplayNameActivity.kt
index ab091d25c3..ad29ffa5cf 100644
--- a/src/org/thoughtcrime/securesms/loki/DisplayNameActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/DisplayNameActivity.kt
@@ -9,6 +9,7 @@ import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.BaseActionBarActivity
 import org.thoughtcrime.securesms.ConversationListActivity
 import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.loki.redesign.utilities.show
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.whispersystems.signalservice.api.crypto.ProfileCipher
 import org.whispersystems.signalservice.loki.utilities.Analytics
@@ -44,7 +45,7 @@ class DisplayNameActivity : BaseActionBarActivity() {
         application.setUpP2PAPI()
         application.startLongPollingIfNeeded()
         application.setUpStorageAPIIfNeeded()
-        startActivity(Intent(this, ConversationListActivity::class.java))
+        show(Intent(this, ConversationListActivity::class.java))
         finish()
         val publicChatAPI = ApplicationContext.getInstance(this).lokiPublicChatAPI
         if (publicChatAPI != null) {
diff --git a/src/org/thoughtcrime/securesms/loki/FriendRequestViewDelegate.kt b/src/org/thoughtcrime/securesms/loki/FriendRequestViewDelegate.kt
deleted file mode 100644
index d3bcb475f8..0000000000
--- a/src/org/thoughtcrime/securesms/loki/FriendRequestViewDelegate.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.thoughtcrime.securesms.loki
-
-import org.thoughtcrime.securesms.database.model.MessageRecord
-
-interface FriendRequestViewDelegate {
-    /**
-     * Implementations of this method should update the thread's friend request status
-     * and send a friend request accepted message.
-     */
-    fun acceptFriendRequest(friendRequest: MessageRecord)
-    /**
-     * Implementations of this method should update the thread's friend request status
-     * and remove the pre keys associated with the contact.
-     */
-    fun rejectFriendRequest(friendRequest: MessageRecord)
-}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/SeedActivity.kt b/src/org/thoughtcrime/securesms/loki/SeedActivity.kt
index 2294c0db93..61d2741883 100644
--- a/src/org/thoughtcrime/securesms/loki/SeedActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/SeedActivity.kt
@@ -256,7 +256,7 @@ class SeedActivity : BaseActionBarActivity(), DeviceLinkingDelegate, ScanListene
         TextSecurePreferences.setHasSeenWelcomeScreen(this, false)
         TextSecurePreferences.setPromptedPushRegistration(this, false)
     }
-    // endregion
+
     override fun onQrDataFound(data: String?) {
         runOnUiThread {
             if (data != null && PublicKeyValidation.isValid(data.trim())) {
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/ChatSettingsActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/ChatSettingsActivity.kt
new file mode 100644
index 0000000000..73ff12be3d
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/ChatSettingsActivity.kt
@@ -0,0 +1,19 @@
+package org.thoughtcrime.securesms.loki.redesign.activities
+
+import android.os.Bundle
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
+import org.thoughtcrime.securesms.preferences.ChatsPreferenceFragment
+
+class ChatSettingsActivity : PassphraseRequiredActionBarActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
+        super.onCreate(savedInstanceState, isReady)
+        setContentView(R.layout.activity_fragment_wrapper)
+        supportActionBar!!.title = "Chats"
+        val fragment = ChatsPreferenceFragment()
+        val transaction = supportFragmentManager.beginTransaction()
+        transaction.replace(R.id.fragmentContainer, fragment)
+        transaction.commit()
+    }
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/CreatePrivateChatActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/CreatePrivateChatActivity.kt
new file mode 100644
index 0000000000..94ed0f1628
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/CreatePrivateChatActivity.kt
@@ -0,0 +1,141 @@
+package org.thoughtcrime.securesms.loki.redesign.activities
+
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.support.v4.app.Fragment
+import android.support.v4.app.FragmentPagerAdapter
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import kotlinx.android.synthetic.main.activity_create_private_chat.*
+import kotlinx.android.synthetic.main.fragment_enter_public_key.*
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
+import org.thoughtcrime.securesms.conversation.ConversationActivity
+import org.thoughtcrime.securesms.database.Address
+import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.ThreadDatabase
+import org.thoughtcrime.securesms.loki.redesign.fragments.ScanQRCodeWrapperFragment
+import org.thoughtcrime.securesms.loki.redesign.fragments.ScanQRCodeWrapperFragmentDelegate
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.util.TextSecurePreferences
+import org.whispersystems.signalservice.loki.utilities.PublicKeyValidation
+
+class CreatePrivateChatActivity : PassphraseRequiredActionBarActivity(), ScanQRCodeWrapperFragmentDelegate {
+    private val adapter = CreatePrivateChatActivityAdapter(this)
+
+    // region Lifecycle
+    override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
+        super.onCreate(savedInstanceState, isReady)
+        // Set content view
+        setContentView(R.layout.activity_create_private_chat)
+        // Set title
+        supportActionBar!!.title = "New Conversation"
+        // Set up view pager
+        viewPager.adapter = adapter
+        tabLayout.setupWithViewPager(viewPager)
+    }
+    // endregion
+
+    // region Interaction
+    override fun handleQRCodeScanned(hexEncodedPublicKey: String) {
+        createPrivateChatIfPossible(hexEncodedPublicKey)
+    }
+
+    fun createPrivateChatIfPossible(hexEncodedPublicKey: String) {
+        if (!PublicKeyValidation.isValid(hexEncodedPublicKey)) { return Toast.makeText(this, "Invalid Session ID", Toast.LENGTH_SHORT).show() }
+        val masterHexEncodedPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(this)
+        val userHexEncodedPublicKey = TextSecurePreferences.getLocalNumber(this)
+        val targetHexEncodedPublicKey = if (hexEncodedPublicKey == masterHexEncodedPublicKey) userHexEncodedPublicKey else hexEncodedPublicKey
+        val recipient = Recipient.from(this, Address.fromSerialized(targetHexEncodedPublicKey), true)
+        val intent = Intent(this, ConversationActivity::class.java)
+        intent.putExtra(ConversationActivity.ADDRESS_EXTRA, recipient.address)
+        intent.putExtra(ConversationActivity.TEXT_EXTRA, getIntent().getStringExtra(ConversationActivity.TEXT_EXTRA))
+        intent.setDataAndType(getIntent().data, getIntent().type)
+        val existingThread = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipient)
+        intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, existingThread)
+        intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, ThreadDatabase.DistributionTypes.DEFAULT)
+        startActivity(intent)
+        finish()
+    }
+    // endregion
+}
+
+// region Adapter
+private class CreatePrivateChatActivityAdapter(val activity: CreatePrivateChatActivity) : FragmentPagerAdapter(activity.supportFragmentManager) {
+
+    override fun getCount(): Int {
+        return 2
+    }
+
+    override fun getItem(index: Int): Fragment {
+        return when (index) {
+            0 -> EnterPublicKeyFragment()
+            1 -> {
+                val result = ScanQRCodeWrapperFragment()
+                result.delegate = activity
+                result.message = "Users can share their QR code by going into their account settings and tapping \"Share QR Code\""
+                result
+            }
+            else -> throw IllegalStateException()
+        }
+    }
+
+    override fun getPageTitle(index: Int): CharSequence? {
+        return when (index) {
+            0 -> "Enter Session ID"
+            1 -> "Scan QR Code"
+            else -> throw IllegalStateException()
+        }
+    }
+}
+// endregion
+
+// region Enter Public Key Fragment
+class EnterPublicKeyFragment : Fragment() {
+
+    private val hexEncodedPublicKey: String
+        get() {
+            val masterHexEncodedPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(context!!)
+            val userHexEncodedPublicKey = TextSecurePreferences.getLocalNumber(context!!)
+            return masterHexEncodedPublicKey ?: userHexEncodedPublicKey
+        }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        return inflater.inflate(R.layout.fragment_enter_public_key, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        publicKeyTextView.imeOptions = publicKeyTextView.imeOptions or 16777216 // Always use incognito keyboard
+        publicKeyTextView.text = hexEncodedPublicKey
+        copyButton.setOnClickListener { copyPublicKey() }
+        shareButton.setOnClickListener { sharePublicKey() }
+        createPrivateChatButton.setOnClickListener { createPrivateChatIfPossible() }
+    }
+
+    private fun copyPublicKey() {
+        val clipboard = activity!!.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+        val clip = ClipData.newPlainText("Session ID", hexEncodedPublicKey)
+        clipboard.primaryClip = clip
+        Toast.makeText(context!!, R.string.activity_register_public_key_copied_message, Toast.LENGTH_SHORT).show()
+    }
+
+    private fun sharePublicKey() {
+        val intent = Intent()
+        intent.action = Intent.ACTION_SEND
+        intent.putExtra(Intent.EXTRA_TEXT, hexEncodedPublicKey)
+        intent.type = "text/plain"
+        startActivity(intent)
+    }
+
+    private fun createPrivateChatIfPossible() {
+        val hexEncodedPublicKey = publicKeyEditText.text.trim().toString()
+        (activity!! as CreatePrivateChatActivity).createPrivateChatIfPossible(hexEncodedPublicKey)
+    }
+}
+// endregion
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/DisplayNameActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/DisplayNameActivity.kt
new file mode 100644
index 0000000000..1ff3367301
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/DisplayNameActivity.kt
@@ -0,0 +1,56 @@
+package org.thoughtcrime.securesms.loki.redesign.activities
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.inputmethod.InputMethodManager
+import android.widget.Toast
+import kotlinx.android.synthetic.main.activity_display_name_v2.*
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.ApplicationContext
+import org.thoughtcrime.securesms.BaseActionBarActivity
+import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.loki.redesign.utilities.setUpActionBarSessionLogo
+import org.thoughtcrime.securesms.loki.redesign.utilities.show
+import org.thoughtcrime.securesms.util.TextSecurePreferences
+import org.whispersystems.signalservice.api.crypto.ProfileCipher
+
+class DisplayNameActivity : BaseActionBarActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setUpActionBarSessionLogo()
+        setContentView(R.layout.activity_display_name_v2)
+        displayNameEditText.imeOptions = displayNameEditText.imeOptions or 16777216 // Always use incognito keyboard
+        registerButton.setOnClickListener { register() }
+    }
+
+    private fun register() {
+        val displayName = displayNameEditText.text.toString().trim()
+        if (displayName.isEmpty()) {
+            return Toast.makeText(this, "Please pick a display name", Toast.LENGTH_SHORT).show()
+        }
+        if (!displayName.matches(Regex("[a-zA-Z0-9_]+"))) {
+            return Toast.makeText(this, "Please pick a display name that consists of only a-z, A-Z, 0-9 and _ characters", Toast.LENGTH_SHORT).show()
+        }
+        if (displayName.toByteArray().size > ProfileCipher.NAME_PADDED_LENGTH) {
+            return Toast.makeText(this, "Please pick a shorter display name", Toast.LENGTH_SHORT).show()
+        }
+        val inputMethodManager = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
+        inputMethodManager.hideSoftInputFromWindow(displayNameEditText.windowToken, 0)
+        TextSecurePreferences.setProfileName(this, displayName)
+        TextSecurePreferences.setHasSeenWelcomeScreen(this, true)
+        TextSecurePreferences.setPromptedPushRegistration(this, true)
+        val publicChatAPI = ApplicationContext.getInstance(this).lokiPublicChatAPI
+        if (publicChatAPI != null) {
+            // TODO: This won't be necessary anymore when we don't auto-join the Loki Public Chat anymore
+            val application = ApplicationContext.getInstance(this)
+            application.setUpStorageAPIIfNeeded()
+            application.createDefaultPublicChatsIfNeeded()
+            val servers = DatabaseFactory.getLokiThreadDatabase(this).getAllPublicChatServers()
+            servers.forEach { publicChatAPI.setDisplayName(displayName, it) }
+        }
+        val intent = Intent(this, HomeActivity::class.java)
+        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        show(intent)
+    }
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/HomeActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/HomeActivity.kt
new file mode 100644
index 0000000000..e7e2b34865
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/HomeActivity.kt
@@ -0,0 +1,246 @@
+package org.thoughtcrime.securesms.loki.redesign.activities
+
+import android.annotation.SuppressLint
+import android.arch.lifecycle.Observer
+import android.content.Intent
+import android.database.Cursor
+import android.graphics.BitmapFactory
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.os.AsyncTask
+import android.os.Bundle
+import android.os.Handler
+import android.support.design.widget.Snackbar
+import android.support.v4.app.LoaderManager
+import android.support.v4.content.Loader
+import android.support.v7.widget.LinearLayoutManager
+import android.support.v7.widget.RecyclerView
+import android.support.v7.widget.helper.ItemTouchHelper
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.style.ForegroundColorSpan
+import android.view.View
+import kotlinx.android.synthetic.main.activity_home.*
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.ApplicationContext
+import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
+import org.thoughtcrime.securesms.conversation.ConversationActivity
+import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.ThreadDatabase
+import org.thoughtcrime.securesms.database.model.ThreadRecord
+import org.thoughtcrime.securesms.loki.getColorWithID
+import org.thoughtcrime.securesms.loki.redesign.utilities.push
+import org.thoughtcrime.securesms.loki.redesign.utilities.show
+import org.thoughtcrime.securesms.loki.redesign.views.ConversationView
+import org.thoughtcrime.securesms.loki.redesign.views.SeedReminderViewDelegate
+import org.thoughtcrime.securesms.mms.GlideApp
+import org.thoughtcrime.securesms.mms.GlideRequests
+import org.thoughtcrime.securesms.notifications.MessageNotifier
+import org.thoughtcrime.securesms.util.TextSecurePreferences
+import kotlin.math.abs
+
+class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListener, SeedReminderViewDelegate {
+    private lateinit var glide: GlideRequests
+
+    private val hexEncodedPublicKey: String
+        get() {
+            val masterHexEncodedPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(this)
+            val userHexEncodedPublicKey = TextSecurePreferences.getLocalNumber(this)
+            return masterHexEncodedPublicKey ?: userHexEncodedPublicKey
+        }
+
+    // region Lifecycle
+    constructor() : super()
+
+    override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
+        super.onCreate(savedInstanceState, isReady)
+        // Process any outstanding deletes
+        val threadDatabase = DatabaseFactory.getThreadDatabase(this)
+        val archivedConversationCount = threadDatabase.archivedConversationListCount
+        if (archivedConversationCount > 0) {
+            val archivedConversations = threadDatabase.archivedConversationList
+            archivedConversations.moveToFirst()
+            fun deleteThreadAtCurrentPosition() {
+                val threadID = archivedConversations.getLong(archivedConversations.getColumnIndex(ThreadDatabase.ID))
+                AsyncTask.execute {
+                    threadDatabase.deleteConversation(threadID)
+                    MessageNotifier.updateNotification(this)
+                }
+            }
+            deleteThreadAtCurrentPosition()
+            while (archivedConversations.moveToNext()) {
+                deleteThreadAtCurrentPosition()
+            }
+        }
+        // Set content view
+        setContentView(R.layout.activity_home)
+        // Set custom toolbar
+        setSupportActionBar(toolbar)
+        // Set up Glide
+        glide = GlideApp.with(this)
+        // Set up toolbar buttons
+        profileButton.glide = glide
+        profileButton.hexEncodedPublicKey = hexEncodedPublicKey
+        profileButton.update()
+        profileButton.setOnClickListener { openSettings() }
+        joinPublicChatButton.setOnClickListener { joinPublicChat() }
+        // Set up seed reminder view
+        val isMasterDevice = (TextSecurePreferences.getMasterHexEncodedPublicKey(this) == null)
+        val hasViewedSeed = TextSecurePreferences.getHasViewedSeed(this)
+        if (!hasViewedSeed && isMasterDevice) {
+            val seedReminderViewTitle = SpannableString("You're almost finished! 80%")
+            seedReminderViewTitle.setSpan(ForegroundColorSpan(resources.getColorWithID(R.color.accent, theme)), 24, 27, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+            seedReminderView.title = seedReminderViewTitle
+            seedReminderView.subtitle = "Secure your account by saving your recovery phrase"
+            seedReminderView.setProgress(80, false)
+            seedReminderView.delegate = this
+        } else {
+            seedReminderView.visibility = View.GONE
+        }
+        // Set up recycler view
+        val cursor = DatabaseFactory.getThreadDatabase(this).conversationList
+        val homeAdapter = HomeAdapter(this, cursor)
+        homeAdapter.glide = glide
+        homeAdapter.conversationClickListener = this
+        recyclerView.adapter = homeAdapter
+        recyclerView.layoutManager = LinearLayoutManager(this)
+        ItemTouchHelper(SwipeCallback(this)).attachToRecyclerView(recyclerView)
+        // This is a workaround for the fact that CursorRecyclerViewAdapter doesn't actually auto-update (even though it says it will)
+        LoaderManager.getInstance(this).restartLoader(0, null, object : LoaderManager.LoaderCallbacks<Cursor> {
+
+            override fun onCreateLoader(id: Int, bundle: Bundle?): Loader<Cursor> {
+                return HomeLoader(this@HomeActivity)
+            }
+
+            override fun onLoadFinished(loader: Loader<Cursor>, cursor: Cursor?) {
+                homeAdapter.changeCursor(cursor)
+            }
+
+            override fun onLoaderReset(cursor: Loader<Cursor>) {
+                homeAdapter.changeCursor(null)
+            }
+        })
+        // Set up new conversation button
+        newConversationButton.setOnClickListener { createPrivateChat() }
+        // Set up typing observer
+        ApplicationContext.getInstance(this).typingStatusRepository.typingThreads.observe(this, Observer<Set<Long>> { threadIDs ->
+            val adapter = recyclerView.adapter as HomeAdapter
+            adapter.typingThreadIDs = threadIDs ?: setOf()
+        })
+        // Set up public chats and RSS feeds if needed
+        if (TextSecurePreferences.getLocalNumber(this) != null) {
+            val application = ApplicationContext.getInstance(this)
+            application.createDefaultPublicChatsIfNeeded()
+            application.createRSSFeedsIfNeeded()
+            application.lokiPublicChatManager.startPollersIfNeeded()
+            application.startRSSFeedPollersIfNeeded()
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        val isMasterDevice = (TextSecurePreferences.getMasterHexEncodedPublicKey(this) == null)
+        val hasViewedSeed = TextSecurePreferences.getHasViewedSeed(this)
+        if (hasViewedSeed || !isMasterDevice) {
+            seedReminderView.visibility = View.GONE
+        }
+    }
+    // endregion
+
+    override fun handleSeedReminderViewContinueButtonTapped() {
+        val intent = Intent(this, SeedActivity::class.java)
+        show(intent)
+    }
+
+    override fun onConversationClick(view: ConversationView) {
+        val thread = view.thread ?: return
+        openConversation(thread)
+    }
+
+    override fun onLongConversationClick(view: ConversationView) {
+        // Do nothing
+    }
+
+    private fun openConversation(thread: ThreadRecord) {
+        val intent = Intent(this, ConversationActivity::class.java)
+        intent.putExtra(ConversationActivity.ADDRESS_EXTRA, thread.recipient.getAddress())
+        intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, thread.threadId)
+        intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, thread.distributionType)
+        intent.putExtra(ConversationActivity.TIMING_EXTRA, System.currentTimeMillis())
+        intent.putExtra(ConversationActivity.LAST_SEEN_EXTRA, thread.lastSeen)
+        intent.putExtra(ConversationActivity.STARTING_POSITION_EXTRA, -1)
+        push(intent)
+    }
+
+    private fun openSettings() {
+        val intent = Intent(this, SettingsActivity::class.java)
+        show(intent)
+    }
+
+    private fun createPrivateChat() {
+        val intent = Intent(this, CreatePrivateChatActivity::class.java)
+        show(intent)
+    }
+
+    private fun joinPublicChat() {
+        val intent = Intent(this, JoinPublicChatActivity::class.java)
+        show(intent)
+    }
+
+    private class SwipeCallback(val activity: HomeActivity) : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT) {
+
+        override fun onMove(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean {
+            return false
+        }
+
+        @SuppressLint("StaticFieldLeak")
+        override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
+            val threadID = (viewHolder as HomeAdapter.ViewHolder).view.thread!!.threadId
+            val threadDatabase = DatabaseFactory.getThreadDatabase(activity)
+            threadDatabase.archiveConversation(threadID)
+            val deleteThread = object : Runnable {
+
+                override fun run() {
+                    AsyncTask.execute {
+                        threadDatabase.deleteConversation(threadID)
+                        MessageNotifier.updateNotification(activity)
+                    }
+                }
+            }
+            val handler = Handler()
+            handler.postDelayed(deleteThread, 5000)
+            val snackbar = Snackbar.make(activity.contentView, "Conversation Deleted", Snackbar.LENGTH_LONG)
+            snackbar.setAction("Undo") {
+                threadDatabase.unarchiveConversation(threadID)
+                handler.removeCallbacks(deleteThread)
+                animate(viewHolder, 0.0f)
+            }
+            snackbar.setActionTextColor(activity.resources.getColorWithID(R.color.accent, activity.theme))
+            snackbar.show()
+        }
+
+        override fun onChildDraw(c: Canvas, recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, dx: Float, dy: Float, actionState: Int, isCurrentlyActive: Boolean) {
+            if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE && dx < 0) {
+                val itemView = viewHolder.itemView
+                animate(viewHolder, dx)
+                val backgroundPaint = Paint()
+                backgroundPaint.color = activity.resources.getColorWithID(R.color.destructive, activity.theme)
+                c.drawRect(itemView.right.toFloat() - abs(dx), itemView.top.toFloat(), itemView.right.toFloat(), itemView.bottom.toFloat(), backgroundPaint)
+                val icon = BitmapFactory.decodeResource(activity.resources, R.drawable.ic_trash_filled_32)
+                val iconPaint = Paint()
+                val left = itemView.right.toFloat() - abs(dx) + activity.resources.getDimension(R.dimen.medium_spacing)
+                val top = itemView.top.toFloat() + (itemView.bottom.toFloat() - itemView.top.toFloat() - icon.height) / 2
+                c.drawBitmap(icon, left, top, iconPaint)
+            } else {
+                super.onChildDraw(c, recyclerView, viewHolder, dx, dy, actionState, isCurrentlyActive)
+            }
+        }
+
+        private fun animate(viewHolder: RecyclerView.ViewHolder, dx: Float) {
+            val alpha = 1.0f - abs(dx) / viewHolder.itemView.width.toFloat()
+            viewHolder.itemView.alpha = alpha
+            viewHolder.itemView.translationX = dx
+        }
+    }
+    // endregion
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/HomeAdapter.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/HomeAdapter.kt
new file mode 100644
index 0000000000..b5eb5885d7
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/HomeAdapter.kt
@@ -0,0 +1,46 @@
+package org.thoughtcrime.securesms.loki.redesign.activities
+
+import android.content.Context
+import android.database.Cursor
+import android.support.v7.widget.RecyclerView
+import android.view.ViewGroup
+import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter
+import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.model.ThreadRecord
+import org.thoughtcrime.securesms.loki.redesign.views.ConversationView
+import org.thoughtcrime.securesms.mms.GlideRequests
+
+class HomeAdapter(context: Context, cursor: Cursor) : CursorRecyclerViewAdapter<HomeAdapter.ViewHolder>(context, cursor) {
+    private val threadDatabase = DatabaseFactory.getThreadDatabase(context)
+    lateinit var glide: GlideRequests
+    var typingThreadIDs = setOf<Long>()
+        set(value) { field = value; notifyDataSetChanged() }
+    var conversationClickListener: ConversationClickListener? = null
+
+    class ViewHolder(val view: ConversationView) : RecyclerView.ViewHolder(view)
+
+    override fun onCreateItemViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val view = ConversationView(context)
+        view.setOnClickListener { conversationClickListener?.onConversationClick(view) }
+        view.setOnLongClickListener {
+            conversationClickListener?.onLongConversationClick(view)
+            true
+        }
+        return ViewHolder(view)
+    }
+
+    override fun onBindItemViewHolder(viewHolder: ViewHolder, cursor: Cursor) {
+        val thread = getThread(cursor)!!
+        val isTyping = typingThreadIDs.contains(thread.threadId)
+        viewHolder.view.bind(thread, isTyping, glide)
+    }
+
+    private fun getThread(cursor: Cursor): ThreadRecord? {
+        return threadDatabase.readerFor(cursor).current
+    }
+}
+
+interface ConversationClickListener {
+    fun onConversationClick(view: ConversationView)
+    fun onLongConversationClick(view: ConversationView)
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/HomeLoader.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/HomeLoader.kt
new file mode 100644
index 0000000000..07f5391392
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/HomeLoader.kt
@@ -0,0 +1,13 @@
+package org.thoughtcrime.securesms.loki.redesign.activities
+
+import android.content.Context
+import android.database.Cursor
+import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.util.AbstractCursorLoader
+
+class HomeLoader(context: Context) : AbstractCursorLoader(context) {
+
+    override fun getCursor(): Cursor {
+        return DatabaseFactory.getThreadDatabase(context).conversationList
+    }
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/JoinPublicChatActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/JoinPublicChatActivity.kt
new file mode 100644
index 0000000000..d2693add68
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/JoinPublicChatActivity.kt
@@ -0,0 +1,139 @@
+package org.thoughtcrime.securesms.loki.redesign.activities
+
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.os.Bundle
+import android.support.v4.app.Fragment
+import android.support.v4.app.FragmentPagerAdapter
+import android.util.Patterns
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.inputmethod.InputMethodManager
+import android.widget.Toast
+import kotlinx.android.synthetic.main.activity_join_public_chat.*
+import kotlinx.android.synthetic.main.fragment_enter_chat_url.*
+import network.loki.messenger.R
+import nl.komponents.kovenant.ui.failUi
+import nl.komponents.kovenant.ui.successUi
+import org.thoughtcrime.securesms.ApplicationContext
+import org.thoughtcrime.securesms.BaseActionBarActivity
+import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
+import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
+import org.thoughtcrime.securesms.loki.redesign.fragments.ScanQRCodeWrapperFragment
+import org.thoughtcrime.securesms.loki.redesign.fragments.ScanQRCodeWrapperFragmentDelegate
+import org.thoughtcrime.securesms.util.TextSecurePreferences
+
+class JoinPublicChatActivity : PassphraseRequiredActionBarActivity(), ScanQRCodeWrapperFragmentDelegate {
+    private val adapter = JoinPublicChatActivityAdapter(this)
+
+    // region Lifecycle
+    override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
+        super.onCreate(savedInstanceState, isReady)
+        // Set content view
+        setContentView(R.layout.activity_join_public_chat)
+        // Set title
+        supportActionBar!!.title = "Join Channel"
+        // Set up view pager
+        viewPager.adapter = adapter
+        tabLayout.setupWithViewPager(viewPager)
+    }
+    // endregion
+
+    // region Updating
+    private fun showLoader() {
+        loader.visibility = View.VISIBLE
+        loader.animate().setDuration(150).alpha(1.0f).start()
+    }
+
+    private fun hideLoader() {
+        loader.animate().setDuration(150).alpha(0.0f).setListener(object : AnimatorListenerAdapter() {
+
+            override fun onAnimationEnd(animation: Animator?) {
+                super.onAnimationEnd(animation)
+                loader.visibility = View.GONE
+            }
+        })
+    }
+    // endregion
+
+    // region Interaction
+    override fun handleQRCodeScanned(url: String) {
+        joinPublicChatIfPossible(url)
+    }
+
+    fun joinPublicChatIfPossible(url: String) {
+        if (!Patterns.WEB_URL.matcher(url).matches() || !url.startsWith("https://")) {
+            return Toast.makeText(this, "Invalid URL", Toast.LENGTH_SHORT).show()
+        }
+        showLoader()
+        val application = ApplicationContext.getInstance(this)
+        val channel: Long = 1
+        val displayName = TextSecurePreferences.getProfileName(this)
+        val lokiPublicChatAPI = application.lokiPublicChatAPI!!
+        application.lokiPublicChatManager.addChat(url, channel).successUi {
+            lokiPublicChatAPI.getMessages(channel, url)
+            lokiPublicChatAPI.setDisplayName(displayName, url)
+            val profileKey: ByteArray = ProfileKeyUtil.getProfileKey(this)
+            val profileUrl: String? = TextSecurePreferences.getProfileAvatarUrl(this)
+            lokiPublicChatAPI.setProfilePicture(url, profileKey, profileUrl)
+            finish()
+        }.failUi {
+            hideLoader()
+            Toast.makeText(this, "Couldn't Join Channel", Toast.LENGTH_SHORT).show()
+        }
+    }
+    // endregion
+}
+
+// region Adapter
+private class JoinPublicChatActivityAdapter(val activity: JoinPublicChatActivity) : FragmentPagerAdapter(activity.supportFragmentManager) {
+
+    override fun getCount(): Int {
+        return 2
+    }
+
+    override fun getItem(index: Int): Fragment {
+        return when (index) {
+            0 -> EnterChatURLFragment()
+            1 -> {
+                val result = ScanQRCodeWrapperFragment()
+                result.delegate = activity
+                result.message = "Scan the QR code of the channel you'd like to join"
+                result
+            }
+            else -> throw IllegalStateException()
+        }
+    }
+
+    override fun getPageTitle(index: Int): CharSequence? {
+        return when (index) {
+            0 -> "Enter Channel URL"
+            1 -> "Scan QR Code"
+            else -> throw IllegalStateException()
+        }
+    }
+}
+// endregion
+
+// region Enter Chat URL Fragment
+class EnterChatURLFragment : Fragment() {
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        return inflater.inflate(R.layout.fragment_enter_chat_url, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        chatURLEditText.imeOptions = chatURLEditText.imeOptions or 16777216 // Always use incognito keyboard
+        joinPublicChatButton.setOnClickListener { joinPublicChatIfPossible() }
+    }
+
+    private fun joinPublicChatIfPossible() {
+        val inputMethodManager = context!!.getSystemService(BaseActionBarActivity.INPUT_METHOD_SERVICE) as InputMethodManager
+        inputMethodManager.hideSoftInputFromWindow(chatURLEditText.windowToken, 0)
+        val chatURL = chatURLEditText.text.trim().toString().toLowerCase().replace("http://", "https://")
+        (activity!! as JoinPublicChatActivity).joinPublicChatIfPossible(chatURL)
+    }
+}
+// endregion
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/LandingActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/LandingActivity.kt
new file mode 100644
index 0000000000..2daa93d81d
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/LandingActivity.kt
@@ -0,0 +1,132 @@
+package org.thoughtcrime.securesms.loki.redesign.activities
+
+import android.content.Intent
+import android.os.AsyncTask
+import android.os.Bundle
+import android.widget.Toast
+import kotlinx.android.synthetic.main.activity_landing.*
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.ApplicationContext
+import org.thoughtcrime.securesms.BaseActionBarActivity
+import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
+import org.thoughtcrime.securesms.database.Address
+import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.IdentityDatabase
+import org.thoughtcrime.securesms.logging.Log
+import org.thoughtcrime.securesms.loki.redesign.dialogs.LinkDeviceSlaveModeDialog
+import org.thoughtcrime.securesms.loki.redesign.dialogs.LinkDeviceSlaveModeDialogDelegate
+import org.thoughtcrime.securesms.loki.redesign.utilities.push
+import org.thoughtcrime.securesms.loki.redesign.utilities.setUpActionBarSessionLogo
+import org.thoughtcrime.securesms.loki.redesign.utilities.show
+import org.thoughtcrime.securesms.loki.sendPairingAuthorisationMessage
+import org.thoughtcrime.securesms.util.Base64
+import org.thoughtcrime.securesms.util.Hex
+import org.thoughtcrime.securesms.util.TextSecurePreferences
+import org.whispersystems.curve25519.Curve25519
+import org.whispersystems.libsignal.ecc.Curve
+import org.whispersystems.libsignal.ecc.ECKeyPair
+import org.whispersystems.libsignal.util.KeyHelper
+import org.whispersystems.signalservice.loki.api.PairingAuthorisation
+import org.whispersystems.signalservice.loki.utilities.hexEncodedPublicKey
+import org.whispersystems.signalservice.loki.utilities.retryIfNeeded
+
+class LandingActivity : BaseActionBarActivity(), LinkDeviceSlaveModeDialogDelegate {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_landing)
+        setUpActionBarSessionLogo()
+        fakeChatView.startAnimating()
+        registerButton.setOnClickListener { register() }
+        restoreButton.setOnClickListener { restore() }
+        linkButton.setOnClickListener { linkDevice() }
+        if (TextSecurePreferences.databaseResetFromUnpair(this)) {
+            Toast.makeText(this, "Your device was unlinked successfully", Toast.LENGTH_LONG).show()
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, intent)
+        if (resultCode != RESULT_OK) { return }
+        val hexEncodedPublicKey = data!!.getStringExtra("hexEncodedPublicKey")
+        requestDeviceLink(hexEncodedPublicKey)
+    }
+
+    private fun register() {
+        val intent = Intent(this, RegisterActivity::class.java)
+        push(intent)
+    }
+
+    private fun restore() {
+        val intent = Intent(this, RestoreActivity::class.java)
+        push(intent)
+    }
+
+    private fun linkDevice() {
+        val intent = Intent(this, LinkDeviceActivity::class.java)
+        show(intent, true)
+    }
+
+    private fun requestDeviceLink(hexEncodedPublicKey: String) {
+        var seed: ByteArray? = null
+        var keyPair: ECKeyPair? = null
+        fun generateKeyPair() {
+            val seedCandidate = Curve25519.getInstance(Curve25519.BEST).generateSeed(16)
+            try {
+                keyPair = Curve.generateKeyPair(seedCandidate + seedCandidate) // Validate the seed
+            } catch (exception: Exception) {
+                return generateKeyPair()
+            }
+            seed = seedCandidate
+        }
+        generateKeyPair()
+        IdentityKeyUtil.save(this, IdentityKeyUtil.lokiSeedKey, Hex.toStringCondensed(seed))
+        IdentityKeyUtil.save(this, IdentityKeyUtil.IDENTITY_PUBLIC_KEY_PREF, Base64.encodeBytes(keyPair!!.publicKey.serialize()))
+        IdentityKeyUtil.save(this, IdentityKeyUtil.IDENTITY_PRIVATE_KEY_PREF, Base64.encodeBytes(keyPair!!.privateKey.serialize()))
+        val userHexEncodedPublicKey = keyPair!!.hexEncodedPublicKey
+        val registrationID = KeyHelper.generateRegistrationId(false)
+        TextSecurePreferences.setLocalRegistrationId(this, registrationID)
+        DatabaseFactory.getIdentityDatabase(this).saveIdentity(Address.fromSerialized(userHexEncodedPublicKey),
+                IdentityKeyUtil.getIdentityKeyPair(this).publicKey, IdentityDatabase.VerifiedStatus.VERIFIED,
+                true, System.currentTimeMillis(), true)
+        TextSecurePreferences.setLocalNumber(this, userHexEncodedPublicKey)
+        TextSecurePreferences.setHasSeenWelcomeScreen(this, true)
+        TextSecurePreferences.setPromptedPushRegistration(this, true)
+        val authorisation = PairingAuthorisation(hexEncodedPublicKey, userHexEncodedPublicKey).sign(PairingAuthorisation.Type.REQUEST, keyPair!!.privateKey.serialize())
+        if (authorisation == null) {
+            Log.d("Loki", "Failed to sign device link request.")
+            reset()
+            return Toast.makeText(application, "Couldn't link device.", Toast.LENGTH_SHORT).show()
+        }
+        val application = ApplicationContext.getInstance(this)
+        application.startLongPollingIfNeeded()
+        application.setUpP2PAPI()
+        application.setUpStorageAPIIfNeeded()
+        val linkDeviceDialog = LinkDeviceSlaveModeDialog()
+        linkDeviceDialog.delegate = this
+        linkDeviceDialog.show(supportFragmentManager, "Link Device Dialog")
+        AsyncTask.execute {
+            retryIfNeeded(8) {
+                sendPairingAuthorisationMessage(this@LandingActivity, authorisation.primaryDevicePublicKey, authorisation)
+            }
+        }
+    }
+
+    override fun onDeviceLinkRequestAuthorized(authorization: PairingAuthorisation) {
+        TextSecurePreferences.setMasterHexEncodedPublicKey(this, authorization.primaryDevicePublicKey)
+        val intent = Intent(this, HomeActivity::class.java)
+        show(intent)
+        finish()
+    }
+
+    override fun onDeviceLinkCanceled() {
+        reset()
+    }
+
+    private fun reset() {
+        IdentityKeyUtil.delete(this, IdentityKeyUtil.lokiSeedKey)
+        TextSecurePreferences.removeLocalNumber(this)
+        TextSecurePreferences.setHasSeenWelcomeScreen(this, false)
+        TextSecurePreferences.setPromptedPushRegistration(this, false)
+    }
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/LinkDeviceActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/LinkDeviceActivity.kt
new file mode 100644
index 0000000000..9c707948de
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/LinkDeviceActivity.kt
@@ -0,0 +1,104 @@
+package org.thoughtcrime.securesms.loki.redesign.activities
+
+import android.content.Intent
+import android.os.Bundle
+import android.support.v4.app.Fragment
+import android.support.v4.app.FragmentPagerAdapter
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.inputmethod.InputMethodManager
+import android.widget.Toast
+import kotlinx.android.synthetic.main.activity_link_device.*
+import kotlinx.android.synthetic.main.fragment_enter_session_id.*
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.BaseActionBarActivity
+import org.thoughtcrime.securesms.loki.redesign.fragments.ScanQRCodeWrapperFragment
+import org.thoughtcrime.securesms.loki.redesign.fragments.ScanQRCodeWrapperFragmentDelegate
+import org.whispersystems.signalservice.loki.utilities.PublicKeyValidation
+
+class LinkDeviceActivity : BaseActionBarActivity(), ScanQRCodeWrapperFragmentDelegate {
+    private val adapter = LinkDeviceActivityAdapter(this)
+
+    // region Lifecycle
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        // Set content view
+        setContentView(R.layout.activity_link_device)
+        // Set title
+        supportActionBar!!.title = "Link Device"
+        // Set up view pager
+        viewPager.adapter = adapter
+        tabLayout.setupWithViewPager(viewPager)
+    }
+    // endregion
+
+    // region Interaction
+    override fun handleQRCodeScanned(hexEncodedPublicKey: String) {
+        requestDeviceLinkIfPossible(hexEncodedPublicKey)
+    }
+
+    fun requestDeviceLinkIfPossible(hexEncodedPublicKey: String) {
+        if (!PublicKeyValidation.isValid(hexEncodedPublicKey)) {
+            Toast.makeText(this, "Invalid Session ID", Toast.LENGTH_SHORT).show()
+        } else {
+            val intent = Intent()
+            intent.putExtra("hexEncodedPublicKey", hexEncodedPublicKey)
+            setResult(RESULT_OK, intent)
+            finish()
+        }
+    }
+    // endregion
+}
+
+// region Adapter
+private class LinkDeviceActivityAdapter(val activity: LinkDeviceActivity) : FragmentPagerAdapter(activity.supportFragmentManager) {
+
+    override fun getCount(): Int {
+        return 2
+    }
+
+    override fun getItem(index: Int): Fragment {
+        return when (index) {
+            0 -> EnterSessionIDFragment()
+            1 -> {
+                val result = ScanQRCodeWrapperFragment()
+                result.delegate = activity
+                result.message = "Link to your existing account by going into your in-app settings and clicking \"Linked Devices\""
+                result
+            }
+            else -> throw IllegalStateException()
+        }
+    }
+
+    override fun getPageTitle(index: Int): CharSequence? {
+        return when (index) {
+            0 -> "Enter Session ID"
+            1 -> "Scan QR Code"
+            else -> throw IllegalStateException()
+        }
+    }
+}
+// endregion
+
+// region Enter Session ID Fragment
+class EnterSessionIDFragment : Fragment() {
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        return inflater.inflate(R.layout.fragment_enter_session_id, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        sessionIDEditText.imeOptions = sessionIDEditText.imeOptions or 16777216 // Always use incognito keyboard
+        requestDeviceLinkButton.setOnClickListener { requestDeviceLinkIfPossible() }
+    }
+
+    private fun requestDeviceLinkIfPossible() {
+        val inputMethodManager = context!!.getSystemService(BaseActionBarActivity.INPUT_METHOD_SERVICE) as InputMethodManager
+        inputMethodManager.hideSoftInputFromWindow(sessionIDEditText.windowToken, 0)
+        val hexEncodedPublicKey = sessionIDEditText.text.trim().toString().toLowerCase()
+        (activity!! as LinkDeviceActivity).requestDeviceLinkIfPossible(hexEncodedPublicKey)
+    }
+}
+// endregion
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/LinkedDevicesActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/LinkedDevicesActivity.kt
new file mode 100644
index 0000000000..7b7c56aea2
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/LinkedDevicesActivity.kt
@@ -0,0 +1,63 @@
+package org.thoughtcrime.securesms.loki.redesign.activities
+
+import android.os.AsyncTask
+import android.os.Bundle
+import android.support.v7.widget.LinearLayoutManager
+import android.view.Menu
+import android.view.MenuItem
+import kotlinx.android.synthetic.main.activity_linked_devices.*
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
+import org.thoughtcrime.securesms.loki.redesign.dialogs.LinkDeviceMasterModeDialog
+import org.thoughtcrime.securesms.loki.redesign.dialogs.LinkDeviceMasterModeDialogDelegate
+import org.thoughtcrime.securesms.loki.signAndSendPairingAuthorisationMessage
+import org.thoughtcrime.securesms.util.Util
+import org.whispersystems.signalservice.loki.api.PairingAuthorisation
+
+class LinkedDevicesActivity : PassphraseRequiredActionBarActivity, LinkDeviceMasterModeDialogDelegate {
+
+    constructor() : super()
+
+    override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
+        super.onCreate(savedInstanceState, isReady)
+        setContentView(R.layout.activity_linked_devices)
+        supportActionBar!!.title = "Linked Devices"
+//        val homeAdapter = LinkedDevicesAdapter(this, cursor)
+//        recyclerView.adapter = homeAdapter
+        recyclerView.layoutManager = LinearLayoutManager(this)
+        linkDeviceButton.setOnClickListener { linkDevice() }
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        menuInflater.inflate(R.menu.menu_linked_devices, menu)
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        val id = item.itemId
+        when (id) {
+            R.id.linkDeviceButton -> linkDevice()
+            else -> { /* Do nothing */ }
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun linkDevice() {
+        val linkDeviceDialog = LinkDeviceMasterModeDialog()
+        linkDeviceDialog.delegate = this
+        linkDeviceDialog.show(supportFragmentManager, "Link Device Dialog")
+    }
+
+    override fun onDeviceLinkRequestAuthorized(authorization: PairingAuthorisation) {
+        AsyncTask.execute {
+            signAndSendPairingAuthorisationMessage(this, authorization)
+            Util.runOnMain {
+
+            }
+        }
+    }
+
+    override fun onDeviceLinkCanceled() {
+        // Do nothing
+    }
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/NotificationSettingsActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/NotificationSettingsActivity.kt
new file mode 100644
index 0000000000..63f42b8a82
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/NotificationSettingsActivity.kt
@@ -0,0 +1,19 @@
+package org.thoughtcrime.securesms.loki.redesign.activities
+
+import android.os.Bundle
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
+import org.thoughtcrime.securesms.preferences.NotificationsPreferenceFragment
+
+class NotificationSettingsActivity : PassphraseRequiredActionBarActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
+        super.onCreate(savedInstanceState, isReady)
+        setContentView(R.layout.activity_fragment_wrapper)
+        supportActionBar!!.title = "Notifications"
+        val fragment = NotificationsPreferenceFragment()
+        val transaction = supportFragmentManager.beginTransaction()
+        transaction.replace(R.id.fragmentContainer, fragment)
+        transaction.commit()
+    }
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/PrivacySettingsActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/PrivacySettingsActivity.kt
new file mode 100644
index 0000000000..82a9d79dff
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/PrivacySettingsActivity.kt
@@ -0,0 +1,19 @@
+package org.thoughtcrime.securesms.loki.redesign.activities
+
+import android.os.Bundle
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
+import org.thoughtcrime.securesms.preferences.AppProtectionPreferenceFragment
+
+class PrivacySettingsActivity : PassphraseRequiredActionBarActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
+        super.onCreate(savedInstanceState, isReady)
+        setContentView(R.layout.activity_fragment_wrapper)
+        supportActionBar!!.title = "Privacy"
+        val fragment = AppProtectionPreferenceFragment()
+        val transaction = supportFragmentManager.beginTransaction()
+        transaction.replace(R.id.fragmentContainer, fragment)
+        transaction.commit()
+    }
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/QRCodeActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/QRCodeActivity.kt
new file mode 100644
index 0000000000..a0e4312263
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/QRCodeActivity.kt
@@ -0,0 +1,163 @@
+package org.thoughtcrime.securesms.loki.redesign.activities
+
+import android.Manifest
+import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.Typeface
+import android.os.Bundle
+import android.os.Environment
+import android.support.v4.app.Fragment
+import android.support.v4.app.FragmentPagerAdapter
+import android.text.Spannable
+import android.text.SpannableStringBuilder
+import android.text.style.StyleSpan
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import com.tbruyelle.rxpermissions2.RxPermissions
+import kotlinx.android.synthetic.main.activity_qr_code.*
+import kotlinx.android.synthetic.main.fragment_view_my_qr_code.*
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
+import org.thoughtcrime.securesms.conversation.ConversationActivity
+import org.thoughtcrime.securesms.database.Address
+import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.ThreadDatabase
+import org.thoughtcrime.securesms.loki.redesign.fragments.ScanQRCodeWrapperFragment
+import org.thoughtcrime.securesms.loki.redesign.fragments.ScanQRCodeWrapperFragmentDelegate
+import org.thoughtcrime.securesms.loki.redesign.utilities.QRCodeUtilities
+import org.thoughtcrime.securesms.loki.toPx
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.util.FileProviderUtil
+import org.thoughtcrime.securesms.util.TextSecurePreferences
+import org.whispersystems.signalservice.loki.utilities.PublicKeyValidation
+import java.io.File
+import java.io.FileOutputStream
+
+class QRCodeActivity : PassphraseRequiredActionBarActivity(), ScanQRCodeWrapperFragmentDelegate {
+    private val adapter = QRCodeActivityAdapter(this)
+
+    // region Lifecycle
+    override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
+        super.onCreate(savedInstanceState, isReady)
+        // Set content view
+        setContentView(R.layout.activity_qr_code)
+        // Set title
+        supportActionBar!!.title = "QR Code"
+        // Set up view pager
+        viewPager.adapter = adapter
+        tabLayout.setupWithViewPager(viewPager)
+    }
+    // endregion
+
+    // region Interaction
+    override fun handleQRCodeScanned(hexEncodedPublicKey: String) {
+        createPrivateChatIfPossible(hexEncodedPublicKey)
+    }
+
+    fun createPrivateChatIfPossible(hexEncodedPublicKey: String) {
+        if (!PublicKeyValidation.isValid(hexEncodedPublicKey)) { return Toast.makeText(this, "Invalid Session ID", Toast.LENGTH_SHORT).show() }
+        val masterHexEncodedPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(this)
+        val userHexEncodedPublicKey = TextSecurePreferences.getLocalNumber(this)
+        val targetHexEncodedPublicKey = if (hexEncodedPublicKey == masterHexEncodedPublicKey) userHexEncodedPublicKey else hexEncodedPublicKey
+        val recipient = Recipient.from(this, Address.fromSerialized(targetHexEncodedPublicKey), true)
+        val intent = Intent(this, ConversationActivity::class.java)
+        intent.putExtra(ConversationActivity.ADDRESS_EXTRA, recipient.address)
+        intent.putExtra(ConversationActivity.TEXT_EXTRA, getIntent().getStringExtra(ConversationActivity.TEXT_EXTRA))
+        intent.setDataAndType(getIntent().data, getIntent().type)
+        val existingThread = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipient)
+        intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, existingThread)
+        intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, ThreadDatabase.DistributionTypes.DEFAULT)
+        startActivity(intent)
+        finish()
+    }
+    // endregion
+}
+
+// region Adapter
+private class QRCodeActivityAdapter(val activity: QRCodeActivity) : FragmentPagerAdapter(activity.supportFragmentManager) {
+
+    override fun getCount(): Int {
+        return 2
+    }
+
+    override fun getItem(index: Int): Fragment {
+        return when (index) {
+            0 -> ViewMyQRCodeFragment()
+            1 -> {
+                val result = ScanQRCodeWrapperFragment()
+                result.delegate = activity
+                result.message = "Scan someone\'s QR code to start a conversation with them"
+                result
+            }
+            else -> throw IllegalStateException()
+        }
+    }
+
+    override fun getPageTitle(index: Int): CharSequence? {
+        return when (index) {
+            0 -> "View My QR Code"
+            1 -> "Scan QR Code"
+            else -> throw IllegalStateException()
+        }
+    }
+}
+// endregion
+
+// region View My QR Code Fragment
+class ViewMyQRCodeFragment : Fragment() {
+
+    private val hexEncodedPublicKey: String
+        get() {
+            val masterHexEncodedPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(context!!)
+            val userHexEncodedPublicKey = TextSecurePreferences.getLocalNumber(context!!)
+            return masterHexEncodedPublicKey ?: userHexEncodedPublicKey
+        }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        return inflater.inflate(R.layout.fragment_view_my_qr_code, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        val size = toPx(280, resources)
+        val qrCode = QRCodeUtilities.encode(hexEncodedPublicKey, size)
+        qrCodeImageView.setImageBitmap(qrCode)
+        val explanation = SpannableStringBuilder("This is your unique public QR code. Other users can scan this to start a conversation with you.")
+        explanation.setSpan(StyleSpan(Typeface.BOLD), 8, 34, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+        explanationTextView.text = explanation
+        shareButton.setOnClickListener { shareQRCode() }
+    }
+
+    private fun shareQRCode() {
+        fun proceed() {
+            val directory = File(Environment.getExternalStorageDirectory(), Environment.DIRECTORY_PICTURES)
+            val fileName = "$hexEncodedPublicKey.png"
+            val file = File(directory, fileName)
+            file.createNewFile()
+            val fos = FileOutputStream(file)
+            val size = toPx(280, resources)
+            val qrCode = QRCodeUtilities.encode(hexEncodedPublicKey, size, false)
+            qrCode.compress(Bitmap.CompressFormat.PNG, 100, fos)
+            fos.flush()
+            fos.close()
+            val intent = Intent(Intent.ACTION_SEND)
+            intent.putExtra(Intent.EXTRA_STREAM, FileProviderUtil.getUriFor(activity!!, file))
+            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            intent.type = "image/png"
+            startActivity(Intent.createChooser(intent, "Share QR Code"))
+        }
+        if (RxPermissions(this).isGranted(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
+            proceed()
+        } else {
+            @SuppressWarnings("unused")
+            val unused = RxPermissions(this).request(Manifest.permission.WRITE_EXTERNAL_STORAGE).subscribe { isGranted ->
+                if (isGranted) {
+                    proceed()
+                }
+            }
+        }
+    }
+}
+// endregion
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/RegisterActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/RegisterActivity.kt
new file mode 100644
index 0000000000..ef7b7d2591
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/RegisterActivity.kt
@@ -0,0 +1,152 @@
+package org.thoughtcrime.securesms.loki.redesign.activities
+
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.content.Intent
+import android.graphics.Typeface
+import android.net.Uri
+import android.os.Bundle
+import android.os.Handler
+import android.text.Spannable
+import android.text.SpannableStringBuilder
+import android.text.style.StyleSpan
+import android.widget.Toast
+import kotlinx.android.synthetic.main.activity_register.*
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.BaseActionBarActivity
+import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
+import org.thoughtcrime.securesms.database.Address
+import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.IdentityDatabase
+import org.thoughtcrime.securesms.loki.redesign.utilities.push
+import org.thoughtcrime.securesms.loki.redesign.utilities.setUpActionBarSessionLogo
+import org.thoughtcrime.securesms.util.Base64
+import org.thoughtcrime.securesms.util.Hex
+import org.thoughtcrime.securesms.util.TextSecurePreferences
+import org.whispersystems.curve25519.Curve25519
+import org.whispersystems.libsignal.ecc.Curve
+import org.whispersystems.libsignal.ecc.ECKeyPair
+import org.whispersystems.libsignal.util.KeyHelper
+import org.whispersystems.signalservice.loki.utilities.hexEncodedPublicKey
+import java.io.File
+import java.io.FileOutputStream
+
+class RegisterActivity : BaseActionBarActivity() {
+    private var seed: ByteArray? = null
+    private var keyPair: ECKeyPair? = null
+        set(value) { field = value; updatePublicKeyTextView() }
+
+    // region Lifecycle
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_register)
+        setUpLanguageFileDirectory()
+        setUpActionBarSessionLogo()
+        registerButton.setOnClickListener { register() }
+        copyButton.setOnClickListener { copyPublicKey() }
+        val termsExplanation = SpannableStringBuilder("By using this service, you agree to our Terms and Conditions and Privacy Statement")
+        termsExplanation.setSpan(StyleSpan(Typeface.BOLD), 40, 60, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+        termsExplanation.setSpan(StyleSpan(Typeface.BOLD), 65, 82, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+        termsButton.text = termsExplanation
+        termsButton.setOnClickListener { showTerms() }
+        updateKeyPair()
+    }
+    // endregion
+
+    // region General
+    private fun setUpLanguageFileDirectory() {
+        val languages = listOf( "english", "japanese", "portuguese", "spanish" )
+        val directory = File(applicationInfo.dataDir)
+        for (language in languages) {
+            val fileName = "$language.txt"
+            if (directory.list().contains(fileName)) { continue }
+            val inputStream = assets.open("mnemonic/$fileName")
+            val file = File(directory, fileName)
+            val outputStream = FileOutputStream(file)
+            val buffer = ByteArray(1024)
+            while (true) {
+                val count = inputStream.read(buffer)
+                if (count < 0) { break }
+                outputStream.write(buffer, 0, count)
+            }
+            inputStream.close()
+            outputStream.close()
+        }
+    }
+    // endregion
+
+    // region Updating
+    private fun updateKeyPair() {
+        val seedCandidate = Curve25519.getInstance(Curve25519.BEST).generateSeed(16)
+        try {
+            this.keyPair = Curve.generateKeyPair(seedCandidate + seedCandidate) // Validate the seed
+        } catch (exception: Exception) {
+            return updateKeyPair()
+        }
+        seed = seedCandidate
+    }
+
+    private fun updatePublicKeyTextView() {
+        val hexEncodedPublicKey = keyPair!!.hexEncodedPublicKey
+        val characterCount = hexEncodedPublicKey.count()
+        var count = 0
+        val limit = 32
+        fun animate() {
+            val numberOfIndexesToShuffle = 32 - count
+            val indexesToShuffle = (0 until characterCount).shuffled().subList(0, numberOfIndexesToShuffle)
+            var mangledHexEncodedPublicKey = hexEncodedPublicKey
+            for (index in indexesToShuffle) {
+                try {
+                    mangledHexEncodedPublicKey = mangledHexEncodedPublicKey.substring(0, index) + "0123456789abcdef__".random() + mangledHexEncodedPublicKey.substring(index + 1, mangledHexEncodedPublicKey.count())
+                } catch (exception: Exception) {
+                    // Do nothing
+                }
+            }
+            count += 1
+            if (count < limit) {
+                publicKeyTextView.text = mangledHexEncodedPublicKey
+                Handler().postDelayed({
+                    animate()
+                }, 32)
+            } else {
+                publicKeyTextView.text = hexEncodedPublicKey
+            }
+        }
+        animate()
+    }
+    // endregion
+
+    // region Interaction
+    private fun register() {
+        IdentityKeyUtil.save(this, IdentityKeyUtil.lokiSeedKey, Hex.toStringCondensed(seed))
+        IdentityKeyUtil.save(this, IdentityKeyUtil.IDENTITY_PUBLIC_KEY_PREF, Base64.encodeBytes(keyPair!!.publicKey.serialize()))
+        IdentityKeyUtil.save(this, IdentityKeyUtil.IDENTITY_PRIVATE_KEY_PREF, Base64.encodeBytes(keyPair!!.privateKey.serialize()))
+        val userHexEncodedPublicKey = keyPair!!.hexEncodedPublicKey
+        val registrationID = KeyHelper.generateRegistrationId(false)
+        TextSecurePreferences.setLocalRegistrationId(this, registrationID)
+        DatabaseFactory.getIdentityDatabase(this).saveIdentity(Address.fromSerialized(userHexEncodedPublicKey),
+            IdentityKeyUtil.getIdentityKeyPair(this).publicKey, IdentityDatabase.VerifiedStatus.VERIFIED,
+            true, System.currentTimeMillis(), true)
+        TextSecurePreferences.setLocalNumber(this, userHexEncodedPublicKey)
+        val intent = Intent(this, DisplayNameActivity::class.java)
+        push(intent)
+    }
+
+    private fun copyPublicKey() {
+        val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+        val clip = ClipData.newPlainText("Session ID", keyPair!!.hexEncodedPublicKey)
+        clipboard.primaryClip = clip
+        Toast.makeText(this, R.string.activity_register_public_key_copied_message, Toast.LENGTH_SHORT).show()
+    }
+
+    private fun showTerms() {
+        try {
+            val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/loki-project/loki-messenger-android/blob/master/privacy-policy.md"))
+            startActivity(intent)
+        } catch (e: Exception) {
+            Toast.makeText(this, "Couldn't open link", Toast.LENGTH_SHORT).show()
+        }
+    }
+    // endregion
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/RestoreActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/RestoreActivity.kt
new file mode 100644
index 0000000000..70bc4aee56
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/RestoreActivity.kt
@@ -0,0 +1,107 @@
+package org.thoughtcrime.securesms.loki.redesign.activities
+
+import android.content.Intent
+import android.graphics.Typeface
+import android.net.Uri
+import android.os.Bundle
+import android.text.Spannable
+import android.text.SpannableStringBuilder
+import android.text.style.StyleSpan
+import android.widget.Toast
+import kotlinx.android.synthetic.main.activity_restore.*
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.BaseActionBarActivity
+import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
+import org.thoughtcrime.securesms.database.Address
+import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.IdentityDatabase
+import org.thoughtcrime.securesms.loki.redesign.utilities.push
+import org.thoughtcrime.securesms.loki.redesign.utilities.setUpActionBarSessionLogo
+import org.thoughtcrime.securesms.util.Base64
+import org.thoughtcrime.securesms.util.Hex
+import org.thoughtcrime.securesms.util.TextSecurePreferences
+import org.whispersystems.libsignal.ecc.Curve
+import org.whispersystems.libsignal.util.KeyHelper
+import org.whispersystems.signalservice.loki.crypto.MnemonicCodec
+import org.whispersystems.signalservice.loki.utilities.hexEncodedPublicKey
+import java.io.File
+import java.io.FileOutputStream
+
+class RestoreActivity : BaseActionBarActivity() {
+    private lateinit var languageFileDirectory: File
+
+    // region Lifecycle
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setUpLanguageFileDirectory()
+        setUpActionBarSessionLogo()
+        setContentView(R.layout.activity_restore)
+        mnemonicEditText.imeOptions = mnemonicEditText.imeOptions or 16777216 // Always use incognito keyboard
+        restoreButton.setOnClickListener { restore() }
+        val termsExplanation = SpannableStringBuilder("By using this service, you agree to our Terms and Conditions and Privacy Statement")
+        termsExplanation.setSpan(StyleSpan(Typeface.BOLD), 40, 60, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+        termsExplanation.setSpan(StyleSpan(Typeface.BOLD), 65, 82, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+        termsButton.text = termsExplanation
+        termsButton.setOnClickListener { showTerms() }
+    }
+    // endregion
+
+    // region General
+    private fun setUpLanguageFileDirectory() {
+        val languages = listOf( "english", "japanese", "portuguese", "spanish" )
+        val directory = File(applicationInfo.dataDir)
+        for (language in languages) {
+            val fileName = "$language.txt"
+            if (directory.list().contains(fileName)) { continue }
+            val inputStream = assets.open("mnemonic/$fileName")
+            val file = File(directory, fileName)
+            val outputStream = FileOutputStream(file)
+            val buffer = ByteArray(1024)
+            while (true) {
+                val count = inputStream.read(buffer)
+                if (count < 0) { break }
+                outputStream.write(buffer, 0, count)
+            }
+            inputStream.close()
+            outputStream.close()
+        }
+        languageFileDirectory = directory
+    }
+    // endregion
+
+    // region Interaction
+    private fun restore() {
+        val mnemonic = mnemonicEditText.text.toString()
+        try {
+            val hexEncodedSeed = MnemonicCodec(languageFileDirectory).decode(mnemonic)
+            var seed = Hex.fromStringCondensed(hexEncodedSeed)
+            IdentityKeyUtil.save(this, IdentityKeyUtil.lokiSeedKey, Hex.toStringCondensed(seed))
+            if (seed.size == 16) { seed = seed + seed }
+            val keyPair = Curve.generateKeyPair(seed)
+            IdentityKeyUtil.save(this, IdentityKeyUtil.IDENTITY_PUBLIC_KEY_PREF, Base64.encodeBytes(keyPair.publicKey.serialize()))
+            IdentityKeyUtil.save(this, IdentityKeyUtil.IDENTITY_PRIVATE_KEY_PREF, Base64.encodeBytes(keyPair.privateKey.serialize()))
+            val userHexEncodedPublicKey = keyPair.hexEncodedPublicKey
+            val registrationID = KeyHelper.generateRegistrationId(false)
+            TextSecurePreferences.setLocalRegistrationId(this, registrationID)
+            DatabaseFactory.getIdentityDatabase(this).saveIdentity(Address.fromSerialized(userHexEncodedPublicKey),
+                    IdentityKeyUtil.getIdentityKeyPair(this).publicKey, IdentityDatabase.VerifiedStatus.VERIFIED,
+                    true, System.currentTimeMillis(), true)
+            TextSecurePreferences.setLocalNumber(this, userHexEncodedPublicKey)
+            val intent = Intent(this, DisplayNameActivity::class.java)
+            push(intent)
+        } catch (e: Exception) {
+            val message = if (e is MnemonicCodec.DecodingError) e.description else MnemonicCodec.DecodingError.Generic.description
+            return Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
+        }
+    }
+
+    private fun showTerms() {
+        try {
+            val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/loki-project/loki-messenger-android/blob/master/privacy-policy.md"))
+            startActivity(intent)
+        } catch (e: Exception) {
+            Toast.makeText(this, "Couldn't open link", Toast.LENGTH_SHORT).show()
+        }
+    }
+    // endregion
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/SeedActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/SeedActivity.kt
new file mode 100644
index 0000000000..b15ecfcd14
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/SeedActivity.kt
@@ -0,0 +1,85 @@
+package org.thoughtcrime.securesms.loki.redesign.activities
+
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.os.Bundle
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.style.ForegroundColorSpan
+import android.widget.LinearLayout
+import android.widget.Toast
+import kotlinx.android.synthetic.main.activity_seed_v2.*
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.BaseActionBarActivity
+import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
+import org.thoughtcrime.securesms.loki.getColorWithID
+import org.thoughtcrime.securesms.util.TextSecurePreferences
+import org.whispersystems.signalservice.loki.crypto.MnemonicCodec
+import org.whispersystems.signalservice.loki.utilities.hexEncodedPrivateKey
+import java.io.File
+
+class SeedActivity : BaseActionBarActivity() {
+
+    private val seed by lazy {
+        val languageFileDirectory = File(applicationInfo.dataDir)
+        var hexEncodedSeed = IdentityKeyUtil.retrieve(this, IdentityKeyUtil.lokiSeedKey)
+        if (hexEncodedSeed == null) {
+            hexEncodedSeed = IdentityKeyUtil.getIdentityKeyPair(this).hexEncodedPrivateKey // Legacy account
+        }
+        MnemonicCodec(languageFileDirectory).encode(hexEncodedSeed!!, MnemonicCodec.Language.Configuration.english)
+    }
+
+    // region Lifecycle
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_seed_v2)
+        supportActionBar!!.title = "Your Recovery Phrase"
+        val seedReminderViewTitle = SpannableString("You're almost finished! 90%")
+        seedReminderViewTitle.setSpan(ForegroundColorSpan(resources.getColorWithID(R.color.accent, theme)), 24, 27, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+        seedReminderView.title = seedReminderViewTitle
+        seedReminderView.subtitle = "Press the redacted words to view your recovery phrase and secure your account"
+        seedReminderView.setProgress(90, false)
+        seedReminderView.hideContinueButton()
+        var redactedSeed = seed
+        var index = 0
+        for (character in seed) {
+            if (character.isLetter()) {
+                redactedSeed = redactedSeed.replaceRange(index, index + 1, "▆")
+            }
+            index += 1
+        }
+        seedTextView.setTextColor(resources.getColorWithID(R.color.accent, theme))
+        seedTextView.text = redactedSeed
+        seedTextView.setOnLongClickListener { revealSeed(); true }
+        revealButton.setOnLongClickListener { revealSeed(); true }
+        copyButton.setOnClickListener { copySeed() }
+    }
+    // endregion
+
+    // region Updating
+    private fun revealSeed() {
+        val seedReminderViewTitle = SpannableString("Account secured! 100%")
+        seedReminderViewTitle.setSpan(ForegroundColorSpan(resources.getColorWithID(R.color.accent, theme)), 17, 21, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+        seedReminderView.title = seedReminderViewTitle
+        seedReminderView.subtitle = "Make sure to store your recovery phrase in a safe place"
+        seedReminderView.setProgress(100, true)
+        val seedTextViewLayoutParams = seedTextView.layoutParams as LinearLayout.LayoutParams
+        seedTextViewLayoutParams.height = seedTextView.height
+        seedTextView.layoutParams = seedTextViewLayoutParams
+        seedTextView.setTextColor(resources.getColorWithID(R.color.text, theme))
+        seedTextView.text = seed
+        TextSecurePreferences.setHasViewedSeed(this, true)
+    }
+    // endregion
+
+    // region Interaction
+    private fun copySeed() {
+        revealSeed()
+        val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+        val clip = ClipData.newPlainText("Seed", seed)
+        clipboard.primaryClip = clip
+        Toast.makeText(this, R.string.activity_register_public_key_copied_message, Toast.LENGTH_SHORT).show()
+    }
+    // endregion
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/SettingsActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/SettingsActivity.kt
new file mode 100644
index 0000000000..e26846e074
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/SettingsActivity.kt
@@ -0,0 +1,282 @@
+package org.thoughtcrime.securesms.loki.redesign.activities
+
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.app.Activity
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.AsyncTask
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.view.View
+import android.view.inputmethod.InputMethodManager
+import android.widget.LinearLayout
+import android.widget.Toast
+import kotlinx.android.synthetic.main.activity_settings.*
+import network.loki.messenger.R
+import nl.komponents.kovenant.Promise
+import nl.komponents.kovenant.all
+import nl.komponents.kovenant.deferred
+import nl.komponents.kovenant.ui.alwaysUi
+import org.thoughtcrime.securesms.ApplicationContext
+import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
+import org.thoughtcrime.securesms.avatar.AvatarSelection
+import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
+import org.thoughtcrime.securesms.database.Address
+import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.loki.redesign.dialogs.ClearAllDataDialog
+import org.thoughtcrime.securesms.loki.redesign.dialogs.SeedDialog
+import org.thoughtcrime.securesms.loki.redesign.utilities.push
+import org.thoughtcrime.securesms.loki.toPx
+import org.thoughtcrime.securesms.mms.GlideApp
+import org.thoughtcrime.securesms.mms.GlideRequests
+import org.thoughtcrime.securesms.profiles.AvatarHelper
+import org.thoughtcrime.securesms.profiles.ProfileMediaConstraints
+import org.thoughtcrime.securesms.util.BitmapDecodingException
+import org.thoughtcrime.securesms.util.BitmapUtil
+import org.thoughtcrime.securesms.util.TextSecurePreferences
+import org.whispersystems.signalservice.api.crypto.ProfileCipher
+import org.whispersystems.signalservice.api.util.StreamDetails
+import org.whispersystems.signalservice.loki.api.LokiStorageAPI
+import java.io.ByteArrayInputStream
+import java.io.File
+import java.security.SecureRandom
+
+class SettingsActivity : PassphraseRequiredActionBarActivity() {
+    private lateinit var glide: GlideRequests
+    private var isEditingDisplayName = false
+        set(value) { field = value; handleIsEditingDisplayNameChanged() }
+    private var displayNameToBeUploaded: String? = null
+    private var profilePictureToBeUploaded: ByteArray? = null
+    private var tempFile: File? = null
+
+    private val hexEncodedPublicKey: String
+        get() {
+            val masterHexEncodedPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(this)
+            val userHexEncodedPublicKey = TextSecurePreferences.getLocalNumber(this)
+            return masterHexEncodedPublicKey ?: userHexEncodedPublicKey
+        }
+
+    // region Lifecycle
+    override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
+        super.onCreate(savedInstanceState, isReady)
+        setContentView(R.layout.activity_settings)
+        setSupportActionBar(toolbar)
+        cancelButton.setOnClickListener { cancelEditingDisplayName() }
+        saveButton.setOnClickListener { saveDisplayName() }
+        showQRCodeButton.setOnClickListener { showQRCode() }
+        glide = GlideApp.with(this)
+        profilePictureView.glide = glide
+        profilePictureView.hexEncodedPublicKey = hexEncodedPublicKey
+        profilePictureView.isLarge = true
+        profilePictureView.update()
+        profilePictureView.setOnClickListener { showEditProfilePictureUI() }
+        displayNameContainer.setOnClickListener { showEditDisplayNameUI() }
+        displayNameTextView.text = DatabaseFactory.getLokiUserDatabase(this).getDisplayName(hexEncodedPublicKey)
+        publicKeyTextView.text = hexEncodedPublicKey
+        copyButton.setOnClickListener { copyPublicKey() }
+        shareButton.setOnClickListener { sharePublicKey() }
+        val isMasterDevice = (TextSecurePreferences.getMasterHexEncodedPublicKey(this) == null)
+        if (!isMasterDevice) {
+            linkedDevicesButtonTopSeparator.visibility = View.GONE
+            linkedDevicesButton.visibility = View.GONE
+            seedButtonTopSeparator.visibility = View.GONE
+            seedButton.visibility = View.GONE
+        }
+        privacyButton.setOnClickListener { showPrivacySettings() }
+        notificationsButton.setOnClickListener { showNotificationSettings() }
+        chatsButton.setOnClickListener { showChatSettings() }
+        linkedDevicesButton.setOnClickListener { showLinkedDevices() }
+        seedButton.setOnClickListener { showSeed() }
+        clearAllDataButton.setOnClickListener { clearAllData() }
+    }
+
+    public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        when (requestCode) {
+            AvatarSelection.REQUEST_CODE_AVATAR -> {
+                if (resultCode != Activity.RESULT_OK) { return }
+                val outputFile = Uri.fromFile(File(cacheDir, "cropped"))
+                var inputFile: Uri? = data?.data
+                if (inputFile == null && tempFile != null) {
+                    inputFile = Uri.fromFile(tempFile)
+                }
+                AvatarSelection.circularCropImage(this, inputFile, outputFile, R.string.CropImageActivity_profile_avatar)
+            }
+            AvatarSelection.REQUEST_CODE_CROP_IMAGE -> {
+                if (resultCode != Activity.RESULT_OK) { return }
+                AsyncTask.execute {
+                    try {
+                        profilePictureToBeUploaded = BitmapUtil.createScaledBytes(this@SettingsActivity, AvatarSelection.getResultUri(data), ProfileMediaConstraints()).bitmap
+                        Handler(Looper.getMainLooper()).post {
+                            updateProfile(true)
+                        }
+                    } catch (e: BitmapDecodingException) {
+                        e.printStackTrace()
+                    }
+                }
+            }
+        }
+    }
+    // endregion
+
+    // region Updating
+    private fun handleIsEditingDisplayNameChanged() {
+        cancelButton.visibility = if (isEditingDisplayName) View.VISIBLE else View.GONE
+        showQRCodeButton.visibility = if (isEditingDisplayName) View.GONE else View.VISIBLE
+        saveButton.visibility = if (isEditingDisplayName) View.VISIBLE else View.GONE
+        displayNameTextView.visibility = if (isEditingDisplayName) View.INVISIBLE else View.VISIBLE
+        displayNameEditText.visibility = if (isEditingDisplayName) View.VISIBLE else View.INVISIBLE
+        val titleTextViewLayoutParams = titleTextView.layoutParams as LinearLayout.LayoutParams
+        titleTextViewLayoutParams.leftMargin = if (isEditingDisplayName) toPx(16, resources) else 0
+        titleTextView.layoutParams = titleTextViewLayoutParams
+        val inputMethodManager = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+        if (isEditingDisplayName) {
+            displayNameEditText.requestFocus()
+            inputMethodManager.showSoftInput(displayNameEditText, 0)
+        } else {
+            inputMethodManager.hideSoftInputFromWindow(displayNameEditText.windowToken, 0)
+        }
+    }
+
+    private fun updateProfile(isUpdatingProfilePicture: Boolean) {
+        showLoader()
+        val promises = mutableListOf<Promise<*, Exception>>()
+        val displayName = displayNameToBeUploaded
+        if (displayName != null) {
+            val publicChatAPI = ApplicationContext.getInstance(this).lokiPublicChatAPI
+            if (publicChatAPI != null) {
+                val servers = DatabaseFactory.getLokiThreadDatabase(this).getAllPublicChatServers()
+                promises.addAll(servers.map { publicChatAPI.setDisplayName(displayName, it) })
+            }
+            TextSecurePreferences.setProfileName(this, displayName)
+        }
+        val profilePicture = profilePictureToBeUploaded
+        val encodedProfileKey = ProfileKeyUtil.generateEncodedProfileKey(this)
+        val profileKey = ProfileKeyUtil.getProfileKeyFromEncodedString(encodedProfileKey)
+        if (isUpdatingProfilePicture && profilePicture != null) {
+            val storageAPI = LokiStorageAPI.shared
+            val deferred = deferred<Unit, Exception>()
+            AsyncTask.execute {
+                val stream = StreamDetails(ByteArrayInputStream(profilePicture), "image/jpeg", profilePicture.size.toLong())
+                val (_, url) = storageAPI.uploadProfilePicture(storageAPI.server, profileKey, stream)
+                TextSecurePreferences.setProfileAvatarUrl(this, url)
+                deferred.resolve(Unit)
+            }
+            promises.add(deferred.promise)
+        }
+        all(promises).alwaysUi {
+            if (displayName != null) {
+                displayNameTextView.text = displayName
+            }
+            displayNameToBeUploaded = null
+            if (isUpdatingProfilePicture && profilePicture != null) {
+                AvatarHelper.setAvatar(this, Address.fromSerialized(TextSecurePreferences.getLocalNumber(this)), profilePicture)
+                TextSecurePreferences.setProfileAvatarId(this, SecureRandom().nextInt())
+                ProfileKeyUtil.setEncodedProfileKey(this, encodedProfileKey)
+                ApplicationContext.getInstance(this).updatePublicChatProfileAvatarIfNeeded()
+                profilePictureView.update()
+            }
+            profilePictureToBeUploaded = null
+            hideLoader()
+        }
+    }
+
+    private fun showLoader() {
+        loader.visibility = View.VISIBLE
+        loader.animate().setDuration(150).alpha(1.0f).start()
+    }
+
+    private fun hideLoader() {
+        loader.animate().setDuration(150).alpha(0.0f).setListener(object : AnimatorListenerAdapter() {
+
+            override fun onAnimationEnd(animation: Animator?) {
+                super.onAnimationEnd(animation)
+                loader.visibility = View.GONE
+            }
+        })
+    }
+    // endregion
+
+    // region Interaction
+    private fun cancelEditingDisplayName() {
+        isEditingDisplayName = false
+    }
+
+    private fun saveDisplayName() {
+        val displayName = displayNameEditText.text.toString().trim()
+        if (displayName.isEmpty()) {
+            return Toast.makeText(this, "Please pick a display name", Toast.LENGTH_SHORT).show()
+        }
+        if (!displayName.matches(Regex("[a-zA-Z0-9_]+"))) {
+            return Toast.makeText(this, "Please pick a display name that consists of only a-z, A-Z, 0-9 and _ characters", Toast.LENGTH_SHORT).show()
+        }
+        if (displayName.toByteArray().size > ProfileCipher.NAME_PADDED_LENGTH) {
+            return Toast.makeText(this, "Please pick a shorter display name", Toast.LENGTH_SHORT).show()
+        }
+        isEditingDisplayName = false
+        displayNameToBeUploaded = displayName
+        updateProfile(false)
+    }
+
+    private fun showQRCode() {
+        val intent = Intent(this, QRCodeActivity::class.java)
+        push(intent)
+    }
+
+    private fun showEditProfilePictureUI() {
+        tempFile = AvatarSelection.startAvatarSelection(this, false, true)
+    }
+
+    private fun showEditDisplayNameUI() {
+        isEditingDisplayName = true
+    }
+
+    private fun copyPublicKey() {
+        val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+        val clip = ClipData.newPlainText("Session ID", hexEncodedPublicKey)
+        clipboard.primaryClip = clip
+        Toast.makeText(this, R.string.activity_register_public_key_copied_message, Toast.LENGTH_SHORT).show()
+    }
+
+    private fun sharePublicKey() {
+        val intent = Intent()
+        intent.action = Intent.ACTION_SEND
+        intent.putExtra(Intent.EXTRA_TEXT, hexEncodedPublicKey)
+        intent.type = "text/plain"
+        startActivity(intent)
+    }
+
+    private fun showPrivacySettings() {
+        val intent = Intent(this, PrivacySettingsActivity::class.java)
+        push(intent)
+    }
+
+    private fun showNotificationSettings() {
+        val intent = Intent(this, NotificationSettingsActivity::class.java)
+        push(intent)
+    }
+
+    private fun showChatSettings() {
+        val intent = Intent(this, ChatSettingsActivity::class.java)
+        push(intent)
+    }
+
+    private fun showLinkedDevices() {
+        val intent = Intent(this, LinkedDevicesActivity::class.java)
+        push(intent)
+    }
+
+    private fun showSeed() {
+        SeedDialog().show(supportFragmentManager, "Recovery Phrase Dialog")
+    }
+
+    private fun clearAllData() {
+        ClearAllDataDialog().show(supportFragmentManager, "Clear All Data Dialog")
+    }
+    // endregion
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/dialogs/ClearAllDataDialog.kt b/src/org/thoughtcrime/securesms/loki/redesign/dialogs/ClearAllDataDialog.kt
new file mode 100644
index 0000000000..9932ac6095
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/dialogs/ClearAllDataDialog.kt
@@ -0,0 +1,30 @@
+package org.thoughtcrime.securesms.loki.redesign.dialogs
+
+import android.app.Dialog
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.os.Bundle
+import android.support.v4.app.DialogFragment
+import android.support.v7.app.AlertDialog
+import android.view.LayoutInflater
+import kotlinx.android.synthetic.main.dialog_clear_all_data.view.*
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.ApplicationContext
+
+class ClearAllDataDialog : DialogFragment() {
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val builder = AlertDialog.Builder(context!!)
+        val contentView = LayoutInflater.from(context!!).inflate(R.layout.dialog_clear_all_data, null)
+        contentView.cancelButton.setOnClickListener { dismiss() }
+        contentView.clearAllDataButton.setOnClickListener { clearAllData() }
+        builder.setView(contentView)
+        val result = builder.create()
+        result.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+        return result
+    }
+
+    private fun clearAllData() {
+        ApplicationContext.getInstance(context).clearData()
+    }
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/dialogs/LinkDeviceMasterModeDialog.kt b/src/org/thoughtcrime/securesms/loki/redesign/dialogs/LinkDeviceMasterModeDialog.kt
new file mode 100644
index 0000000000..e671de605f
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/dialogs/LinkDeviceMasterModeDialog.kt
@@ -0,0 +1,87 @@
+package org.thoughtcrime.securesms.loki.redesign.dialogs
+
+import android.app.Dialog
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.os.Bundle
+import android.support.v4.app.DialogFragment
+import android.support.v7.app.AlertDialog
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.LinearLayout
+import kotlinx.android.synthetic.main.dialog_link_device_master_mode.view.*
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.loki.MnemonicUtilities
+import org.thoughtcrime.securesms.loki.redesign.utilities.QRCodeUtilities
+import org.thoughtcrime.securesms.loki.toPx
+import org.thoughtcrime.securesms.util.TextSecurePreferences
+import org.thoughtcrime.securesms.util.Util
+import org.whispersystems.signalservice.loki.api.DeviceLinkingSession
+import org.whispersystems.signalservice.loki.api.DeviceLinkingSessionListener
+import org.whispersystems.signalservice.loki.api.PairingAuthorisation
+import org.whispersystems.signalservice.loki.crypto.MnemonicCodec
+
+class LinkDeviceMasterModeDialog : DialogFragment(), DeviceLinkingSessionListener {
+    private val languageFileDirectory by lazy { MnemonicUtilities.getLanguageFileDirectory(context!!) }
+    private lateinit var contentView: View
+    private var authorization: PairingAuthorisation? = null
+    var delegate: LinkDeviceMasterModeDialogDelegate? = null
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val builder = AlertDialog.Builder(context!!)
+        contentView = LayoutInflater.from(context!!).inflate(R.layout.dialog_link_device_master_mode, null)
+        val size = toPx(128, resources)
+        val hexEncodedPublicKey = TextSecurePreferences.getLocalNumber(context!!)
+        val qrCode = QRCodeUtilities.encode(hexEncodedPublicKey, size)
+        contentView.qrCodeImageView.setImageBitmap(qrCode)
+        contentView.cancelButton.setOnClickListener { onDeviceLinkCanceled() }
+        contentView.authorizeButton.setOnClickListener { authorizeDeviceLink() }
+        builder.setView(contentView)
+        DeviceLinkingSession.shared.startListeningForLinkingRequests() // FIXME: This flag is named poorly as it's actually also used for authorizations
+        DeviceLinkingSession.shared.addListener(this)
+        val result = builder.create()
+        result.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+        return result
+    }
+
+    override fun requestUserAuthorization(authorization: PairingAuthorisation) {
+        if (authorization.type != PairingAuthorisation.Type.REQUEST || authorization.primaryDevicePublicKey != TextSecurePreferences.getLocalNumber(context!!) || this.authorization != null) { return }
+        Util.runOnMain {
+            this.authorization = authorization
+            contentView.qrCodeImageView.visibility = View.GONE
+            val titleTextViewLayoutParams = contentView.titleTextView.layoutParams as LinearLayout.LayoutParams
+            titleTextViewLayoutParams.topMargin = toPx(8, resources)
+            contentView.titleTextView.layoutParams = titleTextViewLayoutParams
+            contentView.titleTextView.text = "Linking Request Received"
+            contentView.explanationTextView.text = "Please check that the words below match those shown on your other device"
+            contentView.mnemonicTextView.visibility = View.VISIBLE
+            contentView.mnemonicTextView.text = MnemonicUtilities.getFirst3Words(MnemonicCodec(languageFileDirectory), authorization.secondaryDevicePublicKey)
+            contentView.authorizeButton.visibility = View.VISIBLE
+        }
+    }
+
+    private fun authorizeDeviceLink() {
+        val authorization = this.authorization ?: return
+        delegate?.onDeviceLinkRequestAuthorized(authorization)
+        DeviceLinkingSession.shared.stopListeningForLinkingRequests()
+        DeviceLinkingSession.shared.removeListener(this)
+        dismiss()
+    }
+
+    private fun onDeviceLinkCanceled() {
+        DeviceLinkingSession.shared.stopListeningForLinkingRequests()
+        DeviceLinkingSession.shared.removeListener(this)
+        if (authorization != null) {
+            DatabaseFactory.getLokiPreKeyBundleDatabase(context).removePreKeyBundle(authorization!!.secondaryDevicePublicKey)
+        }
+        dismiss()
+        delegate?.onDeviceLinkCanceled()
+    }
+}
+
+interface LinkDeviceMasterModeDialogDelegate {
+
+    fun onDeviceLinkRequestAuthorized(authorization: PairingAuthorisation)
+    fun onDeviceLinkCanceled()
+}
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/dialogs/LinkDeviceSlaveModeDialog.kt b/src/org/thoughtcrime/securesms/loki/redesign/dialogs/LinkDeviceSlaveModeDialog.kt
new file mode 100644
index 0000000000..d899ba6fdc
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/dialogs/LinkDeviceSlaveModeDialog.kt
@@ -0,0 +1,76 @@
+package org.thoughtcrime.securesms.loki.redesign.dialogs
+
+import android.app.Dialog
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.os.Bundle
+import android.os.Handler
+import android.support.v4.app.DialogFragment
+import android.support.v7.app.AlertDialog
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.LinearLayout
+import kotlinx.android.synthetic.main.dialog_link_device_slave_mode.view.*
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.loki.MnemonicUtilities
+import org.thoughtcrime.securesms.util.TextSecurePreferences
+import org.thoughtcrime.securesms.util.Util
+import org.whispersystems.signalservice.loki.api.DeviceLinkingSession
+import org.whispersystems.signalservice.loki.api.DeviceLinkingSessionListener
+import org.whispersystems.signalservice.loki.api.PairingAuthorisation
+import org.whispersystems.signalservice.loki.crypto.MnemonicCodec
+
+class LinkDeviceSlaveModeDialog : DialogFragment(), DeviceLinkingSessionListener {
+    private val languageFileDirectory by lazy { MnemonicUtilities.getLanguageFileDirectory(context!!) }
+    private lateinit var contentView: View
+    private var authorization: PairingAuthorisation? = null
+    var delegate: LinkDeviceSlaveModeDialogDelegate? = null
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val builder = AlertDialog.Builder(context!!)
+        contentView = LayoutInflater.from(context!!).inflate(R.layout.dialog_link_device_slave_mode, null)
+        val hexEncodedPublicKey = TextSecurePreferences.getLocalNumber(context)
+        contentView.mnemonicTextView.text = MnemonicUtilities.getFirst3Words(MnemonicCodec(languageFileDirectory), hexEncodedPublicKey)
+        contentView.cancelButton.setOnClickListener { onDeviceLinkCanceled() }
+        builder.setView(contentView)
+        DeviceLinkingSession.shared.startListeningForLinkingRequests()
+        DeviceLinkingSession.shared.addListener(this)
+        val result = builder.create()
+        result.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+        return result
+    }
+
+    override fun onDeviceLinkRequestAuthorized(authorization: PairingAuthorisation) {
+        if (authorization.type != PairingAuthorisation.Type.GRANT || authorization.secondaryDevicePublicKey != TextSecurePreferences.getLocalNumber(context!!) || this.authorization != null) { return }
+        Util.runOnMain {
+            this.authorization = authorization
+            DeviceLinkingSession.shared.stopListeningForLinkingRequests()
+            DeviceLinkingSession.shared.removeListener(this)
+            contentView.spinner.visibility = View.GONE
+            val titleTextViewLayoutParams = contentView.titleTextView.layoutParams as LinearLayout.LayoutParams
+            titleTextViewLayoutParams.topMargin = 0
+            contentView.titleTextView.layoutParams = titleTextViewLayoutParams
+            contentView.titleTextView.text = "Device Link Authorized"
+            contentView.explanationTextView.text = "Your device has been linked successfully"
+            contentView.mnemonicTextView.visibility = View.GONE
+            contentView.cancelButton.visibility = View.GONE
+            Handler().postDelayed({
+                dismiss()
+                delegate?.onDeviceLinkRequestAuthorized(authorization)
+            }, 4000)
+        }
+    }
+
+    private fun onDeviceLinkCanceled() {
+        DeviceLinkingSession.shared.stopListeningForLinkingRequests()
+        DeviceLinkingSession.shared.removeListener(this)
+        dismiss()
+        delegate?.onDeviceLinkCanceled()
+    }
+}
+
+interface LinkDeviceSlaveModeDialogDelegate {
+
+    fun onDeviceLinkRequestAuthorized(authorization: PairingAuthorisation)
+    fun onDeviceLinkCanceled()
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/dialogs/SeedDialog.kt b/src/org/thoughtcrime/securesms/loki/redesign/dialogs/SeedDialog.kt
new file mode 100644
index 0000000000..6813b69ad8
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/dialogs/SeedDialog.kt
@@ -0,0 +1,51 @@
+package org.thoughtcrime.securesms.loki.redesign.dialogs
+
+import android.app.Dialog
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.os.Bundle
+import android.support.v4.app.DialogFragment
+import android.support.v7.app.AlertDialog
+import android.view.LayoutInflater
+import android.widget.Toast
+import kotlinx.android.synthetic.main.dialog_seed.view.*
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
+import org.whispersystems.signalservice.loki.crypto.MnemonicCodec
+import org.whispersystems.signalservice.loki.utilities.hexEncodedPrivateKey
+import java.io.File
+
+class SeedDialog : DialogFragment() {
+
+    private val seed by lazy {
+        val languageFileDirectory = File(context!!.applicationInfo.dataDir)
+        var hexEncodedSeed = IdentityKeyUtil.retrieve(context!!, IdentityKeyUtil.lokiSeedKey)
+        if (hexEncodedSeed == null) {
+            hexEncodedSeed = IdentityKeyUtil.getIdentityKeyPair(context!!).hexEncodedPrivateKey // Legacy account
+        }
+        MnemonicCodec(languageFileDirectory).encode(hexEncodedSeed!!, MnemonicCodec.Language.Configuration.english)
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val builder = AlertDialog.Builder(context!!)
+        val contentView = LayoutInflater.from(context!!).inflate(R.layout.dialog_seed, null)
+        contentView.seedTextView.text = seed
+        contentView.cancelButton.setOnClickListener { dismiss() }
+        contentView.copyButton.setOnClickListener { copySeed() }
+        builder.setView(contentView)
+        val result = builder.create()
+        result.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+        return result
+    }
+
+    private fun copySeed() {
+        val clipboard = activity!!.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+        val clip = ClipData.newPlainText("Seed", seed)
+        clipboard.primaryClip = clip
+        Toast.makeText(context!!, R.string.activity_register_public_key_copied_message, Toast.LENGTH_SHORT).show()
+        dismiss()
+    }
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/fragments/ScanQRCodeFragmentV2.kt b/src/org/thoughtcrime/securesms/loki/redesign/fragments/ScanQRCodeFragmentV2.kt
new file mode 100644
index 0000000000..069c37c464
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/fragments/ScanQRCodeFragmentV2.kt
@@ -0,0 +1,62 @@
+package org.thoughtcrime.securesms.loki.redesign.fragments
+
+import android.content.res.Configuration
+import android.os.Bundle
+import android.support.v4.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import kotlinx.android.synthetic.main.fragment_scan_qr_code_v2.*
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.qr.ScanListener
+import org.thoughtcrime.securesms.qr.ScanningThread
+
+class ScanQRCodeFragmentV2 : Fragment() {
+    private val scanningThread = ScanningThread()
+    var scanListener: ScanListener? = null
+        set(value) { field = value; scanningThread.setScanListener(scanListener) }
+    var message: CharSequence = ""
+
+    override fun onCreateView(layoutInflater: LayoutInflater, viewGroup: ViewGroup?, bundle: Bundle?): View? {
+        return layoutInflater.inflate(R.layout.fragment_scan_qr_code_v2, viewGroup, false)
+    }
+
+    override fun onViewCreated(view: View, bundle: Bundle?) {
+        super.onViewCreated(view, bundle)
+        when (resources.configuration.orientation) {
+            Configuration.ORIENTATION_LANDSCAPE -> overlayView.orientation = LinearLayout.HORIZONTAL
+            else -> overlayView.orientation = LinearLayout.VERTICAL
+        }
+        messageTextView.text = message
+    }
+
+    override fun onResume() {
+        super.onResume()
+        cameraView.onResume()
+        cameraView.setPreviewCallback(scanningThread)
+        try {
+            scanningThread.start()
+        } catch (exception: Exception) {
+            // Do nothing
+        }
+        scanningThread.setScanListener(scanListener)
+    }
+
+    override fun onConfigurationChanged(newConfiguration: Configuration) {
+        super.onConfigurationChanged(newConfiguration)
+        this.cameraView.onPause()
+        when (newConfiguration.orientation) {
+            Configuration.ORIENTATION_LANDSCAPE -> overlayView.orientation = LinearLayout.HORIZONTAL
+            else -> overlayView.orientation = LinearLayout.VERTICAL
+        }
+        cameraView.onResume()
+        cameraView.setPreviewCallback(scanningThread)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        this.cameraView.onPause()
+        this.scanningThread.stopScanning()
+    }
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/fragments/ScanQRCodePlaceholderFragment.kt b/src/org/thoughtcrime/securesms/loki/redesign/fragments/ScanQRCodePlaceholderFragment.kt
new file mode 100644
index 0000000000..076e7ca9a6
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/fragments/ScanQRCodePlaceholderFragment.kt
@@ -0,0 +1,27 @@
+package org.thoughtcrime.securesms.loki.redesign.fragments
+
+import android.os.Bundle
+import android.support.v4.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import kotlinx.android.synthetic.main.fragment_scan_qr_code_placeholder.*
+import network.loki.messenger.R
+
+class ScanQRCodePlaceholderFragment: Fragment() {
+    var delegate: ScanQRCodePlaceholderFragmentDelegate? = null
+
+    override fun onCreateView(layoutInflater: LayoutInflater, viewGroup: ViewGroup?, bundle: Bundle?): View? {
+        return layoutInflater.inflate(R.layout.fragment_scan_qr_code_placeholder, viewGroup, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        grantCameraAccessButton.setOnClickListener { delegate?.requestCameraAccess() }
+    }
+}
+
+interface ScanQRCodePlaceholderFragmentDelegate {
+
+    fun requestCameraAccess()
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/fragments/ScanQRCodeWrapperFragment.kt b/src/org/thoughtcrime/securesms/loki/redesign/fragments/ScanQRCodeWrapperFragment.kt
new file mode 100644
index 0000000000..e3bc7b4ca6
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/fragments/ScanQRCodeWrapperFragment.kt
@@ -0,0 +1,62 @@
+package org.thoughtcrime.securesms.loki.redesign.fragments
+
+import android.Manifest
+import android.content.pm.PackageManager
+import android.os.Bundle
+import android.support.v4.app.Fragment
+import android.support.v4.content.ContextCompat
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.tbruyelle.rxpermissions2.RxPermissions
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.qr.ScanListener
+
+class ScanQRCodeWrapperFragment : Fragment(), ScanQRCodePlaceholderFragmentDelegate, ScanListener {
+    var delegate: ScanQRCodeWrapperFragmentDelegate? = null
+    var message: CharSequence = ""
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_scan_qr_code_wrapper, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        update()
+    }
+
+    private fun update() {
+        val fragment: Fragment
+        if (ContextCompat.checkSelfPermission(activity!!, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) {
+            val scanQRCodeFragment = ScanQRCodeFragmentV2()
+            scanQRCodeFragment.scanListener = this
+            scanQRCodeFragment.message = message
+            fragment = scanQRCodeFragment
+        } else {
+            val scanQRCodePlaceholderFragment = ScanQRCodePlaceholderFragment()
+            scanQRCodePlaceholderFragment.delegate = this
+            fragment = scanQRCodePlaceholderFragment
+        }
+        val transaction = childFragmentManager.beginTransaction()
+        transaction.replace(R.id.fragmentContainer, fragment)
+        transaction.commit()
+    }
+
+    override fun requestCameraAccess() {
+        @SuppressWarnings("unused")
+        val unused = RxPermissions(this).request(Manifest.permission.CAMERA).subscribe { isGranted ->
+            if (isGranted) {
+                update()
+            }
+        }
+    }
+
+    override fun onQrDataFound(string: String) {
+        delegate?.handleQRCodeScanned(string)
+    }
+}
+
+interface ScanQRCodeWrapperFragmentDelegate {
+
+    fun handleQRCodeScanned(string: String)
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/utilities/ActivityUtilities.kt b/src/org/thoughtcrime/securesms/loki/redesign/utilities/ActivityUtilities.kt
new file mode 100644
index 0000000000..329022a07e
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/utilities/ActivityUtilities.kt
@@ -0,0 +1,40 @@
+package org.thoughtcrime.securesms.loki.redesign.utilities
+
+import android.content.Intent
+import android.support.v7.app.ActionBar
+import android.support.v7.app.AppCompatActivity
+import android.view.Gravity
+import android.widget.ImageView
+import android.widget.RelativeLayout
+import network.loki.messenger.R
+
+fun AppCompatActivity.setUpActionBarSessionLogo() {
+    supportActionBar!!.setDisplayShowHomeEnabled(false)
+    supportActionBar!!.setDisplayShowTitleEnabled(false)
+    val logoImageView = ImageView(this)
+    logoImageView.setImageResource(R.drawable.session_logo)
+    val logoImageViewContainer = RelativeLayout(this)
+    logoImageViewContainer.addView(logoImageView)
+    logoImageViewContainer.gravity = Gravity.CENTER
+    val logoImageViewContainerLayoutParams = ActionBar.LayoutParams(ActionBar.LayoutParams.MATCH_PARENT, ActionBar.LayoutParams.WRAP_CONTENT)
+    supportActionBar!!.setCustomView(logoImageViewContainer, logoImageViewContainerLayoutParams)
+    supportActionBar!!.setDisplayShowCustomEnabled(true)
+}
+
+fun AppCompatActivity.push(intent: Intent, isForResult: Boolean = false) {
+    if (isForResult) {
+        startActivityForResult(intent, 42)
+    } else {
+        startActivity(intent)
+    }
+    overridePendingTransition(R.anim.slide_from_right, R.anim.fade_scale_out)
+}
+
+fun AppCompatActivity.show(intent: Intent, isForResult: Boolean = false) {
+    if (isForResult) {
+        startActivityForResult(intent, 42)
+    } else {
+        startActivity(intent)
+    }
+    overridePendingTransition(R.anim.slide_from_bottom, R.anim.fade_scale_out)
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/utilities/Broadcaster.kt b/src/org/thoughtcrime/securesms/loki/redesign/utilities/Broadcaster.kt
new file mode 100644
index 0000000000..cf2074b657
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/utilities/Broadcaster.kt
@@ -0,0 +1,14 @@
+package org.thoughtcrime.securesms.loki.redesign.utilities
+
+import android.content.Context
+import android.content.Intent
+import android.support.v4.content.LocalBroadcastManager
+
+class Broadcaster(private val context: Context) : org.whispersystems.signalservice.loki.utilities.Broadcaster {
+
+    override fun broadcast(event: String, long: Long) {
+        val intent = Intent(event)
+        intent.putExtra("long", long)
+        LocalBroadcastManager.getInstance(context).sendBroadcast(intent)
+    }
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/MentionUtilities.kt b/src/org/thoughtcrime/securesms/loki/redesign/utilities/MentionUtilities.kt
similarity index 58%
rename from src/org/thoughtcrime/securesms/loki/MentionUtilities.kt
rename to src/org/thoughtcrime/securesms/loki/redesign/utilities/MentionUtilities.kt
index 82ded332cb..4a29eef131 100644
--- a/src/org/thoughtcrime/securesms/loki/MentionUtilities.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/utilities/MentionUtilities.kt
@@ -1,12 +1,16 @@
-package org.thoughtcrime.securesms.loki
+package org.thoughtcrime.securesms.loki.redesign.utilities
 
 import android.content.Context
+import android.graphics.Typeface
 import android.text.Spannable
 import android.text.SpannableString
-import android.text.style.BackgroundColorSpan
+import android.text.style.ForegroundColorSpan
+import android.text.style.StyleSpan
 import android.util.Range
 import network.loki.messenger.R
+import nl.komponents.kovenant.combine.Tuple2
 import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.loki.getColorWithID
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import java.util.regex.Pattern
 
@@ -14,7 +18,7 @@ object MentionUtilities {
 
     @JvmStatic
     fun highlightMentions(text: CharSequence, threadID: Long, context: Context): String {
-        return MentionUtilities.highlightMentions(text, false, threadID, context).toString() // isOutgoingMessage is irrelevant
+        return highlightMentions(text, false, threadID, context).toString() // isOutgoingMessage is irrelevant
     }
 
     @JvmStatic
@@ -22,13 +26,14 @@ object MentionUtilities {
         var text = text
         val pattern = Pattern.compile("@[0-9a-fA-F]*")
         var matcher = pattern.matcher(text)
-        val mentions = mutableListOf<Range<Int>>()
+        val mentions = mutableListOf<Tuple2<Range<Int>, String>>()
         var startIndex = 0
         val publicChat = DatabaseFactory.getLokiThreadDatabase(context).getPublicChat(threadID)
+        val userHexEncodedPublicKey = TextSecurePreferences.getLocalNumber(context)
         if (matcher.find(startIndex)) {
             while (true) {
                 val hexEncodedPublicKey = text.subSequence(matcher.start() + 1, matcher.end()).toString() // +1 to get rid of the @
-                val userDisplayName: String? = if (hexEncodedPublicKey.toLowerCase() == TextSecurePreferences.getLocalNumber(context).toLowerCase()) {
+                val userDisplayName: String? = if (hexEncodedPublicKey.toLowerCase() == userHexEncodedPublicKey.toLowerCase()) {
                     TextSecurePreferences.getProfileName(context)
                 } else if (publicChat != null) {
                     DatabaseFactory.getLokiUserDatabase(context).getServerDisplayName(publicChat.id, hexEncodedPublicKey)
@@ -39,7 +44,7 @@ object MentionUtilities {
                     text = text.subSequence(0, matcher.start()).toString() + "@" + userDisplayName + text.subSequence(matcher.end(), text.length)
                     val endIndex = matcher.start() + 1 + userDisplayName.length
                     startIndex = endIndex
-                    mentions.add(Range.create(matcher.start(), endIndex))
+                    mentions.add(Tuple2(Range.create(matcher.start(), endIndex), hexEncodedPublicKey))
                 } else {
                     startIndex = matcher.end()
                 }
@@ -48,9 +53,12 @@ object MentionUtilities {
             }
         }
         val result = SpannableString(text)
-        for (range in mentions) {
-            val highlightColor = if (isOutgoingMessage) context.resources.getColor(R.color.loki_dark_green) else context.resources.getColor(R.color.loki_green)
-            result.setSpan(BackgroundColorSpan(highlightColor), range.lower, range.upper, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+        val userLinkedDeviceHexEncodedPublicKeys = DatabaseFactory.getLokiAPIDatabase(context).getPairingAuthorisations(userHexEncodedPublicKey).flatMap { listOf( it.primaryDevicePublicKey, it.secondaryDevicePublicKey ) }.toMutableSet()
+        userLinkedDeviceHexEncodedPublicKeys.add(userHexEncodedPublicKey)
+        for (mention in mentions) {
+            if (!userLinkedDeviceHexEncodedPublicKeys.contains(mention.second)) { continue }
+            result.setSpan(ForegroundColorSpan(context.resources.getColorWithID(R.color.accent, 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/redesign/utilities/QRCodeUtilities.kt b/src/org/thoughtcrime/securesms/loki/redesign/utilities/QRCodeUtilities.kt
new file mode 100644
index 0000000000..38af6eff34
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/utilities/QRCodeUtilities.kt
@@ -0,0 +1,31 @@
+package org.thoughtcrime.securesms.loki.redesign.utilities
+
+import android.graphics.Bitmap
+import android.graphics.Color
+import com.google.zxing.BarcodeFormat
+import com.google.zxing.EncodeHintType
+import com.google.zxing.WriterException
+import com.google.zxing.qrcode.QRCodeWriter
+
+object QRCodeUtilities {
+
+    fun encode(data: String, size: Int, hasTransparentBackground: Boolean = true): Bitmap {
+        try {
+            val hints = hashMapOf( EncodeHintType.MARGIN to 1 )
+            val result = QRCodeWriter().encode(data, BarcodeFormat.QR_CODE, size, size, hints)
+            val bitmap = Bitmap.createBitmap(result.width, result.height, Bitmap.Config.ARGB_8888)
+            for (y in 0 until result.height) {
+                for (x in 0 until result.width) {
+                    if (result.get(x, y)) {
+                        bitmap.setPixel(x, y, Color.WHITE)
+                    } else if (!hasTransparentBackground) {
+                        bitmap.setPixel(x, y, Color.BLACK)
+                    }
+                }
+            }
+            return bitmap
+        } catch (e: WriterException) {
+            return Bitmap.createBitmap(512, 512, Bitmap.Config.ARGB_8888)
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/views/ConversationView.kt b/src/org/thoughtcrime/securesms/loki/redesign/views/ConversationView.kt
new file mode 100644
index 0000000000..da3eec713a
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/views/ConversationView.kt
@@ -0,0 +1,89 @@
+package org.thoughtcrime.securesms.loki.redesign.views
+
+import android.content.Context
+import android.graphics.Typeface
+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.model.ThreadRecord
+import org.thoughtcrime.securesms.loki.LokiAPIUtilities.populateUserHexEncodedPublicKeyCacheIfNeeded
+import org.thoughtcrime.securesms.loki.redesign.utilities.MentionUtilities.highlightMentions
+import org.thoughtcrime.securesms.mms.GlideRequests
+import org.thoughtcrime.securesms.util.DateUtils
+import org.whispersystems.signalservice.loki.api.LokiAPI
+import java.util.*
+
+class ConversationView : LinearLayout {
+    var thread: ThreadRecord? = null
+
+    // region Lifecycle
+    constructor(context: Context) : super(context) {
+        setUpViewHierarchy()
+    }
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+        setUpViewHierarchy()
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+        setUpViewHierarchy()
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
+        setUpViewHierarchy()
+    }
+
+    private fun setUpViewHierarchy() {
+        val inflater = context.applicationContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
+        val contentView = inflater.inflate(R.layout.view_conversation, null)
+        addView(contentView)
+    }
+    // endregion
+
+    // region Updating
+    fun bind(thread: ThreadRecord, isTyping: Boolean, glide: GlideRequests) {
+        this.thread = thread
+        populateUserHexEncodedPublicKeyCacheIfNeeded(thread.threadId, context) // FIXME: This is a terrible place to do this
+        unreadMessagesIndicatorView.visibility = if (thread.unreadCount > 0) View.VISIBLE else View.INVISIBLE
+        if (thread.recipient.isGroupRecipient) {
+            val users = LokiAPI.userHexEncodedPublicKeyCache[thread.threadId]?.toList() ?: listOf()
+            val randomUsers = users.sorted() // Sort to provide a level of stability
+            profilePictureView.hexEncodedPublicKey = randomUsers.getOrNull(0) ?: ""
+            profilePictureView.additionalHexEncodedPublicKey = randomUsers.getOrNull(1) ?: ""
+            profilePictureView.isRSSFeed = thread.recipient.name == "Loki News" || thread.recipient.name == "Loki Messenger Updates"
+        } else {
+            profilePictureView.hexEncodedPublicKey = thread.recipient.address.toString()
+            profilePictureView.additionalHexEncodedPublicKey = null
+            profilePictureView.isRSSFeed = false
+        }
+        profilePictureView.glide = glide
+        profilePictureView.update()
+        val senderDisplayName = if (thread.recipient.isLocalNumber) context.getString(R.string.note_to_self) else thread.recipient.name
+        displayNameTextView.text = senderDisplayName
+        timestampTextView.text = DateUtils.getBriefRelativeTimeSpanString(context, Locale.getDefault(), thread.date)
+        muteIndicatorImageView.visibility = if (thread.recipient.isMuted) VISIBLE else GONE
+        val rawSnippet = thread.getDisplayBody(context)
+        val snippet = highlightMentions(rawSnippet, thread.threadId, context)
+        snippetTextView.text = snippet
+        snippetTextView.typeface = if (thread.unreadCount > 0) Typeface.DEFAULT_BOLD else Typeface.DEFAULT
+        snippetTextView.visibility = if (isTyping) View.GONE else View.VISIBLE
+        if (isTyping) {
+            typingIndicatorView.startAnimation()
+        } else {
+            typingIndicatorView.stopAnimation()
+        }
+        typingIndicatorView.visibility = if (isTyping) View.VISIBLE else View.GONE
+        statusIndicatorImageView.visibility = View.VISIBLE
+        when {
+            !thread.isOutgoing || thread.isVerificationStatusChange -> statusIndicatorImageView.visibility = View.GONE
+            thread.isFailed -> statusIndicatorImageView.setImageResource(R.drawable.ic_error)
+            thread.isPending -> statusIndicatorImageView.setImageResource(R.drawable.ic_circle_dot_dot_dot)
+            thread.isRemoteRead -> statusIndicatorImageView.setImageResource(R.drawable.ic_filled_circle_check)
+            else -> statusIndicatorImageView.setImageResource(R.drawable.ic_circle_check)
+        }
+    }
+    // endregion
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/views/FakeChatView.kt b/src/org/thoughtcrime/securesms/loki/redesign/views/FakeChatView.kt
new file mode 100644
index 0000000000..9a12b49314
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/views/FakeChatView.kt
@@ -0,0 +1,73 @@
+package org.thoughtcrime.securesms.loki.redesign.views
+
+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.ScrollView
+import kotlinx.android.synthetic.main.view_fake_chat.view.*
+import network.loki.messenger.R
+
+class FakeChatView : ScrollView {
+
+    // region Settings
+    private val spacing = context.resources.getDimension(R.dimen.medium_spacing)
+    private val startDelay: Long = 2000
+    private val delayBetweenMessages: Long = 3000
+    private val animationDuration: Long = 400
+    // endregion
+
+    // region Lifecycle
+    constructor(context: Context) : super(context) {
+        setUpViewHierarchy()
+    }
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+        setUpViewHierarchy()
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+        setUpViewHierarchy()
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
+        setUpViewHierarchy()
+    }
+
+    private fun setUpViewHierarchy() {
+        val inflater = context.applicationContext.getSystemService(LAYOUT_INFLATER_SERVICE) as LayoutInflater
+        val contentView = inflater.inflate(R.layout.view_fake_chat, null)
+        addView(contentView)
+        isVerticalScrollBarEnabled = false
+    }
+    // endregion
+
+    // 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()
+        }
+        Handler().postDelayed({
+            show(bubble1)
+            Handler().postDelayed({
+                show(bubble2)
+                Handler().postDelayed({
+                    show(bubble3)
+                    smoothScrollTo(0, (bubble1.height + spacing).toInt())
+                    Handler().postDelayed({
+                        show(bubble4)
+                        smoothScrollTo(0, (bubble1.height + spacing).toInt() + (bubble2.height + spacing).toInt())
+                        Handler().postDelayed({
+                            show(bubble5)
+                            smoothScrollTo(0, (bubble1.height + spacing).toInt() + (bubble2.height + spacing).toInt() + (bubble3.height + spacing).toInt())
+                        }, delayBetweenMessages)
+                    }, delayBetweenMessages)
+                }, delayBetweenMessages)
+            }, delayBetweenMessages)
+        }, startDelay)
+    }
+    // endregion
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/FriendRequestView.kt b/src/org/thoughtcrime/securesms/loki/redesign/views/FriendRequestView.kt
similarity index 77%
rename from src/org/thoughtcrime/securesms/loki/FriendRequestView.kt
rename to src/org/thoughtcrime/securesms/loki/redesign/views/FriendRequestView.kt
index 13c41eda49..589b6d2866 100644
--- a/src/org/thoughtcrime/securesms/loki/FriendRequestView.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/views/FriendRequestView.kt
@@ -1,17 +1,21 @@
-package org.thoughtcrime.securesms.loki
+package org.thoughtcrime.securesms.loki.redesign.views
 
 import android.content.Context
 import android.os.Build
 import android.util.AttributeSet
+import android.util.TypedValue
 import android.view.Gravity
 import android.view.View
 import android.widget.Button
 import android.widget.LinearLayout
 import android.widget.ProgressBar
 import android.widget.TextView
+import com.github.ybq.android.spinkit.style.DoubleBounce
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.model.MessageRecord
+import org.thoughtcrime.securesms.loki.getColorWithID
+import org.thoughtcrime.securesms.loki.toPx
 import org.whispersystems.signalservice.loki.messaging.LokiMessageFriendRequestStatus
 
 class FriendRequestView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : LinearLayout(context, attrs, defStyleAttr) {
@@ -28,14 +32,16 @@ class FriendRequestView(context: Context, attrs: AttributeSet?, defStyleAttr: In
 
     private val label by lazy {
         val result = TextView(context)
-        result.setTextColor(resources.getColorWithID(R.color.white, context.theme))
+        result.setTextColor(resources.getColorWithID(R.color.text, context.theme))
         result.textAlignment = TextView.TEXT_ALIGNMENT_CENTER
+        result.setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(R.dimen.small_font_size))
         result
     }
 
     private val buttonLinearLayout by lazy {
         val result = LinearLayout(context)
         result.orientation = HORIZONTAL
+        result.setPadding(0, resources.getDimension(R.dimen.medium_spacing).toInt(), 0, 0)
         result
     }
 
@@ -64,39 +70,45 @@ class FriendRequestView(context: Context, attrs: AttributeSet?, defStyleAttr: In
         if (isUISetUp) { return }
         isUISetUp = true
         orientation = VERTICAL
+        setPadding(toPx(48, resources), 0, toPx(48, resources), 0)
         addView(topSpacer)
         addView(label)
         if (!message!!.isOutgoing) {
             val loader = ProgressBar(context)
             loader.isIndeterminate = true
-            val color = resources.getColorWithID(R.color.white, context.theme)
-            loader.indeterminateDrawable.setColorFilter(color, android.graphics.PorterDuff.Mode.SRC_IN)
+            loader.indeterminateDrawable = DoubleBounce()
             val loaderLayoutParams = LayoutParams(LayoutParams.MATCH_PARENT, toPx(24, resources))
             loader.layoutParams = loaderLayoutParams
             loaderContainer.addView(loader)
             addView(loaderContainer)
             fun button(): Button {
                 val result = Button(context)
-                result.setBackgroundColor(resources.getColorWithID(R.color.transparent, context.theme))
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                     result.elevation = 0f
                     result.stateListAnimator = null
                 }
-                val buttonLayoutParams = LayoutParams(0, toPx(50, resources))
+                result.setTextColor(resources.getColorWithID(R.color.text, context.theme))
+                result.setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(R.dimen.small_font_size))
+                result.isAllCaps = false
+                result.setPadding(0, 0, 0, 0)
+                val buttonLayoutParams = LayoutParams(0, resources.getDimension(R.dimen.small_button_height).toInt())
                 buttonLayoutParams.weight = 1f
                 result.layoutParams = buttonLayoutParams
                 return result
             }
-            val acceptButton = button()
-            acceptButton.text = resources.getString(R.string.view_friend_request_accept_button_title)
-            acceptButton.setTextColor(resources.getColorWithID(R.color.signal_primary, context.theme))
-            acceptButton.setOnClickListener { accept() }
-            buttonLinearLayout.addView(acceptButton)
             val rejectButton = button()
             rejectButton.text = resources.getString(R.string.view_friend_request_reject_button_title)
-            rejectButton.setTextColor(resources.getColorWithID(R.color.red, context.theme))
+            rejectButton.setBackgroundResource(R.drawable.unimportant_dialog_button_background)
             rejectButton.setOnClickListener { reject() }
             buttonLinearLayout.addView(rejectButton)
+            val acceptButton = button()
+            acceptButton.text = resources.getString(R.string.view_friend_request_accept_button_title)
+            acceptButton.setBackgroundResource(R.drawable.prominent_dialog_button_background)
+            val acceptButtonLayoutParams = acceptButton.layoutParams as LayoutParams
+            acceptButtonLayoutParams.setMargins(resources.getDimension(R.dimen.medium_spacing).toInt(), 0, 0, 0)
+            acceptButton.layoutParams = acceptButtonLayoutParams
+            acceptButton.setOnClickListener { accept() }
+            buttonLinearLayout.addView(acceptButton)
             buttonLinearLayout.layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, toPx(50, resources))
             addView(buttonLinearLayout)
         }
@@ -155,4 +167,19 @@ class FriendRequestView(context: Context, attrs: AttributeSet?, defStyleAttr: In
         delegate?.rejectFriendRequest(message!!)
     }
     // endregion
-}
\ No newline at end of file
+}
+
+// region Delegate
+interface FriendRequestViewDelegate {
+    /**
+     * Implementations of this method should update the thread's friend request status
+     * and send a friend request accepted message.
+     */
+    fun acceptFriendRequest(friendRequest: MessageRecord)
+    /**
+     * Implementations of this method should update the thread's friend request status
+     * and remove the pre keys associated with the contact.
+     */
+    fun rejectFriendRequest(friendRequest: MessageRecord)
+}
+// endregion
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/MentionCandidateSelectionView.kt b/src/org/thoughtcrime/securesms/loki/redesign/views/MentionCandidateSelectionView.kt
similarity index 83%
rename from src/org/thoughtcrime/securesms/loki/MentionCandidateSelectionView.kt
rename to src/org/thoughtcrime/securesms/loki/redesign/views/MentionCandidateSelectionView.kt
index fd01cb778e..4810ff6a5b 100644
--- a/src/org/thoughtcrime/securesms/loki/MentionCandidateSelectionView.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/views/MentionCandidateSelectionView.kt
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.loki
+package org.thoughtcrime.securesms.loki.redesign.views
 
 import android.content.Context
 import android.util.AttributeSet
@@ -8,11 +8,15 @@ import android.view.ViewGroup
 import android.widget.BaseAdapter
 import android.widget.ListView
 import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.loki.toPx
+import org.thoughtcrime.securesms.mms.GlideRequests
 import org.whispersystems.signalservice.loki.messaging.Mention
 
 class MentionCandidateSelectionView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : ListView(context, attrs, defStyleAttr) {
     private var mentionCandidates = listOf<Mention>()
         set(newValue) { field = newValue; mentionCandidateSelectionViewAdapter.mentionCandidates = newValue }
+    var glide: GlideRequests? = null
+        set(newValue) { field = newValue; mentionCandidateSelectionViewAdapter.glide = newValue }
     var publicChatServer: String? = null
         set(newValue) { field = newValue; mentionCandidateSelectionViewAdapter.publicChatServer = publicChatServer }
     var publicChatChannel: Long? = null
@@ -24,6 +28,7 @@ class MentionCandidateSelectionView(context: Context, attrs: AttributeSet?, defS
     private class Adapter(private val context: Context) : BaseAdapter() {
         var mentionCandidates = listOf<Mention>()
             set(newValue) { field = newValue; notifyDataSetChanged() }
+        var glide: GlideRequests? = null
         var publicChatServer: String? = null
         var publicChatChannel: Long? = null
 
@@ -40,8 +45,9 @@ class MentionCandidateSelectionView(context: Context, attrs: AttributeSet?, defS
         }
 
         override fun getView(position: Int, cellToBeReused: View?, parent: ViewGroup): View {
-            val cell = cellToBeReused as MentionCandidateSelectionViewCell? ?: MentionCandidateSelectionViewCell.inflate(LayoutInflater.from(context), parent)
+            val cell = cellToBeReused as MentionCandidateView? ?: MentionCandidateView.inflate(LayoutInflater.from(context), parent)
             val mentionCandidate = getItem(position)
+            cell.glide = glide
             cell.mentionCandidate = mentionCandidate
             cell.publicChatServer = publicChatServer
             cell.publicChatChannel = publicChatChannel
@@ -53,6 +59,7 @@ class MentionCandidateSelectionView(context: Context, attrs: AttributeSet?, defS
     constructor(context: Context) : this(context, null)
 
     init {
+        clipToOutline = true
         adapter = mentionCandidateSelectionViewAdapter
         mentionCandidateSelectionViewAdapter.mentionCandidates = mentionCandidates
         setOnItemClickListener { _, _, position, _ ->
@@ -68,7 +75,7 @@ class MentionCandidateSelectionView(context: Context, attrs: AttributeSet?, defS
         }
         this.mentionCandidates = mentionCandidates
         val layoutParams = this.layoutParams as ViewGroup.LayoutParams
-        layoutParams.height = toPx(6 + Math.min(mentionCandidates.count(), 4) * 52, resources)
+        layoutParams.height = toPx(Math.min(mentionCandidates.count(), 4) * 44, resources)
         this.layoutParams = layoutParams
     }
 
diff --git a/src/org/thoughtcrime/securesms/loki/MentionCandidateSelectionViewCell.kt b/src/org/thoughtcrime/securesms/loki/redesign/views/MentionCandidateView.kt
similarity index 56%
rename from src/org/thoughtcrime/securesms/loki/MentionCandidateSelectionViewCell.kt
rename to src/org/thoughtcrime/securesms/loki/redesign/views/MentionCandidateView.kt
index c8bfcc1f81..831590d61c 100644
--- a/src/org/thoughtcrime/securesms/loki/MentionCandidateSelectionViewCell.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/views/MentionCandidateView.kt
@@ -1,21 +1,21 @@
-package org.thoughtcrime.securesms.loki
+package org.thoughtcrime.securesms.loki.redesign.views
 
 import android.content.Context
-import android.graphics.Outline
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.ViewOutlineProvider
 import android.widget.LinearLayout
-import kotlinx.android.synthetic.main.cell_mention_candidate_selection_view.view.*
+import kotlinx.android.synthetic.main.view_mention_candidate.view.*
 import network.loki.messenger.R
+import org.thoughtcrime.securesms.mms.GlideRequests
 import org.whispersystems.signalservice.loki.api.LokiPublicChatAPI
 import org.whispersystems.signalservice.loki.messaging.Mention
 
-class MentionCandidateSelectionViewCell(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : LinearLayout(context, attrs, defStyleAttr) {
+class MentionCandidateView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : LinearLayout(context, attrs, defStyleAttr) {
     var mentionCandidate = Mention("", "")
         set(newValue) { field = newValue; update() }
+    var glide: GlideRequests? = null
     var publicChatServer: String? = null
     var publicChatChannel: Long? = null
 
@@ -24,25 +24,18 @@ class MentionCandidateSelectionViewCell(context: Context, attrs: AttributeSet?,
 
     companion object {
 
-        fun inflate(layoutInflater: LayoutInflater, parent: ViewGroup): MentionCandidateSelectionViewCell {
-            return layoutInflater.inflate(R.layout.cell_mention_candidate_selection_view, parent, false) as MentionCandidateSelectionViewCell
+        fun inflate(layoutInflater: LayoutInflater, parent: ViewGroup): MentionCandidateView {
+            return layoutInflater.inflate(R.layout.view_mention_candidate, parent, false) as MentionCandidateView
         }
     }
 
-    override fun onFinishInflate() {
-        super.onFinishInflate()
-        profilePictureImageViewContainer.outlineProvider = object : ViewOutlineProvider() {
-
-            override fun getOutline(view: View, outline: Outline) {
-                outline.setOval(0, 0, view.width, view.height)
-            }
-        }
-        profilePictureImageViewContainer.clipToOutline = true
-    }
-
     private fun update() {
         displayNameTextView.text = mentionCandidate.displayName
-        profilePictureImageView.update(mentionCandidate.hexEncodedPublicKey)
+        profilePictureView.hexEncodedPublicKey = mentionCandidate.hexEncodedPublicKey
+        profilePictureView.additionalHexEncodedPublicKey = null
+        profilePictureView.isRSSFeed = false
+        profilePictureView.glide = glide!!
+        profilePictureView.update()
         if (publicChatServer != null && publicChatChannel != null) {
             val isUserModerator = LokiPublicChatAPI.isUserModerator(mentionCandidate.hexEncodedPublicKey, publicChatChannel!!, publicChatServer!!)
             moderatorIconImageView.visibility = if (isUserModerator) View.VISIBLE else View.GONE
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/views/ProfilePictureView.kt b/src/org/thoughtcrime/securesms/loki/redesign/views/ProfilePictureView.kt
new file mode 100644
index 0000000000..87fddbfb3e
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/views/ProfilePictureView.kt
@@ -0,0 +1,81 @@
+package org.thoughtcrime.securesms.loki.redesign.views
+
+import android.content.Context
+import android.support.annotation.DimenRes
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.ImageView
+import android.widget.RelativeLayout
+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.JazzIdenticonDrawable
+import org.thoughtcrime.securesms.mms.GlideRequests
+import org.thoughtcrime.securesms.recipients.Recipient
+
+// 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 hexEncodedPublicKey: String? = null
+    var additionalHexEncodedPublicKey: String? = null
+    var isRSSFeed = false
+    var isLarge = false
+
+    // region Lifecycle
+    constructor(context: Context) : super(context) {
+        setUpViewHierarchy()
+    }
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+        setUpViewHierarchy()
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+        setUpViewHierarchy()
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
+        setUpViewHierarchy()
+    }
+
+    private fun setUpViewHierarchy() {
+        val inflater = context.applicationContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
+        val contentView = inflater.inflate(R.layout.view_profile_picture, null)
+        addView(contentView)
+    }
+    // endregion
+
+    // region Updating
+    fun update() {
+        val hexEncodedPublicKey = hexEncodedPublicKey ?: return
+        val additionalHexEncodedPublicKey = additionalHexEncodedPublicKey
+        doubleModeImageViewContainer.visibility = if (additionalHexEncodedPublicKey != null && !isRSSFeed) View.VISIBLE else View.INVISIBLE
+        singleModeImageViewContainer.visibility = if (additionalHexEncodedPublicKey == null && !isRSSFeed && !isLarge) View.VISIBLE else View.INVISIBLE
+        largeSingleModeImageViewContainer.visibility = if (additionalHexEncodedPublicKey == null && !isRSSFeed && isLarge) View.VISIBLE else View.INVISIBLE
+        rssTextView.visibility = if (isRSSFeed) View.VISIBLE else View.INVISIBLE
+        fun setProfilePictureIfNeeded(imageView: ImageView, hexEncodedPublicKey: String, @DimenRes sizeID: Int) {
+            glide.clear(imageView)
+            if (hexEncodedPublicKey.isNotEmpty()) {
+                val signalProfilePicture = Recipient.from(context, Address.fromSerialized(hexEncodedPublicKey), false).contactPhoto
+                if (signalProfilePicture != null && (signalProfilePicture as? ProfileContactPhoto)?.avatarObject != "0") {
+                    glide.load(signalProfilePicture).diskCacheStrategy(DiskCacheStrategy.ALL).circleCrop().into(imageView)
+                } else {
+                    val size = resources.getDimensionPixelSize(sizeID)
+                    val jazzIcon = JazzIdenticonDrawable(size, size, hexEncodedPublicKey)
+                    glide.load(jazzIcon).diskCacheStrategy(DiskCacheStrategy.ALL).circleCrop().into(imageView)
+                }
+            } else {
+                imageView.setImageDrawable(null)
+            }
+        }
+        setProfilePictureIfNeeded(doubleModeImageView1, hexEncodedPublicKey, R.dimen.small_profile_picture_size)
+        setProfilePictureIfNeeded(doubleModeImageView2, additionalHexEncodedPublicKey ?: "", R.dimen.small_profile_picture_size)
+        setProfilePictureIfNeeded(singleModeImageView, hexEncodedPublicKey, R.dimen.medium_profile_picture_size)
+        setProfilePictureIfNeeded(largeSingleModeImageView, hexEncodedPublicKey, R.dimen.large_profile_picture_size)
+    }
+    // endregion
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/views/SeedReminderView.kt b/src/org/thoughtcrime/securesms/loki/redesign/views/SeedReminderView.kt
new file mode 100644
index 0000000000..0b2e9e9ae9
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/views/SeedReminderView.kt
@@ -0,0 +1,60 @@
+package org.thoughtcrime.securesms.loki.redesign.views
+
+import android.content.Context
+import android.os.Build
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.FrameLayout
+import kotlinx.android.synthetic.main.view_seed_reminder.view.*
+import network.loki.messenger.R
+
+class SeedReminderView : FrameLayout {
+    var title: CharSequence
+        get() = titleTextView.text
+        set(value) { titleTextView.text = value }
+    var subtitle: CharSequence
+        get() = subtitleTextView.text
+        set(value) { subtitleTextView.text = value }
+    var delegate: SeedReminderViewDelegate? = null
+
+    constructor(context: Context) : super(context) {
+        setUpViewHierarchy()
+    }
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+        setUpViewHierarchy()
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+        setUpViewHierarchy()
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
+        setUpViewHierarchy()
+    }
+
+    private fun setUpViewHierarchy() {
+        val inflater = context.applicationContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
+        val contentView = inflater.inflate(R.layout.view_seed_reminder, null)
+        addView(contentView)
+        button.setOnClickListener { delegate?.handleSeedReminderViewContinueButtonTapped() }
+    }
+
+    fun setProgress(progress: Int, isAnimated: Boolean) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            progressBar.setProgress(progress, isAnimated)
+        } else {
+            progressBar.progress = progress
+        }
+    }
+
+    fun hideContinueButton() {
+        button.visibility = View.GONE
+    }
+}
+
+interface SeedReminderViewDelegate {
+
+    fun handleSeedReminderViewContinueButtonTapped()
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/views/SeparatorView.kt b/src/org/thoughtcrime/securesms/loki/redesign/views/SeparatorView.kt
new file mode 100644
index 0000000000..3a9e68ffa0
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/redesign/views/SeparatorView.kt
@@ -0,0 +1,70 @@
+package org.thoughtcrime.securesms.loki.redesign.views
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.Path
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.RelativeLayout
+import kotlinx.android.synthetic.main.view_separator.view.*
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.loki.getColorWithID
+import org.thoughtcrime.securesms.loki.toPx
+
+class SeparatorView : RelativeLayout {
+
+    private val path = Path()
+
+    private val paint: Paint = {
+        val result = Paint()
+        result.style = Paint.Style.STROKE
+        result.color = resources.getColorWithID(R.color.separator, context.theme)
+        result.strokeWidth = toPx(1, resources).toFloat()
+        result.isAntiAlias = true
+        result
+    }()
+
+    // region Lifecycle
+    constructor(context: Context) : super(context) {
+        setUpViewHierarchy()
+    }
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+        setUpViewHierarchy()
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+        setUpViewHierarchy()
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
+        setUpViewHierarchy()
+    }
+
+    private fun setUpViewHierarchy() {
+        val inflater = context.applicationContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
+        val contentView = inflater.inflate(R.layout.view_separator, null)
+        val layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
+        addView(contentView, layoutParams)
+        setWillNotDraw(false)
+    }
+    // endregion
+
+    // region Updating
+    override fun onDraw(c: Canvas) {
+        super.onDraw(c)
+        val w = width.toFloat()
+        val h = height.toFloat()
+        val hMargin = toPx(10, resources).toFloat()
+        path.reset()
+        path.moveTo(0.0f, h / 2)
+        path.lineTo(titleTextView.left - hMargin, h / 2)
+        path.addRoundRect(titleTextView.left - hMargin, toPx(1, resources).toFloat(), titleTextView.right + hMargin, h - toPx(1, resources).toFloat(), h / 2, h / 2, Path.Direction.CCW)
+        path.moveTo(titleTextView.right + hMargin, h / 2)
+        path.lineTo(w, h / 2)
+        path.close()
+        c.drawPath(path, paint)
+    }
+    // endregion
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java
index ebd9fa119c..4ba7db24ba 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java
@@ -17,11 +17,12 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 
-import network.loki.messenger.R;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.whispersystems.libsignal.util.guava.Optional;
 
+import network.loki.messenger.R;
+
 /**
  * Allows the user to select a media folder to explore.
  */
@@ -106,7 +107,6 @@ public class MediaPickerFolderFragment extends Fragment implements MediaPickerFo
 
   private void initToolbar(Toolbar toolbar) {
     ((AppCompatActivity) requireActivity()).setSupportActionBar(toolbar);
-    ((AppCompatActivity) requireActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(true);
     ((AppCompatActivity) requireActivity()).getSupportActionBar().setTitle(getString(R.string.MediaPickerActivity_send_to, recipientName));
 
     toolbar.setNavigationOnClickListener(v -> requireActivity().onBackPressed());
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java
index 7409e19d0d..a6d4ac6660 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java
@@ -20,14 +20,14 @@ import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.Toast;
 
-import network.loki.messenger.R;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.util.Util;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
+import network.loki.messenger.R;
+
 /**
  * Allows the user to select a set of media items from a specified folder.
  */
@@ -167,7 +167,6 @@ public class MediaPickerItemFragment extends Fragment implements MediaPickerItem
 
   private void initToolbar(Toolbar toolbar) {
     ((AppCompatActivity) requireActivity()).setSupportActionBar(toolbar);
-    ((AppCompatActivity) requireActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(true);
     ((AppCompatActivity) requireActivity()).getSupportActionBar().setTitle(folderTitle);
 
     toolbar.setNavigationOnClickListener(v -> requireActivity().onBackPressed());
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
index 6c26338b97..818b93d6c8 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
@@ -28,7 +28,6 @@ import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
 import android.widget.TextView;
 
-import network.loki.messenger.R;
 import org.thoughtcrime.securesms.TransportOption;
 import org.thoughtcrime.securesms.components.ComposeText;
 import org.thoughtcrime.securesms.components.ControllableViewPager;
@@ -66,6 +65,8 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 
+import network.loki.messenger.R;
+
 /**
  * Allows the user to edit and caption a set of media items before choosing to send them.
  */
@@ -169,7 +170,7 @@ public class MediaSendFragment extends Fragment implements ViewTreeObserver.OnGl
     sendButton.addOnTransportChangedListener((newTransport, manuallySelected) -> {
       presentCharactersRemaining();
       composeText.setTransport(newTransport);
-      sendButtonBkg.getBackground().setColorFilter(newTransport.getBackgroundColor(), PorterDuff.Mode.MULTIPLY);
+      sendButtonBkg.getBackground().setColorFilter(getResources().getColor(R.color.transparent), PorterDuff.Mode.MULTIPLY);
       sendButtonBkg.getBackground().invalidateSelf();
     });
 
diff --git a/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java
index f0407c15b7..e511b230e6 100644
--- a/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java
@@ -12,7 +12,6 @@ import android.support.v7.preference.Preference;
 import android.widget.Toast;
 
 import org.thoughtcrime.securesms.ApplicationContext;
-import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
 import org.thoughtcrime.securesms.BlockedContactsActivity;
 import org.thoughtcrime.securesms.PassphraseChangeActivity;
 import org.thoughtcrime.securesms.components.SwitchPreferenceCompat;
@@ -72,8 +71,6 @@ public class AppProtectionPreferenceFragment extends CorrectedPreferenceFragment
     disablePassphrase.setOnPreferenceChangeListener(new DisablePassphraseClickListener());
 
     initializeVisibility();
-
-    Analytics.Companion.getShared().track("Privacy Settings Opened");
   }
 
   @Override
@@ -84,8 +81,6 @@ public class AppProtectionPreferenceFragment extends CorrectedPreferenceFragment
   @Override
   public void onResume() {
     super.onResume();
-    ((ApplicationPreferencesActivity) getActivity()).getSupportActionBar().setTitle(R.string.preferences__privacy);
-
     if (!TextSecurePreferences.isPasswordDisabled(getContext())) initializePassphraseTimeoutSummary();
     else                                                         initializeScreenLockTimeoutSummary();
 
diff --git a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java
index 99fa160747..3b6ea99151 100644
--- a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java
@@ -9,7 +9,6 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.preference.EditTextPreference;
-import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
 
@@ -17,8 +16,6 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 import org.thoughtcrime.securesms.ApplicationContext;
-import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
-import network.loki.messenger.R;
 import org.thoughtcrime.securesms.backup.BackupDialog;
 import org.thoughtcrime.securesms.backup.FullBackupBase.BackupEvent;
 import org.thoughtcrime.securesms.components.SwitchPreferenceCompat;
@@ -35,6 +32,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 
+import network.loki.messenger.R;
+
 public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment {
   private static final String TAG = ChatsPreferenceFragment.class.getSimpleName();
 
@@ -49,9 +48,9 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment {
         .setOnPreferenceChangeListener(new MediaDownloadChangeListener());
     findPreference(TextSecurePreferences.MEDIA_DOWNLOAD_ROAMING_PREF)
         .setOnPreferenceChangeListener(new MediaDownloadChangeListener());
-     */
     findPreference(TextSecurePreferences.MESSAGE_BODY_TEXT_SIZE_PREF)
         .setOnPreferenceChangeListener(new ListSummaryListener());
+     */
 
     findPreference(TextSecurePreferences.THREAD_TRIM_NOW)
         .setOnPreferenceClickListener(new TrimNowClickListener());
@@ -63,7 +62,7 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment {
     findPreference(TextSecurePreferences.BACKUP_NOW)
         .setOnPreferenceClickListener(new BackupCreateListener());
 
-    initializeListSummary((ListPreference) findPreference(TextSecurePreferences.MESSAGE_BODY_TEXT_SIZE_PREF));
+//    initializeListSummary((ListPreference) findPreference(TextSecurePreferences.MESSAGE_BODY_TEXT_SIZE_PREF));
 
     EventBus.getDefault().register(this);
   }
@@ -76,7 +75,6 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment {
   @Override
   public void onResume() {
     super.onResume();
-    ((ApplicationPreferencesActivity)getActivity()).getSupportActionBar().setTitle(R.string.preferences__chats);
     setMediaDownloadSummaries();
     setBackupSummary();
   }
diff --git a/src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java
index 01f014b8f0..fd58d1d4b2 100644
--- a/src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java
@@ -14,12 +14,10 @@ import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
 
-import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
 import org.thoughtcrime.securesms.components.SwitchPreferenceCompat;
 import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.whispersystems.signalservice.loki.utilities.Analytics;
 
 import network.loki.messenger.R;
 
@@ -121,8 +119,6 @@ public class NotificationsPreferenceFragment extends ListSummaryPreferenceFragme
     // initializeCallRingtoneSummary(findPreference(TextSecurePreferences.CALL_RINGTONE_PREF));
     initializeMessageVibrateSummary((SwitchPreferenceCompat)findPreference(TextSecurePreferences.VIBRATE_PREF));
     // initializeCallVibrateSummary((SwitchPreferenceCompat)findPreference(TextSecurePreferences.CALL_VIBRATE_PREF));
-
-    Analytics.Companion.getShared().track("Notification Settings Opened");
   }
 
   @Override
@@ -130,12 +126,6 @@ public class NotificationsPreferenceFragment extends ListSummaryPreferenceFragme
     addPreferencesFromResource(R.xml.preferences_notifications);
   }
 
-  @Override
-  public void onResume() {
-    super.onResume();
-    ((ApplicationPreferencesActivity) getActivity()).getSupportActionBar().setTitle(R.string.preferences__notifications);
-  }
-
   @Override
   public void onActivityResult(int requestCode, int resultCode, Intent data) {
     if (requestCode == 1 && resultCode == RESULT_OK && data != null) {
diff --git a/src/org/thoughtcrime/securesms/recipients/Recipient.java b/src/org/thoughtcrime/securesms/recipients/Recipient.java
index 2bdfa8eafe..aa70a329da 100644
--- a/src/org/thoughtcrime/securesms/recipients/Recipient.java
+++ b/src/org/thoughtcrime/securesms/recipients/Recipient.java
@@ -22,7 +22,6 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.text.TextUtils;
 
 import com.annimon.stream.function.Consumer;
 
@@ -34,7 +33,6 @@ import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.GeneratedContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.GroupRecordContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto;
-import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.SystemContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.TransparentContactPhoto;
 import org.thoughtcrime.securesms.database.Address;
diff --git a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
index 00f334bc1a..d72dd23ee1 100644
--- a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
+++ b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
@@ -1195,6 +1195,14 @@ public class TextSecurePreferences {
     setStringPreference(context, "master_hex_encoded_public_key", masterHexEncodedPublicKey.toLowerCase());
   }
 
+  public static Boolean getHasViewedSeed(Context context) {
+    return getBooleanPreference(context, "has_viewed_seed", false);
+  }
+
+  public static void setHasViewedSeed(Context context, Boolean hasViewedSeed) {
+    setBooleanPreference(context, "has_viewed_seed", hasViewedSeed);
+  }
+
   public static void setResetDatabase(Context context, boolean resetDatabase) {
     // We do it this way so that it gets persisted in storage straight away
     PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean("database_reset", resetDatabase).commit();