<script language="JavaScript">
<!--
function _AN_global_var_init(){
	_AN_this_url = "/prx/000/";
	_AN_base_scheme = "https";
	_AN_base_host = "https://patch-diff.githubusercontent.com";
	_AN_base_path = "https://patch-diff.githubusercontent.com/raw/commons-app/apps-android-commons/pull/";
	_AN_encode_urls = 0;
	_AN_mpo = 1;
	_AN_md = 0;
	_AN_rel_urls = 0;
	_AN_nav_switch = 0;
	_AN_nav_allowurl = 1;
	_AN_nav_override = 0;
	_AN_has_iframe = 0;
	_AN_dbg_flags = null;
	_AN_nav_use_aaa = 1;
	_AN_expires_pass = 0;
	_AN_wrap_evthandlers = 0;
	_AN_rewrite_param_exact = 0;
	_AN_obj_params = {};
} 
_AN_global_var_init();
//-->
</script>
<script language="JavaScript" src="/prx/001/http/localh/an_util.js"></script>
<script language="JavaScript" src="/prx/001/http/localh/NSLib.js"></script>

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
index a9c25b542b..89d1de6e11 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
@@ -109,9 +109,7 @@ public class UploadActivity extends BaseActivity implements UploadView, SimilarI
     @BindView(R.id.license_subtitle) TextView licenseSubtitle;
     @BindView(R.id.please_wait_text_view) TextView pleaseWaitTextView;
 
-    //Right Card
-    @BindView(R.id.right_card) CardView rightCard;
-    @BindView(R.id.right_card_expand_button) ImageView rightCardExpandButton;
+
     @BindView(R.id.right_card_map_button) View rightCardMapButton;
 
     // Category Search
@@ -325,7 +323,7 @@ public void setBottomCardVisibility(boolean visible) {
 
     @Override
     public void setRightCardVisibility(boolean visible) {
-        rightCard.setVisibility(visible ? View.VISIBLE : View.GONE);
+        rightCardMapButton.setVisibility(visible ? View.VISIBLE : View.GONE);
     }
 
     @Override
@@ -358,12 +356,6 @@ public void setBottomCardState(boolean state) {
         updateCardState(state, bottomCardExpandButton, rvDescriptions, previous, next, bottomCardAddDescription);
     }
 
-    @Override
-    public void setRightCardState(boolean state) {
-        rightCardExpandButton.animate().rotation(rightCardExpandButton.getRotation() + (state ? -180 : 180)).start();
-        //Add all items in rightCard here
-        rightCardMapButton.setVisibility(state ? View.VISIBLE : View.GONE);
-    }
 
     @Override
     public void setBackground(Uri mediaUri) {
@@ -530,7 +522,6 @@ private void addNewDescription() {
     }
 
     private void configureRightCard() {
-        rightCardExpandButton.setOnClickListener(v -> presenter.toggleRightCardState());
         rightCardMapButton.setOnClickListener(v -> presenter.openCoordinateMap());
     }
 
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java
index 7fc20e9210..51b7e32e1b 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java
@@ -266,14 +266,6 @@ void toggleBottomCardState() {
         view.setBottomCardState(uploadModel.isBottomCardState());
     }
 
-    /**
-     * Toggles the right card's state between open and closed.
-     */
-    void toggleRightCardState() {
-        uploadModel.setRightCardState(!uploadModel.isRightCardState());
-        view.setRightCardState(uploadModel.isRightCardState());
-    }
-
     /**
      * Sets all the cards' states to closed.
      */
@@ -284,7 +276,6 @@ void closeAllCards() {
         }
         if (uploadModel.isRightCardState()) {
             uploadModel.setRightCardState(false);
-            view.setRightCardState(false);
         }
         if (uploadModel.isBottomCardState()) {
             uploadModel.setBottomCardState(false);
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java
index a55e322082..dff659474c 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java
@@ -42,8 +42,6 @@ public interface UploadView {
 
     void setBottomCardState(boolean state);
 
-    void setRightCardState(boolean bottomCardState);
-
     void setBackground(Uri mediaUri);
 
     void setTopCardVisibility(boolean visible);
diff --git a/app/src/main/res/layout/activity_upload_bottom_card.xml b/app/src/main/res/layout/activity_upload_bottom_card.xml
index 0a862f102e..f752f9aa26 100644
--- a/app/src/main/res/layout/activity_upload_bottom_card.xml
+++ b/app/src/main/res/layout/activity_upload_bottom_card.xml
@@ -66,50 +66,8 @@
         </RelativeLayout>
     </androidx.cardview.widget.CardView>
 
-    <androidx.cardview.widget.CardView - android:id="@+id/right_card" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginEnd="8dp" - android:layout_marginRight="8dp" - android:layout_marginBottom="8dp" - app:layout_constraintBottom_toTopOf="@+id/bottom_card" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@+id/top_card" - tools:ignore="UnusedAttribute" - tools:showIn="@layout/activity_upload">
 
-        <LinearLayout - android:id="@+id/right_card_content" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:orientation="vertical">
-
-            <ImageButton - android:id="@+id/right_card_expand_button" - style="@style/Widget.AppCompat.Button.Borderless" - android:layout_width="16dp" - android:layout_height="16dp" - android:layout_margin="8dp" - android:rotation="90" - app:srcCompat="@drawable/ic_expand_less_black_24dp" />
-
-            <ImageButton - android:id="@+id/right_card_map_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:layout_marginBottom="8dp" - android:visibility="visible" - app:srcCompat="@drawable/ic_map_white_24dp" />
-
-        </LinearLayout>
-    </androidx.cardview.widget.CardView>
-
-
-    <androidx.cardview.widget.CardView +><androidx.support.v7.widget.CardView android:id="@+id/bottom_card" android:layout_width="match_parent" android:layout_height="wrap_content" @ -149,6 +107,19 @ app:layout_constraintTop_toBottomOf="@id/bottom_card_title" tools:text="1st image" />
 
+            <ImageButton + android:id="@+id/right_card_map_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="8dp" + android:layout_marginEnd="16dp" + android:layout_marginRight="16dp" + android:visibility="visible" + app:layout_constraintEnd_toStartOf="@+id/bottom_card_expand_button" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/ic_map_white_24dp" />
+
             <ImageButton android:id="@+id/bottom_card_expand_button" style="@style/Widget.AppCompat.Button.Borderless" @ -206,7 +177,7 @ app:layout_constraintStart_toStartOf="parent" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.cardview.widget.CardView>
+    </androidx.support.v7.widget.CardView>
 </androidx.constraintlayout.widget.ConstraintLayout>
 
 
