diff --git a/res/drawable/attachment_selector_shadow.xml b/res/drawable/attachment_selector_shadow.xml
new file mode 100644
index 0000000000..34e2aa8cd4
--- /dev/null
+++ b/res/drawable/attachment_selector_shadow.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">
+
+    <gradient
+        android:startColor="@color/transparent_black_30"
+        android:endColor="@color/transparent_black"
+        android:angle="90"/>
+
+</shape>
\ No newline at end of file
diff --git a/res/layout/attachment_type_selector.xml b/res/layout/attachment_type_selector.xml
index 4c90c09c62..8d84bf3680 100644
--- a/res/layout/attachment_type_selector.xml
+++ b/res/layout/attachment_type_selector.xml
@@ -1,224 +1,235 @@
 <?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"
-              android:background="?attachment_type_selector_background">
+              android:layout_height="wrap_content">
 
-    <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="4dp"
+          android:background="@drawable/attachment_selector_shadow"/>
 
-    <LinearLayout android:orientation="horizontal"
+    <LinearLayout android:orientation="vertical"
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
-                  android:layout_marginLeft="16dp"
-                  android:layout_marginRight="16dp"
-                  android:layout_marginTop="16dp"
-                  android:weightSum="4">
+                  android:background="?attachment_type_selector_background">
 
-        <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.RecentPhotoViewRail
+                android:id="@+id/recent_photos"
+                android:layout_width="match_parent"
+                android:layout_height="90dp"
+                android:padding="4dp"/>
 
-            <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:gravity="center"
-                      android:layout_weight="1"
-                      android:orientation="vertical">
-
-            <org.thoughtcrime.securesms.components.CircleColorImageView
-                    android:id="@+id/audio_button"
-                    android:layout_width="53dp"
-                    android:layout_height="53dp"
-                    android:src="@drawable/ic_headset_white_24dp"
-                    android:scaleType="center"
-                    android:contentDescription="@string/attachment_type_selector__audio_description"
-                    app:circleColor="@color/orange_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__audio"/>
-
-        </LinearLayout>
-
-        <LinearLayout android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:gravity="center"
-                      android:layout_weight="1"
-                      android:orientation="vertical">
-
-            <org.thoughtcrime.securesms.components.CircleColorImageView
-                    android:id="@+id/document_button"
-                    android:layout_width="53dp"
-                    android:layout_height="53dp"
-                    android:src="@drawable/ic_insert_drive_file_white_24dp"
-                    android:scaleType="center"
-                    android:contentDescription="@string/attachment_type_selector__file_description"
-                    app:circleColor="@color/red_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__file"/>
-
-        </LinearLayout>
-
-        <LinearLayout android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:gravity="center"
-                      android:orientation="vertical"
-                      android:layout_weight="1">
-
-            <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_marginLeft="16dp"
-                  android:layout_marginRight="16dp"
-                  android:layout_marginBottom="16dp"
-                  android:weightSum="4">
-
-        <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:id="@+id/location_linear_layout"
+        <LinearLayout android:orientation="horizontal"
                       android:layout_width="match_parent"
                       android:layout_height="wrap_content"
-                      android:layout_weight="1"
-                      android:gravity="center"
-                      android:orientation="vertical">
+                      android:layout_marginLeft="16dp"
+                      android:layout_marginRight="16dp"
+                      android:layout_marginTop="16dp"
+                      android:weightSum="4">
 
-            <org.thoughtcrime.securesms.components.CircleColorImageView
-                    android:id="@+id/location_button"
-                    android:layout_width="53dp"
-                    android:layout_height="53dp"
-                    android:src="@drawable/ic_location_on_white_24dp"
-                    android:scaleType="center"
-                    android:contentDescription="@string/attachment_type_selector__location_description"
-                    app:circleColor="@color/blue_grey_400"/>
+            <LinearLayout android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          android:layout_weight="1"
+                          android:gravity="center"
+                          android:orientation="vertical">
 
-            <TextView android:layout_marginTop="10dp"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      style="@style/AttachmentTypeLabel"
-                      android:text="@string/attachment_type_selector__location"/>
+                <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:gravity="center"
+                          android:layout_weight="1"
+                          android:orientation="vertical">
+
+                <org.thoughtcrime.securesms.components.CircleColorImageView
+                        android:id="@+id/audio_button"
+                        android:layout_width="53dp"
+                        android:layout_height="53dp"
+                        android:src="@drawable/ic_headset_white_24dp"
+                        android:scaleType="center"
+                        android:contentDescription="@string/attachment_type_selector__audio_description"
+                        app:circleColor="@color/orange_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__audio"/>
+
+            </LinearLayout>
+
+            <LinearLayout android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          android:gravity="center"
+                          android:layout_weight="1"
+                          android:orientation="vertical">
+
+                <org.thoughtcrime.securesms.components.CircleColorImageView
+                        android:id="@+id/document_button"
+                        android:layout_width="53dp"
+                        android:layout_height="53dp"
+                        android:src="@drawable/ic_insert_drive_file_white_24dp"
+                        android:scaleType="center"
+                        android:contentDescription="@string/attachment_type_selector__file_description"
+                        app:circleColor="@color/red_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__file"/>
+
+            </LinearLayout>
+
+            <LinearLayout android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          android:gravity="center"
+                          android:orientation="vertical"
+                          android:layout_weight="1">
+
+                <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:layout_width="match_parent"
+        <LinearLayout android:orientation="horizontal"
+                      android:layout_width="match_parent"
                       android:layout_height="wrap_content"
-                      android:layout_weight="1"
-                      android:gravity="center"
-                      android:orientation="vertical">
+                      android:layout_marginTop="16dp"
+                      android:layout_marginLeft="16dp"
+                      android:layout_marginRight="16dp"
+                      android:layout_marginBottom="16dp"
+                      android:weightSum="4">
 
-            <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"/>
+            <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: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">
+
+                <org.thoughtcrime.securesms.components.CircleColorImageView
+                        android:id="@+id/location_button"
+                        android:layout_width="53dp"
+                        android:layout_height="53dp"
+                        android:src="@drawable/ic_location_on_white_24dp"
+                        android:scaleType="center"
+                        android:contentDescription="@string/attachment_type_selector__location_description"
+                        app:circleColor="@color/blue_grey_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__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: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>
 
-            <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: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>
 
 </LinearLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 61667f92e4..64c95f7607 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -57,6 +57,7 @@
 
     <color name="sticker_selected_color">#99ffffff</color>
     <color name="transparent">#00FFFFFF</color>
+    <color name="transparent_black">#00000000</color>
 
     <color name="MediaOverview_Media_selected_overlay">#88000000</color>