diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bc2db4efad5203ebe477061fbfb31627bd44f6ba..f3b3d2daf434e636eb5044c138fc281631d8a657 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3409,7 +3409,7 @@
                  android:permission="android.permission.BIND_JOB_SERVICE" />
 
 	<!-- /e/ specific changes -->
-        <activity android:name="Settings$OpenKeychainActivity"
+      <!--  <activity android:name="Settings$OpenKeychainActivity"
             android:label="@string/open_keychain"
             android:icon="@drawable/ic_homepage_openkeychain">
             <intent-filter android:priority="1">
@@ -3423,7 +3423,7 @@
                 android:value="com.android.settings.category.ia.homepage" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.OpenKeychainSettings" />
-        </activity>
+        </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 bd74db90faee9a739f3291f295fdc2f77aab53c2..9a3c37e6314e7c6d77b3c9336c3f49b01037dcf3 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="@dimen/dashboard_tile_image_size"
-    android:height="@dimen/dashboard_tile_image_size"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="32"
     android:viewportHeight="32">
 
@@ -23,4 +23,4 @@
         android:fillColor="#ffffff"
         android:fillType="evenOdd"
         android:pathData="M16.9823 4.87792C15.4315 4.87792 14.182 6.12744 14.182 7.67821C14.182 8.45204 14.4979 9.15714 15.0119 9.67118C15.3206 9.97985 15.3206 10.4803 15.0119 10.789C14.7032 11.0976 14.2028 11.0976 13.8941 10.789C13.0983 9.99321 12.6012 8.89167 12.6012 7.67821C12.6012 5.25438 14.5585 3.29712 16.9823 3.29712C19.3996 3.29712 21.386 5.24794 21.386 7.67821C21.386 8.11473 21.0321 8.46861 20.5955 8.46861C20.159 8.46861 19.8051 8.11473 19.8051 7.67821C19.8051 6.13387 18.5395 4.87792 16.9823 4.87792Z" />
-</vector>
\ No newline at end of file
+</vector>
diff --git a/res/xml/security_dashboard_settings.xml b/res/xml/security_dashboard_settings.xml
index 591d8a7c21881fe0eb738114558e4fa3b1dd5e64..d954d0777ffcab33179bad162713b57f8f064337 100644
--- a/res/xml/security_dashboard_settings.xml
+++ b/res/xml/security_dashboard_settings.xml
@@ -28,6 +28,17 @@
         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>
+
     <PreferenceCategory
         android:order="1"
         android:key="dashboard_tile_placeholder" />
@@ -165,4 +176,4 @@
         android:summary="@string/summary_placeholder"
         android:fragment="com.android.settings.security.ScreenPinningSettings" />
 
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index de787ac655f1e507eeea50037ec645e9af81badd..b21005a28061772a5f4cd7884ef3dea356869a1f 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -266,7 +266,7 @@ public class SettingsGateway {
             DirectoryAccessDetails.class.getName(),
             ToggleBackupSettingFragment.class.getName(),
             PreviouslyConnectedDeviceDashboardFragment.class.getName(),
-            OpenKeychainSettings.class.getName(),
+        //     OpenKeychainSettings.class.getName(),
             SystemUpdaterSettings.class.getName(),
     };