diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
index 4d910e3c..34ffb569 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
@@ -604,16 +604,16 @@ public class MainActivity extends AppCompatActivity
         MenuItem itemNotification = menu.findItem(R.id.action_notifications);
         if (itemNotification != null) {
             if (notificationCount > 0) {
-                itemNotification.setIcon(R.drawable.ic_bell_ring_white_24dp);
+                itemNotification.setIcon(R.drawable.ic_notifications_colored_48px);
             } else {
-                itemNotification.setIcon(R.drawable.ic_bell_outline_white_24dp);
+                itemNotification.setIcon(R.drawable.ic_notifications_white_48px);
             }
 
             MenuItem itemConversation = menu.findItem(R.id.action_conversations);
             if (conversationCount > 0) {
-                itemConversation.setIcon(R.drawable.ic_message_text_white_24dp);
+                itemConversation.setIcon(R.drawable.ic_email_colored_48px);
             } else {
-                itemConversation.setIcon(R.drawable.ic_message_text_outline_white_24dp);
+                itemConversation.setIcon(R.drawable.ic_mail_white_48px);
             }
         }
         return super.onPrepareOptionsMenu(menu);
@@ -944,11 +944,11 @@ public class MainActivity extends AppCompatActivity
 
                     if (item != null) {
                         if (notificationCount > 0) {
-                            item.setIcon(R.drawable.ic_bell_ring_white_24dp);
+                            item.setIcon(R.drawable.ic_notifications_colored_48px);
                             if (!snackbarNewNotification.isShown() && !webView.getUrl().equals("https://" + podDomain + "/notifications"))
                                 snackbarNewNotification.show();
                         } else {
-                            item.setIcon(R.drawable.ic_bell_outline_white_24dp);
+                            item.setIcon(R.drawable.ic_notifications_white_48px);
                         }
                     }
 
@@ -978,11 +978,11 @@ public class MainActivity extends AppCompatActivity
 
                     if (item != null) {
                         if (conversationCount > 0) {
-                            item.setIcon(R.drawable.ic_message_text_white_24dp);
+                            item.setIcon(R.drawable.ic_email_colored_48px);
                             if (!snackbarNewNotification.isShown() && !webView.getUrl().equals("https://" + podDomain + "/notifications"))
                                 snackbarNewNotification.show();
                         } else {
-                            item.setIcon(R.drawable.ic_message_text_outline_white_24dp);
+                            item.setIcon(R.drawable.ic_mail_white_48px);
                         }
                     }
 
diff --git a/app/src/main/res/drawable-hdpi/ic_bell_outline_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_bell_outline_white_24dp.png
deleted file mode 100644
index b53dde90..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_bell_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_bell_ring_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_bell_ring_white_24dp.png
deleted file mode 100644
index 9cc1f069..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_bell_ring_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_message_text_outline_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_message_text_outline_white_24dp.png
deleted file mode 100644
index 610aa130..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_message_text_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_message_text_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_message_text_white_24dp.png
deleted file mode 100644
index a086bcbb..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_message_text_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_bell_outline_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_bell_outline_white_24dp.png
deleted file mode 100644
index 0d4b0a1d..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_bell_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_bell_ring_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_bell_ring_white_24dp.png
deleted file mode 100644
index 56001f7b..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_bell_ring_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_message_text_outline_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_message_text_outline_white_24dp.png
deleted file mode 100644
index 576b5274..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_message_text_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_message_text_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_message_text_white_24dp.png
deleted file mode 100644
index aee3a1ce..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_message_text_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_bell_outline_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_bell_outline_white_24dp.png
deleted file mode 100644
index 657e69d8..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_bell_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_bell_ring_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_bell_ring_white_24dp.png
deleted file mode 100644
index be2a70e0..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_bell_ring_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_message_text_outline_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_message_text_outline_white_24dp.png
deleted file mode 100644
index d66b733a..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_message_text_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_message_text_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_message_text_white_24dp.png
deleted file mode 100644
index 5155a77a..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_message_text_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_bell_outline_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_bell_outline_white_24dp.png
deleted file mode 100644
index 069bb3e5..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_bell_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_bell_ring_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_bell_ring_white_24dp.png
deleted file mode 100644
index cdb2c24f..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_bell_ring_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_message_text_outline_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_message_text_outline_white_24dp.png
deleted file mode 100644
index 9fcb8682..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_message_text_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_message_text_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_message_text_white_24dp.png
deleted file mode 100644
index 1d3d19e7..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_message_text_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_bell_outline_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_bell_outline_white_24dp.png
deleted file mode 100644
index 2756e2ae..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_bell_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_bell_ring_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_bell_ring_white_24dp.png
deleted file mode 100644
index 7ed1a2f2..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_bell_ring_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_message_text_outline_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_message_text_outline_white_24dp.png
deleted file mode 100644
index 26a10423..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_message_text_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_message_text_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_message_text_white_24dp.png
deleted file mode 100644
index 3fd53a5a..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_message_text_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_email_colored_48px.xml b/app/src/main/res/drawable/ic_email_colored_48px.xml
new file mode 100644
index 00000000..302869b1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_email_colored_48px.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#EBFF7C" android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_favorite_black_48px.xml b/app/src/main/res/drawable/ic_favorite_black_48px.xml
new file mode 100644
index 00000000..e3cc36da
--- /dev/null
+++ b/app/src/main/res/drawable/ic_favorite_black_48px.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_format_align_left_black_48px.xml b/app/src/main/res/drawable/ic_format_align_left_black_48px.xml
new file mode 100644
index 00000000..f1e324c5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_format_align_left_black_48px.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:pathData="M15,15L3,15v2h12v-2zM15,7L3,7v2h12L15,7zM3,13h18v-2L3,11v2zM3,21h18v-2L3,19v2zM3,3v2h18L21,3L3,3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_group_black_48px.xml b/app/src/main/res/drawable/ic_group_black_48px.xml
new file mode 100644
index 00000000..c023a47c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_group_black_48px.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_history_black_48px.xml b/app/src/main/res/drawable/ic_history_black_48px.xml
new file mode 100644
index 00000000..b70c2146
--- /dev/null
+++ b/app/src/main/res/drawable/ic_history_black_48px.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_info_black_48px.xml b/app/src/main/res/drawable/ic_info_black_48px.xml
new file mode 100644
index 00000000..a002fad8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_info_black_48px.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_local_offer_black_48px.xml b/app/src/main/res/drawable/ic_local_offer_black_48px.xml
new file mode 100644
index 00000000..68fdd1b7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_local_offer_black_48px.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:pathData="M21.41,11.58l-9,-9C12.05,2.22 11.55,2 11,2H4c-1.1,0 -2,0.9 -2,2v7c0,0.55 0.22,1.05 0.59,1.42l9,9c0.36,0.36 0.86,0.58 1.41,0.58 0.55,0 1.05,-0.22 1.41,-0.59l7,-7c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-0.55 -0.23,-1.06 -0.59,-1.42zM5.5,7C4.67,7 4,6.33 4,5.5S4.67,4 5.5,4 7,4.67 7,5.5 6.33,7 5.5,7z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_mail_white_48px.xml b/app/src/main/res/drawable/ic_mail_white_48px.xml
new file mode 100644
index 00000000..5382ce54
--- /dev/null
+++ b/app/src/main/res/drawable/ic_mail_white_48px.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_notifications_colored_48px.xml b/app/src/main/res/drawable/ic_notifications_colored_48px.xml
new file mode 100644
index 00000000..24b09e43
--- /dev/null
+++ b/app/src/main/res/drawable/ic_notifications_colored_48px.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#EBFF7C" android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_notifications_white_48px.xml b/app/src/main/res/drawable/ic_notifications_white_48px.xml
new file mode 100644
index 00000000..173dea85
--- /dev/null
+++ b/app/src/main/res/drawable/ic_notifications_white_48px.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_public_black_48px.xml b/app/src/main/res/drawable/ic_public_black_48px.xml
new file mode 100644
index 00000000..97b21143
--- /dev/null
+++ b/app/src/main/res/drawable/ic_public_black_48px.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,19.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zM17.9,17.39c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L8,12v-2h2c0.55,0 1,-0.45 1,-1L11,7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_settings_black_48px.xml b/app/src/main/res/drawable/ic_settings_black_48px.xml
new file mode 100644
index 00000000..8fbaa9a2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_black_48px.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/jb_activities.png b/app/src/main/res/drawable/jb_activities.png
deleted file mode 100644
index f4f7d131..00000000
Binary files a/app/src/main/res/drawable/jb_activities.png and /dev/null differ
diff --git a/app/src/main/res/drawable/jb_aspects.png b/app/src/main/res/drawable/jb_aspects.png
deleted file mode 100644
index 1f2b3a4f..00000000
Binary files a/app/src/main/res/drawable/jb_aspects.png and /dev/null differ
diff --git a/app/src/main/res/drawable/jb_commented.png b/app/src/main/res/drawable/jb_commented.png
deleted file mode 100644
index 64f27b0b..00000000
Binary files a/app/src/main/res/drawable/jb_commented.png and /dev/null differ
diff --git a/app/src/main/res/drawable/jb_heart.png b/app/src/main/res/drawable/jb_heart.png
deleted file mode 100644
index ea9685e3..00000000
Binary files a/app/src/main/res/drawable/jb_heart.png and /dev/null differ
diff --git a/app/src/main/res/drawable/jb_license.png b/app/src/main/res/drawable/jb_license.png
deleted file mode 100644
index b552a1c7..00000000
Binary files a/app/src/main/res/drawable/jb_license.png and /dev/null differ
diff --git a/app/src/main/res/drawable/jb_settings.png b/app/src/main/res/drawable/jb_settings.png
deleted file mode 100644
index 9d65f2a1..00000000
Binary files a/app/src/main/res/drawable/jb_settings.png and /dev/null differ
diff --git a/app/src/main/res/drawable/jb_tag2.png b/app/src/main/res/drawable/jb_tag2.png
deleted file mode 100644
index c8711117..00000000
Binary files a/app/src/main/res/drawable/jb_tag2.png and /dev/null differ
diff --git a/app/src/main/res/menu/main__menu_top.xml b/app/src/main/res/menu/main__menu_top.xml
index 8ec30d36..65f9bf20 100644
--- a/app/src/main/res/menu/main__menu_top.xml
+++ b/app/src/main/res/menu/main__menu_top.xml
@@ -5,13 +5,13 @@
 
     <item
         android:id="@+id/action_notifications"
-        android:icon="@drawable/ic_bell_outline_white_24dp"
+        android:icon="@drawable/ic_notifications_white_48px"
         android:title="@string/notifications"
         app:showAsAction="always" />
 
     <item
         android:id="@+id/action_conversations"
-        android:icon="@drawable/ic_message_text_outline_white_24dp"
+        android:icon="@drawable/ic_mail_white_48px"
         android:title="@string/conversations"
         app:showAsAction="always" />
 
diff --git a/app/src/main/res/menu/main__navdrawer.xml b/app/src/main/res/menu/main__navdrawer.xml
index 35569e1e..d3bd1b03 100644
--- a/app/src/main/res/menu/main__navdrawer.xml
+++ b/app/src/main/res/menu/main__navdrawer.xml
@@ -14,26 +14,26 @@
 
         <item
             android:id="@+id/nav_followed_tags"
-            android:icon="@drawable/jb_tag2"
+            android:icon="@drawable/ic_local_offer_black_48px"
             android:title="@string/nav_followed_tags" />
         <item
             android:id="@+id/nav_aspects"
-            android:icon="@drawable/jb_aspects"
+            android:icon="@drawable/ic_group_black_48px"
             android:title="@string/nav_aspects" />
 
         <item
             android:id="@+id/nav_activities"
-            android:icon="@drawable/jb_activities"
+            android:icon="@drawable/ic_history_black_48px"
             android:title="@string/nav_activities" />
 
         <item
             android:id="@+id/nav_liked"
-            android:icon="@drawable/jb_heart"
+            android:icon="@drawable/ic_favorite_black_48px"
             android:title="@string/nav_liked" />
 
         <item
             android:id="@+id/nav_commented"
-            android:icon="@drawable/jb_commented"
+            android:icon="@drawable/ic_format_align_left_black_48px"
             android:title="@string/nav_commented" />
 
         <item
@@ -43,7 +43,7 @@
 
         <item
             android:id="@+id/nav_public"
-            android:icon="@drawable/jb_aspects"
+            android:icon="@drawable/ic_public_black_48px"
             android:title="@string/nav_public_activities" />
 
         <item
@@ -57,12 +57,12 @@
         <menu>
             <item
                 android:id="@+id/nav_settings_app"
-                android:icon="@drawable/jb_settings"
+                android:icon="@drawable/ic_settings_black_48px"
                 android:title="@string/nav_settings_view" />
 
             <item
                 android:id="@+id/nav_license_help"
-                android:icon="@drawable/jb_license"
+                android:icon="@drawable/ic_info_black_48px"
                 android:title="@string/nav_help_license" />
         </menu>
     </item>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 8bba3ee4..7ff22012 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -40,7 +40,6 @@
   <string name="share__toast_link_address_copied">Linkadresse kopiert &#8230;</string>
   <string name="action_go_to_top">Nach oben scrollen</string>
   <string name="action_search_by_tags_or_persons">Suche nach Tags oder Personen …</string>
-  <string name="action_compose_new_post">Neuer Beitrag</string>
   <string name="action_exit_app">App beenden</string>
   <string name="action_toggle_desktop_page">Mobil-/Desktopansicht umschalten</string>
   <string name="action_share_dotdotdot">Teilen&#8230;</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 8519384f..9953391d 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -36,7 +36,6 @@
   <string name="share__toast_link_address_copied">Lien copié&#8230;</string>
   <string name="action_go_to_top">Retour en haut</string>
   <string name="action_search_by_tags_or_persons">Recherche par tags ou par personnes</string>
-  <string name="action_compose_new_post">Nouveau message</string>
   <string name="action_exit_app">Quitter l\'application</string>
   <string name="action_share_dotdotdot">Partager&#8230;</string>
   <string name="new_post">Nouveau message</string>