diff --git a/MyTracks/res/drawable-hdpi/menu_aggregated_statistics.png b/MyTracks/res/drawable-hdpi/ic_menu_aggregated_statistics.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/menu_aggregated_statistics.png
rename to MyTracks/res/drawable-hdpi/ic_menu_aggregated_statistics.png
diff --git a/MyTracks/res/drawable-hdpi/menu_delete.png b/MyTracks/res/drawable-hdpi/ic_menu_delete.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/menu_delete.png
rename to MyTracks/res/drawable-hdpi/ic_menu_delete.png
diff --git a/MyTracks/res/drawable-hdpi/menu_edit.png b/MyTracks/res/drawable-hdpi/ic_menu_edit.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/menu_edit.png
rename to MyTracks/res/drawable-hdpi/ic_menu_edit.png
diff --git a/MyTracks/res/drawable-hdpi/menu_export.png b/MyTracks/res/drawable-hdpi/ic_menu_export.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/menu_export.png
rename to MyTracks/res/drawable-hdpi/ic_menu_export.png
diff --git a/MyTracks/res/drawable-hdpi/menu_feedback.png b/MyTracks/res/drawable-hdpi/ic_menu_feedback.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/menu_feedback.png
rename to MyTracks/res/drawable-hdpi/ic_menu_feedback.png
diff --git a/MyTracks/res/drawable-hdpi/menu_help.png b/MyTracks/res/drawable-hdpi/ic_menu_help.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/menu_help.png
rename to MyTracks/res/drawable-hdpi/ic_menu_help.png
diff --git a/MyTracks/res/drawable-hdpi/menu_import.png b/MyTracks/res/drawable-hdpi/ic_menu_import.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/menu_import.png
rename to MyTracks/res/drawable-hdpi/ic_menu_import.png
diff --git a/MyTracks/res/drawable-hdpi/menu_insert_marker.png b/MyTracks/res/drawable-hdpi/ic_menu_insert_marker.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/menu_insert_marker.png
rename to MyTracks/res/drawable-hdpi/ic_menu_insert_marker.png
diff --git a/MyTracks/res/drawable-hdpi/menu_map_layer.png b/MyTracks/res/drawable-hdpi/ic_menu_map_layer.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/menu_map_layer.png
rename to MyTracks/res/drawable-hdpi/ic_menu_map_layer.png
diff --git a/MyTracks/res/drawable-hdpi/menu_markers.png b/MyTracks/res/drawable-hdpi/ic_menu_markers.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/menu_markers.png
rename to MyTracks/res/drawable-hdpi/ic_menu_markers.png
diff --git a/MyTracks/res/drawable-hdpi/menu_play.png b/MyTracks/res/drawable-hdpi/ic_menu_play.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/menu_play.png
rename to MyTracks/res/drawable-hdpi/ic_menu_play.png
diff --git a/MyTracks/res/drawable-hdpi/menu_refresh.png b/MyTracks/res/drawable-hdpi/ic_menu_refresh.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/menu_refresh.png
rename to MyTracks/res/drawable-hdpi/ic_menu_refresh.png
diff --git a/MyTracks/res/drawable-hdpi/menu_search.png b/MyTracks/res/drawable-hdpi/ic_menu_search.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/menu_search.png
rename to MyTracks/res/drawable-hdpi/ic_menu_search.png
diff --git a/MyTracks/res/drawable-hdpi/menu_select_all.png b/MyTracks/res/drawable-hdpi/ic_menu_select_all.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/menu_select_all.png
rename to MyTracks/res/drawable-hdpi/ic_menu_select_all.png
diff --git a/MyTracks/res/drawable-hdpi/menu_sensor_state.png b/MyTracks/res/drawable-hdpi/ic_menu_sensor_state.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/menu_sensor_state.png
rename to MyTracks/res/drawable-hdpi/ic_menu_sensor_state.png
diff --git a/MyTracks/res/drawable-hdpi/menu_settings.png b/MyTracks/res/drawable-hdpi/ic_menu_settings.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/menu_settings.png
rename to MyTracks/res/drawable-hdpi/ic_menu_settings.png
diff --git a/MyTracks/res/drawable-hdpi/menu_share.png b/MyTracks/res/drawable-hdpi/ic_menu_share.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/menu_share.png
rename to MyTracks/res/drawable-hdpi/ic_menu_share.png
diff --git a/MyTracks/res/drawable-hdpi/menu_show_on_map.png b/MyTracks/res/drawable-hdpi/ic_menu_show_on_map.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/menu_show_on_map.png
rename to MyTracks/res/drawable-hdpi/ic_menu_show_on_map.png
diff --git a/MyTracks/res/drawable-hdpi/menu_split_frequency.png b/MyTracks/res/drawable-hdpi/ic_menu_split_frequency.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/menu_split_frequency.png
rename to MyTracks/res/drawable-hdpi/ic_menu_split_frequency.png
diff --git a/MyTracks/res/drawable-hdpi/menu_start_gps.png b/MyTracks/res/drawable-hdpi/ic_menu_start_gps.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/menu_start_gps.png
rename to MyTracks/res/drawable-hdpi/ic_menu_start_gps.png
diff --git a/MyTracks/res/drawable-hdpi/menu_stop_gps.png b/MyTracks/res/drawable-hdpi/ic_menu_stop_gps.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/menu_stop_gps.png
rename to MyTracks/res/drawable-hdpi/ic_menu_stop_gps.png
diff --git a/MyTracks/res/drawable-hdpi/menu_voice_frequency.png b/MyTracks/res/drawable-hdpi/ic_menu_voice_frequency.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/menu_voice_frequency.png
rename to MyTracks/res/drawable-hdpi/ic_menu_voice_frequency.png
diff --git a/MyTracks/res/drawable-mdpi/menu_aggregated_statistics.png b/MyTracks/res/drawable-mdpi/ic_menu_aggregated_statistics.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/menu_aggregated_statistics.png
rename to MyTracks/res/drawable-mdpi/ic_menu_aggregated_statistics.png
diff --git a/MyTracks/res/drawable-mdpi/menu_delete.png b/MyTracks/res/drawable-mdpi/ic_menu_delete.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/menu_delete.png
rename to MyTracks/res/drawable-mdpi/ic_menu_delete.png
diff --git a/MyTracks/res/drawable-mdpi/menu_edit.png b/MyTracks/res/drawable-mdpi/ic_menu_edit.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/menu_edit.png
rename to MyTracks/res/drawable-mdpi/ic_menu_edit.png
diff --git a/MyTracks/res/drawable-mdpi/menu_export.png b/MyTracks/res/drawable-mdpi/ic_menu_export.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/menu_export.png
rename to MyTracks/res/drawable-mdpi/ic_menu_export.png
diff --git a/MyTracks/res/drawable-mdpi/menu_feedback.png b/MyTracks/res/drawable-mdpi/ic_menu_feedback.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/menu_feedback.png
rename to MyTracks/res/drawable-mdpi/ic_menu_feedback.png
diff --git a/MyTracks/res/drawable-mdpi/menu_help.png b/MyTracks/res/drawable-mdpi/ic_menu_help.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/menu_help.png
rename to MyTracks/res/drawable-mdpi/ic_menu_help.png
diff --git a/MyTracks/res/drawable-mdpi/menu_import.png b/MyTracks/res/drawable-mdpi/ic_menu_import.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/menu_import.png
rename to MyTracks/res/drawable-mdpi/ic_menu_import.png
diff --git a/MyTracks/res/drawable-mdpi/menu_insert_marker.png b/MyTracks/res/drawable-mdpi/ic_menu_insert_marker.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/menu_insert_marker.png
rename to MyTracks/res/drawable-mdpi/ic_menu_insert_marker.png
diff --git a/MyTracks/res/drawable-mdpi/menu_map_layer.png b/MyTracks/res/drawable-mdpi/ic_menu_map_layer.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/menu_map_layer.png
rename to MyTracks/res/drawable-mdpi/ic_menu_map_layer.png
diff --git a/MyTracks/res/drawable-mdpi/menu_markers.png b/MyTracks/res/drawable-mdpi/ic_menu_markers.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/menu_markers.png
rename to MyTracks/res/drawable-mdpi/ic_menu_markers.png
diff --git a/MyTracks/res/drawable-mdpi/menu_play.png b/MyTracks/res/drawable-mdpi/ic_menu_play.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/menu_play.png
rename to MyTracks/res/drawable-mdpi/ic_menu_play.png
diff --git a/MyTracks/res/drawable-mdpi/menu_refresh.png b/MyTracks/res/drawable-mdpi/ic_menu_refresh.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/menu_refresh.png
rename to MyTracks/res/drawable-mdpi/ic_menu_refresh.png
diff --git a/MyTracks/res/drawable-mdpi/menu_search.png b/MyTracks/res/drawable-mdpi/ic_menu_search.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/menu_search.png
rename to MyTracks/res/drawable-mdpi/ic_menu_search.png
diff --git a/MyTracks/res/drawable-mdpi/menu_select_all.png b/MyTracks/res/drawable-mdpi/ic_menu_select_all.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/menu_select_all.png
rename to MyTracks/res/drawable-mdpi/ic_menu_select_all.png
diff --git a/MyTracks/res/drawable-mdpi/menu_sensor_state.png b/MyTracks/res/drawable-mdpi/ic_menu_sensor_state.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/menu_sensor_state.png
rename to MyTracks/res/drawable-mdpi/ic_menu_sensor_state.png
diff --git a/MyTracks/res/drawable-mdpi/menu_settings.png b/MyTracks/res/drawable-mdpi/ic_menu_settings.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/menu_settings.png
rename to MyTracks/res/drawable-mdpi/ic_menu_settings.png
diff --git a/MyTracks/res/drawable-mdpi/menu_share.png b/MyTracks/res/drawable-mdpi/ic_menu_share.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/menu_share.png
rename to MyTracks/res/drawable-mdpi/ic_menu_share.png
diff --git a/MyTracks/res/drawable-mdpi/menu_show_on_map.png b/MyTracks/res/drawable-mdpi/ic_menu_show_on_map.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/menu_show_on_map.png
rename to MyTracks/res/drawable-mdpi/ic_menu_show_on_map.png
diff --git a/MyTracks/res/drawable-mdpi/menu_split_frequency.png b/MyTracks/res/drawable-mdpi/ic_menu_split_frequency.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/menu_split_frequency.png
rename to MyTracks/res/drawable-mdpi/ic_menu_split_frequency.png
diff --git a/MyTracks/res/drawable-mdpi/menu_start_gps.png b/MyTracks/res/drawable-mdpi/ic_menu_start_gps.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/menu_start_gps.png
rename to MyTracks/res/drawable-mdpi/ic_menu_start_gps.png
diff --git a/MyTracks/res/drawable-mdpi/menu_stop_gps.png b/MyTracks/res/drawable-mdpi/ic_menu_stop_gps.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/menu_stop_gps.png
rename to MyTracks/res/drawable-mdpi/ic_menu_stop_gps.png
diff --git a/MyTracks/res/drawable-mdpi/menu_voice_frequency.png b/MyTracks/res/drawable-mdpi/ic_menu_voice_frequency.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/menu_voice_frequency.png
rename to MyTracks/res/drawable-mdpi/ic_menu_voice_frequency.png
diff --git a/MyTracks/res/drawable-xhdpi/menu_aggregated_statistics.png b/MyTracks/res/drawable-xhdpi/ic_menu_aggregated_statistics.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/menu_aggregated_statistics.png
rename to MyTracks/res/drawable-xhdpi/ic_menu_aggregated_statistics.png
diff --git a/MyTracks/res/drawable-xhdpi/menu_delete.png b/MyTracks/res/drawable-xhdpi/ic_menu_delete.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/menu_delete.png
rename to MyTracks/res/drawable-xhdpi/ic_menu_delete.png
diff --git a/MyTracks/res/drawable-xhdpi/menu_edit.png b/MyTracks/res/drawable-xhdpi/ic_menu_edit.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/menu_edit.png
rename to MyTracks/res/drawable-xhdpi/ic_menu_edit.png
diff --git a/MyTracks/res/drawable-xhdpi/menu_export.png b/MyTracks/res/drawable-xhdpi/ic_menu_export.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/menu_export.png
rename to MyTracks/res/drawable-xhdpi/ic_menu_export.png
diff --git a/MyTracks/res/drawable-xhdpi/menu_feedback.png b/MyTracks/res/drawable-xhdpi/ic_menu_feedback.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/menu_feedback.png
rename to MyTracks/res/drawable-xhdpi/ic_menu_feedback.png
diff --git a/MyTracks/res/drawable-xhdpi/menu_help.png b/MyTracks/res/drawable-xhdpi/ic_menu_help.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/menu_help.png
rename to MyTracks/res/drawable-xhdpi/ic_menu_help.png
diff --git a/MyTracks/res/drawable-xhdpi/menu_import.png b/MyTracks/res/drawable-xhdpi/ic_menu_import.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/menu_import.png
rename to MyTracks/res/drawable-xhdpi/ic_menu_import.png
diff --git a/MyTracks/res/drawable-xhdpi/menu_insert_marker.png b/MyTracks/res/drawable-xhdpi/ic_menu_insert_marker.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/menu_insert_marker.png
rename to MyTracks/res/drawable-xhdpi/ic_menu_insert_marker.png
diff --git a/MyTracks/res/drawable-xhdpi/menu_map_layer.png b/MyTracks/res/drawable-xhdpi/ic_menu_map_layer.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/menu_map_layer.png
rename to MyTracks/res/drawable-xhdpi/ic_menu_map_layer.png
diff --git a/MyTracks/res/drawable-xhdpi/menu_markers.png b/MyTracks/res/drawable-xhdpi/ic_menu_markers.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/menu_markers.png
rename to MyTracks/res/drawable-xhdpi/ic_menu_markers.png
diff --git a/MyTracks/res/drawable-xhdpi/menu_play.png b/MyTracks/res/drawable-xhdpi/ic_menu_play.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/menu_play.png
rename to MyTracks/res/drawable-xhdpi/ic_menu_play.png
diff --git a/MyTracks/res/drawable-xhdpi/menu_refresh.png b/MyTracks/res/drawable-xhdpi/ic_menu_refresh.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/menu_refresh.png
rename to MyTracks/res/drawable-xhdpi/ic_menu_refresh.png
diff --git a/MyTracks/res/drawable-xhdpi/menu_search.png b/MyTracks/res/drawable-xhdpi/ic_menu_search.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/menu_search.png
rename to MyTracks/res/drawable-xhdpi/ic_menu_search.png
diff --git a/MyTracks/res/drawable-xhdpi/menu_select_all.png b/MyTracks/res/drawable-xhdpi/ic_menu_select_all.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/menu_select_all.png
rename to MyTracks/res/drawable-xhdpi/ic_menu_select_all.png
diff --git a/MyTracks/res/drawable-xhdpi/menu_sensor_state.png b/MyTracks/res/drawable-xhdpi/ic_menu_sensor_state.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/menu_sensor_state.png
rename to MyTracks/res/drawable-xhdpi/ic_menu_sensor_state.png
diff --git a/MyTracks/res/drawable-xhdpi/menu_settings.png b/MyTracks/res/drawable-xhdpi/ic_menu_settings.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/menu_settings.png
rename to MyTracks/res/drawable-xhdpi/ic_menu_settings.png
diff --git a/MyTracks/res/drawable-xhdpi/menu_share.png b/MyTracks/res/drawable-xhdpi/ic_menu_share.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/menu_share.png
rename to MyTracks/res/drawable-xhdpi/ic_menu_share.png
diff --git a/MyTracks/res/drawable-xhdpi/menu_show_on_map.png b/MyTracks/res/drawable-xhdpi/ic_menu_show_on_map.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/menu_show_on_map.png
rename to MyTracks/res/drawable-xhdpi/ic_menu_show_on_map.png
diff --git a/MyTracks/res/drawable-xhdpi/menu_split_frequency.png b/MyTracks/res/drawable-xhdpi/ic_menu_split_frequency.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/menu_split_frequency.png
rename to MyTracks/res/drawable-xhdpi/ic_menu_split_frequency.png
diff --git a/MyTracks/res/drawable-xhdpi/menu_start_gps.png b/MyTracks/res/drawable-xhdpi/ic_menu_start_gps.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/menu_start_gps.png
rename to MyTracks/res/drawable-xhdpi/ic_menu_start_gps.png
diff --git a/MyTracks/res/drawable-xhdpi/menu_stop_gps.png b/MyTracks/res/drawable-xhdpi/ic_menu_stop_gps.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/menu_stop_gps.png
rename to MyTracks/res/drawable-xhdpi/ic_menu_stop_gps.png
diff --git a/MyTracks/res/drawable-xhdpi/menu_voice_frequency.png b/MyTracks/res/drawable-xhdpi/ic_menu_voice_frequency.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/menu_voice_frequency.png
rename to MyTracks/res/drawable-xhdpi/ic_menu_voice_frequency.png
diff --git a/MyTracks/res/menu/list_context_menu.xml b/MyTracks/res/menu/list_context_menu.xml
index 540c944b3..8f66735f1 100644
--- a/MyTracks/res/menu/list_context_menu.xml
+++ b/MyTracks/res/menu/list_context_menu.xml
@@ -16,32 +16,32 @@ limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
   <item
-    android:icon="@drawable/menu_play"
+    android:icon="@drawable/ic_menu_play"
     android:id="@+id/list_context_menu_play"
     android:showAsAction="ifRoom"
     android:title="@string/menu_play"/>
   <item
-    android:icon="@drawable/menu_share"
+    android:icon="@drawable/ic_menu_share"
     android:id="@+id/list_context_menu_share"
     android:showAsAction="ifRoom"
     android:title="@string/menu_share"/>
   <item
-    android:icon="@drawable/menu_show_on_map"
+    android:icon="@drawable/ic_menu_show_on_map"
     android:id="@+id/list_context_menu_show_on_map"
     android:showAsAction="ifRoom"
     android:title="@string/menu_show_on_map"/>
   <item
-    android:icon="@drawable/menu_edit"
+    android:icon="@drawable/ic_menu_edit"
     android:id="@+id/list_context_menu_edit"
     android:showAsAction="ifRoom"
     android:title="@string/menu_edit"/>
   <item
-    android:icon="@drawable/menu_delete"
+    android:icon="@drawable/ic_menu_delete"
     android:id="@+id/list_context_menu_delete"
     android:showAsAction="ifRoom"
     android:title="@string/menu_delete"/>
   <item
-    android:icon="@drawable/menu_select_all"
+    android:icon="@drawable/ic_menu_select_all"
     android:id="@+id/list_context_menu_select_all"
     android:showAsAction="ifRoom"
     android:title="@string/menu_select_all"/>
diff --git a/MyTracks/res/menu/map.xml b/MyTracks/res/menu/map.xml
index 0ee97b8e2..a607f71ba 100644
--- a/MyTracks/res/menu/map.xml
+++ b/MyTracks/res/menu/map.xml
@@ -16,7 +16,7 @@ limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
   <item
-    android:icon="@drawable/menu_map_layer"
+    android:icon="@drawable/ic_menu_map_layer"
     android:orderInCategory="5"
     android:showAsAction="ifRoom"
     android:title="@string/menu_map_layer">
diff --git a/MyTracks/res/menu/marker_detail.xml b/MyTracks/res/menu/marker_detail.xml
index f032ce666..0f44aa7de 100644
--- a/MyTracks/res/menu/marker_detail.xml
+++ b/MyTracks/res/menu/marker_detail.xml
@@ -16,17 +16,17 @@ limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
   <item
-    android:icon="@drawable/menu_show_on_map"
+    android:icon="@drawable/ic_menu_show_on_map"
     android:id="@+id/marker_detail_show_on_map"
     android:showAsAction="ifRoom"
     android:title="@string/menu_show_on_map"/>
   <item
-    android:icon="@drawable/menu_edit"
+    android:icon="@drawable/ic_menu_edit"
     android:id="@+id/marker_detail_edit"
     android:showAsAction="ifRoom"
     android:title="@string/menu_edit"/>
   <item
-    android:icon="@drawable/menu_delete"
+    android:icon="@drawable/ic_menu_delete"
     android:id="@+id/marker_detail_delete"
     android:showAsAction="ifRoom"
     android:title="@string/menu_delete"/>
diff --git a/MyTracks/res/menu/marker_list.xml b/MyTracks/res/menu/marker_list.xml
index 4e36b6c0e..2ed2df87a 100644
--- a/MyTracks/res/menu/marker_list.xml
+++ b/MyTracks/res/menu/marker_list.xml
@@ -16,13 +16,13 @@ limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
   <item
-    android:icon="@drawable/menu_insert_marker"
+    android:icon="@drawable/ic_menu_insert_marker"
     android:id="@+id/marker_list_insert_marker"
     android:showAsAction="ifRoom"
     android:title="@string/menu_insert_marker"/>
   <item
     android:actionViewClass="android.widget.SearchView"
-    android:icon="@drawable/menu_search"
+    android:icon="@drawable/ic_menu_search"
     android:id="@+id/marker_list_search"
     android:showAsAction="ifRoom|collapseActionView"
     android:title="@string/menu_search"/>
diff --git a/MyTracks/res/menu/search_list.xml b/MyTracks/res/menu/search_list.xml
index c04675a8c..04107f5d6 100644
--- a/MyTracks/res/menu/search_list.xml
+++ b/MyTracks/res/menu/search_list.xml
@@ -17,7 +17,7 @@ limitations under the License.
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
   <item
     android:actionViewClass="android.widget.SearchView"
-    android:icon="@drawable/menu_search"
+    android:icon="@drawable/ic_menu_search"
     android:id="@+id/search_list_search"
     android:showAsAction="ifRoom|collapseActionView"
     android:title="@string/menu_search"/>
diff --git a/MyTracks/res/menu/track_detail.xml b/MyTracks/res/menu/track_detail.xml
index 6af3ec1d7..8e0d2a51f 100644
--- a/MyTracks/res/menu/track_detail.xml
+++ b/MyTracks/res/menu/track_detail.xml
@@ -16,73 +16,72 @@ limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
   <item
-    android:icon="@drawable/menu_insert_marker"
+    android:icon="@drawable/ic_menu_insert_marker"
     android:id="@+id/track_detail_insert_marker"
     android:orderInCategory="1"
     android:showAsAction="ifRoom"
     android:title="@string/menu_insert_marker"/>
   <item
-    android:icon="@drawable/menu_play"
+    android:icon="@drawable/ic_menu_play"
     android:id="@+id/track_detail_play"
     android:orderInCategory="2"
     android:showAsAction="ifRoom"
     android:title="@string/menu_play"/>
   <item
-    android:icon="@drawable/menu_share"
+    android:icon="@drawable/ic_menu_share"
     android:id="@+id/track_detail_share"
     android:orderInCategory="3"
     android:showAsAction="ifRoom"
-    android:title="@string/menu_share">
-  </item>
+    android:title="@string/menu_share"/>
   <item
-    android:icon="@drawable/menu_markers"
+    android:icon="@drawable/ic_menu_markers"
     android:id="@+id/track_detail_markers"
     android:orderInCategory="4"
     android:showAsAction="ifRoom"
     android:title="@string/menu_markers"/>
   <!-- android:orderInCategory="5" is in map.xml -->
   <item
-    android:icon="@drawable/menu_export"
+    android:icon="@drawable/ic_menu_export"
     android:id="@+id/track_detail_export"
     android:orderInCategory="6"
     android:title="@string/menu_export"/>
   <item
-    android:icon="@drawable/menu_edit"
+    android:icon="@drawable/ic_menu_edit"
     android:id="@+id/track_detail_edit"
     android:orderInCategory="7"
     android:title="@string/menu_edit"/>
   <item
-    android:icon="@drawable/menu_delete"
+    android:icon="@drawable/ic_menu_delete"
     android:id="@+id/track_detail_delete"
     android:orderInCategory="8"
     android:title="@string/menu_delete"/>
   <item
-    android:icon="@drawable/menu_voice_frequency"
+    android:icon="@drawable/ic_menu_voice_frequency"
     android:id="@+id/track_detail_voice_frequency"
     android:orderInCategory="9"
     android:title="@string/menu_voice_frequency"/>
   <item
-    android:icon="@drawable/menu_split_frequency"
+    android:icon="@drawable/ic_menu_split_frequency"
     android:id="@+id/track_detail_split_frequency"
     android:orderInCategory="10"
     android:title="@string/menu_split_frequency"/>
   <item
-    android:icon="@drawable/menu_sensor_state"
+    android:icon="@drawable/ic_menu_sensor_state"
     android:id="@+id/track_detail_sensor_state"
     android:orderInCategory="11"
     android:title="@string/menu_sensor_state"/>
   <item
-    android:icon="@drawable/menu_settings"
+    android:icon="@drawable/ic_menu_settings"
     android:id="@+id/track_detail_settings"
     android:orderInCategory="12"
     android:title="@string/menu_settings"/>
   <item
-    android:icon="@drawable/menu_feedback"
+    android:icon="@drawable/ic_menu_feedback"
     android:id="@+id/track_detail_feedback"
     android:orderInCategory="13"
     android:title="@string/menu_feedback"/>
   <item
-    android:icon="@drawable/menu_help"
+    android:icon="@drawable/ic_menu_help"
     android:id="@+id/track_detail_help"
     android:orderInCategory="14"
     android:title="@string/menu_help"/>
diff --git a/MyTracks/res/menu/track_list.xml b/MyTracks/res/menu/track_list.xml
index b8f1ee2c4..b3f3938ce 100644
--- a/MyTracks/res/menu/track_list.xml
+++ b/MyTracks/res/menu/track_list.xml
@@ -17,47 +17,45 @@ limitations under the License.
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
   <item
     android:actionViewClass="android.widget.SearchView"
-    android:icon="@drawable/menu_search"
+    android:icon="@drawable/ic_menu_search"
     android:id="@+id/track_list_search"
     android:showAsAction="ifRoom|collapseActionView"
     android:title="@string/menu_search"/>
   <item
-    android:icon="@drawable/menu_start_gps"
+    android:icon="@drawable/ic_menu_start_gps"
     android:id="@+id/track_list_start_gps"
     android:showAsAction="ifRoom"
     android:title="@string/menu_start_gps"/>
   <item
-    android:icon="@drawable/menu_refresh"
+    android:icon="@drawable/ic_menu_refresh"
     android:id="@+id/track_list_refresh"
     android:title="@string/menu_refresh"/>
   <item
-    android:icon="@drawable/menu_aggregated_statistics"
+    android:icon="@drawable/ic_menu_aggregated_statistics"
     android:id="@+id/track_list_aggregated_statistics"
     android:title="@string/menu_aggregated_statistics"/>
   <item
-    android:icon="@drawable/menu_export"
+    android:icon="@drawable/ic_menu_export"
     android:id="@+id/track_list_export_all"
-    android:title="@string/menu_export_all">
-  </item>
+    android:title="@string/menu_export_all"/>
   <item
-    android:icon="@drawable/menu_import"
+    android:icon="@drawable/ic_menu_import"
     android:id="@+id/track_list_import_all"
-    android:title="@string/menu_import_all">
-  </item>
+    android:title="@string/menu_import_all"/>
   <item
-    android:icon="@drawable/menu_delete"
+    android:icon="@drawable/ic_menu_delete"
     android:id="@+id/track_list_delete_all"
     android:title="@string/menu_delete_all"/>
   <item
-    android:icon="@drawable/menu_settings"
+    android:icon="@drawable/ic_menu_settings"
     android:id="@+id/track_list_settings"
     android:title="@string/menu_settings"/>
   <item
-    android:icon="@drawable/menu_feedback"
+    android:icon="@drawable/ic_menu_feedback"
     android:id="@+id/track_list_feedback"
     android:title="@string/menu_feedback"/>
   <item
-    android:icon="@drawable/menu_help"
+    android:icon="@drawable/ic_menu_help"
     android:id="@+id/track_list_help"
     android:title="@string/menu_help"/>
 </menu>
\ No newline at end of file
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
index 26104ceab..29d146a98 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
@@ -728,7 +728,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
       if (!isRecording) {
         startGpsMenuItem.setTitle(isGpsStarted ? R.string.menu_stop_gps : R.string.menu_start_gps);
         startGpsMenuItem.setIcon(
-            isGpsStarted ? R.drawable.menu_stop_gps : R.drawable.menu_start_gps);
+            isGpsStarted ? R.drawable.ic_menu_stop_gps : R.drawable.ic_menu_start_gps);
       }
     }
     if (refreshMenuItem != null) {