diff --git a/res/drawable-v21/dialog_background.xml b/res/drawable-v21/dialog_background.xml
new file mode 100644
index 0000000000..d607bfc022
--- /dev/null
+++ b/res/drawable-v21/dialog_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:insetLeft="0dp"
+    android:insetTop="16dp"
+    android:insetRight="0dp"
+    android:insetBottom="16dp">
+    <shape android:shape="rectangle">
+        <corners android:radius="2dp" />
+        <solid android:color="?dialog_background_color" />
+    </shape>
+</inset>
\ No newline at end of file
diff --git a/res/drawable/dialog_background.xml b/res/drawable/dialog_background.xml
new file mode 100644
index 0000000000..1c3a6cfb02
--- /dev/null
+++ b/res/drawable/dialog_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="rectangle">
+    <solid android:color="@color/transparent" />
+</shape>
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 2df8e1d4ab..4991cff627 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -77,6 +77,7 @@
 
     <attr name="dialog_info_icon" format="reference" />
     <attr name="dialog_alert_icon" format="reference" />
+    <attr name="dialog_background_color" format="reference|color" />
 
     <attr name="conversation_icon_attach_audio" format="reference"/>
     <attr name="conversation_icon_attach_video" format="reference" />
diff --git a/res/values/styles.xml b/res/values/styles.xml
index fe4b9b5b0f..5bfff8e7c5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -18,11 +18,24 @@
         <item name="android:backgroundDimEnabled">false</item>
     </style>
 
-    <style name="AppCompatAlertDialogStyle" parent="Theme.AppCompat.Light.Dialog.Alert">
-        <item name="colorAccent">@color/textsecure_primary_dark</item>
-        <item name="colorPrimary">@color/textsecure_primary</item>
-        <item name="colorPrimaryDark">@color/textsecure_primary_dark</item>
-        <item name="android:textColorLink">@color/textsecure_primary_dark</item>
+    <style name="AppCompatAlertDialogStyleLight" parent="Theme.AppCompat.Light.Dialog.Alert">
+        <item name="colorAccent">@color/signal_primary_dark</item>
+    </style>
+
+    <style name="AppCompatAlertDialogStyleDark" parent="Theme.AppCompat.Dialog.Alert">
+        <item name="colorAccent">@color/signal_primary</item>
+        <item name="android:textColor">@null</item>
+    </style>
+
+    <style name="AppCompatDialogStyleLight" parent="Theme.AppCompat.Light.Dialog">
+        <item name="colorAccent">@color/signal_primary_dark</item>
+        <item name="android:windowBackground">@drawable/dialog_background</item>
+    </style>
+
+    <style name="AppCompatDialogStyleDark" parent="Theme.AppCompat.Dialog">
+        <item name="colorAccent">@color/signal_primary</item>
+        <item name="android:windowBackground">@drawable/dialog_background</item>
+        <item name="android:textColor">@null</item>
     </style>
 
     <!-- ActionBar styles -->
diff --git a/res/values/themes.xml b/res/values/themes.xml
index d1384844e2..0ab0148340 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -9,12 +9,15 @@
         <item name="colorPrimary">@color/textsecure_primary</item>
         <item name="colorPrimaryDark">@color/textsecure_primary_dark</item>
         <item name="colorAccent">@color/textsecure_primary_dark</item>
+        <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleLight</item>
+        <item name="android:alertDialogTheme">@style/AppCompatDialogStyleLight</item>
 
         <item name="recipient_preference_blocked">#d00000</item>
         <item name="contact_selection_label_text">#66000000</item>
         <item name="contact_selection_push_user">#ff000000</item>
         <item name="contact_selection_lay_user">#a0000000</item>
         <item name="contact_selection_header_text">@color/textsecure_primary_dark</item>
+        <item name="dialog_background_color">@color/background_material_light</item>
     </style>
 
     <style name="TextSecure.DarkNoActionBar" parent="@style/Theme.AppCompat.NoActionBar">
@@ -22,12 +25,15 @@
         <item name="actionBarStyle">@style/TextSecure.DarkActionBar</item>
         <item name="actionBarTabBarStyle">@style/TextSecure.DarkActionBar.TabBar</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
+        <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleDark</item>
+        <item name="android:alertDialogTheme">@style/AppCompatDialogStyleDark</item>
 
         <item name="recipient_preference_blocked">#d00000</item>
         <item name="contact_selection_label_text">#66eeeeee</item>
         <item name="contact_selection_push_user">#ffeeeeee</item>
         <item name="contact_selection_lay_user">#afeeeeee</item>
         <item name="contact_selection_header_text">#66eeeeee</item>
+        <item name="dialog_background_color">@color/background_material_dark</item>
     </style>
 
     <style name="TextSecure.HighlightTheme" parent="@style/TextSecure.LightTheme">
@@ -94,7 +100,8 @@
         <item name="colorControlActivated">@color/signal_primary</item>
         <item name="colorControlHighlight">@color/signal_primary</item>
         <item name="android:windowBackground">@color/gray5</item>
-        <item name="alertDialogTheme">@style/AppCompatAlertDialogStyle</item>
+        <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleLight</item>
+        <item name="android:alertDialogTheme">@style/AppCompatDialogStyleLight</item>
         <!--<item name="android:windowContentOverlay">@drawable/compat_actionbar_shadow_background</item>-->
         <item name="attachment_type_selector_background">@color/white</item>
         <item name="conversation_list_item_background_selected">@drawable/list_selected_holo_light</item>
@@ -167,6 +174,7 @@
 
         <item name="dialog_info_icon">@drawable/ic_info_outline_light</item>
         <item name="dialog_alert_icon">@drawable/ic_warning_light</item>
+        <item name="dialog_background_color">@color/background_material_light</item>
 
         <item name="device_link_item_card_background">@color/device_link_item_background_light</item>
 
@@ -225,6 +233,8 @@
         <item name="colorControlActivated">@color/signal_primary_dark</item>
         <item name="colorControlHighlight">@color/signal_primary_dark</item>
         <item name="android:windowBackground">@color/black</item>
+        <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleDark</item>
+        <item name="android:alertDialogTheme">@style/AppCompatDialogStyleDark</item>
         <item name="conversation_list_item_background_selected">@drawable/list_selected_holo_dark</item>
         <item name="conversation_list_item_background_unread">@drawable/conversation_list_item_unread_background_dark</item>
         <item name="conversation_list_item_background_read">@drawable/conversation_list_item_read_background_dark</item>
@@ -253,6 +263,7 @@
 
         <item name="dialog_info_icon">@drawable/ic_info_outline_dark</item>
         <item name="dialog_alert_icon">@drawable/ic_warning_dark</item>
+        <item name="dialog_background_color">@color/background_material_dark</item>
 
         <item name="device_link_item_card_background">@color/device_link_item_background_dark</item>