diff --git a/artwork/ic_contact.svg b/artwork/ic_contact.svg
deleted file mode 100644
index d3ecca0e19..0000000000
--- a/artwork/ic_contact.svg
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   sodipodi:docname="ic_contact.svg"
-   inkscape:version="0.91pre3 r13670"
-   x="0px"
-   y="0px"
-   width="48px"
-   height="48px"
-   viewBox="0 0 48 48"
-   enable-background="new 0 0 48 48"
-   xml:space="preserve"><metadata
-     id="metadata8"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs6" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="798"
-     inkscape:window-height="480"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="4.9166667"
-     inkscape:cx="24"
-     inkscape:cy="24"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" /><path
-     id="path4"
-     d="M38,6H10c-2.21,0-4,1.79-4,4v28c0,2.21,1.79,4,4,4h28c2.21,0,4-1.79,4-4V10C42,7.79,40.21,6,38,6z M24,12  c3.31,0,6,2.69,6,6c0,3.32-2.69,6-6,6s-6-2.68-6-6C18,14.69,20.69,12,24,12z M36,36H12v-2c0-4,8-6.2,12-6.2S36,30,36,34V36z"
-     style="opacity:1;fill:#000000" /></svg>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index b8bdfb828c..86dc119f9b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,12 @@ dependencies {
     compile 'org.apache.httpcomponents:httpclient-android:4.3.5'
     compile 'com.github.chrisbanes.photoview:library:1.2.3'
     compile 'com.makeramen:roundedimageview:1.5.0'
-    compile 'com.afollestad:material-dialogs:0.6.1.5'
+    compile ('com.afollestad:material-dialogs:0.6.4.7') {
+        exclude module: 'appcompat-v7'
+        exclude module: 'recyclerview-v7'
+        exclude module: 'support-annotations'
+    }
+
     compile 'com.soundcloud.android:android-crop:0.9.10@aar'
     compile 'com.android.support:appcompat-v7:21.0.3'
     compile 'com.android.support:recyclerview-v7:21.0.3'
@@ -84,7 +89,7 @@ dependencyVerification {
             'org.apache.httpcomponents:httpclient-android:6f56466a9bd0d42934b90bfbfe9977a8b654c058bf44a12bdc2877c4e1f033f1',
             'com.github.chrisbanes.photoview:library:8b5344e206f125e7ba9d684008f36c4992d03853c57e5814125f88496126e3cc',
             'com.makeramen:roundedimageview:7dda2e78c406760e5c356ccce59b0df46b5b171cf18abb891998594405021548',
-            'com.afollestad:material-dialogs:ccb013e6572c86cfcca433855cf0dbfbff9b5e7bb9d1f504b761a6bc6f467b60',
+            'com.afollestad:material-dialogs:6ed57c1c479219f8ae929c310fc171dbfcbcee8326a6dcd50a91959d69eccdf0',
             'com.soundcloud.android:android-crop:ffd4b973cf6e97f7d64118a0dc088df50e9066fd5634fe6911dd0c0c5d346177',
             'com.android.support:appcompat-v7:5dbeb5316d0a6027d646ae552804c3baa5e3bd53f7f33db50904d51505c8a0e5',
             'com.android.support:recyclerview-v7:e525ad3f33c84bb12b73d2dc975b55364a53f0f2d0697e043efba59ba73e22d2',
diff --git a/proguard.cfg b/proguard.cfg
index c7d20acd46..c13f7bf4eb 100644
--- a/proguard.cfg
+++ b/proguard.cfg
@@ -1,6 +1,6 @@
 -keepattributes **
 
--keep class !org.spongycastle.crypto.tls.**,!com.doomonafireball.betterpickers.**,!org.w3c.**,!android.support.v7.internal.view.menu.**,!org.spongycastle.asn1.**,!org.spongycastle.crypto.ec.**,!org.spongycastle.x509.**,!org.spongycastle.crypto.agreement.**,!org.spongycastle.crypto.ec.**,!org.spongycastle.math.**,!org.spongycastle.pqc.**,!org.spongycastle.jcajce.provider.asymmetric.**,!org.apache.http.**,** {*;}
+-keep class !com.afollestad.materialdialogs.**,!com.nineoldandroids.**,!org.spongycastle.crypto.tls.**,!com.doomonafireball.betterpickers.**,!org.w3c.**,!android.support.v7.internal.view.menu.**,!org.spongycastle.asn1.**,!org.spongycastle.crypto.ec.**,!org.spongycastle.x509.**,!org.spongycastle.crypto.agreement.**,!org.spongycastle.crypto.ec.**,!org.spongycastle.math.**,!org.spongycastle.pqc.**,!org.spongycastle.jcajce.provider.asymmetric.**,!org.apache.http.**,** {*;}
 -dontpreverify
 -dontoptimize
 -dontwarn **
diff --git a/res/drawable-hdpi/ic_account_box_dark.png b/res/drawable-hdpi/ic_account_box_dark.png
new file mode 100644
index 0000000000..5aed1dfcd6
Binary files /dev/null and b/res/drawable-hdpi/ic_account_box_dark.png differ
diff --git a/res/drawable-hdpi/ic_contact.png b/res/drawable-hdpi/ic_account_box_light.png
similarity index 100%
rename from res/drawable-hdpi/ic_contact.png
rename to res/drawable-hdpi/ic_account_box_light.png
diff --git a/res/drawable-hdpi/ic_attach_file.png b/res/drawable-hdpi/ic_attach_file_dark.png
similarity index 100%
rename from res/drawable-hdpi/ic_attach_file.png
rename to res/drawable-hdpi/ic_attach_file_dark.png
diff --git a/res/drawable-hdpi-v11/ic_attach_file.png b/res/drawable-hdpi/ic_attach_file_light.png
similarity index 100%
rename from res/drawable-hdpi-v11/ic_attach_file.png
rename to res/drawable-hdpi/ic_attach_file_light.png
diff --git a/res/drawable-hdpi/ic_dialog_alert_holo_dark.png b/res/drawable-hdpi/ic_dialog_alert_holo_dark.png
deleted file mode 100644
index 313982663c..0000000000
Binary files a/res/drawable-hdpi/ic_dialog_alert_holo_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_dialog_alert_holo_light.png b/res/drawable-hdpi/ic_dialog_alert_holo_light.png
deleted file mode 100644
index c2a62578e3..0000000000
Binary files a/res/drawable-hdpi/ic_dialog_alert_holo_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_dialog_info_holo_dark.png b/res/drawable-hdpi/ic_dialog_info_holo_dark.png
deleted file mode 100644
index 2f7baa4dff..0000000000
Binary files a/res/drawable-hdpi/ic_dialog_info_holo_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_dialog_info_holo_light.png b/res/drawable-hdpi/ic_dialog_info_holo_light.png
deleted file mode 100644
index 4c35c6cee6..0000000000
Binary files a/res/drawable-hdpi/ic_dialog_info_holo_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_group_grey600_24dp.png b/res/drawable-hdpi/ic_group_grey600_24dp.png
new file mode 100644
index 0000000000..816fe2053f
Binary files /dev/null and b/res/drawable-hdpi/ic_group_grey600_24dp.png differ
diff --git a/res/drawable-hdpi/ic_image_dark.png b/res/drawable-hdpi/ic_image_dark.png
new file mode 100644
index 0000000000..49cecb88f6
Binary files /dev/null and b/res/drawable-hdpi/ic_image_dark.png differ
diff --git a/res/drawable-hdpi/ic_image.png b/res/drawable-hdpi/ic_image_light.png
similarity index 100%
rename from res/drawable-hdpi/ic_image.png
rename to res/drawable-hdpi/ic_image_light.png
diff --git a/res/drawable-hdpi/ic_info_outline_dark.png b/res/drawable-hdpi/ic_info_outline_dark.png
new file mode 100644
index 0000000000..50765d9f65
Binary files /dev/null and b/res/drawable-hdpi/ic_info_outline_dark.png differ
diff --git a/res/drawable-hdpi/ic_info_outline_light.png b/res/drawable-hdpi/ic_info_outline_light.png
new file mode 100644
index 0000000000..765f2008a6
Binary files /dev/null and b/res/drawable-hdpi/ic_info_outline_light.png differ
diff --git a/res/drawable-hdpi/ic_menu_groups_holo_dark.png b/res/drawable-hdpi/ic_menu_groups_holo_dark.png
deleted file mode 100644
index 56744f9d94..0000000000
Binary files a/res/drawable-hdpi/ic_menu_groups_holo_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_movie_creation_dark.png b/res/drawable-hdpi/ic_movie_creation_dark.png
new file mode 100644
index 0000000000..71d25cbb10
Binary files /dev/null and b/res/drawable-hdpi/ic_movie_creation_dark.png differ
diff --git a/res/drawable-hdpi/ic_movie_creation.png b/res/drawable-hdpi/ic_movie_creation_light.png
similarity index 100%
rename from res/drawable-hdpi/ic_movie_creation.png
rename to res/drawable-hdpi/ic_movie_creation_light.png
diff --git a/res/drawable-hdpi/ic_volume_up_dark.png b/res/drawable-hdpi/ic_volume_up_dark.png
new file mode 100644
index 0000000000..ab9c27c5af
Binary files /dev/null and b/res/drawable-hdpi/ic_volume_up_dark.png differ
diff --git a/res/drawable-hdpi/ic_volume_up.png b/res/drawable-hdpi/ic_volume_up_light.png
similarity index 100%
rename from res/drawable-hdpi/ic_volume_up.png
rename to res/drawable-hdpi/ic_volume_up_light.png
diff --git a/res/drawable-hdpi/ic_warning_dark.png b/res/drawable-hdpi/ic_warning_dark.png
new file mode 100644
index 0000000000..3e808b04ce
Binary files /dev/null and b/res/drawable-hdpi/ic_warning_dark.png differ
diff --git a/res/drawable-hdpi/ic_warning_light.png b/res/drawable-hdpi/ic_warning_light.png
new file mode 100644
index 0000000000..9ee6976476
Binary files /dev/null and b/res/drawable-hdpi/ic_warning_light.png differ
diff --git a/res/drawable-mdpi/ic_account_box_dark.png b/res/drawable-mdpi/ic_account_box_dark.png
new file mode 100644
index 0000000000..285689f3c3
Binary files /dev/null and b/res/drawable-mdpi/ic_account_box_dark.png differ
diff --git a/res/drawable-mdpi/ic_contact.png b/res/drawable-mdpi/ic_account_box_light.png
similarity index 100%
rename from res/drawable-mdpi/ic_contact.png
rename to res/drawable-mdpi/ic_account_box_light.png
diff --git a/res/drawable-mdpi/ic_attach_file.png b/res/drawable-mdpi/ic_attach_file_dark.png
similarity index 100%
rename from res/drawable-mdpi/ic_attach_file.png
rename to res/drawable-mdpi/ic_attach_file_dark.png
diff --git a/res/drawable-mdpi-v11/ic_attach_file.png b/res/drawable-mdpi/ic_attach_file_light.png
similarity index 100%
rename from res/drawable-mdpi-v11/ic_attach_file.png
rename to res/drawable-mdpi/ic_attach_file_light.png
diff --git a/res/drawable-mdpi/ic_dialog_alert_holo_dark.png b/res/drawable-mdpi/ic_dialog_alert_holo_dark.png
deleted file mode 100644
index 836727f1ea..0000000000
Binary files a/res/drawable-mdpi/ic_dialog_alert_holo_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_dialog_alert_holo_light.png b/res/drawable-mdpi/ic_dialog_alert_holo_light.png
deleted file mode 100644
index 40d00f86fe..0000000000
Binary files a/res/drawable-mdpi/ic_dialog_alert_holo_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_dialog_info_holo_dark.png b/res/drawable-mdpi/ic_dialog_info_holo_dark.png
deleted file mode 100644
index e3b6472794..0000000000
Binary files a/res/drawable-mdpi/ic_dialog_info_holo_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_dialog_info_holo_light.png b/res/drawable-mdpi/ic_dialog_info_holo_light.png
deleted file mode 100644
index f4db6803f9..0000000000
Binary files a/res/drawable-mdpi/ic_dialog_info_holo_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_group_grey600_24dp.png b/res/drawable-mdpi/ic_group_grey600_24dp.png
new file mode 100644
index 0000000000..2c69b7cc14
Binary files /dev/null and b/res/drawable-mdpi/ic_group_grey600_24dp.png differ
diff --git a/res/drawable-mdpi/ic_image_dark.png b/res/drawable-mdpi/ic_image_dark.png
new file mode 100644
index 0000000000..3d0143714b
Binary files /dev/null and b/res/drawable-mdpi/ic_image_dark.png differ
diff --git a/res/drawable-mdpi/ic_image.png b/res/drawable-mdpi/ic_image_light.png
similarity index 100%
rename from res/drawable-mdpi/ic_image.png
rename to res/drawable-mdpi/ic_image_light.png
diff --git a/res/drawable-mdpi/ic_info_outline_dark.png b/res/drawable-mdpi/ic_info_outline_dark.png
new file mode 100644
index 0000000000..6a5be39a00
Binary files /dev/null and b/res/drawable-mdpi/ic_info_outline_dark.png differ
diff --git a/res/drawable-mdpi/ic_info_outline_light.png b/res/drawable-mdpi/ic_info_outline_light.png
new file mode 100644
index 0000000000..4d9f50cbc1
Binary files /dev/null and b/res/drawable-mdpi/ic_info_outline_light.png differ
diff --git a/res/drawable-mdpi/ic_menu_groups_holo_dark.png b/res/drawable-mdpi/ic_menu_groups_holo_dark.png
deleted file mode 100644
index 114a489ba5..0000000000
Binary files a/res/drawable-mdpi/ic_menu_groups_holo_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_movie_creation_dark.png b/res/drawable-mdpi/ic_movie_creation_dark.png
new file mode 100644
index 0000000000..1638f00a7c
Binary files /dev/null and b/res/drawable-mdpi/ic_movie_creation_dark.png differ
diff --git a/res/drawable-mdpi/ic_movie_creation.png b/res/drawable-mdpi/ic_movie_creation_light.png
similarity index 100%
rename from res/drawable-mdpi/ic_movie_creation.png
rename to res/drawable-mdpi/ic_movie_creation_light.png
diff --git a/res/drawable-mdpi/ic_volume_up_dark.png b/res/drawable-mdpi/ic_volume_up_dark.png
new file mode 100644
index 0000000000..5b8a65b56d
Binary files /dev/null and b/res/drawable-mdpi/ic_volume_up_dark.png differ
diff --git a/res/drawable-mdpi/ic_volume_up.png b/res/drawable-mdpi/ic_volume_up_light.png
similarity index 100%
rename from res/drawable-mdpi/ic_volume_up.png
rename to res/drawable-mdpi/ic_volume_up_light.png
diff --git a/res/drawable-mdpi/ic_warning_dark.png b/res/drawable-mdpi/ic_warning_dark.png
new file mode 100644
index 0000000000..cc81594263
Binary files /dev/null and b/res/drawable-mdpi/ic_warning_dark.png differ
diff --git a/res/drawable-mdpi/ic_warning_light.png b/res/drawable-mdpi/ic_warning_light.png
new file mode 100644
index 0000000000..f4164a9746
Binary files /dev/null and b/res/drawable-mdpi/ic_warning_light.png differ
diff --git a/res/drawable-xhdpi/ic_account_box_dark.png b/res/drawable-xhdpi/ic_account_box_dark.png
new file mode 100644
index 0000000000..2559c4dbf1
Binary files /dev/null and b/res/drawable-xhdpi/ic_account_box_dark.png differ
diff --git a/res/drawable-xhdpi/ic_contact.png b/res/drawable-xhdpi/ic_account_box_light.png
similarity index 100%
rename from res/drawable-xhdpi/ic_contact.png
rename to res/drawable-xhdpi/ic_account_box_light.png
diff --git a/res/drawable-xhdpi/ic_attach_file.png b/res/drawable-xhdpi/ic_attach_file_dark.png
similarity index 100%
rename from res/drawable-xhdpi/ic_attach_file.png
rename to res/drawable-xhdpi/ic_attach_file_dark.png
diff --git a/res/drawable-xhdpi-v11/ic_attach_file.png b/res/drawable-xhdpi/ic_attach_file_light.png
similarity index 100%
rename from res/drawable-xhdpi-v11/ic_attach_file.png
rename to res/drawable-xhdpi/ic_attach_file_light.png
diff --git a/res/drawable-xhdpi/ic_dialog_alert_holo_dark.png b/res/drawable-xhdpi/ic_dialog_alert_holo_dark.png
deleted file mode 100644
index 00c18766a5..0000000000
Binary files a/res/drawable-xhdpi/ic_dialog_alert_holo_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_dialog_alert_holo_light.png b/res/drawable-xhdpi/ic_dialog_alert_holo_light.png
deleted file mode 100644
index 2048c2b6f8..0000000000
Binary files a/res/drawable-xhdpi/ic_dialog_alert_holo_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_dialog_info_holo_dark.png b/res/drawable-xhdpi/ic_dialog_info_holo_dark.png
deleted file mode 100644
index b9796948a7..0000000000
Binary files a/res/drawable-xhdpi/ic_dialog_info_holo_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_dialog_info_holo_light.png b/res/drawable-xhdpi/ic_dialog_info_holo_light.png
deleted file mode 100644
index e6557c3fd0..0000000000
Binary files a/res/drawable-xhdpi/ic_dialog_info_holo_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_group_grey600_24dp.png b/res/drawable-xhdpi/ic_group_grey600_24dp.png
new file mode 100644
index 0000000000..1865da6942
Binary files /dev/null and b/res/drawable-xhdpi/ic_group_grey600_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_image_dark.png b/res/drawable-xhdpi/ic_image_dark.png
new file mode 100644
index 0000000000..e11a15faf2
Binary files /dev/null and b/res/drawable-xhdpi/ic_image_dark.png differ
diff --git a/res/drawable-xhdpi/ic_image.png b/res/drawable-xhdpi/ic_image_light.png
similarity index 100%
rename from res/drawable-xhdpi/ic_image.png
rename to res/drawable-xhdpi/ic_image_light.png
diff --git a/res/drawable-xhdpi/ic_info_outline_dark.png b/res/drawable-xhdpi/ic_info_outline_dark.png
new file mode 100644
index 0000000000..09a0c88068
Binary files /dev/null and b/res/drawable-xhdpi/ic_info_outline_dark.png differ
diff --git a/res/drawable-xhdpi/ic_info_outline_light.png b/res/drawable-xhdpi/ic_info_outline_light.png
new file mode 100644
index 0000000000..a4759ec06e
Binary files /dev/null and b/res/drawable-xhdpi/ic_info_outline_light.png differ
diff --git a/res/drawable-xhdpi/ic_menu_groups_holo_dark.png b/res/drawable-xhdpi/ic_menu_groups_holo_dark.png
deleted file mode 100644
index 105475b696..0000000000
Binary files a/res/drawable-xhdpi/ic_menu_groups_holo_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_movie_creation_dark.png b/res/drawable-xhdpi/ic_movie_creation_dark.png
new file mode 100644
index 0000000000..fc862cc1cd
Binary files /dev/null and b/res/drawable-xhdpi/ic_movie_creation_dark.png differ
diff --git a/res/drawable-xhdpi/ic_movie_creation.png b/res/drawable-xhdpi/ic_movie_creation_light.png
similarity index 100%
rename from res/drawable-xhdpi/ic_movie_creation.png
rename to res/drawable-xhdpi/ic_movie_creation_light.png
diff --git a/res/drawable-xhdpi/ic_volume_up_dark.png b/res/drawable-xhdpi/ic_volume_up_dark.png
new file mode 100644
index 0000000000..d613fa72b7
Binary files /dev/null and b/res/drawable-xhdpi/ic_volume_up_dark.png differ
diff --git a/res/drawable-xhdpi/ic_volume_up.png b/res/drawable-xhdpi/ic_volume_up_light.png
similarity index 100%
rename from res/drawable-xhdpi/ic_volume_up.png
rename to res/drawable-xhdpi/ic_volume_up_light.png
diff --git a/res/drawable-xhdpi/ic_warning_dark.png b/res/drawable-xhdpi/ic_warning_dark.png
new file mode 100644
index 0000000000..2dccad27da
Binary files /dev/null and b/res/drawable-xhdpi/ic_warning_dark.png differ
diff --git a/res/drawable-xhdpi/ic_warning_light.png b/res/drawable-xhdpi/ic_warning_light.png
new file mode 100644
index 0000000000..489662e29a
Binary files /dev/null and b/res/drawable-xhdpi/ic_warning_light.png differ
diff --git a/res/drawable-xxhdpi/ic_account_box_dark.png b/res/drawable-xxhdpi/ic_account_box_dark.png
new file mode 100644
index 0000000000..a95c8006c5
Binary files /dev/null and b/res/drawable-xxhdpi/ic_account_box_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_contact.png b/res/drawable-xxhdpi/ic_account_box_light.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_contact.png
rename to res/drawable-xxhdpi/ic_account_box_light.png
diff --git a/res/drawable-xxhdpi/ic_attach_file.png b/res/drawable-xxhdpi/ic_attach_file_dark.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_attach_file.png
rename to res/drawable-xxhdpi/ic_attach_file_dark.png
diff --git a/res/drawable-xxhdpi-v11/ic_attach_file.png b/res/drawable-xxhdpi/ic_attach_file_light.png
similarity index 100%
rename from res/drawable-xxhdpi-v11/ic_attach_file.png
rename to res/drawable-xxhdpi/ic_attach_file_light.png
diff --git a/res/drawable-xxhdpi/ic_dialog_alert_holo_dark.png b/res/drawable-xxhdpi/ic_dialog_alert_holo_dark.png
deleted file mode 100644
index 950499608d..0000000000
Binary files a/res/drawable-xxhdpi/ic_dialog_alert_holo_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_dialog_alert_holo_light.png b/res/drawable-xxhdpi/ic_dialog_alert_holo_light.png
deleted file mode 100644
index 30fe7cecb9..0000000000
Binary files a/res/drawable-xxhdpi/ic_dialog_alert_holo_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_dialog_info_holo_dark.png b/res/drawable-xxhdpi/ic_dialog_info_holo_dark.png
deleted file mode 100644
index 3d3b2b4c04..0000000000
Binary files a/res/drawable-xxhdpi/ic_dialog_info_holo_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_dialog_info_holo_light.png b/res/drawable-xxhdpi/ic_dialog_info_holo_light.png
deleted file mode 100644
index e0f1abc728..0000000000
Binary files a/res/drawable-xxhdpi/ic_dialog_info_holo_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_group_grey600_24dp.png b/res/drawable-xxhdpi/ic_group_grey600_24dp.png
new file mode 100644
index 0000000000..2aa030e4cf
Binary files /dev/null and b/res/drawable-xxhdpi/ic_group_grey600_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_image_dark.png b/res/drawable-xxhdpi/ic_image_dark.png
new file mode 100644
index 0000000000..95bac3e67c
Binary files /dev/null and b/res/drawable-xxhdpi/ic_image_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_image.png b/res/drawable-xxhdpi/ic_image_light.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_image.png
rename to res/drawable-xxhdpi/ic_image_light.png
diff --git a/res/drawable-xxhdpi/ic_info_outline_dark.png b/res/drawable-xxhdpi/ic_info_outline_dark.png
new file mode 100644
index 0000000000..dcdacc4623
Binary files /dev/null and b/res/drawable-xxhdpi/ic_info_outline_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_info_outline_light.png b/res/drawable-xxhdpi/ic_info_outline_light.png
new file mode 100644
index 0000000000..03b5165eb0
Binary files /dev/null and b/res/drawable-xxhdpi/ic_info_outline_light.png differ
diff --git a/res/drawable-xxhdpi/ic_menu_groups_holo_dark.png b/res/drawable-xxhdpi/ic_menu_groups_holo_dark.png
deleted file mode 100644
index f398969bb8..0000000000
Binary files a/res/drawable-xxhdpi/ic_menu_groups_holo_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_movie_creation_dark.png b/res/drawable-xxhdpi/ic_movie_creation_dark.png
new file mode 100644
index 0000000000..bb5c3ed9b6
Binary files /dev/null and b/res/drawable-xxhdpi/ic_movie_creation_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_movie_creation.png b/res/drawable-xxhdpi/ic_movie_creation_light.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_movie_creation.png
rename to res/drawable-xxhdpi/ic_movie_creation_light.png
diff --git a/res/drawable-xxhdpi/ic_volume_up_dark.png b/res/drawable-xxhdpi/ic_volume_up_dark.png
new file mode 100644
index 0000000000..ed4105b0fb
Binary files /dev/null and b/res/drawable-xxhdpi/ic_volume_up_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_volume_up.png b/res/drawable-xxhdpi/ic_volume_up_light.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_volume_up.png
rename to res/drawable-xxhdpi/ic_volume_up_light.png
diff --git a/res/drawable-xxhdpi/ic_warning_dark.png b/res/drawable-xxhdpi/ic_warning_dark.png
new file mode 100644
index 0000000000..93326709f5
Binary files /dev/null and b/res/drawable-xxhdpi/ic_warning_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_warning_light.png b/res/drawable-xxhdpi/ic_warning_light.png
new file mode 100644
index 0000000000..46255007f7
Binary files /dev/null and b/res/drawable-xxhdpi/ic_warning_light.png differ
diff --git a/res/layout/icon_list_item.xml b/res/layout/icon_list_item.xml
index f998b84192..9071aa443f 100644
--- a/res/layout/icon_list_item.xml
+++ b/res/layout/icon_list_item.xml
@@ -18,7 +18,6 @@
     <TextView android:id="@+id/text1"
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
-        android:textColor="@color/black"
         android:gravity="center_vertical"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:layout_gravity="center_horizontal|center_vertical" />
diff --git a/res/layout/message_details_header.xml b/res/layout/message_details_header.xml
index 1b3be55f0e..b0617bdfe3 100644
--- a/res/layout/message_details_header.xml
+++ b/res/layout/message_details_header.xml
@@ -14,8 +14,8 @@
               android:padding="5dp"
               tools:visibility="visible"
               android:text="@string/message_details_header__issues_need_your_attention"
-              android:drawableLeft="@drawable/ic_dialog_info_light"
-              android:drawableStart="@drawable/ic_dialog_info_light"
+              android:drawableLeft="@drawable/ic_info_outline_light"
+              android:drawableStart="@drawable/ic_info_outline_light"
               android:gravity="center_vertical" />
 
     <TableLayout android:id="@+id/metadata_container"
diff --git a/res/values-v11/resources.xml b/res/values-v11/resources.xml
deleted file mode 100644
index beaa5425a6..0000000000
--- a/res/values-v11/resources.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <item type="drawable" name="ic_dialog_info_light">@drawable/ic_dialog_info_holo_light</item>
-    <item type="drawable" name="ic_dialog_info_dark">@drawable/ic_dialog_info_holo_dark</item>
-    <item type="drawable" name="ic_dialog_alert_light">@drawable/ic_dialog_alert_holo_light</item>
-    <item type="drawable" name="ic_dialog_alert_dark">@drawable/ic_dialog_alert_holo_dark</item>
-</resources>
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 97e01d7734..58e787b36b 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -33,6 +33,11 @@
     <attr name="conversation_transport_popup_background" format="reference"/>
     <attr name="conversation_emoji_toggle" format="reference"/>
     <attr name="conversation_keyboard_toggle" format="reference"/>
+    <attr name="conversation_attach_file" format="reference"/>
+    <attr name="conversation_attach_image" format="reference"/>
+    <attr name="conversation_attach_video" format="reference"/>
+    <attr name="conversation_attach_sound" format="reference"/>
+    <attr name="conversation_attach_contact_info" format="reference"/>
 
     <attr name="conversation_item_background" format="reference"/>
     <attr name="conversation_item_received_background" format="reference" />
@@ -107,4 +112,5 @@
         <attr name="custom_pref_toggle" format="string"/>
     </declare-styleable>
 
+    <attr name="group_members_dialog_icon" format="reference"/>
 </resources>
diff --git a/res/values/resources.xml b/res/values/resources.xml
deleted file mode 100644
index 4c2a27a1b5..0000000000
--- a/res/values/resources.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <item type="drawable" name="ic_dialog_info_light">@android:drawable/ic_dialog_info</item>
-    <item type="drawable" name="ic_dialog_alert_light">@android:drawable/ic_dialog_alert</item>
-    <item type="drawable" name="ic_dialog_info_dark">@android:drawable/ic_dialog_info</item>
-    <item type="drawable" name="ic_dialog_alert_dark">@android:drawable/ic_dialog_alert</item>
-</resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c45da67288..d79a2cc547 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -96,7 +96,7 @@
     <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Sorry, the selected audio exceeds message size restrictions (%1$skB).</string>
     <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Recipient is not a valid SMS or email address!</string>
     <string name="ConversationActivity_message_is_empty_exclamation">Message is empty!</string>
-    <string name="ConversationActivity_group_conversation_recipients">Group conversation recipients</string>
+    <string name="ConversationActivity_group_members">Group members</string>
     <string name="ConversationActivity_group_conversation">Group conversation</string>
     <string name="ConversationActivity_unnamed_group">Unnamed group</string>
     <string name="ConversationActivity_d_recipients_in_group">%d members</string>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 77ea2cf827..84ba06936c 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -50,6 +50,11 @@
         <item name="conversation_transport_popup_background">@color/white</item>
         <item name="conversation_emoji_toggle">@drawable/ic_emoji_dark</item>
         <item name="conversation_keyboard_toggle">@drawable/ic_ime_dark</item>
+        <item name="conversation_attach_file">@drawable/ic_attach_file_light</item>
+        <item name="conversation_attach_image">@drawable/ic_image_light</item>
+        <item name="conversation_attach_video">@drawable/ic_movie_creation_light</item>
+        <item name="conversation_attach_sound">@drawable/ic_volume_up_light</item>
+        <item name="conversation_attach_contact_info">@drawable/ic_account_box_light</item>
 
         <item name="conversation_item_background">@drawable/conversation_item_background</item>
         <item name="conversation_item_received_background">@color/conversation_item_received_background_light</item>
@@ -67,8 +72,8 @@
         <item name="triangle_tick_outgoing_pending_sms">@drawable/triangle_tick_outgoing_pending_sms_light</item>
         <item name="triangle_tick_outgoing_pending_push">@drawable/triangle_tick_outgoing_pending_push_light</item>
 
-        <item name="dialog_info_icon">@drawable/ic_dialog_info_light</item>
-        <item name="dialog_alert_icon">@drawable/ic_dialog_alert_light</item>
+        <item name="dialog_info_icon">@drawable/ic_info_outline_light</item>
+        <item name="dialog_alert_icon">@drawable/ic_warning_light</item>
 
         <item name="import_export_item_background_color">@color/import_export_item_background_light</item>
         <item name="import_export_item_background_shadow_color">@color/import_export_item_background_shadow_light</item>
@@ -108,6 +113,8 @@
         <item name="pref_ic_advanced">@drawable/ic_advanced_black</item>
 
         <item name="app_protect_timeout_picker_color">@style/BetterPickersDialogFragment.Light</item>
+
+        <item name="group_members_dialog_icon">@drawable/ic_group_grey600_24dp</item>
     </style>
 
     <style name="TextSecure.DarkTheme" parent="@style/Theme.AppCompat">
@@ -117,6 +124,7 @@
         <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="android:textColor">@color/text_color_dark_theme</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_dark_theme</item>
+        <item name="md_dark_theme">true</item>
         <item name="conversation_list_item_background_read">@drawable/conversation_list_item_background_read_dark</item>
         <item name="conversation_list_item_background_unread">@drawable/conversation_list_item_background_unread_dark</item>
         <item name="conversation_list_item_background_selected">@drawable/list_selected_holo_dark</item>
@@ -156,8 +164,8 @@
         <item name="triangle_tick_outgoing_pending_sms">@drawable/triangle_tick_outgoing_pending_sms_dark</item>
         <item name="triangle_tick_outgoing_pending_push">@drawable/triangle_tick_outgoing_pending_push_dark</item>
 
-        <item name="dialog_info_icon">@drawable/ic_dialog_info_dark</item>
-        <item name="dialog_alert_icon">@drawable/ic_dialog_alert_dark</item>
+        <item name="dialog_info_icon">@drawable/ic_info_outline_dark</item>
+        <item name="dialog_alert_icon">@drawable/ic_warning_dark</item>
 
         <item name="import_export_item_background_color">@color/import_export_item_background_dark</item>
         <item name="import_export_item_background_shadow_color">@color/import_export_item_background_shadow_dark</item>
@@ -179,6 +187,11 @@
         <item name="conversation_transport_popup_background">@color/black</item>
         <item name="conversation_emoji_toggle">@drawable/ic_emoji_light</item>
         <item name="conversation_keyboard_toggle">@drawable/ic_ime_light</item>
+        <item name="conversation_attach_file">@drawable/ic_attach_file_dark</item>
+        <item name="conversation_attach_image">@drawable/ic_image_dark</item>
+        <item name="conversation_attach_video">@drawable/ic_movie_creation_dark</item>
+        <item name="conversation_attach_sound">@drawable/ic_volume_up_dark</item>
+        <item name="conversation_attach_contact_info">@drawable/ic_account_box_dark</item>
 
         <item name="menu_new_conversation_icon">@drawable/ic_add_white_24dp</item>
         <item name="menu_group_icon">@drawable/ic_group_white_24dp</item>
@@ -211,6 +224,8 @@
         <item name="pref_ic_advanced">@drawable/ic_advanced_gray</item>
 
         <item name="app_protect_timeout_picker_color">@style/BetterPickersDialogFragment</item>
+
+        <item name="group_members_dialog_icon">@drawable/ic_group_white_24dp</item>
     </style>
 
     <style name="TextSecure.Light.Dialog"
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 628ae103c9..a98ac21290 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -16,7 +16,6 @@
  */
 package org.thoughtcrime.securesms;
 
-import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -34,7 +33,6 @@ import android.text.InputType;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.Log;
-import android.view.ContextThemeWrapper;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -49,6 +47,7 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.afollestad.materialdialogs.AlertDialogWrapper;
 import com.google.protobuf.ByteString;
 
 import org.thoughtcrime.securesms.TransportOptions.OnTransportChangedListener;
@@ -97,7 +96,6 @@ import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.Emoji;
 import org.thoughtcrime.securesms.util.GroupUtil;
 import org.thoughtcrime.securesms.util.MemoryCleaner;
-import org.thoughtcrime.securesms.util.ResUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.libaxolotl.InvalidMessageException;
@@ -359,9 +357,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void handleAbortSecureSession() {
-    AlertDialog.Builder builder = new AlertDialog.Builder(this);
+    AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(this);
     builder.setTitle(R.string.ConversationActivity_abort_secure_session_confirmation);
-    builder.setIcon(ResUtil.getDrawable(this, R.attr.dialog_alert_icon));
+    builder.setIconAttribute(R.attr.dialog_alert_icon);
     builder.setCancelable(true);
     builder.setMessage(R.string.ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question);
     builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
@@ -406,9 +404,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       return;
     }
 
-    AlertDialog.Builder builder = new AlertDialog.Builder(this);
+    AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(this);
     builder.setTitle(getString(R.string.ConversationActivity_leave_group));
-    builder.setIcon(ResUtil.getDrawable(this, R.attr.dialog_info_icon));
+    builder.setIconAttribute(R.attr.dialog_info_icon);
     builder.setCancelable(true);
     builder.setMessage(getString(R.string.ConversationActivity_are_you_sure_you_want_to_leave_this_group));
     builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
@@ -499,9 +497,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void handleDeleteThread() {
-    AlertDialog.Builder builder = new AlertDialog.Builder(this);
+    AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(this);
     builder.setTitle(R.string.ConversationActivity_delete_thread_confirmation);
-    builder.setIcon(ResUtil.getDrawable(this, R.attr.dialog_alert_icon));
+    builder.setIconAttribute(R.attr.dialog_alert_icon);
     builder.setCancelable(true);
     builder.setMessage(R.string.ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question);
     builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
@@ -529,8 +527,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
   private void handleAddAttachment() {
     if (this.isMmsEnabled || DirectoryHelper.isPushDestination(this, getRecipients())) {
-      AlertDialog.Builder builder = new AlertDialog.Builder(new ContextThemeWrapper(this, R.style.TextSecure_Light_Dialog));
-      builder.setIcon(R.drawable.ic_attach_file);
+      AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(this);
+      builder.setIconAttribute(R.attr.conversation_attach_file);
       builder.setTitle(R.string.ConversationActivity_add_attachment);
       builder.setAdapter(attachmentAdapter, new AttachmentTypeListener());
       builder.show();
@@ -853,8 +851,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       numberItems[i] = contactData.numbers.get(i).type + ": " + contactData.numbers.get(i).number;
     }
 
-    AlertDialog.Builder builder = new AlertDialog.Builder(this);
-    builder.setIcon(R.drawable.ic_contact_picture);
+    AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(this);
+    builder.setIconAttribute(R.attr.conversation_attach_contact_info);
     builder.setTitle(R.string.ConversationActivity_select_contact_info);
 
     builder.setItems(numberItems, new DialogInterface.OnClickListener() {
@@ -1100,6 +1098,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     @Override
     public void onClick(DialogInterface dialog, int which) {
       addAttachment(attachmentAdapter.buttonToCommand(which));
+      dialog.dismiss();
     }
   }
 
diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/org/thoughtcrime/securesms/ConversationFragment.java
index e309300883..d415b28fc7 100644
--- a/src/org/thoughtcrime/securesms/ConversationFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationFragment.java
@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -26,6 +25,8 @@ import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.Toast;
 
+import com.afollestad.materialdialogs.AlertDialogWrapper;
+
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MmsSmsDatabase;
@@ -36,11 +37,9 @@ import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.recipients.RecipientFactory;
 import org.thoughtcrime.securesms.recipients.Recipients;
 import org.thoughtcrime.securesms.sms.MessageSender;
-import org.thoughtcrime.securesms.util.Dialogs;
 import org.thoughtcrime.securesms.util.DirectoryHelper;
 import org.thoughtcrime.securesms.util.FutureTaskListener;
 import org.thoughtcrime.securesms.util.ProgressDialogAsyncTask;
-import org.thoughtcrime.securesms.util.ResUtil;
 import org.thoughtcrime.securesms.util.SaveAttachmentTask;
 import org.thoughtcrime.securesms.util.SaveAttachmentTask.Attachment;
 
@@ -191,9 +190,9 @@ public class ConversationFragment extends ListFragment
   }
 
   private void handleDeleteMessages(final List<MessageRecord> messageRecords) {
-    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+    AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(getActivity());
     builder.setTitle(R.string.ConversationFragment_confirm_message_delete);
-    builder.setIcon(ResUtil.getDrawable(getActivity(), R.attr.dialog_alert_icon));
+    builder.setIconAttribute(R.attr.dialog_alert_icon);
     builder.setCancelable(true);
     builder.setMessage(R.string.ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages);
     builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java
index 62313a1960..8dd55021a2 100644
--- a/src/org/thoughtcrime/securesms/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationItem.java
@@ -16,7 +16,6 @@
  */
 package org.thoughtcrime.securesms;
 
-import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -24,8 +23,6 @@ import android.content.Intent;
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.os.Handler;
 import android.os.Looper;
 import android.provider.ContactsContract;
@@ -42,6 +39,8 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.afollestad.materialdialogs.AlertDialogWrapper;
+
 import org.thoughtcrime.securesms.ConversationFragment.SelectionClickListener;
 import org.thoughtcrime.securesms.components.ForegroundImageView;
 import org.thoughtcrime.securesms.contacts.ContactPhotoFactory;
@@ -463,9 +462,9 @@ public class ConversationItem extends LinearLayout {
 
         context.startActivity(intent);
       } else {
-        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+        AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(context);
         builder.setTitle(R.string.ConversationItem_view_secure_media_question);
-        builder.setIcon(ResUtil.getDrawable(context, R.attr.dialog_alert_icon));
+        builder.setIconAttribute(R.attr.dialog_alert_icon);
         builder.setCancelable(true);
         builder.setMessage(R.string.ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning);
         builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
@@ -546,7 +545,7 @@ public class ConversationItem extends LinearLayout {
 
     message = R.string.ConversationItem_click_to_approve_unencrypted_dialog_message;
 
-    AlertDialog.Builder builder = new AlertDialog.Builder(context);
+    AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(context);
     builder.setTitle(title);
 
     if (message > -1) builder.setMessage(message);
diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java
index 416048cf71..0cef89dea5 100644
--- a/src/org/thoughtcrime/securesms/ConversationListFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java
@@ -17,7 +17,6 @@
 package org.thoughtcrime.securesms;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -41,6 +40,7 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ListView;
 
+import com.afollestad.materialdialogs.AlertDialogWrapper;
 import com.melnykov.fab.FloatingActionButton;
 
 import org.thoughtcrime.securesms.components.DefaultSmsReminder;
@@ -53,7 +53,6 @@ import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.loaders.ConversationListLoader;
 import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.recipients.Recipients;
-import org.thoughtcrime.securesms.util.ResUtil;
 
 import java.util.Set;
 
@@ -196,8 +195,8 @@ public class ConversationListFragment extends ListFragment
   }
 
   private void handleDeleteAllSelected() {
-    AlertDialog.Builder alert = new AlertDialog.Builder(getActivity());
-    alert.setIcon(ResUtil.getDrawable(getActivity(), R.attr.dialog_alert_icon));
+    AlertDialogWrapper.Builder alert = new AlertDialogWrapper.Builder(getActivity());
+    alert.setIconAttribute(R.attr.dialog_alert_icon);
     alert.setTitle(R.string.ConversationListFragment_delete_threads_question);
     alert.setMessage(R.string.ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads);
     alert.setCancelable(true);
diff --git a/src/org/thoughtcrime/securesms/ExportFragment.java b/src/org/thoughtcrime/securesms/ExportFragment.java
index 0b1ae3eba9..658f4ff474 100644
--- a/src/org/thoughtcrime/securesms/ExportFragment.java
+++ b/src/org/thoughtcrime/securesms/ExportFragment.java
@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -14,11 +13,11 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
 
+import com.afollestad.materialdialogs.AlertDialogWrapper;
+
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.database.NoExternalStorageException;
 import org.thoughtcrime.securesms.database.PlaintextBackupExporter;
-import org.thoughtcrime.securesms.util.Dialogs;
-import org.thoughtcrime.securesms.util.ResUtil;
 
 import java.io.IOException;
 
@@ -74,8 +73,8 @@ public class ExportFragment extends Fragment {
 //  }
 
   private void handleExportPlaintextBackup() {
-    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-    builder.setIcon(ResUtil.getDrawable(getActivity(), R.attr.dialog_alert_icon));
+    AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(getActivity());
+    builder.setIconAttribute(R.attr.dialog_alert_icon);
     builder.setTitle(getActivity().getString(R.string.ExportFragment_export_plaintext_to_sd_card));
     builder.setMessage(getActivity().getString(R.string.ExportFragment_warning_this_will_export_the_plaintext_contents));
     builder.setPositiveButton(getActivity().getString(R.string.ExportFragment_export), new Dialog.OnClickListener() {
diff --git a/src/org/thoughtcrime/securesms/GroupMembersDialog.java b/src/org/thoughtcrime/securesms/GroupMembersDialog.java
index 0af456ee10..497216d6d4 100644
--- a/src/org/thoughtcrime/securesms/GroupMembersDialog.java
+++ b/src/org/thoughtcrime/securesms/GroupMembersDialog.java
@@ -1,11 +1,12 @@
 package org.thoughtcrime.securesms;
 
-import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.os.AsyncTask;
 import android.util.Log;
 
+import com.afollestad.materialdialogs.AlertDialogWrapper;
+
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.Recipients;
@@ -64,9 +65,9 @@ public class GroupMembersDialog extends AsyncTask<Void, Void, Recipients> {
       }
     }
 
-    AlertDialog.Builder builder = new AlertDialog.Builder(context);
-    builder.setTitle(R.string.ConversationActivity_group_conversation_recipients);
-    builder.setIcon(R.drawable.ic_menu_groups_holo_dark);
+    AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(context);
+    builder.setTitle(R.string.ConversationActivity_group_members);
+    builder.setIconAttribute(R.attr.group_members_dialog_icon);
     builder.setCancelable(true);
     builder.setItems(recipientStrings.toArray(new String[]{}), null);
     builder.setPositiveButton(android.R.string.ok, null);
diff --git a/src/org/thoughtcrime/securesms/ImportFragment.java b/src/org/thoughtcrime/securesms/ImportFragment.java
index 3b9fb8b71e..08ada1c12c 100644
--- a/src/org/thoughtcrime/securesms/ImportFragment.java
+++ b/src/org/thoughtcrime/securesms/ImportFragment.java
@@ -14,6 +14,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
 
+import com.afollestad.materialdialogs.AlertDialogWrapper;
+
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.EncryptedBackupExporter;
@@ -21,8 +23,6 @@ import org.thoughtcrime.securesms.database.NoExternalStorageException;
 import org.thoughtcrime.securesms.database.PlaintextBackupImporter;
 import org.thoughtcrime.securesms.service.ApplicationMigrationService;
 import org.thoughtcrime.securesms.service.KeyCachingService;
-import org.thoughtcrime.securesms.util.Dialogs;
-import org.thoughtcrime.securesms.util.ResUtil;
 
 import java.io.IOException;
 
@@ -82,8 +82,8 @@ public class ImportFragment extends Fragment {
   }
 
   private void handleImportSms() {
-    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-    builder.setIcon(ResUtil.getDrawable(getActivity(), R.attr.dialog_info_icon));
+    AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(getActivity());
+    builder.setIconAttribute(R.attr.dialog_info_icon);
     builder.setTitle(getActivity().getString(R.string.ImportFragment_import_system_sms_database));
     builder.setMessage(getActivity().getString(R.string.ImportFragment_this_will_import_messages_from_the_system));
     builder.setPositiveButton(getActivity().getString(R.string.ImportFragment_import), new AlertDialog.OnClickListener() {
@@ -108,8 +108,8 @@ public class ImportFragment extends Fragment {
   }
 
   private void handleImportEncryptedBackup() {
-    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-    builder.setIcon(ResUtil.getDrawable(getActivity(), R.attr.dialog_alert_icon));
+    AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(getActivity());
+    builder.setIconAttribute(R.attr.dialog_alert_icon);
     builder.setTitle(getActivity().getString(R.string.ImportFragment_restore_encrypted_backup));
     builder.setMessage(getActivity().getString(R.string.ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys));
     builder.setPositiveButton(getActivity().getString(R.string.ImportFragment_restore), new AlertDialog.OnClickListener() {
@@ -123,8 +123,8 @@ public class ImportFragment extends Fragment {
   }
 
   private void handleImportPlaintextBackup() {
-    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-    builder.setIcon(ResUtil.getDrawable(getActivity(), R.attr.dialog_alert_icon));
+    AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(getActivity());
+    builder.setIconAttribute(R.attr.dialog_alert_icon);
     builder.setTitle(getActivity().getString(R.string.ImportFragment_import_plaintext_backup));
     builder.setMessage(getActivity().getString(R.string.ImportFragment_this_will_import_messages_from_a_plaintext_backup));
     builder.setPositiveButton(getActivity().getString(R.string.ImportFragment_import), new AlertDialog.OnClickListener() {
diff --git a/src/org/thoughtcrime/securesms/RegistrationActivity.java b/src/org/thoughtcrime/securesms/RegistrationActivity.java
index c8f5d172e7..950b86fa44 100644
--- a/src/org/thoughtcrime/securesms/RegistrationActivity.java
+++ b/src/org/thoughtcrime/securesms/RegistrationActivity.java
@@ -1,11 +1,9 @@
 package org.thoughtcrime.securesms;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
 import android.telephony.TelephonyManager;
 import android.text.Editable;
 import android.text.TextUtils;
@@ -19,6 +17,7 @@ import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.afollestad.materialdialogs.AlertDialogWrapper;
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GooglePlayServicesUtil;
 import com.google.i18n.phonenumbers.AsYouTypeFormatter;
@@ -196,9 +195,10 @@ public class RegistrationActivity extends BaseActionBarActivity {
         return;
       }
 
-      AlertDialog.Builder dialog = new AlertDialog.Builder(self);
+      AlertDialogWrapper.Builder dialog = new AlertDialogWrapper.Builder(self);
       dialog.setTitle(PhoneNumberFormatter.getInternationalFormatFromE164(e164number));
-      dialog.setMessage(R.string.RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s);
+      dialog.setMessage(String.format(getString(R.string.RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s),
+                                      PhoneNumberFormatter.getInternationalFormatFromE164(e164number)));
       dialog.setPositiveButton(getString(R.string.RegistrationActivity_continue),
                                new DialogInterface.OnClickListener() {
                                  @Override
diff --git a/src/org/thoughtcrime/securesms/components/ExpiredBuildReminder.java b/src/org/thoughtcrime/securesms/components/ExpiredBuildReminder.java
index d8ee5d49c0..55ded55da2 100644
--- a/src/org/thoughtcrime/securesms/components/ExpiredBuildReminder.java
+++ b/src/org/thoughtcrime/securesms/components/ExpiredBuildReminder.java
@@ -18,7 +18,7 @@ public class ExpiredBuildReminder extends Reminder {
   private static final String TAG = ExpiredBuildReminder.class.getSimpleName();
 
   public ExpiredBuildReminder() {
-    super(R.drawable.ic_dialog_alert_holo_dark,
+    super(R.drawable.ic_warning_dark,
           R.string.reminder_header_expired_build,
           R.string.reminder_header_expired_build_details);
   }
diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentTypeSelectorAdapter.java b/src/org/thoughtcrime/securesms/mms/AttachmentTypeSelectorAdapter.java
index 3e271d786f..309871185a 100644
--- a/src/org/thoughtcrime/securesms/mms/AttachmentTypeSelectorAdapter.java
+++ b/src/org/thoughtcrime/securesms/mms/AttachmentTypeSelectorAdapter.java
@@ -26,6 +26,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.util.ResUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -70,10 +71,10 @@ public class AttachmentTypeSelectorAdapter extends ArrayAdapter<AttachmentTypeSe
 
   private static List<IconListItem> getItemList(Context context) {
     List<IconListItem> data = new ArrayList<>(4);
-    addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_picture), R.drawable.ic_image, ADD_IMAGE);
-    addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_video), R.drawable.ic_movie_creation, ADD_VIDEO);
-    addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_audio), R.drawable.ic_volume_up, ADD_SOUND);
-    addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_contact), R.drawable.ic_contact, ADD_CONTACT_INFO);
+    addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_picture), ResUtil.getDrawableRes(context, R.attr.conversation_attach_image),        ADD_IMAGE);
+    addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_video),   ResUtil.getDrawableRes(context, R.attr.conversation_attach_video),        ADD_VIDEO);
+    addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_audio),   ResUtil.getDrawableRes(context, R.attr.conversation_attach_sound),        ADD_SOUND);
+    addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_contact), ResUtil.getDrawableRes(context, R.attr.conversation_attach_contact_info), ADD_CONTACT_INFO);
 
     return data;
   }
diff --git a/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
index 18232a8722..29b97163ab 100644
--- a/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.preferences;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -14,6 +13,7 @@ import android.support.v4.preference.PreferenceFragment;
 import android.util.Log;
 import android.widget.Toast;
 
+import com.afollestad.materialdialogs.AlertDialogWrapper;
 import com.google.android.gms.gcm.GoogleCloudMessaging;
 
 import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
@@ -24,7 +24,6 @@ import org.thoughtcrime.securesms.contacts.ContactAccessor;
 import org.thoughtcrime.securesms.contacts.ContactIdentityManager;
 import org.thoughtcrime.securesms.push.TextSecureCommunicationFactory;
 import org.thoughtcrime.securesms.util.ProgressDialogAsyncTask;
-import org.thoughtcrime.securesms.util.ResUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.whispersystems.libaxolotl.util.guava.Optional;
 import org.whispersystems.textsecure.api.TextSecureAccountManager;
@@ -173,8 +172,8 @@ public class AdvancedPreferenceFragment extends PreferenceFragment {
     @Override
     public boolean onPreferenceChange(final Preference preference, Object newValue) {
       if (((CheckBoxPreference)preference).isChecked()) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder.setIcon(ResUtil.getDrawable(getActivity(), R.attr.dialog_info_icon));
+        AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(getActivity());
+        builder.setIconAttribute(R.attr.dialog_info_icon);
         builder.setTitle(R.string.ApplicationPreferencesActivity_disable_push_messages);
         builder.setMessage(R.string.ApplicationPreferencesActivity_this_will_disable_push_messages);
         builder.setNegativeButton(android.R.string.cancel, null);
diff --git a/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java
index e90bbd41e3..736d1c7477 100644
--- a/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java
@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.preferences;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -13,6 +12,7 @@ import android.preference.PreferenceScreen;
 import android.support.v4.preference.PreferenceFragment;
 import android.widget.Toast;
 
+import com.afollestad.materialdialogs.AlertDialogWrapper;
 import com.doomonafireball.betterpickers.hmspicker.HmsPickerBuilder;
 import com.doomonafireball.betterpickers.hmspicker.HmsPickerDialogFragment;
 
@@ -22,8 +22,6 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
 import org.thoughtcrime.securesms.service.KeyCachingService;
-import org.thoughtcrime.securesms.util.Dialogs;
-import org.thoughtcrime.securesms.util.ResUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 import java.util.concurrent.TimeUnit;
@@ -121,10 +119,10 @@ public class AppProtectionPreferenceFragment extends PreferenceFragment {
     @Override
     public boolean onPreferenceChange(final Preference preference, Object newValue) {
       if (((CheckBoxPreference)preference).isChecked()) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(getActivity());
         builder.setTitle(R.string.ApplicationPreferencesActivity_disable_storage_encryption);
         builder.setMessage(R.string.ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages);
-        builder.setIcon(ResUtil.getDrawable(getActivity(), R.attr.dialog_alert_icon));
+        builder.setIconAttribute(R.attr.dialog_alert_icon);
         builder.setPositiveButton(R.string.ApplicationPreferencesActivity_disable, new DialogInterface.OnClickListener() {
           @Override
           public void onClick(DialogInterface dialog, int which) {
diff --git a/src/org/thoughtcrime/securesms/preferences/LedBlinkPatternListPreference.java b/src/org/thoughtcrime/securesms/preferences/LedBlinkPatternListPreference.java
index a6e3745eb3..445669b3e4 100644
--- a/src/org/thoughtcrime/securesms/preferences/LedBlinkPatternListPreference.java
+++ b/src/org/thoughtcrime/securesms/preferences/LedBlinkPatternListPreference.java
@@ -16,13 +16,10 @@
  */
 package org.thoughtcrime.securesms.preferences;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.SharedPreferences;
 import android.os.Parcelable;
 import android.preference.ListPreference;
-import android.preference.PreferenceManager;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -31,11 +28,10 @@ import android.widget.SeekBar.OnSeekBarChangeListener;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
+import com.afollestad.materialdialogs.AlertDialogWrapper;
+
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.util.ResUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.Dialogs;
 
 /**
  * List preference for LED blink pattern notification.
@@ -82,14 +78,13 @@ public class LedBlinkPatternListPreference extends ListPreference implements OnS
   }
 
   private void initializeDialog(View view) {
-    AlertDialog.Builder builder = new AlertDialog.Builder(context);
-    builder.setIcon(ResUtil.getDrawable(context, R.attr.dialog_info_icon));
+    AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(context);
+    builder.setIconAttribute(R.attr.dialog_info_icon);
     builder.setTitle(R.string.preferences__pref_led_blink_custom_pattern_title);
     builder.setView(view);
     builder.setOnCancelListener(new CustomDialogCancelListener());
     builder.setNegativeButton(android.R.string.cancel, new CustomDialogCancelListener());
     builder.setPositiveButton(android.R.string.ok, new CustomDialogClickListener());
-    builder.setInverseBackgroundForced(true);
     builder.show();
   }
 
diff --git a/src/org/thoughtcrime/securesms/preferences/StoragePreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/StoragePreferenceFragment.java
index ee25cfdb76..616ba275b6 100644
--- a/src/org/thoughtcrime/securesms/preferences/StoragePreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/StoragePreferenceFragment.java
@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.preferences;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
@@ -9,6 +8,8 @@ import android.preference.Preference;
 import android.support.v4.preference.PreferenceFragment;
 import android.util.Log;
 
+import com.afollestad.materialdialogs.AlertDialogWrapper;
+
 import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -38,7 +39,7 @@ public class StoragePreferenceFragment extends PreferenceFragment {
     @Override
     public boolean onPreferenceClick(Preference preference) {
       final int threadLengthLimit = TextSecurePreferences.getThreadTrimLength(getActivity());
-      AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+      AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(getActivity());
       builder.setTitle(R.string.ApplicationPreferencesActivity_delete_all_old_messages_now);
       builder.setMessage(getString(R.string.ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages,
                                    threadLengthLimit));
diff --git a/src/org/thoughtcrime/securesms/util/Dialogs.java b/src/org/thoughtcrime/securesms/util/Dialogs.java
index 74a2985444..c7a10d5037 100644
--- a/src/org/thoughtcrime/securesms/util/Dialogs.java
+++ b/src/org/thoughtcrime/securesms/util/Dialogs.java
@@ -16,28 +16,27 @@
  */
 package org.thoughtcrime.securesms.util;
 
-import android.app.AlertDialog;
 import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.util.TypedValue;
+
+import com.afollestad.materialdialogs.AlertDialogWrapper;
 
 import org.thoughtcrime.securesms.R;
 
 public class Dialogs {
   public static void showAlertDialog(Context context, String title, String message) {
-    AlertDialog.Builder dialog = new AlertDialog.Builder(context);
+    AlertDialogWrapper.Builder dialog = new AlertDialogWrapper.Builder(context);
     dialog.setTitle(title);
     dialog.setMessage(message);
-    dialog.setIcon(ResUtil.getDrawable(context, R.attr.dialog_alert_icon));
+    dialog.setIconAttribute(R.attr.dialog_alert_icon);
     dialog.setPositiveButton(android.R.string.ok, null);
     dialog.show();
   }
 
   public static void showInfoDialog(Context context, String title, String message) {
-    AlertDialog.Builder dialog = new AlertDialog.Builder(context);
+    AlertDialogWrapper.Builder dialog = new AlertDialogWrapper.Builder(context);
     dialog.setTitle(title);
     dialog.setMessage(message);
-    dialog.setIcon(ResUtil.getDrawable(context, R.attr.dialog_info_icon));
+    dialog.setIconAttribute(R.attr.dialog_info_icon);
     dialog.setPositiveButton(android.R.string.ok, null);
     dialog.show();
   }
diff --git a/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java b/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java
index f63608a87f..0d710aaaf1 100644
--- a/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java
+++ b/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java
@@ -1,7 +1,5 @@
 package org.thoughtcrime.securesms.util;
 
-import android.app.AlertDialog;
-import android.content.ContentUris;
 import android.content.Context;
 import android.content.DialogInterface.OnClickListener;
 import android.media.MediaScannerConnection;
@@ -11,9 +9,10 @@ import android.util.Log;
 import android.webkit.MimeTypeMap;
 import android.widget.Toast;
 
+import com.afollestad.materialdialogs.AlertDialogWrapper;
+
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 
 import java.io.File;
@@ -150,9 +149,9 @@ public class SaveAttachmentTask extends ProgressDialogAsyncTask<SaveAttachmentTa
   }
 
   public static void showWarningDialog(Context context, OnClickListener onAcceptListener) {
-    AlertDialog.Builder builder = new AlertDialog.Builder(context);
+    AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(context);
     builder.setTitle(R.string.ConversationFragment_save_to_sd_card);
-    builder.setIcon(ResUtil.getDrawable(context, R.attr.dialog_alert_icon));
+    builder.setIconAttribute(R.attr.dialog_alert_icon);
     builder.setCancelable(true);
     builder.setMessage(R.string.ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning);
     builder.setPositiveButton(R.string.yes, onAcceptListener);