diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index 3e983284b..253ad2c65 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -138,7 +138,7 @@ limitations under the License.
     android:allowBackup="true"
     android:backupAgent="com.google.android.apps.mytracks.io.backup.MyTracksBackupAgent"
     android:hardwareAccelerated="true"
-    android:icon="@drawable/my_tracks_icon"
+    android:icon="@drawable/ic_launcher_my_tracks"
     android:label="@string/my_tracks_app_name"
     android:theme="@style/MyTracks" >
     <!-- For data backup -->
@@ -252,7 +252,7 @@ limitations under the License.
     <service
       android:enabled="true"
       android:exported="true"
-      android:icon="@drawable/arrow_320"
+      android:icon="@drawable/ic_arrow_320"
       android:label="@string/my_tracks_recording_service"
       android:name="com.google.android.apps.mytracks.services.TrackRecordingService"
       android:permission="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
diff --git a/MyTracks/res/drawable-hdpi-v11/my_tracks_notification_icon.png b/MyTracks/res/drawable-hdpi-v11/ic_stat_notify_recording.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi-v11/my_tracks_notification_icon.png
rename to MyTracks/res/drawable-hdpi-v11/ic_stat_notify_recording.png
diff --git a/MyTracks/res/drawable-hdpi/arrow_180.png b/MyTracks/res/drawable-hdpi/ic_arrow_180.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/arrow_180.png
rename to MyTracks/res/drawable-hdpi/ic_arrow_180.png
diff --git a/MyTracks/res/drawable-hdpi/arrow_320.png b/MyTracks/res/drawable-hdpi/ic_arrow_320.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/arrow_320.png
rename to MyTracks/res/drawable-hdpi/ic_arrow_320.png
diff --git a/MyTracks/res/drawable-hdpi/btn_pause.png b/MyTracks/res/drawable-hdpi/ic_button_pause.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/btn_pause.png
rename to MyTracks/res/drawable-hdpi/ic_button_pause.png
diff --git a/MyTracks/res/drawable-hdpi/btn_pause_pressed.png b/MyTracks/res/drawable-hdpi/ic_button_pause_pressed.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/btn_pause_pressed.png
rename to MyTracks/res/drawable-hdpi/ic_button_pause_pressed.png
diff --git a/MyTracks/res/drawable-hdpi/btn_record.png b/MyTracks/res/drawable-hdpi/ic_button_record.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/btn_record.png
rename to MyTracks/res/drawable-hdpi/ic_button_record.png
diff --git a/MyTracks/res/drawable-hdpi/btn_record_pressed.png b/MyTracks/res/drawable-hdpi/ic_button_record_pressed.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/btn_record_pressed.png
rename to MyTracks/res/drawable-hdpi/ic_button_record_pressed.png
diff --git a/MyTracks/res/drawable-hdpi/btn_stop_1.png b/MyTracks/res/drawable-hdpi/ic_button_stop.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/btn_stop_1.png
rename to MyTracks/res/drawable-hdpi/ic_button_stop.png
diff --git a/MyTracks/res/drawable-hdpi/btn_stop_0.png b/MyTracks/res/drawable-hdpi/ic_button_stop_disabled.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/btn_stop_0.png
rename to MyTracks/res/drawable-hdpi/ic_button_stop_disabled.png
diff --git a/MyTracks/res/drawable-hdpi/btn_stop_1_pressed.png b/MyTracks/res/drawable-hdpi/ic_button_stop_pressed.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/btn_stop_1_pressed.png
rename to MyTracks/res/drawable-hdpi/ic_button_stop_pressed.png
diff --git a/MyTracks/res/drawable-hdpi/ic_dialog_success.png b/MyTracks/res/drawable-hdpi/ic_dialog_success.png
new file mode 100644
index 000000000..b8c44dc7f
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/ic_dialog_success.png differ
diff --git a/MyTracks/res/drawable-hdpi/blue_pushpin.png b/MyTracks/res/drawable-hdpi/ic_marker_blue_pushpin.png
old mode 100755
new mode 100644
similarity index 100%
rename from MyTracks/res/drawable-hdpi/blue_pushpin.png
rename to MyTracks/res/drawable-hdpi/ic_marker_blue_pushpin.png
diff --git a/MyTracks/res/drawable-hdpi/green_dot.png b/MyTracks/res/drawable-hdpi/ic_marker_green_paddle.png
old mode 100755
new mode 100644
similarity index 100%
rename from MyTracks/res/drawable-hdpi/green_dot.png
rename to MyTracks/res/drawable-hdpi/ic_marker_green_paddle.png
diff --git a/MyTracks/res/drawable-hdpi/red_dot.png b/MyTracks/res/drawable-hdpi/ic_marker_red_paddle.png
old mode 100755
new mode 100644
similarity index 100%
rename from MyTracks/res/drawable-hdpi/red_dot.png
rename to MyTracks/res/drawable-hdpi/ic_marker_red_paddle.png
diff --git a/MyTracks/res/drawable-hdpi/yellow_pushpin.png b/MyTracks/res/drawable-hdpi/ic_marker_yellow_pushpin.png
old mode 100755
new mode 100644
similarity index 100%
rename from MyTracks/res/drawable-hdpi/yellow_pushpin.png
rename to MyTracks/res/drawable-hdpi/ic_marker_yellow_pushpin.png
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-hdpi/my_location_normal.png b/MyTracks/res/drawable-hdpi/ic_my_location.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/my_location_normal.png
rename to MyTracks/res/drawable-hdpi/ic_my_location.png
diff --git a/MyTracks/res/drawable-hdpi/my_location_pressed.png b/MyTracks/res/drawable-hdpi/ic_my_location_pressed.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/my_location_pressed.png
rename to MyTracks/res/drawable-hdpi/ic_my_location_pressed.png
diff --git a/MyTracks/res/drawable-hdpi/my_tracks_notification_icon.png b/MyTracks/res/drawable-hdpi/ic_stat_notify_recording.png
old mode 100755
new mode 100644
similarity index 100%
rename from MyTracks/res/drawable-hdpi/my_tracks_notification_icon.png
rename to MyTracks/res/drawable-hdpi/ic_stat_notify_recording.png
diff --git a/MyTracks/res/drawable-hdpi/tab_chart.png b/MyTracks/res/drawable-hdpi/ic_tab_chart.png
old mode 100755
new mode 100644
similarity index 100%
rename from MyTracks/res/drawable-hdpi/tab_chart.png
rename to MyTracks/res/drawable-hdpi/ic_tab_chart.png
diff --git a/MyTracks/res/drawable-hdpi/tab_map.png b/MyTracks/res/drawable-hdpi/ic_tab_map.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/tab_map.png
rename to MyTracks/res/drawable-hdpi/ic_tab_map.png
diff --git a/MyTracks/res/drawable-hdpi/tab_stats.png b/MyTracks/res/drawable-hdpi/ic_tab_stats.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/tab_stats.png
rename to MyTracks/res/drawable-hdpi/ic_tab_stats.png
diff --git a/MyTracks/res/drawable-hdpi/track_airplane.png b/MyTracks/res/drawable-hdpi/ic_track_airplane.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/track_airplane.png
rename to MyTracks/res/drawable-hdpi/ic_track_airplane.png
diff --git a/MyTracks/res/drawable-hdpi/track_bike.png b/MyTracks/res/drawable-hdpi/ic_track_bike.png
old mode 100755
new mode 100644
similarity index 100%
rename from MyTracks/res/drawable-hdpi/track_bike.png
rename to MyTracks/res/drawable-hdpi/ic_track_bike.png
diff --git a/MyTracks/res/drawable-hdpi/track_boat.png b/MyTracks/res/drawable-hdpi/ic_track_boat.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/track_boat.png
rename to MyTracks/res/drawable-hdpi/ic_track_boat.png
diff --git a/MyTracks/res/drawable-hdpi/track_drive.png b/MyTracks/res/drawable-hdpi/ic_track_drive.png
old mode 100755
new mode 100644
similarity index 100%
rename from MyTracks/res/drawable-hdpi/track_drive.png
rename to MyTracks/res/drawable-hdpi/ic_track_drive.png
diff --git a/MyTracks/res/drawable-hdpi/track_paused.png b/MyTracks/res/drawable-hdpi/ic_track_paused.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/track_paused.png
rename to MyTracks/res/drawable-hdpi/ic_track_paused.png
diff --git a/MyTracks/res/drawable-hdpi/track_recording.png b/MyTracks/res/drawable-hdpi/ic_track_recording.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/track_recording.png
rename to MyTracks/res/drawable-hdpi/ic_track_recording.png
diff --git a/MyTracks/res/drawable-hdpi/track_run.png b/MyTracks/res/drawable-hdpi/ic_track_run.png
old mode 100755
new mode 100644
similarity index 100%
rename from MyTracks/res/drawable-hdpi/track_run.png
rename to MyTracks/res/drawable-hdpi/ic_track_run.png
diff --git a/MyTracks/res/drawable-hdpi/track_ski.png b/MyTracks/res/drawable-hdpi/ic_track_ski.png
old mode 100755
new mode 100644
similarity index 100%
rename from MyTracks/res/drawable-hdpi/track_ski.png
rename to MyTracks/res/drawable-hdpi/ic_track_ski.png
diff --git a/MyTracks/res/drawable-hdpi/track_snow_boarding.png b/MyTracks/res/drawable-hdpi/ic_track_snow_boarding.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/track_snow_boarding.png
rename to MyTracks/res/drawable-hdpi/ic_track_snow_boarding.png
diff --git a/MyTracks/res/drawable-hdpi/track_walk.png b/MyTracks/res/drawable-hdpi/ic_track_walk.png
old mode 100755
new mode 100644
similarity index 100%
rename from MyTracks/res/drawable-hdpi/track_walk.png
rename to MyTracks/res/drawable-hdpi/ic_track_walk.png
diff --git a/MyTracks/res/drawable-hdpi/warning.png b/MyTracks/res/drawable-hdpi/ic_warning.png
old mode 100755
new mode 100644
similarity index 100%
rename from MyTracks/res/drawable-hdpi/warning.png
rename to MyTracks/res/drawable-hdpi/ic_warning.png
diff --git a/MyTracks/res/drawable-mdpi-v11/my_tracks_notification_icon.png b/MyTracks/res/drawable-mdpi-v11/ic_stat_notify_recording.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi-v11/my_tracks_notification_icon.png
rename to MyTracks/res/drawable-mdpi-v11/ic_stat_notify_recording.png
diff --git a/MyTracks/res/drawable-mdpi/arrow_180.png b/MyTracks/res/drawable-mdpi/ic_arrow_180.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/arrow_180.png
rename to MyTracks/res/drawable-mdpi/ic_arrow_180.png
diff --git a/MyTracks/res/drawable-mdpi/arrow_320.png b/MyTracks/res/drawable-mdpi/ic_arrow_320.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/arrow_320.png
rename to MyTracks/res/drawable-mdpi/ic_arrow_320.png
diff --git a/MyTracks/res/drawable-mdpi/btn_pause.png b/MyTracks/res/drawable-mdpi/ic_button_pause.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/btn_pause.png
rename to MyTracks/res/drawable-mdpi/ic_button_pause.png
diff --git a/MyTracks/res/drawable-mdpi/btn_pause_pressed.png b/MyTracks/res/drawable-mdpi/ic_button_pause_pressed.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/btn_pause_pressed.png
rename to MyTracks/res/drawable-mdpi/ic_button_pause_pressed.png
diff --git a/MyTracks/res/drawable-mdpi/btn_record.png b/MyTracks/res/drawable-mdpi/ic_button_record.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/btn_record.png
rename to MyTracks/res/drawable-mdpi/ic_button_record.png
diff --git a/MyTracks/res/drawable-mdpi/btn_record_pressed.png b/MyTracks/res/drawable-mdpi/ic_button_record_pressed.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/btn_record_pressed.png
rename to MyTracks/res/drawable-mdpi/ic_button_record_pressed.png
diff --git a/MyTracks/res/drawable-mdpi/btn_stop_1.png b/MyTracks/res/drawable-mdpi/ic_button_stop.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/btn_stop_1.png
rename to MyTracks/res/drawable-mdpi/ic_button_stop.png
diff --git a/MyTracks/res/drawable-mdpi/btn_stop_0.png b/MyTracks/res/drawable-mdpi/ic_button_stop_disabled.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/btn_stop_0.png
rename to MyTracks/res/drawable-mdpi/ic_button_stop_disabled.png
diff --git a/MyTracks/res/drawable-mdpi/btn_stop_1_pressed.png b/MyTracks/res/drawable-mdpi/ic_button_stop_pressed.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/btn_stop_1_pressed.png
rename to MyTracks/res/drawable-mdpi/ic_button_stop_pressed.png
diff --git a/MyTracks/res/drawable-mdpi/ic_dialog_success.png b/MyTracks/res/drawable-mdpi/ic_dialog_success.png
new file mode 100644
index 000000000..6079bd642
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/ic_dialog_success.png differ
diff --git a/MyTracks/res/drawable-mdpi/blue_pushpin.png b/MyTracks/res/drawable-mdpi/ic_marker_blue_pushpin.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/blue_pushpin.png
rename to MyTracks/res/drawable-mdpi/ic_marker_blue_pushpin.png
diff --git a/MyTracks/res/drawable-mdpi/green_dot.png b/MyTracks/res/drawable-mdpi/ic_marker_green_paddle.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/green_dot.png
rename to MyTracks/res/drawable-mdpi/ic_marker_green_paddle.png
diff --git a/MyTracks/res/drawable-mdpi/red_dot.png b/MyTracks/res/drawable-mdpi/ic_marker_red_paddle.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/red_dot.png
rename to MyTracks/res/drawable-mdpi/ic_marker_red_paddle.png
diff --git a/MyTracks/res/drawable-mdpi/yellow_pushpin.png b/MyTracks/res/drawable-mdpi/ic_marker_yellow_pushpin.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/yellow_pushpin.png
rename to MyTracks/res/drawable-mdpi/ic_marker_yellow_pushpin.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-mdpi/my_location_normal.png b/MyTracks/res/drawable-mdpi/ic_my_location.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/my_location_normal.png
rename to MyTracks/res/drawable-mdpi/ic_my_location.png
diff --git a/MyTracks/res/drawable-mdpi/my_location_pressed.png b/MyTracks/res/drawable-mdpi/ic_my_location_pressed.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/my_location_pressed.png
rename to MyTracks/res/drawable-mdpi/ic_my_location_pressed.png
diff --git a/MyTracks/res/drawable-mdpi/my_tracks_notification_icon.png b/MyTracks/res/drawable-mdpi/ic_stat_notify_recording.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/my_tracks_notification_icon.png
rename to MyTracks/res/drawable-mdpi/ic_stat_notify_recording.png
diff --git a/MyTracks/res/drawable-mdpi/tab_chart.png b/MyTracks/res/drawable-mdpi/ic_tab_chart.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/tab_chart.png
rename to MyTracks/res/drawable-mdpi/ic_tab_chart.png
diff --git a/MyTracks/res/drawable-mdpi/tab_map.png b/MyTracks/res/drawable-mdpi/ic_tab_map.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/tab_map.png
rename to MyTracks/res/drawable-mdpi/ic_tab_map.png
diff --git a/MyTracks/res/drawable-mdpi/tab_stats.png b/MyTracks/res/drawable-mdpi/ic_tab_stats.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/tab_stats.png
rename to MyTracks/res/drawable-mdpi/ic_tab_stats.png
diff --git a/MyTracks/res/drawable-mdpi/track_airplane.png b/MyTracks/res/drawable-mdpi/ic_track_airplane.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/track_airplane.png
rename to MyTracks/res/drawable-mdpi/ic_track_airplane.png
diff --git a/MyTracks/res/drawable-mdpi/track_bike.png b/MyTracks/res/drawable-mdpi/ic_track_bike.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/track_bike.png
rename to MyTracks/res/drawable-mdpi/ic_track_bike.png
diff --git a/MyTracks/res/drawable-mdpi/track_boat.png b/MyTracks/res/drawable-mdpi/ic_track_boat.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/track_boat.png
rename to MyTracks/res/drawable-mdpi/ic_track_boat.png
diff --git a/MyTracks/res/drawable-mdpi/track_drive.png b/MyTracks/res/drawable-mdpi/ic_track_drive.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/track_drive.png
rename to MyTracks/res/drawable-mdpi/ic_track_drive.png
diff --git a/MyTracks/res/drawable-mdpi/track_paused.png b/MyTracks/res/drawable-mdpi/ic_track_paused.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/track_paused.png
rename to MyTracks/res/drawable-mdpi/ic_track_paused.png
diff --git a/MyTracks/res/drawable-mdpi/track_recording.png b/MyTracks/res/drawable-mdpi/ic_track_recording.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/track_recording.png
rename to MyTracks/res/drawable-mdpi/ic_track_recording.png
diff --git a/MyTracks/res/drawable-mdpi/track_run.png b/MyTracks/res/drawable-mdpi/ic_track_run.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/track_run.png
rename to MyTracks/res/drawable-mdpi/ic_track_run.png
diff --git a/MyTracks/res/drawable-mdpi/track_ski.png b/MyTracks/res/drawable-mdpi/ic_track_ski.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/track_ski.png
rename to MyTracks/res/drawable-mdpi/ic_track_ski.png
diff --git a/MyTracks/res/drawable-mdpi/track_snow_boarding.png b/MyTracks/res/drawable-mdpi/ic_track_snow_boarding.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/track_snow_boarding.png
rename to MyTracks/res/drawable-mdpi/ic_track_snow_boarding.png
diff --git a/MyTracks/res/drawable-mdpi/track_walk.png b/MyTracks/res/drawable-mdpi/ic_track_walk.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/track_walk.png
rename to MyTracks/res/drawable-mdpi/ic_track_walk.png
diff --git a/MyTracks/res/drawable-mdpi/warning.png b/MyTracks/res/drawable-mdpi/ic_warning.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/warning.png
rename to MyTracks/res/drawable-mdpi/ic_warning.png
diff --git a/MyTracks/res/drawable-xhdpi-v11/my_tracks_notification_icon.png b/MyTracks/res/drawable-xhdpi-v11/ic_stat_notify_recording.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi-v11/my_tracks_notification_icon.png
rename to MyTracks/res/drawable-xhdpi-v11/ic_stat_notify_recording.png
diff --git a/MyTracks/res/drawable-xhdpi/arrow_180.png b/MyTracks/res/drawable-xhdpi/ic_arrow_180.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/arrow_180.png
rename to MyTracks/res/drawable-xhdpi/ic_arrow_180.png
diff --git a/MyTracks/res/drawable-xhdpi/arrow_320.png b/MyTracks/res/drawable-xhdpi/ic_arrow_320.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/arrow_320.png
rename to MyTracks/res/drawable-xhdpi/ic_arrow_320.png
diff --git a/MyTracks/res/drawable-xhdpi/btn_pause.png b/MyTracks/res/drawable-xhdpi/ic_button_pause.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/btn_pause.png
rename to MyTracks/res/drawable-xhdpi/ic_button_pause.png
diff --git a/MyTracks/res/drawable-xhdpi/btn_pause_pressed.png b/MyTracks/res/drawable-xhdpi/ic_button_pause_pressed.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/btn_pause_pressed.png
rename to MyTracks/res/drawable-xhdpi/ic_button_pause_pressed.png
diff --git a/MyTracks/res/drawable-xhdpi/btn_record.png b/MyTracks/res/drawable-xhdpi/ic_button_record.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/btn_record.png
rename to MyTracks/res/drawable-xhdpi/ic_button_record.png
diff --git a/MyTracks/res/drawable-xhdpi/btn_record_pressed.png b/MyTracks/res/drawable-xhdpi/ic_button_record_pressed.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/btn_record_pressed.png
rename to MyTracks/res/drawable-xhdpi/ic_button_record_pressed.png
diff --git a/MyTracks/res/drawable-xhdpi/btn_stop_1.png b/MyTracks/res/drawable-xhdpi/ic_button_stop.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/btn_stop_1.png
rename to MyTracks/res/drawable-xhdpi/ic_button_stop.png
diff --git a/MyTracks/res/drawable-xhdpi/btn_stop_0.png b/MyTracks/res/drawable-xhdpi/ic_button_stop_disabled.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/btn_stop_0.png
rename to MyTracks/res/drawable-xhdpi/ic_button_stop_disabled.png
diff --git a/MyTracks/res/drawable-xhdpi/btn_stop_1_pressed.png b/MyTracks/res/drawable-xhdpi/ic_button_stop_pressed.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/btn_stop_1_pressed.png
rename to MyTracks/res/drawable-xhdpi/ic_button_stop_pressed.png
diff --git a/MyTracks/res/drawable-xhdpi/ic_dialog_success.png b/MyTracks/res/drawable-xhdpi/ic_dialog_success.png
new file mode 100644
index 000000000..05bf5aa90
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/ic_dialog_success.png differ
diff --git a/MyTracks/res/drawable-xhdpi/blue_pushpin.png b/MyTracks/res/drawable-xhdpi/ic_marker_blue_pushpin.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/blue_pushpin.png
rename to MyTracks/res/drawable-xhdpi/ic_marker_blue_pushpin.png
diff --git a/MyTracks/res/drawable-xhdpi/green_dot.png b/MyTracks/res/drawable-xhdpi/ic_marker_green_paddle.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/green_dot.png
rename to MyTracks/res/drawable-xhdpi/ic_marker_green_paddle.png
diff --git a/MyTracks/res/drawable-xhdpi/red_dot.png b/MyTracks/res/drawable-xhdpi/ic_marker_red_paddle.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/red_dot.png
rename to MyTracks/res/drawable-xhdpi/ic_marker_red_paddle.png
diff --git a/MyTracks/res/drawable-xhdpi/yellow_pushpin.png b/MyTracks/res/drawable-xhdpi/ic_marker_yellow_pushpin.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/yellow_pushpin.png
rename to MyTracks/res/drawable-xhdpi/ic_marker_yellow_pushpin.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/drawable-xhdpi/my_location_normal.png b/MyTracks/res/drawable-xhdpi/ic_my_location.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/my_location_normal.png
rename to MyTracks/res/drawable-xhdpi/ic_my_location.png
diff --git a/MyTracks/res/drawable-xhdpi/my_location_pressed.png b/MyTracks/res/drawable-xhdpi/ic_my_location_pressed.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/my_location_pressed.png
rename to MyTracks/res/drawable-xhdpi/ic_my_location_pressed.png
diff --git a/MyTracks/res/drawable-xhdpi/track_airplane.png b/MyTracks/res/drawable-xhdpi/ic_track_airplane.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/track_airplane.png
rename to MyTracks/res/drawable-xhdpi/ic_track_airplane.png
diff --git a/MyTracks/res/drawable-xhdpi/track_bike.png b/MyTracks/res/drawable-xhdpi/ic_track_bike.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/track_bike.png
rename to MyTracks/res/drawable-xhdpi/ic_track_bike.png
diff --git a/MyTracks/res/drawable-xhdpi/track_boat.png b/MyTracks/res/drawable-xhdpi/ic_track_boat.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/track_boat.png
rename to MyTracks/res/drawable-xhdpi/ic_track_boat.png
diff --git a/MyTracks/res/drawable-xhdpi/track_drive.png b/MyTracks/res/drawable-xhdpi/ic_track_drive.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/track_drive.png
rename to MyTracks/res/drawable-xhdpi/ic_track_drive.png
diff --git a/MyTracks/res/drawable-xhdpi/track_paused.png b/MyTracks/res/drawable-xhdpi/ic_track_paused.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/track_paused.png
rename to MyTracks/res/drawable-xhdpi/ic_track_paused.png
diff --git a/MyTracks/res/drawable-xhdpi/track_recording.png b/MyTracks/res/drawable-xhdpi/ic_track_recording.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/track_recording.png
rename to MyTracks/res/drawable-xhdpi/ic_track_recording.png
diff --git a/MyTracks/res/drawable-xhdpi/track_run.png b/MyTracks/res/drawable-xhdpi/ic_track_run.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/track_run.png
rename to MyTracks/res/drawable-xhdpi/ic_track_run.png
diff --git a/MyTracks/res/drawable-xhdpi/track_ski.png b/MyTracks/res/drawable-xhdpi/ic_track_ski.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/track_ski.png
rename to MyTracks/res/drawable-xhdpi/ic_track_ski.png
diff --git a/MyTracks/res/drawable-xhdpi/track_snow_boarding.png b/MyTracks/res/drawable-xhdpi/ic_track_snow_boarding.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/track_snow_boarding.png
rename to MyTracks/res/drawable-xhdpi/ic_track_snow_boarding.png
diff --git a/MyTracks/res/drawable-xhdpi/track_walk.png b/MyTracks/res/drawable-xhdpi/ic_track_walk.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/track_walk.png
rename to MyTracks/res/drawable-xhdpi/ic_track_walk.png
diff --git a/MyTracks/res/drawable-xhdpi/warning.png b/MyTracks/res/drawable-xhdpi/ic_warning.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/warning.png
rename to MyTracks/res/drawable-xhdpi/ic_warning.png
diff --git a/MyTracks/res/drawable/record_button.xml b/MyTracks/res/drawable/button_pause.xml
similarity index 82%
rename from MyTracks/res/drawable/record_button.xml
rename to MyTracks/res/drawable/button_pause.xml
index 02bc8a83c..d81ef26ab 100644
--- a/MyTracks/res/drawable/record_button.xml
+++ b/MyTracks/res/drawable/button_pause.xml
@@ -15,6 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/btn_record_pressed" android:state_pressed="true"/>
-  <item android:drawable="@drawable/btn_record"/>
+  <item android:drawable="@drawable/ic_button_pause_pressed" android:state_pressed="true"/>
+  <item android:drawable="@drawable/ic_button_pause"/>
 </selector>
\ No newline at end of file
diff --git a/MyTracks/res/drawable/stop_1_button.xml b/MyTracks/res/drawable/button_record.xml
similarity index 82%
rename from MyTracks/res/drawable/stop_1_button.xml
rename to MyTracks/res/drawable/button_record.xml
index acbd5107d..0d4dc4ef1 100644
--- a/MyTracks/res/drawable/stop_1_button.xml
+++ b/MyTracks/res/drawable/button_record.xml
@@ -15,6 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/btn_stop_1_pressed" android:state_pressed="true"/>
-  <item android:drawable="@drawable/btn_stop_1"/>
+  <item android:drawable="@drawable/ic_button_record_pressed" android:state_pressed="true"/>
+  <item android:drawable="@drawable/ic_button_record"/>
 </selector>
\ No newline at end of file
diff --git a/MyTracks/res/drawable/pause_button.xml b/MyTracks/res/drawable/button_stop.xml
similarity index 82%
rename from MyTracks/res/drawable/pause_button.xml
rename to MyTracks/res/drawable/button_stop.xml
index ac9db77de..a1e833eff 100644
--- a/MyTracks/res/drawable/pause_button.xml
+++ b/MyTracks/res/drawable/button_stop.xml
@@ -15,6 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/btn_pause_pressed" android:state_pressed="true"/>
-  <item android:drawable="@drawable/btn_pause"/>
+  <item android:drawable="@drawable/ic_button_stop_pressed" android:state_pressed="true"/>
+  <item android:drawable="@drawable/ic_button_stop"/>
 </selector>
\ No newline at end of file
diff --git a/MyTracks/res/drawable/my_location.xml b/MyTracks/res/drawable/my_location.xml
index 49e73adf3..3f1c15732 100644
--- a/MyTracks/res/drawable/my_location.xml
+++ b/MyTracks/res/drawable/my_location.xml
@@ -15,6 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/my_location_pressed" android:state_pressed="true"/>
-  <item android:drawable="@drawable/my_location_normal"/>
+  <item android:drawable="@drawable/ic_my_location_pressed" android:state_pressed="true"/>
+  <item android:drawable="@drawable/ic_my_location"/>
 </selector>
\ No newline at end of file
diff --git a/MyTracks/res/layout-land/track_controller.xml b/MyTracks/res/layout-land/track_controller.xml
index 8891c9801..bc567c224 100644
--- a/MyTracks/res/layout-land/track_controller.xml
+++ b/MyTracks/res/layout-land/track_controller.xml
@@ -61,7 +61,7 @@ limitations under the License.
       android:layout_height="0dp"
       android:layout_weight="10"
       android:layout_width="match_parent"
-      android:src="@drawable/btn_stop_0" />
+      android:src="@drawable/ic_button_stop_disabled" />
     <View
       android:layout_height="0dp"
       android:layout_weight="1"
diff --git a/MyTracks/res/layout-land/track_list.xml b/MyTracks/res/layout-land/track_list.xml
index cd90423ac..746063342 100644
--- a/MyTracks/res/layout-land/track_list.xml
+++ b/MyTracks/res/layout-land/track_list.xml
@@ -30,7 +30,6 @@ limitations under the License.
     android:layout_weight="1.0"
     android:layout_width="0dp"
     android:text="@string/track_list_empty_message"
-    android:visibility="gone"
     style="@style/ListEmptyTextView" >
   </TextView>
 </LinearLayout>
\ No newline at end of file
diff --git a/MyTracks/res/layout/about.xml b/MyTracks/res/layout/about.xml
index 88a026d4a..f6c731395 100644
--- a/MyTracks/res/layout/about.xml
+++ b/MyTracks/res/layout/about.xml
@@ -22,7 +22,7 @@ limitations under the License.
     android:orientation="vertical"
     android:padding="8dp" >
     <TextView
-      android:drawableLeft="@drawable/my_tracks_icon"
+      android:drawableLeft="@drawable/ic_launcher_my_tracks"
       android:text="@string/about_copyright_notice"
       style="@style/TextMedium.WithIcon" />
     <TextView
diff --git a/MyTracks/res/layout/map.xml b/MyTracks/res/layout/map.xml
index 4c03b2e8f..134c6f055 100644
--- a/MyTracks/res/layout/map.xml
+++ b/MyTracks/res/layout/map.xml
@@ -20,7 +20,7 @@ limitations under the License.
   android:layout_width="match_parent" >
   <TextView
     android:background="@color/warning_background"
-    android:drawableLeft="@drawable/warning"
+    android:drawableLeft="@drawable/ic_warning"
     android:gravity="left|center_vertical"
     android:id="@+id/map_message"
     android:layout_alignParentTop="true"
diff --git a/MyTracks/res/layout/marker_edit.xml b/MyTracks/res/layout/marker_edit.xml
index 750d38ca1..97e526cd2 100644
--- a/MyTracks/res/layout/marker_edit.xml
+++ b/MyTracks/res/layout/marker_edit.xml
@@ -33,7 +33,7 @@ limitations under the License.
         android:layout_width="match_parent"
         android:orientation="vertical" >
         <EditText
-          android:drawableLeft="@drawable/yellow_pushpin"
+          android:drawableLeft="@drawable/ic_marker_yellow_pushpin"
           android:hint="@string/generic_name"
           android:id="@+id/marker_edit_statistics_name"
           android:imeOptions="actionDone"
@@ -45,7 +45,7 @@ limitations under the License.
         android:layout_width="match_parent"
         android:orientation="vertical" >
         <EditText
-          android:drawableLeft="@drawable/blue_pushpin"
+          android:drawableLeft="@drawable/ic_marker_blue_pushpin"
           android:hint="@string/generic_name"
           android:id="@+id/marker_edit_waypoint_name"
           android:imeOptions="actionNext"
diff --git a/MyTracks/res/layout/track_controller.xml b/MyTracks/res/layout/track_controller.xml
index 72a01b586..4eac77b44 100644
--- a/MyTracks/res/layout/track_controller.xml
+++ b/MyTracks/res/layout/track_controller.xml
@@ -62,7 +62,7 @@ limitations under the License.
       android:layout_height="wrap_content"
       android:layout_weight="10"
       android:layout_width="0dp"
-      android:src="@drawable/btn_stop_0" />
+      android:src="@drawable/ic_button_stop_disabled" />
     <View
       android:layout_height="match_parent"
       android:layout_weight="1"
diff --git a/MyTracks/res/layout/track_list.xml b/MyTracks/res/layout/track_list.xml
index 1746c5496..51dc9628f 100644
--- a/MyTracks/res/layout/track_list.xml
+++ b/MyTracks/res/layout/track_list.xml
@@ -29,7 +29,6 @@ limitations under the License.
     android:layout_weight="1.0"
     android:layout_width="match_parent"
     android:text="@string/track_list_empty_message"
-    android:visibility="gone"
     style="@style/ListEmptyTextView" >
   </TextView>
   <include layout="@layout/track_controller" />
diff --git a/MyTracks/res/layout/track_widget_4x1.xml b/MyTracks/res/layout/track_widget_4x1.xml
index 844861aff..2192cfbd6 100644
--- a/MyTracks/res/layout/track_widget_4x1.xml
+++ b/MyTracks/res/layout/track_widget_4x1.xml
@@ -27,7 +27,7 @@ limitations under the License.
     <ImageButton
       android:contentDescription="@string/icon_record_track"
       android:id="@+id/track_widget_record_button"
-      android:src="@drawable/record_button"      
+      android:src="@drawable/button_record"      
       style="@style/TrackWidgetButton" />
     <LinearLayout
       android:id="@+id/track_widget_stats_container"
@@ -92,7 +92,7 @@ limitations under the License.
     <ImageButton
       android:contentDescription="@string/icon_stop_recording"
       android:id="@+id/track_widget_stop_button"
-      android:src="@drawable/btn_stop_0"
+      android:src="@drawable/ic_button_stop_disabled"
       style="@style/TrackWidgetButton" />
     <LinearLayout
       android:layout_weight="1"
diff --git a/MyTracks/res/layout/track_widget_4x2.xml b/MyTracks/res/layout/track_widget_4x2.xml
index 465ba3eb5..0f818b3b9 100644
--- a/MyTracks/res/layout/track_widget_4x2.xml
+++ b/MyTracks/res/layout/track_widget_4x2.xml
@@ -140,7 +140,7 @@ limitations under the License.
       <ImageButton
         android:contentDescription="@string/icon_record_track"
         android:id="@+id/track_widget_record_button"
-        android:src="@drawable/record_button"      
+        android:src="@drawable/button_record"      
         style="@style/TrackWidgetButton" />
       <TextView
         android:id="@+id/track_widget_record_status"
@@ -148,7 +148,7 @@ limitations under the License.
       <ImageButton
         android:contentDescription="@string/icon_stop_recording"
         android:id="@+id/track_widget_stop_button"
-        android:src="@drawable/btn_stop_0"
+        android:src="@drawable/ic_button_stop_disabled"
         style="@style/TrackWidgetButton" />
       <LinearLayout
         android:layout_weight="1"
diff --git a/MyTracks/res/layout/track_widget_4x3.xml b/MyTracks/res/layout/track_widget_4x3.xml
index 69f3b0a77..b9ff0f56f 100644
--- a/MyTracks/res/layout/track_widget_4x3.xml
+++ b/MyTracks/res/layout/track_widget_4x3.xml
@@ -140,7 +140,7 @@ limitations under the License.
       <ImageButton
         android:contentDescription="@string/icon_record_track"
         android:id="@+id/track_widget_record_button"
-        android:src="@drawable/record_button"      
+        android:src="@drawable/button_record"      
         style="@style/TrackWidgetButton" />
       <TextView
         android:id="@+id/track_widget_record_status"
@@ -148,7 +148,7 @@ limitations under the License.
       <ImageButton
         android:contentDescription="@string/icon_stop_recording"
         android:id="@+id/track_widget_stop_button"
-        android:src="@drawable/btn_stop_0"
+        android:src="@drawable/ic_button_stop_disabled"
         style="@style/TrackWidgetButton" />
       <LinearLayout
         android:layout_weight="1"
diff --git a/MyTracks/res/layout/track_widget_4x4.xml b/MyTracks/res/layout/track_widget_4x4.xml
index cd67d52f6..7fd00ac0e 100644
--- a/MyTracks/res/layout/track_widget_4x4.xml
+++ b/MyTracks/res/layout/track_widget_4x4.xml
@@ -144,7 +144,7 @@ limitations under the License.
       <ImageButton
         android:contentDescription="@string/icon_record_track"
         android:id="@+id/track_widget_record_button"
-        android:src="@drawable/record_button"      
+        android:src="@drawable/button_record"      
         style="@style/TrackWidgetButton" />
       <TextView
         android:id="@+id/track_widget_record_status"
@@ -152,7 +152,7 @@ limitations under the License.
       <ImageButton
         android:contentDescription="@string/icon_stop_recording"
         android:id="@+id/track_widget_stop_button"
-        android:src="@drawable/btn_stop_0"
+        android:src="@drawable/ic_button_stop_disabled"
         style="@style/TrackWidgetButton" />
       <LinearLayout
         android:layout_weight="1"
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/res/values/arrays_do_not_translate.xml b/MyTracks/res/values/arrays_do_not_translate.xml
index 74d9866ee..ecce9d6bc 100644
--- a/MyTracks/res/values/arrays_do_not_translate.xml
+++ b/MyTracks/res/values/arrays_do_not_translate.xml
@@ -116,15 +116,6 @@ limitations under the License.
     <item>1000</item>
     <item>5000</item>
   </string-array>
-  <string-array name="min_recording_distance_values">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-    <item>5</item>
-    <item>10</item>
-    <item>100</item>
-  </string-array>
   <string-array name="min_recording_interval_values">
     <item>-2</item>
     <item>-1</item>
@@ -143,16 +134,25 @@ limitations under the License.
     <item>900</item>
     <item>1800</item>
   </string-array>
-  <string-array name="min_required_accuracy_values">
+  <string-array name="recording_distance_interval_values">
+    <item>1</item>
+    <item>2</item>
+    <item>5</item>
     <item>10</item>
     <item>20</item>
     <item>50</item>
     <item>100</item>
+  </string-array>
+  <string-array name="recording_gps_accuracy_values">
+    <item>10</item>
+    <item>20</item>
+    <item>30</item>
+    <item>50</item>
+    <item>100</item>
     <item>200</item>
     <item>500</item>
     <item>1000</item>
     <item>2000</item>
-    <item>5000</item>
   </string-array>
   <string-array name="sensor_type_all_options">
     <item>@string/settings_sensor_type_polar</item>
diff --git a/MyTracks/res/values/keys.xml b/MyTracks/res/values/keys.xml
index c6d6c681e..bd8cc4e44 100644
--- a/MyTracks/res/values/keys.xml
+++ b/MyTracks/res/values/keys.xml
@@ -31,9 +31,9 @@ limitations under the License.
   <string name="export_type_key">exportType</string>
   <string name="map_type_key">mapType</string>
   <string name="max_recording_distance_key">maxRecordingDistance</string>
-  <string name="min_recording_distance_key">minRecordingDistance</string>
   <string name="min_recording_interval_key">minRecordingInterval</string>
-  <string name="min_required_accuracy_key">minRequiredAccuracy</string>
+  <string name="recording_distance_interval_key">recordingDistanceInterval</string>
+  <string name="recording_gps_accuracy_key">recordingGpsAccuracy</string>
   <string name="report_speed_key">reportSpeed</string>
   <string name="sensor_type_key">sensorType</string>
   <string name="share_track_invite_key">shareTrackInvite</string>
diff --git a/MyTracks/res/values/styles.xml b/MyTracks/res/values/styles.xml
index a6a8b8969..458680f7b 100644
--- a/MyTracks/res/values/styles.xml
+++ b/MyTracks/res/values/styles.xml
@@ -343,7 +343,7 @@ limitations under the License.
     <item name="android:layout_width">24dp</item>
     <item name="android:padding">4dp</item>
     <item name="android:scaleType">fitXY</item>
-    <item name="android:src">@drawable/my_tracks_icon</item>
+    <item name="android:src">@drawable/ic_launcher_my_tracks</item>
   </style>
   <!-- track widget logo 4x4 -->
   <style name="TrackWidgetLogo4x4" parent="@style/TrackWidgetLogo">
diff --git a/MyTracks/res/xml/recording_settings.xml b/MyTracks/res/xml/recording_settings.xml
index 04747184f..76415a16c 100644
--- a/MyTracks/res/xml/recording_settings.xml
+++ b/MyTracks/res/xml/recording_settings.xml
@@ -38,16 +38,16 @@ limitations under the License.
     android:key="@string/min_recording_interval_key"
     android:title="@string/settings_recording_min_recording_interval_title" />
   <com.google.android.apps.mytracks.IntegerListPreference
-    android:defaultValue="5"
-    android:key="@string/min_recording_distance_key"
+    android:defaultValue="10"
+    android:key="@string/recording_distance_interval_key"
     android:title="@string/settings_recording_min_recording_distance_title" />
   <com.google.android.apps.mytracks.IntegerListPreference
     android:defaultValue="200"
     android:key="@string/max_recording_distance_key"
     android:title="@string/settings_recording_max_recording_distance_title" />
   <com.google.android.apps.mytracks.IntegerListPreference
-    android:defaultValue="200"
-    android:key="@string/min_required_accuracy_key"
+    android:defaultValue="50"
+    android:key="@string/recording_gps_accuracy_key"
     android:title="@string/settings_recording_min_required_accuracy_title" />
   <com.google.android.apps.mytracks.IntegerListPreference
     android:defaultValue="10"
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartView.java b/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
index a3db6dae2..f3851946b 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
@@ -200,15 +200,15 @@ public class ChartView extends View {
     markerPaint.setColor(context.getResources().getColor(android.R.color.darker_gray));
     markerPaint.setAntiAlias(false);
 
-    pointer = context.getResources().getDrawable(R.drawable.arrow_180);
+    pointer = context.getResources().getDrawable(R.drawable.ic_arrow_180);
     pointer.setBounds(0, 0, pointer.getIntrinsicWidth(), pointer.getIntrinsicHeight());
 
-    statisticsMarker = getResources().getDrawable(R.drawable.yellow_pushpin);
+    statisticsMarker = getResources().getDrawable(R.drawable.ic_marker_yellow_pushpin);
     markerWidth = statisticsMarker.getIntrinsicWidth();
     markerHeight = statisticsMarker.getIntrinsicHeight();
     statisticsMarker.setBounds(0, 0, markerWidth, markerHeight);
 
-    waypointMarker = getResources().getDrawable(R.drawable.blue_pushpin);
+    waypointMarker = getResources().getDrawable(R.drawable.ic_marker_blue_pushpin);
     waypointMarker.setBounds(0, 0, markerWidth, markerHeight);
 
     scroller = new Scroller(context);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MapOverlay.java b/MyTracks/src/com/google/android/apps/mytracks/MapOverlay.java
index 81c134c86..3f3acb07d 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MapOverlay.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MapOverlay.java
@@ -252,7 +252,7 @@ public class MapOverlay {
         if (cachedLocation.valid) {
           MarkerOptions markerOptions = new MarkerOptions().position(cachedLocation.getLatLng())
               .anchor(MARKER_X_ANCHOR, MARKER_Y_ANCHOR).draggable(false).visible(true)
-              .icon(BitmapDescriptorFactory.fromResource(R.drawable.red_dot));
+              .icon(BitmapDescriptorFactory.fromResource(R.drawable.ic_marker_red_paddle));
           googleMap.addMarker(markerOptions);
           break;
         }
@@ -266,7 +266,7 @@ public class MapOverlay {
       if (cachedLocation.valid) {
         MarkerOptions markerOptions = new MarkerOptions().position(cachedLocation.getLatLng())
             .anchor(MARKER_X_ANCHOR, MARKER_Y_ANCHOR).draggable(false).visible(true)
-            .icon(BitmapDescriptorFactory.fromResource(R.drawable.green_dot));
+            .icon(BitmapDescriptorFactory.fromResource(R.drawable.ic_marker_green_paddle));
         googleMap.addMarker(markerOptions);
         hasStartMarker = true;
         break;
@@ -285,8 +285,8 @@ public class MapOverlay {
       for (Waypoint waypoint : waypoints) {
         Location location = waypoint.getLocation();
         LatLng latLng = new LatLng(location.getLatitude(), location.getLongitude());
-        int drawableId = waypoint.getType() == WaypointType.STATISTICS ? R.drawable.yellow_pushpin
-            : R.drawable.blue_pushpin;
+        int drawableId = waypoint.getType() == WaypointType.STATISTICS 
+            ? R.drawable.ic_marker_yellow_pushpin : R.drawable.ic_marker_blue_pushpin;
         MarkerOptions markerOptions = new MarkerOptions().position(latLng)
             .anchor(WAYPOINT_X_ANCHOR, WAYPOINT_Y_ANCHOR).draggable(false).visible(true)
             .icon(BitmapDescriptorFactory.fromResource(drawableId))
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MarkerDetailActivity.java b/MyTracks/src/com/google/android/apps/mytracks/MarkerDetailActivity.java
index 252183e33..546c4e59d 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MarkerDetailActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MarkerDetailActivity.java
@@ -105,8 +105,10 @@ public class MarkerDetailActivity extends AbstractMyTracksActivity implements De
     getMenuInflater().inflate(R.menu.marker_detail, menu);
 
     Track track = myTracksProviderUtils.getTrack(waypoint.getTrackId());
-    menu.findItem(R.id.marker_detail_edit).setVisible(!track.isSharedWithMe());
-    menu.findItem(R.id.marker_detail_delete).setVisible(!track.isSharedWithMe());
+    boolean isSharedWithMe = track != null ? track.isSharedWithMe() : true;
+    
+    menu.findItem(R.id.marker_detail_edit).setVisible(!isSharedWithMe);
+    menu.findItem(R.id.marker_detail_delete).setVisible(!isSharedWithMe);
     return true;
   }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java
index ecfc71d9d..55223f799 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java
@@ -179,7 +179,8 @@ public class MarkerListActivity extends AbstractMyTracksActivity implements Dele
 
         boolean statistics = WaypointType.values()[cursor.getInt(typeIndex)]
             == WaypointType.STATISTICS;
-        int iconId = statistics ? R.drawable.yellow_pushpin : R.drawable.blue_pushpin;
+        int iconId = statistics ? R.drawable.ic_marker_yellow_pushpin
+            : R.drawable.ic_marker_blue_pushpin;
         String category = statistics ? null : cursor.getString(categoryIndex);
         String description = statistics ? null : cursor.getString(descriptionIndex);
         ListItemUtils.setListItem(MarkerListActivity.this, view, false, true, iconId,
@@ -242,12 +243,17 @@ public class MarkerListActivity extends AbstractMyTracksActivity implements Dele
     insertMarkerMenuItem = menu.findItem(R.id.marker_list_insert_marker);
     searchMenuItem = menu.findItem(R.id.marker_list_search);
     ApiAdapterFactory.getApiAdapter().configureSearchWidget(this, searchMenuItem, null);
-    if (insertMarkerMenuItem != null) {
-      insertMarkerMenuItem.setVisible(track.getId() == recordingTrackId && !recordingTrackPaused);
-    }
     return true;
   }
 
+  @Override
+  public boolean onPrepareOptionsMenu(Menu menu) {
+    if (insertMarkerMenuItem != null) {
+      insertMarkerMenuItem.setVisible(track.getId() == recordingTrackId && !recordingTrackPaused);
+    }
+    return super.onPrepareOptionsMenu(menu);
+  }
+  
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     switch (item.getItemId()) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java
index 9492026fc..bf42d0a26 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java
@@ -483,7 +483,8 @@ public class SearchListActivity extends AbstractSendToGoogleActivity implements
 
     resultMap.put(IS_RECORDING_FIELD, false);
     resultMap.put(IS_PAUSED_FIELD, true);
-    resultMap.put(ICON_ID_FIELD, statistics ? R.drawable.yellow_pushpin : R.drawable.blue_pushpin);
+    resultMap.put(ICON_ID_FIELD,
+        statistics ? R.drawable.ic_marker_yellow_pushpin : R.drawable.ic_marker_blue_pushpin);
     resultMap.put(ICON_CONTENT_DESCRIPTION_ID_FIELD, R.string.icon_marker);
     resultMap.put(NAME_FIELD, waypoint.getName());
     resultMap.put(CATEGORY_FIELD, statistics ? null : waypoint.getCategory());
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackController.java b/MyTracks/src/com/google/android/apps/mytracks/TrackController.java
index 58c51cd74..e4b6116f8 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackController.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackController.java
@@ -101,11 +101,12 @@ public class TrackController {
     }
 
     recordImageButton.setImageResource(
-        isRecording && !isPaused ? R.drawable.pause_button : R.drawable.record_button);
+        isRecording && !isPaused ? R.drawable.button_pause : R.drawable.button_record);
     recordImageButton.setContentDescription(activity.getString(
         isRecording && !isPaused ? R.string.icon_pause_recording : R.string.icon_record_track));
 
-    stopImageButton.setImageResource(isRecording ? R.drawable.stop_1_button : R.drawable.btn_stop_0);
+    stopImageButton.setImageResource(
+        isRecording ? R.drawable.button_stop : R.drawable.ic_button_stop_disabled);
     stopImageButton.setEnabled(isRecording);
 
     statusTextView.setVisibility(isRecording ? View.VISIBLE : View.INVISIBLE);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
index 3bbf04363..46f716255 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
@@ -88,14 +88,15 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity implements
   // Preferences
   private long recordingTrackId = PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
   private boolean recordingTrackPaused = PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT;
-
+  private String sensorType = PreferencesUtils.SENSOR_TYPE_DEFAULT;
+  
   private MenuItem insertMarkerMenuItem;
   private MenuItem playMenuItem;
   private MenuItem shareMenuItem;
   private MenuItem exportMenuItem;
   private MenuItem voiceFrequencyMenuItem;
   private MenuItem splitFrequencyMenuItem;
-  private MenuItem feedbackMenuItem;
+  private MenuItem sensorStateMenuItem;
 
   private final Runnable bindChangedCallback = new Runnable() {
       @Override
@@ -131,6 +132,11 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity implements
                 R.string.recording_track_paused_key,
                 PreferencesUtils.RECORDING_TRACK_PAUSED_DEFAULT);
           }
+          if (key == null || key.equals(
+              PreferencesUtils.getKey(TrackDetailActivity.this, R.string.sensor_type_key))) {
+            sensorType = PreferencesUtils.getString(TrackDetailActivity.this,
+                R.string.sensor_type_key, PreferencesUtils.SENSOR_TYPE_DEFAULT);
+          }
           if (key != null) {
             runOnUiThread(new Runnable() {
                 @Override
@@ -193,17 +199,18 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity implements
     tabsAdapter = new TabsAdapter(this, tabHost, viewPager);
 
     TabSpec mapTabSpec = tabHost.newTabSpec(MyTracksMapFragment.MAP_FRAGMENT_TAG).setIndicator(
-        getString(R.string.track_detail_map_tab), getResources().getDrawable(R.drawable.tab_map));
+        getString(R.string.track_detail_map_tab),
+        getResources().getDrawable(R.drawable.ic_tab_map));
     tabsAdapter.addTab(mapTabSpec, MyTracksMapFragment.class, null);
 
     TabSpec chartTabSpec = tabHost.newTabSpec(ChartFragment.CHART_FRAGMENT_TAG).setIndicator(
         getString(R.string.track_detail_chart_tab),
-        getResources().getDrawable(R.drawable.tab_chart));
+        getResources().getDrawable(R.drawable.ic_tab_chart));
     tabsAdapter.addTab(chartTabSpec, ChartFragment.class, null);
 
     TabSpec statsTabSpec = tabHost.newTabSpec(StatsFragment.STATS_FRAGMENT_TAG).setIndicator(
         getString(R.string.track_detail_stats_tab),
-        getResources().getDrawable(R.drawable.tab_stats));
+        getResources().getDrawable(R.drawable.ic_tab_stats));
     tabsAdapter.addTab(statsTabSpec, StatsFragment.class, null);
 
     if (savedInstanceState != null) {
@@ -295,30 +302,29 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity implements
     getMenuInflater().inflate(R.menu.track_detail, menu);
 
     Track track = myTracksProviderUtils.getTrack(trackId);
-    boolean sharedWithMe = track != null ? track.isSharedWithMe() : true;
-    menu.findItem(R.id.track_detail_edit).setVisible(!sharedWithMe);
-    shareMenuItem = menu.findItem(R.id.track_detail_share);
-    shareMenuItem.setEnabled(!sharedWithMe);
-    shareMenuItem.setVisible(!sharedWithMe);
+    boolean isSharedWithMe = track != null ? track.isSharedWithMe() : true;
+
+    menu.findItem(R.id.track_detail_edit).setVisible(!isSharedWithMe);
+    menu.findItem(R.id.track_detail_feedback)
+        .setVisible(ApiAdapterFactory.getApiAdapter().isGoogleFeedbackAvailable());
 
     insertMarkerMenuItem = menu.findItem(R.id.track_detail_insert_marker);
     playMenuItem = menu.findItem(R.id.track_detail_play);
+
+    shareMenuItem = menu.findItem(R.id.track_detail_share);
+    shareMenuItem.setEnabled(!isSharedWithMe);
+    shareMenuItem.setVisible(!isSharedWithMe);
+
     exportMenuItem = menu.findItem(R.id.track_detail_export);
     voiceFrequencyMenuItem = menu.findItem(R.id.track_detail_voice_frequency);
     splitFrequencyMenuItem = menu.findItem(R.id.track_detail_split_frequency);
-    feedbackMenuItem = menu.findItem(R.id.track_detail_feedback);
-    feedbackMenuItem.setVisible(ApiAdapterFactory.getApiAdapter().isGoogleFeedbackAvailable());
-
-    updateMenuItems(trackId == recordingTrackId, recordingTrackPaused);
+    sensorStateMenuItem = menu.findItem(R.id.track_detail_sensor_state);
     return true;
   }
 
   @Override
   public boolean onPrepareOptionsMenu(Menu menu) {
-    boolean showSensorState = !PreferencesUtils.SENSOR_TYPE_DEFAULT.equals(
-        PreferencesUtils.getString(
-            this, R.string.sensor_type_key, PreferencesUtils.SENSOR_TYPE_DEFAULT));
-    menu.findItem(R.id.track_detail_sensor_state).setVisible(showSensorState);
+    updateMenuItems(trackId == recordingTrackId, recordingTrackPaused);
     return super.onPrepareOptionsMenu(menu);
   }
 
@@ -521,6 +527,9 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity implements
     }
     if (splitFrequencyMenuItem != null) {
       splitFrequencyMenuItem.setVisible(isRecording);
+    }    
+    if (sensorStateMenuItem != null) {
+      sensorStateMenuItem.setVisible(!PreferencesUtils.SENSOR_TYPE_DEFAULT.equals(sensorType));
     }
 
     String title;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackEditActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackEditActivity.java
index 0aa4a761f..6295c7a5e 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackEditActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackEditActivity.java
@@ -122,7 +122,7 @@ public class TrackEditActivity extends AbstractMyTracksActivity
     // Add a border around the icon
     Options options = new BitmapFactory.Options();
     options.inJustDecodeBounds = true;
-    BitmapFactory.decodeResource(getResources(), R.drawable.track_airplane, options);
+    BitmapFactory.decodeResource(getResources(), R.drawable.ic_track_airplane, options);
     final int padding = 4;
     final int width = options.outWidth + 2 * padding;
     final int height = options.outHeight + 2 * padding;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
index 7fd070308..637b21e06 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
@@ -84,6 +84,8 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 import android.widget.Toast;
 
+import java.util.Locale;
+
 /**
  * An activity displaying a list of tracks.
  * 
@@ -292,7 +294,6 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
   private MenuItem exportAllMenuItem;
   private MenuItem importAllMenuItem;
   private MenuItem deleteAllMenuItem;
-  private MenuItem feedbackMenuItem;
 
   private boolean startGps = false; // true to start gps
   private boolean startNewRecording = false; // true to start a new recording
@@ -410,7 +411,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
   @Override
   protected void onResume() {
     super.onResume();
-
+    
     // Update UI
     ApiAdapterFactory.getApiAdapter().invalidMenu(this);
     sectionResourceCursorAdapter.notifyDataSetChanged();
@@ -461,22 +462,28 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
   public boolean onCreateOptionsMenu(Menu menu) {
     getMenuInflater().inflate(R.menu.track_list, menu);
 
+    menu.findItem(R.id.track_list_feedback)
+        .setVisible(ApiAdapterFactory.getApiAdapter().isGoogleFeedbackAvailable());
+
     searchMenuItem = menu.findItem(R.id.track_list_search);
+    ApiAdapterFactory.getApiAdapter().configureSearchWidget(this, searchMenuItem, trackController);
+
     startGpsMenuItem = menu.findItem(R.id.track_list_start_gps);
     refreshMenuItem = menu.findItem(R.id.track_list_refresh);
     exportAllMenuItem = menu.findItem(R.id.track_list_export_all);
     importAllMenuItem = menu.findItem(R.id.track_list_import_all);
     deleteAllMenuItem = menu.findItem(R.id.track_list_delete_all);
-    feedbackMenuItem = menu.findItem(R.id.track_list_feedback);
-    feedbackMenuItem.setVisible(ApiAdapterFactory.getApiAdapter().isGoogleFeedbackAvailable());
-
-    ApiAdapterFactory.getApiAdapter().configureSearchWidget(this, searchMenuItem, trackController);
+    return true;
+  }
+  
+  @Override
+  public boolean onPrepareOptionsMenu(Menu menu) {
     boolean isGpsStarted = TrackRecordingServiceConnectionUtils.isRecordingServiceRunning(this);
     boolean isRecording = recordingTrackId != PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
     updateMenuItems(isGpsStarted, isRecording);
-    return true;
+    return super.onPrepareOptionsMenu(menu);
   }
-
+  
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     Intent intent;
@@ -645,7 +652,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
    * Shows start up dialogs.
    */
   public void showStartupDialogs() {
-    if (!EulaUtils.getAcceptEula(this)) {
+    if (!EulaUtils.hasAcceptEula(this)) {
       Fragment fragment = getSupportFragmentManager()
           .findFragmentByTag(EulaDialogFragment.EULA_DIALOG_TAG);
       if (fragment == null) {
@@ -653,19 +660,20 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
             .show(getSupportFragmentManager(), EulaDialogFragment.EULA_DIALOG_TAG);
       }
     } else {
-      /*
-       * Before the welcome sequence, the empty view is not visible so that it
-       * doesn't show through.
-       */
-      findViewById(R.id.track_list_empty_view).setVisibility(View.VISIBLE);
-
+      if (!EulaUtils.hasDefaultUnits(this)) {
+        String statsUnits = getString(
+            Locale.US.equals(Locale.getDefault()) ? R.string.stats_units_imperial
+                : R.string.stats_units_metric);
+        PreferencesUtils.setString(this, R.string.stats_units_key, statsUnits);        
+        EulaUtils.setDefaultUnits(this);
+      }
       checkGooglePlayServices();
     }
   }
 
   @Override
   public void onEulaDone() {
-    if (EulaUtils.getAcceptEula(this)) {
+    if (EulaUtils.hasAcceptEula(this)) {
       showStartupDialogs();
       return;
     }
@@ -692,7 +700,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
   }
 
   private void showEnableSync() {
-    if (EulaUtils.getShowEnableSync(this)) {
+    if (EulaUtils.hasShowEnableSync(this)) {
       Fragment fragment = getSupportFragmentManager()
           .findFragmentByTag(EnableSyncDialogFragment.ENABLE_SYNC_DIALOG_TAG);
       if (fragment == null) {
@@ -725,7 +733,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) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java b/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java
index a0ba420da..f5a8b610a 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java
@@ -64,8 +64,8 @@ public class TrackDataHub implements DataSourceListener {
   private boolean recordingTrackPaused;
   private boolean metricUnits;
   private boolean reportSpeed;
-  private int minRequiredAccuracy;
-  private int minRecordingDistance;
+  private int recordingGpsAccuracy;
+  private int recordingDistanceInterval;
 
   // Track points sampling state
   private int numLoadedPoints;
@@ -295,27 +295,27 @@ public class TrackDataHub implements DataSourceListener {
           }
         }
         if (key == null
-            || key.equals(PreferencesUtils.getKey(context, R.string.min_required_accuracy_key))) {
-          minRequiredAccuracy = PreferencesUtils.getInt(context, R.string.min_required_accuracy_key,
-              PreferencesUtils.MIN_REQUIRED_ACCURACY_DEFAULT);
+            || key.equals(PreferencesUtils.getKey(context, R.string.recording_gps_accuracy_key))) {
+          recordingGpsAccuracy = PreferencesUtils.getInt(context, R.string.recording_gps_accuracy_key,
+              PreferencesUtils.RECORDING_GPS_ACCURACY_DEFAULT);
           if (key != null) {
             for (TrackDataListener trackDataListener :
                 trackDataManager.getListeners(TrackDataType.PREFERENCE)) {
-              if (trackDataListener.onMinRequiredAccuracy(minRequiredAccuracy)) {
+              if (trackDataListener.onRecordingGpsAccuracy(recordingGpsAccuracy)) {
                 loadDataForListener(trackDataListener);
               }
             }
           }
         }
-        if (key == null
-            || key.equals(PreferencesUtils.getKey(context, R.string.min_recording_distance_key))) {
-          minRecordingDistance = PreferencesUtils.getInt(
-              context, R.string.min_recording_distance_key,
-              PreferencesUtils.MIN_RECORDING_DISTANCE_DEFAULT);
+        if (key == null || key.equals(
+            PreferencesUtils.getKey(context, R.string.recording_distance_interval_key))) {
+          recordingDistanceInterval = PreferencesUtils.getInt(
+              context, R.string.recording_distance_interval_key,
+              PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT);
           if (key != null) {
             for (TrackDataListener trackDataListener :
                 trackDataManager.getListeners(TrackDataType.PREFERENCE)) {
-              if (trackDataListener.onMinRecordingDistanceChanged(minRecordingDistance)) {
+              if (trackDataListener.onRecordingDistanceIntervalChanged(recordingDistanceInterval)) {
                 loadDataForListener(trackDataListener);
               }
             }
@@ -338,8 +338,8 @@ public class TrackDataHub implements DataSourceListener {
         trackDataManager.getListeners(TrackDataType.PREFERENCE)) {
       trackDataListener.onMetricUnitsChanged(metricUnits);
       trackDataListener.onReportSpeedChanged(reportSpeed);
-      trackDataListener.onMinRequiredAccuracy(minRequiredAccuracy);
-      trackDataListener.onMinRecordingDistanceChanged(minRecordingDistance);
+      trackDataListener.onRecordingGpsAccuracy(recordingGpsAccuracy);
+      trackDataListener.onRecordingDistanceIntervalChanged(recordingDistanceInterval);
     }
 
     notifyTracksTableUpdate(trackDataManager.getListeners(TrackDataType.TRACKS_TABLE));
@@ -366,8 +366,8 @@ public class TrackDataHub implements DataSourceListener {
     if (trackDataTypes.contains(TrackDataType.PREFERENCE)) {
       trackDataListener.onMetricUnitsChanged(metricUnits);
       trackDataListener.onReportSpeedChanged(reportSpeed);
-      trackDataListener.onMinRequiredAccuracy(minRequiredAccuracy);
-      trackDataListener.onMinRecordingDistanceChanged(minRecordingDistance);
+      trackDataListener.onRecordingGpsAccuracy(recordingGpsAccuracy);
+      trackDataListener.onRecordingDistanceIntervalChanged(recordingDistanceInterval);
     }
 
     if (trackDataTypes.contains(TrackDataType.TRACKS_TABLE)) {
@@ -580,13 +580,11 @@ public class TrackDataHub implements DataSourceListener {
   }
   
   /**
-   * Gets the minRequiredAccuracy.
-   * 
-   * @return the minRequiredAccuracy
+   * Gets the recordingGpsAccuracy.
    */
   @VisibleForTesting
-  int getMinRequiredAccuracy() {
-    return minRequiredAccuracy;
+  int getRecordingGpsAccuracy() {
+    return recordingGpsAccuracy;
   }
   
   /**
diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataListener.java b/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataListener.java
index 5f78c5087..d26f35149 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataListener.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataListener.java
@@ -109,18 +109,18 @@ public interface TrackDataListener {
   public boolean onReportSpeedChanged(boolean reportSpeed);
 
   /**
-   * Called when the min required accuracy preference value is changed.
+   * Called when the recording gps accuracy preference value is changed.
    * 
-   * @param minRequiredAccuracy the new value
+   * @param recordingGpsAccuracy the new value
    * @return true to reload all the data, false otherwise
    */
-  public boolean onMinRequiredAccuracy(int minRequiredAccuracy);
+  public boolean onRecordingGpsAccuracy(int recordingGpsAccuracy);
   
   /**
-   * Called when the min recording distance preference value is changed.
+   * Called when the recording distance interval preference value is changed.
    * 
-   * @param minRecordingDistance the new value
+   * @param recordingDistanceInterval the new value
    * @return true to reload all the data, false otherwise.
    */
-  public boolean onMinRecordingDistanceChanged(int minRecordingDistance);
+  public boolean onRecordingDistanceIntervalChanged(int recordingDistanceInterval);
 }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/ChartFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/ChartFragment.java
index dd1ccccaa..e4cf37b7f 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/ChartFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/ChartFragment.java
@@ -66,7 +66,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
 
   private boolean metricUnits = true;
   private boolean reportSpeed = PreferencesUtils.REPORT_SPEED_DEFAULT;
-  private int minRecordingDistance = PreferencesUtils.MIN_RECORDING_DISTANCE_DEFAULT;
+  private int recordingDistanceInterval = PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT;
 
   // Modes of operation
   private boolean chartByDistance = true;
@@ -283,18 +283,18 @@ public class ChartFragment extends Fragment implements TrackDataListener {
   }
 
   @Override
-  public boolean onMinRequiredAccuracy(int minRequiredAccuracy) {
+  public boolean onRecordingGpsAccuracy(int minRequiredAccuracy) {
     // We don't care.
     return false;
   }
   
   @Override
-  public boolean onMinRecordingDistanceChanged(int value) {
+  public boolean onRecordingDistanceIntervalChanged(int value) {
     if (isResumed()) {
-      if (minRecordingDistance == value) {
+      if (recordingDistanceInterval == value) {
         return false;
       }
-      minRecordingDistance = value;
+      recordingDistanceInterval = value;
       return true;
     }
     return false;
@@ -439,7 +439,7 @@ public class ChartFragment extends Fragment implements TrackDataListener {
     double power = Double.NaN;
 
     if (tripStatisticsUpdater != null) {
-      tripStatisticsUpdater.addLocation(location, minRecordingDistance);
+      tripStatisticsUpdater.addLocation(location, recordingDistanceInterval);
       TripStatistics tripStatistics = tripStatisticsUpdater.getTripStatistics();
       if (chartByDistance) {
         double distance = tripStatistics.getTotalDistance() * UnitConversions.M_TO_KM;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java
index 6211080ab..38689b358 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java
@@ -82,7 +82,7 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment {
 
     Options options = new BitmapFactory.Options();
     options.inJustDecodeBounds = true;
-    BitmapFactory.decodeResource(getResources(), R.drawable.track_airplane, options);
+    BitmapFactory.decodeResource(getResources(), R.drawable.ic_track_airplane, options);
     int padding = 32;
     int width = options.outWidth + 2 * padding;
     int height = options.outHeight + 2 * padding;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/EulaDialogFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/EulaDialogFragment.java
index 54ebdf249..4c7f15a51 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/EulaDialogFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/EulaDialogFragment.java
@@ -17,7 +17,6 @@
 package com.google.android.apps.mytracks.fragments;
 
 import com.google.android.apps.mytracks.util.EulaUtils;
-import com.google.android.apps.mytracks.util.PreferencesUtils;
 import com.google.android.maps.mytracks.R;
 
 import android.app.Activity;
@@ -33,8 +32,6 @@ import android.text.util.Linkify;
 import android.view.KeyEvent;
 import android.widget.TextView;
 
-import java.util.Locale;
-
 /**
  * A DialogFragment to show EULA.
  * 
@@ -120,10 +117,6 @@ public class EulaDialogFragment extends DialogFragment {
           @Override
         public void onClick(DialogInterface dialog, int which) {
           EulaUtils.setAcceptEula(fragmentActivity);
-          String statsUnits = fragmentActivity.getString(
-              Locale.US.equals(Locale.getDefault()) ? R.string.stats_units_imperial
-                  : R.string.stats_units_metric);
-          PreferencesUtils.setString(fragmentActivity, R.string.stats_units_key, statsUnits);
           caller.onEulaDone();
         }
       });
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/MyTracksMapFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/MyTracksMapFragment.java
index d1c996d68..8ec968c32 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/MyTracksMapFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/MyTracksMapFragment.java
@@ -103,7 +103,7 @@ public class MyTracksMapFragment extends SupportMapFragment implements TrackData
   // Current location
   private Location currentLocation;
   private Location lastTrackPoint;
-  private int minRequiredAccuracy = PreferencesUtils.MIN_REQUIRED_ACCURACY_DEFAULT;
+  private int recordingGpsAccuracy = PreferencesUtils.RECORDING_GPS_ACCURACY_DEFAULT;
 
   /**
    * True to continue keeping the current location visible on the screen.
@@ -492,13 +492,13 @@ public class MyTracksMapFragment extends SupportMapFragment implements TrackData
   }
 
   @Override
-  public boolean onMinRequiredAccuracy(int newValue) {
-    minRequiredAccuracy = newValue;
+  public boolean onRecordingGpsAccuracy(int newValue) {
+    recordingGpsAccuracy = newValue;
     return false;
   }
 
   @Override
-  public boolean onMinRecordingDistanceChanged(int minRecordingDistance) {
+  public boolean onRecordingDistanceIntervalChanged(int minRecordingDistance) {
     // We don't care.
     return false;
   }
@@ -714,7 +714,7 @@ public class MyTracksMapFragment extends SupportMapFragment implements TrackData
           hasGoodFix = false;
         } else {
           hasFix = !LocationUtils.isLocationOld(currentLocation);
-          hasGoodFix = currentLocation.getAccuracy() <= minRequiredAccuracy;
+          hasGoodFix = currentLocation.getAccuracy() <= recordingGpsAccuracy;
         }
         if (!hasFix) {
           message = getString(R.string.gps_wait_for_signal);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/StatsFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/StatsFragment.java
index 86e2dc720..a32dd079f 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/StatsFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/StatsFragment.java
@@ -56,7 +56,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
 
   private Location lastLocation = null;
   private TripStatistics lastTripStatistics = null;
-  private int minRequiredAccuracy = PreferencesUtils.MIN_REQUIRED_ACCURACY_DEFAULT;
+  private int recordingGpsAccuracy = PreferencesUtils.RECORDING_GPS_ACCURACY_DEFAULT;
 
   // A runnable to update the total time field.
   private final Runnable updateTotalTime = new Runnable() {
@@ -148,7 +148,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
 
             if (lastLocation != null) {
               boolean hasFix = !LocationUtils.isLocationOld(lastLocation);
-              boolean hasGoodFix = lastLocation.getAccuracy() <= minRequiredAccuracy;
+              boolean hasGoodFix = lastLocation.getAccuracy() <= recordingGpsAccuracy;
 
               if (!hasFix || !hasGoodFix) {
                 lastLocation = null;
@@ -207,13 +207,13 @@ public class StatsFragment extends Fragment implements TrackDataListener {
   }
 
   @Override
-  public boolean onMinRequiredAccuracy(int newValue) {
-    minRequiredAccuracy = newValue;
+  public boolean onRecordingGpsAccuracy(int newValue) {
+    recordingGpsAccuracy = newValue;
     return false;
   }
 
   @Override
-  public boolean onMinRecordingDistanceChanged(int minRecordingDistance) {
+  public boolean onRecordingDistanceIntervalChanged(int minRecordingDistance) {
     // We don't care.
     return false;
   }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/AbstractImporter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/AbstractImporter.java
index a09884326..2f6e832bd 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/AbstractImporter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/AbstractImporter.java
@@ -104,7 +104,7 @@ abstract class AbstractImporter extends DefaultHandler {
   private final Context context;
   private final long importTrackId;
   private final MyTracksProviderUtils myTracksProviderUtils;
-  private final int minRecordingDistance;
+  private final int recordingDistanceInterval;
   private final List<Long> trackIds;
   private final List<Waypoint> waypoints;
 
@@ -143,8 +143,9 @@ abstract class AbstractImporter extends DefaultHandler {
     this.context = context;
     this.importTrackId = importTrackId;
     this.myTracksProviderUtils = myTracksProviderUtils;
-    this.minRecordingDistance = PreferencesUtils.getInt(context,
-        R.string.min_recording_distance_key, PreferencesUtils.MIN_RECORDING_DISTANCE_DEFAULT);
+    this.recordingDistanceInterval = PreferencesUtils.getInt(context,
+        R.string.recording_distance_interval_key,
+        PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT);
     trackIds = new ArrayList<Long>();
     waypoints = new ArrayList<Waypoint>();
   }
@@ -248,8 +249,8 @@ abstract class AbstractImporter extends DefaultHandler {
             // No more track points. Ignore the rest of the waypoints.
             return;
           }
-          trackTripStatisticstrackUpdater.addLocation(trackPoint, minRecordingDistance);
-          markerTripStatisticsUpdater.addLocation(trackPoint, minRecordingDistance);
+          trackTripStatisticstrackUpdater.addLocation(trackPoint, recordingDistanceInterval);
+          markerTripStatisticsUpdater.addLocation(trackPoint, recordingDistanceInterval);
         }
         if (waypoint.getLocation().getTime() > trackPoint.getTime()) {
           trackPoint = null;
@@ -526,7 +527,7 @@ abstract class AbstractImporter extends DefaultHandler {
       trackData.tripStatisticsUpdater = new TripStatisticsUpdater(
           location.getTime() != -1L ? location.getTime() : trackData.importTime);
     }
-    trackData.tripStatisticsUpdater.addLocation(location, minRecordingDistance);
+    trackData.tripStatisticsUpdater.addLocation(location, recordingDistanceInterval);
 
     trackData.bufferedLocations[trackData.numBufferedLocations] = location;
     trackData.numBufferedLocations++;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/ImportActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/ImportActivity.java
index 216ff2a36..7c96beae5 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/ImportActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/ImportActivity.java
@@ -153,11 +153,12 @@ public class ImportActivity extends Activity {
         String totalFiles = getResources()
             .getQuantityString(R.plurals.files, totalCount, totalCount);
         if (successCount == totalCount) {
-          iconId = android.R.drawable.ic_dialog_info;
           if (totalCount == 0) {
+            iconId = android.R.drawable.ic_dialog_info;
             titleId = R.string.import_no_file_title;
             message = getString(R.string.import_no_file, directoryDisplayName);
           } else {
+            iconId = R.drawable.ic_dialog_success;
             titleId = R.string.generic_success_title;
             message = getString(R.string.import_success, totalFiles, directoryDisplayName);
           }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
index 1816a32aa..c2d45c2ef 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
@@ -132,11 +132,12 @@ public class SaveActivity extends Activity {
         String totalTracks = getResources()
             .getQuantityString(R.plurals.tracks, totalCount, totalCount);
         if (successCount == totalCount) {
-          iconId = android.R.drawable.ic_dialog_info;
           if (totalCount == 0) {
+            iconId = android.R.drawable.ic_dialog_info;
             titleId = R.string.export_external_storage_no_track_title;
             message = getString(R.string.export_external_storage_no_track);
           } else {
+            iconId = R.drawable.ic_dialog_success;
             titleId = R.string.generic_success_title;
             message = getString(
                 R.string.export_external_storage_success, totalTracks, directoryDisplayName);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsAsyncTask.java
index f0d8503c9..e4c7c3587 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsAsyncTask.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsAsyncTask.java
@@ -253,8 +253,9 @@ public class SendMapsAsyncTask extends AbstractSendAsyncTask {
       Vector<Double> elevations = new Vector<Double>();
       TripStatisticsUpdater tripStatisticsUpdater = new TripStatisticsUpdater(
           track.getTripStatistics().getStartTime());
-      int minRecordingDistance = PreferencesUtils.getInt(context,
-          R.string.min_recording_distance_key, PreferencesUtils.MIN_RECORDING_DISTANCE_DEFAULT);
+      int recordingDistanceInterval = PreferencesUtils.getInt(context,
+          R.string.recording_distance_interval_key,
+          PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT);
 
       for (int i = 0; i < count; i++) {
         cursor.moveToPosition(i);
@@ -276,7 +277,7 @@ public class SendMapsAsyncTask extends AbstractSendAsyncTask {
           sentStartMarker = true;
         }
 
-        tripStatisticsUpdater.addLocation(location, minRecordingDistance);
+        tripStatisticsUpdater.addLocation(location, recordingDistanceInterval);
         if (i % elevationSamplingFrequency == 0) {
           distances.add(tripStatisticsUpdater.getTripStatistics().getTotalDistance());
           elevations.add(tripStatisticsUpdater.getSmoothedElevation());
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java
index 3b5f10518..9b7499162 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java
@@ -101,7 +101,7 @@ public class UploadResultActivity extends FragmentActivity implements ChooseActi
         success ? R.string.export_google_success : R.string.export_google_error,
         getString(serviceName), getString(serviceUrl));
     AlertDialog.Builder builder = new AlertDialog.Builder(this).setCancelable(true)
-        .setIcon(success ? android.R.drawable.ic_dialog_info : android.R.drawable.ic_dialog_alert)
+        .setIcon(success ? R.drawable.ic_dialog_success : android.R.drawable.ic_dialog_alert)
         .setMessage(message)
         .setOnCancelListener(new DialogInterface.OnCancelListener() {
             @Override
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
index 442278275..50fc379ec 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
@@ -114,9 +114,9 @@ public class TrackRecordingService extends Service {
   private long recordingTrackId;
   private boolean recordingTrackPaused;
   private LocationListenerPolicy locationListenerPolicy;
-  private int minRecordingDistance;
+  private int recordingDistanceInterval;
   private int maxRecordingDistance;
-  private int minRequiredAccuracy;
+  private int recordingGpsAccuracy;
   private int autoResumeTrackTimeout;
   private long currentRecordingInterval;
 
@@ -193,10 +193,10 @@ public class TrackRecordingService extends Service {
             }
           }
           if (key == null || key.equals(
-              PreferencesUtils.getKey(context, R.string.min_recording_distance_key))) {
-            minRecordingDistance = PreferencesUtils.getInt(context,
-                R.string.min_recording_distance_key,
-                PreferencesUtils.MIN_RECORDING_DISTANCE_DEFAULT);
+              PreferencesUtils.getKey(context, R.string.recording_distance_interval_key))) {
+            recordingDistanceInterval = PreferencesUtils.getInt(context,
+                R.string.recording_distance_interval_key,
+                PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT);
           }
           if (key == null || key.equals(
               PreferencesUtils.getKey(context, R.string.max_recording_distance_key))) {
@@ -204,10 +204,11 @@ public class TrackRecordingService extends Service {
                 R.string.max_recording_distance_key,
                 PreferencesUtils.MAX_RECORDING_DISTANCE_DEFAULT);
           }
-          if (key == null
-              || key.equals(PreferencesUtils.getKey(context, R.string.min_required_accuracy_key))) {
-            minRequiredAccuracy = PreferencesUtils.getInt(context,
-                R.string.min_required_accuracy_key, PreferencesUtils.MIN_REQUIRED_ACCURACY_DEFAULT);
+          if (key == null || key.equals(
+              PreferencesUtils.getKey(context, R.string.recording_gps_accuracy_key))) {
+            recordingGpsAccuracy = PreferencesUtils.getInt(context,
+                R.string.recording_gps_accuracy_key,
+                PreferencesUtils.RECORDING_GPS_ACCURACY_DEFAULT);
           }
           if (key == null || key.equals(
               PreferencesUtils.getKey(context, R.string.auto_resume_track_timeout_key))) {
@@ -510,7 +511,7 @@ public class TrackRecordingService extends Service {
     NotificationCompat.Builder builder = new NotificationCompat.Builder(this).setContentIntent(
         pendingIntent).setContentText(getString(messageId))
         .setContentTitle(getString(R.string.my_tracks_app_name)).setOngoing(true)
-        .setSmallIcon(R.drawable.my_tracks_notification_icon).setWhen(System.currentTimeMillis());
+        .setSmallIcon(R.drawable.ic_stat_notify_recording).setWhen(System.currentTimeMillis());
     startForeground(1, builder.build());
   }
 
@@ -648,9 +649,9 @@ public class TrackRecordingService extends Service {
         if (cursor.moveToLast()) {
           do {
             Location location = myTracksProviderUtils.createTrackPoint(cursor);
-            trackTripStatisticsUpdater.addLocation(location, minRecordingDistance);
+            trackTripStatisticsUpdater.addLocation(location, recordingDistanceInterval);
             if (location.getTime() > markerStartTime) {
-              markerTripStatisticsUpdater.addLocation(location, minRecordingDistance);
+              markerTripStatisticsUpdater.addLocation(location, recordingDistanceInterval);
             }
           } while (cursor.moveToPrevious());
         }
@@ -887,7 +888,7 @@ public class TrackRecordingService extends Service {
         return;
       }
 
-      if (location.getAccuracy() > minRequiredAccuracy) {
+      if (location.getAccuracy() > recordingGpsAccuracy) {
         Log.d(TAG, "Ignore onLocationChangedAsync. Poor accuracy.");
         return;
       }
@@ -931,8 +932,8 @@ public class TrackRecordingService extends Service {
       }
 
       double distanceToLastTrackLocation = location.distanceTo(lastValidTrackPoint);
-      if (distanceToLastTrackLocation < minRecordingDistance && sensorDataSet == null) {
-        Log.d(TAG, "Not recording location due to min recording distance.");
+      if (distanceToLastTrackLocation < recordingDistanceInterval && sensorDataSet == null) {
+        Log.d(TAG, "Not recording location due to recording distance interval.");
       } else if (distanceToLastTrackLocation > maxRecordingDistance) {
         insertLocation(track, lastLocation, lastValidTrackPoint);
         Location pause = new Location(LocationManager.GPS_PROVIDER);
@@ -981,8 +982,8 @@ public class TrackRecordingService extends Service {
     try {
       Uri uri = myTracksProviderUtils.insertTrackPoint(location, track.getId());
       long trackPointId = Long.parseLong(uri.getLastPathSegment());
-      trackTripStatisticsUpdater.addLocation(location, minRecordingDistance);
-      markerTripStatisticsUpdater.addLocation(location, minRecordingDistance);
+      trackTripStatisticsUpdater.addLocation(location, recordingDistanceInterval);
+      markerTripStatisticsUpdater.addLocation(location, recordingDistanceInterval);
       updateRecordingTrack(track, trackPointId, LocationUtils.isValidLocation(location));
     } catch (SQLiteException e) {
       /*
diff --git a/MyTracks/src/com/google/android/apps/mytracks/settings/RecordingSettingsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/settings/RecordingSettingsActivity.java
index 06da4b795..506c6ad83 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/settings/RecordingSettingsActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/settings/RecordingSettingsActivity.java
@@ -49,14 +49,14 @@ public class RecordingSettingsActivity extends AbstractSettingsActivity {
     configListPreference(R.string.min_recording_interval_key,
         PreferencesUtils.MIN_RECORDING_INTERVAL_DEFAULT, R.array.min_recording_interval_values,
         metricUnits);
-    configListPreference(R.string.min_recording_distance_key,
-        PreferencesUtils.MIN_RECORDING_DISTANCE_DEFAULT, R.array.min_recording_distance_values,
-        metricUnits);
+    configListPreference(R.string.recording_distance_interval_key,
+        PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT,
+        R.array.recording_distance_interval_values, metricUnits);
     configListPreference(R.string.max_recording_distance_key,
         PreferencesUtils.MAX_RECORDING_DISTANCE_DEFAULT, R.array.max_recording_distance_values,
         metricUnits);
-    configListPreference(R.string.min_required_accuracy_key,
-        PreferencesUtils.MIN_REQUIRED_ACCURACY_DEFAULT, R.array.min_required_accuracy_values,
+    configListPreference(R.string.recording_gps_accuracy_key,
+        PreferencesUtils.RECORDING_GPS_ACCURACY_DEFAULT, R.array.recording_gps_accuracy_values,
         metricUnits);
     configListPreference(R.string.auto_resume_track_timeout_key,
         PreferencesUtils.AUTO_RESUME_TRACK_TIMEOUT_DEFAULT,
@@ -115,14 +115,14 @@ public class RecordingSettingsActivity extends AbstractSettingsActivity {
       case R.string.min_recording_interval_key:
         setMinRecordingIntervalSummaryAndOptions(summary, options, values);
         break;
-      case R.string.min_recording_distance_key:
-        setMinRecordingDistanceSummaryAndOptions(summary, options, values, metricUnits);
+      case R.string.recording_distance_interval_key:
+        setRecordingDistanceIntervalSummaryAndOptions(summary, options, values, metricUnits);
         break;
       case R.string.max_recording_distance_key:
         setMaxRecordingDistanceSummaryAndOptions(summary, options, values, metricUnits);
         break;
-      case R.string.min_required_accuracy_key:
-        setMinRequiredAccuracySummaryAndOptions(summary, options, values, metricUnits);
+      case R.string.recording_gps_accuracy_key:
+        setRecordingGpsAccuracySummaryAndOptions(summary, options, values, metricUnits);
         break;
       case R.string.auto_resume_track_timeout_key:
         setAutoResumeTrackTimeoutSummaryAndOptions(summary, options, values);
@@ -167,14 +167,14 @@ public class RecordingSettingsActivity extends AbstractSettingsActivity {
   }
 
   /**
-   * Sets the min recording distance summary and options.
+   * Sets the recording distance interval summary and options.
    * 
    * @param summary the summary
    * @param options the options
    * @param values the values
    * @param metricUnits true for metric units
    */
-  private void setMinRecordingDistanceSummaryAndOptions(
+  private void setRecordingDistanceIntervalSummaryAndOptions(
       String[] summary, String[] options, String[] values, boolean metricUnits) {
     for (int i = 0; i < values.length; i++) {
       int value = Integer.parseInt(values[i]);
@@ -182,7 +182,7 @@ public class RecordingSettingsActivity extends AbstractSettingsActivity {
       if (metricUnits) {
         displayValue = getString(R.string.value_integer_meter, value);
         switch (value) {
-          case PreferencesUtils.MIN_RECORDING_DISTANCE_DEFAULT:
+          case PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT:
             options[i] = getString(R.string.value_integer_meter_recommended, value);
             break;
           default:
@@ -192,7 +192,7 @@ public class RecordingSettingsActivity extends AbstractSettingsActivity {
         int feet = (int) (value * UnitConversions.M_TO_FT);
         displayValue = getString(R.string.value_integer_feet, feet);
         switch (value) {
-          case PreferencesUtils.MIN_RECORDING_DISTANCE_DEFAULT:
+          case PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT:
             options[i] = getString(R.string.value_integer_feet_recommended, feet);
             break;
           default:
@@ -248,14 +248,14 @@ public class RecordingSettingsActivity extends AbstractSettingsActivity {
   }
 
   /**
-   * Sets the min required accuracy summary and options.
+   * Sets the recording gps accuracy summary and options.
    * 
    * @param summary the summary
    * @param options the options
    * @param values the values
    * @param metricUnits true for metric units
    */
-  private void setMinRequiredAccuracySummaryAndOptions(
+  private void setRecordingGpsAccuracySummaryAndOptions(
       String[] summary, String[] options, String[] values, boolean metricUnits) {
     for (int i = 0; i < values.length; i++) {
       int value = Integer.parseInt(values[i]);
@@ -263,13 +263,13 @@ public class RecordingSettingsActivity extends AbstractSettingsActivity {
       if (metricUnits) {
         displayValue = getString(R.string.value_integer_meter, value);
         switch (value) {
-          case PreferencesUtils.MIN_REQUIRED_ACCURACY_DEFAULT:
+          case PreferencesUtils.RECORDING_GPS_ACCURACY_DEFAULT:
             options[i] = getString(R.string.value_integer_meter_recommended, value);
             break;
-          case PreferencesUtils.MIN_REQUIRED_ACCURACY_EXCELLENT:
+          case PreferencesUtils.RECORDING_GPS_ACCURACY_EXCELLENT:
             options[i] = getString(R.string.value_integer_meter_excellent_gps, value);
             break;
-          case PreferencesUtils.MIN_REQUIRED_ACCURACY_POOR:
+          case PreferencesUtils.RECORDING_GPS_ACCURACY_POOR:
             options[i] = getString(R.string.value_integer_meter_poor_gps, value);
             break;
           default:
@@ -280,10 +280,10 @@ public class RecordingSettingsActivity extends AbstractSettingsActivity {
         if (feet < 2000) {
           displayValue = getString(R.string.value_integer_feet, feet);
           switch (value) {
-            case PreferencesUtils.MIN_REQUIRED_ACCURACY_DEFAULT:
+            case PreferencesUtils.RECORDING_GPS_ACCURACY_DEFAULT:
               options[i] = getString(R.string.value_integer_feet_recommended, feet);
               break;
-            case PreferencesUtils.MIN_REQUIRED_ACCURACY_EXCELLENT:
+            case PreferencesUtils.RECORDING_GPS_ACCURACY_EXCELLENT:
               options[i] = getString(R.string.value_integer_feet_excellent_gps, feet);
               break;
             default:
@@ -293,7 +293,7 @@ public class RecordingSettingsActivity extends AbstractSettingsActivity {
           double mile = feet * UnitConversions.FT_TO_MI;
           displayValue = getString(R.string.value_float_mile, mile);
           switch (value) {
-            case PreferencesUtils.MIN_REQUIRED_ACCURACY_POOR:
+            case PreferencesUtils.RECORDING_GPS_ACCURACY_POOR:
               options[i] = getString(R.string.value_float_mile_poor_gps, mile);
               break;
             default:
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/EulaUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/EulaUtils.java
index 2a612385d..5976d3bf1 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/EulaUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/EulaUtils.java
@@ -30,25 +30,63 @@ public class EulaUtils {
 
   // Accepting Google mobile terms of service
   private static final String ACCEPT_EULA_PREFERENCE_KEY = "eula.google_mobile_tos_accepted";
+  private static final String DEFAULT_UNITS_PREFERENCE_KEY = "defaultUnits";
   private static final String SHOW_ENABLE_SYNC_PREFERENCE_KEY = "showEnableSync";
   
   private EulaUtils() {}
 
-  public static boolean getAcceptEula(Context context) {
+  /**
+   * Returns true if eula is accepted.
+   * @param context the context
+   */
+  public static boolean hasAcceptEula(Context context) {
     return getValue(context, ACCEPT_EULA_PREFERENCE_KEY, false);
   }
 
+  /**
+   * Sets to true that eula is accepted.
+   * 
+   * @param context the context
+   */
   public static void setAcceptEula(Context context) {
     setValue(context, ACCEPT_EULA_PREFERENCE_KEY, true);
   }
-
-  public static boolean getShowEnableSync(Context context) {
+  
+  /**
+   * Returns true if the default units is initialized.
+   * 
+   * @param context the context
+   */
+  public static boolean hasDefaultUnits(Context context) {
+    return getValue(context, DEFAULT_UNITS_PREFERENCE_KEY, false);
+  }
+  
+  /**
+   * Sets to true that the default units is initialized.
+   * 
+   * @param context the context
+   */
+  public static void setDefaultUnits(Context context) {
+    setValue(context, DEFAULT_UNITS_PREFERENCE_KEY, true);
+  }
+  
+  /**
+   * Returns true if show enable sync is needed.
+   * 
+   * @param context the context 
+   */
+  public static boolean hasShowEnableSync(Context context) {
     return getValue(context, SHOW_ENABLE_SYNC_PREFERENCE_KEY, true);
   }
-
+  
+  /**
+   * Sets to false that show enable sync is needed.
+   * 
+   * @param context the context
+   */
   public static void setShowEnableSync(Context context) {
     setValue(context, SHOW_ENABLE_SYNC_PREFERENCE_KEY, false);
-  }
+  }  
   
   private static boolean getValue(Context context, String key, boolean defaultValue) {
     SharedPreferences sharedPreferences = context.getSharedPreferences(
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/ListItemUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/ListItemUtils.java
index 667119d30..5f0f1c324 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/ListItemUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/ListItemUtils.java
@@ -57,7 +57,7 @@ public class ListItemUtils {
       String totalDistance, long startTime, String description, String sharedOwner) {
 
     if (isRecording) {
-      iconId = isPaused ? R.drawable.track_paused : R.drawable.track_recording;
+      iconId = isPaused ? R.drawable.ic_track_paused : R.drawable.ic_track_recording;
       iconContentDescriptionId = isPaused ? R.string.icon_pause_recording
           : R.string.icon_record_track;
     }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java
index 8d54360ef..4a3f5500b 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java
@@ -76,18 +76,19 @@ public class PreferencesUtils {
   public static final String GOOGLE_ACCOUNT_DEFAULT = "";
   public static final int MAP_TYPE_DEFAUlT = 1;
   public static final int MAX_RECORDING_DISTANCE_DEFAULT = 200;
-  public static final int MIN_RECORDING_DISTANCE_DEFAULT = 5;
-
+  
   // Values for min_recording_interval_key
   public static final int MIN_RECORDING_INTERVAL_ADAPT_ACCURACY = -1;
   public static final int MIN_RECORDING_INTERVAL_ADAPT_BATTERY_LIFE = -2;
   public static final int MIN_RECORDING_INTERVAL_DEFAULT = 0;
 
-  // Values for min_required_accuracy
-  public static final int MIN_REQUIRED_ACCURACY_DEFAULT = 200;
-  public static final int MIN_REQUIRED_ACCURACY_EXCELLENT = 10;
-  public static final int MIN_REQUIRED_ACCURACY_POOR = 5000;
-
+  public static final int RECORDING_DISTANCE_INTERVAL_DEFAULT = 10;
+  
+  // Values for recording_gps_accuracy
+  public static final int RECORDING_GPS_ACCURACY_DEFAULT = 50;
+  public static final int RECORDING_GPS_ACCURACY_EXCELLENT = 10;
+  public static final int RECORDING_GPS_ACCURACY_POOR = 2000;
+  
   public static final long RECORDING_TRACK_ID_DEFAULT = -1L;
   public static final boolean RECORDING_TRACK_PAUSED_DEFAULT = true;
   public static final boolean REPORT_SPEED_DEFAULT = true;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/TrackIconUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/TrackIconUtils.java
index 190766861..5f503641a 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/TrackIconUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/TrackIconUtils.java
@@ -50,18 +50,22 @@ public class TrackIconUtils {
       new LinkedHashMap<String, Pair<Integer, Integer>>();
 
   static {
-    map.put(RUN, new Pair<Integer, Integer>(R.string.activity_type_running, R.drawable.track_run));
     map.put(
-        WALK, new Pair<Integer, Integer>(R.string.activity_type_walking, R.drawable.track_walk));
-    map.put(BIKE, new Pair<Integer, Integer>(R.string.activity_type_biking, R.drawable.track_bike));
+        RUN, new Pair<Integer, Integer>(R.string.activity_type_running, R.drawable.ic_track_run));
     map.put(
-        DRIVE, new Pair<Integer, Integer>(R.string.activity_type_driving, R.drawable.track_drive));
-    map.put(SKI, new Pair<Integer, Integer>(R.string.activity_type_skiing, R.drawable.track_ski));
+        WALK, new Pair<Integer, Integer>(R.string.activity_type_walking, R.drawable.ic_track_walk));
+    map.put(
+        BIKE, new Pair<Integer, Integer>(R.string.activity_type_biking, R.drawable.ic_track_bike));
+    map.put(DRIVE,
+        new Pair<Integer, Integer>(R.string.activity_type_driving, R.drawable.ic_track_drive));
+    map.put(
+        SKI, new Pair<Integer, Integer>(R.string.activity_type_skiing, R.drawable.ic_track_ski));
     map.put(SNOW_BOARDING, new Pair<Integer, Integer>(
-        R.string.activity_type_snow_boarding, R.drawable.track_snow_boarding));
+        R.string.activity_type_snow_boarding, R.drawable.ic_track_snow_boarding));
     map.put(AIRPLANE,
-        new Pair<Integer, Integer>(R.string.activity_type_airplane, R.drawable.track_airplane));
-    map.put(BOAT, new Pair<Integer, Integer>(R.string.activity_type_boat, R.drawable.track_boat));
+        new Pair<Integer, Integer>(R.string.activity_type_airplane, R.drawable.ic_track_airplane));
+    map.put(
+        BOAT, new Pair<Integer, Integer>(R.string.activity_type_boat, R.drawable.ic_track_boat));
   }
 
   private static int[] airplane = new int[] {
@@ -96,10 +100,10 @@ public class TrackIconUtils {
    */
   public static int getIconDrawable(String iconValue) {
     if (iconValue == null || iconValue.equals("")) {
-      return R.drawable.track_walk;
+      return R.drawable.ic_track_walk;
     }
     Pair<Integer, Integer> pair = map.get(iconValue);
-    return pair == null ? R.drawable.track_walk : pair.second;
+    return pair == null ? R.drawable.ic_track_walk : pair.second;
   }
 
   /**
diff --git a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
index f925aa9e4..9bd8ce793 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
@@ -433,7 +433,7 @@ public class TrackWidgetProvider extends AppWidgetProvider {
   private static void updateRecordButton(
       Context context, RemoteViews remoteViews, boolean isRecording, boolean recordingTrackPaused) {
     remoteViews.setImageViewResource(R.id.track_widget_record_button,
-        isRecording && !recordingTrackPaused ? R.drawable.pause_button : R.drawable.record_button);
+        isRecording && !recordingTrackPaused ? R.drawable.button_pause : R.drawable.button_record);
     int recordActionId;
     if (isRecording) {
       recordActionId = recordingTrackPaused ? R.string.track_action_resume
@@ -457,8 +457,8 @@ public class TrackWidgetProvider extends AppWidgetProvider {
    */
   private static void updateStopButton(
       Context context, RemoteViews remoteViews, boolean isRecording) {
-    remoteViews.setImageViewResource(
-        R.id.track_widget_stop_button, isRecording ? R.drawable.stop_1_button : R.drawable.btn_stop_0);
+    remoteViews.setImageViewResource(R.id.track_widget_stop_button,
+        isRecording ? R.drawable.button_stop : R.drawable.ic_button_stop_disabled);
     remoteViews.setBoolean(R.id.track_widget_stop_button, "setEnabled", isRecording);
     if (isRecording) {
       Intent intent = new Intent(context, ControlRecordingService.class).setAction(
diff --git a/MyTracksLib/AndroidManifest.xml b/MyTracksLib/AndroidManifest.xml
index 271b2a052..bf69ed909 100644
--- a/MyTracksLib/AndroidManifest.xml
+++ b/MyTracksLib/AndroidManifest.xml
@@ -29,7 +29,7 @@ limitations under the License.
     android:targetSdkVersion="17" />
 
   <application
-    android:icon="@drawable/my_tracks_icon"
+    android:icon="@drawable/ic_launcher_my_tracks"
     android:label="@string/lib_name" >
   </application>
 
diff --git a/MyTracksLib/res/drawable-hdpi/my_tracks_icon.png b/MyTracksLib/res/drawable-hdpi/ic_launcher_my_tracks.png
similarity index 100%
rename from MyTracksLib/res/drawable-hdpi/my_tracks_icon.png
rename to MyTracksLib/res/drawable-hdpi/ic_launcher_my_tracks.png
diff --git a/MyTracksLib/res/drawable-mdpi/my_tracks_icon.png b/MyTracksLib/res/drawable-mdpi/ic_launcher_my_tracks.png
similarity index 100%
rename from MyTracksLib/res/drawable-mdpi/my_tracks_icon.png
rename to MyTracksLib/res/drawable-mdpi/ic_launcher_my_tracks.png
diff --git a/MyTracksLib/res/drawable-xhdpi/my_tracks_icon.png b/MyTracksLib/res/drawable-xhdpi/ic_launcher_my_tracks.png
similarity index 100%
rename from MyTracksLib/res/drawable-xhdpi/my_tracks_icon.png
rename to MyTracksLib/res/drawable-xhdpi/ic_launcher_my_tracks.png
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java
index dddd14f01..c60cf868e 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/content/TrackDataHubTest.java
@@ -529,24 +529,26 @@ public class TrackDataHubTest extends AndroidTestCase {
     PreferencesUtils.setBoolean(context, R.string.report_speed_key, true);
     PreferencesUtils.setString(
         context, R.string.stats_units_key, PreferencesUtils.STATS_UNITS_DEFAULT);
-    PreferencesUtils.setInt(context, R.string.min_required_accuracy_key,
-        PreferencesUtils.MIN_REQUIRED_ACCURACY_DEFAULT);
-    PreferencesUtils.setInt(context, R.string.min_recording_distance_key,
-        PreferencesUtils.MIN_RECORDING_DISTANCE_DEFAULT);
+    PreferencesUtils.setInt(context, R.string.recording_gps_accuracy_key,
+        PreferencesUtils.RECORDING_GPS_ACCURACY_DEFAULT);
+    PreferencesUtils.setInt(context, R.string.recording_distance_interval_key,
+        PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT);
 
     dataSource.registerOnSharedPreferenceChangeListener(capture(preferenceChangeListenerCapture));
     expect(trackDataListener1.onMetricUnitsChanged(true)).andReturn(false);
     expect(trackDataListener1.onReportSpeedChanged(true)).andReturn(false);
-    expect(trackDataListener1.onMinRequiredAccuracy(PreferencesUtils.MIN_REQUIRED_ACCURACY_DEFAULT))
+    expect(
+        trackDataListener1.onRecordingGpsAccuracy(PreferencesUtils.RECORDING_GPS_ACCURACY_DEFAULT))
         .andReturn(false);
-    expect(trackDataListener1.onMinRecordingDistanceChanged(
-        PreferencesUtils.MIN_RECORDING_DISTANCE_DEFAULT)).andReturn(false);
+    expect(trackDataListener1.onRecordingDistanceIntervalChanged(
+        PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT)).andReturn(false);
     expect(trackDataListener2.onMetricUnitsChanged(true)).andReturn(false);
     expect(trackDataListener2.onReportSpeedChanged(true)).andReturn(false);
-    expect(trackDataListener2.onMinRequiredAccuracy(PreferencesUtils.MIN_REQUIRED_ACCURACY_DEFAULT))
+    expect(
+        trackDataListener2.onRecordingGpsAccuracy(PreferencesUtils.RECORDING_GPS_ACCURACY_DEFAULT))
         .andReturn(false);
-    expect(trackDataListener2.onMinRecordingDistanceChanged(
-        PreferencesUtils.MIN_RECORDING_DISTANCE_DEFAULT)).andReturn(false);
+    expect(trackDataListener2.onRecordingDistanceIntervalChanged(
+        PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT)).andReturn(false);
     replay();
 
     trackDataHub.start();
@@ -749,14 +751,14 @@ public class TrackDataHubTest extends AndroidTestCase {
    */
   public void testNotifyPreferenceChanged_minRequiredAccuracy() {
     int value = 1;
-    PreferencesUtils.setInt(context, R.string.min_required_accuracy_key, value);
+    PreferencesUtils.setInt(context, R.string.recording_gps_accuracy_key, value);
     trackDataHub.notifyPreferenceChanged(PreferencesUtils
-        .getKey(context, R.string.min_required_accuracy_key));
-    assertEquals(value, trackDataHub.getMinRequiredAccuracy());
-    PreferencesUtils.setInt(context, R.string.min_required_accuracy_key, value + 1);
+        .getKey(context, R.string.recording_gps_accuracy_key));
+    assertEquals(value, trackDataHub.getRecordingGpsAccuracy());
+    PreferencesUtils.setInt(context, R.string.recording_gps_accuracy_key, value + 1);
     trackDataHub.notifyPreferenceChanged(PreferencesUtils
-        .getKey(context, R.string.min_required_accuracy_key));
-    assertEquals(value + 1, trackDataHub.getMinRequiredAccuracy());
+        .getKey(context, R.string.recording_gps_accuracy_key));
+    assertEquals(value + 1, trackDataHub.getRecordingGpsAccuracy());
   }
   
   /**
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java
index d84e36a24..c9c0a64f9 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java
@@ -610,14 +610,14 @@ public class TrackRecordingServiceTest extends ServiceTestCase<TestRecordingServ
 
   @MediumTest
   public void testWithProperties_minRecordingDistanceDefault() throws Exception {
-    PreferencesUtils.setInt(context, R.string.min_recording_distance_key,
-        PreferencesUtils.MIN_RECORDING_DISTANCE_DEFAULT);
+    PreferencesUtils.setInt(context, R.string.recording_distance_interval_key,
+        PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT);
     fullRecordingSession();
   }
 
   @MediumTest
   public void testWithProperties_minRecordingDistance() throws Exception {
-    PreferencesUtils.setInt(context, R.string.min_recording_distance_key, 2);
+    PreferencesUtils.setInt(context, R.string.recording_distance_interval_key, 2);
     fullRecordingSession();
   }
 
@@ -669,14 +669,14 @@ public class TrackRecordingServiceTest extends ServiceTestCase<TestRecordingServ
 
   @MediumTest
   public void testWithProperties_minRequiredAccuracyDefault() throws Exception {
-    PreferencesUtils.setInt(context, R.string.min_required_accuracy_key,
-        PreferencesUtils.MIN_REQUIRED_ACCURACY_DEFAULT);
+    PreferencesUtils.setInt(context, R.string.recording_gps_accuracy_key,
+        PreferencesUtils.RECORDING_GPS_ACCURACY_DEFAULT);
     fullRecordingSession();
   }
 
   @MediumTest
   public void testWithProperties_minRequiredAccuracy() throws Exception {
-    PreferencesUtils.setInt(context, R.string.min_required_accuracy_key, 500);
+    PreferencesUtils.setInt(context, R.string.recording_gps_accuracy_key, 500);
     fullRecordingSession();
   }
 
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/stats/TripStatisticsUpdaterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/stats/TripStatisticsUpdaterTest.java
index 900bb4812..be497c561 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/stats/TripStatisticsUpdaterTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/stats/TripStatisticsUpdaterTest.java
@@ -235,7 +235,8 @@ public class TripStatisticsUpdaterTest extends TestCase {
       // Each time slice is 10 seconds.
       Location location = getLocation(i + locationOffset, (i + locationOffset) * .001, MOVING_SPEED,
           startTime + (timeOffset + i) * TEN_SECONDS);
-      tripStatisticsUpdater.addLocation(location, PreferencesUtils.MIN_RECORDING_DISTANCE_DEFAULT);
+      tripStatisticsUpdater.addLocation(
+          location, PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT);
       tripStatistics = tripStatisticsUpdater.getTripStatistics();
 
       assertEquals((timeOffset + i) * TEN_SECONDS, tripStatistics.getTotalTime());
@@ -279,7 +280,8 @@ public class TripStatisticsUpdaterTest extends TestCase {
     for (int i = 0; i < points; i++) {
       Location location = getLocation(
           locationOffset, locationOffset * .001, 0, startTime + (i + timeOffset) * TEN_SECONDS);
-      tripStatisticsUpdater.addLocation(location, PreferencesUtils.MIN_RECORDING_DISTANCE_DEFAULT);
+      tripStatisticsUpdater.addLocation(
+          location, PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT);
 
       tripStatistics = tripStatisticsUpdater.getTripStatistics();
       assertEquals((i + timeOffset) * TEN_SECONDS, tripStatistics.getTotalTime());
@@ -315,7 +317,8 @@ public class TripStatisticsUpdaterTest extends TestCase {
       // 99999 means a speed should bigger than given speed.
       Location location = getLocation(i + locationOffset, (i + locationOffset) * .001, 99999,
           startTime + (timeOffset + i) * TEN_SECONDS);
-      tripStatisticsUpdater.addLocation(location, PreferencesUtils.MIN_RECORDING_DISTANCE_DEFAULT);
+      tripStatisticsUpdater.addLocation(
+          location, PreferencesUtils.RECORDING_DISTANCE_INTERVAL_DEFAULT);
       tripStatistics = tripStatisticsUpdater.getTripStatistics();
 
       assertTrue(tripStatistics.getMovingTime() <= tripStatistics.getTotalTime());