diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java b/myTracks/src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java
index b0a123987..3d8c7c079 100644
--- a/myTracks/src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java
+++ b/myTracks/src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java
@@ -65,13 +65,11 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker
       WaypointsColumns.TYPE, WaypointsColumns.TIME, WaypointsColumns.PHOTOURL };
 
   // Callback when an item is selected in the contextual action mode
-  private ContextualActionModeCallback
-      contextualActionModeCallback = new ContextualActionModeCallback() {
-          @Override
+  private ContextualActionModeCallback contextualActionModeCallback = new ContextualActionModeCallback() {
+        @Override
         public void onPrepare(Menu menu, int[] positions, long[] ids, boolean showSelectAll) {
           boolean isSingleSelection = ids.length == 1;
 
-          // Always disable
           menu.findItem(R.id.list_context_menu_share).setVisible(false);
           menu.findItem(R.id.list_context_menu_show_on_map).setVisible(isSingleSelection);
           menu.findItem(R.id.list_context_menu_edit).setVisible(isSingleSelection);
diff --git a/myTracks/src/main/res/menu/track_detail.xml b/myTracks/src/main/res/menu/track_detail.xml
index f4e65b04b..35a9b5682 100644
--- a/myTracks/src/main/res/menu/track_detail.xml
+++ b/myTracks/src/main/res/menu/track_detail.xml
@@ -13,32 +13,32 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/track_detail_insert_marker"
         android:icon="@drawable/ic_menu_insert_marker"
         android:orderInCategory="1"
         android:title="@string/menu_insert_marker"
-        app:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom" />
     <item
         android:id="@+id/track_detail_insert_photo"
         android:icon="@drawable/ic_menu_insert_photo"
         android:orderInCategory="2"
         android:title="@string/menu_insert_photo"
-        app:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom" />
     <item
         android:id="@+id/track_detail_share"
         android:icon="@drawable/ic_menu_share"
         android:orderInCategory="4"
         android:title="@string/menu_share"
         android:actionProviderClass="android.widget.ShareActionProvider"
-        app:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom" />
     <item
         android:id="@+id/track_detail_markers"
         android:icon="@drawable/ic_menu_markers"
         android:orderInCategory="5"
-        android:title="@string/menu_markers" />
+        android:title="@string/menu_markers"
+        android:showAsAction="ifRoom" />
     <item
         android:id="@+id/track_detail_edit"
         android:icon="@drawable/ic_menu_edit"
diff --git a/myTracks/src/main/res/menu/track_list.xml b/myTracks/src/main/res/menu/track_list.xml
index 15d4f7d9d..011794bdc 100644
--- a/myTracks/src/main/res/menu/track_list.xml
+++ b/myTracks/src/main/res/menu/track_list.xml
@@ -13,19 +13,18 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/track_list_search"
         android:icon="@drawable/ic_menu_search"
         android:title="@string/menu_search"
         android:actionViewClass="android.widget.SearchView"
-        android:showAsAction="always" />
+        android:showAsAction="ifRoom" />
     <item
         android:id="@+id/track_list_start_gps"
         android:icon="@drawable/ic_menu_start_gps"
         android:title="@string/menu_start_gps"
-        app:showAsAction="ifRoom" />
+        android:showAsAction="ifRoom" />
     <item
         android:id="@+id/track_list_aggregated_statistics"
         android:icon="@drawable/ic_menu_aggregated_statistics"