diff --git a/res/drawable-hdpi/ic_action_search.png b/res/drawable-hdpi/ic_action_search.png
new file mode 100644
index 00000000..bbfbc96c
Binary files /dev/null and b/res/drawable-hdpi/ic_action_search.png differ
diff --git a/res/drawable-mdpi/ic_action_search.png b/res/drawable-mdpi/ic_action_search.png
new file mode 100644
index 00000000..faefc59c
Binary files /dev/null and b/res/drawable-mdpi/ic_action_search.png differ
diff --git a/res/drawable-xhdpi/ic_action_search.png b/res/drawable-xhdpi/ic_action_search.png
new file mode 100644
index 00000000..bfc3e393
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_search.png differ
diff --git a/res/drawable-xxhdpi/ic_action_search.png b/res/drawable-xxhdpi/ic_action_search.png
new file mode 100644
index 00000000..abbb9895
Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_search.png differ
diff --git a/res/drawable-xxxhdpi/ic_action_search.png b/res/drawable-xxxhdpi/ic_action_search.png
new file mode 100644
index 00000000..dd5adfc7
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_action_search.png differ
diff --git a/src/ch/blinkenlights/android/vanilla/LibraryActivity.java b/src/ch/blinkenlights/android/vanilla/LibraryActivity.java
index c3f55f5c..eb685285 100644
--- a/src/ch/blinkenlights/android/vanilla/LibraryActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/LibraryActivity.java
@@ -814,7 +814,14 @@ public class LibraryActivity
 		// Call super after adding the now-playing view as this should be the first item
 		super.onCreateOptionsMenu(menu);
 
-		mSearchMenuItem = menu.add(0, MENU_SEARCH, 0, R.string.search).setIcon(R.drawable.ic_menu_search);
+		// Check if we're running on Android 5.0 or higher
+		if (ThemeHelper.usesHoloTheme()) {
+				// Keep using the old icon
+				mSearchMenuItem = menu.add(0, MENU_SEARCH, 0, R.string.search).setIcon(R.drawable.ic_menu_search);
+		} else {
+				// Use the new material search icon
+				mSearchMenuItem = menu.add(0, MENU_SEARCH, 0, R.string.search).setIcon(R.drawable.ic_action_search);
+		}
 		mSearchMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW | MenuItem.SHOW_AS_ACTION_ALWAYS);
 		SearchView mSearchView = new SearchView(getActionBar().getThemedContext());
 		mSearchView.setOnQueryTextListener(this);