diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
index e418b0992..36a189035 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
@@ -173,7 +173,7 @@ class ConversationInfoActivity :
         if (CapabilitiesUtilNew.hasSpreedFeatureCapability(conversationUser, "rich-object-list-media")) {
             binding.sharedItemsButton.setOnClickListener { showSharedItems() }
         } else {
-            binding.categorySharedItems.visibility = GONE
+            binding.sharedItems.visibility = GONE
         }
 
         fetchRoomInfo()
@@ -257,8 +257,8 @@ class ConversationInfoActivity :
                 binding.notificationSettingsView.notificationSettingsCategory,
                 binding.webinarInfoView.webinarSettingsCategory,
                 binding.guestAccessView.guestAccessSettingsCategory,
-                binding.categorySharedItems,
-                binding.conversationSettings,
+                binding.sharedItemsTitle,
+                binding.conversationSettingsTitle,
                 binding.participantsListCategory
             )
         }.forEach(viewThemeUtils.platform::colorTextView)
diff --git a/app/src/main/res/layout/activity_conversation_info.xml b/app/src/main/res/layout/activity_conversation_info.xml
index 8e35f8552..f25f8a843 100644
--- a/app/src/main/res/layout/activity_conversation_info.xml
+++ b/app/src/main/res/layout/activity_conversation_info.xml
@@ -25,7 +25,6 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:apc="http://schemas.android.com/apk/res-auto"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/parent_container"
@@ -188,6 +187,7 @@
             </LinearLayout>
 
             <LinearLayout
+                    android:id="@+id/shared_items"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/standard_quarter_margin"
@@ -195,7 +195,7 @@
                     >
 
                     <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/category_shared_items"
+                        android:id="@+id/shared_items_title"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/nc_shared_items"
@@ -231,6 +231,7 @@
 
 
             <LinearLayout
+                    android:id="@+id/conversation_settings"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/standard_quarter_margin"
@@ -238,7 +239,7 @@
                     >
 
                     <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/conversation_settings"
+                        android:id="@+id/conversation_settings_title"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/nc_conversation_settings"