made all the suggested changes

gradle.properties

@@ -4,5 +4,4 @@ NC_TEST_SERVER_USERNAME=test
 NC_TEST_SERVER_PASSWORD=test
 android.enableJetifier=true
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx4G
 #android.debug.obsoleteApi=true

src/main/java/com/owncloud/android/ui/dialog/SyncedFolderPreferencesDialogFragment.java

@@ -179,7 +179,7 @@ public class SyncedFolderPreferencesDialogFragment extends DialogFragment {
 
         // find/saves UI elements
         mEnabledSwitch = view.findViewById(R.id.sync_enabled);
-        ThemeCheckableUtils.tintSwitch(mEnabledSwitch, accentColor, getContext());
+        ThemeCheckableUtils.tintSwitch(mEnabledSwitch, accentColor);
 
         mLocalFolderPath = view.findViewById(R.id.synced_folders_settings_local_folder_path);
 

src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupFragment.java

@@ -138,11 +138,11 @@ public class BackupFragment extends FileFragment implements DatePickerDialog.OnD
         arbitraryDataProvider = new ArbitraryDataProvider(getContext().getContentResolver());
 
         ThemeCheckableUtils.tintSwitch(
-            binding.contacts, getContext().getResources().getColor(R.color.color_accent), getContext());
+            binding.contacts, getContext().getResources().getColor(R.color.color_accent));
         ThemeCheckableUtils.tintSwitch(
-            binding.calendar, ThemeColorUtils.primaryAccentColor(getContext()), getContext());
+            binding.calendar, ThemeColorUtils.primaryAccentColor(getContext()));
         ThemeCheckableUtils.tintSwitch(
-            binding.dailyBackup, ThemeColorUtils.primaryAccentColor(getContext()), getContext());
+            binding.dailyBackup, ThemeColorUtils.primaryAccentColor(getContext()));
         binding.dailyBackup.setChecked(
             arbitraryDataProvider.getBooleanValue(user, PREFERENCE_CONTACTS_AUTOMATIC_BACKUP));
 

src/main/java/com/owncloud/android/utils/theme/ThemeCheckableUtils.java

@@ -56,33 +56,24 @@ public final class ThemeCheckableUtils {
         }
     }
 
-    public static void tintSwitch(SwitchCompat switchView, int color, Context context) {
-       // int trackColor = Color.argb(77, Color.red(color), Color.green(color), Color.blue(color));
-        int trackColor = context.getResources().getColor(R.color.grey_200);
+    public static void tintSwitch(SwitchCompat switchView, int color) {
+        int trackColor = switchView.getContext().getResources().getColor(R.color.grey_200);
         ColorStateList thumbColorStateList = null;
         ColorStateList trackColorStateList = null;
-
-        if(thumbColorStateList == null && trackColorStateList == null) {
-            int thumbColor = ThemeColorUtils.primaryAccentColor(switchView.getContext());
-            if (ThemeColorUtils.darkTheme(switchView.getContext()) &&
-                AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES) {
-                thumbColor = Color.WHITE;
-                trackColor = Color.DKGRAY;
-            }
-           // int trackColorUnchecked = context.getResources().getColor(R.color.switch_track_color_unchecked);
-            thumbColorStateList = new ColorStateList(
-                new int[][]{new int[]{android.R.attr.state_checked}, new int[]{}},
-                new int[]{thumbColor, switchView.getContext().getResources().getColor(R.color.switch_thumb_color_unchecked)});
-            trackColorStateList = new ColorStateList(
-                new int[][]{new int[]{android.R.attr.state_checked},
-                    new int[]{}},
-                new int[]{trackColor, trackColor});
+        int thumbColor = ThemeColorUtils.primaryAccentColor(switchView.getContext());
+        if (ThemeColorUtils.darkTheme(switchView.getContext()) &&
+            AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES) {
+            thumbColor = Color.WHITE;
+            trackColor = Color.DKGRAY;
         }
-
-        // setting the thumb color
+        thumbColorStateList = new ColorStateList(
+            new int[][]{new int[]{android.R.attr.state_checked}, new int[]{}},
+            new int[]{thumbColor, switchView.getContext().getResources().getColor(R.color.switch_thumb_color_unchecked)});
+        trackColorStateList = new ColorStateList(
+            new int[][]{new int[]{android.R.attr.state_checked},
+                new int[]{}},
+            new int[]{trackColor, trackColor});
         DrawableCompat.setTintList(switchView.getThumbDrawable(), thumbColorStateList);
-
-        // setting the track color
         DrawableCompat.setTintList(switchView.getTrackDrawable(), trackColorStateList);
     }
 }

src/main/res/layout/backup_fragment.xml

@@ -44,7 +44,6 @@
             android:minHeight="48dp"
             android:text="@string/contacts"
             android:textColor="@color/text_color"
-            app:theme="@style/Color1SwitchStyle"
             android:textSize="@dimen/two_line_primary_text_size" />
 
         <androidx.appcompat.widget.SwitchCompat