diff --git a/res/menu/profile_chat.xml b/res/menu/profile_chat.xml
index 0fcaa467e..4d5529f3a 100644
--- a/res/menu/profile_chat.xml
+++ b/res/menu/profile_chat.xml
@@ -2,11 +2,6 @@
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item android:title="@string/menu_group_name_and_image"
-          android:id="@+id/edit_group_name_and_image"
-          android:icon="@drawable/ic_create_white_24dp"
-          app:showAsAction="always"/>
-
     <item android:title="@string/menu_mute"
           android:id="@+id/menu_mute_notifications"
           app:showAsAction="never"/>
diff --git a/res/menu/profile_common.xml b/res/menu/profile_common.xml
new file mode 100644
index 000000000..10ea9319f
--- /dev/null
+++ b/res/menu/profile_common.xml
@@ -0,0 +1,11 @@
+<?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">
+
+    <!-- android:icon="@drawable/ic_create_white_24dp" app:showAsAction="always" is not needed as the image is already shown
+     and editing group images and names is not an action that is used every time the profile is opened -->
+    <item android:title="@string/menu_group_name_and_image"
+          android:id="@+id/edit_name_etc"
+          app:showAsAction="never"/>
+
+</menu>
diff --git a/res/menu/profile_contact.xml b/res/menu/profile_contact.xml
index bd7d92a5a..83d96bf2b 100644
--- a/res/menu/profile_contact.xml
+++ b/res/menu/profile_contact.xml
@@ -2,11 +2,6 @@
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item android:title="@string/menu_edit_name"
-          android:id="@+id/edit_contact_name"
-          android:icon="@drawable/ic_create_white_24dp"
-          app:showAsAction="always"/>
-
     <item android:title="@string/profile_encryption"
           android:id="@+id/show_encr_info"
           app:showAsAction="never"/>
diff --git a/src/org/thoughtcrime/securesms/ProfileActivity.java b/src/org/thoughtcrime/securesms/ProfileActivity.java
index fdeaa4e6c..94ad555ff 100644
--- a/src/org/thoughtcrime/securesms/ProfileActivity.java
+++ b/src/org/thoughtcrime/securesms/ProfileActivity.java
@@ -90,12 +90,14 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
   public boolean onCreateOptionsMenu(Menu menu) {
     MenuInflater inflater = getMenuInflater();
 
+    inflater.inflate(R.menu.profile_common, menu);
+    if (!chatIsGroup) {
+      menu.findItem(R.id.edit_name_etc).setTitle(R.string.menu_edit_name);
+    }
+
     if (!isSelfProfile()) {
       if (chatId != 0) {
         inflater.inflate(R.menu.profile_chat, menu);
-        if (!chatIsGroup) {
-          menu.findItem(R.id.edit_group_name_and_image).setVisible(false);
-        }
       }
 
       if (isContactProfile()) {
@@ -298,11 +300,13 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
       case R.id.menu_vibrate:
         onVibrateSettings();
         break;
-      case R.id.edit_group_name_and_image:
-        onEditGroupNameAndImage();
-        break;
-      case R.id.edit_contact_name:
-        onEditContactName();
+      case R.id.edit_name_etc:
+        if (chatIsGroup) {
+          onEditGroupNameAndImage();
+        }
+        else {
+          onEditContactName();
+        }
         break;
       case R.id.show_encr_info:
         onEncrInfo();