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 dc1bfbb23a8d..76b23ade82ef 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
@@ -94,8 +94,6 @@ class FileActionsBottomSheet : BottomSheetDialogFragment(), Injectable {
         bottomSheetDialog.behavior.state = BottomSheetBehavior.STATE_EXPANDED
         bottomSheetDialog.behavior.skipCollapsed = true
 
-        viewThemeUtils.platform.colorViewBackground(binding.bottomSheet, ColorRole.SURFACE)
-
         return binding.root
     }
 
@@ -149,7 +147,11 @@ class FileActionsBottomSheet : BottomSheetDialogFragment(), Injectable {
 
     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)
         }
     }
@@ -282,12 +284,8 @@ class FileActionsBottomSheet : BottomSheetDialogFragment(), Injectable {
                 }
                 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/owncloud/android/ui/dialog/SendFilesDialog.kt b/app/src/main/java/com/owncloud/android/ui/dialog/SendFilesDialog.kt
index cc407ce2a655..5bddf54a68b7 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
@@ -60,7 +59,6 @@ class SendFilesDialog : BottomSheetDialogFragment(R.layout.send_files_fragment),
         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 178c5e6bb3c3..6ca2c2d9aeb9 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 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.java b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.java
index 2deb69e0537d..56318fd3710a 100644
--- a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.java
+++ b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.java
@@ -11,7 +11,6 @@
 
 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;
@@ -76,12 +75,8 @@ protected void onCreate(Bundle savedInstanceState) {
         binding = FileListActionsBottomSheetFragmentBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
-        viewThemeUtils.platform.colorImageView(binding.menuIconUploadFiles, ColorRole.PRIMARY);
-        viewThemeUtils.platform.colorImageView(binding.menuIconUploadFromApp, ColorRole.PRIMARY);
-        viewThemeUtils.platform.colorImageView(binding.menuIconDirectCameraUpload, ColorRole.PRIMARY);
-        viewThemeUtils.platform.colorImageView(binding.menuIconScanDocUpload, ColorRole.PRIMARY);
-        viewThemeUtils.platform.colorImageView(binding.menuIconMkdir, ColorRole.PRIMARY);
-        viewThemeUtils.platform.colorImageView(binding.menuIconAddFolderInfo, ColorRole.PRIMARY);
+        // NMC Customization
+        reorderUploadFromOtherAppsView();
 
         binding.addToCloud.setText(getContext().getResources().getString(R.string.add_to_cloud,
                                                                          themeUtils.getDefaultDisplayNameForRootFolder(getContext())));
@@ -136,8 +131,9 @@ protected void onCreate(Bundle savedInstanceState) {
             binding.menuDirectCameraUpload.setVisibility(View.GONE);
         }
 
+        // not required for NMC
         // create rich workspace
-        if (editorUtils.isEditorAvailable(user,
+       /* if (editorUtils.isEditorAvailable(user,
                                           MimeTypeUtil.MIMETYPE_TEXT_MARKDOWN) &&
             file != null && !file.isEncrypted()) {
             // richWorkspace
@@ -154,11 +150,19 @@ protected void onCreate(Bundle savedInstanceState) {
         } else {
             binding.menuCreateRichWorkspace.setVisibility(View.GONE);
             binding.menuCreateRichWorkspaceDivider.setVisibility(View.GONE);
-        }
+        } */
 
         setupClickListener();
     }
 
+    private void 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 void setupClickListener() {
         binding.menuCreateRichWorkspace.setOnClickListener(v -> {
             actions.createRichWorkspace();
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_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 92c93182a241..9dc3f46be36c 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">
 
@@ -59,6 +60,7 @@
                 android:ellipsize="middle"
                 android:lines="1"
                 android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall"
+                android:textColor="@color/bottom_sheet_txt_color"
                 tools:text="Test file name which is very very very very very long.pdf" />
 
         </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 947a24fe27f6..7d6f69217e6b 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:layout_width="wrap_content"
@@ -99,7 +102,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>
@@ -123,7 +126,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"
@@ -131,7 +134,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>
@@ -186,7 +189,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"
@@ -194,11 +197,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"
@@ -233,7 +267,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>
 
@@ -263,7 +297,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>
 
@@ -293,7 +327,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>
@@ -320,7 +354,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"
@@ -330,7 +365,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
@@ -348,7 +386,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 e6a298d76655..a3f171c06ed0 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -207,6 +207,7 @@
     <string name="create_new">Neu</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 1ce3f0da4f73..2f79b79712ed 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -36,4 +36,68 @@
     <!-- App bar -->
     <color name="appbar">#1E1E1E</color>
     <color name="fontAppbar">@android:color/white</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>
+
+    <!-- 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 89ed00a08bf2..46992e0a67c6 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -75,4 +75,93 @@
     <color name="appbar">@android:color/white</color>
     <color name="fontAppbar">#666666</color>
     <color name="fontSecondaryAppbar">#A5A5A5</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>
+
+    <!--  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 1f6a3f88885b..51e254b4c529 100644
--- a/app/src/main/res/values/dims.xml
+++ b/app/src/main/res/values/dims.xml
@@ -14,8 +14,8 @@
     <dimen name="nav_drawer_header_height">164dp</dimen>
     <dimen name="nav_drawer_menu_avatar_radius">12sp</dimen>
     <dimen name="list_item_avatar_icon_radius">20dp</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 e347e81c90d6..b0870b589514 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -820,6 +820,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="sharee_add_failed">Adding sharee failed</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 13c9a15b63a6..0453cda8b431 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -443,7 +443,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">