diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index b58073298ce65606d0c7c1bc32b22e6d432b38d5..94fa7525b0d1f889f0f9f8b55a188ce094bf0fc0 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -560,10 +560,10 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 			}
 		}
 
-		int ic_notifications = 		  getThemeResource(R.attr.icon_notifications, R.drawable.ic_notifications_black54_24dp);
-		int ic_notifications_off = 	  getThemeResource(R.attr.icon_notifications_off, R.drawable.ic_notifications_off_black54_24dp);
-		int ic_notifications_paused = getThemeResource(R.attr.icon_notifications_paused, R.drawable.ic_notifications_paused_black54_24dp);
-		int ic_notifications_none =	  getThemeResource(R.attr.icon_notifications_none, R.drawable.ic_notifications_none_black54_24dp);
+		int ic_notifications = 		  getThemeResource(R.attr.icon_notifications, R.drawable.ic_notifications_black_24dp);
+		int ic_notifications_off = 	  getThemeResource(R.attr.icon_notifications_off, R.drawable.ic_notifications_off_black_24dp);
+		int ic_notifications_paused = getThemeResource(R.attr.icon_notifications_paused, R.drawable.ic_notifications_paused_black_24dp);
+		int ic_notifications_none =	  getThemeResource(R.attr.icon_notifications_none, R.drawable.ic_notifications_none_black_24dp);
 
 		long mutedTill = mConversation.getLongAttribute(Conversation.ATTRIBUTE_MUTED_TILL,0);
 		if (mutedTill == Long.MAX_VALUE) {
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index d6dff80efdef8ce24ee819d6629043dd32f9a712..72f2007c3a3f2d88fe9b258218a5d496d0dbb926 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -1515,7 +1515,9 @@ public class ConversationActivity extends XmppActivity
 					}
 				});
 			}
-			builder.create().show();
+			AlertDialog dialog = builder.create();
+			dialog.setCanceledOnTouchOutside(false);
+			dialog.show();
 		}
 	}
 
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
index daa569de547bf0376030a892696a68cf30b4e3a3..202c80357839d5b2b08743b89249bdcb7072152b 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -126,17 +126,17 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 		long muted_till = conversation.getLongAttribute(Conversation.ATTRIBUTE_MUTED_TILL,0);
 		if (muted_till == Long.MAX_VALUE) {
 			notificationStatus.setVisibility(View.VISIBLE);
-			int ic_notifications_off = 	  activity.getThemeResource(R.attr.icon_notifications_off, R.drawable.ic_notifications_off_black54_24dp);
+			int ic_notifications_off = 	  activity.getThemeResource(R.attr.icon_notifications_off, R.drawable.ic_notifications_off_black_24dp);
 			notificationStatus.setImageResource(ic_notifications_off);
 		} else if (muted_till >= System.currentTimeMillis()) {
 			notificationStatus.setVisibility(View.VISIBLE);
-			int ic_notifications_paused = activity.getThemeResource(R.attr.icon_notifications_paused, R.drawable.ic_notifications_paused_black54_24dp);
+			int ic_notifications_paused = activity.getThemeResource(R.attr.icon_notifications_paused, R.drawable.ic_notifications_paused_black_24dp);
 			notificationStatus.setImageResource(ic_notifications_paused);
 		} else if (conversation.alwaysNotify()) {
 			notificationStatus.setVisibility(View.GONE);
 		} else {
 			notificationStatus.setVisibility(View.VISIBLE);
-			int ic_notifications_none =	  activity.getThemeResource(R.attr.icon_notifications_none, R.drawable.ic_notifications_none_black54_24dp);
+			int ic_notifications_none =	  activity.getThemeResource(R.attr.icon_notifications_none, R.drawable.ic_notifications_none_black_24dp);
 			notificationStatus.setImageResource(ic_notifications_none);
 		}
 
diff --git a/src/main/res/drawable-hdpi/ic_notifications_black54_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_black54_24dp.png
deleted file mode 100644
index d0e987e89e9b93ec06554d6ea058612050a3fbff..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-hdpi/ic_notifications_black54_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_none_black54_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_none_black54_24dp.png
deleted file mode 100644
index 6ea331d130902037ea61b54fa7a6b443ef035c3c..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-hdpi/ic_notifications_none_black54_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_off_black54_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_off_black54_24dp.png
deleted file mode 100644
index 98c28297844c63557a2861c13149b57e7013bde1..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-hdpi/ic_notifications_off_black54_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_paused_black54_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_paused_black54_24dp.png
deleted file mode 100644
index 3366fc69367614f5c676ddcb3f5a8ec82e9e060c..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-hdpi/ic_notifications_paused_black54_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_black54_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_black54_24dp.png
deleted file mode 100644
index 91cd0b8497f95932dc15b0692f336abb90d8210b..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-mdpi/ic_notifications_black54_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_none_black54_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_none_black54_24dp.png
deleted file mode 100644
index 7c41a4452e97ea8fe969049e18286c2568f8ab1b..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-mdpi/ic_notifications_none_black54_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_off_black54_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_off_black54_24dp.png
deleted file mode 100644
index c2ee2de297d23a37e43662fe04615962dcfc34aa..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-mdpi/ic_notifications_off_black54_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_paused_black54_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_paused_black54_24dp.png
deleted file mode 100644
index 0c4fc2eff7a35449b927a5b0a3d4fd427470002d..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-mdpi/ic_notifications_paused_black54_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_black54_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_black54_24dp.png
deleted file mode 100644
index 9bc2a6a6cc1c4c727814fe121127e6683f104d7d..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xhdpi/ic_notifications_black54_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_none_black54_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_none_black54_24dp.png
deleted file mode 100644
index d5586382912b96f8eb2f4fd591d864dce080f257..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xhdpi/ic_notifications_none_black54_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_off_black54_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_off_black54_24dp.png
deleted file mode 100644
index 92dbcf147ce43021f0f564ec37f38f6e7652d0a8..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xhdpi/ic_notifications_off_black54_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_paused_black54_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_paused_black54_24dp.png
deleted file mode 100644
index cd0ddaa036a20c26b828ab184266807f82017e0f..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xhdpi/ic_notifications_paused_black54_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_black54_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_black54_24dp.png
deleted file mode 100644
index 25ca3bf2bcbdb5a7c3b41b4f0a082c6cc4a69e6a..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_notifications_black54_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_none_black54_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_none_black54_24dp.png
deleted file mode 100644
index d11bf922bb9a81a93eec4e310b2583760c03ab2d..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_notifications_none_black54_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_off_black54_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_off_black54_24dp.png
deleted file mode 100644
index bbef755487cde0af881620c175659eb7161c4994..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_notifications_off_black54_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_paused_black54_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_paused_black54_24dp.png
deleted file mode 100644
index 108f7b94417b0941e60681f9b59e8435ec53e2db..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_notifications_paused_black54_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_black54_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_black54_24dp.png
deleted file mode 100644
index c05fd3b548ce0564cd98ce83aa971f86e50c7b18..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_notifications_black54_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_none_black54_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_none_black54_24dp.png
deleted file mode 100644
index c433379fb616e8030f0f56f7f1b953d6d434dbd3..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_notifications_none_black54_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_off_black54_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_off_black54_24dp.png
deleted file mode 100644
index 2d50a52577c07a764e4c5d683fed8c5a5278d42b..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_notifications_off_black54_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_paused_black54_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_black54_24dp.png
deleted file mode 100644
index 647a611a2968239eb62a50d5c2ebda99d69e6685..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_notifications_paused_black54_24dp.png and /dev/null differ
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index f4e45598fe10b46f2e672993f41a75a98a38d3cf..56b7f90b8dc700bb5cbfc01b19e204d1cba85162 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -134,6 +134,7 @@
 					android:layout_centerVertical="true"
 					android:background="?android:selectableItemBackground"
 					android:padding="@dimen/image_button_padding"
+					android:alpha="?attr/icon_alpha"
 					android:src="?attr/icon_notifications"/>
 			</RelativeLayout>
 
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 12605e6ca2e0b32d9610a48ebfea2b01a5b33c40..65be4802a3bef9a5e45205bdda74ffa036e8ddf2 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -109,6 +109,7 @@
                         android:layout_alignWithParentIfMissing="true"
                         android:layout_centerVertical="true"
                         android:layout_marginLeft="4dp"
+                        android:alpha="?attr/icon_alpha"
                         android:src="?attr/icon_notifications"
                         />
                     <eu.siacs.conversations.ui.widget.UnreadCountCustomView
diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
index af283d2fadec51140ed7cff70402d2c2a21e6bd7..8e57ef2d054506f08f2ab85bc12f6119bd0d4ac0 100644
--- a/src/main/res/values-v21/themes.xml
+++ b/src/main/res/values-v21/themes.xml
@@ -73,10 +73,10 @@
         <item name="attr/icon_share">@drawable/ic_share_white_24dp</item>
         <item name="attr/icon_scan_qr_code">@drawable/ic_camera_alt_white_24dp</item>
 
-        <item name="attr/icon_notifications">@drawable/ic_notifications_black54_24dp</item>
-        <item name="attr/icon_notifications_off">@drawable/ic_notifications_off_black54_24dp</item>
-        <item name="attr/icon_notifications_paused">@drawable/ic_notifications_paused_black54_24dp</item>
-        <item name="attr/icon_notifications_none">@drawable/ic_notifications_none_black54_24dp</item>
+        <item name="attr/icon_notifications">@drawable/ic_notifications_black_24dp</item>
+        <item name="attr/icon_notifications_off">@drawable/ic_notifications_off_black_24dp</item>
+        <item name="attr/icon_notifications_paused">@drawable/ic_notifications_paused_black_24dp</item>
+        <item name="attr/icon_notifications_none">@drawable/ic_notifications_none_black_24dp</item>
     </style>
 
     <style name="ConversationsTheme.Dark" parent="android:Theme.Material">
@@ -123,7 +123,7 @@
 
         <item name="attr/conversations_overview_background">@color/primary900</item>
 
-        <item name="attr/icon_alpha">1.0</item>
+        <item name="attr/icon_alpha">0.7</item>
 
         <item name="attr/dialog_horizontal_padding">24dp</item>
         <item name="attr/dialog_vertical_padding">16dp</item>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index ad1640c3b04aec932356a885fe110af50ce795ba..c4c925f325ab7e27de05c1a41c4b416c16bb0966 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -70,10 +70,10 @@
         <item name="attr/icon_share">@drawable/ic_action_share</item>
         <item name="attr/icon_scan_qr_code">@drawable/ic_action_camera</item>
 
-        <item name="attr/icon_notifications">@drawable/ic_notifications_black54_24dp</item>
-        <item name="attr/icon_notifications_off">@drawable/ic_notifications_off_black54_24dp</item>
-        <item name="attr/icon_notifications_paused">@drawable/ic_notifications_paused_black54_24dp</item>
-        <item name="attr/icon_notifications_none">@drawable/ic_notifications_none_black54_24dp</item>
+        <item name="attr/icon_notifications">@drawable/ic_notifications_black_24dp</item>
+        <item name="attr/icon_notifications_off">@drawable/ic_notifications_off_black_24dp</item>
+        <item name="attr/icon_notifications_paused">@drawable/ic_notifications_paused_black_24dp</item>
+        <item name="attr/icon_notifications_none">@drawable/ic_notifications_none_black_24dp</item>
     </style>
 
     <style name="ConversationsTheme.Dark" parent="@android:style/Theme.Holo">