diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index e18dd20a7..9ba432210 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -137,8 +137,7 @@ limitations under the License.
     android:icon="@drawable/arrow_icon"
     android:label="@string/my_tracks_app_name"
     android:name="com.google.android.apps.mytracks.MyTracksApplication"
-    android:theme="@style/ThemeSelector"
-    android:uiOptions="splitActionBarWhenNarrow" >
+    android:theme="@style/ThemeSelector" >
 
     <!-- For data backup -->
     <meta-data
diff --git a/MyTracks/res/drawable-hdpi/ic_menu_recordtrack.png b/MyTracks/res/drawable-hdpi/ic_menu_recordtrack.png
deleted file mode 100644
index 11d79017e..000000000
Binary files a/MyTracks/res/drawable-hdpi/ic_menu_recordtrack.png and /dev/null differ
diff --git a/MyTracks/res/drawable-hdpi/ic_menu_stoprecording.png b/MyTracks/res/drawable-hdpi/ic_menu_stoprecording.png
deleted file mode 100644
index a55f09f27..000000000
Binary files a/MyTracks/res/drawable-hdpi/ic_menu_stoprecording.png and /dev/null differ
diff --git a/MyTracks/res/drawable-hdpi/menu_help.png b/MyTracks/res/drawable-hdpi/menu_help.png
new file mode 100644
index 000000000..4c65ab2d8
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/menu_help.png differ
diff --git a/MyTracks/res/drawable-hdpi/menu_record_track.png b/MyTracks/res/drawable-hdpi/menu_record_track.png
new file mode 100644
index 000000000..ad8ada6bd
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/menu_record_track.png differ
diff --git a/MyTracks/res/drawable-hdpi/menu_search.png b/MyTracks/res/drawable-hdpi/menu_search.png
new file mode 100644
index 000000000..f12e005eb
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/menu_search.png differ
diff --git a/MyTracks/res/drawable-hdpi/menu_settings.png b/MyTracks/res/drawable-hdpi/menu_settings.png
new file mode 100644
index 000000000..3e4580e05
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/menu_settings.png differ
diff --git a/MyTracks/res/drawable-hdpi/menu_stop_recording.png b/MyTracks/res/drawable-hdpi/menu_stop_recording.png
new file mode 100644
index 000000000..dd5d6a1c1
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/menu_stop_recording.png differ
diff --git a/MyTracks/res/drawable-ldpi/ic_menu_recordtrack.png b/MyTracks/res/drawable-ldpi/ic_menu_recordtrack.png
deleted file mode 100644
index 60f3c67e6..000000000
Binary files a/MyTracks/res/drawable-ldpi/ic_menu_recordtrack.png and /dev/null differ
diff --git a/MyTracks/res/drawable-ldpi/ic_menu_stoprecording.png b/MyTracks/res/drawable-ldpi/ic_menu_stoprecording.png
deleted file mode 100644
index 6f0104709..000000000
Binary files a/MyTracks/res/drawable-ldpi/ic_menu_stoprecording.png and /dev/null differ
diff --git a/MyTracks/res/drawable-mdpi/ic_menu_recordtrack.png b/MyTracks/res/drawable-mdpi/ic_menu_recordtrack.png
deleted file mode 100644
index f2327cef7..000000000
Binary files a/MyTracks/res/drawable-mdpi/ic_menu_recordtrack.png and /dev/null differ
diff --git a/MyTracks/res/drawable-mdpi/ic_menu_stoprecording.png b/MyTracks/res/drawable-mdpi/ic_menu_stoprecording.png
deleted file mode 100644
index 263da50f9..000000000
Binary files a/MyTracks/res/drawable-mdpi/ic_menu_stoprecording.png and /dev/null differ
diff --git a/MyTracks/res/drawable-mdpi/menu_help.png b/MyTracks/res/drawable-mdpi/menu_help.png
new file mode 100644
index 000000000..50580cf97
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/menu_help.png differ
diff --git a/MyTracks/res/drawable-mdpi/menu_record_track.png b/MyTracks/res/drawable-mdpi/menu_record_track.png
new file mode 100644
index 000000000..4d5d484b3
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/menu_record_track.png differ
diff --git a/MyTracks/res/drawable-mdpi/menu_search.png b/MyTracks/res/drawable-mdpi/menu_search.png
new file mode 100644
index 000000000..587d9e0bf
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/menu_search.png differ
diff --git a/MyTracks/res/drawable-mdpi/menu_settings.png b/MyTracks/res/drawable-mdpi/menu_settings.png
new file mode 100644
index 000000000..d3e42edcb
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/menu_settings.png differ
diff --git a/MyTracks/res/drawable-mdpi/menu_stop_recording.png b/MyTracks/res/drawable-mdpi/menu_stop_recording.png
new file mode 100644
index 000000000..20df41586
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/menu_stop_recording.png differ
diff --git a/MyTracks/res/drawable-xhdpi/menu_help.png b/MyTracks/res/drawable-xhdpi/menu_help.png
new file mode 100644
index 000000000..243704869
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/menu_help.png differ
diff --git a/MyTracks/res/drawable-xhdpi/menu_record_track.png b/MyTracks/res/drawable-xhdpi/menu_record_track.png
new file mode 100644
index 000000000..23b9a1c18
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/menu_record_track.png differ
diff --git a/MyTracks/res/drawable-xhdpi/menu_search.png b/MyTracks/res/drawable-xhdpi/menu_search.png
new file mode 100644
index 000000000..3549f84dd
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/menu_search.png differ
diff --git a/MyTracks/res/drawable-xhdpi/menu_settings.png b/MyTracks/res/drawable-xhdpi/menu_settings.png
new file mode 100644
index 000000000..09b014834
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/menu_settings.png differ
diff --git a/MyTracks/res/drawable-xhdpi/menu_stop_recording.png b/MyTracks/res/drawable-xhdpi/menu_stop_recording.png
new file mode 100644
index 000000000..ee5eda25c
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/menu_stop_recording.png differ
diff --git a/MyTracks/res/menu/main.xml b/MyTracks/res/menu/main.xml
index 76be5e18e..5ed7798dc 100644
--- a/MyTracks/res/menu/main.xml
+++ b/MyTracks/res/menu/main.xml
@@ -15,78 +15,61 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
   <item
-    android:icon="@drawable/ic_menu_recordtrack"
+    android:icon="@drawable/menu_record_track"
     android:id="@+id/menu_record_track"
     android:showAsAction="always"
     android:title="@string/menu_record_track"/>
-
   <item
-    android:icon="@drawable/ic_menu_stoprecording"
+    android:icon="@drawable/menu_stop_recording"
     android:id="@+id/menu_stop_recording"
     android:showAsAction="always"
     android:title="@string/menu_stop_recording"/>
-
   <item
     android:icon="@drawable/ic_menu_tracklist"
     android:id="@+id/menu_tracks"
     android:showAsAction="ifRoom"
     android:title="@string/menu_tracks"/>
-
   <item
     android:icon="@drawable/ic_menu_waypoints"
     android:id="@+id/menu_markers"
     android:showAsAction="ifRoom"
     android:title="@string/menu_markers"/>
-
   <item
     android:icon="@drawable/ic_menu_chartsettings"
     android:id="@+id/menu_chart_settings"
     android:showAsAction="ifRoom"
-    android:title="@string/menu_chart_view_chart_settings"
+    android:title="@string/menu_chart_settings"
     android:visible="false"/>
-
   <item
     android:icon="@android:drawable/ic_menu_mylocation"
     android:id="@+id/menu_my_location"
     android:showAsAction="ifRoom"
-    android:title="@string/menu_map_view_my_location"
+    android:title="@string/menu_my_location"
     android:visible="false"/>
-
   <item
     android:icon="@android:drawable/ic_menu_mapmode"
     android:id="@+id/menu_satellite_mode"
     android:showAsAction="ifRoom"
-    android:title="@string/menu_map_view_satellite_mode"
+    android:title="@string/menu_satellite_mode"
     android:visible="false"/>
-
   <item
-    android:icon="@android:drawable/ic_menu_search"
+    android:icon="@drawable/menu_search"
     android:id="@+id/menu_search"
     android:title="@string/menu_search"/>
-
   <item
     android:icon="@drawable/ic_menu_sensorstatus"
     android:id="@+id/menu_sensor_state"
-    android:orderInCategory="1000"
     android:title="@string/menu_sensor_state"/>
-
   <item
-    android:icon="@android:drawable/ic_menu_preferences"
+    android:icon="@drawable/menu_settings"
     android:id="@+id/menu_settings"
-    android:orderInCategory="1001"
     android:title="@string/menu_settings"/>
-
   <item
     android:id="@+id/menu_aggregated_statistics"
-    android:orderInCategory="1002"
     android:title="@string/menu_aggregated_statistics"/>
-
   <item
-    android:icon="@android:drawable/ic_menu_info_details"
+    android:icon="@drawable/menu_help"
     android:id="@+id/menu_help"
-    android:orderInCategory="1003"
     android:title="@string/menu_help"/>
-
 </menu>
\ No newline at end of file
diff --git a/MyTracks/res/menu/search_only.xml b/MyTracks/res/menu/search_only.xml
index 44cd456e8..22d061d37 100644
--- a/MyTracks/res/menu/search_only.xml
+++ b/MyTracks/res/menu/search_only.xml
@@ -16,7 +16,7 @@ limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
   <item
-    android:icon="@android:drawable/ic_menu_search"
+    android:icon="@drawable/menu_search"
     android:id="@+id/menu_search"
     android:showAsAction="always"
     android:title="@string/menu_search"/>
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index ad5dde84c..32420774d 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -966,80 +966,55 @@ limitations under the License.
 
   <!-- Menu Items -->
   <string name="menu_aggregated_statistics"
-    translation_description="In the menu, to go to the aggregated statistics page.
-
-      Screenshot: menu_record_track_more.png">
+    translation_description="In the menu, to go to the aggregated statistics page.">
     Aggregated statistics
   </string>
-  <string name="menu_chart_view_chart_settings"
-    translation_description="In the menu for the chart view, to change the chart settings.
-
-      Screenshot: menu_chart_settings.png">
+  <string name="menu_chart_settings"
+    translation_description="In the menu, to change the chart settings.">
     Chart settings
   </string>
   <string name="menu_help"
-    translation_description="In the menu, to go to the help page.
-
-      Screenshot: menu_record_track_more.png">
+    translation_description="In the menu, to go to the help page.">
     Help
   </string>
-  <string name="menu_map_view_map_mode"
-    translation_description="In the menu for the map view, to switch the display to the map mode.
-
-      Screenshot: menu_map_mode.png">
+  <string name="menu_map_mode"
+    translation_description="In the menu, to switch the display to the map mode.">
     Map mode
   </string>
-  <string name="menu_map_view_my_location"
-    translation_description="In the menu for the map view, to display user's current location.
-
-      Screenshot: menu_record_track.png">
-    My location
-  </string>
-  <string name="menu_map_view_satellite_mode"
-    translation_description="In the menu for the map view, to switch the display to the satellite
-      mode.
-
-      Screenshot: menu_record_track.png">
-    Satellite mode
-  </string>
   <string name="menu_markers"
-    translation_description="In the menu, to show a list of markers for the current track.
-
-      Screenshot: menu_record_track.png">
+    translation_description="In the menu, to show a list of markers for the current track.">
     Markers
   </string>
+  <string name="menu_my_location"
+    translation_description="In the menu, to display the user's current location.">
+    My location
+  </string>
   <string name="menu_record_track"
-    translation_description="In the menu, to start recording a track.
-
-      Screenshot: menu_record_track.png">
+    translation_description="In the menu, to start recording a track.">
     Record track
   </string>
+  <string name="menu_satellite_mode"
+    translation_description="In the menu, to switch the display to the satellite mode.">
+    Satellite mode
+  </string>
   <string name="menu_search"
     translation_description="In the menu, to start a textual search for tracks or waypoints.">
     Search
   </string>
   <string name="menu_sensor_state"
-    translation_description="In the menu, to go to the sensor state page.
-
-      Screenshot: menu_record_track_more.png">
+    translation_description="In the menu, to go to the sensor state page.">
     Sensor state
   </string>
   <string name="menu_settings"
-    translation_description="In the menu, to go to the settings page.
-
-      Screenshot: menu_record_track_more.png">
+    translation_description="In the menu, to go to the settings page.">
     Settings
   </string>
   <string name="menu_stop_recording"
-    translation_description="In the menu, to stop recording a track.
-
-      Screenshot: menu_stop_recording.png">
+    translation_description="In the menu, to stop recording a track.">
     Stop recording
   </string>
   <string name="menu_tracks"
-    translation_description="In the menu, to show a list of all the tracks.
-
-      Screenshot: menu_record_track.png">
+    translation_description="In the menu, to show a list of all the tracks.">
     Tracks
   </string>
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java b/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
index cab942bad..fda7566dc 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
@@ -228,7 +228,7 @@ public class ChartActivity extends Activity implements TrackDataListener {
             chartView.postInvalidate();
           }
         })
-        .setTitle(R.string.menu_chart_view_chart_settings)
+        .setTitle(R.string.menu_chart_settings)
         .setView(view)
         .create();
   }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java b/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java
index 90480c3ab..f9f624a39 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java
@@ -81,9 +81,7 @@ class MenuManager {
         .setVisible(isMapTab);
     menu.findItem(R.id.menu_satellite_mode)
         .setVisible(isMapTab)
-        .setTitle(isSatelliteMode
-            ? R.string.menu_map_view_map_mode
-            : R.string.menu_map_view_satellite_mode);
+        .setTitle(isSatelliteMode ? R.string.menu_map_mode : R.string.menu_satellite_mode);
   }
 
   /**