diff --git a/src/keepass2android/Resources/menu/entry.xml b/src/keepass2android/Resources/menu/entry.xml
index e2641153..9a08360c 100644
--- a/src/keepass2android/Resources/menu/entry.xml
+++ b/src/keepass2android/Resources/menu/entry.xml
@@ -15,19 +15,20 @@
   You should have received a copy of the GNU General Public License
   along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:id="@+id/menu_lock"
-        android:icon="@android:drawable/ic_lock_lock"
+        android:icon="@drawable/ic_menu_lock"
         android:title="@string/menu_lock"
-        android:showAsAction="ifRoom"
+        app:showAsAction="ifRoom"
     />
     <item android:id="@+id/menu_toggle_pass"
         android:title="@string/show_password"
         android:icon="@android:drawable/ic_menu_view"
-        android:showAsAction="ifRoom"
+        app:showAsAction="ifRoom"
     />
     <item android:id="@+id/menu_donate"
         android:title="@string/menu_donate"
-        android:showAsAction="ifRoom"
+        app:showAsAction="ifRoom"
     />
 </menu>
diff --git a/src/keepass2android/Resources/menu/fileselect.xml b/src/keepass2android/Resources/menu/fileselect.xml
index c21896fd..2d743446 100644
--- a/src/keepass2android/Resources/menu/fileselect.xml
+++ b/src/keepass2android/Resources/menu/fileselect.xml
@@ -15,21 +15,22 @@
   You should have received a copy of the GNU General Public License
   along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
     
     <item android:id="@+id/menu_about"
         android:title="@string/menu_about"
         android:icon="@android:drawable/ic_menu_help"
-        android:showAsAction="ifRoom"
+        app:showAsAction="ifRoom"
     />
     <item android:id="@+id/menu_app_settings"
         android:title="@string/menu_app_settings"
         android:icon="@android:drawable/ic_menu_preferences"
-        android:showAsAction="ifRoom"
+        app:showAsAction="ifRoom"
         
     />
     <item android:id="@+id/menu_donate"
         android:title="@string/menu_donate"
-        android:showAsAction="ifRoom"
+        app:showAsAction="ifRoom"
     />
 </menu>