1 files changed, 19 insertions, 19 deletions
diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml
index 716a426a0..f61172a0a 100644
--- a/OpenKeychain/src/main/res/menu/key_list.xml
+++ b/OpenKeychain/src/main/res/menu/key_list.xml
@@ -5,59 +5,59 @@
     <item
         android:id="@+id/menu_key_list_search"
         android:title="@string/menu_search"
-        android:icon="@drawable/ic_action_search"
+        android:icon="@drawable/ic_search_white_24dp"
         app:actionViewClass="android.support.v7.widget.SearchView"
         app:showAsAction="collapseActionView|always" />
 
     <item
         android:id="@+id/menu_key_list_search_cloud"
-        app:showAsAction="always|withText"
         android:icon="@drawable/ic_action_search_cloud"
-        android:title="@string/menu_add_keys" />
+        android:title="@string/menu_search_cloud"
+        app:showAsAction="ifRoom|withText" />
 
     <item
         android:id="@+id/menu_key_list_add"
-        app:showAsAction="always|withText"
         android:icon="@drawable/ic_action_qr_code"
-        android:title="@string/import_qr_code_button" />
+        android:title="@string/import_qr_code_button"
+        app:showAsAction="ifRoom|withText" />
 
     <item
         android:id="@+id/menu_key_list_export"
-        app:showAsAction="never"
-        android:title="@string/menu_export_all_keys" />
+        android:title="@string/menu_export_all_keys"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/menu_key_list_create"
-        app:showAsAction="never"
-        android:title="@string/menu_create_key" />
+        android:title="@string/menu_create_key"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/menu_key_list_import_existing_key"
-        app:showAsAction="never"
-        android:title="@string/menu_import_existing_key" />
+        android:title="@string/menu_import_existing_key"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/menu_key_list_debug_cons"
-        app:showAsAction="never"
         android:title="Debug / Consolidate"
-        android:visible="false" />
+        android:visible="false"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/menu_key_list_debug_read"
-        app:showAsAction="never"
         android:title="Debug / DB restore"
-        android:visible="false" />
+        android:visible="false"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/menu_key_list_debug_write"
-        app:showAsAction="never"
         android:title="Debug / DB backup"
-        android:visible="false" />
+        android:visible="false"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/menu_key_list_debug_first_time"
-        app:showAsAction="never"
         android:title="Debug / Show first time screen"
-        android:visible="false" />
+        android:visible="false"
+        app:showAsAction="never" />
 
 </menu>