diff --git a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetActionItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetActionItem.kt
index 3666cabce3..80792648f6 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetActionItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetActionItem.kt
@@ -44,6 +44,9 @@ abstract class BottomSheetActionItem : VectorEpoxyModel<BottomSheetActionItem.Ho
     @DrawableRes
     var iconRes: Int = 0
 
+    @EpoxyAttribute
+    var showIcon = true
+
     @EpoxyAttribute
     var text: String? = null
 
@@ -80,6 +83,7 @@ abstract class BottomSheetActionItem : VectorEpoxyModel<BottomSheetActionItem.Ho
         } else {
             ThemeUtils.getColor(holder.view.context, R.attr.riotx_text_secondary)
         }
+        holder.icon.isVisible = showIcon
         holder.icon.setImageResource(iconRes)
         ImageViewCompat.setImageTintList(holder.icon, ColorStateList.valueOf(tintColor))
         if (text != null) {
diff --git a/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericController.kt b/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericController.kt
index a41a389dda..67347c3220 100644
--- a/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericController.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericController.kt
@@ -48,8 +48,11 @@ abstract class BottomSheetGenericController<State : BottomSheetGenericState, Act
             }
         }
         // Actions
-        getActions(state).forEach { action ->
+        val actions = getActions(state)
+        val showIcons = actions.any { it.iconResId > 0 }
+        actions.forEach { action ->
             action.toBottomSheetItem()
+                    .showIcon(showIcons)
                     .listener(View.OnClickListener { listener?.didSelectAction(action) })
                     .addTo(this)
         }
diff --git a/vector/src/main/res/layout/item_bottom_sheet_action.xml b/vector/src/main/res/layout/item_bottom_sheet_action.xml
index 8b5716cd8e..7456f50670 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_action.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_action.xml
@@ -13,6 +13,7 @@
     android:paddingEnd="@dimen/layout_horizontal_margin"
     android:paddingBottom="8dp">
 
+    <!-- Used for sub items -->
     <Space
         android:id="@+id/actionStartSpace"
         android:layout_width="32dp"
@@ -25,37 +26,44 @@
 
     <ImageView
         android:id="@+id/actionIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
+        android:layout_width="26dp"
+        android:layout_height="26dp"
+        android:layout_marginEnd="16dp"
         android:layout_toEndOf="@id/actionStartSpace"
         android:scaleType="center"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/actionTitleContainer"
         app:layout_constraintStart_toEndOf="@+id/actionStartSpace"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@drawable/ic_room_actions_notifications_all"
         app:tint="?riotx_text_secondary"
-        tools:ignore="MissingPrefix" />
+        tools:ignore="MissingPrefix"
+        tools:src="@drawable/ic_room_actions_notifications_all" />
 
-    <TextView
-        android:id="@+id/actionTitle"
-        android:layout_width="wrap_content"
+    <FrameLayout
+        android:id="@+id/actionTitleContainer"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="40dp"
-        android:layout_marginEnd="16dp"
-        android:drawablePadding="16dp"
-        android:ellipsize="end"
-        android:maxLines="2"
-        android:textColor="?riotx_text_secondary"
-        android:textSize="17sp"
-        app:layout_constrainedWidth="true"
+        android:layout_marginEnd="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/actionSelected"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toEndOf="@id/actionStartSpace"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="zbla azjazjaz s sdkqdskdsqk kqsdkdqsk kdqsksqdk" />
+        app:layout_constraintStart_toEndOf="@id/actionIcon"
+        app:layout_constraintTop_toTopOf="parent">
 
+        <TextView
+            android:id="@+id/actionTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="16dp"
+            android:drawablePadding="16dp"
+            android:ellipsize="end"
+            android:maxLines="2"
+            android:textColor="?riotx_text_secondary"
+            android:textSize="17sp"
+            tools:drawableEnd="@drawable/ic_material_expand_more_black"
+            tools:drawableTint="?riotx_text_secondary"
+            tools:text="kdqsksqdk" />
+
+    </FrameLayout>
 
     <ImageView
         android:id="@+id/actionSelected"
@@ -66,9 +74,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible"
         app:tint="@color/riotx_accent"
-        tools:ignore="MissingPrefix" />
-
+        tools:ignore="MissingPrefix"
+        tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>