diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index e55d52d36c..cda84c19a9 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -63,8 +63,8 @@
             android:orientation="vertical"
             android:paddingBottom="@dimen/padding_extra_large"
             android:paddingStart="@dimen/padding_extra_large"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent">
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintBottom_toBottomOf="@id/backgroundImage">
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_welcome.xml b/app/src/main/res/layout/fragment_welcome.xml
index 58c0f76635..bb7ec7e278 100644
--- a/app/src/main/res/layout/fragment_welcome.xml
+++ b/app/src/main/res/layout/fragment_welcome.xml
@@ -49,7 +49,7 @@
     <ImageView
         android:layout_width="@dimen/avatar_medium"
         android:layout_height="@dimen/avatar_medium"
-        android:layout_above="@+id/pickCityButton"
+        android:layout_above="@+id/currentLocation"
         android:layout_below="@id/textLinearLayout"
         android:layout_centerHorizontal="true"
         app:srcCompat="@drawable/ic_location_world"
@@ -68,8 +68,8 @@
             android:layout_width="@dimen/item_image_view_medium"
             android:layout_height="@dimen/item_image_view_medium"
             android:layout_margin="@dimen/layout_margin_medium"
-            android:tint="@color/colorPrimary"
-            app:srcCompat="@drawable/ic_location_pin"/>
+            app:srcCompat="@drawable/ic_location_pin"
+            app:tint="@color/colorPrimary" />
 
         <TextView
             android:layout_width="wrap_content"