diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d802fcb746048e665e856bb31081f7e23805780b..ee8484e2905e36225600c6f980283f39ddd95027 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3292,22 +3292,6 @@
                 android:value="com.android.settings.gestures.GlobalActionsPanelSettings" />
 	</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 android:priority="6">
-                <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">
diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml
index 6a753f2a009821453489c6bd0de0763cde24a03e..aa9fec6d399855e83151f44b19919b9089bc41d3 100644
--- a/res/xml/system_dashboard_fragment.xml
+++ b/res/xml/system_dashboard_fragment.xml
@@ -21,6 +21,17 @@
     android:title="@string/header_category_system"
     settings:initialExpandedChildrenCount="4">
 
+    <Preference
+	android:key="microg_settings"
+	android:title="@string/micro_g"
+	android:icon="@drawable/ic_microg_settings"
+	android:order="-252"
+	android:fragment="com.android.settings.MicroGSettings">
+	<intent android:action="android.intent.action.MAIN"
+	    android:targetPackage="com.google.android.gms"
+	    android:targetClass="org.microg.gms.ui.SettingsActivity" />
+    </Preference>
+
     <Preference
         android:key="gesture_settings"
         android:title="@string/gesture_preference_title"
@@ -60,4 +71,4 @@
                 android:targetClass="@string/additional_system_update_menu" />
     </Preference>
 
-</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 e76e15f3dbdb2c97ebcf9892c986af2b92dadc33..244ddc00fb86c2618188a6bd744a3b46637282f9 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -286,7 +286,6 @@ public class SettingsGateway {
             MobileNetworkListFragment.class.getName(),
             GlobalActionsPanelSettings.class.getName(),
             DarkModeSettingsFragment.class.getName(),
-            MicroGSettings.class.getName(),
             OpenKeychainSettings.class.getName(),
     };
 
@@ -304,7 +303,6 @@ public class SettingsGateway {
             Settings.SecurityDashboardActivity.class.getName(),
             Settings.AccessibilitySettingsActivity.class.getName(),
             Settings.SystemDashboardActivity.class.getName(),
-	    // Settings.MicroGActivity.class.getName(),
             SupportDashboardActivity.class.getName(),
             // Home page > Network & Internet
             Settings.WifiSettingsActivity.class.getName(),
@@ -321,6 +319,7 @@ public class SettingsGateway {
             // Home page > Security & screen lock
             Settings.LocationSettingsActivity.class.getName(),
             // Home page > System
+	    Settings.MicroGActivity.class.getName(),
             Settings.LanguageAndInputSettingsActivity.class.getName(),
             Settings.DateTimeSettingsActivity.class.getName(),
             Settings.EnterprisePrivacySettingsActivity.class.getName(),