diff --git a/res/drawable/ic_download_filled_24.xml b/res/drawable/ic_download_filled_24.xml
new file mode 100644
index 000000000..f479812e4
--- /dev/null
+++ b/res/drawable/ic_download_filled_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M3.5,20.5h17V22h-17V20.5zM20,11.3l-7.5,7.5c-0.3,0.3 -0.8,0.3 -1.1,0L4,11.3c-0.3,-0.3 -0.3,-0.8 0,-1.1C4.1,10.1 4.3,10 4.5,10h4V2h7v8h4c0.4,0 0.7,0.4 0.7,0.8C20.2,11 20.1,11.1 20,11.3z"/>
+</vector>
diff --git a/res/drawable/ic_download_outline_24.xml b/res/drawable/ic_download_outline_24.xml
new file mode 100644
index 000000000..196a4a1f1
--- /dev/null
+++ b/res/drawable/ic_download_outline_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M3.5,20.5h17V22h-17V20.5zM20,11.3l-7.5,7.5c-0.3,0.3 -0.8,0.3 -1.1,0L4,11.3c-0.3,-0.3 -0.3,-0.8 0,-1.1C4.1,10.1 4.3,10 4.5,10h4V2h7v8h4c0.4,0 0.7,0.4 0.7,0.8C20.2,11 20.1,11.1 20,11.3zM17.4,11.8l0.6,-0.4l-0.8,0.1H14v-8h-4v8H6.8l-0.8,-0.2l0.7,0.5l5.3,5.3L17.4,11.8z"/>
+</vector>
diff --git a/res/layout/camera_contact_contact_item.xml b/res/layout/camera_contact_contact_item.xml
index b881a74b0..a6447528c 100644
--- a/res/layout/camera_contact_contact_item.xml
+++ b/res/layout/camera_contact_contact_item.xml
@@ -13,8 +13,8 @@
     
     <org.thoughtcrime.securesms.components.AvatarImageView
         android:id="@+id/camera_contact_item_avatar"
-        android:layout_width="40dp"
-        android:layout_height="40dp" />
+        android:layout_width="44dp"
+        android:layout_height="44dp" />
     
     <org.thoughtcrime.securesms.components.FromTextView
         android:id="@+id/camera_contact_item_name"
diff --git a/res/layout/camera_contact_selection_fragment.xml b/res/layout/camera_contact_selection_fragment.xml
index eb2416c1e..d807f50ef 100644
--- a/res/layout/camera_contact_selection_fragment.xml
+++ b/res/layout/camera_contact_selection_fragment.xml
@@ -5,7 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:animateLayoutChanges="true"
     android:background="?android:windowBackground">
 
     <androidx.appcompat.widget.Toolbar
@@ -13,11 +12,17 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?attr/conversation_list_toolbar_background"
-        android:elevation="8dp"
         android:theme="?actionBarStyle"
         app:title="@string/CameraContacts_select_signal_recipients"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <View
+        android:id="@+id/camera_contacts_top_shadow"
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        android:background="@drawable/search_toolbar_shadow"
+        app:layout_constraintTop_toBottomOf="@id/camera_contacts_toolbar" />
+
     <LinearLayout
         android:id="@+id/camera_contacts_empty"
         android:layout_width="0dp"
@@ -72,7 +77,7 @@
         app:layout_constraintTop_toBottomOf="@id/camera_contacts_toolbar" />
 
     <View
-        android:id="@+id/view"
+        android:id="@+id/camera_contacts_bottom_shadow"
         android:layout_width="match_parent"
         android:layout_height="2dp"
         android:background="@drawable/compose_divider_background"
@@ -118,6 +123,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="gone"
-        app:constraint_referenced_ids="camera_contacts_send_button,camera_contacts_selected_list,view" />
+        app:constraint_referenced_ids="camera_contacts_send_button,camera_contacts_selected_list,camera_contacts_bottom_shadow" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/res/layout/conversation_list_fragment.xml b/res/layout/conversation_list_fragment.xml
index 234097a7a..e964f86d6 100644
--- a/res/layout/conversation_list_fragment.xml
+++ b/res/layout/conversation_list_fragment.xml
@@ -72,7 +72,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_marginEnd="16dp"
-        android:layout_marginBottom="82dp"
+        android:layout_marginBottom="88dp"
         android:src="@drawable/ic_camera_alt_white_24dp"
         android:tint="@color/core_grey_60"
         android:focusable="true"
diff --git a/res/menu/media_preview.xml b/res/menu/media_preview.xml
index 049416555..b62877174 100644
--- a/res/menu/media_preview.xml
+++ b/res/menu/media_preview.xml
@@ -7,7 +7,8 @@
           app:showAsAction="always"/>
     <item android:id="@+id/save"
           android:title="@string/media_preview__save_title"
-          android:icon="@drawable/ic_save_white_24dp"
+          android:icon="@drawable/ic_download_filled_24"
+          app:iconTint="@color/core_white"
           app:showAsAction="always"/>
     <item android:id="@+id/media_preview__overview"
           android:title="@string/media_preview__all_media_title"