diff --git a/res/drawable/attachment_audio_preview_background.xml b/res/drawable/attachment_audio_preview_background.xml
index 8b62415..d2298cc 100644
--- a/res/drawable/attachment_audio_preview_background.xml
+++ b/res/drawable/attachment_audio_preview_background.xml
@@ -15,6 +15,6 @@
     limitations under the License.
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@android:color/white" />
-    <corners android:radius="2dp" />
-</shape>
\ No newline at end of file
+    <solid android:color="@color/attachment_bg_color" />
+    <corners android:radius="@dimen/attachment_rounded_corner_radius" />
+</shape>
diff --git a/res/drawable/attachment_image_placeholder_background.xml b/res/drawable/attachment_image_placeholder_background.xml
index b3315e8..d2298cc 100644
--- a/res/drawable/attachment_image_placeholder_background.xml
+++ b/res/drawable/attachment_image_placeholder_background.xml
@@ -15,6 +15,6 @@
     limitations under the License.
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@android:color/white" />
+    <solid android:color="@color/attachment_bg_color" />
     <corners android:radius="@dimen/attachment_rounded_corner_radius" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/res/drawable/attachment_vcard_preview_background.xml b/res/drawable/attachment_vcard_preview_background.xml
index 8b62415..d2298cc 100644
--- a/res/drawable/attachment_vcard_preview_background.xml
+++ b/res/drawable/attachment_vcard_preview_background.xml
@@ -15,6 +15,6 @@
     limitations under the License.
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@android:color/white" />
-    <corners android:radius="2dp" />
-</shape>
\ No newline at end of file
+    <solid android:color="@color/attachment_bg_color" />
+    <corners android:radius="@dimen/attachment_rounded_corner_radius" />
+</shape>
diff --git a/res/layout/attachment_chooser_audio.xml b/res/layout/attachment_chooser_audio.xml
index ea2f431..48440f0 100644
--- a/res/layout/attachment_chooser_audio.xml
+++ b/res/layout/attachment_chooser_audio.xml
@@ -20,7 +20,7 @@
     android:id="@+id/audio_attachment_background"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/attachment_chooser_audio_background">
+    android:background="@drawable/attachment_audio_preview_background">
 
     <com.android.messaging.ui.AudioAttachmentView
         android:id="@+id/audio_attachment_view"
diff --git a/res/layout/attachment_chooser_image.xml b/res/layout/attachment_chooser_image.xml
index b635161..099d69f 100644
--- a/res/layout/attachment_chooser_image.xml
+++ b/res/layout/attachment_chooser_image.xml
@@ -23,4 +23,5 @@
     android:minWidth="@dimen/single_attachment_min_dimen"
     android:minHeight="@dimen/single_attachment_min_dimen"
     android:scaleType="centerCrop"
-    android:adjustViewBounds="true" />
+    android:adjustViewBounds="true"
+    app:cornerRadius="@dimen/attachment_rounded_corner_radius"/>
diff --git a/res/layout/attachment_chooser_vcard.xml b/res/layout/attachment_chooser_vcard.xml
index e6f1072..49541b9 100644
--- a/res/layout/attachment_chooser_vcard.xml
+++ b/res/layout/attachment_chooser_vcard.xml
@@ -17,7 +17,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/attachment_chooser_vcard_background">
+    android:background="@drawable/attachment_vcard_preview_background">
 
     <com.android.messaging.ui.PersonItemView
         android:id="@+id/vcard_attachment_view"
diff --git a/res/values-night/lineage_colors.xml b/res/values-night/lineage_colors.xml
index 4e054e5..6d86482 100644
--- a/res/values-night/lineage_colors.xml
+++ b/res/values-night/lineage_colors.xml
@@ -23,4 +23,6 @@
     <color name="compose_send_text_background_color">@*android:color/system_neutral1_600</color>
 
     <color name="fab_fg_color">@android:color/black</color>
+
+    <color name="attachment_bg_color">@android:color/system_neutral1_800</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 1da1b9c..4d22628 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -100,7 +100,7 @@
 
     <!-- Videos in the message list view should at least be this big in the smallest dimension -->
     <dimen name="video_message_min_size">320dp</dimen>
-    <dimen name="attachment_rounded_corner_radius">3dp</dimen>
+    <dimen name="attachment_rounded_corner_radius">16dp</dimen>
     <dimen name="participant_list_text_size">18sp</dimen>
     <dimen name="people_and_options_header_text_size">16sp</dimen>
     <dimen name="image_attachment_fallback_width">240dp</dimen>
diff --git a/res/values/lineage_colors.xml b/res/values/lineage_colors.xml
index 54c5ceb..e52a6da 100644
--- a/res/values/lineage_colors.xml
+++ b/res/values/lineage_colors.xml
@@ -25,4 +25,6 @@
     <color name="compose_send_text_background_color">@android:color/white</color>
 
     <color name="fab_fg_color">@android:color/white</color>
+
+    <color name="attachment_bg_color">@android:color/system_neutral1_0</color>
 </resources>