diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
index 0b739e316..44b042436 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
@@ -56,26 +56,26 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment impl
     WikipediaInstructionsDialogFragment.Callback {
 
     private static final String RV_STATE = "rv_scroll_state";
+      
+    @BindView(R.id.contributionsList)
+    RecyclerView rvContributionsList;
+    @BindView(R.id.loadingContributionsProgressBar)
+    ProgressBar progressBar;
+    @BindView(R.id.fab_plus)
+    FloatingActionButton fabPlus;
+    @BindView(R.id.fab_camera)
+    FloatingActionButton fabCamera;
+    @BindView(R.id.fab_gallery)
+    FloatingActionButton fabGallery;
+    @BindView(R.id.noContributionsYet)
+    TextView noContributionsYet;
+    @BindView(R.id.fab_layout)
+    LinearLayout fab_layout;
+    @BindView(R.id.fab_custom_gallery)
+    FloatingActionButton fabCustomGallery;
 
-  @BindView(R.id.contributionsList)
-  RecyclerView rvContributionsList;
-  @BindView(R.id.loadingContributionsProgressBar)
-  ProgressBar progressBar;
-  @BindView(R.id.fab_plus)
-  FloatingActionButton fabPlus;
-  @BindView(R.id.fab_camera)
-  FloatingActionButton fabCamera;
-  @BindView(R.id.fab_gallery)
-  FloatingActionButton fabGallery;
-  @BindView(R.id.noContributionsYet)
-  TextView noContributionsYet;
-  @BindView(R.id.fab_layout)
-  LinearLayout fab_layout;
-  @BindView(R.id.fab_custom_gallery)
-  FloatingActionButton fabCustomGallery;
-
-  @Inject
-  SystemThemeUtils systemThemeUtils;
+    @Inject
+    SystemThemeUtils systemThemeUtils;
 
     @Inject
     ContributionController controller;
diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
index 52f8b7385..ce6585b52 100644
--- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
@@ -102,6 +102,7 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple
         pager.addOnPageChangeListener(this);
 
         adapter = new MediaDetailAdapter(getChildFragmentManager());
+        ((BaseActivity)getActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         if (getActivity() != null) {
             final ActionBar actionBar = ((AppCompatActivity) getActivity()).getSupportActionBar();
diff --git a/app/src/main/res/layout/bottom_container_location_picker.xml b/app/src/main/res/layout/bottom_container_location_picker.xml
index 98a8216c5..2eafaa4b6 100644
--- a/app/src/main/res/layout/bottom_container_location_picker.xml
+++ b/app/src/main/res/layout/bottom_container_location_picker.xml
@@ -77,5 +77,4 @@
 
   </androidx.constraintlayout.widget.ConstraintLayout>
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 6983f6744..d944d2d0b 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -51,6 +51,8 @@
     <attr name="custom_selector_done" format="reference"/>
     <attr name="custom_selector_back" format="reference"/>
     <attr name="caption_description_text_color" format="reference" />
+    <attr name="custom_selector_done" format="reference"/>
+    <attr name="custom_selector_back" format="reference"/>
 
     <declare-styleable name="Badge">
         <attr name="boundary" format="color"/>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4a04fe47d..b594d182d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -640,13 +640,6 @@ Upload your first media by tapping on the add button.</string>
     The shadow of the image view of the location picker</string>
   <string name="image_location">Image Location</string>
   <string name="check_whether_location_is_correct">Check whether location is correct</string>
-  <string name="place_state_wlm">WLM</string>
-  <string name="wlm_upload_info">You are contributing to Wiki Loves Monuments Campaign. Related templates will be added accordingly.</string>
-  <string name="display_monuments">Display monuments</string>
-  <string name="wlm_month_message">It\'s Wiki Loves Monuments month!</string>
-  <string name="learn_more">LEARN MORE</string>
-  <string name="wlm_campaign_title">Wiki Loves Monuments</string>
-  <string name="wlm_campaign_description">Wiki Loves Monuments is an international photo contest for monuments organised by Wikimedia</string>
   <string name="custom_selector_title">Custom Selector</string>
   <string name="custom_selector_empty_text">No Images</string>
   <string name="done">Done</string>
@@ -656,5 +649,11 @@ Upload your first media by tapping on the add button.</string>
   <string name="custom_selector_info_text2">Unlike the picture on the left, the picture on the right has the Commons logo indicating it is already uploaded.</string>
   <string name="welcome_custom_selector_ok">Awesome</string>
   <string name="custom_selector_already_uploaded_image_text">This image has already been uploaded to Commons.</string>
-
+  <string name="place_state_wlm">WLM</string>
+  <string name="wlm_upload_info">You are contributing to Wiki Loves Monuments Campaign. Related templates will be added accordingly.</string>
+  <string name="display_monuments">Display monuments</string>
+  <string name="wlm_month_message">It\'s Wiki Loves Monuments month!</string>
+  <string name="learn_more">LEARN MORE</string>
+  <string name="wlm_campaign_title">Wiki Loves Monuments</string>
+  <string name="wlm_campaign_description">Wiki Loves Monuments is an international photo contest for monuments organised by Wikimedia</string>
 </resources>