diff --git a/app/src/googleplay/res/layout/activity_location_picker.xml b/app/src/main/res/layout/activity_location_picker.xml
similarity index 92%
rename from app/src/googleplay/res/layout/activity_location_picker.xml
rename to app/src/main/res/layout/activity_location_picker.xml
index a2528f094..9fce512a1 100644
--- a/app/src/googleplay/res/layout/activity_location_picker.xml
+++ b/app/src/main/res/layout/activity_location_picker.xml
@@ -82,13 +82,11 @@
           android:id="@+id/select_this_location"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:paddingTop="@dimen/keyline_first"
-          android:paddingBottom="@dimen/keyline_first"
           android:background="?attr/selectableItemBackground"
           android:clickable="true"
           android:focusable="true"
           android:orientation="horizontal"
-          app:layout_constraintBottom_toTopOf="@id/choose_recent_location"
+          app:layout_constraintBottom_toBottomOf="parent"
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toBottomOf="@id/map">
 
@@ -100,6 +98,8 @@
             android:layout_marginLeft="@dimen/keyline_first"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
+            android:paddingTop="@dimen/keyline_first"
+            android:paddingBottom="@dimen/keyline_first"
             android:contentDescription="@string/pick_this_location"
             android:src="@drawable/ic_outline_place_24px"
             android:tint="@color/icon_tint"/>
@@ -113,6 +113,8 @@
             android:layout_marginRight="@dimen/keyline_first"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
+            android:paddingTop="@dimen/keyline_first"
+            android:paddingBottom="@dimen/keyline_first"
             android:indeterminate="true"
             android:visibility="gone"/>
 
@@ -125,35 +127,28 @@
             android:layout_toLeftOf="@id/loading_indicator"
             android:layout_toRightOf="@id/place_icon"
             android:layout_toStartOf="@id/loading_indicator"
+            android:paddingTop="@dimen/keyline_first"
+            android:paddingBottom="@dimen/keyline_first"
             android:gravity="start|center_vertical"
             android:text="@string/pick_this_location"
             android:textAlignment="viewStart"
             android:textAppearance="@style/TextAppearance"/>
 
-        </RelativeLayout>
-
-        <LinearLayout
-          android:id="@+id/choose_recent_location"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:paddingTop="8dp"
-          android:paddingBottom="8dp"
-          android:background="@color/window_background"
-          app:layout_constraintBottom_toBottomOf="parent"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toBottomOf="@id/select_this_location">
-
           <TextView
+            android:id="@+id/choose_recent_location"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/keyline_first"
             android:layout_marginLeft="@dimen/keyline_first"
+            android:layout_below="@id/place_icon"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
             android:text="@string/or_choose_a_location"
             android:textAppearance="@style/TextAppearance"
             android:textColor="@color/text_secondary"
             android:textSize="14sp"/>
 
-        </LinearLayout>
+        </RelativeLayout>
 
       </androidx.constraintlayout.widget.ConstraintLayout>