diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 91deb5653..33e2ef340 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -1,17 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="AppCompatAlertDialogStyleLight" parent="Theme.AppCompat.Light.Dialog.Alert">
+        <item name="colorAccent">@color/def_accent</item>
         <item name="buttonBarPositiveButtonStyle">@style/AlertDialogButton</item>
         <item name="buttonBarNegativeButtonStyle">@style/AlertDialogButton</item>
         <item name="buttonBarNeutralButtonStyle">@style/AlertDialogButton</item>
     </style>
 
     <style name="AppCompatAlertDialogStyleDark" parent="Theme.AppCompat.Dialog.Alert">
+        <item name="colorAccent">@color/def_accent</item>
         <item name="buttonBarPositiveButtonStyle">@style/AlertDialogButton</item>
         <item name="buttonBarNegativeButtonStyle">@style/AlertDialogButton</item>
         <item name="buttonBarNeutralButtonStyle">@style/AlertDialogButton</item>
     </style>
 
+    <!-- Purple -->
+    <style name="AppCompatAlertDialogStylePurple" parent="AppCompatAlertDialogStyleLight">
+        <item name="colorAccent">@color/purple_accent</item>
+    </style>
+    <style name="AppCompatAlertDialogStylePurpleDark" parent="AppCompatAlertDialogStyleDark">
+        <item name="colorAccent">@color/purple_accent</item>
+    </style>
+
+    <!-- Green -->
+    <style name="AppCompatAlertDialogStyleGreen" parent="AppCompatAlertDialogStyleLight">
+        <item name="colorAccent">@color/green_accent</item>
+    </style>
+    <style name="AppCompatAlertDialogStyleGreenDark" parent="AppCompatAlertDialogStyleDark">
+        <item name="colorAccent">@color/green_accent</item>
+    </style>
+
+    <!-- Blue -->
+    <style name="AppCompatAlertDialogStyleBlue" parent="AppCompatAlertDialogStyleLight">
+        <item name="colorAccent">@color/blue_accent</item>
+    </style>
+    <style name="AppCompatAlertDialogStyleBlueDark" parent="AppCompatAlertDialogStyleDark">
+        <item name="colorAccent">@color/blue_accent</item>
+    </style>
+
+    <!-- Red -->
+    <style name="AppCompatAlertDialogStyleRed" parent="AppCompatAlertDialogStyleLight">
+        <item name="colorAccent">@color/red_accent</item>
+    </style>
+    <style name="AppCompatAlertDialogStyleRedDark" parent="AppCompatAlertDialogStyleDark">
+        <item name="colorAccent">@color/red_accent</item>
+    </style>
+
+    <!-- Pink -->
+    <style name="AppCompatAlertDialogStylePink" parent="AppCompatAlertDialogStyleLight">
+        <item name="colorAccent">@color/pink_accent</item>
+    </style>
+    <style name="AppCompatAlertDialogStylePinkDark" parent="AppCompatAlertDialogStyleDark">
+        <item name="colorAccent">@color/pink_accent</item>
+    </style>
+
+    <!-- Gray -->
+    <style name="AppCompatAlertDialogStyleGray" parent="AppCompatAlertDialogStyleLight">
+        <item name="colorAccent">@color/gray_accent</item>
+    </style>
+    <style name="AppCompatAlertDialogStyleGrayDark" parent="AppCompatAlertDialogStyleDark">
+        <item name="colorAccent">@color/gray_accent</item>
+    </style>
+
     <style name="AlertDialogButton" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
         <item name="android:textColor">?attr/colorAccent</item>
     </style>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 47e807318..0806adf3b 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -277,6 +277,8 @@
         <item name="colorAccent">@color/purple_accent</item>
         <item name="colorControlActivated">@color/purple_accent</item>
         <item name="colorControlHighlight">@color/purple_accent</item>
+        
+        <item name="alertDialogTheme">@style/AppCompatAlertDialogStylePurple</item>
 
 	<item name="conversation_list_item_unreadcount_color">@color/purple_unreadcount</item>
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background_purple</item>
@@ -306,6 +308,8 @@
         <item name="colorControlActivated">@color/purple_accent</item>
         <item name="colorControlHighlight">@color/purple_accent</item>
 
+        <item name="alertDialogTheme">@style/AppCompatAlertDialogStylePurpleDark</item>
+
 	    <item name="conversation_list_item_unreadcount_color">@color/purple_unreadcount</item>
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background_purple</item>
         <item name="pinned_list_item_background">@drawable/pinned_list_item_background_purple</item>
@@ -344,6 +348,8 @@
         <item name="colorControlActivated">@color/green_accent</item>
         <item name="colorControlHighlight">@color/green_accent</item>
 
+        <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleGreen</item>
+
 	<item name="conversation_list_item_unreadcount_color">@color/green_unreadcount</item>
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background_green</item>
         <item name="pinned_list_item_background">@drawable/pinned_list_item_background_green</item>
@@ -372,6 +378,8 @@
         <item name="colorControlActivated">@color/green_accent</item>
         <item name="colorControlHighlight">@color/green_accent</item>
 
+        <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleGreenDark</item>
+
 	<item name="conversation_list_item_unreadcount_color">@color/green_unreadcount</item>
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background_green</item>
         <item name="pinned_list_item_background">@drawable/pinned_list_item_background_green</item>
@@ -411,6 +419,8 @@
         <item name="colorControlActivated">@color/blue_accent</item>
         <item name="colorControlHighlight">@color/blue_accent</item>
 
+        <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleBlue</item>
+
 	<item name="conversation_list_item_unreadcount_color">@color/blue_unreadcount</item>
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background_blue</item>
         <item name="pinned_list_item_background">@drawable/pinned_list_item_background_blue</item>
@@ -439,6 +449,8 @@
         <item name="colorControlActivated">@color/blue_accent</item>
         <item name="colorControlHighlight">@color/blue_accent</item>
 
+        <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleBlueDark</item>
+
 	<item name="conversation_list_item_unreadcount_color">@color/blue_unreadcount</item>
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background_blue</item>
         <item name="pinned_list_item_background">@drawable/pinned_list_item_background_blue</item>
@@ -477,6 +489,8 @@
         <item name="colorControlActivated">@color/red_accent</item>
         <item name="colorControlHighlight">@color/red_accent</item>
 
+        <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleRed</item>
+
 	<item name="conversation_list_item_unreadcount_color">@color/red_unreadcount</item>
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background_red</item>
         <item name="pinned_list_item_background">@drawable/pinned_list_item_background_red</item>
@@ -505,6 +519,8 @@
         <item name="colorControlActivated">@color/red_accent</item>
         <item name="colorControlHighlight">@color/red_accent</item>
 
+        <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleRedDark</item>
+
 	<item name="conversation_list_item_unreadcount_color">@color/red_unreadcount</item>
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background_red</item>
         <item name="pinned_list_item_background">@drawable/pinned_list_item_background_red</item>
@@ -543,6 +559,8 @@
         <item name="colorControlActivated">@color/pink_accent</item>
         <item name="colorControlHighlight">@color/pink_accent</item>
 
+        <item name="alertDialogTheme">@style/AppCompatAlertDialogStylePink</item>
+
 	<item name="conversation_list_item_unreadcount_color">@color/pink_unreadcount</item>
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background_pink</item>
         <item name="pinned_list_item_background">@drawable/pinned_list_item_background_pink</item>
@@ -571,6 +589,8 @@
         <item name="colorControlActivated">@color/pink_accent</item>
         <item name="colorControlHighlight">@color/pink_accent</item>
 
+        <item name="alertDialogTheme">@style/AppCompatAlertDialogStylePinkDark</item>
+
 	<item name="conversation_list_item_unreadcount_color">@color/pink_unreadcount</item>
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background_pink</item>
         <item name="pinned_list_item_background">@drawable/pinned_list_item_background_pink</item>
@@ -609,6 +629,8 @@
         <item name="colorControlActivated">@color/gray_accent</item>
         <item name="colorControlHighlight">@color/gray_accent</item>
 
+        <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleGray</item>
+
 	<item name="conversation_list_item_unreadcount_color">@color/gray_unreadcount</item>
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background_gray</item>
         <item name="pinned_list_item_background">@drawable/pinned_list_item_background_gray</item>
@@ -637,6 +659,8 @@
         <item name="colorControlActivated">@color/gray_accent</item>
         <item name="colorControlHighlight">@color/gray_accent</item>
 
+        <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleGrayDark</item>
+
 	<item name="conversation_list_item_unreadcount_color">@color/gray_unreadcount</item>
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background_gray</item>
         <item name="pinned_list_item_background">@drawable/pinned_list_item_background_gray</item>