diff --git a/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java b/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java
index 8806b5a3eb9b..692f650fa4b8 100644
--- a/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java
+++ b/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java
@@ -434,7 +434,8 @@ public void setAutoUploadInit(boolean autoUploadInit) {
 
     @Override
     public int getUploaderBehaviour() {
-        return preferences.getInt(AUTO_PREF__UPLOADER_BEHAVIOR, 1);
+        // NMC Customization
+        return preferences.getInt(AUTO_PREF__UPLOADER_BEHAVIOR, 0);
     }
 
     @Override
diff --git a/app/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/app/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index f7176035ccad..dead1d626414 100644
--- a/app/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/app/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@ -70,6 +70,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import androidx.annotation.DimenRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
@@ -162,9 +163,19 @@ public static void initDiskCacheAsync() {
      * @return int
      */
     public static int getThumbnailDimension() {
+        return getThumbnailDimension(R.dimen.file_icon_size_grid);
+    }
+
+    /**
+     * Converts size of file icon from dp to pixel
+     * this function is required for custom thumbnail sizes
+     * @param thumbnailDimension dimension to be converted
+     * @return int
+     */
+    public static int getThumbnailDimension(@DimenRes int thumbnailDimension) {
         // Converts dp to pixel
         Resources r = MainApp.getAppContext().getResources();
-        return Math.round(r.getDimension(R.dimen.file_icon_size_grid));
+        return Math.round(r.getDimension(thumbnailDimension));
     }
 
     /**
@@ -883,14 +894,25 @@ private enum Type {IMAGE, VIDEO}
         private String mImageKey;
         private final Context mContext;
         private final ViewThemeUtils viewThemeUtils;
+        @DimenRes
+        private final int thumbnailDimension;
+
+        public MediaThumbnailGenerationTask(ImageView imageView,
+                                            Context context,
+                                            ViewThemeUtils viewThemeUtils) {
+            this(imageView, context, R.dimen.file_icon_size_grid, viewThemeUtils);
+        }
 
+        // constructor to generate thumbnails for the requested size
         public MediaThumbnailGenerationTask(ImageView imageView,
                                             Context context,
+                                            @DimenRes int thumbnailDimension,
                                             ViewThemeUtils viewThemeUtils) {
             // Use a WeakReference to ensure the ImageView can be garbage collected
             mImageViewReference = new WeakReference<>(imageView);
             mContext = context;
             this.viewThemeUtils = viewThemeUtils;
+            this.thumbnailDimension = thumbnailDimension;
         }
 
         @Override
@@ -963,7 +985,7 @@ private Bitmap doFileInBackground(File file, Type type) {
             if (thumbnail == null) {
 
                 if (Type.IMAGE == type) {
-                    int px = getThumbnailDimension();
+                    int px = getThumbnailDimension(thumbnailDimension);
 
                     Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile(file.getAbsolutePath(), px, px);
 
@@ -981,7 +1003,7 @@ private Bitmap doFileInBackground(File file, Type type) {
 
                     if (thumbnail != null) {
                         // Scale down bitmap if too large.
-                        int px = getThumbnailDimension();
+                        int px = getThumbnailDimension(thumbnailDimension);
                         int width = thumbnail.getWidth();
                         int height = thumbnail.getHeight();
                         int max = Math.max(width, height);
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java
index 226bb6d294b2..7ad2065cbaf1 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java
@@ -204,8 +204,9 @@ public void onCreate(Bundle savedInstanceState) {
 
         // file upload spinner
         List<String> behaviours = new ArrayList<>();
-        behaviours.add(getString(R.string.uploader_upload_files_behaviour_move_to_nextcloud_folder,
-                                 themeUtils.getDefaultDisplayNameForRootFolder(this)));
+        // Not required this option for NMC
+        // behaviours.add(getString(R.string.uploader_upload_files_behaviour_move_to_nextcloud_folder,
+        //                        themeUtils.getDefaultDisplayNameForRootFolder(this)));
         behaviours.add(getString(R.string.uploader_upload_files_behaviour_only_upload));
         behaviours.add(getString(R.string.uploader_upload_files_behaviour_upload_and_delete_from_source));
 
@@ -214,6 +215,19 @@ public void onCreate(Bundle savedInstanceState) {
         behaviourAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         binding.uploadFilesSpinnerBehaviour.setAdapter(behaviourAdapter);
         binding.uploadFilesSpinnerBehaviour.setSelection(localBehaviour);
+        // NMC Customization
+        binding.uploadFilesSpinnerBehaviour.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
+                // store behaviour
+                preferences.setUploaderBehaviour(binding.uploadFilesSpinnerBehaviour.getSelectedItemPosition());
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> adapterView) {
+
+            }
+        });
 
         // setup the toolbar
         setupToolbar();
@@ -278,7 +292,12 @@ public void showToolbarSpinner() {
     private void fillDirectoryDropdown() {
         File currentDir = mCurrentDir;
         while (currentDir != null && currentDir.getParentFile() != null) {
-            mDirectories.add(currentDir.getName());
+            // NMC Customization
+            if (currentDir.getName().equals("0")) {
+                mDirectories.add(getResources().getString(R.string.storage_internal_storage));
+            } else {
+                mDirectories.add(currentDir.getName());
+            }
             currentDir = currentDir.getParentFile();
         }
         mDirectories.add(File.separator);
@@ -512,15 +531,16 @@ public void onCheckAvailableSpaceFinish(boolean hasEnoughSpaceAvailable, String.
 
                 // set result code
                 switch (binding.uploadFilesSpinnerBehaviour.getSelectedItemPosition()) {
-                    case 0: // move to nextcloud folder
+                    // Not required for NMC
+                    /*case 0: // move to nextcloud folder
                         setResult(RESULT_OK_AND_MOVE, data);
-                        break;
+                        break;*/
 
-                    case 1: // only upload
+                    case 0: // only upload
                         setResult(RESULT_OK_AND_DO_NOTHING, data);
                         break;
 
-                    case 2: // upload and delete from source
+                    case 1: // upload and delete from source
                         setResult(RESULT_OK_AND_DELETE, data);
                         break;
 
@@ -587,7 +607,8 @@ private void checkWritableFolder(File folder) {
             int localBehaviour = preferences.getUploaderBehaviour();
             binding.uploadFilesSpinnerBehaviour.setSelection(localBehaviour);
         } else {
-            binding.uploadFilesSpinnerBehaviour.setSelection(1);
+            // NMC Customization: default select 0
+            binding.uploadFilesSpinnerBehaviour.setSelection(0);
             textView.setText(new StringBuilder().append(getString(R.string.uploader_upload_files_behaviour))
                                  .append(' ')
                                  .append(getString(R.string.uploader_upload_files_behaviour_not_writable))
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.kt b/app/src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.kt
index cca0e200322c..5659ead26ec6 100644
--- a/app/src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.kt
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.kt
@@ -17,9 +17,9 @@ import android.widget.ImageButton
 import android.widget.PopupMenu
 import androidx.annotation.VisibleForTesting
 import androidx.core.view.isVisible
+import androidx.core.content.res.ResourcesCompat
 import com.afollestad.sectionedrecyclerview.SectionedRecyclerViewAdapter
 import com.afollestad.sectionedrecyclerview.SectionedViewHolder
-import com.nextcloud.android.common.ui.theme.utils.ColorRole
 import com.nextcloud.client.core.Clock
 import com.nextcloud.utils.extensions.filterEnabledOrWithoutEnabledParent
 import com.nextcloud.utils.extensions.hasEnabledParent
@@ -346,6 +346,9 @@ class SyncedFolderAdapter(
                 MediaThumbnailGenerationTask(
                     holder.binding.thumbnail,
                     context,
+                    // due to 512dp(NMC) thumb size there was scroll lagging in auto upload
+                    // so for auto upload we have to use different thumb size (NMC-2589)
+                    R.dimen.auto_upload_file_thumb_size,
                     viewThemeUtils
                 )
 
@@ -450,9 +453,16 @@ class SyncedFolderAdapter(
 
     private fun setSyncButtonActiveIcon(syncStatusButton: ImageButton, enabled: Boolean) {
         if (enabled) {
-            syncStatusButton.setImageDrawable(
-                viewThemeUtils.platform.tintDrawable(context, R.drawable.ic_cloud_sync_on, ColorRole.PRIMARY)
-            )
+            // NMC Customization theme color icon
+            val drawable = ResourcesCompat.getDrawable(context.resources, R.drawable.ic_cloud_sync_on, null)
+            drawable?.let {
+                syncStatusButton.setImageDrawable(
+                    viewThemeUtils.platform.colorDrawable(
+                        it,
+                        ResourcesCompat.getColor(context.resources, R.color.primary, null)
+                    )
+                )
+            }
         } else {
             syncStatusButton.setImageResource(R.drawable.ic_cloud_sync_off)
         }
diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/LocalStoragePathPickerDialogFragment.kt b/app/src/main/java/com/owncloud/android/ui/dialog/LocalStoragePathPickerDialogFragment.kt
index ae5d0f86adbe..5de98c72e9a4 100644
--- a/app/src/main/java/com/owncloud/android/ui/dialog/LocalStoragePathPickerDialogFragment.kt
+++ b/app/src/main/java/com/owncloud/android/ui/dialog/LocalStoragePathPickerDialogFragment.kt
@@ -92,12 +92,14 @@ class LocalStoragePathPickerDialogFragment :
                     Environment.getExternalStoragePublicDirectory(standardDirectory.name).absolutePath
                 )
             }
-            val sdCard = getString(R.string.storage_internal_storage)
             for (dir in FileStorageUtils.getStorageDirectories(requireActivity())) {
+                // NMC Customisation
                 if (internalStoragePaths.contains(dir)) {
-                    addIfExists(storagePathItems, R.drawable.ic_sd_grey600, sdCard, dir)
+                    val internalStorage = getString(R.string.storage_internal_storage)
+                    addIfExists(storagePathItems, R.drawable.ic_sd_grey600, internalStorage, dir)
                 } else {
-                    addIfExists(storagePathItems, R.drawable.ic_sd_grey600, File(dir).name, dir)
+                    val sdCard = getString(R.string.storage_sd_card)
+                    addIfExists(storagePathItems, R.drawable.ic_sd, sdCard, dir)
                 }
             }
             return storagePathItems
diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/parcel/SyncedFolderParcelable.java b/app/src/main/java/com/owncloud/android/ui/dialog/parcel/SyncedFolderParcelable.java
index a8f68a9e0b4a..b943f8a98057 100644
--- a/app/src/main/java/com/owncloud/android/ui/dialog/parcel/SyncedFolderParcelable.java
+++ b/app/src/main/java/com/owncloud/android/ui/dialog/parcel/SyncedFolderParcelable.java
@@ -126,8 +126,9 @@ public int describeContents() {
     public Integer getUploadActionInteger() {
         return switch (uploadAction) {
             case FileUploadWorker.LOCAL_BEHAVIOUR_FORGET -> 0;
-            case FileUploadWorker.LOCAL_BEHAVIOUR_MOVE -> 1;
-            case FileUploadWorker.LOCAL_BEHAVIOUR_DELETE -> 2;
+            // NMC customization: No required move
+            // case FileUploadWorker.LOCAL_BEHAVIOUR_MOVE -> 1;
+            case FileUploadWorker.LOCAL_BEHAVIOUR_DELETE -> 1;
             default -> 0;
         };
     }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6bb94fc8f45d..77c8feb2d00f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1131,6 +1131,7 @@
     <string name="write_email">E-Mail senden</string>
     <string name="wrong_storage_path">Speicherordner existiert nicht!</string>
     <string name="wrong_storage_path_desc">Ursache könnte die Wiederherstellung einer Sicherungskopie auf einem anderen Gerät sein. Der Standard-Ordner wird jetzt wieder verwendet. Bitte überprüfen Sie die Einstellungen bezüglich des Speicherortes.</string>
+    <string name="storage_sd_card">SD-Karte</string>
     <plurals name="hours">
         <item quantity="one">%d Stunde</item>
         <item quantity="other">%d Stunden</item>
diff --git a/app/src/main/res/values-sw600dp/dims.xml b/app/src/main/res/values-sw600dp/dims.xml
index 7436d593a3c5..0d67561d21f4 100644
--- a/app/src/main/res/values-sw600dp/dims.xml
+++ b/app/src/main/res/values-sw600dp/dims.xml
@@ -9,4 +9,5 @@
 <resources>
   <integer name="media_grid_width">6</integer>
     <dimen name="file_icon_size_grid">512dp</dimen>
+    <dimen name="auto_upload_file_thumb_size">512dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 8641f4e9de73..036e7277b9d5 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -9,13 +9,15 @@
 <resources>
     <string-array name="pref_behaviour_entries" translatable="false">
         <item>@string/pref_behaviour_entries_keep_file</item>
-        <item>@string/pref_behaviour_entries_move</item>
+        <!-- not required for NMC -->
+       <!-- <item>@string/pref_behaviour_entries_move</item> -->
         <item>@string/pref_behaviour_entries_delete_file</item>
     </string-array>
 
     <string-array name="pref_behaviour_entryValues" translatable="false">
         <item>LOCAL_BEHAVIOUR_FORGET</item>
-        <item>LOCAL_BEHAVIOUR_MOVE</item>
+        <!-- not required for NMC -->
+        <!-- <item>LOCAL_BEHAVIOUR_MOVE</item> -->
         <item>LOCAL_BEHAVIOUR_DELETE</item>
     </string-array>
 
diff --git a/app/src/main/res/values/dims.xml b/app/src/main/res/values/dims.xml
index d320c92a664a..cdb9b6df0cf4 100644
--- a/app/src/main/res/values/dims.xml
+++ b/app/src/main/res/values/dims.xml
@@ -130,6 +130,7 @@
     <dimen name="synced_folders_item_type_layout_right_end_margin">24dp</dimen>
     <dimen name="synced_folders_recycler_view_layout_margin">-3dp</dimen>
     <dimen name="synced_folders_control_width">80dp</dimen>
+    <dimen name="auto_upload_file_thumb_size">128dp</dimen>
     <dimen name="bottom_sheet_text_size">16sp</dimen>
     <dimen name="permission_dialog_text_size">18sp</dimen>
     <dimen name="button_corner_radius">24dp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7e699376c89e..e8432160eeda 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1190,6 +1190,7 @@
     <string name="delete_link">Delete Link</string>
     <string name="share_settings">Settings</string>
     <string name="common_confirm">Confirm</string>
+    <string name="storage_sd_card">SD Card</string>
     <string name="destination_filename">Destination filename</string>
     <string name="suggest">Suggest</string>
     <string name="enter_destination_filename">Enter destination filename</string>