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 198f9258d2f6..2f857dd3f250 100644
--- a/app/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/app/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@ -68,6 +68,7 @@
 import java.net.URLEncoder;
 import java.util.List;
 
+import androidx.annotation.DimenRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
@@ -158,9 +159,19 @@ protected Void doInBackground(File... params) {
      * @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));
     }
 
     /**
@@ -815,14 +826,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
@@ -837,9 +859,9 @@ protected Bitmap doInBackground(Object... params) {
                     }
 
                     if (MimeTypeUtil.isImage(mFile)) {
-                        thumbnail = doFileInBackground(mFile, Type.IMAGE);
+                        thumbnail = doFileInBackground(mFile, Type.IMAGE, thumbnailDimension);
                     } else if (MimeTypeUtil.isVideo(mFile)) {
-                        thumbnail = doFileInBackground(mFile, Type.VIDEO);
+                        thumbnail = doFileInBackground(mFile, Type.VIDEO, thumbnailDimension);
                     }
                 }
             } // the app should never break due to a problem with thumbnails
@@ -885,7 +907,7 @@ protected void onPostExecute(Bitmap bitmap) {
             }
         }
 
-        private Bitmap doFileInBackground(File file, Type type) {
+        private Bitmap doFileInBackground(File file, Type type, @DimenRes int thumbnailDimension) {
             final String imageKey;
 
             if (mImageKey != null) {
@@ -901,7 +923,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);
 
@@ -927,7 +949,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/adapter/SyncedFolderAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.java
index 194c3f50680d..ac7082d96105 100644
--- a/app/src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.java
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.java
@@ -35,6 +35,7 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 
+import androidx.core.content.res.ResourcesCompat;
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 
@@ -337,6 +338,9 @@ public void onBindViewHolder(SectionedViewHolder commonHolder, int section, int
             ThumbnailsCacheManager.MediaThumbnailGenerationTask task =
                 new ThumbnailsCacheManager.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);
 
             ThumbnailsCacheManager.AsyncMediaThumbnailDrawable asyncDrawable =
@@ -445,7 +449,9 @@ private MainViewHolder(GridSyncItemBinding binding) {
     private void setSyncButtonActiveIcon(ImageButton syncStatusButton, boolean enabled) {
         if (enabled) {
             syncStatusButton.setImageDrawable(
-                viewThemeUtils.platform.tintPrimaryDrawable(context, R.drawable.ic_cloud_sync_on)
+                viewThemeUtils.platform.colorDrawable(ResourcesCompat.getDrawable(context.getResources(),
+                                                                                  R.drawable.ic_cloud_sync_on, null),
+                                                      ResourcesCompat.getColor(context.getResources(), 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/parcel/SyncedFolderParcelable.java b/app/src/main/java/com/owncloud/android/ui/dialog/parcel/SyncedFolderParcelable.java
index a5ee925e9529..696b94d1c7b7 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
@@ -127,10 +127,11 @@ public Integer getUploadActionInteger() {
         switch (uploadAction) {
             case FileUploadWorker.LOCAL_BEHAVIOUR_FORGET:
                 return 0;
-            case FileUploadWorker.LOCAL_BEHAVIOUR_MOVE:
-                return 1;
+            // NMC customization: No required move
+            /*case FileUploadWorker.LOCAL_BEHAVIOUR_MOVE:
+                return 1;*/
             case FileUploadWorker.LOCAL_BEHAVIOUR_DELETE:
-                return 2;
+                return 1;
         }
         return 0;
     }
diff --git a/app/src/main/res/values-sw600dp/dims.xml b/app/src/main/res/values-sw600dp/dims.xml
index e4a56e63b0e4..9dddeb69f894 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 7317a84ee0e1..fd243acd3978 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 ce0b68648bc5..494d4edc8141 100644
--- a/app/src/main/res/values/dims.xml
+++ b/app/src/main/res/values/dims.xml
@@ -132,6 +132,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>