diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
index 08d682de0..4b2a79690 100644
--- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
@@ -1361,47 +1361,26 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                 if (theme == Helper.THEME_BLACK) {
                     iconColor = R.color.action_black;
                     iconColorCompat = ContextCompat.getColor(context, iconColor);
-                    holder.status_cardview.setBackgroundResource(R.drawable.card_border_black);
-                    Helper.changeDrawableColor(context, R.drawable.ic_photo, R.color.dark_text);
-                    Helper.changeDrawableColor(context, R.drawable.ic_remove_red_eye, R.color.dark_text);
-                    holder.status_cardview_title.setTextColor(ContextCompat.getColor(context, R.color.black_text_toot_header));
-                    holder.status_cardview_content.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
-                    holder.status_cardview_url.setTextColor(ContextCompat.getColor(context, R.color.black_text_toot_header));
-                    Helper.changeDrawableColor(context, R.drawable.ic_bookmark, R.color.black);
-                    Helper.changeDrawableColor(context, R.drawable.ic_bookmark_border, R.color.black);
-                    Helper.changeDrawableColor(context, R.drawable.ic_translate, R.color.black);
-
                 } else if (theme == Helper.THEME_DARK) {
                     iconColor = R.color.action_dark;
                     iconColorCompat = ContextCompat.getColor(context, iconColor);
-                    Helper.changeDrawableColor(context, R.drawable.ic_photo, R.color.mastodonC4);
-                    Helper.changeDrawableColor(context, R.drawable.ic_remove_red_eye, R.color.mastodonC4);
-                    Helper.changeDrawableColor(context, R.drawable.ic_fetch_more, R.color.mastodonC4);
-                    holder.status_cardview_title.setTextColor(ContextCompat.getColor(context, R.color.dark_text_toot_header));
-                    holder.status_cardview_content.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
-                    holder.status_cardview_url.setTextColor(ContextCompat.getColor(context, R.color.dark_text_toot_header));
-                    holder.status_cardview.setBackgroundResource(R.drawable.card_border_dark);
-
-                    Helper.changeDrawableColor(context, R.drawable.ic_bookmark, R.color.mastodonC1);
-                    Helper.changeDrawableColor(context, R.drawable.ic_bookmark_border, R.color.mastodonC1);
-                    Helper.changeDrawableColor(context, R.drawable.ic_translate, R.color.mastodonC1);
                 } else {
                     iconColor = R.color.action_light;
                     iconColorCompat = ContextCompat.getColor(context, iconColor);
-                    holder.status_cardview.setBackgroundResource(R.drawable.card_border_light);
-                    Helper.changeDrawableColor(context, R.drawable.ic_photo, R.color.mastodonC4);
-                    Helper.changeDrawableColor(context, R.drawable.ic_remove_red_eye, R.color.mastodonC4);
-                    holder.status_cardview_title.setTextColor(ContextCompat.getColor(context, R.color.light_black));
-                    holder.status_cardview_content.setTextColor(ContextCompat.getColor(context, R.color.light_black));
-                    holder.status_cardview_url.setTextColor(ContextCompat.getColor(context, R.color.light_black));
-                    Helper.changeDrawableColor(context, R.drawable.ic_bookmark, R.color.white);
-                    Helper.changeDrawableColor(context, R.drawable.ic_bookmark_border, R.color.white);
-                    Helper.changeDrawableColor(context, R.drawable.ic_translate, R.color.white);
                 }
             }
 
+
+            holder.status_cardview_title.setTextColor(ContextCompat.getColor(context, R.color.dark_text_toot_header));
+            holder.status_cardview_content.setTextColor(ContextCompat.getColor(context, R.color.dark_icon));
+            holder.status_cardview_url.setTextColor(ContextCompat.getColor(context, R.color.dark_text_toot_header));
+            holder.status_cardview.setBackgroundResource(R.drawable.card_border_dark);
+
             Helper.changeDrawableColor(context, R.drawable.ic_audio_wave, iconColor);
 
+            Helper.changeDrawableColor(context, R.drawable.ic_photo, R.attr.colorAccent);
+            Helper.changeDrawableColor(context, R.drawable.ic_remove_red_eye, R.attr.colorAccent);
+            Helper.changeDrawableColor(context, R.drawable.ic_fetch_more, R.attr.colorAccent);
 
             Helper.changeDrawableColor(context, holder.status_remove, iconColor);
             Helper.changeDrawableColor(context, R.drawable.ic_fetch_more, iconColor);
diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java
index 3a3b4be80..f76b2b356 100644
--- a/app/src/main/java/app/fedilab/android/helper/Helper.java
+++ b/app/src/main/java/app/fedilab/android/helper/Helper.java
@@ -91,6 +91,7 @@ import android.text.style.URLSpan;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.Patterns;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -2663,7 +2664,14 @@ public class Helper {
         try {
             color = Color.parseColor(context.getString(hexaColor));
         }catch (Resources.NotFoundException e){
-            color = hexaColor;
+            try {
+                TypedValue typedValue = new TypedValue();
+                Resources.Theme theme = context.getTheme();
+                theme.resolveAttribute(hexaColor, typedValue, true);
+                color = typedValue.data;
+            }catch (Resources.NotFoundException ed) {
+                color = hexaColor;
+            }
         }
         assert mDrawable != null;
         mDrawable.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
diff --git a/app/src/main/res/layout-sw600dp/activity_about.xml b/app/src/main/res/layout-sw600dp/activity_about.xml
index e170a8b13..9fd6b5042 100644
--- a/app/src/main/res/layout-sw600dp/activity_about.xml
+++ b/app/src/main/res/layout-sw600dp/activity_about.xml
@@ -53,7 +53,7 @@
             android:gravity="center_vertical"
             android:padding="5dp"
             android:text="@string/about_developer"
-            android:textColor="?colorAccent"
+            android:textColor="?attr/colorAccent"
             android:textSize="16sp"
             android:focusable="true" />
 
@@ -130,7 +130,7 @@
             android:gravity="center_vertical|center_horizontal"
             android:padding="5dp"
             android:text="@string/thanks_text_ux"
-            android:textColor="?colorAccent"
+            android:textColor="?attr/colorAccent"
             android:textSize="16sp" />
 
         <app.fedilab.android.helper.ExpandableHeightListView
@@ -181,7 +181,7 @@
             android:layout_marginTop="10dp"
             android:padding="5dp"
             android:text="@string/thanks_text_logo"
-            android:textColor="?colorAccent"
+            android:textColor="?attr/colorAccent"
             android:textSize="16sp" />
 
         <app.fedilab.android.helper.ExpandableHeightListView
@@ -214,7 +214,7 @@
             android:gravity="center_vertical"
             android:padding="5dp"
             android:text="@string/thanks_text_dev"
-            android:textColor="?colorAccent"
+            android:textColor="?attr/colorAccent"
             android:textSize="16sp" />
 
         <app.fedilab.android.helper.ExpandableHeightListView
diff --git a/app/src/main/res/layout-sw600dp/activity_show_account.xml b/app/src/main/res/layout-sw600dp/activity_show_account.xml
index c2f4303c6..48ee62227 100644
--- a/app/src/main/res/layout-sw600dp/activity_show_account.xml
+++ b/app/src/main/res/layout-sw600dp/activity_show_account.xml
@@ -171,7 +171,7 @@
 
                             <TextView
                                 android:id="@+id/account_dn"
-                                android:textColor="?colorAccent"
+                                android:textColor="?attr/colorAccent"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:maxLines="1"
diff --git a/app/src/main/res/layout-sw600dp/activity_toot.xml b/app/src/main/res/layout-sw600dp/activity_toot.xml
index 5c67abafd..cc8aeebe0 100644
--- a/app/src/main/res/layout-sw600dp/activity_toot.xml
+++ b/app/src/main/res/layout-sw600dp/activity_toot.xml
@@ -248,7 +248,7 @@
                     android:layout_gravity="center"
                     android:layout_weight="1"
                     android:gravity="center"
-                    android:textColor="?colorAccent" />
+                    android:textColor="?attr/colorAccent" />
 
                 <Button
                     android:id="@+id/toot_it"
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index c1c7a539a..1c0a37e44 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -50,7 +50,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:textColor="?colorAccent"
+            android:textColor="?attr/colorAccent"
             android:gravity="center_vertical"
             android:text="@string/about_developer"
             android:textSize="16sp" />
@@ -118,7 +118,7 @@
             android:layout_marginTop="10dp"
             android:id="@+id/about_thanks_ux"
             android:layout_width="match_parent"
-            android:textColor="?colorAccent"
+            android:textColor="?attr/colorAccent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:gravity="center_vertical"
@@ -153,7 +153,7 @@
             android:layout_marginTop="10dp"
             android:id="@+id/about_thanks_logo"
             android:layout_width="match_parent"
-            android:textColor="?colorAccent"
+            android:textColor="?attr/colorAccent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:gravity="center_vertical"
@@ -180,7 +180,7 @@
             android:layout_marginTop="10dp"
             android:id="@+id/about_thanks_dev"
             android:layout_width="match_parent"
-            android:textColor="?colorAccent"
+            android:textColor="?attr/colorAccent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index e298bb7c7..a7484b0c5 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -138,7 +138,7 @@
                     android:layout_gravity="center"
                     android:layout_margin="10dp"
                     android:textSize="16sp"
-                    android:textColor="?colorAccent"
+                    android:textColor="?attr/colorAccent"
                     android:id="@+id/instance_chosen"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/activity_opencollective.xml b/app/src/main/res/layout/activity_opencollective.xml
index 176ddbf6c..cc0facb01 100644
--- a/app/src/main/res/layout/activity_opencollective.xml
+++ b/app/src/main/res/layout/activity_opencollective.xml
@@ -70,7 +70,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:textColor="?colorAccent"
+            android:textColor="?attr/colorAccent"
             android:gravity="center_vertical"
             android:text="Backers"
             android:textSize="16sp"
@@ -90,7 +90,7 @@
             android:layout_marginTop="10dp"
             android:id="@+id/about_thanks_ux"
             android:layout_width="match_parent"
-            android:textColor="?colorAccent"
+            android:textColor="?attr/colorAccent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/activity_peertube_edit.xml b/app/src/main/res/layout/activity_peertube_edit.xml
index d5f5fc688..ee85525d2 100644
--- a/app/src/main/res/layout/activity_peertube_edit.xml
+++ b/app/src/main/res/layout/activity_peertube_edit.xml
@@ -74,7 +74,7 @@
                     android:layout_height="wrap_content"
                     TagsEditText:allowSpaceInTag="true"
                     TagsEditText:tagsCloseImageRight="@drawable/tag_close"
-                    TagsEditText:tagsTextColor="?colorAccent"
+                    TagsEditText:tagsTextColor="?attr/colorAccent"
                     TagsEditText:tagsTextSize="@dimen/defaultTagsTextSize"
                     TagsEditText:tagsCloseImagePadding="@dimen/defaultTagsCloseImagePadding"
                     android:inputType="textMultiLine" />
diff --git a/app/src/main/res/layout/activity_pixelfed_compose.xml b/app/src/main/res/layout/activity_pixelfed_compose.xml
index 398309a4e..df9574e6e 100644
--- a/app/src/main/res/layout/activity_pixelfed_compose.xml
+++ b/app/src/main/res/layout/activity_pixelfed_compose.xml
@@ -158,7 +158,7 @@
                     android:layout_height="10dp"/>
                 <TextView
                     android:layout_gravity="center_vertical"
-                    android:textColor="?colorAccent"
+                    android:textColor="?attr/colorAccent"
                     android:layout_marginStart="5dp"
                     android:textSize="12sp"
                     android:gravity="center_vertical"
@@ -216,7 +216,7 @@
                     android:layout_weight="1"
                     android:layout_marginEnd="20dp"
                     android:gravity="center_vertical|end"
-                    android:textColor="?colorAccent" />
+                    android:textColor="?attr/colorAccent" />
 
                 <Button
                     android:id="@+id/toot_it"
diff --git a/app/src/main/res/layout/activity_show_account.xml b/app/src/main/res/layout/activity_show_account.xml
index 4856adba8..fdb59f840 100644
--- a/app/src/main/res/layout/activity_show_account.xml
+++ b/app/src/main/res/layout/activity_show_account.xml
@@ -173,7 +173,7 @@
 
                             <TextView
                                 android:id="@+id/account_dn"
-                                android:textColor="?colorAccent"
+                                android:textColor="?attr/colorAccent"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:maxLines="1"
diff --git a/app/src/main/res/layout/activity_toot.xml b/app/src/main/res/layout/activity_toot.xml
index f2be6dca6..216261384 100644
--- a/app/src/main/res/layout/activity_toot.xml
+++ b/app/src/main/res/layout/activity_toot.xml
@@ -186,7 +186,7 @@
                     android:layout_height="10dp"/>
                 <TextView
                     android:layout_gravity="center_vertical"
-                    android:textColor="?colorAccent"
+                    android:textColor="?attr/colorAccent"
                     android:layout_marginStart="5dp"
                     android:textSize="12sp"
                     android:gravity="center_vertical"
@@ -274,7 +274,7 @@
                     android:layout_gravity="center"
                     android:layout_weight="1"
                     android:gravity="center"
-                    android:textColor="?colorAccent" />
+                    android:textColor="?attr/colorAccent" />
 
                 <Button
                     android:id="@+id/toot_it"
diff --git a/app/src/main/res/layout/add_filter.xml b/app/src/main/res/layout/add_filter.xml
index d2335f32b..811729366 100644
--- a/app/src/main/res/layout/add_filter.xml
+++ b/app/src/main/res/layout/add_filter.xml
@@ -33,7 +33,7 @@
             android:textSize="12sp"
             android:text="@string/filter_keyword_explanations"
             android:layout_width="match_parent"
-            android:textColor="?colorAccent"
+            android:textColor="?attr/colorAccent"
             android:layout_height="wrap_content" />
 
         <EditText
@@ -53,7 +53,7 @@
             android:textSize="12sp"
             android:text="@string/filter_context_explanations"
             android:layout_width="match_parent"
-            android:textColor="?colorAccent"
+            android:textColor="?attr/colorAccent"
             android:layout_height="wrap_content" />
 
         <LinearLayout
@@ -112,7 +112,7 @@
             android:textSize="12sp"
             android:text="@string/context_drop_explanations"
             android:layout_width="match_parent"
-            android:textColor="?colorAccent"
+            android:textColor="?attr/colorAccent"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
             android:layout_marginLeft="20dp"
@@ -130,7 +130,7 @@
             android:textSize="12sp"
             android:text="@string/context_whole_word_explanations"
             android:layout_width="match_parent"
-            android:textColor="?colorAccent"
+            android:textColor="?attr/colorAccent"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
             android:layout_marginLeft="20dp"
diff --git a/app/src/main/res/layout/drawer_filters.xml b/app/src/main/res/layout/drawer_filters.xml
index 9ab262a36..c7d294895 100644
--- a/app/src/main/res/layout/drawer_filters.xml
+++ b/app/src/main/res/layout/drawer_filters.xml
@@ -44,7 +44,7 @@
         android:layout_margin="5dp"
         android:id="@+id/edit_filter"
         app:fabSize="mini"
-        app:backgroundTint="?colorAccent"
+        app:backgroundTint="?attr/colorAccent"
         app:srcCompat="@drawable/ic_edit"
         tools:ignore="VectorDrawableCompat"
         android:layout_width="wrap_content"
@@ -54,7 +54,7 @@
         app:fabSize="mini"
         android:layout_margin="5dp"
         android:id="@+id/delete_filter"
-        app:backgroundTint="?colorAccent"
+        app:backgroundTint="?attr/colorAccent"
         app:srcCompat="@drawable/ic_delete"
         tools:ignore="VectorDrawableCompat"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/drawer_how_to_videos.xml b/app/src/main/res/layout/drawer_how_to_videos.xml
index b6cb4507a..dd287b2ce 100644
--- a/app/src/main/res/layout/drawer_how_to_videos.xml
+++ b/app/src/main/res/layout/drawer_how_to_videos.xml
@@ -42,7 +42,7 @@
         <TextView
             android:id="@+id/how_to_title"
             android:textStyle="bold"
-            android:textColor="?colorAccent"
+            android:textColor="?attr/colorAccent"
             android:layout_gravity="center_vertical"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/drawer_peertube.xml b/app/src/main/res/layout/drawer_peertube.xml
index 14965e147..7a3688246 100644
--- a/app/src/main/res/layout/drawer_peertube.xml
+++ b/app/src/main/res/layout/drawer_peertube.xml
@@ -69,7 +69,7 @@
             <TextView
                 android:id="@+id/peertube_title"
                 android:textStyle="bold"
-                android:textColor="?colorAccent"
+                android:textColor="?attr/colorAccent"
                 android:layout_gravity="center_vertical"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index 71894d532..5061a1a2c 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -31,7 +31,7 @@
         android:layout_width="2dp"
 
         android:layout_height="0dp"
-        android:background="?colorAccent"
+        android:background="?attr/colorAccent"
         app:layout_constraintBottom_toBottomOf="@id/reply_indicator_dot"
         app:layout_constraintEnd_toEndOf="@id/reply_indicator_dot"
         app:layout_constraintStart_toStartOf="@id/reply_indicator_dot"
@@ -43,7 +43,7 @@
         android:layout_width="8dp"
         android:layout_height="8dp"
         android:layout_marginStart="16sp"
-        android:background="?colorAccent"
+        android:background="?attr/colorAccent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -54,7 +54,7 @@
         android:layout_width="2dp"
         android:layout_height="0dp"
 
-        android:background="?colorAccent"
+        android:background="?attr/colorAccent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@id/reply_indicator_dot"
         app:layout_constraintStart_toStartOf="@id/reply_indicator_dot"
@@ -883,7 +883,7 @@
                         android:drawablePadding="2dp"
                         android:gravity="center_vertical"
                         android:text="@string/reply"
-                        android:textColor="?colorAccent"
+                        android:textColor="?attr/colorAccent"
                         android:visibility="gone" />
 
                     <TextView
@@ -896,7 +896,7 @@
                         android:drawablePadding="2dp"
                         android:gravity="center_vertical"
                         android:text="@string/delete"
-                        android:textColor="?colorAccent"
+                        android:textColor="?attr/colorAccent"
                         android:visibility="gone" />
                 </LinearLayout>
 
diff --git a/app/src/main/res/layout/drawer_status_compact.xml b/app/src/main/res/layout/drawer_status_compact.xml
index 8ed9e6277..7c77609e4 100644
--- a/app/src/main/res/layout/drawer_status_compact.xml
+++ b/app/src/main/res/layout/drawer_status_compact.xml
@@ -30,7 +30,7 @@
         android:layout_width="2dp"
 
         android:layout_height="0dp"
-        android:background="?colorAccent"
+        android:background="?attr/colorAccent"
         app:layout_constraintBottom_toBottomOf="@id/reply_indicator_dot"
         app:layout_constraintEnd_toEndOf="@id/reply_indicator_dot"
         app:layout_constraintStart_toStartOf="@id/reply_indicator_dot"
@@ -42,7 +42,7 @@
         android:layout_width="8dp"
         android:layout_height="8dp"
         android:layout_marginStart="16sp"
-        android:background="?colorAccent"
+        android:background="?attr/colorAccent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -53,7 +53,7 @@
         android:layout_width="2dp"
         android:layout_height="0dp"
 
-        android:background="?colorAccent"
+        android:background="?attr/colorAccent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@id/reply_indicator_dot"
         app:layout_constraintStart_toStartOf="@id/reply_indicator_dot"
@@ -834,7 +834,7 @@
                                 android:drawablePadding="2dp"
                                 android:gravity="center_vertical"
                                 android:text="@string/reply"
-                                android:textColor="?colorAccent"
+                                android:textColor="?attr/colorAccent"
                                 android:visibility="gone" />
 
                             <TextView
@@ -847,7 +847,7 @@
                                 android:drawablePadding="2dp"
                                 android:gravity="center_vertical"
                                 android:text="@string/delete"
-                                android:textColor="?colorAccent"
+                                android:textColor="?attr/colorAccent"
                                 android:visibility="gone" />
                         </LinearLayout>
 
diff --git a/app/src/main/res/layout/drawer_status_focused.xml b/app/src/main/res/layout/drawer_status_focused.xml
index 174a67347..9d5b95da0 100644
--- a/app/src/main/res/layout/drawer_status_focused.xml
+++ b/app/src/main/res/layout/drawer_status_focused.xml
@@ -44,7 +44,7 @@
         android:id="@+id/status_reply_indicator_top"
         android:layout_width="2dp"
         android:layout_height="0dp"
-        android:background="?colorAccent"
+        android:background="?attr/colorAccent"
         app:layout_constraintBottom_toBottomOf="@id/reply_indicator_dot"
         app:layout_constraintEnd_toEndOf="@id/reply_indicator_dot"
         app:layout_constraintStart_toStartOf="@id/reply_indicator_dot"
@@ -56,7 +56,7 @@
         android:layout_width="8dp"
         android:layout_height="8dp"
         android:layout_marginStart="0dp"
-        android:background="?colorAccent"
+        android:background="?attr/colorAccent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -66,7 +66,7 @@
         android:id="@+id/status_reply_indicator_bottom"
         android:layout_width="2dp"
         android:layout_height="0dp"
-        android:background="?colorAccent"
+        android:background="?attr/colorAccent"
         app:layout_constraintBottom_toTopOf="@+id/status_reply_indicator_diag_bottom"
         app:layout_constraintEnd_toEndOf="@id/reply_indicator_dot"
         app:layout_constraintStart_toStartOf="@id/reply_indicator_dot"
diff --git a/app/src/main/res/layout/drawer_who_to_follow_account.xml b/app/src/main/res/layout/drawer_who_to_follow_account.xml
index 571efd8df..2fa41d8d0 100644
--- a/app/src/main/res/layout/drawer_who_to_follow_account.xml
+++ b/app/src/main/res/layout/drawer_who_to_follow_account.xml
@@ -51,7 +51,7 @@
         app:fabSize="mini"
         android:layout_margin="5dp"
         android:id="@+id/account_to_follow_profile"
-        app:backgroundTint="?colorAccent"
+        app:backgroundTint="?attr/colorAccent"
         android:tint="@android:color/white"
         app:srcCompat="@drawable/ic_remove_red_eye"
         tools:ignore="VectorDrawableCompat"
diff --git a/app/src/main/res/layout/fragment_settings_reveal.xml b/app/src/main/res/layout/fragment_settings_reveal.xml
index 39df1ac0e..ee0e7f6e3 100644
--- a/app/src/main/res/layout/fragment_settings_reveal.xml
+++ b/app/src/main/res/layout/fragment_settings_reveal.xml
@@ -875,14 +875,14 @@
                                 android:layout_height="1dp"
                                 android:layout_margin="10dp"
                                 android:layout_weight="1"
-                                android:background="?colorAccent" />
+                                android:background="?attr/colorAccent" />
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:gravity="center"
                                 android:text="@string/settings_category_notif_customize"
-                                android:textColor="?colorAccent"
+                                android:textColor="?attr/colorAccent"
                                 android:textSize="16sp" />
 
                             <View
@@ -890,7 +890,7 @@
                                 android:layout_height="1dp"
                                 android:layout_margin="10dp"
                                 android:layout_weight="1"
-                                android:background="?colorAccent" />
+                                android:background="?attr/colorAccent" />
                         </LinearLayout>
 
                         <Button
@@ -1032,14 +1032,14 @@
                                 android:layout_height="1dp"
                                 android:layout_margin="10dp"
                                 android:layout_weight="1"
-                                android:background="?colorAccent" />
+                                android:background="?attr/colorAccent" />
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:gravity="center"
                                 android:text="@string/settings_category_notif_categories"
-                                android:textColor="?colorAccent"
+                                android:textColor="?attr/colorAccent"
                                 android:textSize="16sp" />
 
                             <View
@@ -1047,7 +1047,7 @@
                                 android:layout_height="1dp"
                                 android:layout_margin="10dp"
                                 android:layout_weight="1"
-                                android:background="?colorAccent" />
+                                android:background="?attr/colorAccent" />
                         </LinearLayout>
 
                         <LinearLayout
@@ -1177,14 +1177,14 @@
                                 android:layout_height="1dp"
                                 android:layout_margin="10dp"
                                 android:layout_weight="1"
-                                android:background="?colorAccent" />
+                                android:background="?attr/colorAccent" />
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:gravity="center"
                                 android:text="@string/settings_category_notif_time_slot"
-                                android:textColor="?colorAccent"
+                                android:textColor="?attr/colorAccent"
                                 android:textSize="16sp" />
 
                             <View
@@ -1192,7 +1192,7 @@
                                 android:layout_height="1dp"
                                 android:layout_margin="10dp"
                                 android:layout_weight="1"
-                                android:background="?colorAccent" />
+                                android:background="?attr/colorAccent" />
                         </LinearLayout>
 
                         <LinearLayout
@@ -1274,14 +1274,14 @@
                                 android:layout_height="1dp"
                                 android:layout_margin="10dp"
                                 android:layout_weight="1"
-                                android:background="?colorAccent" />
+                                android:background="?attr/colorAccent" />
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:gravity="center"
                                 android:text="@string/settings_category_notif_advanced"
-                                android:textColor="?colorAccent"
+                                android:textColor="?attr/colorAccent"
                                 android:textSize="16sp" />
 
                             <View
@@ -1289,7 +1289,7 @@
                                 android:layout_height="1dp"
                                 android:layout_margin="10dp"
                                 android:layout_weight="1"
-                                android:background="?colorAccent" />
+                                android:background="?attr/colorAccent" />
                         </LinearLayout>
 
                         <LinearLayout
@@ -1512,14 +1512,14 @@
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
                             android:layout_weight="1"
-                            android:background="?colorAccent" />
+                            android:background="?attr/colorAccent" />
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:gravity="center"
                             android:text="@string/set_backup"
-                            android:textColor="?colorAccent"
+                            android:textColor="?attr/colorAccent"
                             android:textSize="16sp" />
 
                         <View
@@ -1527,7 +1527,7 @@
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
                             android:layout_weight="1"
-                            android:background="?colorAccent" />
+                            android:background="?attr/colorAccent" />
                     </LinearLayout>
 
                     <LinearLayout
@@ -1612,14 +1612,14 @@
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
                             android:layout_weight="1"
-                            android:background="?colorAccent" />
+                            android:background="?attr/colorAccent" />
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:gravity="center"
                             android:text="@string/action_cache"
-                            android:textColor="?colorAccent"
+                            android:textColor="?attr/colorAccent"
                             android:textSize="16sp" />
 
                         <View
@@ -1627,7 +1627,7 @@
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
                             android:layout_weight="1"
-                            android:background="?colorAccent" />
+                            android:background="?attr/colorAccent" />
                     </LinearLayout>
 
                     <LinearLayout
@@ -1676,14 +1676,14 @@
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
                             android:layout_weight="1"
-                            android:background="?colorAccent" />
+                            android:background="?attr/colorAccent" />
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:gravity="center"
                             android:text="@string/set_crash_reports"
-                            android:textColor="?colorAccent"
+                            android:textColor="?attr/colorAccent"
                             android:textSize="16sp" />
 
                         <View
@@ -1691,7 +1691,7 @@
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
                             android:layout_weight="1"
-                            android:background="?colorAccent" />
+                            android:background="?attr/colorAccent" />
                     </LinearLayout>
 
                     <LinearLayout
@@ -1836,7 +1836,7 @@
                             TagsEditText:allowSpaceInTag="true"
                             TagsEditText:tagsCloseImagePadding="@dimen/defaultTagsCloseImagePadding"
                             TagsEditText:tagsCloseImageRight="@drawable/tag_close"
-                            TagsEditText:tagsTextColor="?colorAccent"
+                            TagsEditText:tagsTextColor="?attr/colorAccent"
                             TagsEditText:tagsTextSize="@dimen/defaultTagsTextSize" />
 
                         <TextView
@@ -2650,14 +2650,14 @@
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
                             android:layout_weight="1"
-                            android:background="?colorAccent" />
+                            android:background="?attr/colorAccent" />
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:gravity="center"
                             android:text="@string/communication_menu_title"
-                            android:textColor="?colorAccent"
+                            android:textColor="?attr/colorAccent"
                             android:textSize="16sp" />
 
                         <View
@@ -2665,7 +2665,7 @@
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
                             android:layout_weight="1"
-                            android:background="?colorAccent" />
+                            android:background="?attr/colorAccent" />
                     </LinearLayout>
 
                     <LinearLayout
@@ -2863,14 +2863,14 @@
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
                             android:layout_weight="1"
-                            android:background="?colorAccent" />
+                            android:background="?attr/colorAccent" />
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:gravity="center"
                             android:text="@string/neutral_menu_title"
-                            android:textColor="?colorAccent"
+                            android:textColor="?attr/colorAccent"
                             android:textSize="16sp" />
 
                         <View
@@ -2878,7 +2878,7 @@
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
                             android:layout_weight="1"
-                            android:background="?colorAccent" />
+                            android:background="?attr/colorAccent" />
                     </LinearLayout>
 
                     <LinearLayout
@@ -2961,14 +2961,14 @@
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
                             android:layout_weight="1"
-                            android:background="?colorAccent" />
+                            android:background="?attr/colorAccent" />
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:gravity="center"
                             android:text="@string/neutral_menu_information"
-                            android:textColor="?colorAccent"
+                            android:textColor="?attr/colorAccent"
                             android:textSize="16sp" />
 
                         <View
@@ -2976,7 +2976,7 @@
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
                             android:layout_weight="1"
-                            android:background="?colorAccent" />
+                            android:background="?attr/colorAccent" />
                     </LinearLayout>
 
                     <LinearLayout
@@ -3061,7 +3061,7 @@
                         android:gravity="center_vertical"
                         android:padding="5dp"
                         android:text="@string/crowdin_manager"
-                        android:textColor="?colorAccent"
+                        android:textColor="?attr/colorAccent"
                         android:textSize="16sp" />
 
                     <app.fedilab.android.helper.ExpandableHeightListView
diff --git a/app/src/main/res/layout/layout_quick_reply.xml b/app/src/main/res/layout/layout_quick_reply.xml
index 99778c9d3..ece6f4d8f 100644
--- a/app/src/main/res/layout/layout_quick_reply.xml
+++ b/app/src/main/res/layout/layout_quick_reply.xml
@@ -50,7 +50,7 @@
         android:layout_weight="1"
         android:gravity="center_vertical"
         android:text="0"
-        android:textColor="?colorAccent"
+        android:textColor="?attr/colorAccent"
         app:layout_constraintEnd_toStartOf="@id/quick_reply_emoji"
         app:layout_constraintStart_toEndOf="@id/quick_reply_switch_to_full"
         app:layout_constraintTop_toBottomOf="@id/quick_reply_text" />
diff --git a/app/src/main/res/layout/popup_cache.xml b/app/src/main/res/layout/popup_cache.xml
index 64423d526..4d2c254b6 100644
--- a/app/src/main/res/layout/popup_cache.xml
+++ b/app/src/main/res/layout/popup_cache.xml
@@ -25,14 +25,14 @@
         android:layout_height="1dp"
         android:layout_margin="10dp"
         android:layout_weight="1"
-        android:background="?colorAccent" />
+        android:background="?attr/colorAccent" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
         android:text="@string/file_cache"
-        android:textColor="?colorAccent"
+        android:textColor="?attr/colorAccent"
         android:textSize="16sp" />
 
     <View
@@ -40,7 +40,7 @@
         android:layout_height="1dp"
         android:layout_margin="10dp"
         android:layout_weight="1"
-        android:background="?colorAccent" />
+        android:background="?attr/colorAccent" />
 
     <TextView
         android:layout_marginTop="5dp"
@@ -54,14 +54,14 @@
         android:layout_height="1dp"
         android:layout_margin="10dp"
         android:layout_weight="1"
-        android:background="?colorAccent" />
+        android:background="?attr/colorAccent" />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
         android:text="@string/database_cache"
-        android:textColor="?colorAccent"
+        android:textColor="?attr/colorAccent"
         android:textSize="16sp" />
 
     <View
@@ -69,7 +69,7 @@
         android:layout_height="1dp"
         android:layout_margin="10dp"
         android:layout_weight="1"
-        android:background="?colorAccent" />
+        android:background="?attr/colorAccent" />
 
     <CheckBox
         android:id="@+id/cache_timeline"
diff --git a/app/src/main/res/layout/stats_owner_notifications.xml b/app/src/main/res/layout/stats_owner_notifications.xml
index ee92be619..be1ce13c7 100644
--- a/app/src/main/res/layout/stats_owner_notifications.xml
+++ b/app/src/main/res/layout/stats_owner_notifications.xml
@@ -68,14 +68,14 @@
                     android:layout_height="1dp"
                     android:layout_margin="10dp"
                     android:layout_weight="1"
-                    android:background="?colorAccent" />
+                    android:background="?attr/colorAccent" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center"
                     android:text="@string/date_range"
-                    android:textColor="?colorAccent"
+                    android:textColor="?attr/colorAccent"
                     android:textSize="16sp" />
 
                 <View
@@ -83,7 +83,7 @@
                     android:layout_height="1dp"
                     android:layout_margin="10dp"
                     android:layout_weight="1"
-                    android:background="?colorAccent" />
+                    android:background="?attr/colorAccent" />
             </LinearLayout>
 
             <LinearLayout
@@ -154,14 +154,14 @@
                     android:layout_height="1dp"
                     android:layout_margin="10dp"
                     android:layout_weight="1"
-                    android:background="?colorAccent" />
+                    android:background="?attr/colorAccent" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center"
                     android:text="@string/notifications"
-                    android:textColor="?colorAccent"
+                    android:textColor="?attr/colorAccent"
                     android:textSize="16sp" />
 
                 <View
@@ -169,7 +169,7 @@
                     android:layout_height="1dp"
                     android:layout_margin="10dp"
                     android:layout_weight="1"
-                    android:background="?colorAccent" />
+                    android:background="?attr/colorAccent" />
             </LinearLayout>
 
             <LinearLayout
diff --git a/app/src/main/res/layout/stats_owner_toots.xml b/app/src/main/res/layout/stats_owner_toots.xml
index 4dd8070c9..8e7d75a59 100644
--- a/app/src/main/res/layout/stats_owner_toots.xml
+++ b/app/src/main/res/layout/stats_owner_toots.xml
@@ -68,14 +68,14 @@
                     android:layout_height="1dp"
                     android:layout_margin="10dp"
                     android:layout_weight="1"
-                    android:background="?colorAccent" />
+                    android:background="?attr/colorAccent" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center"
                     android:text="@string/date_range"
-                    android:textColor="?colorAccent"
+                    android:textColor="?attr/colorAccent"
                     android:textSize="16sp" />
 
                 <View
@@ -83,7 +83,7 @@
                     android:layout_height="1dp"
                     android:layout_margin="10dp"
                     android:layout_weight="1"
-                    android:background="?colorAccent" />
+                    android:background="?attr/colorAccent" />
             </LinearLayout>
 
             <LinearLayout
@@ -154,14 +154,14 @@
                     android:layout_height="1dp"
                     android:layout_margin="10dp"
                     android:layout_weight="1"
-                    android:background="?colorAccent" />
+                    android:background="?attr/colorAccent" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center"
                     android:text="@string/statuses"
-                    android:textColor="?colorAccent"
+                    android:textColor="?attr/colorAccent"
                     android:textSize="16sp" />
 
                 <View
@@ -169,7 +169,7 @@
                     android:layout_height="1dp"
                     android:layout_margin="10dp"
                     android:layout_weight="1"
-                    android:background="?colorAccent" />
+                    android:background="?attr/colorAccent" />
             </LinearLayout>
 
             <LinearLayout
@@ -317,14 +317,14 @@
                     android:layout_height="1dp"
                     android:layout_margin="10dp"
                     android:layout_weight="1"
-                    android:background="?colorAccent" />
+                    android:background="?attr/colorAccent" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center"
                     android:text="@string/visibility"
-                    android:textColor="?colorAccent"
+                    android:textColor="?attr/colorAccent"
                     android:textSize="16sp" />
 
                 <View
@@ -332,7 +332,7 @@
                     android:layout_height="1dp"
                     android:layout_margin="10dp"
                     android:layout_weight="1"
-                    android:background="?colorAccent" />
+                    android:background="?attr/colorAccent" />
             </LinearLayout>
 
             <LinearLayout
@@ -422,14 +422,14 @@
                     android:layout_height="1dp"
                     android:layout_margin="10dp"
                     android:layout_weight="1"
-                    android:background="?colorAccent" />
+                    android:background="?attr/colorAccent" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center"
                     android:text="@string/tags"
-                    android:textColor="?colorAccent"
+                    android:textColor="?attr/colorAccent"
                     android:textSize="16sp" />
 
                 <View
@@ -437,7 +437,7 @@
                     android:layout_height="1dp"
                     android:layout_margin="10dp"
                     android:layout_weight="1"
-                    android:background="?colorAccent" />
+                    android:background="?attr/colorAccent" />
             </LinearLayout>
 
             <TextView