diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
index b9fa08c5..aff2ad16 100644
--- a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
+++ b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
@@ -869,7 +869,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
                     statusList.get(currentCursorPosition).text = String.format("@%s %s", acct, statusList.get(currentCursorPosition).text);
                 }
             } else {
-                statusList.get(currentCursorPosition).text = statusList.get(currentCursorPosition).text.replaceAll("\\b@" + acct, "");
+                statusList.get(currentCursorPosition).text = statusList.get(currentCursorPosition).text.replaceAll("@" + acct, "");
             }
             notifyItemChanged(currentCursorPosition);
         }
diff --git a/app/src/main/res/drawable/tag_follow.xml b/app/src/main/res/drawable/tag_follow.xml
index 247fb35c..41568a65 100644
--- a/app/src/main/res/drawable/tag_follow.xml
+++ b/app/src/main/res/drawable/tag_follow.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="?colorControlNormal"
       android:pathData="M21.41,11.58L12.41,2.58C12.04,2.21 11.53,2 11,2H4A2,2 0,0 0,2 4V11C2,11.53 2.21,12.04 2.59,12.41L3,12.81C3.9,12.27 4.94,12 6,12A6,6 0,0 1,12 18C12,19.06 11.72,20.09 11.18,21L11.58,21.4C11.95,21.78 12.47,22 13,22C13.53,22 14.04,21.79 14.41,21.41L21.41,14.41C21.79,14.04 22,13.53 22,13C22,12.47 21.79,11.96 21.41,11.58M5.5,7A1.5,1.5 0,0 1,4 5.5A1.5,1.5 0,0 1,5.5 4A1.5,1.5 0,0 1,7 5.5A1.5,1.5 0,0 1,5.5 7M10,19H7V22H5V19H2V17H5V14H7V17H10V19Z" />
 </vector>
diff --git a/app/src/main/res/drawable/tag_muted.xml b/app/src/main/res/drawable/tag_muted.xml
index 4000c43f..93125f55 100644
--- a/app/src/main/res/drawable/tag_muted.xml
+++ b/app/src/main/res/drawable/tag_muted.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="?colorControlNormal"
         android:pathData="M5.64,3.64L21.36,19.36L19.95,20.78L16,16.83V20L11,15H7V9H8.17L4.22,5.05L5.64,3.64M16,4V11.17L12.41,7.58L16,4Z" />
 </vector>
diff --git a/app/src/main/res/drawable/tag_pin.xml b/app/src/main/res/drawable/tag_pin.xml
index 07091cb1..4d3bb51d 100644
--- a/app/src/main/res/drawable/tag_pin.xml
+++ b/app/src/main/res/drawable/tag_pin.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="?colorControlNormal"
         android:pathData="M16,12V4H17V2H7V4H8V12L6,14V16H11.2V22H12.8V16H18V14L16,12Z" />
 </vector>
diff --git a/app/src/main/res/drawable/tag_pin_off.xml b/app/src/main/res/drawable/tag_pin_off.xml
index 95d54cf5..d8223d50 100644
--- a/app/src/main/res/drawable/tag_pin_off.xml
+++ b/app/src/main/res/drawable/tag_pin_off.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="?colorControlNormal"
         android:pathData="M2,5.27L3.28,4L20,20.72L18.73,22L12.8,16.07V22H11.2V16H6V14L8,12V11.27L2,5.27M16,12L18,14V16H17.82L8,6.18V4H7V2H17V4H16V12Z" />
 </vector>
diff --git a/app/src/main/res/drawable/tag_unfollow.xml b/app/src/main/res/drawable/tag_unfollow.xml
index 35f5cb4a..06b2a0e8 100644
--- a/app/src/main/res/drawable/tag_unfollow.xml
+++ b/app/src/main/res/drawable/tag_unfollow.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="?colorControlNormal"
         android:pathData="M21.41,11.58L12.41,2.58C12.04,2.21 11.53,2 11,2H4A2,2 0,0 0,2 4V11C2,11.53 2.21,12.04 2.59,12.41L3,12.81C3.9,12.27 4.94,12 6,12A6,6 0,0 1,12 18C12,19.06 11.72,20.09 11.18,21L11.58,21.4C11.95,21.78 12.47,22 13,22C13.53,22 14.04,21.79 14.41,21.41L21.41,14.41C21.79,14.04 22,13.53 22,13C22,12.47 21.79,11.96 21.41,11.58M5.5,7A1.5,1.5 0,0 1,4 5.5A1.5,1.5 0,0 1,5.5 4A1.5,1.5 0,0 1,7 5.5A1.5,1.5 0,0 1,5.5 7M8.12,21.54L6,19.41L3.88,21.54L2.46,20.12L4.59,18L2.46,15.88L3.87,14.47L6,16.59L8.12,14.47L9.53,15.88L7.41,18L9.53,20.12L8.12,21.54Z" />
 </vector>
diff --git a/app/src/main/res/drawable/tag_unmuted.xml b/app/src/main/res/drawable/tag_unmuted.xml
index 4fc63b7a..6f15b551 100644
--- a/app/src/main/res/drawable/tag_unmuted.xml
+++ b/app/src/main/res/drawable/tag_unmuted.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="?colorControlNormal"
         android:pathData="M4,9V15H8L13,20V4L8,9H4M16.55,2.47L15.5,3.53L17.93,6L15,9L17.93,12L15,15L17.93,18L15.5,20.47L16.55,21.53L20,18L17.07,15L20,12L17.07,9L20,6L16.55,2.47Z" />
 </vector>