diff --git a/app/src/main/java/com/h/pixeldroid/posts/feeds/cachedFeeds/notifications/NotificationsFragment.kt b/app/src/main/java/com/h/pixeldroid/posts/feeds/cachedFeeds/notifications/NotificationsFragment.kt
index ee02bf44..52010574 100644
--- a/app/src/main/java/com/h/pixeldroid/posts/feeds/cachedFeeds/notifications/NotificationsFragment.kt
+++ b/app/src/main/java/com/h/pixeldroid/posts/feeds/cachedFeeds/notifications/NotificationsFragment.kt
@@ -115,7 +115,7 @@ class NotificationViewHolder(view: View) : RecyclerView.ViewHolder(view) {
                 getStringAndDrawable(context, R.string.followed_notification, R.drawable.ic_follow)
             }
             Notification.NotificationType.mention -> {
-                getStringAndDrawable(context, R.string.mention_notification, R.drawable.ic_apenstaart)
+                getStringAndDrawable(context, R.string.mention_notification, R.drawable.mention_at_24dp)
             }
 
             Notification.NotificationType.reblog -> {
diff --git a/app/src/main/res/drawable-night/add_photo_alternate_black_24dp.xml b/app/src/main/res/drawable-night/add_photo_alternate_black_24dp.xml
deleted file mode 100644
index fd1b4c87..00000000
--- a/app/src/main/res/drawable-night/add_photo_alternate_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M19,7v2.99s-1.99,0.01 -2,0L17,7h-3s0.01,-1.99 0,-2h3L17,2h2v3h3v2h-3zM16,11L16,8h-3L13,5L5,5c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2v-8h-3zM5,19l3,-4 2,3 3,-4 4,5L5,19z"
-      android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_apenstaart.xml b/app/src/main/res/drawable-night/ic_apenstaart.xml
deleted file mode 100644
index f8ba0ad7..00000000
--- a/app/src/main/res/drawable-night/ic_apenstaart.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="48"
-    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="m18.9609,24.1172q0,2.793 1.3867,4.3945 1.3867,1.582 3.8086,1.582 2.4023,0 3.7695,-1.6016 1.3867,-1.6016 1.3867,-4.375 0,-2.7344 -1.4063,-4.3359 -1.4063,-1.6211 -3.7891,-1.6211 -2.3633,0 -3.7695,1.6016 -1.3867,1.6016 -1.3867,4.3555zM29.6055,29.957q-1.1719,1.5039 -2.6953,2.2266 -1.5039,0.7031 -3.5156,0.7031 -3.3594,0 -5.4688,-2.4219 -2.0898,-2.4414 -2.0898,-6.3477 0,-3.9063 2.1094,-6.3477 2.1094,-2.4414 5.4492,-2.4414 2.0117,0 3.5352,0.7422 1.5234,0.7227 2.6758,2.207v-2.5586h2.793v14.375q2.8516,-0.4297 4.4531,-2.5977 1.6211,-2.1875 1.6211,-5.6445 0,-2.0898 -0.625,-3.9258 -0.6055,-1.8359 -1.8555,-3.3984 -2.0313,-2.5586 -4.9609,-3.9063 -2.9102,-1.3672 -6.3477,-1.3672 -2.4023,0 -4.6094,0.6445 -2.207,0.625 -4.082,1.875 -3.0664,1.9922 -4.8047,5.2344 -1.7188,3.2227 -1.7188,6.9922 0,3.1055 1.1133,5.8203 1.1328,2.7148 3.2617,4.7852 2.0508,2.0313 4.7461,3.0859 2.6953,1.0742 5.7617,1.0742 2.5195,0 4.9414,-0.8594 2.4414,-0.8398 4.4727,-2.4219l1.7578,2.168q-2.4414,1.8945 -5.332,2.8906 -2.8711,1.0156 -5.8398,1.0156 -3.6133,0 -6.8164,-1.2891 -3.2031,-1.2695 -5.7031,-3.7109 -2.5,-2.4414 -3.8086,-5.6445 -1.3086,-3.2227 -1.3086,-6.9141 0,-3.5547 1.3281,-6.7773 1.3281,-3.2227 3.7891,-5.6641 2.5195,-2.4805 5.8203,-3.7891 3.3008,-1.3281 6.9922,-1.3281 4.1406,0 7.6758,1.6992 3.5547,1.6992 5.957,4.8242 1.4648,1.9141 2.2266,4.1602 0.7813,2.2461 0.7813,4.6484 0,5.1367 -3.1055,8.1055 -3.1055,2.9688 -8.5742,3.0859z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_crop_black_24dp.xml b/app/src/main/res/drawable-night/ic_crop_black_24dp.xml
deleted file mode 100644
index fdbd3551..00000000
--- a/app/src/main/res/drawable-night/ic_crop_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M17,15h2V7c0,-1.1 -0.9,-2 -2,-2H9v2h8v8zM7,17V1H5v4H1v2h4v10c0,1.1 0.9,2 2,2h10v4h2v-4h4v-2H7z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_follow.xml b/app/src/main/res/drawable-night/ic_follow.xml
deleted file mode 100644
index 7e3807e2..00000000
--- a/app/src/main/res/drawable-night/ic_follow.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_heart.xml b/app/src/main/res/drawable-night/ic_heart.xml
deleted file mode 100644
index 7e9b5f46..00000000
--- a/app/src/main/res/drawable-night/ic_heart.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="18dp" android:viewportHeight="512"
-    android:viewportWidth="512" android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="M462.3,62.6C407.5,15.9 326,24.3 275.7,76.2L256,96.5l-19.7,-20.3C186.1,24.3 104.5,15.9 49.7,62.6c-62.8,53.6 -66.1,149.8 -9.9,207.9l193.5,199.8c12.5,12.9 32.8,12.9 45.3,0l193.5,-199.8c56.3,-58.1 53,-154.3 -9.8,-207.9z"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_like_empty.xml b/app/src/main/res/drawable-night/ic_like_empty.xml
deleted file mode 100644
index 75c187a2..00000000
--- a/app/src/main/res/drawable-night/ic_like_empty.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<vector android:height="21.6dp" android:viewportHeight="99"
-    android:viewportWidth="110" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#00000000"
-        android:pathData="M54.5,94.5C58.2,90.74 79.39,69.25 92.63,55.83C104.5,43.8 104.24,26.26 93.46,15.39C82.67,4.5 65.23,4.55 54.5,15.48C43.76,4.55 26.32,4.5 15.54,15.38C4.75,26.25 4.5,43.79 16.36,55.83C29.6,69.25 50.79,90.74 54.5,94.5Z"
-        android:strokeColor="#FFFFFF" android:strokeWidth="9"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_reblog.xml b/app/src/main/res/drawable-night/ic_reblog.xml
deleted file mode 100644
index 4306c2d0..00000000
--- a/app/src/main/res/drawable-night/ic_reblog.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="85"
-    android:viewportWidth="111" android:width="31.341177dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#00000000"
-        android:pathData="M30.5,64.5L90.5,64.5L90.5,39.81"
-        android:strokeColor="#FFFFFF" android:strokeWidth="9"/>
-    <path android:fillColor="#FFFFFF"
-        android:pathData="M90.5,25.56L100,44.56L90.5,39.81L81,44.56Z"
-        android:strokeColor="#FFFFFF" android:strokeWidth="9"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M80.5,18.5L20.5,18.5L20.5,44.19"
-        android:strokeColor="#FFFFFF" android:strokeWidth="9"/>
-    <path android:fillColor="#FFFFFF"
-        android:pathData="M20.5,58.44L11,39.44L20.5,44.19L30,39.44Z"
-        android:strokeColor="#FFFFFF" android:strokeWidth="9"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/poll.xml b/app/src/main/res/drawable-night/poll.xml
deleted file mode 100644
index 7d6bd4bc..00000000
--- a/app/src/main/res/drawable-night/poll.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM9,17L7,17v-7h2v7zM13,17h-2L11,7h2v10zM17,17h-2v-4h2v4z"
-      android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/app/src/main/res/drawable/add_photo_alternate_black_24dp.xml b/app/src/main/res/drawable/add_photo_alternate_black_24dp.xml
index 3c74f0a0..df8b200f 100644
--- a/app/src/main/res/drawable/add_photo_alternate_black_24dp.xml
+++ b/app/src/main/res/drawable/add_photo_alternate_black_24dp.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M19,7v2.99s-1.99,0.01 -2,0L17,7h-3s0.01,-1.99 0,-2h3L17,2h2v3h3v2h-3zM16,11L16,8h-3L13,5L5,5c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2v-8h-3zM5,19l3,-4 2,3 3,-4 4,5L5,19z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorDrawing"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_apenstaart.xml b/app/src/main/res/drawable/ic_apenstaart.xml
deleted file mode 100644
index 0f7289ab..00000000
--- a/app/src/main/res/drawable/ic_apenstaart.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="48"
-    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="m18.9609,24.1172q0,2.793 1.3867,4.3945 1.3867,1.582 3.8086,1.582 2.4023,0 3.7695,-1.6016 1.3867,-1.6016 1.3867,-4.375 0,-2.7344 -1.4063,-4.3359 -1.4063,-1.6211 -3.7891,-1.6211 -2.3633,0 -3.7695,1.6016 -1.3867,1.6016 -1.3867,4.3555zM29.6055,29.957q-1.1719,1.5039 -2.6953,2.2266 -1.5039,0.7031 -3.5156,0.7031 -3.3594,0 -5.4688,-2.4219 -2.0898,-2.4414 -2.0898,-6.3477 0,-3.9063 2.1094,-6.3477 2.1094,-2.4414 5.4492,-2.4414 2.0117,0 3.5352,0.7422 1.5234,0.7227 2.6758,2.207v-2.5586h2.793v14.375q2.8516,-0.4297 4.4531,-2.5977 1.6211,-2.1875 1.6211,-5.6445 0,-2.0898 -0.625,-3.9258 -0.6055,-1.8359 -1.8555,-3.3984 -2.0313,-2.5586 -4.9609,-3.9063 -2.9102,-1.3672 -6.3477,-1.3672 -2.4023,0 -4.6094,0.6445 -2.207,0.625 -4.082,1.875 -3.0664,1.9922 -4.8047,5.2344 -1.7188,3.2227 -1.7188,6.9922 0,3.1055 1.1133,5.8203 1.1328,2.7148 3.2617,4.7852 2.0508,2.0313 4.7461,3.0859 2.6953,1.0742 5.7617,1.0742 2.5195,0 4.9414,-0.8594 2.4414,-0.8398 4.4727,-2.4219l1.7578,2.168q-2.4414,1.8945 -5.332,2.8906 -2.8711,1.0156 -5.8398,1.0156 -3.6133,0 -6.8164,-1.2891 -3.2031,-1.2695 -5.7031,-3.7109 -2.5,-2.4414 -3.8086,-5.6445 -1.3086,-3.2227 -1.3086,-6.9141 0,-3.5547 1.3281,-6.7773 1.3281,-3.2227 3.7891,-5.6641 2.5195,-2.4805 5.8203,-3.7891 3.3008,-1.3281 6.9922,-1.3281 4.1406,0 7.6758,1.6992 3.5547,1.6992 5.957,4.8242 1.4648,1.9141 2.2266,4.1602 0.7813,2.2461 0.7813,4.6484 0,5.1367 -3.1055,8.1055 -3.1055,2.9688 -8.5742,3.0859z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_crop_black_24dp.xml b/app/src/main/res/drawable/ic_crop_black_24dp.xml
index 5a4749cd..63d132ce 100644
--- a/app/src/main/res/drawable/ic_crop_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_crop_black_24dp.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/colorDrawing"
         android:pathData="M17,15h2V7c0,-1.1 -0.9,-2 -2,-2H9v2h8v8zM7,17V1H5v4H1v2h4v10c0,1.1 0.9,2 2,2h10v4h2v-4h4v-2H7z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_follow.xml b/app/src/main/res/drawable/ic_follow.xml
index 225ae0a8..612a4a07 100644
--- a/app/src/main/res/drawable/ic_follow.xml
+++ b/app/src/main/res/drawable/ic_follow.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/colorDrawing"
         android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_heart.xml b/app/src/main/res/drawable/ic_heart.xml
index 800bf6ab..62239504 100644
--- a/app/src/main/res/drawable/ic_heart.xml
+++ b/app/src/main/res/drawable/ic_heart.xml
@@ -1,4 +1,4 @@
 <vector android:height="18dp" android:viewportHeight="512"
     android:viewportWidth="512" android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000" android:pathData="M462.3,62.6C407.5,15.9 326,24.3 275.7,76.2L256,96.5l-19.7,-20.3C186.1,24.3 104.5,15.9 49.7,62.6c-62.8,53.6 -66.1,149.8 -9.9,207.9l193.5,199.8c12.5,12.9 32.8,12.9 45.3,0l193.5,-199.8c56.3,-58.1 53,-154.3 -9.8,-207.9z"/>
+    <path android:fillColor="@color/colorDrawing" android:pathData="M462.3,62.6C407.5,15.9 326,24.3 275.7,76.2L256,96.5l-19.7,-20.3C186.1,24.3 104.5,15.9 49.7,62.6c-62.8,53.6 -66.1,149.8 -9.9,207.9l193.5,199.8c12.5,12.9 32.8,12.9 45.3,0l193.5,-199.8c56.3,-58.1 53,-154.3 -9.8,-207.9z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_like_empty.xml b/app/src/main/res/drawable/ic_like_empty.xml
index 18c836ac..e83455b9 100644
--- a/app/src/main/res/drawable/ic_like_empty.xml
+++ b/app/src/main/res/drawable/ic_like_empty.xml
@@ -2,5 +2,5 @@
     android:viewportWidth="110" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#00000000"
         android:pathData="M54.5,94.5C58.2,90.74 79.39,69.25 92.63,55.83C104.5,43.8 104.24,26.26 93.46,15.39C82.67,4.5 65.23,4.55 54.5,15.48C43.76,4.55 26.32,4.5 15.54,15.38C4.75,26.25 4.5,43.79 16.36,55.83C29.6,69.25 50.79,90.74 54.5,94.5Z"
-        android:strokeColor="#000000" android:strokeWidth="9"/>
+        android:strokeColor="@color/colorDrawing" android:strokeWidth="9"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_person_white_24dp.xml b/app/src/main/res/drawable/ic_person_white_24dp.xml
deleted file mode 100644
index 6353f460..00000000
--- a/app/src/main/res/drawable/ic_person_white_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_reblog.xml b/app/src/main/res/drawable/ic_reblog.xml
index d712269d..0968c08f 100644
--- a/app/src/main/res/drawable/ic_reblog.xml
+++ b/app/src/main/res/drawable/ic_reblog.xml
@@ -2,14 +2,14 @@
     android:viewportWidth="111" android:width="31.341177dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#00000000"
         android:pathData="M30.5,64.5L90.5,64.5L90.5,39.81"
-        android:strokeColor="#000000" android:strokeWidth="9"/>
-    <path android:fillColor="#000000"
+        android:strokeColor="@color/colorDrawing" android:strokeWidth="9"/>
+    <path android:fillColor="@color/colorDrawing"
         android:pathData="M90.5,25.56L100,44.56L90.5,39.81L81,44.56Z"
-        android:strokeColor="#000000" android:strokeWidth="9"/>
+        android:strokeColor="@color/colorDrawing" android:strokeWidth="9"/>
     <path android:fillColor="#00000000"
         android:pathData="M80.5,18.5L20.5,18.5L20.5,44.19"
-        android:strokeColor="#000000" android:strokeWidth="9"/>
-    <path android:fillColor="#000000"
+        android:strokeColor="@color/colorDrawing" android:strokeWidth="9"/>
+    <path android:fillColor="@color/colorDrawing"
         android:pathData="M20.5,58.44L11,39.44L20.5,44.19L30,39.44Z"
-        android:strokeColor="#000000" android:strokeWidth="9"/>
+        android:strokeColor="@color/colorDrawing" android:strokeWidth="9"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
deleted file mode 100644
index 24a5623c..00000000
--- a/app/src/main/res/drawable/ic_settings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/lens_black_24dp.xml b/app/src/main/res/drawable/lens_black_24dp.xml
deleted file mode 100644
index e9a9ce1d..00000000
--- a/app/src/main/res/drawable/lens_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2z"
-      android:fillColor="#000000"/>
-</vector>
diff --git a/app/src/main/res/drawable/mention_at_24dp.xml b/app/src/main/res/drawable/mention_at_24dp.xml
new file mode 100644
index 00000000..1d1aa7a5
--- /dev/null
+++ b/app/src/main/res/drawable/mention_at_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10h5v-2h-5c-4.34,0 -8,-3.66 -8,-8s3.66,-8 8,-8 8,3.66 8,8v1.43c0,0.79 -0.71,1.57 -1.5,1.57s-1.5,-0.78 -1.5,-1.57L17,12c0,-2.76 -2.24,-5 -5,-5s-5,2.24 -5,5 2.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.57L22,12c0,-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"
+      android:fillColor="@color/colorDrawing"/>
+</vector>
diff --git a/app/src/main/res/drawable/poll.xml b/app/src/main/res/drawable/poll.xml
index 950547d6..b78dad8b 100644
--- a/app/src/main/res/drawable/poll.xml
+++ b/app/src/main/res/drawable/poll.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM9,17L7,17v-7h2v7zM13,17h-2L11,7h2v10zM17,17h-2v-4h2v4z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorDrawing"/>
 </vector>
diff --git a/app/src/main/res/layout/fragment_camera.xml b/app/src/main/res/layout/fragment_camera.xml
index cee301b3..edc9eec2 100644
--- a/app/src/main/res/layout/fragment_camera.xml
+++ b/app/src/main/res/layout/fragment_camera.xml
@@ -18,7 +18,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/camera_container"
-    android:background="@android:color/black"
     android:layout_width="match_parent"
     android:layoutDirection="ltr"
     android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/fragment_offline_feed.xml b/app/src/main/res/layout/fragment_offline_feed.xml
deleted file mode 100644
index ad5525f7..00000000
--- a/app/src/main/res/layout/fragment_offline_feed.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:id="@+id/offline_feed_placeholder_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:textSize="25sp"
-        android:text="@string/nothing_to_see_here"
-        android:visibility="gone"/>
-
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/swipeRefreshLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/offline_feed_recyclerview"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="gone"/>
-
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
-    <ProgressBar
-        android:id="@+id/offline_feed_progress_bar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:visibility="gone"/>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/post_fragment.xml b/app/src/main/res/layout/post_fragment.xml
index 1b64a526..d49a6789 100644
--- a/app/src/main/res/layout/post_fragment.xml
+++ b/app/src/main/res/layout/post_fragment.xml
@@ -248,7 +248,8 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:hint="@string/comment"
-                        android:inputType="text" />
+                        android:inputType="text"
+                        android:importantForAutofill="no" />
                 </com.google.android.material.textfield.TextInputLayout>
 
                 <ImageButton