diff --git a/MyTracks/res/drawable-hdpi/blue_pushpin.png b/MyTracks/res/drawable-hdpi/blue_pushpin.png
new file mode 100755
index 000000000..13f9e72e2
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/blue_pushpin.png differ
diff --git a/MyTracks/res/drawable-hdpi/green_dot.png b/MyTracks/res/drawable-hdpi/green_dot.png
new file mode 100755
index 000000000..dd923d8ac
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/green_dot.png differ
diff --git a/MyTracks/res/drawable-hdpi/menu_play.png b/MyTracks/res/drawable-hdpi/menu_play.png
index df8a2ca28..54b356955 100644
Binary files a/MyTracks/res/drawable-hdpi/menu_play.png and b/MyTracks/res/drawable-hdpi/menu_play.png differ
diff --git a/MyTracks/res/drawable-hdpi/menu_record_track.png b/MyTracks/res/drawable-hdpi/menu_record_track.png
index ad8ada6bd..2af4f09bc 100644
Binary files a/MyTracks/res/drawable-hdpi/menu_record_track.png and b/MyTracks/res/drawable-hdpi/menu_record_track.png differ
diff --git a/MyTracks/res/drawable-hdpi/menu_stop_recording.png b/MyTracks/res/drawable-hdpi/menu_stop_recording.png
index dd5d6a1c1..ae72962d1 100644
Binary files a/MyTracks/res/drawable-hdpi/menu_stop_recording.png and b/MyTracks/res/drawable-hdpi/menu_stop_recording.png differ
diff --git a/MyTracks/res/drawable-hdpi/my_tracks_notification_icon.png b/MyTracks/res/drawable-hdpi/my_tracks_notification_icon.png
new file mode 100755
index 000000000..586aa9f30
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/my_tracks_notification_icon.png differ
diff --git a/MyTracks/res/drawable-hdpi/red_dot.png b/MyTracks/res/drawable-hdpi/red_dot.png
new file mode 100755
index 000000000..6671bd6e3
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/red_dot.png differ
diff --git a/MyTracks/res/drawable-hdpi/tab_chart.png b/MyTracks/res/drawable-hdpi/tab_chart.png
old mode 100644
new mode 100755
index 0f650ee25..0d97d3b11
Binary files a/MyTracks/res/drawable-hdpi/tab_chart.png and b/MyTracks/res/drawable-hdpi/tab_chart.png differ
diff --git a/MyTracks/res/drawable-hdpi/tab_map.png b/MyTracks/res/drawable-hdpi/tab_map.png
index e5907072f..8f59c742a 100644
Binary files a/MyTracks/res/drawable-hdpi/tab_map.png and b/MyTracks/res/drawable-hdpi/tab_map.png differ
diff --git a/MyTracks/res/drawable-hdpi/tab_stats.png b/MyTracks/res/drawable-hdpi/tab_stats.png
index 6b58c2dab..594ad5943 100644
Binary files a/MyTracks/res/drawable-hdpi/tab_stats.png and b/MyTracks/res/drawable-hdpi/tab_stats.png differ
diff --git a/MyTracks/res/drawable-hdpi/track.png b/MyTracks/res/drawable-hdpi/track.png
new file mode 100755
index 000000000..04f681017
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/track.png differ
diff --git a/MyTracks/res/drawable-hdpi/warning.png b/MyTracks/res/drawable-hdpi/warning.png
new file mode 100755
index 000000000..30e3c9a18
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/warning.png differ
diff --git a/MyTracks/res/drawable-hdpi/yellow_pushpin.png b/MyTracks/res/drawable-hdpi/yellow_pushpin.png
new file mode 100755
index 000000000..443f61c9a
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/yellow_pushpin.png differ
diff --git a/MyTracks/res/drawable-mdpi/blue_pushpin.png b/MyTracks/res/drawable-mdpi/blue_pushpin.png
index 6e010b038..b8ed23502 100644
Binary files a/MyTracks/res/drawable-mdpi/blue_pushpin.png and b/MyTracks/res/drawable-mdpi/blue_pushpin.png differ
diff --git a/MyTracks/res/drawable-mdpi/green_dot.png b/MyTracks/res/drawable-mdpi/green_dot.png
index c6e683662..164bc8c0e 100644
Binary files a/MyTracks/res/drawable-mdpi/green_dot.png and b/MyTracks/res/drawable-mdpi/green_dot.png differ
diff --git a/MyTracks/res/drawable-mdpi/menu_play.png b/MyTracks/res/drawable-mdpi/menu_play.png
index 6a40cd5f7..a36cae497 100644
Binary files a/MyTracks/res/drawable-mdpi/menu_play.png and b/MyTracks/res/drawable-mdpi/menu_play.png differ
diff --git a/MyTracks/res/drawable-mdpi/menu_record_track.png b/MyTracks/res/drawable-mdpi/menu_record_track.png
index 4d5d484b3..87730d51d 100644
Binary files a/MyTracks/res/drawable-mdpi/menu_record_track.png and b/MyTracks/res/drawable-mdpi/menu_record_track.png differ
diff --git a/MyTracks/res/drawable-mdpi/menu_stop_recording.png b/MyTracks/res/drawable-mdpi/menu_stop_recording.png
index 20df41586..8998cb8f2 100644
Binary files a/MyTracks/res/drawable-mdpi/menu_stop_recording.png and b/MyTracks/res/drawable-mdpi/menu_stop_recording.png differ
diff --git a/MyTracks/res/drawable-mdpi/my_tracks_notification_icon.png b/MyTracks/res/drawable-mdpi/my_tracks_notification_icon.png
index 4980583b7..c7c300d20 100644
Binary files a/MyTracks/res/drawable-mdpi/my_tracks_notification_icon.png and b/MyTracks/res/drawable-mdpi/my_tracks_notification_icon.png differ
diff --git a/MyTracks/res/drawable-mdpi/red_dot.png b/MyTracks/res/drawable-mdpi/red_dot.png
index b0f3f0e92..e7263a45d 100644
Binary files a/MyTracks/res/drawable-mdpi/red_dot.png and b/MyTracks/res/drawable-mdpi/red_dot.png differ
diff --git a/MyTracks/res/drawable-mdpi/tab_chart.png b/MyTracks/res/drawable-mdpi/tab_chart.png
index d6235554b..86cd8d7ed 100644
Binary files a/MyTracks/res/drawable-mdpi/tab_chart.png and b/MyTracks/res/drawable-mdpi/tab_chart.png differ
diff --git a/MyTracks/res/drawable-mdpi/tab_map.png b/MyTracks/res/drawable-mdpi/tab_map.png
index 21de20114..113e84e75 100644
Binary files a/MyTracks/res/drawable-mdpi/tab_map.png and b/MyTracks/res/drawable-mdpi/tab_map.png differ
diff --git a/MyTracks/res/drawable-mdpi/tab_stats.png b/MyTracks/res/drawable-mdpi/tab_stats.png
index 5b87a5fbf..0ec20e69b 100644
Binary files a/MyTracks/res/drawable-mdpi/tab_stats.png and b/MyTracks/res/drawable-mdpi/tab_stats.png differ
diff --git a/MyTracks/res/drawable-mdpi/track.png b/MyTracks/res/drawable-mdpi/track.png
index 2be66c85b..45c8a1c19 100644
Binary files a/MyTracks/res/drawable-mdpi/track.png and b/MyTracks/res/drawable-mdpi/track.png differ
diff --git a/MyTracks/res/drawable-mdpi/warning.png b/MyTracks/res/drawable-mdpi/warning.png
new file mode 100755
index 000000000..b40291acd
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/warning.png differ
diff --git a/MyTracks/res/drawable-mdpi/yellow_pushpin.png b/MyTracks/res/drawable-mdpi/yellow_pushpin.png
old mode 100644
new mode 100755
index c33c52034..6e301e80d
Binary files a/MyTracks/res/drawable-mdpi/yellow_pushpin.png and b/MyTracks/res/drawable-mdpi/yellow_pushpin.png differ
diff --git a/MyTracks/res/drawable-xhdpi/blue_pushpin.png b/MyTracks/res/drawable-xhdpi/blue_pushpin.png
new file mode 100755
index 000000000..c649a3f15
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/blue_pushpin.png differ
diff --git a/MyTracks/res/drawable-xhdpi/green_dot.png b/MyTracks/res/drawable-xhdpi/green_dot.png
new file mode 100755
index 000000000..9a3a19deb
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/green_dot.png differ
diff --git a/MyTracks/res/drawable-xhdpi/menu_play.png b/MyTracks/res/drawable-xhdpi/menu_play.png
index 51124993d..82704af0a 100644
Binary files a/MyTracks/res/drawable-xhdpi/menu_play.png and b/MyTracks/res/drawable-xhdpi/menu_play.png differ
diff --git a/MyTracks/res/drawable-xhdpi/menu_record_track.png b/MyTracks/res/drawable-xhdpi/menu_record_track.png
index 23b9a1c18..e0cbcbbe4 100644
Binary files a/MyTracks/res/drawable-xhdpi/menu_record_track.png and b/MyTracks/res/drawable-xhdpi/menu_record_track.png differ
diff --git a/MyTracks/res/drawable-xhdpi/menu_stop_recording.png b/MyTracks/res/drawable-xhdpi/menu_stop_recording.png
index ee5eda25c..b2d6fa90a 100644
Binary files a/MyTracks/res/drawable-xhdpi/menu_stop_recording.png and b/MyTracks/res/drawable-xhdpi/menu_stop_recording.png differ
diff --git a/MyTracks/res/drawable-xhdpi/my_tracks_notification_icon.png b/MyTracks/res/drawable-xhdpi/my_tracks_notification_icon.png
new file mode 100755
index 000000000..975602b50
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/my_tracks_notification_icon.png differ
diff --git a/MyTracks/res/drawable-xhdpi/red_dot.png b/MyTracks/res/drawable-xhdpi/red_dot.png
new file mode 100755
index 000000000..12e9c3092
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/red_dot.png differ
diff --git a/MyTracks/res/drawable-xhdpi/tab_chart.png b/MyTracks/res/drawable-xhdpi/tab_chart.png
index 3f93e4f65..acef12a11 100644
Binary files a/MyTracks/res/drawable-xhdpi/tab_chart.png and b/MyTracks/res/drawable-xhdpi/tab_chart.png differ
diff --git a/MyTracks/res/drawable-xhdpi/tab_map.png b/MyTracks/res/drawable-xhdpi/tab_map.png
index f5ce90a33..7455a2338 100644
Binary files a/MyTracks/res/drawable-xhdpi/tab_map.png and b/MyTracks/res/drawable-xhdpi/tab_map.png differ
diff --git a/MyTracks/res/drawable-xhdpi/tab_stats.png b/MyTracks/res/drawable-xhdpi/tab_stats.png
index 4b4355c4d..25df845e5 100644
Binary files a/MyTracks/res/drawable-xhdpi/tab_stats.png and b/MyTracks/res/drawable-xhdpi/tab_stats.png differ
diff --git a/MyTracks/res/drawable-xhdpi/track.png b/MyTracks/res/drawable-xhdpi/track.png
new file mode 100755
index 000000000..ec5147335
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/track.png differ
diff --git a/MyTracks/res/drawable-xhdpi/warning.png b/MyTracks/res/drawable-xhdpi/warning.png
new file mode 100755
index 000000000..a20b85e0a
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/warning.png differ
diff --git a/MyTracks/res/drawable-xhdpi/yellow_pushpin.png b/MyTracks/res/drawable-xhdpi/yellow_pushpin.png
new file mode 100755
index 000000000..9db302f30
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/yellow_pushpin.png differ
diff --git a/MyTracks/res/layout/map.xml b/MyTracks/res/layout/map.xml
index 41d69cecd..2ec207452 100644
--- a/MyTracks/res/layout/map.xml
+++ b/MyTracks/res/layout/map.xml
@@ -28,7 +28,7 @@ limitations under the License.
     android:layout_width="fill_parent" />
   <TextView
     android:background="@color/warning_background"
-    android:drawableLeft="@android:drawable/ic_dialog_alert"
+    android:drawableLeft="@drawable/warning"
     android:gravity="center"
     android:id="@+id/map_message"
     android:layout_alignParentTop="true"
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 9d88c47d1..1fad0ac02 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -498,11 +498,11 @@ limitations under the License.
     Max elevation: %1$d m (%2$d ft)
   </string>
   <string name="description_max_grade"
-    translation_description="Max grade description. \u0025 is the unicode value for the percent
+    translation_description="Max grade description. %% is the escape sequence for the percent
       symbol.
 
       %1$d grade in percentage">
-    Max grade: %1$d \u0025
+    Max grade: %1$d %%
   </string>
   <string name="description_max_speed"
     translation_description="Max speed description.
@@ -519,11 +519,11 @@ limitations under the License.
     Min elevation: %1$d m (%2$d ft)
   </string>
   <string name="description_min_grade"
-    translation_description="Min grade description. \u0025 is the unicode value for the percent
+    translation_description="Min grade description. %% is the escape sequence for the percent
       symbol.
 
       %1$d grade in percentage">
-    Min grade: %1$d \u0025
+    Min grade: %1$d %%
   </string>
   <string name="description_moving_time"
     translation_description="Moving time description.
@@ -2317,11 +2317,12 @@ limitations under the License.
     %1$d min
   </string>
   <string name="value_integer_percent"
-     translation_description="To display a value in percent like 2 %. \u0025 is the unicode value
+     translation_description="To display a value in percent like 2 %. %% is the escape sequence for
+      the percent symbol.
       for the percent symbol.
 
      %1$d: an integer value. E.g., '2'">
-    %1$d \u0025
+    %1$d %%
   </string>
   <string name="value_integer_second"
     translation_description="In a setting picker, the string format to display an integer value in
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartView.java b/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
index bfa518280..2e417ec74 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
@@ -81,7 +81,7 @@ public class ChartView extends View {
   private static final int Y_AXIS_OFFSET = 16;
 
   // Marker pin x position / marker icon width
-  private static final double MARKER_PIN_X_POSITION_PERCENTAGE = (double) 10 / 32;
+  private static final double MARKER_PIN_X_POSITION_PERCENTAGE = 13 / 48.0;
 
   private final ChartValueSeries[] series = new ChartValueSeries[NUM_SERIES];
   private final ArrayList<double[]> chartData = new ArrayList<double[]>();
diff --git a/MyTracksLib/res/drawable-hdpi/my_tracks_icon.png b/MyTracksLib/res/drawable-hdpi/my_tracks_icon.png
new file mode 100755
index 000000000..123e66d97
Binary files /dev/null and b/MyTracksLib/res/drawable-hdpi/my_tracks_icon.png differ
diff --git a/MyTracksLib/res/drawable-mdpi/my_tracks_icon.png b/MyTracksLib/res/drawable-mdpi/my_tracks_icon.png
old mode 100644
new mode 100755
index de9d69802..55330712d
Binary files a/MyTracksLib/res/drawable-mdpi/my_tracks_icon.png and b/MyTracksLib/res/drawable-mdpi/my_tracks_icon.png differ
diff --git a/MyTracksLib/res/drawable-xhdpi/my_tracks_icon.png b/MyTracksLib/res/drawable-xhdpi/my_tracks_icon.png
new file mode 100755
index 000000000..31427f37a
Binary files /dev/null and b/MyTracksLib/res/drawable-xhdpi/my_tracks_icon.png differ