diff --git a/src/main/java/com/nutomic/syncthingandroid/gui/NodeSettingsActivity.java b/src/main/java/com/nutomic/syncthingandroid/gui/NodeSettingsActivity.java
index e8cf40f4..f2f04bf6 100644
--- a/src/main/java/com/nutomic/syncthingandroid/gui/NodeSettingsActivity.java
+++ b/src/main/java/com/nutomic/syncthingandroid/gui/NodeSettingsActivity.java
@@ -141,7 +141,7 @@ public class NodeSettingsActivity extends PreferenceActivity implements
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		getMenuInflater().inflate(R.menu.node_settings, menu);
-		return super.onCreateOptionsMenu(menu);
+		return true;
 	}
 
 	@Override
diff --git a/src/main/java/com/nutomic/syncthingandroid/gui/RepoSettingsActivity.java b/src/main/java/com/nutomic/syncthingandroid/gui/RepoSettingsActivity.java
index bcaf987a..e5d6e2e2 100644
--- a/src/main/java/com/nutomic/syncthingandroid/gui/RepoSettingsActivity.java
+++ b/src/main/java/com/nutomic/syncthingandroid/gui/RepoSettingsActivity.java
@@ -176,7 +176,7 @@ public class RepoSettingsActivity extends PreferenceActivity
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		getMenuInflater().inflate(R.menu.repo_settings, menu);
-		return super.onCreateOptionsMenu(menu);
+		return true;
 	}
 
 	@Override
diff --git a/src/main/res/menu/node_settings.xml b/src/main/res/menu/node_settings.xml
index 96081d0a..1f2389e7 100644
--- a/src/main/res/menu/node_settings.xml
+++ b/src/main/res/menu/node_settings.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<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/create"
-			android:title="@string/create" />
+			android:title="@string/create"
+			android:showAsAction="always" />
 
 	<item
 			android:id="@+id/share_node_id"
 			android:icon="@android:drawable/ic_menu_share"
 			android:title="@string/share_node_id"
-			app:showAsAction="ifRoom" />
+			android:showAsAction="always" />
 
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/repo_settings.xml b/src/main/res/menu/repo_settings.xml
index b73bbab2..e24eecef 100644
--- a/src/main/res/menu/repo_settings.xml
+++ b/src/main/res/menu/repo_settings.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
 	<item
 			android:id="@+id/create"
-			android:title="@string/create" />
+			android:title="@string/create"
+			android:showAsAction="always" />
 </menu>
\ No newline at end of file