diff --git a/res/drawable-hdpi/ic_camera_white_24dp.png b/res/drawable-hdpi/ic_camera_white_24dp.png
new file mode 100644
index 0000000000..60b4eed405
Binary files /dev/null and b/res/drawable-hdpi/ic_camera_white_24dp.png differ
diff --git a/res/drawable-hdpi/ic_gif_white_24dp.png b/res/drawable-hdpi/ic_gif_white_24dp.png
new file mode 100644
index 0000000000..0978a141a9
Binary files /dev/null and b/res/drawable-hdpi/ic_gif_white_24dp.png differ
diff --git a/res/drawable-hdpi/ic_headset_white_24dp.png b/res/drawable-hdpi/ic_headset_white_24dp.png
new file mode 100644
index 0000000000..d25d3888e1
Binary files /dev/null and b/res/drawable-hdpi/ic_headset_white_24dp.png differ
diff --git a/res/drawable-hdpi/ic_image_white_24dp.png b/res/drawable-hdpi/ic_image_white_24dp.png
new file mode 100644
index 0000000000..b414cf5b68
Binary files /dev/null and b/res/drawable-hdpi/ic_image_white_24dp.png differ
diff --git a/res/drawable-hdpi/ic_keyboard_arrow_down_white_24dp.png b/res/drawable-hdpi/ic_keyboard_arrow_down_white_24dp.png
new file mode 100644
index 0000000000..bbb4fb4dc0
Binary files /dev/null and b/res/drawable-hdpi/ic_keyboard_arrow_down_white_24dp.png differ
diff --git a/res/drawable-hdpi/ic_location_on_white_24dp.png b/res/drawable-hdpi/ic_location_on_white_24dp.png
new file mode 100644
index 0000000000..7c281c3f52
Binary files /dev/null and b/res/drawable-hdpi/ic_location_on_white_24dp.png differ
diff --git a/res/drawable-hdpi/ic_person_white_24dp.png b/res/drawable-hdpi/ic_person_white_24dp.png
new file mode 100644
index 0000000000..56708b0bad
Binary files /dev/null and b/res/drawable-hdpi/ic_person_white_24dp.png differ
diff --git a/res/drawable-mdpi/ic_camera_white_24dp.png b/res/drawable-mdpi/ic_camera_white_24dp.png
new file mode 100644
index 0000000000..57756c01ac
Binary files /dev/null and b/res/drawable-mdpi/ic_camera_white_24dp.png differ
diff --git a/res/drawable-mdpi/ic_gif_white_24dp.png b/res/drawable-mdpi/ic_gif_white_24dp.png
new file mode 100644
index 0000000000..1efc6fb72a
Binary files /dev/null and b/res/drawable-mdpi/ic_gif_white_24dp.png differ
diff --git a/res/drawable-mdpi/ic_headset_white_24dp.png b/res/drawable-mdpi/ic_headset_white_24dp.png
new file mode 100644
index 0000000000..df063799d8
Binary files /dev/null and b/res/drawable-mdpi/ic_headset_white_24dp.png differ
diff --git a/res/drawable-mdpi/ic_image_white_24dp.png b/res/drawable-mdpi/ic_image_white_24dp.png
new file mode 100644
index 0000000000..d474bd577d
Binary files /dev/null and b/res/drawable-mdpi/ic_image_white_24dp.png differ
diff --git a/res/drawable-mdpi/ic_keyboard_arrow_down_white_24dp.png b/res/drawable-mdpi/ic_keyboard_arrow_down_white_24dp.png
new file mode 100644
index 0000000000..ef8a4b6a4c
Binary files /dev/null and b/res/drawable-mdpi/ic_keyboard_arrow_down_white_24dp.png differ
diff --git a/res/drawable-mdpi/ic_location_on_white_24dp.png b/res/drawable-mdpi/ic_location_on_white_24dp.png
new file mode 100644
index 0000000000..933eb5148f
Binary files /dev/null and b/res/drawable-mdpi/ic_location_on_white_24dp.png differ
diff --git a/res/drawable-mdpi/ic_person_white_24dp.png b/res/drawable-mdpi/ic_person_white_24dp.png
new file mode 100644
index 0000000000..f0b1c725da
Binary files /dev/null and b/res/drawable-mdpi/ic_person_white_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_camera_white_24dp.png b/res/drawable-xhdpi/ic_camera_white_24dp.png
new file mode 100644
index 0000000000..32fa295bc6
Binary files /dev/null and b/res/drawable-xhdpi/ic_camera_white_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_gif_white_24dp.png b/res/drawable-xhdpi/ic_gif_white_24dp.png
new file mode 100644
index 0000000000..80324f70a9
Binary files /dev/null and b/res/drawable-xhdpi/ic_gif_white_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_headset_white_24dp.png b/res/drawable-xhdpi/ic_headset_white_24dp.png
new file mode 100644
index 0000000000..d7a741b612
Binary files /dev/null and b/res/drawable-xhdpi/ic_headset_white_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_image_white_24dp.png b/res/drawable-xhdpi/ic_image_white_24dp.png
new file mode 100644
index 0000000000..2642b9e09e
Binary files /dev/null and b/res/drawable-xhdpi/ic_image_white_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_keyboard_arrow_down_white_24dp.png b/res/drawable-xhdpi/ic_keyboard_arrow_down_white_24dp.png
new file mode 100644
index 0000000000..058cebb7f9
Binary files /dev/null and b/res/drawable-xhdpi/ic_keyboard_arrow_down_white_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_location_on_white_24dp.png b/res/drawable-xhdpi/ic_location_on_white_24dp.png
new file mode 100644
index 0000000000..814ca8ddc4
Binary files /dev/null and b/res/drawable-xhdpi/ic_location_on_white_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_person_white_24dp.png b/res/drawable-xhdpi/ic_person_white_24dp.png
new file mode 100644
index 0000000000..aea15f0be5
Binary files /dev/null and b/res/drawable-xhdpi/ic_person_white_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_camera_white_24dp.png b/res/drawable-xxhdpi/ic_camera_white_24dp.png
new file mode 100644
index 0000000000..0fe586ad04
Binary files /dev/null and b/res/drawable-xxhdpi/ic_camera_white_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_gif_white_24dp.png b/res/drawable-xxhdpi/ic_gif_white_24dp.png
new file mode 100644
index 0000000000..acdb6d0b90
Binary files /dev/null and b/res/drawable-xxhdpi/ic_gif_white_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_headset_white_24dp.png b/res/drawable-xxhdpi/ic_headset_white_24dp.png
new file mode 100644
index 0000000000..82db5427b7
Binary files /dev/null and b/res/drawable-xxhdpi/ic_headset_white_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_image_white_24dp.png b/res/drawable-xxhdpi/ic_image_white_24dp.png
new file mode 100644
index 0000000000..f9f1defa6d
Binary files /dev/null and b/res/drawable-xxhdpi/ic_image_white_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_keyboard_arrow_down_white_24dp.png b/res/drawable-xxhdpi/ic_keyboard_arrow_down_white_24dp.png
new file mode 100644
index 0000000000..f9622b7bee
Binary files /dev/null and b/res/drawable-xxhdpi/ic_keyboard_arrow_down_white_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_location_on_white_24dp.png b/res/drawable-xxhdpi/ic_location_on_white_24dp.png
new file mode 100644
index 0000000000..078b10d4fb
Binary files /dev/null and b/res/drawable-xxhdpi/ic_location_on_white_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_person_white_24dp.png b/res/drawable-xxhdpi/ic_person_white_24dp.png
new file mode 100644
index 0000000000..184f7418d5
Binary files /dev/null and b/res/drawable-xxhdpi/ic_person_white_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_camera_white_24dp.png b/res/drawable-xxxhdpi/ic_camera_white_24dp.png
new file mode 100644
index 0000000000..d3716553e2
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_camera_white_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_gif_white_24dp.png b/res/drawable-xxxhdpi/ic_gif_white_24dp.png
new file mode 100644
index 0000000000..f7a70d8471
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_gif_white_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_headset_white_24dp.png b/res/drawable-xxxhdpi/ic_headset_white_24dp.png
new file mode 100644
index 0000000000..0f0b2e1544
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_headset_white_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_image_white_24dp.png b/res/drawable-xxxhdpi/ic_image_white_24dp.png
new file mode 100644
index 0000000000..2ffdb55f26
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_image_white_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_keyboard_arrow_down_white_24dp.png b/res/drawable-xxxhdpi/ic_keyboard_arrow_down_white_24dp.png
new file mode 100644
index 0000000000..30948d9833
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_keyboard_arrow_down_white_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_location_on_white_24dp.png b/res/drawable-xxxhdpi/ic_location_on_white_24dp.png
new file mode 100644
index 0000000000..8bcb6f620d
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_location_on_white_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_person_white_24dp.png b/res/drawable-xxxhdpi/ic_person_white_24dp.png
new file mode 100644
index 0000000000..33d40d8b62
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_person_white_24dp.png differ
diff --git a/res/layout/attachment_type_selector.xml b/res/layout/attachment_type_selector.xml
index 71c6404aa6..04122c4c6a 100644
--- a/res/layout/attachment_type_selector.xml
+++ b/res/layout/attachment_type_selector.xml
@@ -29,11 +29,10 @@
 
             <org.thoughtcrime.securesms.components.CircleColorImageView
                     android:id="@+id/gallery_button"
-                    android:layout_width="60dp"
-                    android:layout_height="60dp"
-                    android:src="@drawable/ic_image_white_36dp"
+                    android:layout_width="53dp"
+                    android:layout_height="53dp"
+                    android:src="@drawable/ic_image_white_24dp"
                     android:scaleType="center"
-                    android:elevation="4dp"
                     android:contentDescription="@string/attachment_type_selector__gallery_description"
                     app:circleColor="@color/purple_400"/>
 
@@ -53,11 +52,10 @@
 
             <org.thoughtcrime.securesms.components.CircleColorImageView
                     android:id="@+id/audio_button"
-                    android:layout_width="60dp"
-                    android:layout_height="60dp"
-                    android:src="@drawable/ic_headset_white_36dp"
+                    android:layout_width="53dp"
+                    android:layout_height="53dp"
+                    android:src="@drawable/ic_headset_white_24dp"
                     android:scaleType="center"
-                    android:elevation="4dp"
                     android:contentDescription="@string/attachment_type_selector__audio_description"
                     app:circleColor="@color/orange_400"/>
 
@@ -77,11 +75,10 @@
 
             <org.thoughtcrime.securesms.components.CircleColorImageView
                     android:id="@+id/document_button"
-                    android:layout_width="60dp"
-                    android:layout_height="60dp"
-                    android:src="@drawable/ic_insert_drive_file_white_36dp"
+                    android:layout_width="53dp"
+                    android:layout_height="53dp"
+                    android:src="@drawable/ic_insert_drive_file_white_24dp"
                     android:scaleType="center"
-                    android:elevation="4dp"
                     android:contentDescription="@string/attachment_type_selector__document_description"
                     app:circleColor="@color/red_400"/>
 
@@ -101,11 +98,10 @@
 
             <org.thoughtcrime.securesms.components.CircleColorImageView
                     android:id="@+id/contact_button"
-                    android:layout_width="60dp"
-                    android:layout_height="60dp"
-                    android:src="@drawable/ic_person_white_36dp"
+                    android:layout_width="53dp"
+                    android:layout_height="53dp"
+                    android:src="@drawable/ic_person_white_24dp"
                     android:scaleType="center"
-                    android:elevation="4dp"
                     android:contentDescription="@string/attachment_type_selector__contact_description"
                     app:circleColor="@color/blue_400"/>
 
@@ -136,11 +132,10 @@
 
             <org.thoughtcrime.securesms.components.CircleColorImageView
                     android:id="@+id/camera_button"
-                    android:layout_width="60dp"
-                    android:layout_height="60dp"
-                    android:src="@drawable/ic_camera_white_36dp"
+                    android:layout_width="53dp"
+                    android:layout_height="53dp"
+                    android:src="@drawable/ic_camera_white_24dp"
                     android:scaleType="center"
-                    android:elevation="4dp"
                     android:contentDescription="@string/attachment_type_selector__camera_description"
                     app:circleColor="@color/green_400"/>
 
@@ -162,11 +157,10 @@
 
             <org.thoughtcrime.securesms.components.CircleColorImageView
                     android:id="@+id/location_button"
-                    android:layout_width="60dp"
-                    android:layout_height="60dp"
-                    android:src="@drawable/ic_location_on_white_36dp"
+                    android:layout_width="53dp"
+                    android:layout_height="53dp"
+                    android:src="@drawable/ic_location_on_white_24dp"
                     android:scaleType="center"
-                    android:elevation="4dp"
                     android:contentDescription="@string/attachment_type_selector__location_description"
                     app:circleColor="@color/blue_grey_400"/>
 
@@ -187,11 +181,10 @@
 
             <org.thoughtcrime.securesms.components.CircleColorImageView
                     android:id="@+id/giphy_button"
-                    android:layout_width="60dp"
-                    android:layout_height="60dp"
-                    android:src="@drawable/ic_gif_white_36dp"
+                    android:layout_width="53dp"
+                    android:layout_height="53dp"
+                    android:src="@drawable/ic_gif_white_24dp"
                     android:scaleType="center"
-                    android:elevation="4dp"
                     android:contentDescription="@string/attachment_type_selector__gif_description"
                     app:circleColor="@color/cyan_400"/>
 
@@ -211,11 +204,10 @@
 
             <org.thoughtcrime.securesms.components.CircleColorImageView
                     android:id="@+id/close_button"
-                    android:layout_width="60dp"
-                    android:layout_height="60dp"
-                    android:src="@drawable/ic_keyboard_arrow_down_white_36dp"
+                    android:layout_width="53dp"
+                    android:layout_height="53dp"
+                    android:src="@drawable/ic_keyboard_arrow_down_white_24dp"
                     android:scaleType="center"
-                    android:elevation="4dp"
                     android:contentDescription="@string/attachment_type_selector__drawer_description"
                     app:circleColor="@color/gray50"/>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5bfff8e7c5..e533566c55 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -218,6 +218,7 @@
 
     <style name="AttachmentTypeLabel">
         <item name="android:textColor">#ff999999</item>
+        <item name="android:textSize">14sp</item>
     </style>
 
     <!-- RedPhone -->