diff --git a/MyTracks/res/menu/marker_list.xml b/MyTracks/res/menu/marker_list.xml
index 66ef63365..4e36b6c0e 100644
--- a/MyTracks/res/menu/marker_list.xml
+++ b/MyTracks/res/menu/marker_list.xml
@@ -24,6 +24,6 @@ limitations under the License.
     android:actionViewClass="android.widget.SearchView"
     android:icon="@drawable/menu_search"
     android:id="@+id/marker_list_search"
-    android:showAsAction="always|collapseActionView"
+    android:showAsAction="ifRoom|collapseActionView"
     android:title="@string/menu_search"/>
 </menu>
\ No newline at end of file
diff --git a/MyTracks/res/menu/search_list.xml b/MyTracks/res/menu/search_list.xml
index d145d729f..c04675a8c 100644
--- a/MyTracks/res/menu/search_list.xml
+++ b/MyTracks/res/menu/search_list.xml
@@ -19,6 +19,6 @@ limitations under the License.
     android:actionViewClass="android.widget.SearchView"
     android:icon="@drawable/menu_search"
     android:id="@+id/search_list_search"
-    android:showAsAction="always|collapseActionView"
+    android:showAsAction="ifRoom|collapseActionView"
     android:title="@string/menu_search"/>
 </menu>
\ No newline at end of file
diff --git a/MyTracks/res/menu/track_detail.xml b/MyTracks/res/menu/track_detail.xml
index 1cf172779..82b64f253 100644
--- a/MyTracks/res/menu/track_detail.xml
+++ b/MyTracks/res/menu/track_detail.xml
@@ -41,25 +41,15 @@ limitations under the License.
     android:showAsAction="ifRoom"
     android:title="@string/menu_markers"/>
   <!-- android:orderInCategory="5" is in map.xml -->
-  <item
-    android:icon="@drawable/menu_voice_frequency"
-    android:id="@+id/track_detail_voice_frequency"
-    android:orderInCategory="6"
-    android:title="@string/menu_voice_frequency"/>
-  <item
-    android:icon="@drawable/menu_split_frequency"
-    android:id="@+id/track_detail_split_frequency"
-    android:orderInCategory="7"
-    android:title="@string/menu_split_frequency"/>
   <item
     android:icon="@drawable/menu_send_google"
     android:id="@+id/track_detail_send_google"
-    android:orderInCategory="8"
+    android:orderInCategory="6"
     android:title="@string/menu_send_google"/>
   <item
     android:icon="@drawable/menu_save"
     android:id="@+id/track_detail_save"
-    android:orderInCategory="9"
+    android:orderInCategory="7"
     android:title="@string/menu_save">
     <menu>
       <item android:id="@+id/track_detail_save_gpx"/>
@@ -71,13 +61,23 @@ limitations under the License.
   <item
     android:icon="@drawable/menu_edit"
     android:id="@+id/track_detail_edit"
-    android:orderInCategory="10"
+    android:orderInCategory="8"
     android:title="@string/menu_edit"/>
   <item
     android:icon="@drawable/menu_delete"
     android:id="@+id/track_detail_delete"
-    android:orderInCategory="11"
+    android:orderInCategory="9"
     android:title="@string/menu_delete"/>
+  <item
+    android:icon="@drawable/menu_voice_frequency"
+    android:id="@+id/track_detail_voice_frequency"
+    android:orderInCategory="10"
+    android:title="@string/menu_voice_frequency"/>
+  <item
+    android:icon="@drawable/menu_split_frequency"
+    android:id="@+id/track_detail_split_frequency"
+    android:orderInCategory="11"
+    android:title="@string/menu_split_frequency"/>
   <item
     android:icon="@drawable/menu_sensor_state"
     android:id="@+id/track_detail_sensor_state"