diff --git a/TODO b/TODO
index a584fc9..b33a312 100644
--- a/TODO
+++ b/TODO
@@ -7,7 +7,6 @@ Fixes:
 -- Show full network error? Make it copy-able?
 
 Tasks:
-- Move "New Identity" action to list item
 - Subclass EmailListFragment for each default mailbox
 - Refactor code
 -- Reorganize for clarity
diff --git a/res/menu/settings.xml b/res/menu/settings.xml
deleted file mode 100644
index 54b3062..0000000
--- a/res/menu/settings.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/action_new_identity"
-        android:icon="@drawable/ic_device_access_new_account"
-        android:title="@string/new_identity"
-        android:showAsAction="ifRoom"/>
-
-</menu>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8cb579c..cc15c7c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -121,7 +121,7 @@
     <string name="password_changed">Password changed successfully</string>
 
     <string name="pref_title_identities">Identities</string>
-    <string name="new_identity">New identity</string>
+    <string name="new_identity">New identity...</string>
     <string name="edit_identity">Edit identity</string>
     <string name="public_name">Public name</string>
     <string name="description">Description</string>
diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index bc494aa..8066646 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -17,5 +17,12 @@
     <header
         android:id="@+id/identity_settings"
         android:title="@string/pref_title_identities" />
+    <header
+        android:id="@+id/new_identity"
+        android:title="@string/new_identity" >
+        <intent
+            android:targetClass="i2p.bote.android.config.EditIdentityActivity"
+            android:targetPackage="i2p.bote.android" />
+    </header>
 
 </preference-headers>
\ No newline at end of file
diff --git a/res/xml/settings_headers_legacy.xml b/res/xml/settings_headers_legacy.xml
index df69696..468f2c9 100644
--- a/res/xml/settings_headers_legacy.xml
+++ b/res/xml/settings_headers_legacy.xml
@@ -12,5 +12,6 @@
             android:targetClass="i2p.bote.android.config.SetPasswordActivity"
             android:targetPackage="i2p.bote.android" />
     </Preference>
+    <Preference android:title="@string/new_identity" />
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/src/i2p/bote/android/config/SettingsActivity.java b/src/i2p/bote/android/config/SettingsActivity.java
index 6d849b8..5f99270 100644
--- a/src/i2p/bote/android/config/SettingsActivity.java
+++ b/src/i2p/bote/android/config/SettingsActivity.java
@@ -15,7 +15,6 @@ import java.util.List;
 import java.util.Map;
 
 import android.annotation.TargetApi;
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -31,8 +30,6 @@ import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
@@ -113,35 +110,6 @@ public class SettingsActivity extends PreferenceActivity {
         super.onPause();
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu
-        getMenuInflater().inflate(R.menu.settings, menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-        case R.id.action_new_identity:
-            Intent ni = new Intent(this, EditIdentityActivity.class);
-            startActivityForResult(ni, ALTER_IDENTITY_LIST);
-            return true;
-
-        default:
-            return super.onOptionsItemSelected(item);
-        }
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == ALTER_IDENTITY_LIST) {
-            if (resultCode == Activity.RESULT_OK) {
-                updateIdentities();
-            }
-        }
-    }
-
     @Override
     protected boolean isValidFragment(String fragmentName) {
         return SettingsFragment.class.getName().equals(fragmentName);