diff --git a/app/src/main/assets/themes/cyanea_themes.json b/app/src/main/assets/themes/cyanea_themes.json
index f317ae182..30f5932c2 100644
--- a/app/src/main/assets/themes/cyanea_themes.json
+++ b/app/src/main/assets/themes/cyanea_themes.json
@@ -2,7 +2,7 @@
   {
     "theme_name":"Light",
     "base_theme":"LIGHT",
-    "primary":"#FFFFFFFF",
+    "primary":"#FFFFFF",
     "primary_dark":"#FFFFFFFF",
     "primary_light":"#FFd9e1e8",
     "accent":"#FF2b90d9",
diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
index 2f6b1af75..9a695cd80 100644
--- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
@@ -323,7 +323,8 @@ public abstract class BaseMainActivity extends BaseActivity
         //Here, the user is authenticated
         appBar = findViewById(R.id.appBar);
         Toolbar toolbar = findViewById(R.id.toolbar);
-
+        toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
         toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
         toolbar_search = toolbar.findViewById(R.id.toolbar_search);
         delete_instance = findViewById(R.id.delete_instance);
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 351553006..c46565c96 100644
--- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
@@ -944,13 +944,26 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
 
 
             if (type == RetrieveFeedsAsyncTask.Type.CONTEXT && holder.status_reply_indicator_top != null) {
-                holder.status_reply_indicator_top.setBackgroundColor(ContextCompat.getColor(context, R.color.cyanea_accent_reference));
-                holder.status_reply_indicator_bottom.setBackgroundColor(ContextCompat.getColor(context, R.color.cyanea_accent_reference));
-                holder.reply_indicator_dot.setBackgroundColor(ContextCompat.getColor(context, R.color.cyanea_accent_reference));
+
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+                    holder.status_reply_indicator_top.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4));
+                    holder.status_reply_indicator_bottom.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4));
+                    holder.reply_indicator_dot.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4));
+                }else{
+                    holder.status_reply_indicator_top.setBackgroundColor(ContextCompat.getColor(context, R.color.cyanea_accent_reference));
+                    holder.status_reply_indicator_bottom.setBackgroundColor(ContextCompat.getColor(context, R.color.cyanea_accent_reference));
+                    holder.reply_indicator_dot.setBackgroundColor(ContextCompat.getColor(context, R.color.cyanea_accent_reference));
+                }
+
                 if (status.isShowTopLine()) {
                     holder.status_reply_indicator_top.setVisibility(View.VISIBLE);
                     holder.reply_indicator_dot.setVisibility(View.VISIBLE);
                     if( holder.status_reply_indicator_diag_top != null){
+                        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+                            holder.status_reply_indicator_diag_top.setBackgroundResource(R.drawable.diag_top_android4);
+                        }else {
+                            holder.status_reply_indicator_diag_top.setBackgroundResource(R.drawable.diag_top);
+                        }
                         holder.status_reply_indicator_diag_top.setVisibility(View.VISIBLE);
                     }
                 }
@@ -958,6 +971,12 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                     holder.reply_indicator_dot.setVisibility(View.VISIBLE);
                     holder.status_reply_indicator_bottom.setVisibility(View.VISIBLE);
                     if( holder.status_reply_indicator_diag_bottom != null){
+                        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+                            holder.status_reply_indicator_diag_bottom.setBackgroundResource(R.drawable.diag_bottom_android4);
+                        }else {
+                            holder.status_reply_indicator_diag_bottom.setBackgroundResource(R.drawable.diag_bottom);
+                        }
+
                         holder.status_reply_indicator_diag_bottom.setVisibility(View.VISIBLE);
                     }
                 }
diff --git a/app/src/main/res/drawable/diag_bottom_android4.xml b/app/src/main/res/drawable/diag_bottom_android4.xml
new file mode 100644
index 000000000..bd7a79a1c
--- /dev/null
+++ b/app/src/main/res/drawable/diag_bottom_android4.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <rotate
+            android:fromDegrees="45"
+            android:pivotX="50%"
+            android:pivotY="50%"
+            android:toDegrees="0">
+            <shape
+                android:shape="line"
+                android:top="1dip">
+                <stroke
+                    android:width="2dp"
+                    android:color="@color/mastodonC4"/>
+            </shape>
+        </rotate>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/diag_top_android4.xml b/app/src/main/res/drawable/diag_top_android4.xml
new file mode 100644
index 000000000..a4c4e62a1
--- /dev/null
+++ b/app/src/main/res/drawable/diag_top_android4.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <rotate
+            android:fromDegrees="135"
+            android:pivotX="50%"
+            android:pivotY="50%"
+            android:toDegrees="0">
+            <shape
+                android:shape="line"
+                android:top="1dp">
+                <stroke
+                    android:width="2dp"
+                    android:color="@color/mastodonC4"/>
+            </shape>
+        </rotate>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_admin.xml b/app/src/main/res/layout/activity_admin.xml
index 119625183..32f38af4c 100644
--- a/app/src/main/res/layout/activity_admin.xml
+++ b/app/src/main/res/layout/activity_admin.xml
@@ -26,7 +26,7 @@
         android:id="@+id/appBar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        >
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/admin_tablayout"
diff --git a/app/src/main/res/layout/activity_admin_report.xml b/app/src/main/res/layout/activity_admin_report.xml
index 7bbffab20..1cdf53721 100644
--- a/app/src/main/res/layout/activity_admin_report.xml
+++ b/app/src/main/res/layout/activity_admin_report.xml
@@ -28,7 +28,7 @@
         android:id="@+id/appBar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        >
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5240f6f64..2955e2511 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -32,7 +32,7 @@
             android:id="@+id/appBar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:theme="@style/AppTheme.AppBarOverlay">
+            >
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
diff --git a/app/src/main/res/layout/activity_show_account.xml b/app/src/main/res/layout/activity_show_account.xml
index 88575e484..b31711baf 100644
--- a/app/src/main/res/layout/activity_show_account.xml
+++ b/app/src/main/res/layout/activity_show_account.xml
@@ -27,7 +27,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:fitsSystemWindows="true"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        >
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_show_conversation.xml b/app/src/main/res/layout/activity_show_conversation.xml
index 090fdcdd3..8201cec4c 100644
--- a/app/src/main/res/layout/activity_show_conversation.xml
+++ b/app/src/main/res/layout/activity_show_conversation.xml
@@ -15,7 +15,7 @@
             android:id="@+id/appBar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:theme="@style/AppTheme.AppBarOverlay">
+            >
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/drawer_status_focused.xml b/app/src/main/res/layout/drawer_status_focused.xml
index 0ee4edb7d..0abae2e93 100644
--- a/app/src/main/res/layout/drawer_status_focused.xml
+++ b/app/src/main/res/layout/drawer_status_focused.xml
@@ -30,7 +30,6 @@
     >
     <View
         android:visibility="gone"
-        android:background="@drawable/diag_top"
         android:id="@+id/status_reply_indicator_diag_top"
         android:layout_width="20dp"
         android:layout_height="11dp"
@@ -73,7 +72,6 @@
 
     <View
         android:visibility="gone"
-        android:background="@drawable/diag_bottom"
         android:id="@+id/status_reply_indicator_diag_bottom"
         android:layout_width="20dp"
         android:layout_height="11dp"
@@ -154,8 +152,8 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:layout_marginTop="5dp"
+                    android:backgroundTint="?attr/colorAccent"
                     android:contentDescription="@string/profile_picture"
-                    android:tint="?attr/colorAccent"
                     android:visibility="gone" />
             </LinearLayout>
 
@@ -191,7 +189,7 @@
                         android:layout_height="20dp"
                         android:contentDescription="@string/cached_status"
                         android:src="@drawable/ic_cached_black"
-                        android:tint="?attr/colorAccent"
+                        android:tint="?attr/iconColor"
                         android:visibility="gone" />
 
                     <TextView
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a3f920761..4dd0a6786 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -14,6 +14,7 @@
         <item name="textHeader">@color/black</item>
         <item name="customFeature">@color/mastodonC4</item>
         <item name="cardviewHeaderBoostColor">@color/mastodonC2</item>
+        <item name="colorPrimary">@color/white</item>
         <item name="textColor">@color/black</item>
         <item name="android:textColor">@color/black</item>
     </style>
@@ -24,6 +25,7 @@
         <item name="iconColor">@color/black</item>
         <item name="textHeader">@color/black</item>
         <item name="customFeature">@color/mastodonC4</item>
+        <item name="colorPrimary">@color/white</item>
         <item name="cardviewHeaderBoostColor">@color/mastodonC2</item>
         <item name="textColor">@color/black</item>
         <item name="android:textColor">@color/black</item>
@@ -34,6 +36,7 @@
         <item name="iconColor">@color/black_icon_theme</item>
         <item name="textHeader">@color/dark_text_toot_header</item>
         <item name="customFeature">@color/custom_features_button_black</item>
+        <item name="colorPrimary">@color/black</item>
         <item name="cardviewHeaderBoostColor">@color/mastodonC1_</item>
         <item name="textColor">@color/dark_text</item>
         <item name="android:textColor">@color/dark_text</item>
@@ -44,6 +47,7 @@
         <item name="iconColor">@color/black_icon_theme</item>
         <item name="textHeader">@color/dark_text_toot_header</item>
         <item name="customFeature">@color/custom_features_button_black</item>
+        <item name="colorPrimary">@color/black</item>
         <item name="cardviewHeaderBoostColor">@color/mastodonC1_</item>
         <item name="textColor">@color/dark_text</item>
         <item name="android:textColor">@color/dark_text</item>
@@ -56,6 +60,7 @@
         <item name="iconColor">@color/dark_icon_theme</item>
         <item name="textHeader">@color/dark_text_toot_header</item>
         <item name="customFeature">@color/mastodonC4</item>
+        <item name="colorPrimary">@color/mastodonC1</item>
         <item name="cardviewHeaderBoostColor">@color/mastodonC1___</item>
         <item name="textColor">@color/dark_text</item>
         <item name="android:textColor">@color/dark_text</item>
@@ -66,6 +71,7 @@
         <item name="iconColor">@color/dark_icon_theme</item>
         <item name="textHeader">@color/dark_text_toot_header</item>
         <item name="customFeature">@color/mastodonC4</item>
+        <item name="colorPrimary">@color/mastodonC1</item>
         <item name="cardviewHeaderBoostColor">@color/mastodonC1___</item>
         <item name="textColor">@color/dark_text</item>
         <item name="android:textColor">@color/dark_text</item>
@@ -88,6 +94,7 @@
 
     <style name="TransparentLight" parent="Theme.Cyanea.Light">black_icon_theme
         <item name="iconColor">@color/black</item>
+        <item name="colorPrimary">@color/white</item>
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowContentOverlay">@null</item>
@@ -96,6 +103,7 @@
 
     <style name="TransparentDark" parent="Theme.Cyanea.Dark">
         <item name="iconColor">@color/dark_icon_theme</item>
+        <item name="colorPrimary">@color/mastodonC1</item>
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowContentOverlay">@null</item>
@@ -104,6 +112,7 @@
 
     <style name="TransparentBlack" parent="Theme.Cyanea.Dark">
         <item name="iconColor">@color/black_icon_theme</item>
+        <item name="colorPrimary">@color/black</item>
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowContentOverlay">@null</item>