diff --git a/vector/src/main/java/im/vector/app/core/extensions/RecyclerView.kt b/vector/src/main/java/im/vector/app/core/extensions/RecyclerView.kt
index f7d51cd862..03ce44f33f 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/RecyclerView.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/RecyclerView.kt
@@ -23,7 +23,6 @@ import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.epoxy.EpoxyController
 import com.airbnb.epoxy.EpoxyVisibilityTracker
 import im.vector.app.R
-import im.vector.app.features.themes.ThemeUtils
 
 /**
  * Apply a Vertical LinearLayout Manager to the recyclerView and set the adapter from the epoxy controller
@@ -46,7 +45,7 @@ fun RecyclerView.configureWith(epoxyController: EpoxyController,
     if (showDivider) {
         addItemDecoration(
                 DividerItemDecoration(context, DividerItemDecoration.VERTICAL).apply {
-                    ContextCompat.getDrawable(context, ThemeUtils.getResourceId(context, R.drawable.divider_horizontal_light))?.let {
+                    ContextCompat.getDrawable(context, R.drawable.divider_horizontal)?.let {
                         setDrawable(it)
                     }
                 }
diff --git a/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
index 38fc328f14..7cc7dc7f55 100644
--- a/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
@@ -182,7 +182,6 @@ object ThemeUtils {
                     R.drawable.bg_search_edit_text_light     -> R.drawable.bg_search_edit_text_dark
                     R.drawable.bg_unread_notification_light  -> R.drawable.bg_unread_notification_dark
                     R.drawable.vector_label_background_light -> R.drawable.vector_label_background_dark
-                    R.drawable.divider_horizontal_light      -> R.drawable.divider_horizontal_dark
                     else                                     -> {
                         Timber.w("Warning, missing case for wanted drawable in dark theme")
                         resourceId
@@ -194,7 +193,6 @@ object ThemeUtils {
                     R.drawable.bg_search_edit_text_light     -> R.drawable.bg_search_edit_text_black
                     R.drawable.bg_unread_notification_light  -> R.drawable.bg_unread_notification_black
                     R.drawable.vector_label_background_light -> R.drawable.vector_label_background_black
-                    R.drawable.divider_horizontal_light      -> R.drawable.divider_horizontal_black
                     else                                     -> {
                         Timber.w("Warning, missing case for wanted drawable in black theme")
                         resourceId
diff --git a/vector/src/main/res/drawable/divider_horizontal_dark.xml b/vector/src/main/res/drawable/divider_horizontal.xml
similarity index 62%
rename from vector/src/main/res/drawable/divider_horizontal_dark.xml
rename to vector/src/main/res/drawable/divider_horizontal.xml
index 24a9307799..ae2f61e60a 100644
--- a/vector/src/main/res/drawable/divider_horizontal_dark.xml
+++ b/vector/src/main/res/drawable/divider_horizontal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <size android:height="1dp" />
-    <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/divider_horizontal_black.xml b/vector/src/main/res/drawable/divider_horizontal_black.xml
deleted file mode 100644
index 43a68bbe2d..0000000000
--- a/vector/src/main/res/drawable/divider_horizontal_black.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <size android:height="1dp" />
-    <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/divider_horizontal_light.xml b/vector/src/main/res/drawable/divider_horizontal_light.xml
deleted file mode 100644
index 4b215ecaa4..0000000000
--- a/vector/src/main/res/drawable/divider_horizontal_light.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <size android:height="1dp" />
-    <solid android:color="@color/riotx_header_panel_border_mobile_light" />
-</shape>
\ No newline at end of file