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 0af874f65..c57c31f58 100644
--- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
@@ -689,11 +689,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                     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.setBackgroundResource(R.drawable.diag_top);
                         holder.status_reply_indicator_diag_top.setVisibility(View.VISIBLE);
                     }
                 }
@@ -701,12 +697,7 @@ 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.setBackgroundResource(R.drawable.diag_bottom);
                         holder.status_reply_indicator_diag_bottom.setVisibility(View.VISIBLE);
                     }
                 }
@@ -2047,11 +2038,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             if (status.isTranslationShown() && status.getContentSpanTranslated() != null) {
                 holder.status_content_translated.setText(status.getContentSpanTranslated(), TextView.BufferType.SPANNABLE);
                 holder.status_content_translated_container.setVisibility(View.VISIBLE);
-                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-                    holder.translation_border_view.setBackgroundResource(R.drawable.translation_border_android4);
-                } else {
-                    holder.translation_border_view.setBackgroundResource(R.drawable.translation_border);
-                }
+                holder.translation_border_view.setBackgroundResource(R.drawable.translation_border);
 
             } else { //Toot is not translated
                 holder.status_content_translated_container.setVisibility(View.GONE);
diff --git a/app/src/main/res/drawable/diag_bottom_android4.xml b/app/src/main/res/drawable-v19/diag_bottom.xml
similarity index 100%
rename from app/src/main/res/drawable/diag_bottom_android4.xml
rename to app/src/main/res/drawable-v19/diag_bottom.xml
diff --git a/app/src/main/res/drawable/diag_top_android4.xml b/app/src/main/res/drawable-v19/diag_top.xml
similarity index 100%
rename from app/src/main/res/drawable/diag_top_android4.xml
rename to app/src/main/res/drawable-v19/diag_top.xml
diff --git a/app/src/main/res/drawable/translation_border_android4.xml b/app/src/main/res/drawable-v19/translation_border.xml
similarity index 100%
rename from app/src/main/res/drawable/translation_border_android4.xml
rename to app/src/main/res/drawable-v19/translation_border.xml
diff --git a/app/src/main/res/layout/fragment_settings_reveal.xml b/app/src/main/res/layout/fragment_settings_reveal.xml
index b29b44400..f1eb531f0 100644
--- a/app/src/main/res/layout/fragment_settings_reveal.xml
+++ b/app/src/main/res/layout/fragment_settings_reveal.xml
@@ -784,7 +784,7 @@
                             android:layout_height="wrap_content"
                             android:orientation="horizontal">
 
-                            <View
+                            <LinearLayout
                                 android:layout_width="0dp"
                                 android:layout_height="1dp"
                                 android:layout_margin="10dp"
@@ -799,7 +799,7 @@
                                 android:textColor="?colorAccent"
                                 android:textSize="16sp" />
 
-                            <View
+                            <LinearLayout
                                 android:layout_width="0dp"
                                 android:layout_height="1dp"
                                 android:layout_margin="10dp"
@@ -941,7 +941,7 @@
                             android:layout_height="wrap_content"
                             android:orientation="horizontal">
 
-                            <View
+                            <LinearLayout
                                 android:layout_width="0dp"
                                 android:layout_height="1dp"
                                 android:layout_margin="10dp"
@@ -956,7 +956,7 @@
                                 android:textColor="?colorAccent"
                                 android:textSize="16sp" />
 
-                            <View
+                            <LinearLayout
                                 android:layout_width="0dp"
                                 android:layout_height="1dp"
                                 android:layout_margin="10dp"
@@ -1086,7 +1086,7 @@
                             android:layout_height="wrap_content"
                             android:orientation="horizontal">
 
-                            <View
+                            <LinearLayout
                                 android:layout_width="0dp"
                                 android:layout_height="1dp"
                                 android:layout_margin="10dp"
@@ -1101,7 +1101,7 @@
                                 android:textColor="?colorAccent"
                                 android:textSize="16sp" />
 
-                            <View
+                            <LinearLayout
                                 android:layout_width="0dp"
                                 android:layout_height="1dp"
                                 android:layout_margin="10dp"
@@ -1180,7 +1180,7 @@
                             android:layout_height="wrap_content"
                             android:orientation="horizontal">
 
-                            <View
+                            <LinearLayout
                                 android:layout_width="0dp"
                                 android:layout_height="1dp"
                                 android:layout_margin="10dp"
@@ -1195,7 +1195,7 @@
                                 android:textColor="?colorAccent"
                                 android:textSize="16sp" />
 
-                            <View
+                            <LinearLayout
                                 android:layout_width="0dp"
                                 android:layout_height="1dp"
                                 android:layout_margin="10dp"
@@ -1419,7 +1419,7 @@
                         android:layout_height="wrap_content"
                         android:orientation="horizontal">
 
-                        <View
+                        <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
@@ -1434,7 +1434,7 @@
                             android:textColor="?colorAccent"
                             android:textSize="16sp" />
 
-                        <View
+                        <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
@@ -1519,7 +1519,7 @@
                         android:layout_height="wrap_content"
                         android:orientation="horizontal">
 
-                        <View
+                        <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
@@ -1534,7 +1534,7 @@
                             android:textColor="?colorAccent"
                             android:textSize="16sp" />
 
-                        <View
+                        <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
@@ -1583,7 +1583,7 @@
                         android:layout_height="wrap_content"
                         android:orientation="horizontal">
 
-                        <View
+                        <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
@@ -1598,7 +1598,7 @@
                             android:textColor="?colorAccent"
                             android:textSize="16sp" />
 
-                        <View
+                        <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
@@ -2742,7 +2742,7 @@
                         android:layout_height="wrap_content"
                         android:orientation="horizontal">
 
-                        <View
+                        <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
@@ -2757,7 +2757,7 @@
                             android:textColor="?colorAccent"
                             android:textSize="16sp" />
 
-                        <View
+                        <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
@@ -2955,12 +2955,12 @@
                         android:layout_height="wrap_content"
                         android:orientation="horizontal">
 
-                        <View
+                        <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
                             android:layout_weight="1"
-                            android:background="?colorAccent" />
+                            android:background="?colorAccent"/>
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -2970,12 +2970,12 @@
                             android:textColor="?colorAccent"
                             android:textSize="16sp" />
 
-                        <View
+                        <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
                             android:layout_weight="1"
-                            android:background="?colorAccent" />
+                            android:background="?colorAccent"/>
                     </LinearLayout>
 
                     <LinearLayout
@@ -3053,12 +3053,12 @@
                         android:layout_height="wrap_content"
                         android:orientation="horizontal">
 
-                        <View
+                        <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
                             android:layout_weight="1"
-                            android:background="?colorAccent" />
+                            android:background="?colorAccent"/>
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -3068,7 +3068,7 @@
                             android:textColor="?colorAccent"
                             android:textSize="16sp" />
 
-                        <View
+                        <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a79d5dcb7..16f7dc261 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -125,7 +125,7 @@
     <color name="dark_blockquote">#5E68A0</color>
 
     <color name="cyanea_primary_reference">#0288D1</color>
-    <color name="cyanea_accent_reference">#FFA000</color>
+    <color name="cyanea_accent_reference">#2b90d9</color>
 
 
     <color name="dark_icon_theme">#f3f3f3</color>