diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java b/myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java
index 612d87da1..9022318d3 100644
--- a/myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java
+++ b/myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java
@@ -593,8 +593,7 @@ public class TrackListActivity extends AbstractTrackActivity implements FileType
       startGpsMenuItem.setVisible(!isRecording);
       if (!isRecording) {
         startGpsMenuItem.setTitle(isGpsStarted ? R.string.menu_stop_gps : R.string.menu_start_gps);
-        startGpsMenuItem.setIcon(
-            isGpsStarted ? R.drawable.ic_menu_stop_gps : R.drawable.ic_menu_start_gps);
+        startGpsMenuItem.setIcon(isGpsStarted ? R.drawable.ic_menu_stop_gps : R.drawable.ic_menu_start_gps);
         TrackIconUtils.setMenuIconColor(startGpsMenuItem);        
       }
     }
diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackIconUtils.java b/myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackIconUtils.java
index ea39f54f9..bb91b2906 100644
--- a/myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackIconUtils.java
+++ b/myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackIconUtils.java
@@ -238,6 +238,8 @@ public class TrackIconUtils {
    */
   private static void revertMenuIconColor(MenuItem menuitem) {
     Drawable drawable = menuitem.getIcon();
-    drawable.setColorFilter(new ColorMatrixColorFilter(REVERT_COLOR_MATRIX));
+    if (drawable != null) {
+      drawable.setColorFilter(new ColorMatrixColorFilter(REVERT_COLOR_MATRIX));
+    }
   }
 }
diff --git a/myTracks/src/main/res/drawable-hdpi/ic_menu_search.png b/myTracks/src/main/res/drawable-hdpi/ic_menu_search.png
deleted file mode 100644
index f12e005eb..000000000
Binary files a/myTracks/src/main/res/drawable-hdpi/ic_menu_search.png and /dev/null differ
diff --git a/myTracks/src/main/res/drawable-mdpi/ic_menu_search.png b/myTracks/src/main/res/drawable-mdpi/ic_menu_search.png
deleted file mode 100644
index 587d9e0bf..000000000
Binary files a/myTracks/src/main/res/drawable-mdpi/ic_menu_search.png and /dev/null differ
diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_menu_search.png b/myTracks/src/main/res/drawable-xhdpi/ic_menu_search.png
deleted file mode 100644
index 3549f84dd..000000000
Binary files a/myTracks/src/main/res/drawable-xhdpi/ic_menu_search.png and /dev/null differ
diff --git a/myTracks/src/main/res/menu/marker_list.xml b/myTracks/src/main/res/menu/marker_list.xml
index 435d09b13..6f7737b74 100644
--- a/myTracks/src/main/res/menu/marker_list.xml
+++ b/myTracks/src/main/res/menu/marker_list.xml
@@ -21,7 +21,6 @@ limitations under the License.
         android:showAsAction="ifRoom" />
     <item
         android:id="@+id/marker_list_search"
-        android:icon="@drawable/ic_menu_search"
         android:title="@string/menu_search"
         android:actionViewClass="android.widget.SearchView"
         android:showAsAction="ifRoom|collapseActionView" />
diff --git a/myTracks/src/main/res/menu/search_list.xml b/myTracks/src/main/res/menu/search_list.xml
index d77269b31..424c4cfbb 100644
--- a/myTracks/src/main/res/menu/search_list.xml
+++ b/myTracks/src/main/res/menu/search_list.xml
@@ -17,7 +17,6 @@ limitations under the License.
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/search_list_search"
-        android:icon="@drawable/ic_menu_search"
         android:title="@string/menu_search"
         android:actionViewClass="android.widget.SearchView"
         app:showAsAction="ifRoom|collapseActionView" />
diff --git a/myTracks/src/main/res/menu/track_list.xml b/myTracks/src/main/res/menu/track_list.xml
index 011794bdc..03b6a1121 100644
--- a/myTracks/src/main/res/menu/track_list.xml
+++ b/myTracks/src/main/res/menu/track_list.xml
@@ -16,7 +16,6 @@ limitations under the License.
 <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="ifRoom" />