diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java
index 1a95c0e94..8ed1300bc 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java
@@ -1,11 +1,7 @@
 package fr.free.nrw.commons.upload;
 
-import android.content.Context;
-import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
-import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -17,6 +13,7 @@ import androidx.appcompat.widget.AppCompatSpinner;
 import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import com.google.android.material.textfield.TextInputLayout;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.utils.AbstractTextWatcher;
 import java.util.ArrayList;
@@ -93,9 +90,15 @@ public class UploadMediaDetailAdapter extends RecyclerView.Adapter<UploadMediaDe
         @BindView(R.id.description_item_edit_text)
         AppCompatEditText descItemEditText;
 
+        @BindView(R.id.description_item_edit_text_input_layout)
+        TextInputLayout descInputLayout;
+
         @BindView(R.id.caption_item_edit_text)
         AppCompatEditText captionItemEditText;
 
+        @BindView(R.id.caption_item_edit_text_input_layout)
+        TextInputLayout captionInputLayout;
+
         public ViewHolder(View itemView) {
             super(itemView);
             ButterKnife.bind(this, itemView);
@@ -116,38 +119,19 @@ public class UploadMediaDetailAdapter extends RecyclerView.Adapter<UploadMediaDe
                 }));
 
             if (position == 0) {
-                captionItemEditText.setCompoundDrawablesWithIntrinsicBounds(null, null, getInfoIcon(),
-                        null);
-                captionItemEditText.setOnTouchListener((v, event) -> {
-                    //2 is for drawable right
-                    if (event.getAction() == MotionEvent.ACTION_UP && (event.getRawX() >= (captionItemEditText.getRight() - captionItemEditText.getCompoundDrawables()[2].getBounds().width()))) {
-                        if (getAdapterPosition() == 0) {
-                            callback.showAlert(R.string.media_detail_caption,
-                                    R.string.caption_info);
-                        }
-                        return true;
-                    }
-                    return false;
-                });
+                captionInputLayout.setEndIconMode(TextInputLayout.END_ICON_CUSTOM);
+                captionInputLayout.setEndIconDrawable(R.drawable.mapbox_info_icon_default);
+                captionInputLayout.setEndIconOnClickListener(v ->
+                    callback.showAlert(R.string.media_detail_caption, R.string.caption_info));
 
-                descItemEditText.setCompoundDrawablesWithIntrinsicBounds(null, null, getInfoIcon(),
-                        null);
-                descItemEditText.setOnTouchListener((v, event) -> {
-                    //2 is for drawable right
-                    float twelveDpInPixels = convertDpToPixel(12, descItemEditText.getContext());
-                    if (event.getAction() == MotionEvent.ACTION_UP && descItemEditText.getCompoundDrawables()[2].getBounds().contains((int)(descItemEditText.getWidth()-(event.getX()+twelveDpInPixels)),(int)(event.getY()-twelveDpInPixels))){
-                        if (getAdapterPosition() == 0) {
-                            callback.showAlert(R.string.media_detail_description,
-                                    R.string.description_info);
-                        }
-                        return true;
-                    }
-                    return false;
-                });
+                descInputLayout.setEndIconMode(TextInputLayout.END_ICON_CUSTOM);
+                descInputLayout.setEndIconDrawable(R.drawable.mapbox_info_icon_default);
+                descInputLayout.setEndIconOnClickListener(v ->
+                    callback.showAlert(R.string.media_detail_description, R.string.description_info));
 
             } else {
-                captionItemEditText.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
-                descItemEditText.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
+                captionInputLayout.setEndIconDrawable(null);
+                descInputLayout.setEndIconDrawable(null);
             }
 
             captionItemEditText.addTextChangedListener(new AbstractTextWatcher(
@@ -218,15 +202,6 @@ public class UploadMediaDetailAdapter extends RecyclerView.Adapter<UploadMediaDe
                 selectedLanguages.put(spinnerDescriptionLanguages, description.getLanguageCode());
             }
         }
-
-        /**
-         * Extracted out the method to get the icon drawable
-         */
-        private Drawable getInfoIcon() {
-            return descItemEditText.getContext()
-                    .getResources()
-                    .getDrawable(R.drawable.mapbox_info_icon_default);
-        }
     }
 
     public interface Callback {
@@ -238,13 +213,4 @@ public class UploadMediaDetailAdapter extends RecyclerView.Adapter<UploadMediaDe
         void onPrimaryCaptionTextChange(boolean isNotEmpty);
     }
 
-    /**
-     * converts dp to pixel
-     * @param dp
-     * @param context
-     * @return
-     */
-    private float convertDpToPixel(float dp, Context context) {
-        return dp * ((float) context.getResources().getDisplayMetrics().densityDpi / DisplayMetrics.DENSITY_DEFAULT);
-    }
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java
index 29abc0254..061fb8cd8 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java
@@ -4,8 +4,10 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.net.Uri;
 import androidx.annotation.Nullable;
+import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.contributions.Contribution;
+import fr.free.nrw.commons.filepicker.MimeTypeMapWrapper;
 import fr.free.nrw.commons.filepicker.UploadableFile;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.nearby.Place;
@@ -106,8 +108,8 @@ public class UploadModel {
         Timber.d("File created date is %d", fileCreatedDate);
         final ImageCoordinates imageCoordinates = fileProcessor
                 .processFileCoordinates(similarImageInterface, uploadableFile.getFilePath());
-        final UploadItem uploadItem = new UploadItem(uploadableFile.getContentUri(),
-                Uri.parse(uploadableFile.getFilePath()),
+        final UploadItem uploadItem = new UploadItem(
+            Uri.parse(uploadableFile.getFilePath()),
                 uploadableFile.getMimeType(context), imageCoordinates, place, fileCreatedDate,
                 createdTimestampSource);
         if (place != null) {
@@ -204,7 +206,6 @@ public class UploadModel {
     @SuppressWarnings("WeakerAccess")
     public static class UploadItem {
 
-        private final Uri originalContentUri;
         private final Uri mediaUri;
         private final String mimeType;
         private ImageCoordinates gpsCoords;
@@ -214,13 +215,12 @@ public class UploadModel {
         private final String createdTimestampSource;
         private final BehaviorSubject<Integer> imageQuality;
         @SuppressLint("CheckResult")
-        UploadItem(final Uri originalContentUri,
-            final Uri mediaUri, final String mimeType,
+        UploadItem(final Uri mediaUri,
+            final String mimeType,
             final ImageCoordinates gpsCoords,
             final Place place,
             final long createdTimestamp,
             final String createdTimestampSource) {
-            this.originalContentUri = originalContentUri;
             this.createdTimestampSource = createdTimestampSource;
             uploadMediaDetails = new ArrayList<>(Arrays.asList(new UploadMediaDetail()));
             this.place = place;
@@ -267,10 +267,6 @@ public class UploadModel {
             this.uploadMediaDetails = uploadMediaDetails;
         }
 
-        public Uri getContentUri() {
-            return originalContentUri;
-        }
-
         @Override
         public boolean equals(@Nullable final Object obj) {
             if (!(obj instanceof UploadItem)) {
@@ -290,15 +286,13 @@ public class UploadModel {
          * Currently, the caption is used as a filename. If several languages have been entered, the first language is used.
          */
         public String getFileName() {
-            return uploadMediaDetails.get(0).getCaptionText();
+            return Utils.fixExtension(uploadMediaDetails.get(0).getCaptionText(),
+                MimeTypeMapWrapper.getExtensionFromMimeType(mimeType));
         }
 
         public void setGpsCoords(final ImageCoordinates gpsCoords) {
             this.gpsCoords = gpsCoords;
         }
 
-        public String getMimeType() {
-            return mimeType;
-        }
     }
 }
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 be2244b76..435e829a8 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
@@ -151,8 +151,8 @@ public class UploadCategoriesFragment extends UploadBaseFragment implements Cate
         DialogUtil.showAlertDialog(getActivity(),
                 getString(R.string.no_categories_selected),
                 getString(R.string.no_categories_selected_warning_desc),
-                getString(R.string.yes_submit),
-                getString(R.string.no_go_back),
+                getString(R.string.continue_message),
+                getString(R.string.cancel),
                 () -> goToNextScreen(),
                 null);
 
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsFragment.java
index 4ac5e7727..7394a7d17 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsFragment.java
@@ -104,8 +104,8 @@ public class DepictsFragment extends UploadBaseFragment implements DepictsContra
         DialogUtil.showAlertDialog(getActivity(),
             getString(R.string.no_depictions_selected),
             getString(R.string.no_depictions_selected_warning_desc),
-            getString(R.string.yes_submit),
-            getString(R.string.no_go_back),
+            getString(R.string.continue_message),
+            getString(R.string.cancel),
             this::goToNextScreen,
             null
         );
diff --git a/app/src/main/res/layout/row_item_description.xml b/app/src/main/res/layout/row_item_description.xml
index e9c8e98b2..ae2e66b19 100644
--- a/app/src/main/res/layout/row_item_description.xml
+++ b/app/src/main/res/layout/row_item_description.xml
@@ -19,6 +19,7 @@
         android:orientation="vertical"
         android:layout_weight="8">
     <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/caption_item_edit_text_input_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         >
@@ -33,6 +34,7 @@
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/description_item_edit_text_input_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         >
@@ -47,4 +49,4 @@
     </com.google.android.material.textfield.TextInputLayout>
 
     </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3582558f5..91cbe2b41 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -460,13 +460,10 @@ Upload your first media by tapping on the add button.</string>
   <string name="desc_language_Pacific">Pacific</string>
 
   <string name="no_categories_selected">No Categories Selected</string>
-  <string name="no_categories_selected_warning_desc">Images without categories are rarely usable. Are you sure you want to submit without selecting categories?</string>
+  <string name="no_categories_selected_warning_desc">Images without categories are rarely usable. Are you sure you want to continue without selecting categories?</string>
 
   <string name="no_depictions_selected">No Depictions Selected</string>
-  <string name="no_depictions_selected_warning_desc">Depictions help when searching for images. Are you sure you want to submit without selecting depictions?</string>
-
-  <string name="yes_submit">Yes, Submit</string>
-  <string name="no_go_back">No, Go Back</string>
+  <string name="no_depictions_selected_warning_desc">Images with depictions are more easily found and more likely to be used. Are you sure you want to continue without selecting depictions?</string>
 
   <string name="upload_flow_all_images_in_set">(For all images in set)</string>
   <string name="search_this_area">Search this area</string>