Update menu icons.

Update tab icons.
Place tab tag in the appropriate fragment.

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>

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"

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"

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

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