diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index 61bdbea707..0e2a9b0b44 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -24,8 +24,7 @@
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/groupToolbar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="24dp">
+            android:layout_height="wrap_content">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -122,11 +121,37 @@
 
                 </RelativeLayout>
 
+                <ImageView
+                    android:id="@+id/back_button_chevron"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:importantForAccessibility="no"
+                    android:src="@drawable/ic_arrow_right"
+                    android:rotation="180"
+                    app:layout_constraintTop_toTopOf="@id/back_button_text"
+                    app:layout_constraintBottom_toBottomOf="@id/back_button_text"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:tint="@color/palette_element_green" />
+
+                <TextView
+                    android:id="@+id/back_button_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/chats"
+                    android:layout_marginStart="6dp"
+                    android:layout_marginTop="16dp"
+                    android:textSize="17sp"
+                    android:textColor="@color/palette_element_green"
+                    app:layout_constraintStart_toEndOf="@id/back_button_chevron"
+                    app:layout_constraintTop_toTopOf="parent" />
+
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:id="@+id/all_chats_layout"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    app:layout_constraintBottom_toBottomOf="parent"
+                    android:layout_marginTop="16dp"
+                    android:paddingBottom="8dp"
+                    app:layout_constraintTop_toBottomOf="@id/back_button_chevron"
                     app:layout_constraintStart_toStartOf="parent">
 
                     <TextView
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 74a16c528d..167a434189 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3038,5 +3038,6 @@
     <string name="screen_sharing_notification_title">${app_name} Screen Sharing</string>
     <string name="screen_sharing_notification_description">Screen sharing is in progress</string>
     <string name="all_chats">All Chats</string>
-    <string name="choose_a_space">Choose a space</string>
+    <string name="choose_a_space">Spaces</string>
+    <string name="chats">Chats</string>
 </resources>