diff --git a/app/src/main/java/com/nextcloud/client/editimage/EditImageActivity.kt b/app/src/main/java/com/nextcloud/client/editimage/EditImageActivity.kt
index 386c1bbe8e05..1a03938831ef 100644
--- a/app/src/main/java/com/nextcloud/client/editimage/EditImageActivity.kt
+++ b/app/src/main/java/com/nextcloud/client/editimage/EditImageActivity.kt
@@ -8,6 +8,7 @@
 package com.nextcloud.client.editimage
 
 import android.graphics.Bitmap
+import android.graphics.drawable.ColorDrawable
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
@@ -16,9 +17,6 @@ import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.ContextCompat
-import androidx.core.graphics.drawable.DrawableCompat
-import androidx.core.view.WindowCompat
-import androidx.core.view.WindowInsetsCompat
 import com.canhub.cropper.CropImageView
 import com.nextcloud.client.di.Injectable
 import com.nextcloud.client.jobs.upload.FileUploadHelper
@@ -73,21 +71,25 @@ class EditImageActivity :
         file = intent.extras?.getParcelableArgument(EXTRA_FILE, OCFile::class.java)
             ?: throw IllegalArgumentException("Missing file argument")
 
-        setSupportActionBar(binding.toolbar)
-        supportActionBar?.apply {
-            title = file.fileName
-            setDisplayHomeAsUpEnabled(true)
-        }
-
-        val windowInsetsController = WindowCompat.getInsetsController(window, window.decorView)
-        windowInsetsController.hide(WindowInsetsCompat.Type.statusBars())
-
-        window.statusBarColor = ContextCompat.getColor(this, R.color.black)
-        window.navigationBarColor = getColor(R.color.black)
+        //NMC Customization
+        setupToolbar()
+        setupActionBar()
 
         setupCropper()
     }
 
+    //NMC Customization
+    private fun setupActionBar() {
+        supportActionBar?.let {
+            viewThemeUtils.platform.themeStatusBar(this)
+            it.setDisplayHomeAsUpEnabled(true)
+            it.setDisplayShowTitleEnabled(true)
+            //custom color for back arrow for NMC
+            viewThemeUtils.files.themeActionBar(this, it, file.fileName)
+            it.setBackgroundDrawable(ColorDrawable(resources.getColor(R.color.bg_default, null)))
+        }
+    }
+
     override fun onCropImageComplete(view: CropImageView, result: CropImageView.CropResult) {
         if (!result.isSuccessful) {
             DisplayUtils.showSnackMessage(this, getString(R.string.image_editor_unable_to_edit_image))
@@ -124,14 +126,20 @@ class EditImageActivity :
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         // add save button to action bar
         menuInflater.inflate(R.menu.custom_menu_placeholder, menu)
-        val saveIcon = AppCompatResources.getDrawable(this, R.drawable.ic_check)?.also {
-            DrawableCompat.setTint(it, resources.getColor(R.color.white, theme))
-        }
+        // NMC: No need to apply NC tint here as we will be doing it later in code
+        val saveIcon = AppCompatResources.getDrawable(this, R.drawable.ic_tick)
         menu?.findItem(R.id.custom_menu_placeholder_item)?.apply {
             icon = saveIcon
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 contentDescription = getString(R.string.common_save)
             }
+            // NMC customization
+            icon = icon?.let {
+                viewThemeUtils.platform.colorDrawable(
+                    it,
+                    ContextCompat.getColor(this@EditImageActivity, R.color.fontAppbar)
+                )
+            }
         }
         return true
     }
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 1269459f2a94..187682fdd11b 100644
--- a/app/src/main/java/com/nextcloud/ui/fileactions/FileActionsBottomSheet.kt
+++ b/app/src/main/java/com/nextcloud/ui/fileactions/FileActionsBottomSheet.kt
@@ -140,7 +140,8 @@ class FileActionsBottomSheet : BottomSheetDialogFragment(), Injectable {
                 binding.thumbnailLayout.thumbnailShimmer,
                 syncedFolderProvider.preferences,
                 viewThemeUtils,
-                syncedFolderProvider
+                syncedFolderProvider,
+                false
             )
         }
     }
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.kt
index 77088066ea0f..929f9b63e7a3 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.kt
+++ b/app/src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.kt
@@ -21,7 +21,6 @@ import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.snackbar.Snackbar
-import com.nextcloud.android.common.ui.theme.utils.ColorRole
 import com.nextcloud.client.di.Injectable
 import com.nextcloud.client.preferences.AppPreferences
 import com.owncloud.android.R
@@ -80,30 +79,18 @@ class PassCodeActivity : AppCompatActivity(), Injectable {
         setContentView(binding.root)
 
         PassCodeManager.setSecureFlag(this, true)
-        applyTint()
         setupPasscodeEditTexts()
         setSoftInputMode()
         setupUI(savedInstanceState)
         setTextListeners()
     }
 
-    private fun applyTint() {
-        viewThemeUtils.platform.colorViewBackground(binding.cardViewContent, ColorRole.SURFACE_VARIANT)
-        viewThemeUtils.material.colorMaterialButtonPrimaryBorderless(binding.cancel)
-    }
-
     private fun setupPasscodeEditTexts() {
         passCodeEditTexts[0] = binding.txt0
         passCodeEditTexts[1] = binding.txt1
         passCodeEditTexts[2] = binding.txt2
         passCodeEditTexts[3] = binding.txt3
 
-        passCodeEditTexts.forEach {
-            it?.let { editText ->
-                viewThemeUtils.platform.colorEditText(editText)
-            }
-        }
-
         passCodeEditTexts[0]?.requestFocus()
 
         binding.cardViewContent.setOnClickListener {
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/GalleryAdapter.kt b/app/src/main/java/com/owncloud/android/ui/adapter/GalleryAdapter.kt
index b612c7960b1b..fccc4bea5bb0 100644
--- a/app/src/main/java/com/owncloud/android/ui/adapter/GalleryAdapter.kt
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/GalleryAdapter.kt
@@ -74,7 +74,8 @@ class GalleryAdapter(
             transferServiceGetter,
             showMetadata = false,
             showShareAvatar = false,
-            viewThemeUtils
+            viewThemeUtils,
+            true
         )
     }
 
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
index 16c032707a29..3f5a14132553 100644
--- a/app/src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
@@ -179,8 +179,7 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
                     if (isCheckedFile(file)) {
                         gridViewHolder.itemLayout.setBackgroundColor(ContextCompat.getColor(mContext, R.color.selected_item_background));
 
-                        gridViewHolder.checkbox.setImageDrawable(
-                            viewThemeUtils.platform.tintDrawable(mContext, R.drawable.ic_checkbox_marked, ColorRole.PRIMARY));
+                        gridViewHolder.checkbox.setImageResource(R.drawable.ic_checkbox_marked);
                     } else {
                         gridViewHolder.itemLayout.setBackgroundColor(mContext.getResources().getColor(R.color.bg_default));
                         gridViewHolder.checkbox.setImageResource(R.drawable.ic_checkbox_blank_outline);
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
index 2514e3eb0a64..fc5587c17493 100644
--- a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
@@ -178,6 +178,7 @@ public OCFileListAdapter(
                                                         .getVersion()
                                                         .isShareesOnDavSupported(),
                                                     viewThemeUtils,
+                                                    false,
                                                     syncedFolderProvider);
 
         setHasStableIds(true);
@@ -370,6 +371,8 @@ public boolean isEmpty() {
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         switch (viewType) {
+            // change required for NMC
+            // default case will be used for VIEW_TYPE_IMAGE & VIEWTYPE_ITEM also
             default -> {
                 if (gridView) {
                     return new OCFileListGridItemViewHolder(
@@ -381,17 +384,6 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
                     );
                 }
             }
-            case VIEW_TYPE_IMAGE -> {
-                if (gridView) {
-                    return new OCFileListViewHolder(
-                        GridImageBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)
-                    );
-                } else {
-                    return new OCFileListItemViewHolder(
-                        ListItemBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)
-                    );
-                }
-            }
             case VIEW_TYPE_FOOTER -> {
                 return new OCFileListFooterViewHolder(
                     ListFooterBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)
@@ -415,7 +407,6 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
         if (holder instanceof OCFileListFooterViewHolder footerViewHolder) {
             footerViewHolder.getFooterText().setText(getFooterText());
-            viewThemeUtils.platform.colorCircularProgressBar(footerViewHolder.getLoadingProgressBar(), ColorRole.ON_SURFACE_VARIANT);
             footerViewHolder.getLoadingProgressBar().setVisibility(
                 ocFileListFragmentInterface.isLoading() ? View.VISIBLE : View.GONE);
         } else if (holder instanceof OCFileListHeaderViewHolder headerViewHolder) {
@@ -509,15 +500,10 @@ private void updateLivePhotoIndicators(ListViewHolder holder, OCFile file) {
     private void bindListGridItemViewHolder(ListGridItemViewHolder holder, OCFile file) {
         holder.getFileName().setText(file.getDecryptedFileName());
 
-        boolean gridImage = MimeTypeUtil.isImage(file) || MimeTypeUtil.isVideo(file);
-        if (gridView && gridImage) {
+        if (gridView && ocFileListFragmentInterface.getColumnsCount() > showFilenameColumnThreshold) {
             holder.getFileName().setVisibility(View.GONE);
         } else {
-            if (gridView && ocFileListFragmentInterface.getColumnsCount() > showFilenameColumnThreshold) {
-                holder.getFileName().setVisibility(View.GONE);
-            } else {
-                holder.getFileName().setVisibility(View.VISIBLE);
-            }
+            holder.getFileName().setVisibility(View.VISIBLE);
         }
 
         ViewExtensionsKt.setVisibleIf(holder.getShared(), !file.isOfflineOperation());
@@ -722,7 +708,7 @@ public boolean shouldShowHeader() {
             return false;
         }
 
-        if (MainApp.isOnlyOnDevice()) {
+        if (MainApp.isOnlyOnDevice() || ocFileListFragmentInterface.isSearchFragment()) {
             return false;
         }
 
@@ -1121,6 +1107,7 @@ public void cancelAllPendingTasks() {
 
     public void setGridView(boolean bool) {
         gridView = bool;
+        ocFileListDelegate.setGridView(bool);
     }
 
     public void setShowMetadata(boolean bool) {
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt
index dff220e2a3bd..a4ed0f771653 100644
--- a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt
@@ -48,11 +48,12 @@ class OCFileListDelegate(
     private val storageManager: FileDataStorageManager,
     private val hideItemOptions: Boolean,
     private val preferences: AppPreferences,
-    private val gridView: Boolean,
+    private var gridView: Boolean,
     private val transferServiceGetter: ComponentsGetter,
     private val showMetadata: Boolean,
     private var showShareAvatar: Boolean,
     private var viewThemeUtils: ViewThemeUtils,
+    private val isMediaGallery: Boolean,
     private val syncFolderProvider: SyncedFolderProvider? = null
 ) {
     private val checkedFiles: MutableSet<OCFile> = HashSet()
@@ -214,7 +215,8 @@ class OCFileListDelegate(
             gridViewHolder.shimmerThumbnail,
             preferences,
             viewThemeUtils,
-            syncFolderProvider
+            syncFolderProvider,
+            isMediaGallery
         )
 
         // item layout + click listeners
@@ -238,7 +240,8 @@ class OCFileListDelegate(
 
         // shares
         val shouldHideShare = (
-            hideItemOptions ||
+            gridView || // NMC: don't show share icon in grid mode
+                hideItemOptions ||
                 !file.isFolder &&
                 file.isEncrypted ||
                 file.isEncrypted &&
@@ -315,9 +318,8 @@ class OCFileListDelegate(
 
     private fun setCheckBoxImage(file: OCFile, gridViewHolder: ListViewHolder) {
         if (isCheckedFile(file)) {
-            gridViewHolder.checkbox.setImageDrawable(
-                viewThemeUtils.platform.tintDrawable(context, R.drawable.ic_checkbox_marked, ColorRole.PRIMARY)
-            )
+            // NMC Customization
+            gridViewHolder.checkbox.setImageResource(R.drawable.ic_checkbox_marked)
         } else {
             gridViewHolder.checkbox.setImageResource(R.drawable.ic_checkbox_blank_outline)
         }
@@ -405,6 +407,10 @@ class OCFileListDelegate(
         showShareAvatar = bool
     }
 
+    fun setGridView(bool: Boolean){
+        gridView = bool
+    }
+
     companion object {
         private val TAG = OCFileListDelegate::class.java.simpleName
     }
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListGridItemViewHolder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListGridItemViewHolder.kt
index 05ee4731e994..013d92ca28ef 100644
--- a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListGridItemViewHolder.kt
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListGridItemViewHolder.kt
@@ -53,8 +53,8 @@ internal class OCFileListGridItemViewHolder(var binding: GridItemBinding) :
         get() = null
     override val livePhotoIndicatorSeparator: TextView?
         get() = null
-    override val fileFeaturesLayout: LinearLayout
-        get() = binding.fileFeaturesLayout
+    override val fileFeaturesLayout: LinearLayout?
+        get() = null
     override val more: ImageButton
         get() = binding.more
 
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java
index 80fdcb89a5c0..ee0812f89997 100755
--- a/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java
@@ -101,7 +101,8 @@ public void onBindHeaderViewHolder(SectionedViewHolder holder, int section, bool
         headerViewHolder.binding.uploadListTitle.setText(
             String.format(parentActivity.getString(R.string.uploads_view_group_header),
                           group.getGroupName(), group.getGroupItemCount()));
-        viewThemeUtils.platform.colorPrimaryTextViewElement(headerViewHolder.binding.uploadListTitle);
+        //NMC Customization
+        headerViewHolder.binding.uploadListTitle.setTextColor(parentActivity.getResources().getColor(R.color.primary, null));
 
         headerViewHolder.binding.uploadListTitle.setOnClickListener(v -> {
             toggleSectionExpanded(section);
diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.kt b/app/src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.kt
index bda667cd6b08..bd5c5e1ee0fe 100644
--- a/app/src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.kt
+++ b/app/src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.kt
@@ -229,7 +229,8 @@ class ConflictsResolveDialog : DialogFragment(), Injectable {
             null,
             syncedFolderProvider.preferences,
             viewThemeUtils,
-            syncedFolderProvider
+            syncedFolderProvider,
+            false
         )
     }
 
diff --git a/app/src/main/java/com/owncloud/android/ui/interfaces/OCFileListFragmentInterface.java b/app/src/main/java/com/owncloud/android/ui/interfaces/OCFileListFragmentInterface.java
index 2d47d841299e..0b6c577e65cc 100644
--- a/app/src/main/java/com/owncloud/android/ui/interfaces/OCFileListFragmentInterface.java
+++ b/app/src/main/java/com/owncloud/android/ui/interfaces/OCFileListFragmentInterface.java
@@ -35,4 +35,6 @@ public interface OCFileListFragmentInterface {
     boolean isLoading();
 
     void onHeaderClicked();
+
+    boolean isSearchFragment();
 }
diff --git a/app/src/main/java/com/owncloud/android/utils/DisplayUtils.java b/app/src/main/java/com/owncloud/android/utils/DisplayUtils.java
index 106916fb6e93..0be098d6a1d0 100644
--- a/app/src/main/java/com/owncloud/android/utils/DisplayUtils.java
+++ b/app/src/main/java/com/owncloud/android/utils/DisplayUtils.java
@@ -860,9 +860,13 @@ public static void setThumbnail(OCFile file,
                                     LoaderImageView shimmerThumbnail,
                                     AppPreferences preferences,
                                     ViewThemeUtils viewThemeUtils,
-                                    SyncedFolderProvider syncedFolderProvider) {
+                                    SyncedFolderProvider syncedFolderProvider,
+                                    boolean isMediaGallery) {
         if (file.isFolder()) {
             stopShimmer(shimmerThumbnail, thumbnailView);
+            updateThumbnailViewSize(thumbnailView, gridView, context, isMediaGallery, R.dimen.standard_folders_grid_item_size);
+            //reset the padding as this will change for files and we don't this for folders
+            thumbnailView.setPadding(0, 0, 0, 0);
 
             boolean isAutoUploadFolder = SyncedFolderProvider.isAutoUploadFolder(syncedFolderProvider, file, user);
             boolean isDarkModeActive = preferences.isDarkModeEnabled();
@@ -871,26 +875,28 @@ public static void setThumbnail(OCFile file,
             LayerDrawable fileIcon = MimeTypeUtil.getFileIcon(isDarkModeActive, overlayIconId, context, viewThemeUtils);
             thumbnailView.setImageDrawable(fileIcon);
         } else {
+            updateThumbnailViewSize(thumbnailView, gridView, context, isMediaGallery, R.dimen.standard_files_grid_item_size);
             if (file.getRemoteId() != null && file.isPreviewAvailable()) {
                 // Thumbnail in cache?
                 Bitmap thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(
                     ThumbnailsCacheManager.PREFIX_THUMBNAIL + file.getRemoteId());
 
                 if (thumbnail != null && !file.isUpdateThumbnailNeeded()) {
+                    setThumbnailViewPadding(thumbnailView, gridView, context, isMediaGallery, R.dimen.alternate_padding);
                     stopShimmer(shimmerThumbnail, thumbnailView);
 
                     if (MimeTypeUtil.isVideo(file)) {
-                        Bitmap withOverlay = ThumbnailsCacheManager.addVideoOverlay(thumbnail, context);
-                        thumbnailView.setImageBitmap(withOverlay);
+                        thumbnail = ThumbnailsCacheManager.addVideoOverlay(thumbnail, context);
+                    }
+
+                    // NMC: set the corner for both video and image thumbnail
+                    if (gridView) {
+                        BitmapUtils.setRoundedBitmapForGridMode(thumbnail, thumbnailView);
                     } else {
-                        if (gridView) {
-                            BitmapUtils.setRoundedBitmapForGridMode(thumbnail, thumbnailView);
-                        } else {
-                            BitmapUtils.setRoundedBitmap(thumbnail, thumbnailView);
-                        }
+                        BitmapUtils.setRoundedBitmap(thumbnail, thumbnailView);
                     }
                 } else {
-                    generateNewThumbnail(file, thumbnailView, user, storageManager, asyncTasks, gridView, context, shimmerThumbnail, preferences, viewThemeUtils);
+                    generateNewThumbnail(file, thumbnailView, user, storageManager, asyncTasks, gridView, context, shimmerThumbnail, preferences, viewThemeUtils, isMediaGallery);
                 }
 
                 if ("image/png".equalsIgnoreCase(file.getMimeType())) {
@@ -898,9 +904,10 @@ public static void setThumbnail(OCFile file,
                 }
             } else {
                 if (file.getRemoteId() != null) {
-                    generateNewThumbnail(file, thumbnailView, user, storageManager, asyncTasks, gridView, context, shimmerThumbnail, preferences, viewThemeUtils);
+                    generateNewThumbnail(file, thumbnailView, user, storageManager, asyncTasks, gridView, context, shimmerThumbnail, preferences, viewThemeUtils, isMediaGallery);
                 } else {
                     stopShimmer(shimmerThumbnail, thumbnailView);
+                    setThumbnailViewPadding(thumbnailView, gridView, context, isMediaGallery, R.dimen.standard_quarter_padding);
                     thumbnailView.setImageDrawable(MimeTypeUtil.getFileTypeIcon(file.getMimeType(),
                                                                                 file.getFileName(),
                                                                                 context,
@@ -919,7 +926,8 @@ private static void generateNewThumbnail(OCFile file,
                                              Context context,
                                              LoaderImageView shimmerThumbnail,
                                              AppPreferences preferences,
-                                             ViewThemeUtils viewThemeUtils) {
+                                             ViewThemeUtils viewThemeUtils,
+                                             boolean isMediaGallery) {
         if (!ThumbnailsCacheManager.cancelPotentialThumbnailWork(file, thumbnailView)) {
             return;
         }
@@ -964,6 +972,10 @@ private static void generateNewThumbnail(OCFile file,
 
             int px = ThumbnailsCacheManager.getThumbnailDimension();
             thumbnail = BitmapUtils.drawableToBitmap(drawable, px, px);
+
+            //NMC: set thumbnailView padding for no thumbnail
+            setThumbnailViewPadding(thumbnailView, gridView, context, isMediaGallery, R.dimen.standard_quarter_padding);
+
             final ThumbnailsCacheManager.AsyncThumbnailDrawable asyncDrawable =
                 new ThumbnailsCacheManager.AsyncThumbnailDrawable(context.getResources(),
                                                                   thumbnail, task);
@@ -971,9 +983,6 @@ private static void generateNewThumbnail(OCFile file,
             if (shimmerThumbnail != null) {
                 shimmerThumbnail.postDelayed(() -> {
                     if (thumbnailView.getDrawable() == null) {
-                        if (gridView) {
-                            configShimmerGridImageSize(shimmerThumbnail, preferences.getGridColumns());
-                        }
                         startShimmer(shimmerThumbnail, thumbnailView);
                     }
                 }, 100);
@@ -1045,4 +1054,41 @@ private static Point getScreenSize(Context context) throws Exception {
             throw new Exception("WindowManager not found");
         }
     }
+
+    /**
+     * method to set the padding to thumbnail view this is required for files so that there will be space between file
+     * and file name
+     *
+     * @param thumbnailView
+     * @param gridView
+     * @param context
+     * @param isMediaGallery
+     * @param dimensPadding
+     */
+    private static void setThumbnailViewPadding(ImageView thumbnailView, boolean gridView, Context context,
+                                                boolean isMediaGallery, int dimensPadding) {
+        if (gridView && !isMediaGallery) {
+            int padding = context.getResources().getDimensionPixelSize(dimensPadding);
+            thumbnailView.setPadding(0, 0, 0, padding);
+        }
+    }
+
+    /**
+     * method to set manual thumbnail view height and width for folders and files because we are using different size
+     * for both files and folders
+     *
+     * @param thumbnailView
+     * @param gridView
+     * @param context
+     * @param isMediaGallery
+     * @param size
+     */
+    private static void updateThumbnailViewSize(ImageView thumbnailView, boolean gridView, Context context,
+                                                boolean isMediaGallery, int size) {
+        if (gridView && !isMediaGallery) {
+            thumbnailView.getLayoutParams().width =
+                context.getResources().getDimensionPixelSize(size);
+            thumbnailView.getLayoutParams().height = context.getResources().getDimensionPixelSize(size);
+        }
+    }
 }
diff --git a/app/src/main/res/drawable/cursor_drawable.xml b/app/src/main/res/drawable/cursor_drawable.xml
new file mode 100644
index 000000000000..dd35b659e8ae
--- /dev/null
+++ b/app/src/main/res/drawable/cursor_drawable.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/text_color" />
+    <size android:width="1.5dp" />
+</shape>
diff --git a/app/src/main/res/layout/activity_edit_image.xml b/app/src/main/res/layout/activity_edit_image.xml
index 4b11869ee501..257ba56fa732 100644
--- a/app/src/main/res/layout/activity_edit_image.xml
+++ b/app/src/main/res/layout/activity_edit_image.xml
@@ -12,15 +12,10 @@
     android:layout_height="match_parent"
     android:background="@color/black">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/black"
-        android:elevation="4dp"
-        android:minHeight="?attr/actionBarSize"
-        android:theme="@style/Theme.ownCloud.Toolbar.AppWidgetContainer"
-        app:layout_constraintTop_toTopOf="parent" />
+    <!-- NMC Customization -->
+    <include
+        layout="@layout/toolbar_standard"
+        android:theme="@style/Theme.ownCloud.Toolbar.AppWidgetContainer" />
 
     <com.canhub.cropper.CropImageView
         android:id="@+id/cropImageView"
@@ -30,7 +25,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/toolbar" />
+        app:layout_constraintTop_toBottomOf="@+id/appbar" />
 
     <LinearLayout
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/file_details_fragment.xml b/app/src/main/res/layout/file_details_fragment.xml
index 9466d4638d35..1340f98f569a 100644
--- a/app/src/main/res/layout/file_details_fragment.xml
+++ b/app/src/main/res/layout/file_details_fragment.xml
@@ -49,8 +49,8 @@
 
                 <ImageView
                     android:id="@+id/favorite"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="18dp"
+                    android:layout_height="18dp"
                     android:layout_marginStart="@dimen/zero"
                     android:layout_marginEnd="@dimen/standard_eighth_margin"
                     android:contentDescription="@null"
diff --git a/app/src/main/res/layout/file_thumbnail.xml b/app/src/main/res/layout/file_thumbnail.xml
index 6f318d47e9b3..b7a842e4d78d 100644
--- a/app/src/main/res/layout/file_thumbnail.xml
+++ b/app/src/main/res/layout/file_thumbnail.xml
@@ -24,7 +24,7 @@
             android:layout_width="@dimen/file_icon_size"
             android:layout_height="@dimen/file_icon_size"
             android:contentDescription="@null"
-            android:src="@drawable/folder" />
+            tools:src="@drawable/folder" />
 
         <ImageView
             android:id="@+id/videoOverlay"
diff --git a/app/src/main/res/layout/files_folder_picker.xml b/app/src/main/res/layout/files_folder_picker.xml
index f1d4f53ebb5d..100123c7ff20 100644
--- a/app/src/main/res/layout/files_folder_picker.xml
+++ b/app/src/main/res/layout/files_folder_picker.xml
@@ -24,17 +24,10 @@
         android:layout_height="0dp"
         android:layout_weight="1" />
 
-    <LinearLayout
+    <View
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/list_divider_background" />
-
-    </LinearLayout>
+        android:layout_height="0.5dp"
+        android:background="@color/divider_color" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/grid_image.xml b/app/src/main/res/layout/grid_image.xml
index 69e064ac87f4..1ddce030090c 100644
--- a/app/src/main/res/layout/grid_image.xml
+++ b/app/src/main/res/layout/grid_image.xml
@@ -25,11 +25,12 @@
 
         <com.elyeproj.loaderviewlibrary.LoaderImageView
             android:id="@+id/thumbnail_shimmer"
-            android:visibility="gone"
-            android:layout_marginBottom="@dimen/grid_thumbnail_margin_bottom"
             android:layout_width="@dimen/standard_list_item_size"
             android:layout_height="@dimen/standard_list_item_size"
+            android:layout_marginBottom="@dimen/grid_thumbnail_margin_bottom"
             android:contentDescription="@null"
+            android:visibility="gone"
+            app:corners="8"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/grid_item.xml b/app/src/main/res/layout/grid_item.xml
index e7f2a6d8b661..8eb996d23c68 100644
--- a/app/src/main/res/layout/grid_item.xml
+++ b/app/src/main/res/layout/grid_item.xml
@@ -8,131 +8,124 @@
   ~ SPDX-FileCopyrightText: 2015 ownCloud Inc.
   ~ SPDX-License-Identifier: GPL-2.0-only AND (AGPL-3.0-or-later OR GPL-2.0-only)
 -->
-<LinearLayout
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.owncloud.android.ui.SquareLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/ListItemLayout"
-    android:layout_marginEnd="@dimen/grid_container_margin"
-    android:layout_marginTop="@dimen/grid_container_margin"
-    android:orientation="vertical"
-    android:gravity="center"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/grid_container_height">
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal"
+    android:gravity="center"
+    android:orientation="vertical">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="@dimen/grid_container_width"
-        android:layout_height="@dimen/grid_container_height">
-
-        <com.elyeproj.loaderviewlibrary.LoaderImageView
-            android:id="@+id/thumbnail_shimmer"
-            android:visibility="gone"
-            android:layout_marginBottom="@dimen/grid_thumbnail_margin_bottom"
-            android:layout_width="@dimen/standard_list_item_size"
-            android:layout_height="@dimen/standard_list_item_size"
-            android:contentDescription="@null"
-            android:src="@drawable/folder"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:visibility="visible" />
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-        <ImageView
-            android:id="@+id/thumbnail"
-            android:layout_width="@dimen/standard_list_item_size"
-            android:layout_height="@dimen/standard_list_item_size"
-            android:layout_marginBottom="@dimen/grid_thumbnail_margin_bottom"
-            android:contentDescription="@null"
-            android:src="@drawable/folder"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:visibility="visible" />
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/gridItemGuideline"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:orientation="horizontal"
+            app:layout_constraintGuide_percent="0.22" />
 
-        <LinearLayout
-            android:id="@+id/file_features_layout"
-            android:layout_width="wrap_content"
+        <FrameLayout
+            android:id="@+id/frameLayout"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_marginEnd="@dimen/grid_layout_file_features_margin_end"
-            android:layout_marginBottom="@dimen/grid_layout_margin_bottom"
-            android:alpha="0.9"
-            android:background="@drawable/rounded_rect"
-            android:backgroundTint="@color/grid_file_features_background_color"
-            android:orientation="horizontal"
-            android:padding="@dimen/standard_quarter_padding"
-            android:translationZ="4dp"
-            app:layout_constraintBottom_toBottomOf="@+id/thumbnail"
-            app:layout_constraintEnd_toEndOf="parent">
+            android:layout_gravity="center_horizontal"
+            app:layout_constraintBottom_toTopOf="@+id/Filename"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent">
+
+            <com.elyeproj.loaderviewlibrary.LoaderImageView
+                android:id="@+id/thumbnail_shimmer"
+                android:layout_width="@dimen/standard_folders_grid_item_size"
+                android:layout_height="@dimen/standard_folders_grid_item_size"
+                android:layout_gravity="center"
+                android:contentDescription="@null"
+                android:src="@drawable/folder"
+                android:visibility="gone"
+                app:corners="8"
+                tools:visibility="visible" />
 
             <ImageView
-                tools:visibility="visible"
-                android:id="@+id/favorite_action"
-                android:layout_width="@dimen/grid_layout_item_size"
-                android:layout_height="@dimen/grid_layout_item_size"
-                android:layout_marginEnd="@dimen/grid_layout_margin_end"
-                android:contentDescription="@string/favorite_icon"
-                android:src="@drawable/favorite" />
+                android:id="@+id/thumbnail"
+                android:layout_width="@dimen/standard_folders_grid_item_size"
+                android:layout_height="@dimen/standard_folders_grid_item_size"
+                android:layout_gravity="center"
+                android:contentDescription="@null"
+                android:src="@drawable/folder"
+                tools:visibility="visible" />
 
             <ImageView
                 android:id="@+id/videoOverlay"
-                android:layout_width="@dimen/grid_layout_item_size"
-                android:layout_height="@dimen/grid_layout_item_size"
-                android:layout_marginEnd="@dimen/grid_layout_margin_end"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_marginTop="4dp"
                 android:contentDescription="@string/video_overlay_icon"
                 android:src="@drawable/video_white"
                 android:visibility="gone"
-                app:tint="@color/grid_file_features_icon_color"
                 tools:visibility="visible" />
 
             <ImageView
                 android:id="@+id/sharedIcon"
-                android:layout_width="@dimen/grid_layout_item_size"
-                android:layout_height="@dimen/grid_layout_item_size"
-                android:layout_marginEnd="@dimen/grid_layout_margin_end"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top|end"
+                android:layout_marginTop="@dimen/grid_item_shared_icon_layout_top_margin"
+                android:layout_marginEnd="@dimen/standard_quarter_margin"
                 android:contentDescription="@string/shared_icon_shared_via_link"
                 android:src="@drawable/shared_via_link"
-                app:tint="@color/grid_file_features_icon_color"
-                tools:visibility="visible" />
+                app:tint="@color/list_icon_color" />
 
             <ImageView
                 android:id="@+id/unreadComments"
-                android:layout_width="@dimen/grid_layout_item_size"
-                android:layout_height="@dimen/grid_layout_item_size"
-                tools:ignore="TouchTargetSizeCheck"
-                android:layout_marginEnd="@dimen/grid_layout_margin_end"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top|end"
+                android:layout_marginTop="@dimen/grid_item_shared_icon_layout_top_margin"
+                android:layout_marginEnd="@dimen/standard_quarter_margin"
                 android:clickable="true"
                 android:contentDescription="@string/unread_comments"
                 android:focusable="true"
                 android:src="@drawable/ic_comment_grid"
-                android:visibility="gone"
-                app:tint="@color/grid_file_features_icon_color"
-                tools:visibility="visible" />
+                android:visibility="gone" />
 
             <ImageView
                 android:id="@+id/localFileIndicator"
-                android:layout_width="@dimen/grid_layout_item_size"
-                android:layout_height="@dimen/grid_layout_item_size"
-                android:layout_marginEnd="@dimen/grid_layout_margin_end"
+                android:layout_width="@dimen/grid_item_icons_size"
+                android:layout_height="@dimen/grid_item_icons_size"
+                android:layout_gravity="bottom|end"
+                android:layout_marginEnd="@dimen/standard_quarter_margin"
+                android:layout_marginBottom="@dimen/standard_quarter_margin"
                 android:contentDescription="@string/synced_icon"
-                android:src="@drawable/ic_synced"
-                tools:visibility="visible" />
+                android:src="@drawable/ic_synced" />
+
+        </FrameLayout>
 
-        </LinearLayout>
+        <ImageView
+            android:id="@+id/favorite_action"
+            android:layout_width="@dimen/grid_item_icons_size"
+            android:layout_height="@dimen/grid_item_icons_size"
+            android:layout_gravity="top|end"
+            android:layout_marginEnd="@dimen/standard_half_margin"
+            android:contentDescription="@string/favorite_icon"
+            android:src="@drawable/favorite"
+            app:layout_constraintBottom_toTopOf="@+id/gridItemGuideline"
+            app:layout_constraintEnd_toEndOf="@+id/frameLayout" />
 
         <ImageView
             android:id="@+id/custom_checkbox"
-            android:layout_width="@dimen/grid_checkbox_size"
-            android:layout_height="@dimen/grid_checkbox_size"
-            android:layout_marginStart="@dimen/grid_checkbox_margin"
-            android:layout_marginTop="@dimen/grid_checkbox_margin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start|top"
+            android:layout_marginLeft="@dimen/standard_half_margin"
             android:contentDescription="@string/checkbox"
             android:src="@android:drawable/checkbox_off_background"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:visibility="visible" />
+            app:layout_constraintBottom_toTopOf="@+id/gridItemGuideline"
+            app:layout_constraintStart_toStartOf="@+id/frameLayout" />
 
         <TextView
             android:id="@+id/Filename"
@@ -155,17 +148,19 @@
             android:id="@+id/more"
             android:layout_width="@dimen/grid_bottom_view_height"
             android:layout_height="@dimen/grid_bottom_view_height"
-            android:layout_marginBottom="@dimen/grid_bottom_view_margin_bottom"
-            android:layout_marginEnd="@dimen/grid_bottom_view_margin_end"
-            android:translationZ="2dp"
-            tools:ignore="TouchTargetSizeCheck"
             android:layout_gravity="center"
+            android:layout_marginBottom="@dimen/grid_bottom_view_margin_bottom"
             android:background="@color/transparent"
             android:contentDescription="@string/overflow_menu"
+            android:paddingStart="@dimen/grid_bottom_view_margin_end"
+            android:paddingEnd="@dimen/grid_bottom_view_margin_end"
+            android:translationZ="2dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:srcCompat="@drawable/ic_dots_vertical" />
+            app:srcCompat="@drawable/ic_dots_vertical"
+            app:tint="@color/list_icon_color"
+            tools:ignore="TouchTargetSizeCheck" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</LinearLayout>
+</com.owncloud.android.ui.SquareLinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item.xml b/app/src/main/res/layout/list_item.xml
index 536940b0bfde..991dae3b12b3 100644
--- a/app/src/main/res/layout/list_item.xml
+++ b/app/src/main/res/layout/list_item.xml
@@ -15,19 +15,17 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/ListItemLayout"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="@dimen/standard_list_item_size"
     android:baselineAligned="false"
     android:descendantFocusability="blocksDescendants"
-    android:minHeight="@dimen/standard_list_item_size"
-    android:orientation="horizontal"
-    android:paddingTop="@dimen/standard_half_padding"
-    android:paddingBottom="@dimen/standard_half_padding">
+    android:orientation="horizontal">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="@dimen/min_list_item_size"
-        android:layout_height="@dimen/min_list_item_size"
+        android:layout_width="@dimen/standard_list_item_size"
+        android:layout_height="@dimen/standard_list_item_size"
         android:layout_marginStart="@dimen/zero"
-        android:layout_marginEnd="@dimen/standard_quarter_padding">
+        android:layout_marginEnd="@dimen/standard_quarter_padding"
+        android:layout_marginBottom="@dimen/standard_padding">
 
         <FrameLayout
             android:id="@+id/thumbnail_container"
@@ -45,10 +43,9 @@
 
         <ImageView
             android:id="@+id/localFileIndicator"
-            android:layout_width="@dimen/list_item_local_file_indicator_layout_width"
-            android:layout_height="@dimen/list_item_local_file_indicator_layout_height"
+            android:layout_width="@dimen/list_item_icons_size"
+            android:layout_height="@dimen/list_item_icons_size"
             android:contentDescription="@string/downloader_download_succeeded_ticker"
-            android:scaleType="fitCenter"
             android:src="@drawable/ic_synced"
             app:layout_constraintBottom_toBottomOf="@+id/thumbnail_container"
             app:layout_constraintEnd_toEndOf="@+id/thumbnail_container"
@@ -57,8 +54,8 @@
 
         <ImageView
             android:id="@+id/favorite_action"
-            android:layout_width="@dimen/list_item_favorite_action_layout_width"
-            android:layout_height="@dimen/list_item_favorite_action_layout_height"
+            android:layout_width="@dimen/list_item_icons_size"
+            android:layout_height="@dimen/list_item_icons_size"
             android:contentDescription="@string/favorite"
             android:src="@drawable/favorite"
             app:layout_constraintBottom_toTopOf="@+id/thumbnail_container"
@@ -70,12 +67,11 @@
 
     <LinearLayout
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_weight="1"
         android:gravity="top"
-        android:minHeight="@dimen/min_list_item_size"
         android:orientation="vertical"
-        android:paddingTop="@dimen/standard_half_padding">
+        android:paddingTop="@dimen/standard_padding">
 
         <TextView
             android:id="@+id/Filename"
@@ -217,7 +213,7 @@
 
     <LinearLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:gravity="center_vertical|end"
         android:orientation="horizontal"
         android:paddingStart="@dimen/standard_half_padding"
@@ -234,17 +230,17 @@
             android:paddingEnd="@dimen/list_item_share_right_margin"
             android:src="@drawable/ic_comment"
             android:visibility="gone"
-            tools:visibility="visible" />
+            tools:visibility="visible"
+            app:tint="@color/list_icon_color" />
 
         <ImageView
             android:id="@+id/sharedIcon"
             android:layout_width="48dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="top"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
             android:clickable="true"
             android:contentDescription="@string/shared_icon_share"
             android:focusable="true"
-            android:minHeight="@dimen/min_list_item_size"
             android:paddingStart="@dimen/list_item_share_right_margin"
             android:paddingEnd="@dimen/list_item_share_right_margin"
             android:src="@drawable/ic_unshared"
@@ -262,12 +258,11 @@
         <ImageView
             android:id="@+id/custom_checkbox"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="top"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
             android:clickable="false"
             android:contentDescription="@string/checkbox"
             android:focusable="false"
-            android:minHeight="@dimen/min_list_item_size"
             android:paddingStart="@dimen/standard_half_padding"
             android:paddingEnd="@dimen/alternate_padding"
             android:src="@drawable/ic_checkbox_blank_outline" />
@@ -275,15 +270,15 @@
         <ImageView
             android:id="@+id/overflow_menu"
             android:layout_width="48dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="top"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
             android:clickable="true"
             android:contentDescription="@string/overflow_menu"
             android:focusable="true"
-            android:minHeight="@dimen/min_list_item_size"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
-            android:src="@drawable/ic_dots_vertical" />
+            android:src="@drawable/ic_dots_vertical"
+            app:tint="@color/list_icon_color" />
 
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/receive_external_files.xml b/app/src/main/res/layout/receive_external_files.xml
index 1f85eae78a32..d25f4afcafb3 100644
--- a/app/src/main/res/layout/receive_external_files.xml
+++ b/app/src/main/res/layout/receive_external_files.xml
@@ -11,6 +11,7 @@
     android:id="@+id/upload_files_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/bg_default"
     android:orientation="vertical">
 
     <include
diff --git a/app/src/main/res/layout/synced_folders_settings_layout.xml b/app/src/main/res/layout/synced_folders_settings_layout.xml
index 378629b73c6e..fd90bd572100 100644
--- a/app/src/main/res/layout/synced_folders_settings_layout.xml
+++ b/app/src/main/res/layout/synced_folders_settings_layout.xml
@@ -11,6 +11,7 @@
     android:id="@+id/root"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:background="@color/bg_default"
     android:gravity="center"
     android:orientation="vertical">
 
@@ -221,6 +222,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:ellipsize="marquee"
+                        android:maxLines="2"
                         android:text="@string/instant_upload_existing"
                         android:textAppearance="?attr/textAppearanceListItem" />
                 </RelativeLayout>
diff --git a/app/src/main/res/layout/trashbin_item.xml b/app/src/main/res/layout/trashbin_item.xml
index 3124e49dc442..126537e3eaf1 100644
--- a/app/src/main/res/layout/trashbin_item.xml
+++ b/app/src/main/res/layout/trashbin_item.xml
@@ -6,6 +6,7 @@
   ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/ListItemLayout"
     android:layout_width="match_parent"
@@ -108,7 +109,8 @@
                 android:focusable="false"
                 android:paddingEnd="@dimen/list_item_share_right_margin"
                 android:paddingStart="@dimen/standard_half_padding"
-                android:src="@drawable/ic_history"/>
+                android:src="@drawable/ic_history"
+                app:tint="@color/list_icon_color"/>
 
             <ImageView
                 android:id="@+id/customCheckbox"
@@ -134,7 +136,8 @@
                 android:focusable="true"
                 android:paddingEnd="@dimen/alternate_padding"
                 android:paddingStart="@dimen/standard_half_padding"
-                android:src="@drawable/ic_dots_vertical"/>
+                android:src="@drawable/ic_dots_vertical"
+                app:tint="@color/list_icon_color"/>
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/upload_files_layout.xml b/app/src/main/res/layout/upload_files_layout.xml
index 4012193eb6a9..b5d4e9e90fec 100644
--- a/app/src/main/res/layout/upload_files_layout.xml
+++ b/app/src/main/res/layout/upload_files_layout.xml
@@ -26,17 +26,10 @@
         android:layout_height="0dp"
         android:layout_weight="1" />
 
-    <LinearLayout
+    <View
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/list_divider_background"/>
-
-    </LinearLayout>
+        android:layout_height="0.5dp"
+        android:background="@color/divider_color" />
 
     <LinearLayout
         android:id="@+id/upload_options"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 1ce3f0da4f73..c85a78eb88d3 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -7,6 +7,7 @@
 -->
 <resources>
 
+    <color name="list_item_lastmod_and_filesize_text">@color/grey_30</color>
     <color name="text_color">#E3E3E3</color>
     <color name="text_color_inverse">#000000</color>
     <color name="disabled_text">#ff6F6F6F</color>
@@ -24,7 +25,7 @@
 
     <!-- Multiselect backgrounds -->
     <color name="action_mode_background">@color/appbar</color>
-    <color name="selected_item_background">#373535</color>
+    <color name="selected_item_background">@color/grey_70</color>
 
     <color name="filelist_icon_background">#222222</color>
     <color name="standard_grey">#DADADA</color>
@@ -34,6 +35,70 @@
     <color name="drawer_active_item_background">@color/white</color>
 
     <!-- App bar -->
-    <color name="appbar">#1E1E1E</color>
+    <color name="appbar">#121212</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-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 19b3ce692520..167139478049 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -23,5 +23,8 @@
         <item name="popupMenuStyle">@style/Nextcloud.Widget.PopupMenu</item>
         <item name="bottomSheetDialogTheme">@style/ThemeOverlay.App.BottomSheetDialog</item>
         <item name="actionModeStyle">@style/App.ActionMode</item>
+        <!-- styling autocomplete text view mainly for search view cursor color-->
+        <item name="autoCompleteTextViewStyle">@style/AutoCompleteCursorColorStyle</item>
+        <item name="android:autoCompleteTextViewStyle">@style/AutoCompleteCursorColorStyle</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values-sw600dp/dims.xml b/app/src/main/res/values-sw600dp/dims.xml
index 7436d593a3c5..a32fc3e858d1 100644
--- a/app/src/main/res/values-sw600dp/dims.xml
+++ b/app/src/main/res/values-sw600dp/dims.xml
@@ -8,5 +8,7 @@
 -->
 <resources>
   <integer name="media_grid_width">6</integer>
+    <dimen name="file_icon_rounded_corner_radius">32dp</dimen>
+    <dimen name="file_icon_rounded_corner_radius_for_grid_mode">16dp</dimen>
     <dimen name="file_icon_size_grid">512dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 89ed00a08bf2..d3a487f05279 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,11 +10,11 @@
   ~ SPDX-License-Identifier: GPL-2.0-only AND (AGPL-3.0-or-later OR GPL-2.0-only)
 -->
 <resources>
-    <color name="list_item_lastmod_and_filesize_text">@color/secondary_text_color</color>
+    <color name="list_item_lastmod_and_filesize_text">@color/grey_600</color>
     <color name="black">#000000</color>
     <color name="white">#ffffff</color>
     <color name="white_helper_text">#B3FFFFFF</color>
-    <color name="text_color">#333333</color>
+    <color name="text_color">#191919</color>
     <color name="light_grey">#F5F5F5</color>
     <color name="grid_file_features_icon_color">#303034</color>
     <color name="grid_file_features_background_color">#E9E8EB</color>
@@ -26,7 +26,7 @@
     <color name="filelist_icon_background">#DDDDDD</color>
     <color name="dark_background_text_color">#EEEEEE</color>
     <color name="transparent">#00000000</color>
-    <color name="secondary_text_color">#666666</color>
+    <color name="secondary_text_color">@color/grey_30</color>
     <color name="highlight_textColor_Warning">#e53935</color>
 
     <!-- Colors -->
@@ -64,15 +64,104 @@
     <color name="color_dark_transparent">#40162233</color>
 
     <!-- Multiselect backgrounds -->
-    <color name="action_mode_background">@color/fontAppbar</color>
-    <color name="selected_item_background">#ECECEC</color>
+    <color name="action_mode_background">@color/white</color>
+    <color name="selected_item_background">@color/grey_0</color>
 
     <color name="drawer_menu_icon">#757575</color>
     <color name="bg_fallback_highlight">#616161</color>
-    <color name="drawer_active_item_background">#80000000</color>
+    <color name="drawer_active_item_background">#919191</color>
 
     <!-- App bar -->
     <color name="appbar">@android:color/white</color>
-    <color name="fontAppbar">#666666</color>
+    <color name="fontAppbar">#191919</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/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 000000000000..cc023ec9c6e1
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="grid_recyclerview_padding">4dp</dimen>
+    <dimen name="list_item_icons_size">16dp</dimen>
+    <dimen name="grid_item_icons_size">24dp</dimen>
+    <dimen name="grid_item_shared_icon_layout_top_margin">24dp</dimen>
+    <dimen name="media_grid_item_rv_spacing">6dp</dimen>
+    <dimen name="txt_size_18sp">18sp</dimen>
+    <dimen name="txt_size_15sp">15sp</dimen>
+    <dimen name="crop_corner_size">15dp</dimen>
+    <dimen name="edit_scan_bottom_bar_height">56dp</dimen>
+    <dimen name="standard_folders_grid_item_size">86dp</dimen>
+    <dimen name="standard_files_grid_item_size">80dp</dimen>
+    <dimen name="txt_size_11sp">11sp</dimen>
+    <dimen name="share_row_icon_size">30dp</dimen>
+    <dimen name="create_link_button_height">55dp</dimen>
+    <dimen name="note_et_height">258dp</dimen>
+    <dimen name="txt_size_17sp">17sp</dimen>
+    <dimen name="share_exp_date_divider_margin">20dp</dimen>
+    <dimen name="privacy_btn_width">160dp</dimen>
+    <dimen name="privacy_icon_size">50dp</dimen>
+    <dimen name="login_btn_width">150dp</dimen>
+    <dimen name="login_btn_height">55dp</dimen>
+    <dimen name="login_btn_bottom_margin">48dp</dimen>
+    <dimen name="login_btn_bottom_margin_land">48dp</dimen>
+    <dimen name="login_btn_bottom_margin_small_screen">24dp</dimen>
+    <dimen name="shared_with_me_icon_size">26dp</dimen>
+    <dimen name="txt_size_20sp">20sp</dimen>
+    <dimen name="notification_row_item_height">145dp</dimen>
+    <dimen name="button_stroke_width">1dp</dimen>
+    <dimen name="txt_size_13sp">13sp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dims.xml b/app/src/main/res/values/dims.xml
index 1f6a3f88885b..88624fb8aa7c 100644
--- a/app/src/main/res/values/dims.xml
+++ b/app/src/main/res/values/dims.xml
@@ -21,7 +21,7 @@
     <dimen name="live_photo_indicator_margin">100dp</dimen>
     <dimen name="file_icon_size_grid">128dp</dimen>
     <dimen name="file_icon_rounded_corner_radius">8dp</dimen>
-    <dimen name="file_icon_rounded_corner_radius_for_grid_mode">3dp</dimen>
+    <dimen name="file_icon_rounded_corner_radius_for_grid_mode">4dp</dimen>
     <dimen name="file_avatar_size">128dp</dimen>
     <integer name="file_avatar_px">512</integer>
     <dimen name="drawer_content_horizontal_padding">28dp</dimen>
@@ -77,7 +77,7 @@
     <dimen name="alternate_fragment_margin">15dp</dimen>
     <dimen name="file_download_fragment_display_text_margin">40dp</dimen>
     <dimen name="drawer_width">240dp</dimen>
-    <dimen name="grid_item_text_size">16sp</dimen>
+    <dimen name="grid_item_text_size">14sp</dimen>
     <dimen name="search_users_groups_layout_width">200dp</dimen>
     <dimen name="search_users_groups_layout_list_view_margin">20dp</dimen>
     <dimen name="share_file_layout_text_size">12sp</dimen>
@@ -118,11 +118,13 @@
     <dimen name="contactlist_item_icon_layout_height">40dp</dimen>
     <dimen name="empty_list_icon_layout_width">72dp</dimen>
     <dimen name="empty_list_icon_layout_height">72dp</dimen>
+    <dimen name="grid_item_local_file_indicator_layout_width">24dp</dimen>
+    <dimen name="grid_item_local_file_indicator_layout_height">24dp</dimen>
     <dimen name="grid_sync_item_layout_counter_text_size">22sp</dimen>
     <dimen name="list_item_favorite_action_layout_width">14dp</dimen>
     <dimen name="list_item_favorite_action_layout_height">14dp</dimen>
-    <dimen name="list_item_local_file_indicator_layout_width">12dp</dimen>
-    <dimen name="list_item_local_file_indicator_layout_height">12dp</dimen>
+    <dimen name="list_item_local_file_indicator_layout_width">24dp</dimen>
+    <dimen name="list_item_local_file_indicator_layout_height">24dp</dimen>
     <dimen name="preview_error_image_layout_width">72dp</dimen>
     <dimen name="preview_error_image_layout_height">72dp</dimen>
     <dimen name="preview_error_text_size">26sp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4c1563085156..f079e0dd6afd 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -32,6 +32,9 @@
         <item name="android:navigationBarColor">@color/bg_default</item>
         <item name="textInputStyle">@style/Widget.App.TextInputLayout</item>
         <item name="dialogCornerRadius">@dimen/dialogBorderRadius</item>
+        <!-- styling autocomplete text view mainly for search view cursor color-->
+        <item name="autoCompleteTextViewStyle">@style/AutoCompleteCursorColorStyle</item>
+        <item name="android:autoCompleteTextViewStyle">@style/AutoCompleteCursorColorStyle</item>
     </style>
 
     <style name="Theme.ownCloud" parent="BaseTheme.ownCloud" />
@@ -43,6 +46,9 @@
         <item name="android:textColor">@color/text_color</item>
         <item name="android:textColorSecondary">@color/secondary_text_color</item>
         <item name="android:windowBackground">@color/bg_default</item>
+        <item name="colorAccent">@color/color_accent</item>
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryDark">@color/primary_dark</item>
         <item name="colorSecondary">@color/secondary_text_color</item>
         <item name="dialogTheme">@style/FallbackTheming.Dialog</item>
         <item name="android:actionModeBackground">@color/action_mode_background</item>
@@ -50,6 +56,9 @@
         <item name="android:navigationBarColor">@color/bg_default</item>
         <item name="textInputStyle">@style/Widget.App.TextInputLayout</item>
         <item name="dialogCornerRadius">@dimen/dialogBorderRadius</item>
+        <!-- styling autocomplete text view mainly for search view cursor color-->
+        <item name="autoCompleteTextViewStyle">@style/AutoCompleteCursorColorStyle</item>
+        <item name="android:autoCompleteTextViewStyle">@style/AutoCompleteCursorColorStyle</item>
     </style>
 
     <style name="FallbackThemingTheme" parent="FallbackThemingThemeBase" />
@@ -454,6 +463,10 @@
         <item name="android:textColor">@color/white</item>
     </style>
 
+    <style name="AutoCompleteCursorColorStyle" parent="Widget.AppCompat.AutoCompleteTextView">
+        <item name="android:textCursorDrawable">@drawable/cursor_drawable</item>
+    </style>
+
     <!-- Splash screen style attributes: https://developer.android.com/develop/ui/views/launch/splash-screen#set-theme -->
     <style name="Theme.App.Starting" parent="Theme.SplashScreen">
         <!-- Set the splash screen background color -->
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index cefa8e7856d8..518adc1b3a23 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -24,6 +24,9 @@
         <item name="popupMenuStyle">@style/Nextcloud.Widget.PopupMenu</item>
         <item name="bottomSheetDialogTheme">@style/ThemeOverlay.App.BottomSheetDialog</item>
         <item name="actionModeStyle">@style/App.ActionMode</item>
+        <!-- styling autocomplete text view mainly for search view cursor color-->
+        <item name="autoCompleteTextViewStyle">@style/AutoCompleteCursorColorStyle</item>
+        <item name="android:autoCompleteTextViewStyle">@style/AutoCompleteCursorColorStyle</item>
     </style>
 
     <style name="Theme.ownCloud.Toolbar.AppWidgetContainerParent" parent="@android:style/Theme.DeviceDefault">