diff --git a/MyTracks/res/drawable-hdpi/warning.png b/MyTracks/res/drawable-hdpi/warning.png
index a20b85e0a..28aa9be2c 100755
Binary files a/MyTracks/res/drawable-hdpi/warning.png and b/MyTracks/res/drawable-hdpi/warning.png differ
diff --git a/MyTracks/res/drawable-ldpi/warning.png b/MyTracks/res/drawable-ldpi/warning.png
index b40291acd..28acb48b3 100755
Binary files a/MyTracks/res/drawable-ldpi/warning.png and b/MyTracks/res/drawable-ldpi/warning.png differ
diff --git a/MyTracks/res/drawable-mdpi/warning.png b/MyTracks/res/drawable-mdpi/warning.png
index 30e3c9a18..c5659d1ff 100755
Binary files a/MyTracks/res/drawable-mdpi/warning.png and b/MyTracks/res/drawable-mdpi/warning.png differ
diff --git a/MyTracks/res/layout/map.xml b/MyTracks/res/layout/map.xml
index 7e05571a6..ee6e67378 100644
--- a/MyTracks/res/layout/map.xml
+++ b/MyTracks/res/layout/map.xml
@@ -25,7 +25,8 @@ limitations under the License.
     android:id="@+id/map_message"
     android:layout_alignParentTop="true"
     android:layout_width="match_parent"
-    android:padding="8dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
     android:textColor="@android:color/primary_text_dark"
     android:visibility="gone"
     style="@style/TextMedium.WithIcon" />
@@ -34,7 +35,7 @@ limitations under the License.
     android:contentDescription="@string/icon_my_location"
     android:id="@+id/map_my_location"
     android:layout_alignParentRight="true"
-    android:layout_below="@id/map_message"
+    android:layout_alignParentTop="true"
     android:layout_height="wrap_content"
     android:layout_marginRight="8dp"
     android:layout_marginTop="8dp"
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 2bc85d746..c2c9fb3f2 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -758,12 +758,12 @@ limitations under the License.
   <string name="gps_wait_for_better_signal"
     translation_description="In the main view, the message on the top indicating My Tracks is
       waiting for a better GPS signal.">
-    Waiting for a better GPS signal. Make sure the sky is visible.
+    Waiting for a better GPS signal.
   </string>
   <string name="gps_wait_for_signal"
     translation_description="In the main view, the message on the top indicating My Tracks is
-      waiting for a better GPS signal.">
-    Waiting for GPS signal. Make sure the sky is visible.
+      waiting for GPS signal.">
+    Waiting for GPS signal.
   </string>
 
   <!-- Help page -->
@@ -846,7 +846,7 @@ limitations under the License.
   </string>
   <string name="help_gps_signal_question"
     translation_description="In the 'Help' page, the question on the GPS signal message.">
-    Why does the application sometimes display &#8220;Waiting for a better GPS signal.&#8221;?
+    Why does the application sometimes display &#8220;Waiting for GPS signal.&#8221;?
   </string>
   <string name="help_location_precision_answer"
     translation_description="In the 'Help' page, the answer on location precision.">