diff --git a/app/src/main/res/layout/item_autocomplete_account.xml b/app/src/main/res/layout/item_autocomplete_account.xml
index e207ae9e..4fcb11c6 100644
--- a/app/src/main/res/layout/item_autocomplete_account.xml
+++ b/app/src/main/res/layout/item_autocomplete_account.xml
@@ -22,8 +22,6 @@
         android:gravity="center_vertical"
         android:orientation="vertical">
 
-        <!--TODO: Check if this needs emoji support-->
-        <!--FIXME: The placeholder texts seem to be swapped-->
         <androidx.emoji.widget.EmojiTextView
             android:id="@+id/display_name"
             android:layout_width="wrap_content"
@@ -33,7 +31,7 @@
             android:textColor="?android:textColorPrimary"
             android:textSize="?attr/status_text_large"
             android:textStyle="normal|bold"
-            tools:text="\@ConnyDuck" />
+            tools:text="Conny Duck" />
 
         <TextView
             android:id="@+id/username"
@@ -43,7 +41,7 @@
             android:maxLines="1"
             android:textColor="?android:textColorSecondary"
             android:textSize="?attr/status_text_medium"
-            tools:text="Conny Duck" />
+            tools:text="\@ConnyDuck" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/item_conversation.xml b/app/src/main/res/layout/item_conversation.xml
index bcf9e023..f009e0ac 100644
--- a/app/src/main/res/layout/item_conversation.xml
+++ b/app/src/main/res/layout/item_conversation.xml
@@ -309,7 +309,7 @@
             app:layout_constraintTop_toTopOf="@+id/status_media_preview_container"
             app:srcCompat="@drawable/ic_eye_24dp" />
 
-        <androidx.emoji.widget.EmojiTextView
+        <TextView
             android:id="@+id/status_sensitive_media_warning"
             android:layout_width="0dp"
             android:layout_height="0dp"
@@ -327,8 +327,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <!--TODO: Check if this needs emoji support-->
-        <androidx.emoji.widget.EmojiTextView
+        <TextView
             android:id="@+id/status_media_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_status.xml b/app/src/main/res/layout/item_status.xml
index 94cf3127..9da46bf4 100644
--- a/app/src/main/res/layout/item_status.xml
+++ b/app/src/main/res/layout/item_status.xml
@@ -293,7 +293,7 @@
             app:layout_constraintTop_toTopOf="@+id/status_media_preview_container"
             app:srcCompat="@drawable/ic_eye_24dp" />
 
-        <androidx.emoji.widget.EmojiTextView
+        <TextView
             android:id="@+id/status_sensitive_media_warning"
             android:layout_width="0dp"
             android:layout_height="0dp"
@@ -312,8 +312,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <!--TODO: Check if this needs emoji support-->
-        <androidx.emoji.widget.EmojiTextView
+        <TextView
             android:id="@+id/status_media_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_status_detailed.xml b/app/src/main/res/layout/item_status_detailed.xml
index 2ad5b788..75f70ebd 100644
--- a/app/src/main/res/layout/item_status_detailed.xml
+++ b/app/src/main/res/layout/item_status_detailed.xml
@@ -144,7 +144,6 @@
             android:paddingRight="6dp"
             android:paddingBottom="6dp">
 
-            <!--TODO: check if this needs emoji support-->
             <androidx.emoji.widget.EmojiTextView
                 android:id="@+id/card_title"
                 android:layout_width="wrap_content"
@@ -156,7 +155,6 @@
                 android:textColor="?android:textColorPrimary"
                 android:textSize="?attr/status_text_medium" />
 
-            <!--TODO: Check if this needs emoji support-->
             <androidx.emoji.widget.EmojiTextView
                 android:id="@+id/card_description"
                 android:layout_width="wrap_content"
@@ -293,8 +291,7 @@
             app:layout_constraintTop_toTopOf="@+id/status_media_preview_container"
             app:srcCompat="@drawable/ic_eye_24dp" />
 
-        <!--TODO: Check if this needs emoji support-->
-        <androidx.emoji.widget.EmojiTextView
+        <TextView
             android:id="@+id/status_sensitive_media_warning"
             android:layout_width="0dp"
             android:layout_height="0dp"
@@ -312,8 +309,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <!--TODO: Check if this needs emoji support-->
-        <androidx.emoji.widget.EmojiTextView
+        <TextView
             android:id="@+id/status_media_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"