diff --git a/app/src/androidTest/java/com/nmc/android/OCFileListBottomSheetDialogIT.kt b/app/src/androidTest/java/com/nmc/android/OCFileListBottomSheetDialogIT.kt
new file mode 100644
index 000000000000..a0200d2a1a75
--- /dev/null
+++ b/app/src/androidTest/java/com/nmc/android/OCFileListBottomSheetDialogIT.kt
@@ -0,0 +1,113 @@
+package com.nmc.android
+
+import android.os.Looper
+import androidx.activity.result.contract.ActivityResultContract
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.intent.rule.IntentsTestRule
+import androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.gson.Gson
+import com.nextcloud.client.device.DeviceInfo
+import com.nextcloud.client.documentscan.AppScanOptionalFeature
+import com.nextcloud.utils.EditorUtils
+import com.owncloud.android.AbstractIT
+import com.owncloud.android.datamodel.ArbitraryDataProvider
+import com.owncloud.android.datamodel.ArbitraryDataProviderImpl
+import com.owncloud.android.datamodel.OCFile
+import com.owncloud.android.lib.common.Creator
+import com.owncloud.android.lib.common.DirectEditing
+import com.owncloud.android.lib.resources.status.CapabilityBooleanType
+import com.owncloud.android.ui.activity.FileDisplayActivity
+import com.owncloud.android.ui.fragment.OCFileListBottomSheetActions
+import com.owncloud.android.ui.fragment.OCFileListBottomSheetDialog
+import com.owncloud.android.utils.MimeTypeUtil
+import com.owncloud.android.utils.theme.CapabilityUtils
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.mockito.Mock
+import org.mockito.MockitoAnnotations
+
+class OCFileListBottomSheetDialogIT : AbstractIT() {
+
+    @Mock
+    private lateinit var actions: OCFileListBottomSheetActions
+
+    @get:Rule
+    val activityRule = IntentsTestRule(FileDisplayActivity::class.java, true, true)
+
+    @Before
+    fun setUp() {
+        MockitoAnnotations.initMocks(this)
+    }
+
+    @Test
+    fun validateCreateTextDocumentMenuOption() {
+        if (Looper.myLooper() == null) {
+            Looper.prepare()
+        }
+
+        val info = DeviceInfo()
+        val ocFile = OCFile("/test.md")
+
+        // add direct editing info
+        val creatorMap = mutableMapOf<String, Creator>()
+        creatorMap["1"] = Creator(
+            "1",
+            "md",
+            "markdown file",
+            ".md",
+            MimeTypeUtil.MIMETYPE_TEXT_MARKDOWN,
+            false
+        )
+
+        val directEditing = DirectEditing(
+            creators = creatorMap
+        )
+
+        val json = Gson().toJson(directEditing)
+        ArbitraryDataProviderImpl(targetContext).storeOrUpdateKeyValue(
+            user.accountName,
+            ArbitraryDataProvider.DIRECT_EDITING,
+            json
+        )
+
+        val capability = activityRule.activity.capabilities
+        capability.richDocuments = CapabilityBooleanType.TRUE
+        capability.richDocumentsDirectEditing = CapabilityBooleanType.TRUE
+        capability.richDocumentsTemplatesAvailable = CapabilityBooleanType.TRUE
+        capability.accountName = user.accountName
+        CapabilityUtils.updateCapability(capability)
+
+        val appScanOptionalFeature: AppScanOptionalFeature = object : AppScanOptionalFeature() {
+            override fun getScanContract(): ActivityResultContract<Unit, String?> {
+                throw UnsupportedOperationException("Document scan is not available")
+            }
+        }
+
+        val editorUtils = EditorUtils(ArbitraryDataProviderImpl(targetContext))
+        val sut = OCFileListBottomSheetDialog(
+            activityRule.activity,
+            actions,
+            info,
+            user,
+            ocFile,
+            activityRule.activity.themeUtils,
+            activityRule.activity.viewThemeUtils,
+            editorUtils,
+            appScanOptionalFeature
+        )
+
+        activityRule.activity.runOnUiThread { sut.show() }
+
+        waitForIdleSync()
+
+        sut.behavior.state = BottomSheetBehavior.STATE_EXPANDED
+
+        shortSleep()
+
+        onView(withText("Create text document")).check(matches(isCompletelyDisplayed()))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nextcloud/ui/fileactions/FileActionsBottomSheet.kt b/app/src/main/java/com/nextcloud/ui/fileactions/FileActionsBottomSheet.kt
index 63ccd3b66f2c..7aca2f7f77bb 100644
--- a/app/src/main/java/com/nextcloud/ui/fileactions/FileActionsBottomSheet.kt
+++ b/app/src/main/java/com/nextcloud/ui/fileactions/FileActionsBottomSheet.kt
@@ -18,9 +18,9 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.annotation.IdRes
-import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.os.bundleOf
 import androidx.core.view.isEmpty
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.setFragmentResult
@@ -98,8 +98,6 @@ class FileActionsBottomSheet :
         bottomSheetDialog.behavior.state = BottomSheetBehavior.STATE_EXPANDED
         bottomSheetDialog.behavior.skipCollapsed = true
 
-        viewThemeUtils.platform.colorViewBackground(binding.bottomSheet, ColorRole.SURFACE)
-
         return binding.root
     }
 
@@ -151,7 +149,11 @@ class FileActionsBottomSheet :
 
     private fun setMultipleFilesThumbnail() {
         context?.let {
-            val drawable = viewThemeUtils.platform.tintDrawable(it, R.drawable.file_multiple, ColorRole.PRIMARY)
+            // NMC Customization
+            val drawable = viewThemeUtils.platform.colorDrawable(
+                ResourcesCompat.getDrawable(it.resources, R.drawable.file_multiple, null)!!,
+                it.resources.getColor(R.color.primary, null)
+            )
             binding.thumbnailLayout.thumbnail.setImageDrawable(drawable)
         }
     }
@@ -292,12 +294,8 @@ class FileActionsBottomSheet :
                 }
                 text.setText(action.title)
                 if (action.icon != null) {
-                    val drawable =
-                        viewThemeUtils.platform.tintDrawable(
-                            requireContext(),
-                            AppCompatResources.getDrawable(requireContext(), action.icon)!!
-                        )
-                    icon.setImageDrawable(drawable)
+                    // NMC customization
+                    icon.setImageResource(action.icon)
                 }
             }
         return itemBinding.root
diff --git a/app/src/main/java/com/nextcloud/ui/trashbinFileActions/TrashbinFileActionsBottomSheet.kt b/app/src/main/java/com/nextcloud/ui/trashbinFileActions/TrashbinFileActionsBottomSheet.kt
index b97c9bae97bc..277e8c3cfe97 100644
--- a/app/src/main/java/com/nextcloud/ui/trashbinFileActions/TrashbinFileActionsBottomSheet.kt
+++ b/app/src/main/java/com/nextcloud/ui/trashbinFileActions/TrashbinFileActionsBottomSheet.kt
@@ -12,7 +12,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.annotation.IdRes
-import androidx.appcompat.content.res.AppCompatResources
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.os.bundleOf
 import androidx.core.view.isEmpty
 import androidx.core.view.isVisible
@@ -136,7 +136,11 @@ class TrashbinFileActionsBottomSheet :
 
     private fun setMultipleFilesThumbnail() {
         context?.let {
-            val drawable = viewThemeUtils.platform.tintDrawable(it, R.drawable.file_multiple, ColorRole.PRIMARY)
+            // NMC Customization
+            val drawable = viewThemeUtils.platform.colorDrawable(
+                ResourcesCompat.getDrawable(it.resources, R.drawable.file_multiple, null)!!,
+                it.resources.getColor(R.color.primary, null)
+            )
             binding.thumbnailLayout.thumbnail.setImageDrawable(drawable)
         }
     }
@@ -198,12 +202,8 @@ class TrashbinFileActionsBottomSheet :
                 }
                 text.setText(action.title)
                 if (action.icon != null) {
-                    val drawable =
-                        viewThemeUtils.platform.tintDrawable(
-                            requireContext(),
-                            AppCompatResources.getDrawable(requireContext(), action.icon)!!
-                        )
-                    icon.setImageDrawable(drawable)
+                    // NMC customization
+                    icon.setImageResource(action.icon)
                 }
             }
         return itemBinding.root
diff --git a/app/src/main/java/com/nextcloud/utils/BuildHelper.kt b/app/src/main/java/com/nextcloud/utils/BuildHelper.kt
index 4eca26f03780..29fad1c04023 100644
--- a/app/src/main/java/com/nextcloud/utils/BuildHelper.kt
+++ b/app/src/main/java/com/nextcloud/utils/BuildHelper.kt
@@ -6,10 +6,9 @@
  */
 package com.nextcloud.utils
 
-import com.owncloud.android.BuildConfig
-
 object BuildHelper {
     const val GPLAY: String = "gplay"
 
-    fun isFlavourGPlay(): Boolean = GPLAY == BuildConfig.FLAVOR
+    // NMC Customization to have it false always
+    fun isFlavourGPlay(): Boolean = false
 }
diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/SendFilesDialog.kt b/app/src/main/java/com/owncloud/android/ui/dialog/SendFilesDialog.kt
index 09f2edbfe502..607370e63ebd 100644
--- a/app/src/main/java/com/owncloud/android/ui/dialog/SendFilesDialog.kt
+++ b/app/src/main/java/com/owncloud/android/ui/dialog/SendFilesDialog.kt
@@ -19,7 +19,6 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.recyclerview.widget.GridLayoutManager
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import com.nextcloud.android.common.ui.theme.utils.ColorRole
 import com.nextcloud.client.di.Injectable
 import com.nextcloud.client.utils.IntentUtil.createSendIntent
 import com.owncloud.android.R
@@ -58,7 +57,6 @@ class SendFilesDialog :
         binding = SendFilesFragmentBinding.inflate(inflater, container, false)
 
         setupSendButtonRecyclerView()
-        viewThemeUtils?.platform?.colorViewBackground(binding.bottomSheet, ColorRole.SURFACE)
 
         return binding.root
     }
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragmentBottomSheetDialog.kt b/app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragmentBottomSheetDialog.kt
index 05118c06796f..af7d200e5efe 100644
--- a/app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragmentBottomSheetDialog.kt
+++ b/app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragmentBottomSheetDialog.kt
@@ -42,23 +42,6 @@ class GalleryFragmentBottomSheetDialog(private val actions: GalleryFragmentBotto
     }
 
     private fun setupLayout() {
-        viewThemeUtils.platform.colorViewBackground(binding.bottomSheet, ColorRole.SURFACE)
-
-        listOf(
-            binding.tickMarkShowImages,
-            binding.tickMarkShowVideos
-        ).forEach {
-            viewThemeUtils.platform.colorImageView(it, ColorRole.PRIMARY)
-        }
-
-        listOf(
-            binding.btnSelectMediaFolder,
-            binding.btnHideVideos,
-            binding.btnHideImages
-        ).forEach {
-            viewThemeUtils.material.colorMaterialButtonText(it)
-        }
-
         when (currentMediaState) {
             MediaState.MEDIA_STATE_PHOTOS_ONLY -> {
                 binding.tickMarkShowImages.visibility = View.VISIBLE
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 1d7990290a90..6dd0164dfe41 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
@@ -11,7 +11,6 @@ import android.os.Bundle
 import android.view.View
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.gson.Gson
-import com.nextcloud.android.common.ui.theme.utils.ColorRole
 import com.nextcloud.client.account.User
 import com.nextcloud.client.device.DeviceInfo
 import com.nextcloud.client.di.Injectable
@@ -28,6 +27,7 @@ import com.owncloud.android.ui.activity.FileActivity
 import com.owncloud.android.utils.MimeTypeUtil
 import com.owncloud.android.utils.theme.ThemeUtils
 import com.owncloud.android.utils.theme.ViewThemeUtils
+import androidx.core.content.ContextCompat
 
 @Suppress("LongParameterList")
 class OCFileListBottomSheetDialog(
@@ -50,7 +50,8 @@ class OCFileListBottomSheetDialog(
         binding = FileListActionsBottomSheetFragmentBinding.inflate(layoutInflater)
         setContentView(binding.getRoot())
 
-        applyBranding()
+        // NMC Customization
+        reorderUploadFromOtherAppsView()
         binding.addToCloud.text = context.resources.getString(
             R.string.add_to_cloud,
             themeUtils.getDefaultDisplayNameForRootFolder(context)
@@ -63,24 +64,10 @@ class OCFileListBottomSheetDialog(
             binding.menuDirectCameraUpload.visibility = View.GONE
         }
 
-        createRichWorkspace()
         setupClickListener()
         filterActionsForOfflineOperations()
     }
 
-    private fun applyBranding() {
-        viewThemeUtils.platform.run {
-            binding.run {
-                colorImageView(menuIconUploadFiles, ColorRole.PRIMARY)
-                colorImageView(menuIconUploadFromApp, ColorRole.PRIMARY)
-                colorImageView(menuIconDirectCameraUpload, ColorRole.PRIMARY)
-                colorImageView(menuIconScanDocUpload, ColorRole.PRIMARY)
-                colorImageView(menuIconMkdir, ColorRole.PRIMARY)
-                colorImageView(menuIconAddFolderInfo, ColorRole.PRIMARY)
-            }
-        }
-    }
-
     @Suppress("ComplexCondition")
     private fun checkTemplateVisibility() {
         val capability = fileActivity.capabilities
@@ -112,21 +99,24 @@ class OCFileListBottomSheetDialog(
                     FileListActionsBottomSheetCreatorBinding.inflate(layoutInflater)
 
                 val creatorView: View = creatorViewBinding.getRoot()
-
-                creatorViewBinding.creatorName.text = String.format(
-                    fileActivity.getString(R.string.editor_placeholder),
-                    fileActivity.getString(R.string.create_new),
-                    creator.name
-                )
-
-                creatorViewBinding.creatorThumbnail.setImageDrawable(
-                    MimeTypeUtil.getFileTypeIcon(
-                        creator.mimetype,
-                        creator.extension,
-                        creatorViewBinding.creatorThumbnail.context,
-                        viewThemeUtils
-                    )
-                )
+                //for NMC we have different text and icon for Markdown(.md) menu
+                if (creator.mimetype == MimeTypeUtil.MIMETYPE_TEXT_MARKDOWN) {
+                    creatorViewBinding.creatorName.text = fileActivity.getString(R.string.create_text_document)
+                    creatorViewBinding.creatorThumbnail.setImageDrawable(
+                        ContextCompat.getDrawable(
+                            context,
+                        R.drawable.ic_new_txt_doc))
+                } else {
+                    creatorViewBinding.creatorName.text = String.format(fileActivity.getString(R.string.editor_placeholder),
+                        fileActivity.getString(R.string.create_new),
+                        creator.name)
+
+                    creatorViewBinding.creatorThumbnail.setImageDrawable(
+                        MimeTypeUtil.getFileTypeIcon(creator.mimetype,
+                            creator.extension,
+                            creatorViewBinding.creatorThumbnail.context,
+                            viewThemeUtils))
+                }
 
                 creatorView.setOnClickListener {
                     actions.showTemplate(creator, creatorViewBinding.creatorName.text.toString())
@@ -138,25 +128,6 @@ class OCFileListBottomSheetDialog(
         }
     }
 
-    private fun createRichWorkspace() {
-        if (editorUtils.isEditorAvailable(user, MimeTypeUtil.MIMETYPE_TEXT_MARKDOWN) && !file.isEncrypted) {
-            // richWorkspace
-            // == "": no info set -> show button
-            // == null: disabled on server side -> hide button
-            // != "": info set -> hide button
-            if (file.richWorkspace == null || "" != file.richWorkspace) {
-                binding.menuCreateRichWorkspace.visibility = View.GONE
-                binding.menuCreateRichWorkspaceDivider.visibility = View.GONE
-            } else {
-                binding.menuCreateRichWorkspace.visibility = View.VISIBLE
-                binding.menuCreateRichWorkspaceDivider.visibility = View.VISIBLE
-            }
-        } else {
-            binding.menuCreateRichWorkspace.visibility = View.GONE
-            binding.menuCreateRichWorkspaceDivider.visibility = View.GONE
-        }
-    }
-
     private fun setupClickListener() {
         binding.run {
             menuCreateRichWorkspace.setOnClickListener {
@@ -210,6 +181,17 @@ class OCFileListBottomSheetDialog(
         }
     }
 
+    private fun reorderUploadFromOtherAppsView() {
+        // move the upload from other app option
+        // below Create new folder or Create new e2ee folder
+        // NMC-3095 requirement
+        binding.actionLinear.removeView(binding.menuUploadFromApp)
+        binding.actionLinear.addView(
+            binding.menuUploadFromApp,
+            binding.actionLinear.indexOfChild(binding.menuEncryptedMkdir) + 1
+        )
+    }
+
     private fun filterActionsForOfflineOperations() {
         fileActivity.connectivityService.isNetworkAndServerAvailable { result: Boolean? ->
             if (file.isRootDirectory) {
diff --git a/app/src/main/res/drawable/ic_encrypted_folder.xml b/app/src/main/res/drawable/ic_encrypted_folder.xml
new file mode 100644
index 000000000000..351565589c6a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_encrypted_folder.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,21.75a3,3 0,0 1,-3 -3L1,2.25L7.5,2.25a3.65,3.65 0,0 1,2.7 1.2l0.45,0.45a1.43,1.43 0,0 0,0.85 0.35L23,4.25v14.5a3,3 0,0 1,-3 3ZM2.5,18.75a1.46,1.46 0,0 0,1.43 1.5L20,20.25a1.47,1.47 0,0 0,1.5 -1.44L21.5,5.75h-10A2.57,2.57 0,0 1,9.6 4.9l-0.45,-0.45a2.38,2.38 0,0 0,-1.65 -0.7h-5Z"
+      android:fillColor="#262626"/>
+  <path
+      android:pathData="M14.14,16.56L9.86,16.56a1.07,1.07 0,0 1,-1.07 -1.08L8.79,12.09h0.89v-0.71a2.32,2.32 0,0 1,4.64 0v0.71h0.89v3.39A1.07,1.07 0,0 1,14.14 16.56ZM12,13.56a0.54,0.54 0,0 0,-0.54 0.53,0.55 0.55,0 0,0 0.18,0.4v0.68h0.72v-0.68a0.53,0.53 0,0 0,0 -0.75A0.52,0.52 0,0 0,12 13.52ZM12,9.63a1.79,1.79 0,0 0,-1.79 1.79v0.71h3.58v-0.71A1.79,1.79 0,0 0,12 9.59Z"
+      android:fillColor="#262626"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_file_collection.xml b/app/src/main/res/drawable/ic_file_collection.xml
new file mode 100644
index 000000000000..8825d1f461cf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_file_collection.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M17.75,0.5L8,0.5L8,3.5L5,3.5L5,6.5L2,6.5L2,21.25C2,22.4925 3.0075,23.5 4.25,23.5L13.25,23.5C14.4925,23.5 15.5,22.4925 15.5,21.25L15.5,20.5L16.25,20.5C17.4925,20.5 18.5,19.4925 18.5,18.25L18.5,17.5L19.25,17.5C20.4925,17.5 21.5,16.4925 21.5,15.25L21.5,4.3635L17.75,0.5ZM14,21.25C14,21.6635 13.6635,22 13.25,22L4.25,22C3.8365,22 3.5,21.6635 3.5,21.25L3.5,8L5,8L5,18.25C5,19.4925 6.0075,20.5 7.25,20.5L14,20.5L14,21.25ZM17,18.25C17,18.6635 16.6635,19 16.25,19L7.25,19C6.8365,19 6.5,18.6635 6.5,18.25L6.5,5L8,5L8,15.25C8,16.4925 9.0075,17.5 10.25,17.5L17,17.5L17,18.25ZM19.25,16L10.25,16C9.8365,16 9.5,15.6635 9.5,15.25L9.5,2L16,2L16,4.1705C16,4.9045 16.595,5.5 17.3295,5.5L20,5.5L20,15.25C20,15.6635 19.6635,16 19.25,16Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_new_txt_doc.xml b/app/src/main/res/drawable/ic_new_txt_doc.xml
new file mode 100644
index 000000000000..2b0783479d48
--- /dev/null
+++ b/app/src/main/res/drawable/ic_new_txt_doc.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path
+        android:pathData="M3,1l17.9997,0l0,22l-17.9997,0z"/>
+    <path
+        android:pathData="M4.4997,20C4.4997,20.828 5.1717,21.5 5.9997,21.5L14.9997,21.5L14.9997,18.5C14.9997,17.672 15.6717,17 16.4997,17L19.4997,17L19.4997,2.5L4.4997,2.5L4.4997,20ZM5.9997,23C4.3437,23 2.9997,21.657 2.9997,20L2.9997,1L20.9997,1L20.9997,18L15.9997,23L5.9997,23Z"
+        android:strokeWidth="1"
+        android:fillColor="#262626"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+  </group>
+  <path
+      android:pathData="M8.0817,14.8262C7.6757,14.8262 7.3467,14.4972 7.3467,14.0912C7.3467,13.6842 7.6757,13.3552 8.0817,13.3552L15.9187,13.3552C16.3247,13.3552 16.6537,13.6842 16.6537,14.0912C16.6537,14.4972 16.3247,14.8262 15.9187,14.8262L8.0817,14.8262Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M8.0817,11.397C7.6757,11.397 7.3467,11.068 7.3467,10.662C7.3467,10.256 7.6757,9.927 8.0817,9.927L15.9187,9.927C16.3247,9.927 16.6537,10.256 16.6537,10.662C16.6537,11.068 16.3247,11.397 15.9187,11.397L8.0817,11.397Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M8.0817,7.9678C7.6757,7.9678 7.3477,7.6388 7.3477,7.2338C7.3477,6.8278 7.6757,6.4988 8.0817,6.4988L15.9187,6.4988C16.3237,6.4988 16.6527,6.8278 16.6527,7.2338C16.6527,7.6388 16.3237,7.9678 15.9187,7.9678L8.0817,7.9678Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_upload_file.xml b/app/src/main/res/drawable/ic_upload_file.xml
new file mode 100644
index 000000000000..3c16034fc8f9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_upload_file.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2.5,1L2.5,20C2.5,21.65 3.85,23 5.5,23L15.5,23L20.5,18L20.5,1L2.5,1ZM4,20L4,2.5L19,2.5L19,17L16,17C15.15,17 14.5,17.65 14.5,18.5L14.5,21.5L5.5,21.5C4.65,21.5 4,20.85 4,20Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/layout/file_actions_bottom_sheet.xml b/app/src/main/res/layout/file_actions_bottom_sheet.xml
index cf2c493069b9..b4340d3e822f 100644
--- a/app/src/main/res/layout/file_actions_bottom_sheet.xml
+++ b/app/src/main/res/layout/file_actions_bottom_sheet.xml
@@ -13,6 +13,7 @@
     style="@style/Widget.Material3.BottomSheet"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@color/bottom_sheet_bg_color"
     android:layout_gravity="bottom"
     app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
@@ -68,6 +69,7 @@
                 android:ellipsize="start"
                 android:lines="1"
                 android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall"
+                android:textColor="@color/bottom_sheet_txt_color"
                 tools:text="@string/placeholder_extension" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/file_actions_bottom_sheet_item.xml b/app/src/main/res/layout/file_actions_bottom_sheet_item.xml
index 576726071cd0..3af941c60930 100644
--- a/app/src/main/res/layout/file_actions_bottom_sheet_item.xml
+++ b/app/src/main/res/layout/file_actions_bottom_sheet_item.xml
@@ -29,7 +29,7 @@
         android:layout_width="@dimen/iconized_single_line_item_icon_size"
         android:layout_height="@dimen/iconized_single_line_item_icon_size"
         android:contentDescription="@null"
-        app:tint="@color/primary"
+        app:tint="@color/bottom_sheet_icon_color"
         tools:src="@drawable/ic_delete" />
 
     <LinearLayout
@@ -44,7 +44,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
-            android:textColor="@color/text_color"
+            android:textColor="@color/bottom_sheet_txt_color"
             android:textSize="@dimen/bottom_sheet_text_size"
             tools:text="Delete file" />
 
diff --git a/app/src/main/res/layout/file_list_actions_bottom_sheet_creator.xml b/app/src/main/res/layout/file_list_actions_bottom_sheet_creator.xml
index ccb1fa4d2d7e..db2bc705b0b2 100644
--- a/app/src/main/res/layout/file_list_actions_bottom_sheet_creator.xml
+++ b/app/src/main/res/layout/file_list_actions_bottom_sheet_creator.xml
@@ -8,12 +8,15 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/creator_container"
     android:layout_width="match_parent"
     android:layout_height="@dimen/bottom_sheet_item_height"
     android:background="?android:attr/selectableItemBackground"
     android:gravity="center_vertical"
     android:orientation="horizontal"
+    android:paddingTop="@dimen/standard_half_padding"
+    android:paddingBottom="@dimen/standard_half_padding"
     android:paddingLeft="@dimen/standard_padding"
     android:paddingRight="@dimen/standard_padding"
     tools:ignore="UseCompoundDrawables">
@@ -22,8 +25,7 @@
         android:id="@+id/creator_thumbnail"
         android:layout_width="24dp"
         android:layout_height="24dp"
-        android:layout_marginTop="@dimen/standard_margin"
-        android:layout_marginBottom="@dimen/standard_margin"
+        app:tint="@color/bottom_sheet_icon_color"
         android:contentDescription="@null"
         android:src="@drawable/file_ppt" />
 
@@ -32,8 +34,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
+        android:layout_marginStart="@dimen/standard_margin"
         android:text="@string/create_new_presentation"
-        android:textColor="@color/text_color"
+        android:textColor="@color/bottom_sheet_txt_color"
         android:textSize="@dimen/bottom_sheet_text_size" />
 </LinearLayout>
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 2f1b5239dacf..272cc7e1f369 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
@@ -10,6 +10,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/bottom_sheet_bg_color"
     android:orientation="vertical"
     android:paddingBottom="@dimen/standard_half_padding"
     app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
@@ -26,7 +27,8 @@
         android:paddingBottom="@dimen/standard_half_padding"
         android:text="@string/add_to_cloud"
         android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall"
-        android:textColor="@color/text_color" />
+        android:textColor="@color/text_color"
+        android:visibility="gone" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -36,6 +38,7 @@
         app:layout_constraintTop_toBottomOf="@+id/title">
 
         <LinearLayout
+            android:id="@+id/action_linear"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical">
@@ -48,7 +51,7 @@
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
                 android:paddingLeft="@dimen/standard_padding"
-                android:paddingTop="@dimen/standard_half_padding"
+                android:paddingTop="@dimen/standard_padding"
                 android:paddingRight="@dimen/standard_padding"
                 android:paddingBottom="@dimen/standard_half_padding"
                 tools:ignore="UseCompoundDrawables">
@@ -58,8 +61,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:contentDescription="@null"
-                    android:src="@drawable/ic_action_upload"
-                    app:tint="@color/primary" />
+                    android:src="@drawable/ic_upload_file"
+                    app:tint="@color/bottom_sheet_icon_color" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -67,7 +70,7 @@
                     android:layout_gravity="center_vertical"
                     android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
                     android:text="@string/upload_files"
-                    android:textColor="@color/text_color"
+                    android:textColor="@color/bottom_sheet_txt_color"
                     android:textSize="@dimen/bottom_sheet_text_size" />
 
             </LinearLayout>
@@ -90,8 +93,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:contentDescription="@null"
-                    android:src="@drawable/ic_import"
-                    app:tint="@color/primary" />
+                    android:src="@drawable/ic_file_collection"
+                    app:tint="@color/bottom_sheet_icon_color" />
 
                 <TextView
                     android:id="@+id/upload_content_from_other_apps"
@@ -100,7 +103,7 @@
                     android:layout_gravity="center_vertical"
                     android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
                     android:text="@string/upload_content_from_other_apps"
-                    android:textColor="@color/text_color"
+                    android:textColor="@color/bottom_sheet_txt_color"
                     android:textSize="@dimen/bottom_sheet_text_size" />
 
             </LinearLayout>
@@ -124,7 +127,7 @@
                     android:layout_height="wrap_content"
                     android:contentDescription="@null"
                     android:src="@drawable/ic_camera"
-                    app:tint="@color/primary" />
+                    app:tint="@color/bottom_sheet_icon_color" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -132,7 +135,7 @@
                     android:layout_gravity="center_vertical"
                     android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
                     android:text="@string/upload_direct_camera_upload"
-                    android:textColor="@color/text_color"
+                    android:textColor="@color/bottom_sheet_txt_color"
                     android:textSize="@dimen/bottom_sheet_text_size" />
 
             </LinearLayout>
@@ -187,7 +190,7 @@
                     android:layout_height="wrap_content"
                     android:contentDescription="@null"
                     android:src="@drawable/ic_action_create_dir"
-                    app:tint="@color/primary" />
+                    app:tint="@color/bottom_sheet_icon_color" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -195,11 +198,42 @@
                     android:layout_gravity="center_vertical"
                     android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
                     android:text="@string/create_new_folder"
-                    android:textColor="@color/text_color"
+                    android:textColor="@color/bottom_sheet_txt_color"
                     android:textSize="@dimen/bottom_sheet_text_size" />
 
             </LinearLayout>
 
+            <LinearLayout
+                android:id="@+id/menu_encrypted_mkdir"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/bottom_sheet_item_height"
+                android:background="?android:attr/selectableItemBackground"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingLeft="@dimen/standard_padding"
+                android:paddingTop="@dimen/standard_half_padding"
+                android:paddingRight="@dimen/standard_padding"
+                android:paddingBottom="@dimen/standard_half_padding"
+                tools:ignore="UseCompoundDrawables">
+
+                <ImageView
+                    android:id="@+id/menu_icon_encrypted_mkdir"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@null"
+                    android:src="@drawable/ic_encrypted_folder"
+                    app:tint="@color/bottom_sheet_icon_color" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
+                    android:text="@string/create_new_encrypted_folder"
+                    android:textColor="@color/bottom_sheet_txt_color"
+                    android:textSize="@dimen/bottom_sheet_text_size" />
+            </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/templates"
                 android:layout_width="match_parent"
@@ -234,7 +268,7 @@
                         android:layout_gravity="center_vertical"
                         android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
                         android:text="@string/create_new_document"
-                        android:textColor="@color/text_color"
+                        android:textColor="@color/bottom_sheet_txt_color"
                         android:textSize="@dimen/bottom_sheet_text_size" />
                 </LinearLayout>
 
@@ -264,7 +298,7 @@
                         android:layout_gravity="center_vertical"
                         android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
                         android:text="@string/create_new_spreadsheet"
-                        android:textColor="@color/text_color"
+                        android:textColor="@color/bottom_sheet_txt_color"
                         android:textSize="@dimen/bottom_sheet_text_size" />
                 </LinearLayout>
 
@@ -294,7 +328,7 @@
                         android:layout_gravity="center_vertical"
                         android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
                         android:text="@string/create_new_presentation"
-                        android:textColor="@color/text_color"
+                        android:textColor="@color/bottom_sheet_txt_color"
                         android:textSize="@dimen/bottom_sheet_text_size" />
                 </LinearLayout>
             </LinearLayout>
@@ -321,7 +355,8 @@
                 android:layout_marginStart="@dimen/bottom_sheet_menu_item_divider_standard_margin"
                 android:layout_marginTop="@dimen/standard_half_margin"
                 android:layout_marginBottom="@dimen/standard_half_margin"
-                android:background="@color/list_divider_background" />
+                android:background="@color/list_divider_background"
+                android:visibility="gone" />
 
             <LinearLayout
                 android:id="@+id/menu_create_rich_workspace"
@@ -331,7 +366,10 @@
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
                 android:paddingLeft="@dimen/standard_padding"
+                android:paddingTop="@dimen/standard_half_padding"
                 android:paddingRight="@dimen/standard_padding"
+                android:paddingBottom="@dimen/standard_padding"
+                android:visibility="gone"
                 tools:ignore="UseCompoundDrawables">
 
                 <ImageView
@@ -349,7 +387,7 @@
                     android:layout_marginStart="@dimen/bottom_sheet_text_start_margin"
                     android:contentDescription="@string/creates_rich_workspace"
                     android:text="@string/create_rich_workspace"
-                    android:textColor="@color/text_color"
+                    android:textColor="@color/bottom_sheet_txt_color"
                     android:textSize="@dimen/bottom_sheet_text_size" />
 
             </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_gallery_bottom_sheet.xml b/app/src/main/res/layout/fragment_gallery_bottom_sheet.xml
index 507cec6908bc..aa720ff688bb 100644
--- a/app/src/main/res/layout/fragment_gallery_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_gallery_bottom_sheet.xml
@@ -15,10 +15,10 @@
     android:layout_height="match_parent">
 
     <FrameLayout
-        style="@style/Widget.Material3.BottomSheet"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:behavior_peekHeight="350dp"
+        android:background="@color/bottom_sheet_bg_color"
         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
         <LinearLayout
@@ -48,7 +48,9 @@
                     android:text="@string/show_images"
                     app:iconPadding="@dimen/standard_half_padding"
                     android:textSize="@dimen/bottom_sheet_text_size"
-                    app:icon="@drawable/ic_camera" />
+                    android:textColor="@color/bottom_sheet_txt_color"
+                    app:icon="@drawable/ic_camera"
+                    app:iconTint="@color/bottom_sheet_icon_color"/>
 
                 <View
                     android:layout_width="0dp"
@@ -84,7 +86,9 @@
                     android:text="@string/show_video"
                     app:iconPadding="@dimen/standard_half_padding"
                     android:textSize="@dimen/bottom_sheet_text_size"
-                    app:icon="@drawable/ic_video_camera" />
+                    android:textColor="@color/bottom_sheet_txt_color"
+                    app:icon="@drawable/ic_video_camera"
+                    app:iconTint="@color/bottom_sheet_icon_color"/>
 
                 <View
                     android:layout_width="0dp"
@@ -118,7 +122,9 @@
                     app:iconPadding="@dimen/standard_half_padding"
                     android:text="@string/select_media_folder"
                     android:textSize="@dimen/bottom_sheet_text_size"
-                    app:icon="@drawable/nav_photos" />
+                    android:textColor="@color/bottom_sheet_txt_color"
+                    app:icon="@drawable/nav_photos"
+                    app:iconTint="@color/bottom_sheet_icon_color"/>
 
                 <View
                     android:layout_width="0dp"
diff --git a/app/src/main/res/layout/quick_sharing_permissions_bottom_sheet_fragment.xml b/app/src/main/res/layout/quick_sharing_permissions_bottom_sheet_fragment.xml
index 8909b5e1387a..d9db69917f91 100644
--- a/app/src/main/res/layout/quick_sharing_permissions_bottom_sheet_fragment.xml
+++ b/app/src/main/res/layout/quick_sharing_permissions_bottom_sheet_fragment.xml
@@ -10,6 +10,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@color/bottom_sheet_bg_color"
     android:paddingTop="@dimen/standard_padding"
     android:paddingBottom="@dimen/standard_padding"
     android:orientation="vertical">
diff --git a/app/src/main/res/layout/send_files_fragment.xml b/app/src/main/res/layout/send_files_fragment.xml
index d256a9433067..085cb14f043b 100644
--- a/app/src/main/res/layout/send_files_fragment.xml
+++ b/app/src/main/res/layout/send_files_fragment.xml
@@ -15,6 +15,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="bottom"
+    android:background="@color/bottom_sheet_bg_color"
     app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
     <LinearLayout
diff --git a/app/src/main/res/layout/send_share_fragment.xml b/app/src/main/res/layout/send_share_fragment.xml
index 12342895bc50..9d18932d9dda 100644
--- a/app/src/main/res/layout/send_share_fragment.xml
+++ b/app/src/main/res/layout/send_share_fragment.xml
@@ -15,6 +15,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="bottom"
+    android:background="@color/bottom_sheet_bg_color"
     app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
     <LinearLayout
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6bb94fc8f45d..80258c810b92 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -216,8 +216,10 @@
     <string name="create_dir_fail_msg">Verzeichnis konnte nicht erstellt werden</string>
     <string name="create_link">Link erstellen</string>
     <string name="create_new">Neu</string>
+    <string name="create_text_document">Neues Textdokument erstellen</string>
     <string name="create_new_document">Neues Dokument</string>
     <string name="create_new_folder">Neuer Ordner</string>
+    <string name="create_new_encrypted_folder">Verschlüsselten Ordner erstellen</string>
     <string name="create_new_presentation">Neue Präsentation</string>
     <string name="create_new_spreadsheet">Neue Tabelle</string>
     <string name="create_rich_workspace">Ordnerbeschreibung hinzufügen</string>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index db1e1d218038..e51fe9edd7db 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -39,4 +39,69 @@
     <color name="fontAppbar">@android:color/white</color>
 
     <color name="actionbar_color">#101418</color>
+
+    <!-- NMC Colors -->
+    <color name="icon_color">#FFFFFF</color>
+    <color name="sort_text_color">@color/grey_30</color>
+    <color name="list_icon_color">@color/grey_30</color>
+    <color name="warning_icon_color">#CCCCCC</color>
+    <color name="divider_color">@color/grey_70</color>
+    <color name="spinner_bg_color">@color/grey_80</color>
+    <color name="refresh_layout_bg_color">#2D2D2D</color>
+    <color name="primary_button_disabled_color">@color/grey_70</color>
+    <color name="toolbar_divider_color">@color/grey_70</color>
+
+    <!-- Snackbar Colors -->
+    <color name="snackbar_bg_color">@color/grey_80</color>
+    <color name="snackbar_txt_color">@color/grey_0</color>
+
+    <!-- Alert Dialog Colors -->
+    <color name="alert_bg_color">@color/grey_80</color>
+    <color name="alert_txt_color">@color/grey_0</color>
+
+    <!--  NavigationView colors  -->
+    <color name="nav_selected_bg_color">@color/grey_60</color>
+    <color name="nav_txt_unselected_color">@color/grey_0</color>
+    <color name="nav_txt_selected_color">@color/grey_0</color>
+    <color name="nav_icon_unselected_color">@color/grey_30</color>
+    <color name="nav_icon_selected_color">#FFFFFF</color>
+    <color name="nav_divider_color">@color/grey_30</color>
+    <color name="nav_bg_color">@color/grey_80</color>
+    <color name="drawer_quota_txt_color">#FFFFFF</color>
+
+    <!-- Bottom Sheet Colors -->
+    <color name="bottom_sheet_bg_color">@color/grey_80</color>
+    <color name="bottom_sheet_icon_color">@color/grey_30</color>
+    <color name="bottom_sheet_txt_color">@color/grey_0</color>
+
+    <!-- Popup Menu Colors -->
+    <color name="popup_menu_bg">@color/grey_80</color>
+    <color name="popup_menu_txt_color">@color/grey_0</color>
+    <color name="overflow_bg_color">@color/grey_80</color>
+
+    <!-- Switch Compat Colors -->
+    <color name="switch_thumb_disabled">@color/grey_70</color>
+    <color name="switch_track_disabled">@color/grey_60</color>
+
+    <!-- Checkbox Colors -->
+    <color name="checkbox_checked_disabled">@color/grey_70</color>
+    <color name="checkbox_unchecked_disabled">@color/grey_70</color>
+
+    <!-- Share Colors -->
+    <color name="share_title_txt_color">#FFFFFF</color>
+    <color name="share_subtitle_txt_color">@color/grey_30</color>
+    <color name="share_info_txt_color">@color/grey_0</color>
+    <color name="share_search_border_color">@color/grey_0</color>
+    <color name="share_btn_txt_color">@color/grey_0</color>
+    <color name="share_list_item_txt_color">@color/grey_0</color>
+    <color name="share_disabled_txt_color">@color/grey_60</color>
+    <color name="share_txt_color">@color/grey_0</color>
+    <color name="share_et_divider">#FFFFFF</color>
+    <color name="share_blue_color">#7d94f9</color>
+
+    <!-- Scan Colors -->
+    <color name="scan_doc_bg_color">#121212</color>
+    <color name="scan_text_color">@color/grey_0</color>
+    <color name="scan_edit_bottom_color">@color/grey_80</color>
+    <color name="scan_count_bg_color">@color/grey_80</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 36d7459ecdaf..5e5aafeb02d4 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -89,4 +89,94 @@
     <color name="fontSecondaryAppbar">#A5A5A5</color>
 
     <color name="actionbar_color">#F7F9FF</color>
+
+    <!--  NMC Colors  -->
+    <color name="icon_color">#191919</color>
+    <color name="sort_text_color">@color/primary</color>
+    <color name="list_icon_color">#191919</color>
+    <color name="warning_icon_color">#191919</color>
+    <color name="divider_color">@color/grey_30</color>
+    <color name="spinner_bg_color">@android:color/white</color>
+    <color name="refresh_layout_bg_color">#FFFFFF</color>
+    <color name="primary_button_disabled_color">@color/grey_0</color>
+    <color name="toolbar_divider_color">#CCCCCC</color>
+    <color name="et_highlight_color">#77c4ff</color>
+    <color name="white_trans_70">#B3FFFFFF</color>
+    <color name="progress_bar_background">@color/grey_10</color>
+
+    <!-- Grey Colors -->
+    <color name="dark_grey">#101010</color>
+    <color name="grey_0">#F2F2F2</color>
+    <color name="grey_10">#E5E5E5</color>
+    <color name="grey_30">#B2B2B2</color>
+    <color name="grey_60">#666666</color>
+    <color name="grey_70">#4C4C4C</color>
+    <color name="grey_80">#333333</color>
+
+    <!-- Snackbar Colors  -->
+    <color name="snackbar_bg_color">@color/design_snackbar_background_color</color>
+    <color name="snackbar_txt_color">@color/white</color>
+
+    <!-- Alert Dialog Colors -->
+    <color name="alert_bg_color">#FFFFFF</color>
+    <color name="alert_txt_color">#191919</color>
+
+    <!--  NavigationView colors  -->
+    <color name="nav_selected_bg_color">@color/grey_0</color>
+    <color name="nav_txt_unselected_color">#191919</color>
+    <color name="nav_txt_selected_color">@color/primary</color>
+    <color name="nav_icon_unselected_color">#191919</color>
+    <color name="nav_icon_selected_color">@color/primary</color>
+    <color name="nav_divider_color">@color/grey_30</color>
+    <color name="nav_bg_color">@color/white</color>
+    <color name="drawer_quota_txt_color">#191919</color>
+
+    <!-- Bottom Sheet Colors -->
+    <color name="bottom_sheet_bg_color">#FFFFFF</color>
+    <color name="bottom_sheet_icon_color">#191919</color>
+    <color name="bottom_sheet_txt_color">#191919</color>
+
+    <!-- Popup Menu Colors -->
+    <color name="popup_menu_bg">#FFFFFF</color>
+    <color name="popup_menu_txt_color">#191919</color>
+    <color name="overflow_bg_color">#FFFFFF</color>
+
+    <!-- Switch Compat Colors -->
+    <color name="switch_thumb_checked_enabled">@color/primary</color>
+    <color name="switch_track_checked_enabled">#F399C7</color>
+    <color name="switch_thumb_unchecked_enabled">#FFFFFF</color>
+    <color name="switch_track_unchecked_enabled">@color/grey_30</color>
+    <color name="switch_thumb_disabled">@color/grey_10</color>
+    <color name="switch_track_disabled">@color/grey_0</color>
+
+    <!-- Checkbox Colors -->
+    <color name="checkbox_checked_enabled">@color/primary</color>
+    <color name="checkbox_unchecked_enabled">@color/grey_30</color>
+    <color name="checkbox_checked_disabled">@color/grey_30</color>
+    <color name="checkbox_unchecked_disabled">#CCCCCC</color>
+
+    <!-- Share Colors -->
+    <color name="share_title_txt_color">#191919</color>
+    <color name="share_subtitle_txt_color">@color/grey_30</color>
+    <color name="share_info_txt_color">#191919</color>
+    <color name="share_search_border_color">#191919</color>
+    <color name="share_btn_txt_color">#191919</color>
+    <color name="share_list_item_txt_color">#191919</color>
+    <color name="share_disabled_txt_color">@color/grey_30</color>
+    <color name="share_txt_color">#191919</color>
+    <color name="share_et_divider">#000000</color>
+    <color name="share_warning_txt_color">#191919</color>
+    <color name="sharing_warning_bg_color">#F6E5EB</color>
+    <color name="sharing_warning_border_color">#C16F81</color>
+    <color name="share_color">#0D39DF</color>
+    <color name="shared_with_me_color">#0099ff</color>
+    <color name="share_blue_color">#2238df</color>
+
+    <!--  Scan Colors  -->
+    <color name="scan_doc_bg_color">@color/grey_0</color>
+    <color name="scan_text_color">#191919</color>
+    <color name="scan_edit_bottom_color">@color/grey_0</color>
+    <color name="scan_count_bg_color">@color/grey_30</color>
+    <color name="neptune">#77b6bb</color>
+    <color name="neptune_50">#5077b6bb</color>
 </resources>
diff --git a/app/src/main/res/values/dims.xml b/app/src/main/res/values/dims.xml
index d320c92a664a..d94e37c76b46 100644
--- a/app/src/main/res/values/dims.xml
+++ b/app/src/main/res/values/dims.xml
@@ -15,8 +15,8 @@
     <dimen name="nav_drawer_menu_avatar_radius">12sp</dimen>
     <dimen name="list_item_avatar_icon_radius">20dp</dimen>
     <dimen name="action_bar_margin_top">64dp</dimen>
-    <dimen name="bottom_sheet_text_start_margin">40dp</dimen>
-    <dimen name="bottom_sheet_item_height">56dp</dimen>
+    <dimen name="bottom_sheet_text_start_margin">16dp</dimen>
+    <dimen name="bottom_sheet_item_height">48dp</dimen>
     <dimen name="bottom_sheet_menu_item_divider_standard_margin">80dp</dimen>
     <dimen name="file_icon_size">40dp</dimen>
     <dimen name="live_photo_indicator_margin">100dp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7e699376c89e..9f57d2ae9fcb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -889,6 +889,7 @@
     <string name="upload_scan_doc_upload">Scan document from camera</string>
     <string name="upload_content_from_other_apps">Upload content from other apps</string>
     <string name="create_new_folder">New folder</string>
+    <string name="create_new_encrypted_folder">Create new encrypted folder</string>
     <string name="uploads_view_upload_status_virus_detected">Virus detected. Upload cannot be completed!</string>
     <string name="tags">Tags</string>
     <string name="error_fetching_sharees">Unable to fetch sharees.</string>
@@ -1081,6 +1082,7 @@
     <string name="upload_list_cancel_upload">Cancel upload</string>
     <string name="upload_list_delete">Delete</string>
     <string name="create_new">New</string>
+    <string name="create_text_document">Create text document</string>
     <string name="editor_placeholder" translatable="false">%1$s %2$s</string>
 
     <string name="share_permission_file_request">File request</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 17cdbaabca4a..c91bf49c9ced 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -447,7 +447,7 @@
     </style>
 
     <style name="App.BottomSheetDialog" parent="Widget.Material3.BottomSheet.Modal">
-        <item name="backgroundTint">@color/bg_default</item>
+        <item name="backgroundTint">@color/bottom_sheet_bg_color</item>
     </style>
 
     <style name="App.ActionMode" parent="@style/Widget.Material3.ActionMode">