diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java
index 32ddc4400b..cf2ae26667 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java
@@ -442,8 +442,8 @@ private void showNearbyCardPermissionRationale() {
         DialogUtil.showAlertDialog(getActivity(),
                 getString(R.string.nearby_card_permission_title),
                 getString(R.string.nearby_card_permission_explanation),
-                this::displayYouWontSeeNearbyMessage,
                 this::requestLocationPermission,
+                this::displayYouWontSeeNearbyMessage,
                 checkBoxView,
                 false);
     }
diff --git a/app/src/main/java/fr/free/nrw/commons/quiz/QuizChecker.java b/app/src/main/java/fr/free/nrw/commons/quiz/QuizChecker.java
index e9ebda4b5c..201c5bfc68 100644
--- a/app/src/main/java/fr/free/nrw/commons/quiz/QuizChecker.java
+++ b/app/src/main/java/fr/free/nrw/commons/quiz/QuizChecker.java
@@ -151,7 +151,8 @@ private void callQuiz(Activity activity) {
                 activity.getString(R.string.quiz_alert_message, REVERT_PERCENTAGE_FOR_MESSAGE),
                 activity.getString(R.string.about_translate_proceed),
                 activity.getString(android.R.string.cancel),
-                () -> startQuizActivity(activity), null);
+                () -> startQuizActivity(activity),
+                null);
     }
 
     private void startQuizActivity(Activity activity) {
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.java
index 762b70e3b7..0e4b94f9e4 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.java
@@ -167,10 +167,11 @@ public void showNoCategorySelected() {
         DialogUtil.showAlertDialog(getActivity(),
                 getString(R.string.no_categories_selected),
                 getString(R.string.no_categories_selected_warning_desc),
-                getString(R.string.no_go_back),
                 getString(R.string.yes_submit),
-                null,
-                () -> goToNextScreen());
+                getString(R.string.no_go_back),
+                () -> goToNextScreen(),
+                null);
+
     }
 
     @Override
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java
index 1c6140b408..e08121302b 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java
@@ -354,13 +354,11 @@ public void showDuplicatePicturePopup() {
                 String.format(Locale.getDefault(),
                         uploadTitleFormat,
                         uploadItem.getFileName()),
-                () -> {
-
-                },
                 () -> {
                     uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP);
                     onNextButtonClicked();
-                });
+                }, null);
+
     }
 
     @Override
@@ -370,11 +368,12 @@ public void showBadImagePopup(Integer errorCode) {
             DialogUtil.showAlertDialog(getActivity(),
                     getString(R.string.warning),
                     errorMessageForResult,
-                    () -> deleteThisPicture(),
                     () -> {
                         uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP);
                         onNextButtonClicked();
-                    });
+                    },
+                    () -> deleteThisPicture()
+        );
         }
         //If the error message is null, we will probably not show anything
     }
diff --git a/app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java b/app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java
index 0ce8ca9c9e..25fae6e8ee 100644
--- a/app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java
+++ b/app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java
@@ -44,8 +44,8 @@ public static void showAlertDialog(Activity activity,
         showAlertDialog(activity,
                 title,
                 message,
-                activity.getString(R.string.no),
                 activity.getString(R.string.yes),
+                activity.getString(R.string.no),
                 onPositiveBtnClick,
                 onNegativeBtnClick);
     }
@@ -96,8 +96,8 @@ public static void showAlertDialog(Activity activity,
         showAlertDialog(activity,
                 title,
                 message,
-                activity.getString(R.string.no),
                 activity.getString(R.string.yes),
+                activity.getString(R.string.no),
                 onPositiveBtnClick,
                 onNegativeBtnClick,
                 customView,