diff --git a/MyTracks/res/drawable-hdpi/ic_menu_chartsettings.png b/MyTracks/res/drawable-hdpi/ic_menu_chartsettings.png
deleted file mode 100644
index 2364bd956..000000000
Binary files a/MyTracks/res/drawable-hdpi/ic_menu_chartsettings.png and /dev/null differ
diff --git a/MyTracks/res/drawable-hdpi/ic_menu_sensorstatus.png b/MyTracks/res/drawable-hdpi/ic_menu_sensorstatus.png
deleted file mode 100644
index b13f28cd2..000000000
Binary files a/MyTracks/res/drawable-hdpi/ic_menu_sensorstatus.png and /dev/null differ
diff --git a/MyTracks/res/drawable-hdpi/ic_menu_statistics.png b/MyTracks/res/drawable-hdpi/ic_menu_statistics.png
deleted file mode 100644
index ce3d6285a..000000000
Binary files a/MyTracks/res/drawable-hdpi/ic_menu_statistics.png and /dev/null differ
diff --git a/MyTracks/res/drawable-hdpi/ic_menu_waypoints.png b/MyTracks/res/drawable-hdpi/ic_menu_waypoints.png
deleted file mode 100644
index c2c792f11..000000000
Binary files a/MyTracks/res/drawable-hdpi/ic_menu_waypoints.png and /dev/null differ
diff --git a/MyTracks/res/drawable-hdpi/menu_aggregated_statistics.png b/MyTracks/res/drawable-hdpi/menu_aggregated_statistics.png
new file mode 100644
index 000000000..2bc6f5aca
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/menu_aggregated_statistics.png differ
diff --git a/MyTracks/res/drawable-hdpi/menu_chart_settings.png b/MyTracks/res/drawable-hdpi/menu_chart_settings.png
new file mode 100644
index 000000000..0f650ee25
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/menu_chart_settings.png differ
diff --git a/MyTracks/res/drawable-hdpi/menu_delete_all.png b/MyTracks/res/drawable-hdpi/menu_delete_all.png
new file mode 100644
index 000000000..094eea589
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/menu_delete_all.png differ
diff --git a/MyTracks/res/drawable-hdpi/menu_export_all.png b/MyTracks/res/drawable-hdpi/menu_export_all.png
new file mode 100644
index 000000000..52601b036
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/menu_export_all.png differ
diff --git a/MyTracks/res/drawable-hdpi/menu_import_all.png b/MyTracks/res/drawable-hdpi/menu_import_all.png
new file mode 100644
index 000000000..1dd8bc75d
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/menu_import_all.png differ
diff --git a/MyTracks/res/drawable-hdpi/menu_markers.png b/MyTracks/res/drawable-hdpi/menu_markers.png
new file mode 100644
index 000000000..e45ea1fd9
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/menu_markers.png differ
diff --git a/MyTracks/res/drawable-hdpi/menu_my_location.png b/MyTracks/res/drawable-hdpi/menu_my_location.png
new file mode 100644
index 000000000..d7fae7e98
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/menu_my_location.png differ
diff --git a/MyTracks/res/drawable-hdpi/menu_satellite_mode.png b/MyTracks/res/drawable-hdpi/menu_satellite_mode.png
new file mode 100644
index 000000000..e5907072f
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/menu_satellite_mode.png differ
diff --git a/MyTracks/res/drawable-hdpi/menu_save.png b/MyTracks/res/drawable-hdpi/menu_save.png
new file mode 100644
index 000000000..306d55a9c
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/menu_save.png differ
diff --git a/MyTracks/res/drawable-hdpi/menu_send_google.png b/MyTracks/res/drawable-hdpi/menu_send_google.png
new file mode 100644
index 000000000..a1d27cec9
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/menu_send_google.png differ
diff --git a/MyTracks/res/drawable-hdpi/menu_sensor_state.png b/MyTracks/res/drawable-hdpi/menu_sensor_state.png
new file mode 100644
index 000000000..97231b91f
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/menu_sensor_state.png differ
diff --git a/MyTracks/res/drawable-hdpi/tab_chart.png b/MyTracks/res/drawable-hdpi/tab_chart.png
new file mode 100644
index 000000000..0f650ee25
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/tab_chart.png differ
diff --git a/MyTracks/res/drawable-hdpi/tab_map.png b/MyTracks/res/drawable-hdpi/tab_map.png
new file mode 100644
index 000000000..e5907072f
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/tab_map.png differ
diff --git a/MyTracks/res/drawable-hdpi/tab_stats.png b/MyTracks/res/drawable-hdpi/tab_stats.png
new file mode 100644
index 000000000..6b58c2dab
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/tab_stats.png differ
diff --git a/MyTracks/res/drawable-ldpi/failure.png b/MyTracks/res/drawable-ldpi/failure.png
deleted file mode 100644
index 3722b0794..000000000
Binary files a/MyTracks/res/drawable-ldpi/failure.png and /dev/null differ
diff --git a/MyTracks/res/drawable-ldpi/ic_menu_chartsettings.png b/MyTracks/res/drawable-ldpi/ic_menu_chartsettings.png
deleted file mode 100644
index e2692561d..000000000
Binary files a/MyTracks/res/drawable-ldpi/ic_menu_chartsettings.png and /dev/null differ
diff --git a/MyTracks/res/drawable-ldpi/ic_menu_sensorstatus.png b/MyTracks/res/drawable-ldpi/ic_menu_sensorstatus.png
deleted file mode 100644
index 4a25d569f..000000000
Binary files a/MyTracks/res/drawable-ldpi/ic_menu_sensorstatus.png and /dev/null differ
diff --git a/MyTracks/res/drawable-ldpi/ic_menu_statistics.png b/MyTracks/res/drawable-ldpi/ic_menu_statistics.png
deleted file mode 100644
index ec2e4e721..000000000
Binary files a/MyTracks/res/drawable-ldpi/ic_menu_statistics.png and /dev/null differ
diff --git a/MyTracks/res/drawable-ldpi/ic_menu_waypoints.png b/MyTracks/res/drawable-ldpi/ic_menu_waypoints.png
deleted file mode 100644
index e8dda7e2a..000000000
Binary files a/MyTracks/res/drawable-ldpi/ic_menu_waypoints.png and /dev/null differ
diff --git a/MyTracks/res/drawable-ldpi/success.png b/MyTracks/res/drawable-ldpi/success.png
deleted file mode 100644
index 1d44ba697..000000000
Binary files a/MyTracks/res/drawable-ldpi/success.png and /dev/null differ
diff --git a/MyTracks/res/drawable-mdpi/ic_menu_chartsettings.png b/MyTracks/res/drawable-mdpi/ic_menu_chartsettings.png
deleted file mode 100644
index 38327b492..000000000
Binary files a/MyTracks/res/drawable-mdpi/ic_menu_chartsettings.png and /dev/null differ
diff --git a/MyTracks/res/drawable-mdpi/ic_menu_sensorstatus.png b/MyTracks/res/drawable-mdpi/ic_menu_sensorstatus.png
deleted file mode 100644
index ca4ea1899..000000000
Binary files a/MyTracks/res/drawable-mdpi/ic_menu_sensorstatus.png and /dev/null differ
diff --git a/MyTracks/res/drawable-mdpi/ic_menu_statistics.png b/MyTracks/res/drawable-mdpi/ic_menu_statistics.png
deleted file mode 100644
index 859be5c8a..000000000
Binary files a/MyTracks/res/drawable-mdpi/ic_menu_statistics.png and /dev/null differ
diff --git a/MyTracks/res/drawable-mdpi/ic_menu_waypoints.png b/MyTracks/res/drawable-mdpi/ic_menu_waypoints.png
deleted file mode 100644
index 3b9284e8c..000000000
Binary files a/MyTracks/res/drawable-mdpi/ic_menu_waypoints.png and /dev/null differ
diff --git a/MyTracks/res/drawable-mdpi/menu_aggregated_statistics.png b/MyTracks/res/drawable-mdpi/menu_aggregated_statistics.png
new file mode 100644
index 000000000..e275e0283
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/menu_aggregated_statistics.png differ
diff --git a/MyTracks/res/drawable-mdpi/menu_chart_settings.png b/MyTracks/res/drawable-mdpi/menu_chart_settings.png
new file mode 100644
index 000000000..d6235554b
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/menu_chart_settings.png differ
diff --git a/MyTracks/res/drawable-mdpi/menu_delete_all.png b/MyTracks/res/drawable-mdpi/menu_delete_all.png
new file mode 100644
index 000000000..3336760d5
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/menu_delete_all.png differ
diff --git a/MyTracks/res/drawable-mdpi/menu_elevation.png b/MyTracks/res/drawable-mdpi/menu_elevation.png
deleted file mode 100644
index 59190b782..000000000
Binary files a/MyTracks/res/drawable-mdpi/menu_elevation.png and /dev/null differ
diff --git a/MyTracks/res/drawable-mdpi/menu_export_all.png b/MyTracks/res/drawable-mdpi/menu_export_all.png
new file mode 100644
index 000000000..6fdcd5fc4
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/menu_export_all.png differ
diff --git a/MyTracks/res/drawable-mdpi/menu_import_all.png b/MyTracks/res/drawable-mdpi/menu_import_all.png
new file mode 100644
index 000000000..aac1c3851
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/menu_import_all.png differ
diff --git a/MyTracks/res/drawable-mdpi/menu_markers.png b/MyTracks/res/drawable-mdpi/menu_markers.png
new file mode 100644
index 000000000..9c748b0b5
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/menu_markers.png differ
diff --git a/MyTracks/res/drawable-mdpi/menu_my_location.png b/MyTracks/res/drawable-mdpi/menu_my_location.png
new file mode 100644
index 000000000..9d1f4403a
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/menu_my_location.png differ
diff --git a/MyTracks/res/drawable-mdpi/menu_satellite_mode.png b/MyTracks/res/drawable-mdpi/menu_satellite_mode.png
new file mode 100644
index 000000000..21de20114
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/menu_satellite_mode.png differ
diff --git a/MyTracks/res/drawable-mdpi/menu_save.png b/MyTracks/res/drawable-mdpi/menu_save.png
new file mode 100644
index 000000000..ad0769553
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/menu_save.png differ
diff --git a/MyTracks/res/drawable-mdpi/menu_send_google.png b/MyTracks/res/drawable-mdpi/menu_send_google.png
new file mode 100644
index 000000000..0e06c2212
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/menu_send_google.png differ
diff --git a/MyTracks/res/drawable-mdpi/menu_sensor_state.png b/MyTracks/res/drawable-mdpi/menu_sensor_state.png
new file mode 100644
index 000000000..539bad7d7
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/menu_sensor_state.png differ
diff --git a/MyTracks/res/drawable-mdpi/tab_chart.png b/MyTracks/res/drawable-mdpi/tab_chart.png
new file mode 100644
index 000000000..d6235554b
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/tab_chart.png differ
diff --git a/MyTracks/res/drawable-mdpi/tab_map.png b/MyTracks/res/drawable-mdpi/tab_map.png
new file mode 100644
index 000000000..21de20114
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/tab_map.png differ
diff --git a/MyTracks/res/drawable-mdpi/tab_stats.png b/MyTracks/res/drawable-mdpi/tab_stats.png
new file mode 100644
index 000000000..5b87a5fbf
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/tab_stats.png differ
diff --git a/MyTracks/res/drawable-xhdpi/menu_aggregated_statistics.png b/MyTracks/res/drawable-xhdpi/menu_aggregated_statistics.png
new file mode 100644
index 000000000..05f9ab06d
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/menu_aggregated_statistics.png differ
diff --git a/MyTracks/res/drawable-xhdpi/menu_chart_settings.png b/MyTracks/res/drawable-xhdpi/menu_chart_settings.png
new file mode 100644
index 000000000..3f93e4f65
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/menu_chart_settings.png differ
diff --git a/MyTracks/res/drawable-xhdpi/menu_delete_all.png b/MyTracks/res/drawable-xhdpi/menu_delete_all.png
new file mode 100644
index 000000000..f391760ef
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/menu_delete_all.png differ
diff --git a/MyTracks/res/drawable-xhdpi/menu_export_all.png b/MyTracks/res/drawable-xhdpi/menu_export_all.png
new file mode 100644
index 000000000..791240fd2
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/menu_export_all.png differ
diff --git a/MyTracks/res/drawable-xhdpi/menu_import_all.png b/MyTracks/res/drawable-xhdpi/menu_import_all.png
new file mode 100644
index 000000000..741774bef
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/menu_import_all.png differ
diff --git a/MyTracks/res/drawable-xhdpi/menu_markers.png b/MyTracks/res/drawable-xhdpi/menu_markers.png
new file mode 100644
index 000000000..95708234a
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/menu_markers.png differ
diff --git a/MyTracks/res/drawable-xhdpi/menu_my_location.png b/MyTracks/res/drawable-xhdpi/menu_my_location.png
new file mode 100644
index 000000000..52ca8ab7f
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/menu_my_location.png differ
diff --git a/MyTracks/res/drawable-xhdpi/menu_satellite_mode.png b/MyTracks/res/drawable-xhdpi/menu_satellite_mode.png
new file mode 100644
index 000000000..f5ce90a33
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/menu_satellite_mode.png differ
diff --git a/MyTracks/res/drawable-xhdpi/menu_save.png b/MyTracks/res/drawable-xhdpi/menu_save.png
new file mode 100644
index 000000000..272060253
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/menu_save.png differ
diff --git a/MyTracks/res/drawable-xhdpi/menu_send_google.png b/MyTracks/res/drawable-xhdpi/menu_send_google.png
new file mode 100644
index 000000000..37d98e5dd
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/menu_send_google.png differ
diff --git a/MyTracks/res/drawable-xhdpi/menu_sensor_state.png b/MyTracks/res/drawable-xhdpi/menu_sensor_state.png
new file mode 100644
index 000000000..2caf74c95
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/menu_sensor_state.png differ
diff --git a/MyTracks/res/drawable-xhdpi/tab_chart.png b/MyTracks/res/drawable-xhdpi/tab_chart.png
new file mode 100644
index 000000000..3f93e4f65
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/tab_chart.png differ
diff --git a/MyTracks/res/drawable-xhdpi/tab_map.png b/MyTracks/res/drawable-xhdpi/tab_map.png
new file mode 100644
index 000000000..f5ce90a33
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/tab_map.png differ
diff --git a/MyTracks/res/drawable-xhdpi/tab_stats.png b/MyTracks/res/drawable-xhdpi/tab_stats.png
new file mode 100644
index 000000000..4b4355c4d
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/tab_stats.png differ
diff --git a/MyTracks/res/menu/list_context_menu.xml b/MyTracks/res/menu/list_context_menu.xml
index 0ddf00d29..68aaa23c4 100644
--- a/MyTracks/res/menu/list_context_menu.xml
+++ b/MyTracks/res/menu/list_context_menu.xml
@@ -18,16 +18,16 @@ limitations under the License.
   <item
     android:icon="@drawable/menu_show_on_map"
     android:id="@+id/list_context_menu_show_on_map"
-    android:showAsAction="always"
+    android:showAsAction="ifRoom"
     android:title="@string/menu_show_on_map"/>
   <item
     android:icon="@drawable/menu_edit"
     android:id="@+id/list_context_menu_edit"
-    android:showAsAction="always"
+    android:showAsAction="ifRoom"
     android:title="@string/menu_edit"/>
   <item
     android:icon="@drawable/menu_delete"
     android:id="@+id/list_context_menu_delete"
-    android:showAsAction="always"
+    android:showAsAction="ifRoom"
     android:title="@string/menu_delete"/>
 </menu>
\ No newline at end of file
diff --git a/MyTracks/res/menu/marker_detail.xml b/MyTracks/res/menu/marker_detail.xml
index 3bbb168cb..f032ce666 100644
--- a/MyTracks/res/menu/marker_detail.xml
+++ b/MyTracks/res/menu/marker_detail.xml
@@ -18,12 +18,12 @@ limitations under the License.
   <item
     android:icon="@drawable/menu_show_on_map"
     android:id="@+id/marker_detail_show_on_map"
-    android:showAsAction="always"
+    android:showAsAction="ifRoom"
     android:title="@string/menu_show_on_map"/>
   <item
     android:icon="@drawable/menu_edit"
     android:id="@+id/marker_detail_edit"
-    android:showAsAction="always"
+    android:showAsAction="ifRoom"
     android:title="@string/menu_edit"/>
   <item
     android:icon="@drawable/menu_delete"
diff --git a/MyTracks/res/menu/marker_list.xml b/MyTracks/res/menu/marker_list.xml
index 9e5a85ea9..66ef63365 100644
--- a/MyTracks/res/menu/marker_list.xml
+++ b/MyTracks/res/menu/marker_list.xml
@@ -18,7 +18,7 @@ limitations under the License.
   <item
     android:icon="@drawable/menu_insert_marker"
     android:id="@+id/marker_list_insert_marker"
-    android:showAsAction="always"
+    android:showAsAction="ifRoom"
     android:title="@string/menu_insert_marker"/>
   <item
     android:actionViewClass="android.widget.SearchView"
diff --git a/MyTracks/res/menu/track_detail.xml b/MyTracks/res/menu/track_detail.xml
index 5b48e050b..778874656 100644
--- a/MyTracks/res/menu/track_detail.xml
+++ b/MyTracks/res/menu/track_detail.xml
@@ -18,22 +18,22 @@ limitations under the License.
   <item
     android:icon="@drawable/menu_stop_recording"
     android:id="@+id/track_detail_stop_recording"
-    android:showAsAction="always"
+    android:showAsAction="ifRoom"
     android:title="@string/menu_stop_recording"/>
   <item
     android:icon="@drawable/menu_insert_marker"
     android:id="@+id/track_detail_insert_marker"
-    android:showAsAction="always"
+    android:showAsAction="ifRoom"
     android:title="@string/menu_insert_marker"/>
   <item
     android:icon="@drawable/menu_play"
     android:id="@+id/track_detail_play"
-    android:showAsAction="always"
+    android:showAsAction="ifRoom"
     android:title="@string/menu_play"/>
   <item
     android:icon="@drawable/menu_share"
     android:id="@+id/track_detail_share"
-    android:showAsAction="always"
+    android:showAsAction="ifRoom"
     android:title="@string/menu_share">
     <menu>
       <item
@@ -49,13 +49,16 @@ limitations under the License.
     </menu>
   </item>
   <item
-    android:icon="@drawable/ic_menu_waypoints"
+    android:icon="@drawable/menu_markers"
     android:id="@+id/track_detail_markers"
+    android:showAsAction="ifRoom"
     android:title="@string/menu_markers"/>
   <item
+    android:icon="@drawable/menu_send_google"
     android:id="@+id/track_detail_send_google"
     android:title="@string/menu_send_google"/>
   <item
+    android:icon="@drawable/menu_save"
     android:id="@+id/track_detail_save"
     android:title="@string/menu_save">
     <menu>
@@ -74,19 +77,19 @@ limitations under the License.
     android:id="@+id/track_detail_delete"
     android:title="@string/menu_delete"/>
   <item
-    android:icon="@android:drawable/ic_menu_mylocation"
+    android:icon="@drawable/menu_my_location"
     android:id="@+id/track_detail_my_location"
     android:title="@string/menu_my_location"/>
   <item
-    android:icon="@android:drawable/ic_menu_mapmode"
+    android:icon="@drawable/menu_satellite_mode"
     android:id="@+id/track_detail_satellite_mode"
     android:title="@string/menu_satellite_mode"/>
   <item
-    android:icon="@drawable/ic_menu_chartsettings"
+    android:icon="@drawable/menu_chart_settings"
     android:id="@+id/track_detail_chart_settings"
     android:title="@string/menu_chart_settings"/>
   <item
-    android:icon="@drawable/ic_menu_sensorstatus"
+    android:icon="@drawable/menu_sensor_state"
     android:id="@+id/track_detail_sensor_state"
     android:title="@string/menu_sensor_state"/>
   <item
diff --git a/MyTracks/res/menu/track_list.xml b/MyTracks/res/menu/track_list.xml
index 8fd39329b..506810d76 100644
--- a/MyTracks/res/menu/track_list.xml
+++ b/MyTracks/res/menu/track_list.xml
@@ -18,12 +18,12 @@ limitations under the License.
   <item
     android:icon="@drawable/menu_record_track"
     android:id="@+id/track_list_record_track"
-    android:showAsAction="always"
+    android:showAsAction="ifRoom"
     android:title="@string/menu_record_track"/>
   <item
     android:icon="@drawable/menu_stop_recording"
     android:id="@+id/track_list_stop_recording"
-    android:showAsAction="always"
+    android:showAsAction="ifRoom"
     android:title="@string/menu_stop_recording"/>
   <item
     android:actionViewClass="android.widget.SearchView"
@@ -32,9 +32,11 @@ limitations under the License.
     android:showAsAction="always|collapseActionView"
     android:title="@string/menu_search"/>
   <item
+    android:icon="@drawable/menu_import_all"
     android:id="@+id/track_list_import_all"
     android:title="@string/menu_import_all"/>
   <item
+    android:icon="@drawable/menu_export_all"
     android:id="@+id/track_list_export_all"
     android:title="@string/menu_export_all">
     <menu>
@@ -45,9 +47,11 @@ limitations under the License.
     </menu>
   </item>
   <item
+    android:icon="@drawable/menu_delete_all"
     android:id="@+id/track_list_delete_all"
     android:title="@string/menu_delete_all"/>
   <item
+    android:icon="@drawable/menu_aggregated_statistics"
     android:id="@+id/track_list_aggregated_statistics"
     android:title="@string/menu_aggregated_statistics"/>
   <item
diff --git a/MyTracks/src/com/google/android/apps/mytracks/Constants.java b/MyTracks/src/com/google/android/apps/mytracks/Constants.java
index 92842278e..7b2da7c39 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/Constants.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/Constants.java
@@ -33,14 +33,6 @@ public abstract class Constants {
    */
   public static final String SDCARD_TOP_DIR = "MyTracks";
 
-  /*
-   * Main screen tab tags:
-   */
-
-  public static final String MAP_TAB_TAG = "map";
-  public static final String STATS_TAB_TAG = "stats";
-  public static final String CHART_TAB_TAG = "chart";
-
   /**
    * The number of distance readings to smooth to get a stable signal.
    */
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
index 1c6f8e2d8..5312a802e 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
@@ -16,10 +16,6 @@
 
 package com.google.android.apps.mytracks;
 
-import static com.google.android.apps.mytracks.Constants.CHART_TAB_TAG;
-import static com.google.android.apps.mytracks.Constants.MAP_TAB_TAG;
-import static com.google.android.apps.mytracks.Constants.STATS_TAB_TAG;
-
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.TrackDataHub;
 import com.google.android.apps.mytracks.content.Waypoint;
@@ -148,17 +144,16 @@ public class TrackDetailActivity extends FragmentActivity {
     tabHost = (TabHost) findViewById(android.R.id.tabhost);
     tabHost.setup();
     tabManager = new TabManager(this, tabHost, R.id.realtabcontent);
-    TabSpec mapTabSpec = tabHost.newTabSpec(MAP_TAB_TAG).setIndicator(
-        getString(R.string.track_detail_map_tab),
-        getResources().getDrawable(android.R.drawable.ic_menu_mapmode));
+    TabSpec mapTabSpec = tabHost.newTabSpec(MapFragment.MAP_FRAGMENT_TAG).setIndicator(
+        getString(R.string.track_detail_map_tab), getResources().getDrawable(R.drawable.tab_map));
     tabManager.addTab(mapTabSpec, MapFragment.class, null);
-    TabSpec chartTabSpec = tabHost.newTabSpec(CHART_TAB_TAG).setIndicator(
+    TabSpec chartTabSpec = tabHost.newTabSpec(ChartFragment.CHART_FRAGMENT_TAG).setIndicator(
         getString(R.string.track_detail_chart_tab),
-        getResources().getDrawable(R.drawable.menu_elevation));
+        getResources().getDrawable(R.drawable.tab_chart));
     tabManager.addTab(chartTabSpec, ChartFragment.class, null);
-    TabSpec statsTabSpec = tabHost.newTabSpec(STATS_TAB_TAG).setIndicator(
+    TabSpec statsTabSpec = tabHost.newTabSpec(StatsFragment.STATS_FRAGMENT_TAG).setIndicator(
         getString(R.string.track_detail_stats_tab),
-        getResources().getDrawable(R.drawable.ic_menu_statistics));
+        getResources().getDrawable(R.drawable.tab_stats));
     tabManager.addTab(statsTabSpec, StatsFragment.class, null);
     if (savedInstanceState != null) {
       tabHost.setCurrentTabByTag(savedInstanceState.getString(CURRENT_TAG_KEY));
@@ -242,14 +237,17 @@ public class TrackDetailActivity extends FragmentActivity {
   @Override
   public boolean onPrepareOptionsMenu(Menu menu) {
     String currentTabTag = tabHost.getCurrentTabTag();
-    menu.findItem(R.id.track_detail_chart_settings).setVisible(CHART_TAB_TAG.equals(currentTabTag));
-    menu.findItem(R.id.track_detail_my_location).setVisible(MAP_TAB_TAG.equals(currentTabTag));
+    menu.findItem(R.id.track_detail_chart_settings).setVisible(
+        ChartFragment.CHART_FRAGMENT_TAG.equals(currentTabTag));
+    menu.findItem(R.id.track_detail_my_location)
+        .setVisible(MapFragment.MAP_FRAGMENT_TAG.equals(currentTabTag));
 
     // Set map or satellite mode
     MapFragment mapFragment = (MapFragment) getSupportFragmentManager()
-        .findFragmentByTag(MAP_TAB_TAG);
+        .findFragmentByTag(MapFragment.MAP_FRAGMENT_TAG);
     boolean isSatelliteMode = mapFragment != null ? mapFragment.isSatelliteView() : false;
-    menu.findItem(R.id.track_detail_satellite_mode).setVisible(MAP_TAB_TAG.equals(currentTabTag))
+    menu.findItem(R.id.track_detail_satellite_mode)
+        .setVisible(MapFragment.MAP_FRAGMENT_TAG.equals(currentTabTag))
         .setTitle(isSatelliteMode ? R.string.menu_map_mode : R.string.menu_satellite_mode);
 
     return super.onPrepareOptionsMenu(menu);
@@ -339,13 +337,15 @@ public class TrackDetailActivity extends FragmentActivity {
             getSupportFragmentManager(), DeleteOneTrackDialogFragment.DELETE_ONE_TRACK_DIALOG_TAG);
         return true;
       case R.id.track_detail_my_location:
-        mapFragment = (MapFragment) getSupportFragmentManager().findFragmentByTag(MAP_TAB_TAG);
+        mapFragment = (MapFragment) getSupportFragmentManager()
+            .findFragmentByTag(MapFragment.MAP_FRAGMENT_TAG);
         if (mapFragment != null) {
           mapFragment.showMyLocation();
         }
         return true;
       case R.id.track_detail_satellite_mode:
-        mapFragment = (MapFragment) getSupportFragmentManager().findFragmentByTag(MAP_TAB_TAG);
+        mapFragment = (MapFragment) getSupportFragmentManager()
+            .findFragmentByTag(MapFragment.MAP_FRAGMENT_TAG);
         if (mapFragment != null) {
           mapFragment.setSatelliteView(!mapFragment.isSatelliteView());
         }
@@ -433,9 +433,9 @@ public class TrackDetailActivity extends FragmentActivity {
 
     if (markerId != -1L) {
       MapFragment mapFragmet = (MapFragment) getSupportFragmentManager()
-          .findFragmentByTag(MAP_TAB_TAG);
+          .findFragmentByTag(MapFragment.MAP_FRAGMENT_TAG);
       if (mapFragmet != null) {
-        tabHost.setCurrentTabByTag(MAP_TAB_TAG);
+        tabHost.setCurrentTabByTag(MapFragment.MAP_FRAGMENT_TAG);
         mapFragmet.showMarker(trackId, markerId);
       } else {
         Log.e(TAG, "MapFragment is null");
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 5e667ee83..eef8ae371 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/ChartFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/ChartFragment.java
@@ -55,6 +55,8 @@ import java.util.EnumSet;
  */
 public class ChartFragment extends Fragment implements TrackDataListener {
 
+  public static final String CHART_FRAGMENT_TAG = "chartFragment";
+  
   // Android reports 128 when the speed is invalid
   private static final int INVALID_SPEED = 128;
   private final DoubleBuffer elevationBuffer = new DoubleBuffer(
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/ChartSettingsDialogFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/ChartSettingsDialogFragment.java
index 2da461610..14937a13e 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/ChartSettingsDialogFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/ChartSettingsDialogFragment.java
@@ -16,8 +16,6 @@
 
 package com.google.android.apps.mytracks.fragments;
 
-import static com.google.android.apps.mytracks.Constants.CHART_TAB_TAG;
-
 import com.google.android.apps.mytracks.ChartView;
 import com.google.android.maps.mytracks.R;
 
@@ -42,7 +40,7 @@ public class ChartSettingsDialogFragment extends DialogFragment {
   @Override
   public Dialog onCreateDialog(Bundle savedInstanceState) {
     final ChartFragment chartFragment = (ChartFragment) getActivity()
-        .getSupportFragmentManager().findFragmentByTag(CHART_TAB_TAG);
+        .getSupportFragmentManager().findFragmentByTag(ChartFragment.CHART_FRAGMENT_TAG);
     View view = getActivity().getLayoutInflater().inflate(R.layout.chart_settings, null);
     final RadioGroup radioGroup = (RadioGroup) view.findViewById(R.id.chart_settings_x);
     radioGroup.check(chartFragment.getMode() == ChartView.Mode.BY_DISTANCE
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/MapFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/MapFragment.java
index b7aa282ec..ef43990fa 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/MapFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/MapFragment.java
@@ -57,6 +57,8 @@ import java.util.EnumSet;
 public class MapFragment extends Fragment
     implements View.OnTouchListener, View.OnClickListener, TrackDataListener {
 
+  public static final String MAP_FRAGMENT_TAG = "mapFragment";
+  
   private static final String KEY_CURRENT_LOCATION = "currentLocation";
   private static final String KEY_KEEP_MY_LOCATION_VISIBLE = "keepMyLocationVisible";
 
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 de8698797..4d618af47 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/StatsFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/StatsFragment.java
@@ -48,6 +48,8 @@ import java.util.EnumSet;
  */
 public class StatsFragment extends Fragment implements TrackDataListener {
 
+  public static final String STATS_FRAGMENT_TAG = "statsFragment";
+  
   private static final String TAG = StatsFragment.class.getSimpleName();
 
   private TrackDataHub trackDataHub;