diff --git a/vector/src/main/res/drawable/highlighted_message_background_dark.xml b/vector/src/main/res/drawable/highlighted_message_background.xml
similarity index 91%
rename from vector/src/main/res/drawable/highlighted_message_background_dark.xml
rename to vector/src/main/res/drawable/highlighted_message_background.xml
index 4448f01d0e..5975ff06b3 100644
--- a/vector/src/main/res/drawable/highlighted_message_background_dark.xml
+++ b/vector/src/main/res/drawable/highlighted_message_background.xml
@@ -9,7 +9,7 @@
             <item android:left="6dp" android:right="2dp">
                 <shape>
                     <corners android:bottomRightRadius="4dp" android:topRightRadius="4dp" />
-                    <solid android:color="@color/riotx_header_panel_background_dark" />
+                    <solid android:color="?riotx_header_panel_background" />
                 </shape>
             </item>
 
diff --git a/vector/src/main/res/drawable/highlighted_message_background_black.xml b/vector/src/main/res/drawable/highlighted_message_background_black.xml
deleted file mode 100644
index ebb4c81dd9..0000000000
--- a/vector/src/main/res/drawable/highlighted_message_background_black.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_checked="true">
-
-        <layer-list>
-
-            <!-- Draw the BG. -->
-            <item android:left="6dp" android:right="2dp">
-                <shape>
-                    <corners android:bottomRightRadius="4dp" android:topRightRadius="4dp" />
-                    <solid android:color="@color/riotx_header_panel_background_black" />
-                </shape>
-            </item>
-
-            <item android:gravity="start" android:left="2dp">
-                <shape>
-                    <size android:width="4dp" />
-                    <corners android:bottomLeftRadius="40dp" android:topLeftRadius="40dp" />
-                    <solid android:color="@color/riotx_accent" />
-                </shape>
-            </item>
-
-        </layer-list>
-
-    </item>
-
-    <item android:state_checked="false">
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/transparent" />
-        </shape>
-    </item>
-
-
-</selector>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/highlighted_message_background_light.xml b/vector/src/main/res/drawable/highlighted_message_background_light.xml
deleted file mode 100644
index 7b53b3ffe3..0000000000
--- a/vector/src/main/res/drawable/highlighted_message_background_light.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_checked="true">
-
-        <layer-list>
-
-            <!-- Draw the BG. -->
-            <item android:left="6dp" android:right="2dp">
-                <shape>
-                    <corners android:bottomRightRadius="4dp" android:topRightRadius="4dp" />
-                    <solid android:color="@color/riotx_header_panel_background_light" />
-                </shape>
-            </item>
-
-            <item android:gravity="start" android:left="2dp">
-                <shape>
-                    <size android:width="4dp" />
-                    <corners android:bottomLeftRadius="40dp" android:topLeftRadius="40dp" />
-                    <solid android:color="@color/riotx_accent" />
-                </shape>
-            </item>
-
-        </layer-list>
-
-    </item>
-
-    <item android:state_checked="false">
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/transparent" />
-        </shape>
-    </item>
-
-
-</selector>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index 80d257fbfd..853ece47e1 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -13,7 +13,7 @@
         android:layout_height="match_parent"
         android:layout_alignBottom="@+id/informationBottom"
         android:layout_alignParentTop="true"
-        android:background="?riotx_highlighted_message_background" />
+        android:background="@drawable/highlighted_message_background" />
 
     <ImageView
         android:id="@+id/messageAvatarImageView"
diff --git a/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml b/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
index bd5603c6f5..4ad9ad5cae 100644
--- a/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
@@ -12,7 +12,7 @@
         android:layout_height="match_parent"
         android:layout_alignBottom="@+id/readReceiptsView"
         android:layout_alignParentTop="true"
-        android:background="?riotx_highlighted_message_background" />
+        android:background="@drawable/highlighted_message_background" />
 
     <View
         android:id="@+id/messageStartGuideline"
diff --git a/vector/src/main/res/layout/item_timeline_event_base_state.xml b/vector/src/main/res/layout/item_timeline_event_base_state.xml
index c7a5291338..a6b21aed15 100644
--- a/vector/src/main/res/layout/item_timeline_event_base_state.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base_state.xml
@@ -13,7 +13,7 @@
         android:layout_height="match_parent"
         android:layout_alignBottom="@+id/informationBottom"
         android:layout_alignParentTop="true"
-        android:background="?riotx_highlighted_message_background" />
+        android:background="@drawable/highlighted_message_background" />
 
     <View
         android:id="@+id/messageStartGuideline"
diff --git a/vector/src/main/res/values/attrs.xml b/vector/src/main/res/values/attrs.xml
index c6864fcac9..8c71fb26b2 100644
--- a/vector/src/main/res/values/attrs.xml
+++ b/vector/src/main/res/values/attrs.xml
@@ -41,8 +41,6 @@
         <attr name="vctr_icon_tint_on_light_action_bar_color" format="color" />
         <attr name="vctr_settings_icon_tint_color" format="color" />
 
-        <attr name="riotx_highlighted_message_background" format="reference" />
-
     </declare-styleable>
 
     <declare-styleable name="PollResultLineView">
diff --git a/vector/src/main/res/values/theme_black.xml b/vector/src/main/res/values/theme_black.xml
index faad47d9bc..083c8d9bb2 100644
--- a/vector/src/main/res/values/theme_black.xml
+++ b/vector/src/main/res/values/theme_black.xml
@@ -39,9 +39,6 @@
 
         <item name="riotx_bottom_nav_icon_color">@color/riotx_bottom_nav_icon_color_black</item>
 
-        <!-- Drawables -->
-        <item name="riotx_highlighted_message_background">@drawable/highlighted_message_background_black</item>
-
         <!-- Material color: Note: this block should be the same in all theme because it references only common colors and ?riotx attributes -->
         <item name="colorPrimary">@color/riotx_accent</item>
         <!--item name="colorPrimaryVariant">@color/primary_color_dark_light</item-->
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index 17b594ae23..64855223ee 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -39,9 +39,6 @@
 
         <item name="riotx_keys_backup_banner_accent_color">@color/riotx_keys_backup_banner_accent_color_dark</item>
 
-        <!-- Drawables -->
-        <item name="riotx_highlighted_message_background">@drawable/highlighted_message_background_dark</item>
-
         <!-- Material color: Note: this block should be the same in all theme because it references only common colors and ?riotx attributes -->
         <item name="colorPrimary">@color/riotx_accent</item>
         <item name="colorPrimaryVariant">@color/primary_color_dark_light</item>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index 35fc092ce7..88510e526a 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -38,9 +38,6 @@
 
         <item name="riotx_bottom_nav_icon_color">@color/riotx_bottom_nav_icon_color_light</item>
 
-        <!-- Drawables -->
-        <item name="riotx_highlighted_message_background">@drawable/highlighted_message_background_light</item>
-
         <!-- Material color: Note: this block should be the same in all theme because it references only common colors and ?riotx attributes -->
         <item name="colorPrimary">@color/riotx_accent</item>
         <!--item name="colorPrimaryVariant">@color/primary_color_dark_light</item-->