diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/NotificationUtils.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/NotificationUtils.kt
index 67fed14b67..a1879a70f4 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/NotificationUtils.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/NotificationUtils.kt
@@ -389,7 +389,7 @@ object NotificationUtils {
                 PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_UPDATE_CURRENT,
             )
         return NotificationCompat.Action
-            .Builder(R.drawable.ic_notif_reply, stringRes(applicationContext, R.string.app_notification_reply_label), replyPendingIntent)
+            .Builder(R.drawable.ic_action_reply, stringRes(applicationContext, R.string.app_notification_reply_label), replyPendingIntent)
             .addRemoteInput(replyRemoteInput(applicationContext))
             .setAllowGeneratedReplies(true)
             .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_REPLY)
@@ -460,7 +460,7 @@ object NotificationUtils {
                 PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT,
             )
         return NotificationCompat.Action
-            .Builder(R.drawable.ic_notif_message, stringRes(applicationContext, R.string.app_notification_mark_read_label), markReadPendingIntent)
+            .Builder(R.drawable.ic_action_mark_read, stringRes(applicationContext, R.string.app_notification_mark_read_label), markReadPendingIntent)
             .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MARK_AS_READ)
             .build()
     }
diff --git a/amethyst/src/main/res/drawable/ic_action_mark_read.xml b/amethyst/src/main/res/drawable/ic_action_mark_read.xml
new file mode 100644
index 0000000000..4c833fa3d9
--- /dev/null
+++ b/amethyst/src/main/res/drawable/ic_action_mark_read.xml
@@ -0,0 +1,8 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#000000">
+  <path android:fillColor="#000000" android:pathData="M20,2H4c-1.1,0 -2,0.9 -2,2v18l4,-4h14c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/amethyst/src/main/res/drawable/ic_action_reply.xml b/amethyst/src/main/res/drawable/ic_action_reply.xml
new file mode 100644
index 0000000000..cba9670de1
--- /dev/null
+++ b/amethyst/src/main/res/drawable/ic_action_reply.xml
@@ -0,0 +1,8 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#000000">
+  <path android:fillColor="#000000" android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z"/>
+</vector>
diff --git a/amethyst/src/main/res/drawable/ic_notif_article.xml b/amethyst/src/main/res/drawable/ic_notif_article.xml
index 33edc24b2b..ff0e41b68f 100644
--- a/amethyst/src/main/res/drawable/ic_notif_article.xml
+++ b/amethyst/src/main/res/drawable/ic_notif_article.xml
@@ -4,5 +4,17 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="#000000">
-  <path android:fillColor="#000000" android:pathData="M19,3H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2zM14,17H7v-2h7v2zM17,13H7v-2h10v2zM17,9H7V7h10v2z"/>
+  <path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M5.9,2.5H18.1A2.3,2.3 0 0 1 20.4,4.8V19.2A2.3,2.3 0 0 1 18.1,21.5H5.9A2.3,2.3 0 0 1 3.6,19.2V4.8A2.3,2.3 0 0 1 5.9,2.5Z M6.7,4.6H17.3A1.1,1.1 0 0 1 18.4,5.7V18.3A1.1,1.1 0 0 1 17.3,19.4H6.7A1.1,1.1 0 0 1 5.6,18.3V5.7A1.1,1.1 0 0 1 6.7,4.6Z"/>
+  <path android:fillColor="#000000" android:pathData="M11.8,6.8H16A0.6,0.6 0 0 1 16.6,7.4V7.4A0.6,0.6 0 0 1 16,8H11.8A0.6,0.6 0 0 1 11.2,7.4V7.4A0.6,0.6 0 0 1 11.8,6.8Z"/>
+  <path android:fillColor="#000000" android:pathData="M11.8,9.2H16A0.6,0.6 0 0 1 16.6,9.8V9.8A0.6,0.6 0 0 1 16,10.4H11.8A0.6,0.6 0 0 1 11.2,9.8V9.8A0.6,0.6 0 0 1 11.8,9.2Z"/>
+  <path android:fillColor="#000000" android:pathData="M7.2,12.6H16.8A0.6,0.6 0 0 1 17.4,13.2V13.2A0.6,0.6 0 0 1 16.8,13.8H7.2A0.6,0.6 0 0 1 6.6,13.2V13.2A0.6,0.6 0 0 1 7.2,12.6Z"/>
+  <path android:fillColor="#000000" android:pathData="M7.2,15H16.8A0.6,0.6 0 0 1 17.4,15.6V15.6A0.6,0.6 0 0 1 16.8,16.2H7.2A0.6,0.6 0 0 1 6.6,15.6V15.6A0.6,0.6 0 0 1 7.2,15Z"/>
+  <path android:fillColor="#000000" android:pathData="M7.2,17.4H14A0.6,0.6 0 0 1 14.6,18V18A0.6,0.6 0 0 1 14,18.6H7.2A0.6,0.6 0 0 1 6.6,18V18A0.6,0.6 0 0 1 7.2,17.4Z"/>
+  <group
+      android:scaleX="0.017"
+      android:scaleY="0.017"
+      android:translateX="4.196"
+      android:translateY="3.918">
+    <path android:fillColor="#000000" android:pathData="M370.18,326.86C369.91,326.04 307.3,176.97 290.09,135.63c-20.96,0 -65.23,0 -96.46,0 -9.17,22.67 -32.82,80.44 -51.8,126.98 10.4,24.81 19.74,47.1 26.95,64.29l39.28,0a2.68,2.68 135,0 0,2.51 -3.15c-0.34,-7.93 -21.93,-36.76 -15.49,-67.94 1.72,-6.71 3.03,-13.53 4.91,-20.21a235.88,235.88 135,0 1,18.04 -46.7c1.19,-2.27 1.74,-3.29 4.5,-1.57 5.86,3.65 12.41,3.44 18.94,2.97 5.62,-1.22 8.36,-3.92 18.67,-1.18 2.04,0 4.03,0 6.11,0.19 4.95,0.39 9.6,1.57 12.57,6.05 3.25,4.9 3.77,10.44 3.25,16.1 -0.79,8.47 -0.23,16.36 6.94,22.33a77.19,77.19 0,0 0,8.05 5.37c3.56,2.28 7.85,3.27 10.9,6.44 1.8,1.87 2.86,3.85 2.08,6.51 -0.78,2.66 -2.86,3.91 -5.6,4.2 -6.92,0.75 -13.69,-0.66 -20.49,-1.48 -0.89,-0.11 -1.76,-0.17 -2.68,-0.23a15.39,15.39 0,0 1,-5.11 0.17l-1.6,0a35.83,35.83 0,0 0,-7.92 1.89c-6.41,2.34 -12.25,4.91 -19.82,4.78a5.8,5.8 0,0 0,-2.75 1.19c-5.93,5.27 -9.5,11.93 -6.54,21.66 8.13,22.72 29,77.53 37.96,101.18 -0.25,-16.02 -0.32,-44.71 -0.38,-58.64 35.8,0.05 90.7,0.03 95.08,0.03z"/>
+  </group>
 </vector>
diff --git a/amethyst/src/main/res/drawable/ic_notif_badge.xml b/amethyst/src/main/res/drawable/ic_notif_badge.xml
index 2fee256783..0754175f14 100644
--- a/amethyst/src/main/res/drawable/ic_notif_badge.xml
+++ b/amethyst/src/main/res/drawable/ic_notif_badge.xml
@@ -4,5 +4,14 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="#000000">
-  <path android:fillColor="#000000" android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
+  <path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M19.4,9.9L19.337,10.866L19.148,11.815L18.837,12.732L18.409,13.6L17.871,14.405L17.233,15.133L16.505,15.771L15.7,16.309L14.832,16.737L13.915,17.048L12.966,17.237L12,17.3L11.034,17.237L10.085,17.048L9.168,16.737L8.3,16.309L7.495,15.771L6.767,15.133L6.129,14.405L5.591,13.6L5.163,12.732L4.852,11.815L4.663,10.866L4.6,9.9L4.663,8.934L4.852,7.985L5.163,7.068L5.591,6.2L6.129,5.395L6.767,4.667L7.495,4.029L8.3,3.491L9.168,3.063L10.085,2.752L11.034,2.563L12,2.5L12.966,2.563L13.915,2.752L14.832,3.063L15.7,3.491L16.505,4.029L17.233,4.667L17.871,5.395L18.409,6.2L18.837,7.068L19.148,7.985L19.337,8.934Z M16.5,9.9L16.462,10.487L16.347,11.065L16.157,11.622L15.897,12.15L15.57,12.639L15.182,13.082L14.739,13.47L14.25,13.797L13.722,14.057L13.165,14.247L12.587,14.362L12,14.4L11.413,14.362L10.835,14.247L10.278,14.057L9.75,13.797L9.261,13.47L8.818,13.082L8.43,12.639L8.103,12.15L7.843,11.622L7.653,11.065L7.538,10.487L7.5,9.9L7.538,9.313L7.653,8.735L7.843,8.178L8.103,7.65L8.43,7.161L8.818,6.718L9.261,6.33L9.75,6.003L10.278,5.743L10.835,5.553L11.413,5.438L12,5.4L12.587,5.438L13.165,5.553L13.722,5.743L14.25,6.003L14.739,6.33L15.182,6.718L15.57,7.161L15.897,7.65L16.157,8.178L16.347,8.735L16.462,9.313Z"/>
+  <path android:fillColor="#000000" android:pathData="M9.2,14.6L8,22L11.2,18.8Z"/>
+  <path android:fillColor="#000000" android:pathData="M14.8,14.6L16,22L12.8,18.8Z"/>
+  <group
+      android:scaleX="0.022"
+      android:scaleY="0.022"
+      android:translateX="6.363"
+      android:translateY="4.162">
+    <path android:fillColor="#000000" android:pathData="M370.18,326.86C369.91,326.04 307.3,176.97 290.09,135.63c-20.96,0 -65.23,0 -96.46,0 -9.17,22.67 -32.82,80.44 -51.8,126.98 10.4,24.81 19.74,47.1 26.95,64.29l39.28,0a2.68,2.68 135,0 0,2.51 -3.15c-0.34,-7.93 -21.93,-36.76 -15.49,-67.94 1.72,-6.71 3.03,-13.53 4.91,-20.21a235.88,235.88 135,0 1,18.04 -46.7c1.19,-2.27 1.74,-3.29 4.5,-1.57 5.86,3.65 12.41,3.44 18.94,2.97 5.62,-1.22 8.36,-3.92 18.67,-1.18 2.04,0 4.03,0 6.11,0.19 4.95,0.39 9.6,1.57 12.57,6.05 3.25,4.9 3.77,10.44 3.25,16.1 -0.79,8.47 -0.23,16.36 6.94,22.33a77.19,77.19 0,0 0,8.05 5.37c3.56,2.28 7.85,3.27 10.9,6.44 1.8,1.87 2.86,3.85 2.08,6.51 -0.78,2.66 -2.86,3.91 -5.6,4.2 -6.92,0.75 -13.69,-0.66 -20.49,-1.48 -0.89,-0.11 -1.76,-0.17 -2.68,-0.23a15.39,15.39 0,0 1,-5.11 0.17l-1.6,0a35.83,35.83 0,0 0,-7.92 1.89c-6.41,2.34 -12.25,4.91 -19.82,4.78a5.8,5.8 0,0 0,-2.75 1.19c-5.93,5.27 -9.5,11.93 -6.54,21.66 8.13,22.72 29,77.53 37.96,101.18 -0.25,-16.02 -0.32,-44.71 -0.38,-58.64 35.8,0.05 90.7,0.03 95.08,0.03z"/>
+  </group>
 </vector>
diff --git a/amethyst/src/main/res/drawable/ic_notif_chess.xml b/amethyst/src/main/res/drawable/ic_notif_chess.xml
index e20882a854..049d70f1b0 100644
--- a/amethyst/src/main/res/drawable/ic_notif_chess.xml
+++ b/amethyst/src/main/res/drawable/ic_notif_chess.xml
@@ -4,5 +4,18 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="#000000">
-  <path android:fillColor="#000000" android:pathData="M19,22H5v-2h14v2zM17.16,8.26C18.22,9.63 18.7,11.4 18.5,13.16C18.15,15.98 15.67,18 12.83,18H11.5C8.66,18 6.35,15.98 6,13.16c-0.2,-1.79 0.29,-3.56 1.34,-4.93C6.5,7.68 6,6.65 6,5.5 6,3.57 7.57,2 9.5,2c1.03,0 1.95,0.45 2.59,1.15C12.71,2.44 13.58,2 14.5,2 16.43,2 18,3.57 18,5.5c0,1.15 -0.5,2.18 -0.84,2.76z"/>
+  <group
+      android:scaleX="0.76"
+      android:scaleY="0.76"
+      android:translateX="-0.399"
+      android:translateY="1.08">
+    <path android:fillColor="#000000" android:pathData="M 5.0,22.0 L 5.0,18.0 Q 5.0,17.43 5.3,16.96 Q 5.6,16.5 6.1,16.23 L 11.0,13.75 L 11.0,12.0 L 7.53,13.72 Q 7.23,13.88 6.9,13.95 Q 6.58,14.02 6.25,14.02 Q 5.47,14.02 4.79,13.62 Q 4.1,13.22 3.73,12.47 Q 3.38,11.8 3.43,11.04 Q 3.48,10.28 3.9,9.62 L 7.0,5.0 L 5.0,2.0 L 11.0,2.0 Q 14.32,2.0 16.66,4.32 Q 19.0,6.65 19.0,10.0 L 19.0,22.0 L 5.0,22.0 M 7.0,20.0 L 17.0,20.0 L 17.0,10.0 Q 17.0,7.5 15.25,5.75 Q 13.5,4.0 11.0,4.0 L 8.75,4.0 L 9.4,5.0 L 5.58,10.75 Q 5.45,10.95 5.44,11.16 Q 5.42,11.38 5.53,11.57 Q 5.65,11.85 5.86,11.94 Q 6.08,12.03 6.28,12.02 Q 6.35,12.02 6.65,11.95 L 13.0,8.75 L 13.0,15.0 L 7.0,18.0 L 7.0,20.0"/>
+  </group>
+  <group
+      android:scaleX="0.035"
+      android:scaleY="0.035"
+      android:translateX="9.74"
+      android:translateY="9.78">
+    <path android:fillColor="#000000" android:pathData="M370.18,326.86C369.91,326.04 307.3,176.97 290.09,135.63c-20.96,0 -65.23,0 -96.46,0 -9.17,22.67 -32.82,80.44 -51.8,126.98 10.4,24.81 19.74,47.1 26.95,64.29l39.28,0a2.68,2.68 135,0 0,2.51 -3.15c-0.34,-7.93 -21.93,-36.76 -15.49,-67.94 1.72,-6.71 3.03,-13.53 4.91,-20.21a235.88,235.88 135,0 1,18.04 -46.7c1.19,-2.27 1.74,-3.29 4.5,-1.57 5.86,3.65 12.41,3.44 18.94,2.97 5.62,-1.22 8.36,-3.92 18.67,-1.18 2.04,0 4.03,0 6.11,0.19 4.95,0.39 9.6,1.57 12.57,6.05 3.25,4.9 3.77,10.44 3.25,16.1 -0.79,8.47 -0.23,16.36 6.94,22.33a77.19,77.19 0,0 0,8.05 5.37c3.56,2.28 7.85,3.27 10.9,6.44 1.8,1.87 2.86,3.85 2.08,6.51 -0.78,2.66 -2.86,3.91 -5.6,4.2 -6.92,0.75 -13.69,-0.66 -20.49,-1.48 -0.89,-0.11 -1.76,-0.17 -2.68,-0.23a15.39,15.39 0,0 1,-5.11 0.17l-1.6,0a35.83,35.83 0,0 0,-7.92 1.89c-6.41,2.34 -12.25,4.91 -19.82,4.78a5.8,5.8 0,0 0,-2.75 1.19c-5.93,5.27 -9.5,11.93 -6.54,21.66 8.13,22.72 29,77.53 37.96,101.18 -0.25,-16.02 -0.32,-44.71 -0.38,-58.64 35.8,0.05 90.7,0.03 95.08,0.03z"/>
+  </group>
 </vector>
diff --git a/amethyst/src/main/res/drawable/ic_notif_code.xml b/amethyst/src/main/res/drawable/ic_notif_code.xml
index d54a09f8ab..f87226c26e 100644
--- a/amethyst/src/main/res/drawable/ic_notif_code.xml
+++ b/amethyst/src/main/res/drawable/ic_notif_code.xml
@@ -5,4 +5,11 @@
     android:viewportHeight="24"
     android:tint="#000000">
   <path android:fillColor="#000000" android:pathData="M9.4,16.6L4.8,12l4.6,-4.6L8,6l-6,6 6,6 1.4,-1.4zM14.6,16.6l4.6,-4.6 -4.6,-4.6L16,6l6,6 -6,6 -1.4,-1.4z"/>
+  <group
+      android:scaleX="0.025"
+      android:scaleY="0.025"
+      android:translateX="5.646"
+      android:translateY="5.532">
+    <path android:fillColor="#000000" android:pathData="M370.18,326.86C369.91,326.04 307.3,176.97 290.09,135.63c-20.96,0 -65.23,0 -96.46,0 -9.17,22.67 -32.82,80.44 -51.8,126.98 10.4,24.81 19.74,47.1 26.95,64.29l39.28,0a2.68,2.68 135,0 0,2.51 -3.15c-0.34,-7.93 -21.93,-36.76 -15.49,-67.94 1.72,-6.71 3.03,-13.53 4.91,-20.21a235.88,235.88 135,0 1,18.04 -46.7c1.19,-2.27 1.74,-3.29 4.5,-1.57 5.86,3.65 12.41,3.44 18.94,2.97 5.62,-1.22 8.36,-3.92 18.67,-1.18 2.04,0 4.03,0 6.11,0.19 4.95,0.39 9.6,1.57 12.57,6.05 3.25,4.9 3.77,10.44 3.25,16.1 -0.79,8.47 -0.23,16.36 6.94,22.33a77.19,77.19 0,0 0,8.05 5.37c3.56,2.28 7.85,3.27 10.9,6.44 1.8,1.87 2.86,3.85 2.08,6.51 -0.78,2.66 -2.86,3.91 -5.6,4.2 -6.92,0.75 -13.69,-0.66 -20.49,-1.48 -0.89,-0.11 -1.76,-0.17 -2.68,-0.23a15.39,15.39 0,0 1,-5.11 0.17l-1.6,0a35.83,35.83 0,0 0,-7.92 1.89c-6.41,2.34 -12.25,4.91 -19.82,4.78a5.8,5.8 0,0 0,-2.75 1.19c-5.93,5.27 -9.5,11.93 -6.54,21.66 8.13,22.72 29,77.53 37.96,101.18 -0.25,-16.02 -0.32,-44.71 -0.38,-58.64 35.8,0.05 90.7,0.03 95.08,0.03z"/>
+  </group>
 </vector>
diff --git a/amethyst/src/main/res/drawable/ic_notif_media.xml b/amethyst/src/main/res/drawable/ic_notif_media.xml
index 575a58dd8b..267e8fc2e0 100644
--- a/amethyst/src/main/res/drawable/ic_notif_media.xml
+++ b/amethyst/src/main/res/drawable/ic_notif_media.xml
@@ -4,5 +4,13 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="#000000">
-  <path android:fillColor="#000000" android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
+  <path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M5.4,3.4H18.6A3,3 0 0 1 21.6,6.4V17.6A3,3 0 0 1 18.6,20.6H5.4A3,3 0 0 1 2.4,17.6V6.4A3,3 0 0 1 5.4,3.4Z M6.2,6H17.8A1.2,1.2 0 0 1 19,7.2V16.8A1.2,1.2 0 0 1 17.8,18H6.2A1.2,1.2 0 0 1 5,16.8V7.2A1.2,1.2 0 0 1 6.2,6Z"/>
+  <path android:fillColor="#000000" android:pathData="M5.2,18L10.5,10.6L14.2,15.2L15.6,13.4L18.8,18Z"/>
+  <group
+      android:scaleX="0.018"
+      android:scaleY="0.018"
+      android:translateX="10.986"
+      android:translateY="4.901">
+    <path android:fillColor="#000000" android:pathData="M370.18,326.86C369.91,326.04 307.3,176.97 290.09,135.63c-20.96,0 -65.23,0 -96.46,0 -9.17,22.67 -32.82,80.44 -51.8,126.98 10.4,24.81 19.74,47.1 26.95,64.29l39.28,0a2.68,2.68 135,0 0,2.51 -3.15c-0.34,-7.93 -21.93,-36.76 -15.49,-67.94 1.72,-6.71 3.03,-13.53 4.91,-20.21a235.88,235.88 135,0 1,18.04 -46.7c1.19,-2.27 1.74,-3.29 4.5,-1.57 5.86,3.65 12.41,3.44 18.94,2.97 5.62,-1.22 8.36,-3.92 18.67,-1.18 2.04,0 4.03,0 6.11,0.19 4.95,0.39 9.6,1.57 12.57,6.05 3.25,4.9 3.77,10.44 3.25,16.1 -0.79,8.47 -0.23,16.36 6.94,22.33a77.19,77.19 0,0 0,8.05 5.37c3.56,2.28 7.85,3.27 10.9,6.44 1.8,1.87 2.86,3.85 2.08,6.51 -0.78,2.66 -2.86,3.91 -5.6,4.2 -6.92,0.75 -13.69,-0.66 -20.49,-1.48 -0.89,-0.11 -1.76,-0.17 -2.68,-0.23a15.39,15.39 0,0 1,-5.11 0.17l-1.6,0a35.83,35.83 0,0 0,-7.92 1.89c-6.41,2.34 -12.25,4.91 -19.82,4.78a5.8,5.8 0,0 0,-2.75 1.19c-5.93,5.27 -9.5,11.93 -6.54,21.66 8.13,22.72 29,77.53 37.96,101.18 -0.25,-16.02 -0.32,-44.71 -0.38,-58.64 35.8,0.05 90.7,0.03 95.08,0.03z"/>
+  </group>
 </vector>
diff --git a/amethyst/src/main/res/drawable/ic_notif_mention.xml b/amethyst/src/main/res/drawable/ic_notif_mention.xml
index afb7e1bebd..067717f696 100644
--- a/amethyst/src/main/res/drawable/ic_notif_mention.xml
+++ b/amethyst/src/main/res/drawable/ic_notif_mention.xml
@@ -4,5 +4,13 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="#000000">
-  <path android:fillColor="#000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10c1.87,0 3.63,-0.52 5.13,-1.42l-0.9,-1.55C15,19.65 13.55,20 12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8v0.72c0,0.79 -0.71,1.78 -1.5,1.78s-1.5,-0.99 -1.5,-1.78V12c0,-2.76 -2.24,-5 -5,-5S7,9.24 7,12s2.24,5 5,5c1.38,0 2.64,-0.56 3.54,-1.47 0.65,0.89 1.77,1.47 2.96,1.47 1.97,0 3.5,-1.6 3.5,-3.78V12c0,-5.52 -4.48,-10 -10,-10zM12,15c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3z"/>
+  <path android:fillColor="#000000" android:pathData="M17.246,20.396L16.134,20.996L14.955,21.449L13.727,21.748L12.471,21.889L11.208,21.868L9.957,21.687L8.74,21.348L7.576,20.856L6.484,20.221L5.481,19.451L4.585,18.56L3.81,17.562L3.168,16.473L2.67,15.312L2.325,14.097L2.136,12.847L2.109,11.584L2.242,10.327L2.535,9.098L2.982,7.916L3.575,6.801L4.306,5.77L5.163,4.84L6.13,4.028L7.194,3.345L8.335,2.803L9.536,2.411L10.778,2.176L12.039,2.1L13.3,2.186L14.54,2.431L15.738,2.833L16.875,3.383L17.933,4.075L18.894,4.895L19.743,5.831L20.466,6.868L21.05,7.988L21.488,9.173L21.771,10.405L21.894,11.662L21.857,12.925L21.658,14.173L21.303,15.386L18.108,14.223L18.341,13.427L18.472,12.608L18.496,11.778L18.415,10.953L18.229,10.144L17.942,9.366L17.558,8.63L17.084,7.95L16.526,7.335L15.895,6.796L15.201,6.343L14.454,5.981L13.667,5.717L12.854,5.556L12.026,5.5L11.198,5.55L10.383,5.704L9.594,5.962L8.844,6.317L8.146,6.766L7.511,7.299L6.949,7.909L6.469,8.586L6.079,9.319L5.786,10.095L5.593,10.902L5.506,11.727L5.524,12.556L5.647,13.377L5.875,14.175L6.201,14.937L6.623,15.652L7.132,16.307L7.72,16.892L8.378,17.397L9.095,17.815L9.859,18.137L10.659,18.36L11.48,18.479L12.309,18.493L13.134,18.4L13.94,18.204L14.714,17.906L15.444,17.512Z"/>
+  <path android:fillColor="#000000" android:pathData="M19.4,15.6C21.2,15,21.6,12.8,20.6,11.6L18.8,12.9C19.4,13.6,19.2,14.6,18.2,14.9Z"/>
+  <group
+      android:scaleX="0.028"
+      android:scaleY="0.028"
+      android:translateX="4.929"
+      android:translateY="4.702">
+    <path android:fillColor="#000000" android:pathData="M370.18,326.86C369.91,326.04 307.3,176.97 290.09,135.63c-20.96,0 -65.23,0 -96.46,0 -9.17,22.67 -32.82,80.44 -51.8,126.98 10.4,24.81 19.74,47.1 26.95,64.29l39.28,0a2.68,2.68 135,0 0,2.51 -3.15c-0.34,-7.93 -21.93,-36.76 -15.49,-67.94 1.72,-6.71 3.03,-13.53 4.91,-20.21a235.88,235.88 135,0 1,18.04 -46.7c1.19,-2.27 1.74,-3.29 4.5,-1.57 5.86,3.65 12.41,3.44 18.94,2.97 5.62,-1.22 8.36,-3.92 18.67,-1.18 2.04,0 4.03,0 6.11,0.19 4.95,0.39 9.6,1.57 12.57,6.05 3.25,4.9 3.77,10.44 3.25,16.1 -0.79,8.47 -0.23,16.36 6.94,22.33a77.19,77.19 0,0 0,8.05 5.37c3.56,2.28 7.85,3.27 10.9,6.44 1.8,1.87 2.86,3.85 2.08,6.51 -0.78,2.66 -2.86,3.91 -5.6,4.2 -6.92,0.75 -13.69,-0.66 -20.49,-1.48 -0.89,-0.11 -1.76,-0.17 -2.68,-0.23a15.39,15.39 0,0 1,-5.11 0.17l-1.6,0a35.83,35.83 0,0 0,-7.92 1.89c-6.41,2.34 -12.25,4.91 -19.82,4.78a5.8,5.8 0,0 0,-2.75 1.19c-5.93,5.27 -9.5,11.93 -6.54,21.66 8.13,22.72 29,77.53 37.96,101.18 -0.25,-16.02 -0.32,-44.71 -0.38,-58.64 35.8,0.05 90.7,0.03 95.08,0.03z"/>
+  </group>
 </vector>
diff --git a/amethyst/src/main/res/drawable/ic_notif_message.xml b/amethyst/src/main/res/drawable/ic_notif_message.xml
index 4c833fa3d9..a4be19aa3e 100644
--- a/amethyst/src/main/res/drawable/ic_notif_message.xml
+++ b/amethyst/src/main/res/drawable/ic_notif_message.xml
@@ -4,5 +4,13 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="#000000">
-  <path android:fillColor="#000000" android:pathData="M20,2H4c-1.1,0 -2,0.9 -2,2v18l4,-4h14c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2z"/>
+  <path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M5.6,2.6H18.4A3.6,3.6 0 0 1 22,6.2V13.2A3.6,3.6 0 0 1 18.4,16.8H5.6A3.6,3.6 0 0 1 2,13.2V6.2A3.6,3.6 0 0 1 5.6,2.6Z M6.4,5.2H17.6A1.7,1.7 0 0 1 19.3,6.9V12.5A1.7,1.7 0 0 1 17.6,14.2H6.4A1.7,1.7 0 0 1 4.7,12.5V6.9A1.7,1.7 0 0 1 6.4,5.2Z"/>
+  <path android:fillColor="#000000" android:pathData="M7,15.2L7,20.6L12.6,15.2Z"/>
+  <group
+      android:scaleX="0.026"
+      android:scaleY="0.026"
+      android:translateX="5.236"
+      android:translateY="2.665">
+    <path android:fillColor="#000000" android:pathData="M370.18,326.86C369.91,326.04 307.3,176.97 290.09,135.63c-20.96,0 -65.23,0 -96.46,0 -9.17,22.67 -32.82,80.44 -51.8,126.98 10.4,24.81 19.74,47.1 26.95,64.29l39.28,0a2.68,2.68 135,0 0,2.51 -3.15c-0.34,-7.93 -21.93,-36.76 -15.49,-67.94 1.72,-6.71 3.03,-13.53 4.91,-20.21a235.88,235.88 135,0 1,18.04 -46.7c1.19,-2.27 1.74,-3.29 4.5,-1.57 5.86,3.65 12.41,3.44 18.94,2.97 5.62,-1.22 8.36,-3.92 18.67,-1.18 2.04,0 4.03,0 6.11,0.19 4.95,0.39 9.6,1.57 12.57,6.05 3.25,4.9 3.77,10.44 3.25,16.1 -0.79,8.47 -0.23,16.36 6.94,22.33a77.19,77.19 0,0 0,8.05 5.37c3.56,2.28 7.85,3.27 10.9,6.44 1.8,1.87 2.86,3.85 2.08,6.51 -0.78,2.66 -2.86,3.91 -5.6,4.2 -6.92,0.75 -13.69,-0.66 -20.49,-1.48 -0.89,-0.11 -1.76,-0.17 -2.68,-0.23a15.39,15.39 0,0 1,-5.11 0.17l-1.6,0a35.83,35.83 0,0 0,-7.92 1.89c-6.41,2.34 -12.25,4.91 -19.82,4.78a5.8,5.8 0,0 0,-2.75 1.19c-5.93,5.27 -9.5,11.93 -6.54,21.66 8.13,22.72 29,77.53 37.96,101.18 -0.25,-16.02 -0.32,-44.71 -0.38,-58.64 35.8,0.05 90.7,0.03 95.08,0.03z"/>
+  </group>
 </vector>
diff --git a/amethyst/src/main/res/drawable/ic_notif_reaction.xml b/amethyst/src/main/res/drawable/ic_notif_reaction.xml
index 9521a89868..033141faa5 100644
--- a/amethyst/src/main/res/drawable/ic_notif_reaction.xml
+++ b/amethyst/src/main/res/drawable/ic_notif_reaction.xml
@@ -4,5 +4,12 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="#000000">
-  <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"/>
+  <path android:fillColor="#000000" android:fillType="evenOdd" 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 M 12.0,16.775 L 11.275,16.115000000000002 C 8.7,13.78 7.0,12.239999999999998 7.0,10.35 C 7.0,8.809999999999999 8.21,7.6 9.75,7.6 C 10.620000000000001,7.6 11.455,8.004999999999999 12.0,8.645 C 12.545,8.004999999999999 13.379999999999999,7.6 14.25,7.6 C 15.79,7.6 17.0,8.809999999999999 17.0,10.35 C 17.0,12.239999999999998 15.3,13.78 12.725,16.119999999999997 L 12.0,16.775"/>
+  <group
+      android:scaleX="0.02"
+      android:scaleY="0.02"
+      android:translateX="6.978"
+      android:translateY="6.488">
+    <path android:fillColor="#000000" android:pathData="M370.18,326.86C369.91,326.04 307.3,176.97 290.09,135.63c-20.96,0 -65.23,0 -96.46,0 -9.17,22.67 -32.82,80.44 -51.8,126.98 10.4,24.81 19.74,47.1 26.95,64.29l39.28,0a2.68,2.68 135,0 0,2.51 -3.15c-0.34,-7.93 -21.93,-36.76 -15.49,-67.94 1.72,-6.71 3.03,-13.53 4.91,-20.21a235.88,235.88 135,0 1,18.04 -46.7c1.19,-2.27 1.74,-3.29 4.5,-1.57 5.86,3.65 12.41,3.44 18.94,2.97 5.62,-1.22 8.36,-3.92 18.67,-1.18 2.04,0 4.03,0 6.11,0.19 4.95,0.39 9.6,1.57 12.57,6.05 3.25,4.9 3.77,10.44 3.25,16.1 -0.79,8.47 -0.23,16.36 6.94,22.33a77.19,77.19 0,0 0,8.05 5.37c3.56,2.28 7.85,3.27 10.9,6.44 1.8,1.87 2.86,3.85 2.08,6.51 -0.78,2.66 -2.86,3.91 -5.6,4.2 -6.92,0.75 -13.69,-0.66 -20.49,-1.48 -0.89,-0.11 -1.76,-0.17 -2.68,-0.23a15.39,15.39 0,0 1,-5.11 0.17l-1.6,0a35.83,35.83 0,0 0,-7.92 1.89c-6.41,2.34 -12.25,4.91 -19.82,4.78a5.8,5.8 0,0 0,-2.75 1.19c-5.93,5.27 -9.5,11.93 -6.54,21.66 8.13,22.72 29,77.53 37.96,101.18 -0.25,-16.02 -0.32,-44.71 -0.38,-58.64 35.8,0.05 90.7,0.03 95.08,0.03z"/>
+  </group>
 </vector>
diff --git a/amethyst/src/main/res/drawable/ic_notif_reply.xml b/amethyst/src/main/res/drawable/ic_notif_reply.xml
index cba9670de1..787006bd9b 100644
--- a/amethyst/src/main/res/drawable/ic_notif_reply.xml
+++ b/amethyst/src/main/res/drawable/ic_notif_reply.xml
@@ -4,5 +4,18 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="#000000">
-  <path android:fillColor="#000000" android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z"/>
+  <group
+      android:scaleX="0.62"
+      android:scaleY="0.62"
+      android:translateX="0.3"
+      android:translateY="0.3">
+    <path android:fillColor="#000000" android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z"/>
+  </group>
+  <group
+      android:scaleX="0.035"
+      android:scaleY="0.035"
+      android:translateX="9.74"
+      android:translateY="9.78">
+    <path android:fillColor="#000000" android:pathData="M370.18,326.86C369.91,326.04 307.3,176.97 290.09,135.63c-20.96,0 -65.23,0 -96.46,0 -9.17,22.67 -32.82,80.44 -51.8,126.98 10.4,24.81 19.74,47.1 26.95,64.29l39.28,0a2.68,2.68 135,0 0,2.51 -3.15c-0.34,-7.93 -21.93,-36.76 -15.49,-67.94 1.72,-6.71 3.03,-13.53 4.91,-20.21a235.88,235.88 135,0 1,18.04 -46.7c1.19,-2.27 1.74,-3.29 4.5,-1.57 5.86,3.65 12.41,3.44 18.94,2.97 5.62,-1.22 8.36,-3.92 18.67,-1.18 2.04,0 4.03,0 6.11,0.19 4.95,0.39 9.6,1.57 12.57,6.05 3.25,4.9 3.77,10.44 3.25,16.1 -0.79,8.47 -0.23,16.36 6.94,22.33a77.19,77.19 0,0 0,8.05 5.37c3.56,2.28 7.85,3.27 10.9,6.44 1.8,1.87 2.86,3.85 2.08,6.51 -0.78,2.66 -2.86,3.91 -5.6,4.2 -6.92,0.75 -13.69,-0.66 -20.49,-1.48 -0.89,-0.11 -1.76,-0.17 -2.68,-0.23a15.39,15.39 0,0 1,-5.11 0.17l-1.6,0a35.83,35.83 0,0 0,-7.92 1.89c-6.41,2.34 -12.25,4.91 -19.82,4.78a5.8,5.8 0,0 0,-2.75 1.19c-5.93,5.27 -9.5,11.93 -6.54,21.66 8.13,22.72 29,77.53 37.96,101.18 -0.25,-16.02 -0.32,-44.71 -0.38,-58.64 35.8,0.05 90.7,0.03 95.08,0.03z"/>
+  </group>
 </vector>
diff --git a/amethyst/src/main/res/drawable/ic_notif_repost.xml b/amethyst/src/main/res/drawable/ic_notif_repost.xml
index 845f99423c..4a7f55febc 100644
--- a/amethyst/src/main/res/drawable/ic_notif_repost.xml
+++ b/amethyst/src/main/res/drawable/ic_notif_repost.xml
@@ -5,4 +5,11 @@
     android:viewportHeight="24"
     android:tint="#000000">
   <path android:fillColor="#000000" android:pathData="M7,7h10v3l4,-4 -4,-4v3H5v6h2V7zM17,17H7v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
+  <group
+      android:scaleX="0.022"
+      android:scaleY="0.022"
+      android:translateX="6.466"
+      android:translateY="6.367">
+    <path android:fillColor="#000000" android:pathData="M370.18,326.86C369.91,326.04 307.3,176.97 290.09,135.63c-20.96,0 -65.23,0 -96.46,0 -9.17,22.67 -32.82,80.44 -51.8,126.98 10.4,24.81 19.74,47.1 26.95,64.29l39.28,0a2.68,2.68 135,0 0,2.51 -3.15c-0.34,-7.93 -21.93,-36.76 -15.49,-67.94 1.72,-6.71 3.03,-13.53 4.91,-20.21a235.88,235.88 135,0 1,18.04 -46.7c1.19,-2.27 1.74,-3.29 4.5,-1.57 5.86,3.65 12.41,3.44 18.94,2.97 5.62,-1.22 8.36,-3.92 18.67,-1.18 2.04,0 4.03,0 6.11,0.19 4.95,0.39 9.6,1.57 12.57,6.05 3.25,4.9 3.77,10.44 3.25,16.1 -0.79,8.47 -0.23,16.36 6.94,22.33a77.19,77.19 0,0 0,8.05 5.37c3.56,2.28 7.85,3.27 10.9,6.44 1.8,1.87 2.86,3.85 2.08,6.51 -0.78,2.66 -2.86,3.91 -5.6,4.2 -6.92,0.75 -13.69,-0.66 -20.49,-1.48 -0.89,-0.11 -1.76,-0.17 -2.68,-0.23a15.39,15.39 0,0 1,-5.11 0.17l-1.6,0a35.83,35.83 0,0 0,-7.92 1.89c-6.41,2.34 -12.25,4.91 -19.82,4.78a5.8,5.8 0,0 0,-2.75 1.19c-5.93,5.27 -9.5,11.93 -6.54,21.66 8.13,22.72 29,77.53 37.96,101.18 -0.25,-16.02 -0.32,-44.71 -0.38,-58.64 35.8,0.05 90.7,0.03 95.08,0.03z"/>
+  </group>
 </vector>
diff --git a/amethyst/src/main/res/drawable/ic_notif_zap.xml b/amethyst/src/main/res/drawable/ic_notif_zap.xml
index 77f822994d..5c470f14a3 100644
--- a/amethyst/src/main/res/drawable/ic_notif_zap.xml
+++ b/amethyst/src/main/res/drawable/ic_notif_zap.xml
@@ -4,5 +4,18 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="#000000">
-  <path android:fillColor="#000000" android:pathData="M11,21h-1l1,-7H7.5c-0.58,0 -0.57,-0.32 -0.38,-0.66c0.19,-0.34 0.05,-0.08 0.07,-0.12C8.48,10.94 10.42,7.54 13,3h1l-1,7h3.5c0.49,0 0.56,0.33 0.47,0.51l-0.07,0.15C12.96,17.55 11,21 11,21z"/>
+  <group
+      android:scaleX="0.62"
+      android:scaleY="0.62"
+      android:translateX="0.3"
+      android:translateY="0.3">
+    <path android:fillColor="#000000" android:pathData="M11,21h-1l1,-7H7.5c-0.58,0 -0.57,-0.32 -0.38,-0.66c0.19,-0.34 0.05,-0.08 0.07,-0.12C8.48,10.94 10.42,7.54 13,3h1l-1,7h3.5c0.49,0 0.56,0.33 0.47,0.51l-0.07,0.15C12.96,17.55 11,21 11,21z"/>
+  </group>
+  <group
+      android:scaleX="0.035"
+      android:scaleY="0.035"
+      android:translateX="9.74"
+      android:translateY="9.78">
+    <path android:fillColor="#000000" android:pathData="M370.18,326.86C369.91,326.04 307.3,176.97 290.09,135.63c-20.96,0 -65.23,0 -96.46,0 -9.17,22.67 -32.82,80.44 -51.8,126.98 10.4,24.81 19.74,47.1 26.95,64.29l39.28,0a2.68,2.68 135,0 0,2.51 -3.15c-0.34,-7.93 -21.93,-36.76 -15.49,-67.94 1.72,-6.71 3.03,-13.53 4.91,-20.21a235.88,235.88 135,0 1,18.04 -46.7c1.19,-2.27 1.74,-3.29 4.5,-1.57 5.86,3.65 12.41,3.44 18.94,2.97 5.62,-1.22 8.36,-3.92 18.67,-1.18 2.04,0 4.03,0 6.11,0.19 4.95,0.39 9.6,1.57 12.57,6.05 3.25,4.9 3.77,10.44 3.25,16.1 -0.79,8.47 -0.23,16.36 6.94,22.33a77.19,77.19 0,0 0,8.05 5.37c3.56,2.28 7.85,3.27 10.9,6.44 1.8,1.87 2.86,3.85 2.08,6.51 -0.78,2.66 -2.86,3.91 -5.6,4.2 -6.92,0.75 -13.69,-0.66 -20.49,-1.48 -0.89,-0.11 -1.76,-0.17 -2.68,-0.23a15.39,15.39 0,0 1,-5.11 0.17l-1.6,0a35.83,35.83 0,0 0,-7.92 1.89c-6.41,2.34 -12.25,4.91 -19.82,4.78a5.8,5.8 0,0 0,-2.75 1.19c-5.93,5.27 -9.5,11.93 -6.54,21.66 8.13,22.72 29,77.53 37.96,101.18 -0.25,-16.02 -0.32,-44.71 -0.38,-58.64 35.8,0.05 90.7,0.03 95.08,0.03z"/>
+  </group>
 </vector>