diff --git a/MyTracks/res/menu/main.xml b/MyTracks/res/menu/main.xml
index 8ff5a9e71..e2a2dc395 100644
--- a/MyTracks/res/menu/main.xml
+++ b/MyTracks/res/menu/main.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
   <item android:id="@+id/menu_start_recording"
-    android:icon="@drawable/menu_record"
+    android:icon="@drawable/ic_menu_recordtrack"
     android:title="@string/start_recording"/>
 
   <item android:id="@+id/menu_stop_recording"
-    android:icon="@drawable/menu_stop"
+    android:icon="@drawable/ic_menu_stoprecording"
     android:title="@string/stop_recording"/>
 
   <item android:id="@+id/menu_list_tracks"
-    android:icon="@drawable/menu_list_tracks"
+    android:icon="@drawable/ic_menu_tracklist"
     android:title="@string/list_tracks"/>
 
   <item android:id="@+id/menu_list_markers"
-    android:icon="@drawable/menu_marker"
+    android:icon="@drawable/ic_menu_waypoints"
     android:title="@string/list_markers"/>
 
   <item android:id="@+id/menu_settings"
@@ -26,7 +26,7 @@
     android:title="@string/aggregated_stats"/>
 
   <item android:id="@+id/menu_sensor_state"
-    android:icon="@drawable/menu_sensor_status"
+    android:icon="@drawable/ic_menu_sensorstatus"
     android:orderInCategory="1000"
     android:title="@string/sensor_state"/>
     
diff --git a/MyTracks/res/values-de/strings.xml b/MyTracks/res/values-de/strings.xml
index 571094c20..94ba8ecb2 100644
--- a/MyTracks/res/values-de/strings.xml
+++ b/MyTracks/res/values-de/strings.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" encoding="utf-8"?> 
 <!--
 Copyright 2010 Google Inc.
diff --git a/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java
index 9d68c9c27..d185c12db 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java
@@ -269,7 +269,7 @@ public class StatsActivity extends Activity
     super.onCreateOptionsMenu(menu);
     MenuItem currentSegment = menu.add(0,
         MyTracksConstants.MENU_CURRENT_SEGMENT, 0, R.string.current_segment);
-    currentSegment.setIcon(R.drawable.menu_by_distance);
+    currentSegment.setIcon(R.drawable.ic_menu_lastsegment);
     return true;
   }