diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e0ccdfb68f2cecea2210a7eb05f468721f8b6654..7f89099bdf2faf599bdc52e3ea8740510610850f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3326,37 +3326,6 @@
         </activity>
 
         <!-- /e/ specific changes -->
-       <!-- <activity android:name="Settings$MicroGActivity"
-            android:label="@string/micro_g"
-            android:icon="@drawable/ic_homepage_microg">
-            <intent-filter android:priority="1">
-                <action android:name="android.settings.MICROG_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="com.android.settings.action.SETTINGS" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.ia.homepage" />
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.MicroGSettings" />
-        </activity>-->
-
-        <activity android:name="Settings$OpenKeychainActivity"
-            android:label="@string/open_keychain"
-            android:icon="@drawable/ic_homepage_openkeychain">
-            <intent-filter android:priority="1">
-                <action android:name="android.settings.OPENKEYCHAIN_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="com.android.settings.action.SETTINGS" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.ia.homepage" />
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.OpenKeychainSettings" />
-        </activity>
 
         <!-- This is the longest AndroidManifest.xml ever. -->
     </application>
diff --git a/res/drawable/ic_homepage_openkeychain.xml b/res/drawable/ic_homepage_openkeychain.xml
index 631517bd4f8f0656cc5bb442216b166509294146..407813e7e11f6da210b22081bb3c5ba7b89c39cb 100644
--- a/res/drawable/ic_homepage_openkeychain.xml
+++ b/res/drawable/ic_homepage_openkeychain.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="32"
     android:viewportHeight="32">
 
diff --git a/res/xml/security_settings_status.xml b/res/xml/security_settings_status.xml
index 59057ac180a4a661193593525ece65f466d2bc9a..8ba291a6304200ec7af290e4f9a89d664be1d8ee 100644
--- a/res/xml/security_settings_status.xml
+++ b/res/xml/security_settings_status.xml
@@ -18,7 +18,20 @@
                   android:title="@string/security_privacy_settings_title">
 
     <PreferenceCategory
+        android:order="-10"
         android:key="security_status"
         android:title="@string/security_status_title"/>
 
+    <Preference
+        android:key="open_keychain_settings"
+        android:title="@string/open_keychain"
+        android:icon="@drawable/ic_homepage_openkeychain"
+        android:order="75">
+        <intent android:action="android.intent.action.MAIN"
+            android:targetPackage="org.sufficientlysecure.keychain"
+            android:targetClass="org.sufficientlysecure.keychain.ui.MainActivity" />
+    </Preference>
+
+
+
 </PreferenceScreen>
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 15849223dcc0f0a4a789dbd82d0e655c12276967..a223838900e1274f41bb2d69368e356f82ac7b38 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -257,7 +257,6 @@ public class SettingsGateway {
             BluetoothDeviceDetailsFragment.class.getName(),
             DataUsageList.class.getName(),
             MicroGSettings.class.getName(),
-            OpenKeychainSettings.class.getName(),
             SystemUpdaterSettings.class.getName()
 
     };