diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b86e28f963..6d1f71ca38 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -359,7 +359,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"
@@ -486,7 +486,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/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/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/prominent_filled_button_medium_background.xml b/res/drawable/prominent_filled_button_medium_background.xml
index 07b25bc37c..9e4eeed50c 100644
--- a/res/drawable/prominent_filled_button_medium_background.xml
+++ b/res/drawable/prominent_filled_button_medium_background.xml
@@ -5,7 +5,7 @@
 
     <solid  android:color="@color/accent" />
 
-    <corners android:radius="24dp" />
+    <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
index d42517077f..b5f3dc5355 100644
--- a/res/drawable/prominent_outline_button_medium_background.xml
+++ b/res/drawable/prominent_outline_button_medium_background.xml
@@ -5,7 +5,7 @@
 
     <solid  android:color="@color/transparent" />
 
-    <corners android:radius="24dp" />
+    <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/unimportant_filled_button_medium_background.xml b/res/drawable/unimportant_filled_button_medium_background.xml
index bec2d9ffe9..4880fd4fed 100644
--- a/res/drawable/unimportant_filled_button_medium_background.xml
+++ b/res/drawable/unimportant_filled_button_medium_background.xml
@@ -5,7 +5,7 @@
 
     <solid  android:color="@color/unimportant_button_background" />
 
-    <corners android:radius="24dp" />
+    <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
index 202eb9cd5c..81471826c3 100644
--- a/res/drawable/unimportant_outline_button_medium_background.xml
+++ b/res/drawable/unimportant_outline_button_medium_background.xml
@@ -5,7 +5,7 @@
 
     <solid  android:color="@color/transparent" />
 
-    <corners android:radius="24dp" />
+    <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/layout-sw400dp/activity_display_name_v2.xml b/res/layout-sw400dp/activity_display_name_v2.xml
index 467cc8d98a..00bafed0aa 100644
--- a/res/layout-sw400dp/activity_display_name_v2.xml
+++ b/res/layout-sw400dp/activity_display_name_v2.xml
@@ -25,7 +25,7 @@
         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_marginTop="10dp"
         android:layout_marginRight="@dimen/very_large_spacing"
         android:textSize="@dimen/medium_font_size"
         android:textColor="@color/text"
@@ -37,7 +37,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="@dimen/medium_spacing"
         android:layout_marginRight="@dimen/very_large_spacing"
         android:hint="Enter a display name" />
 
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
index af260c2265..e04c544fae 100644
--- a/res/layout-sw400dp/activity_register.xml
+++ b/res/layout-sw400dp/activity_register.xml
@@ -25,7 +25,7 @@
         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_marginTop="10dp"
         android:layout_marginRight="@dimen/very_large_spacing"
         android:textSize="@dimen/medium_font_size"
         android:textColor="@color/text"
@@ -37,7 +37,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="@dimen/medium_spacing"
         android:layout_marginRight="@dimen/very_large_spacing"
         android:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
 
diff --git a/res/layout-sw400dp/activity_restore.xml b/res/layout-sw400dp/activity_restore.xml
index 3433c90157..1697ebc224 100644
--- a/res/layout-sw400dp/activity_restore.xml
+++ b/res/layout-sw400dp/activity_restore.xml
@@ -15,7 +15,6 @@
         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:textSize="@dimen/very_large_font_size"
         android:textStyle="bold"
@@ -26,7 +25,7 @@
         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_marginTop="10dp"
         android:layout_marginRight="@dimen/very_large_spacing"
         android:textSize="@dimen/medium_font_size"
         android:textColor="@color/text"
@@ -38,7 +37,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="@dimen/medium_spacing"
         android:layout_marginRight="@dimen/very_large_spacing"
         android:hint="Enter your recovery phrase" />
 
@@ -53,7 +52,6 @@
         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" />
 
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_session_id.xml b/res/layout-sw400dp/fragment_enter_session_id.xml
index 773561fd98..3eb2aff559 100644
--- a/res/layout-sw400dp/fragment_enter_session_id.xml
+++ b/res/layout-sw400dp/fragment_enter_session_id.xml
@@ -26,7 +26,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/large_spacing"
-        android:layout_marginTop="@dimen/medium_spacing"
+        android:layout_marginTop="10dp"
         android:layout_marginRight="@dimen/large_spacing"
         android:textSize="@dimen/medium_font_size"
         android:textColor="@color/text"
@@ -38,7 +38,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/large_spacing"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="@dimen/medium_spacing"
         android:layout_marginRight="@dimen/large_spacing"
         android:hint="Enter your session ID" />
 
diff --git a/res/layout-sw420dp/attachment_type_selector.xml b/res/layout-sw420dp/attachment_type_selector.xml
new file mode 100644
index 0000000000..6d71246d6b
--- /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_marginEnd="16dp"
+            android:layout_marginTop="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_landing.xml b/res/layout/activity_landing.xml
index 42d38fa3f9..dec625033b 100644
--- a/res/layout/activity_landing.xml
+++ b/res/layout/activity_landing.xml
@@ -16,7 +16,7 @@
         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:textSize="@dimen/large_font_size"
         android:textStyle="bold"
         android:textColor="@color/text"
         android:text="Your Session begins here..." />
@@ -25,7 +25,7 @@
         android:id="@+id/fakeChatView"
         android:layout_width="match_parent"
         android:layout_height="@dimen/fake_chat_view_height"
-        android:layout_marginTop="@dimen/medium_spacing" />
+        android:layout_marginTop="@dimen/small_spacing" />
 
     <View
         android:layout_width="match_parent"
@@ -47,7 +47,7 @@
         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_marginTop="@dimen/small_spacing"
         android:layout_marginRight="@dimen/massive_spacing"
         android:text="Continue Your Session" />
 
diff --git a/res/layout/activity_restore.xml b/res/layout/activity_restore.xml
index f71f50e0b5..eb5db6bf14 100644
--- a/res/layout/activity_restore.xml
+++ b/res/layout/activity_restore.xml
@@ -52,7 +52,6 @@
         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" />
 
diff --git a/res/layout/activity_seed_v2.xml b/res/layout/activity_seed_v2.xml
index 17a406b1f7..978e31e9ab 100644
--- a/res/layout/activity_seed_v2.xml
+++ b/res/layout/activity_seed_v2.xml
@@ -4,6 +4,7 @@
     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
@@ -21,7 +22,7 @@
         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:textSize="@dimen/large_font_size"
         android:textStyle="bold"
         android:textColor="@color/text"
         android:text="Meet your recovery phrase" />
@@ -30,7 +31,7 @@
         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_marginTop="10dp"
         android:layout_marginRight="@dimen/very_large_spacing"
         android:textSize="@dimen/medium_font_size"
         android:textColor="@color/text"
@@ -42,7 +43,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="@dimen/medium_spacing"
         android:layout_marginRight="@dimen/very_large_spacing"
         android:gravity="center"
         android:textSize="@dimen/medium_font_size"
@@ -53,7 +54,7 @@
         android:id="@+id/revealButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/medium_spacing"
+        android:layout_marginTop="12dp"
         android:textAlignment="center"
         android:textSize="@dimen/medium_font_size"
         android:textColor="@color/text"
@@ -68,10 +69,8 @@
     <Button
         style="@style/MediumProminentOutlineButton"
         android:id="@+id/copyButton"
-        android:layout_width="match_parent"
+        android:layout_width="196dp"
         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="Copy" />
 
diff --git a/res/layout/conversation_fragment.xml b/res/layout/conversation_fragment.xml
index 3222a014bd..5ba515a3df 100644
--- a/res/layout/conversation_fragment.xml
+++ b/res/layout/conversation_fragment.xml
@@ -45,15 +45,14 @@
             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:padding="@dimen/small_spacing"
+            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/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/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/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/values/dimens.xml b/res/values/dimens.xml
index a234d14ccf..41a10deae5 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -13,7 +13,7 @@
 
     <!-- Element Sizes -->
     <dimen name="small_button_height">34dp</dimen>
-    <dimen name="medium_button_height">48dp</dimen>
+    <dimen name="medium_button_height">44dp</dimen>
     <dimen name="accent_line_thickness">4dp</dimen>
     <dimen name="small_profile_picture_size">36dp</dimen>
     <dimen name="medium_profile_picture_size">46dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 873832abc3..6ae18a6007 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -108,9 +108,9 @@
     <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">@dimen/very_large_spacing</item>
+        <item name="android:paddingTop">30dp</item>
         <item name="android:paddingRight">@dimen/medium_spacing</item>
-        <item name="android:paddingBottom">@dimen/very_large_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>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 8d6f46c42e..fec26e0b57 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -363,7 +363,7 @@
         <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>
@@ -517,7 +517,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/src/org/thoughtcrime/securesms/conversation/ConversationItem.java b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
index a7629cafdf..f82da686fd 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -470,10 +470,6 @@ public class ConversationItem extends LinearLayout
     bodyText.setClickable(false);
     bodyText.setFocusable(false);
     bodyText.setTextSize(TypedValue.COMPLEX_UNIT_SP, TextSecurePreferences.getMessageBodyTextSize(context));
-    bodyBubble.setPadding(0, 0, 0, 0);
-    if (messageRecord.isOutgoing() && !isCaptionlessMms(messageRecord)) {
-      bodyBubble.setPadding(0, 0, 0, (int) getResources().getDimension(R.dimen.medium_spacing));
-    }
     if (isCaptionlessMms(messageRecord)) {
       bodyText.setVisibility(View.GONE);
     } else {
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/DisplayNameActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/DisplayNameActivity.kt
index 2b915ab980..1ff3367301 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/activities/DisplayNameActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/DisplayNameActivity.kt
@@ -9,8 +9,8 @@ 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.push
 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
 
@@ -51,6 +51,6 @@ class DisplayNameActivity : BaseActionBarActivity() {
         }
         val intent = Intent(this, HomeActivity::class.java)
         intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-        push(intent)
+        show(intent)
     }
 }
\ 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();
     });