diff --git a/vector/src/debug/res/layout/item_test_linkify.xml b/vector/src/debug/res/layout/item_test_linkify.xml
index 19bebeaf50..89d1dade0d 100644
--- a/vector/src/debug/res/layout/item_test_linkify.xml
+++ b/vector/src/debug/res/layout/item_test_linkify.xml
@@ -12,7 +12,6 @@
         android:orientation="vertical">
 
         <TextView
-            style="@style/ListHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="AutoLink" />
@@ -26,7 +25,6 @@
             tools:text="www.example.org" />
 
         <TextView
-            style="@style/ListHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Custom Link" />
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
index e9cf8251de..2e97abc32e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
@@ -468,7 +468,7 @@ class MessageItemFactory @Inject constructor(
         spannable.append(linkifiedBody)
         val editedSuffix = stringProvider.getString(R.string.edited_suffix)
         spannable.append(" ").append(editedSuffix)
-        val color = colorProvider.getColorFromAttribute(R.attr.vctr_list_header_secondary_text_color)
+        val color = colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)
         val editStart = spannable.lastIndexOf(editedSuffix)
         val editEnd = editStart + editedSuffix.length
         spannable.setSpan(
diff --git a/vector/src/main/res/drawable/ic_sliders.xml b/vector/src/main/res/drawable/ic_sliders.xml
deleted file mode 100644
index 55ccfcfb3d..0000000000
--- a/vector/src/main/res/drawable/ic_sliders.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="14dp"
-    android:height="12dp"
-    android:viewportWidth="14"
-    android:viewportHeight="12">
-  <path
-      android:strokeWidth="1"
-      android:pathData="M2.636,11V7.111M2.636,4.889V1M7,11V6M7,3.778V1M11.364,11V8.222M11.364,6V1M1,7.111h3.273M5.364,3.778h3.272M9.727,8.222H13"
-      android:strokeLineJoin="round"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#454545"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/vector/src/main/res/drawable/pill_background_bing.xml b/vector/src/main/res/drawable/pill_background_bing.xml
deleted file mode 100644
index 70a2bda8a4..0000000000
--- a/vector/src/main/res/drawable/pill_background_bing.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/vector_fuchsia_color" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/rounded_rect_shape.xml b/vector/src/main/res/drawable/rounded_rect_shape.xml
deleted file mode 100644
index e9c0a27f59..0000000000
--- a/vector/src/main/res/drawable/rounded_rect_shape.xml
+++ /dev/null
@@ -1,13 +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="40dp" android:height="22dp"/>-->
-
-    <solid android:color="?vctr_list_header_background_color" />
-
-    <stroke android:width="1dp" android:color="@color/accent_color_light" />
-
-    <corners android:radius="20dp" />
-
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/rounded_rect_shape_off.xml b/vector/src/main/res/drawable/rounded_rect_shape_off.xml
deleted file mode 100644
index 8dac3020e3..0000000000
--- a/vector/src/main/res/drawable/rounded_rect_shape_off.xml
+++ /dev/null
@@ -1,13 +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="40dp" android:height="22dp"/>
-
-    <solid android:color="?vctr_list_header_background_color" />
-
-    <!--<stroke android:width="1dp" android:color="@color/list_divider_color_light" />-->
-
-    <corners android:radius="20dp" />
-
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/values/attrs.xml b/vector/src/main/res/values/attrs.xml
index 94a43037ae..ecc64bf07d 100644
--- a/vector/src/main/res/values/attrs.xml
+++ b/vector/src/main/res/values/attrs.xml
@@ -18,8 +18,6 @@
 
     <!-- list colors -->
     <attr name="vctr_list_header_background_color" format="color" />
-    <attr name="vctr_list_header_primary_text_color" format="color" />
-    <attr name="vctr_list_header_secondary_text_color" format="color" />
 
     <attr name="vctr_list_divider_color" format="color" />
 
diff --git a/vector/src/main/res/values/styles_riot.xml b/vector/src/main/res/values/styles_riot.xml
index bf74dd86fa..5f6890564a 100644
--- a/vector/src/main/res/values/styles_riot.xml
+++ b/vector/src/main/res/values/styles_riot.xml
@@ -227,18 +227,6 @@
         <item name="tabMaxWidth">0dp</item>
     </style>
 
-    <style name="ListHeader">
-        <item name="android:textSize">14sp</item>
-        <item name="android:textColor">?vctr_list_header_primary_text_color</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:background">?vctr_list_header_background_color</item>
-        <item name="android:paddingLeft">16dp</item>
-        <item name="android:paddingRight">16dp</item>
-        <item name="android:paddingTop">10dp</item>
-        <item name="android:paddingBottom">10dp</item>
-    </style>
-
     <!-- BottomSheet theming -->
     <style name="Vector.BottomSheet.Dark" parent="Theme.Design.BottomSheetDialog">
         <item name="android:textColorPrimary">@color/riot_primary_text_color_dark</item>
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index 24500f6d78..5d22683b82 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -90,10 +90,6 @@
         <!-- list colors -->
         <!--Header/Panel Background-->
         <item name="vctr_list_header_background_color">@color/primary_color_dark</item>
-        <!--Header/Panel Text Primary-->
-        <item name="vctr_list_header_primary_text_color">#FFA1B2D1</item>
-        <!--Header/Panel Text Secondary-->
-        <item name="vctr_list_header_secondary_text_color">#FFC8C8CD</item>
 
         <item name="riotx_list_bottom_sheet_divider_color">@color/riotx_list_bottom_sheet_divider_color_dark</item>
         <item name="vctr_list_divider_color">@color/riotx_header_panel_background_dark</item>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index d0e33959c1..049f8dd1db 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -90,10 +90,6 @@
         <!-- list colors -->
         <!--Header/Panel Background-->
         <item name="vctr_list_header_background_color">#FFF3F8FD</item>
-        <!--Header/Panel Text Primary-->
-        <item name="vctr_list_header_primary_text_color">#FF61708B</item>
-        <!--Header/Panel Text Secondary-->
-        <item name="vctr_list_header_secondary_text_color">#FFC8C8CD</item>
 
         <item name="riotx_list_bottom_sheet_divider_color">@color/riotx_list_bottom_sheet_divider_color_light</item>
         <item name="vctr_list_divider_color">@color/riotx_header_panel_background_light</item>