diff --git a/app/src/main/java/com/nextcloud/talk/activities/SharedItemsActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/SharedItemsActivity.kt
index b42d8a743..5149ef2eb 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/SharedItemsActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/SharedItemsActivity.kt
@@ -130,10 +130,10 @@ class SharedItemsActivity : AppCompatActivity() {
         // tabDeckCard.text = "deckcard"
         // binding.sharedItemsTabs.addTab(tabDeckCard)
 
-        val tabOther: TabLayout.Tab = binding.sharedItemsTabs.newTab()
-        tabOther.tag = TAB_OTHER
-        tabOther.setText(R.string.shared_items_other)
-        binding.sharedItemsTabs.addTab(tabOther)
+        // val tabOther: TabLayout.Tab = binding.sharedItemsTabs.newTab()
+        // tabOther.tag = TAB_OTHER
+        // tabOther.setText(R.string.shared_items_other)
+        // binding.sharedItemsTabs.addTab(tabOther)
 
         binding.sharedItemsTabs.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
             override fun onTabSelected(tab: TabLayout.Tab) {
diff --git a/app/src/main/res/layout/activity_shared_items.xml b/app/src/main/res/layout/activity_shared_items.xml
index d6ababc24..cbab88d8d 100644
--- a/app/src/main/res/layout/activity_shared_items.xml
+++ b/app/src/main/res/layout/activity_shared_items.xml
@@ -42,15 +42,13 @@
 
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/shared_items_tabs"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="@dimen/min_size_clickable_area"
-        android:layout_marginBottom="8dp"
         android:background="@color/appbar"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/shared_items_toolbar"
         app:tabGravity="fill"
-        app:tabMode="scrollable"
+        app:tabMode="fixed"
+        app:tabMaxWidth="0dp"
         app:tabTextAppearance="@style/TextAppearanceTab" />
 
 
@@ -61,6 +59,7 @@
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/shared_items_tabs"
+        android:layout_marginTop="@dimen/double_margin_between_elements"
         tools:listitem="@layout/attachment_item" />
 
 
diff --git a/app/src/main/res/layout/attachment_list_item.xml b/app/src/main/res/layout/attachment_list_item.xml
index d12c99730..541d323ac 100644
--- a/app/src/main/res/layout/attachment_list_item.xml
+++ b/app/src/main/res/layout/attachment_list_item.xml
@@ -24,7 +24,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="@dimen/standard_margin"
-    android:layout_marginTop="@dimen/standard_half_margin"
     android:layout_marginEnd="@dimen/standard_margin"
     android:layout_marginBottom="@dimen/standard_half_margin"
     android:orientation="vertical">