diff --git a/app/src/main/res/drawable/blue_border.xml b/app/src/main/res/drawable/blue_border.xml
index 74aeb3419..4651e821d 100644
--- a/app/src/main/res/drawable/blue_border.xml
+++ b/app/src/main/res/drawable/blue_border.xml
@@ -3,7 +3,7 @@
     <solid android:color="@android:color/transparent" />
     <stroke
         android:width="1dip"
-        android:color="@color/mastodonC4" />
+        android:color="?colorPrimary" />
     <corners android:radius="2dp" />
     <padding
         android:bottom="1dip"
diff --git a/app/src/main/res/layout/activity_admin_account.xml b/app/src/main/res/layout/activity_admin_account.xml
index 84fba13c8..cdc45b9ce 100644
--- a/app/src/main/res/layout/activity_admin_account.xml
+++ b/app/src/main/res/layout/activity_admin_account.xml
@@ -158,7 +158,7 @@
                                 android:layout_marginTop="5dp"
                                 android:background="@drawable/blue_border"
                                 android:text="@string/bot"
-                                android:textColor="@color/mastodonC4"
+                                android:textColor="?colorPrimary"
                                 android:visibility="gone" />
 
                             <TextView
@@ -197,7 +197,7 @@
                                 android:layout_marginEnd="3dp"
                                 android:background="@drawable/blue_border"
                                 android:singleLine="true"
-                                android:textColor="@color/mastodonC4"
+                                android:textColor="?colorPrimary"
                                 android:visibility="gone" />
 
                             <TextView
@@ -208,7 +208,7 @@
                                 android:layout_marginEnd="3dp"
                                 android:background="@drawable/blue_border"
                                 android:singleLine="true"
-                                android:textColor="@color/mastodonC4"
+                                android:textColor="?colorPrimary"
                                 android:visibility="gone" />
 
                             <TextView
@@ -232,7 +232,7 @@
                                 android:background="@drawable/blue_border"
                                 android:singleLine="true"
                                 android:text="@string/request_sent"
-                                android:textColor="@color/mastodonC4"
+                                android:textColor="?colorPrimary"
                                 android:visibility="gone" />
 
                         </LinearLayout>
diff --git a/app/src/main/res/layout/activity_instance_profile.xml b/app/src/main/res/layout/activity_instance_profile.xml
index 57a9eaeb7..30d44c58f 100644
--- a/app/src/main/res/layout/activity_instance_profile.xml
+++ b/app/src/main/res/layout/activity_instance_profile.xml
@@ -37,7 +37,7 @@
                 android:layout_margin="10dp"
                 android:background="@drawable/blue_border"
                 android:gravity="center"
-                android:textColor="@color/mastodonC4"
+                android:textColor="?colorPrimary"
                 android:textSize="20sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml
index 6f111b5d6..203715ef4 100644
--- a/app/src/main/res/layout/activity_profile.xml
+++ b/app/src/main/res/layout/activity_profile.xml
@@ -183,7 +183,7 @@
                         android:layout_marginTop="5dp"
                         android:background="@drawable/blue_border"
                         android:text="@string/bot"
-                        android:textColor="@color/mastodonC4"
+                        android:textColor="?colorPrimary"
                         android:visibility="gone" />
 
                     <androidx.appcompat.widget.AppCompatTextView
@@ -274,7 +274,7 @@
                             android:layout_marginEnd="3dp"
                             android:background="@drawable/blue_border"
                             android:singleLine="true"
-                            android:textColor="@color/mastodonC4"
+                            android:textColor="?colorPrimary"
                             android:visibility="gone" />
 
                         <androidx.appcompat.widget.AppCompatTextView
@@ -285,7 +285,7 @@
                             android:layout_marginEnd="3dp"
                             android:background="@drawable/blue_border"
                             android:singleLine="true"
-                            android:textColor="@color/mastodonC4"
+                            android:textColor="?colorPrimary"
                             android:visibility="gone" />
 
                         <androidx.appcompat.widget.AppCompatTextView
@@ -309,7 +309,7 @@
                             android:background="@drawable/blue_border"
                             android:singleLine="true"
                             android:text="@string/request_sent"
-                            android:textColor="@color/mastodonC4"
+                            android:textColor="?colorPrimary"
                             android:visibility="gone" />
                     </androidx.appcompat.widget.LinearLayoutCompat>
 
diff --git a/app/src/main/res/layout/popup_status_theme.xml b/app/src/main/res/layout/popup_status_theme.xml
index 387e16451..87983e20c 100644
--- a/app/src/main/res/layout/popup_status_theme.xml
+++ b/app/src/main/res/layout/popup_status_theme.xml
@@ -246,7 +246,8 @@
                                         android:layout_height="wrap_content"
                                         android:maxLines="1"
                                         android:text="Maecenas sollicitudin, eros quis interdum posuere, quam lorem tempus dui."
-                                        android:textColor="?colorAccent" />
+                                        android:textColor="?colorAccent"
+                                        tools:ignore="HardcodedText" />
 
                                     <androidx.appcompat.widget.AppCompatTextView
                                         android:id="@+id/card_description"