diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 70d18154903e6fbf08e1bc90a20158aefc1af8d1..2de7ca14a599325c33af577160b85fb800575179 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 0000000000000000000000000000000000000000..e2b58373c0ccbf9a743884923d46baf32677dbcc
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 3125b12dd7e2cb9e74a7dfe1733b41c8b4a72743..d48df2c3856d65f15f5fecc5130f41916b8594a8 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 0000000000000000000000000000000000000000..f1c6e150b9afa8959094b3eaeedfb8eccab2b37d
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 0000000000000000000000000000000000000000..38e7b3e401f072c0e397e874777ca54060240b6c
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 b3c9a5e105a83540870092f7fa5605fe1b8dc729..200daf4c951ab01ef7db40eea006578bd744e101 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 0000000000000000000000000000000000000000..072e7ba7bfef7e825b024a65f472c15313f9e175
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 0000000000000000000000000000000000000000..75a1b11112abf289d5ff5ceb9581f5fc0ce6632d
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 5ef36c2f15865ff33a63b5b9388e26c19a764275..927a2d2a565590bf0545375c86fc6b3e6c59f507 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 0000000000000000000000000000000000000000..0500d3750696f639b89d0ac8e69e8b482f288356
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 9dbbdd9713a9a9fbb333072d33334dfcd3c23a74..3f856599c5a39178bcb65ae9d5a832c36cb094fb 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 0000000000000000000000000000000000000000..962dc126f32226a84c2ec056af046c63a2dbb645
Binary files /dev/null and b/res/drawable-xxhdpi/ic_notification.png differ