diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 70d181549..2de7ca14a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -41,7 +41,8 @@
             android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_conversations"
             android:windowSoftInputMode="stateHidden"
-            android:launchMode="singleTask" >
+            android:launchMode="singleTask"
+            android:logo="@drawable/ic_activity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -51,29 +52,34 @@
         <activity
             android:name="eu.siacs.conversations.ui.SettingsActivity"
             android:label="@string/title_activity_settings"
-            android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" >
+            android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity"
+            android:logo="@drawable/ic_activity">
         </activity>
         <activity
             android:name="eu.siacs.conversations.ui.ManageAccountActivity"
             android:label="@string/title_activity_manage_accounts"
             android:configChanges="orientation|screenSize"
-            android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" >
+            android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity"
+            android:logo="@drawable/ic_activity">
         </activity>
         <activity
             android:name="eu.siacs.conversations.ui.MucDetailsActivity"
             android:label="@string/title_activity_conference_details"
-            android:windowSoftInputMode="stateHidden" >
+            android:windowSoftInputMode="stateHidden"
+            android:logo="@drawable/ic_activity">
         </activity>
         <activity
             android:name="eu.siacs.conversations.ui.ContactDetailsActivity"
             android:label="@string/title_activity_contact_details"
-            android:windowSoftInputMode="stateHidden" >
+            android:windowSoftInputMode="stateHidden"
+            android:logo="@drawable/ic_activity">
         </activity>
         <activity
             android:name="eu.siacs.conversations.ui.ContactsActivity"
             android:label="@string/title_activity_contacts"
             android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity"
-            android:windowSoftInputMode="stateHidden" >
+            android:windowSoftInputMode="stateHidden"
+            android:logo="@drawable/ic_activity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="de.gultsch.chat.ui.ConversationActivity" />
@@ -88,7 +94,7 @@
             android:name="eu.siacs.conversations.ui.ShareWithActivity"
             android:label="@string/title_activity_conversations"
             android:theme="@android:style/Theme.Holo.Light.DialogWhenLarge"
-            android:icon="@drawable/ic_launcher">
+            android:icon="@drawable/ic_activity">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/res/drawable-hdpi/ic_activity.png b/res/drawable-hdpi/ic_activity.png
new file mode 100644
index 000000000..e2b58373c
Binary files /dev/null and b/res/drawable-hdpi/ic_activity.png differ
diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png
index 3125b12dd..d48df2c38 100644
Binary files a/res/drawable-hdpi/ic_launcher.png and b/res/drawable-hdpi/ic_launcher.png differ
diff --git a/res/drawable-hdpi/ic_notification.png b/res/drawable-hdpi/ic_notification.png
new file mode 100644
index 000000000..f1c6e150b
Binary files /dev/null and b/res/drawable-hdpi/ic_notification.png differ
diff --git a/res/drawable-mdpi/ic_activity.png b/res/drawable-mdpi/ic_activity.png
new file mode 100644
index 000000000..38e7b3e40
Binary files /dev/null and b/res/drawable-mdpi/ic_activity.png differ
diff --git a/res/drawable-mdpi/ic_launcher.png b/res/drawable-mdpi/ic_launcher.png
index b3c9a5e10..200daf4c9 100644
Binary files a/res/drawable-mdpi/ic_launcher.png and b/res/drawable-mdpi/ic_launcher.png differ
diff --git a/res/drawable-mdpi/ic_notification.png b/res/drawable-mdpi/ic_notification.png
new file mode 100644
index 000000000..072e7ba7b
Binary files /dev/null and b/res/drawable-mdpi/ic_notification.png differ
diff --git a/res/drawable-xhdpi/ic_activity.png b/res/drawable-xhdpi/ic_activity.png
new file mode 100644
index 000000000..75a1b1111
Binary files /dev/null and b/res/drawable-xhdpi/ic_activity.png differ
diff --git a/res/drawable-xhdpi/ic_launcher.png b/res/drawable-xhdpi/ic_launcher.png
index 5ef36c2f1..927a2d2a5 100644
Binary files a/res/drawable-xhdpi/ic_launcher.png and b/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/res/drawable-xhdpi/ic_notification.png b/res/drawable-xhdpi/ic_notification.png
new file mode 100644
index 000000000..0500d3750
Binary files /dev/null and b/res/drawable-xhdpi/ic_notification.png differ
diff --git a/res/drawable-xxhdpi/ic_launcher.png b/res/drawable-xxhdpi/ic_launcher.png
index 9dbbdd971..3f856599c 100644
Binary files a/res/drawable-xxhdpi/ic_launcher.png and b/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/res/drawable-xxhdpi/ic_notification.png b/res/drawable-xxhdpi/ic_notification.png
new file mode 100644
index 000000000..962dc126f
Binary files /dev/null and b/res/drawable-xxhdpi/ic_notification.png differ