diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/DividerItem.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/DividerItem.kt
index 3b2efebc5d..8051804145 100644
--- a/vector/src/main/java/im/vector/riotx/core/epoxy/DividerItem.kt
+++ b/vector/src/main/java/im/vector/riotx/core/epoxy/DividerItem.kt
@@ -21,7 +21,7 @@ import im.vector.riotx.R
 
 /**
  * Default background color is for the bottom sheets (R.attr.vctr_list_bottom_sheet_divider_color).
- * To use in fragment, set color using R.attr.vctr_list_divider_color
+ * To use in fragment, set color using R.attr.riotx_list_divider_color
  */
 @EpoxyModelClass(layout = R.layout.item_divider)
 abstract class DividerItem : VectorEpoxyModel<DividerItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
index 74475406ed..66c8e87e2c 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
@@ -65,10 +65,6 @@ class RoomListQuickActionsEpoxyController @Inject constructor(
         RoomListQuickActionsSharedAction.NotificationsMute(roomSummary.roomId).toBottomSheetItem(3, selectedRoomState)
 
         if (showAll) {
-            // Leave
-            dividerItem {
-                id("leave_separator")
-            }
             RoomListQuickActionsSharedAction.Leave(roomSummary.roomId).toBottomSheetItem(5)
         }
     }
diff --git a/vector/src/main/res/drawable/ic_radio_button_off.xml b/vector/src/main/res/drawable/ic_radio_button_off.xml
new file mode 100644
index 0000000000..a26c27495c
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_radio_button_off.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+
+    <!-- Note: I adapted this vector manually since clip-path is API24+ -->
+    <path
+        android:fillColor="?riotx_disabled_view_color"
+        android:pathData="M10,5M10,0C4.5,0 0,4.5 0,10C0,15.5 4.5,20 10,20C15.5,20 20,15.5 20,10C20,4.5 15.5,0 10,0ZM10,18C5.6,18 2,14.4 2,10C2,5.6 5.6,2 10,2C14.4,2 18,5.6 18,10C18,14.4 14.4,18 10,18Z" />
+
+</vector>
diff --git a/vector/src/main/res/layout/item_divider.xml b/vector/src/main/res/layout/item_divider.xml
index f4fbf87b39..8d7be0b620 100644
--- a/vector/src/main/res/layout/item_divider.xml
+++ b/vector/src/main/res/layout/item_divider.xml
@@ -3,5 +3,5 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="1dp"
-    android:background="?attr/vctr_list_bottom_sheet_divider_color"
+    android:background="?riotx_list_bottom_sheet_divider_color"
     tools:layout_height="100dp" />
diff --git a/vector/src/main/res/values/attrs.xml b/vector/src/main/res/values/attrs.xml
index 6b913f1903..bad72d3c0d 100644
--- a/vector/src/main/res/values/attrs.xml
+++ b/vector/src/main/res/values/attrs.xml
@@ -40,7 +40,6 @@
         <attr name="vctr_list_header_primary_text_color" format="color" />
         <attr name="vctr_list_header_secondary_text_color" format="color" />
 
-        <attr name="vctr_list_bottom_sheet_divider_color" format="color" />
         <attr name="vctr_list_divider_color" format="color" />
 
         <attr name="vctr_redacted_message_color" format="color" />
diff --git a/vector/src/main/res/values/colors_riotx.xml b/vector/src/main/res/values/colors_riotx.xml
index a4a7badce2..d6abe6271a 100644
--- a/vector/src/main/res/values/colors_riotx.xml
+++ b/vector/src/main/res/values/colors_riotx.xml
@@ -213,7 +213,14 @@
     <color name="riotx_waiting_background_color_dark">#FF15171b</color>
     <color name="riotx_waiting_background_color_status">#AAAAAAAA</color>
 
+    <attr name="riotx_disabled_view_color" format="color" />
+    <color name="riotx_disabled_view_color_light">#EEEEEE</color>
+    <color name="riotx_disabled_view_color_dark">#61708B</color>
 
+    <attr name="riotx_list_bottom_sheet_divider_color" format="color" />
+    <color name="riotx_list_bottom_sheet_divider_color_light">#C0C0C2</color>
+    <color name="riotx_list_bottom_sheet_divider_color_dark">#444E60</color>
+    <color name="riotx_list_bottom_sheet_divider_color_black">#444E60</color>
 
     <!-- (color from RiotWeb) -->
     <attr name="riotx_keys_backup_banner_accent_color" format="color" />
diff --git a/vector/src/main/res/values/theme_black.xml b/vector/src/main/res/values/theme_black.xml
index 1f8a4c5cc4..5a1ce1af44 100644
--- a/vector/src/main/res/values/theme_black.xml
+++ b/vector/src/main/res/values/theme_black.xml
@@ -78,7 +78,7 @@
         <!--Header/Panel Text Secondary-->
         <item name="vctr_tab_home_secondary">@color/primary_color_dark_black</item>
 
-        <item name="vctr_list_bottom_sheet_divider_color">@color/list_divider_color_black</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_black</item>
 
         <item name="vctr_redacted_message_color">@color/list_divider_color_black</item>
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index 98bfb4e6cd..fae33cf6bf 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -126,7 +126,7 @@
         <!--Header/Panel Text Secondary-->
         <item name="vctr_list_header_secondary_text_color">#FFC8C8CD</item>
 
-        <item name="vctr_list_bottom_sheet_divider_color">@color/list_divider_color_dark</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>
 
         <item name="vctr_redacted_message_color">@color/list_divider_color_dark</item>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index 5292f20dd6..ce47b9498f 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -126,7 +126,7 @@
         <!--Header/Panel Text Secondary-->
         <item name="vctr_list_header_secondary_text_color">#FFC8C8CD</item>
 
-        <item name="vctr_list_bottom_sheet_divider_color">@color/list_divider_color_light</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_light</item>
 
         <item name="vctr_redacted_message_color">@color/list_divider_color_light</item>