diff --git a/vector/src/main/res/drawable/line_divider_dark.xml b/vector/src/main/res/drawable/line_divider.xml
similarity index 75%
rename from vector/src/main/res/drawable/line_divider_dark.xml
rename to vector/src/main/res/drawable/line_divider.xml
index ee2a3a0972..004243a214 100644
--- a/vector/src/main/res/drawable/line_divider_dark.xml
+++ b/vector/src/main/res/drawable/line_divider.xml
@@ -6,6 +6,6 @@
         android:width="1dp"
         android:height="1dp" />
 
-    <solid android:color="@color/list_divider_color_dark" />
+    <solid android:color="?list_divider_color" />
 
 </shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/line_divider_light.xml b/vector/src/main/res/drawable/line_divider_light.xml
deleted file mode 100644
index cfaebbda7d..0000000000
--- a/vector/src/main/res/drawable/line_divider_light.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size
-        android:width="1dp"
-        android:height="1dp" />
-
-    <solid android:color="@color/list_divider_color_light" />
-
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/pill_receipt_dark.xml b/vector/src/main/res/drawable/pill_receipt.xml
similarity index 67%
rename from vector/src/main/res/drawable/pill_receipt_dark.xml
rename to vector/src/main/res/drawable/pill_receipt.xml
index 5442f13985..4ee57ebe61 100644
--- a/vector/src/main/res/drawable/pill_receipt_dark.xml
+++ b/vector/src/main/res/drawable/pill_receipt.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="10dp" />
-    <solid android:color="@color/riotx_header_panel_border_mobile_dark" />
+    <solid android:color="?riotx_header_panel_border_mobile" />
 </shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/pill_receipt_black.xml b/vector/src/main/res/drawable/pill_receipt_black.xml
deleted file mode 100644
index e63903550d..0000000000
--- a/vector/src/main/res/drawable/pill_receipt_black.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="10dp" />
-    <solid android:color="@color/riotx_header_panel_border_mobile_black" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/pill_receipt_light.xml b/vector/src/main/res/drawable/pill_receipt_light.xml
deleted file mode 100644
index 66875dc1b1..0000000000
--- a/vector/src/main/res/drawable/pill_receipt_light.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="10dp" />
-    <solid android:color="@color/riotx_header_panel_border_mobile_light" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/view_keys_backup_banner.xml b/vector/src/main/res/layout/view_keys_backup_banner.xml
index 6c8fc2b5a1..d9b66b9213 100644
--- a/vector/src/main/res/layout/view_keys_backup_banner.xml
+++ b/vector/src/main/res/layout/view_keys_backup_banner.xml
@@ -115,7 +115,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="?vctr_line_divider"
+        android:background="@drawable/line_divider"
         app:layout_constraintBottom_toBottomOf="parent" />
 
 </merge>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/view_read_receipts.xml b/vector/src/main/res/layout/view_read_receipts.xml
index cb536884a1..3e4c49fe00 100644
--- a/vector/src/main/res/layout/view_read_receipts.xml
+++ b/vector/src/main/res/layout/view_read_receipts.xml
@@ -10,7 +10,7 @@
         android:id="@+id/receiptMore"
         android:layout_width="wrap_content"
         android:layout_height="18dp"
-        android:background="?vctr_pill_receipt"
+        android:background="@drawable/pill_receipt"
         android:gravity="center"
         android:importantForAccessibility="no"
         android:paddingStart="4dp"
diff --git a/vector/src/main/res/values/attrs.xml b/vector/src/main/res/values/attrs.xml
index 3190482c5c..c6864fcac9 100644
--- a/vector/src/main/res/values/attrs.xml
+++ b/vector/src/main/res/values/attrs.xml
@@ -41,12 +41,6 @@
         <attr name="vctr_icon_tint_on_light_action_bar_color" format="color" />
         <attr name="vctr_settings_icon_tint_color" format="color" />
 
-        <!-- theses colours are requested a background cannot be set by an ?att on android < 5 -->
-        <!-- dedicated drawables are created for each theme -->
-        <attr name="vctr_line_divider" format="reference" />
-
-        <attr name="vctr_pill_receipt" format="reference" />
-
         <attr name="riotx_highlighted_message_background" format="reference" />
 
     </declare-styleable>
diff --git a/vector/src/main/res/values/colors_riot.xml b/vector/src/main/res/values/colors_riot.xml
index b9befb9e09..d939b9ddc5 100644
--- a/vector/src/main/res/values/colors_riot.xml
+++ b/vector/src/main/res/values/colors_riot.xml
@@ -46,6 +46,7 @@
     <color name="accent_color_status">#FF586C7B</color>
 
     <!--Default/Line break mobile-->
+    <attr name="list_divider_color" format="color" />
     <color name="list_divider_color_light">#EEEFEF</color>
     <!--Dark/Line break mobile-->
     <color name="list_divider_color_dark">#FF61708B</color>
diff --git a/vector/src/main/res/values/theme_black.xml b/vector/src/main/res/values/theme_black.xml
index 54e59903de..faad47d9bc 100644
--- a/vector/src/main/res/values/theme_black.xml
+++ b/vector/src/main/res/values/theme_black.xml
@@ -80,8 +80,6 @@
 
         <item name="vctr_markdown_block_background_color">#FF4D4D4D</item>
 
-        <item name="vctr_pill_receipt">@drawable/pill_receipt_black</item>
-
         <!-- activities background -->
         <item name="android:windowBackground">@color/riot_primary_background_color_black</item>
         <item name="riotx_bottom_nav_background_color">@color/riotx_bottom_nav_background_color_black</item>
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index 6f193d9c91..17b594ae23 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -122,11 +122,7 @@
         <item name="vctr_settings_icon_tint_color">@android:color/white</item>
         <item name="vctr_icon_tint_on_light_action_bar_color">@color/riotx_accent</item>
 
-        <!-- theses colours are requested a background cannot be set by an ?att on android < 5 -->
-        <!-- dedicated drawables are created for each theme -->
-        <item name="vctr_line_divider">@drawable/line_divider_dark</item>
-
-        <item name="vctr_pill_receipt">@drawable/pill_receipt_dark</item>
+        <item name="list_divider_color">@color/list_divider_color_dark</item>
 
         <!-- ANDROID SUPPORT ATTRIBUTES -->
         <!-- disable the overscroll because setOverscrollHeader/Footer don't always work -->
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index ba900af168..35fc092ce7 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -122,11 +122,7 @@
         <item name="vctr_settings_icon_tint_color">@android:color/black</item>
         <item name="vctr_icon_tint_on_light_action_bar_color">@color/riotx_accent</item>
 
-        <!-- theses colours are requested a background cannot be set by an ?att on android < 5 -->
-        <!-- dedicated drawables are created for each theme -->
-        <item name="vctr_line_divider">@drawable/line_divider_light</item>
-
-        <item name="vctr_pill_receipt">@drawable/pill_receipt_light</item>
+        <item name="list_divider_color">@color/list_divider_color_light</item>
 
         <!-- ANDROID SUPPORT ATTRIBUTES -->
         <!-- disable the overscroll because setOverscrollHeader/Footer don't always work -->
diff --git a/vector/src/main/res/values/theme_status.xml b/vector/src/main/res/values/theme_status.xml
index 90f0b121de..adc22741c4 100644
--- a/vector/src/main/res/values/theme_status.xml
+++ b/vector/src/main/res/values/theme_status.xml
@@ -63,10 +63,6 @@
         <item name="vctr_settings_icon_tint_color">@color/accent_color_status</item>
         <item name="vctr_icon_tint_on_light_action_bar_color">@color/riotx_accent</item>
 
-        <!-- theses colours are requested a background cannot be set by an ?att on android < 5 -->
-        <!-- dedicated drawables are created for each theme -->
-        <item name="vctr_line_divider">@drawable/line_divider_light</item>
-
         <!-- ANDROID SUPPORT ATTRIBUTES -->
         <!-- disable the overscroll because setOverscrollHeader/Footer don't always work -->
         <item name="android:overScrollMode">never</item>