diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.kt b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.kt
index 3225b765ea6d..2f09a77622a0 100644
--- a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.kt
+++ b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.kt
@@ -60,12 +60,7 @@ class OCFileListBottomSheetDialog(
         setContentView(binding.getRoot())
 
         applyBranding()
-        binding.addToCloud.text = context.resources.getString(
-            R.string.add_to_cloud,
-            themeUtils.getDefaultDisplayNameForRootFolder(context)
-        )
 
-        checkTemplateVisibility()
         initCreatorContainer()
 
         if (!deviceInfo.hasCamera(context)) {
@@ -126,23 +121,6 @@ class OCFileListBottomSheetDialog(
         }
     }
 
-    @Suppress("ComplexCondition")
-    private fun checkTemplateVisibility() {
-        val optionalCapability = fileActivity.capabilities
-        if (optionalCapability.isPresent) {
-            val capability = optionalCapability.get()
-            if (capability.richDocuments.isTrue &&
-                capability.richDocumentsDirectEditing.isTrue &&
-                capability.richDocumentsTemplatesAvailable.isTrue &&
-                !file.isEncrypted
-            ) {
-                binding.menuNewDocument.visibility = View.VISIBLE
-                binding.menuNewSpreadsheet.visibility = View.VISIBLE
-                binding.menuNewPresentation.visibility = View.VISIBLE
-            }
-        }
-    }
-
     @Suppress("DEPRECATION", "LongMethod", "MagicNumber")
     private fun initCreatorContainer() {
         val json = ArbitraryDataProviderImpl(context)
@@ -179,12 +157,7 @@ class OCFileListBottomSheetDialog(
                     gravity = Gravity.START or Gravity.CENTER_VERTICAL
                     setPaddingRelative(standardPadding, 0, standardPadding, 0)
 
-                    val buttonText = String.format(
-                        fileActivity.getString(R.string.editor_placeholder),
-                        fileActivity.getString(R.string.create_new),
-                        creator.name
-                    )
-                    text = buttonText
+                    text = creator.name
                     setTextColor(ContextCompat.getColor(context, R.color.text_color))
                     textSize = 16f
                     isAllCaps = false
@@ -201,7 +174,7 @@ class OCFileListBottomSheetDialog(
                     iconTint = null
 
                     setOnClickListener {
-                        actions.showTemplate(creator, buttonText)
+                        actions.showTemplate(creator, creator.name)
                         dismiss()
                     }
                 }
@@ -275,21 +248,6 @@ class OCFileListBottomSheetDialog(
                 actions.uploadFiles()
                 dismiss()
             }
-
-            menuNewDocument.setOnClickListener {
-                actions.newDocument()
-                dismiss()
-            }
-
-            menuNewSpreadsheet.setOnClickListener {
-                actions.newSpreadsheet()
-                dismiss()
-            }
-
-            menuNewPresentation.setOnClickListener {
-                actions.newPresentation()
-                dismiss()
-            }
         }
     }
 
@@ -305,9 +263,6 @@ class OCFileListBottomSheetDialog(
                     menuUploadFromApp.visibility = View.GONE
                     menuDirectCameraUpload.visibility = View.GONE
                     menuScanDocUpload.visibility = View.GONE
-                    menuNewDocument.visibility = View.GONE
-                    menuNewSpreadsheet.visibility = View.GONE
-                    menuNewPresentation.visibility = View.GONE
                     creatorsContainer.visibility = View.GONE
                 }
             }
diff --git a/app/src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml b/app/src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml
index 233d98c179a7..3cd27e28816c 100644
--- a/app/src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml
+++ b/app/src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml
@@ -19,16 +19,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
-    <TextView
-        android:id="@+id/add_to_cloud"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/standard_padding"
-        android:paddingBottom="@dimen/standard_half_padding"
-        android:text="@string/add_to_cloud"
-        android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall"
-        android:textColor="@color/text_color" />
-
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -149,59 +139,11 @@
                 app:iconSize="@dimen/iconized_single_line_item_icon_size"
                 app:iconTint="@color/primary" />
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/menu_new_document"
-                style="@style/Widget.App.Button.BottomSheetItem"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/bottom_sheet_item_height"
-                android:contentDescription="@string/create_new_document"
-                android:gravity="start|center_vertical"
-                android:paddingStart="@dimen/standard_padding"
-                android:paddingEnd="@dimen/standard_padding"
-                android:text="@string/create_new_document"
-                android:textColor="@color/text_color"
-                android:textSize="@dimen/bottom_sheet_text_size"
-                app:icon="@drawable/file_doc"
-                app:iconGravity="start"
-                app:iconPadding="@dimen/standard_padding"
-                app:iconSize="@dimen/iconized_single_line_item_icon_size"
-                app:iconTint="@null" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/menu_new_spreadsheet"
-                style="@style/Widget.App.Button.BottomSheetItem"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/bottom_sheet_item_height"
-                android:contentDescription="@string/create_new_spreadsheet"
-                android:gravity="start|center_vertical"
-                android:paddingStart="@dimen/standard_padding"
-                android:paddingEnd="@dimen/standard_padding"
-                android:text="@string/create_new_spreadsheet"
-                android:textColor="@color/text_color"
-                android:textSize="@dimen/bottom_sheet_text_size"
-                app:icon="@drawable/file_xls"
-                app:iconGravity="start"
-                app:iconPadding="@dimen/standard_padding"
-                app:iconSize="@dimen/iconized_single_line_item_icon_size"
-                app:iconTint="@null" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/menu_new_presentation"
-                style="@style/Widget.App.Button.BottomSheetItem"
+            <com.google.android.material.divider.MaterialDivider
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/bottom_sheet_item_height"
-                android:contentDescription="@string/create_new_presentation"
-                android:gravity="start|center_vertical"
-                android:paddingStart="@dimen/standard_padding"
-                android:paddingEnd="@dimen/standard_padding"
-                android:text="@string/create_new_presentation"
-                android:textColor="@color/text_color"
-                android:textSize="@dimen/bottom_sheet_text_size"
-                app:icon="@drawable/file_ppt"
-                app:iconGravity="start"
-                app:iconPadding="@dimen/standard_padding"
-                app:iconSize="@dimen/iconized_single_line_item_icon_size"
-                app:iconTint="@null" />
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="@dimen/standard_half_margin"
+                app:dividerColor="@color/list_divider_background" />
 
             <LinearLayout
                 android:id="@+id/creators_container"