diff --git a/res/drawable/ic_e_settings_parental_control.xml b/res/drawable/ic_e_settings_parental_control.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cbc6bae71605fb33ad1ebc7563b20b80e39344c4
--- /dev/null
+++ b/res/drawable/ic_e_settings_parental_control.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2024
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <group>
+    <clip-path
+        android:pathData="M0,0h32v32h-32z"/>
+    <path
+        android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z"
+        android:fillColor="#953EB4"/>
+    <path
+        android:pathData="M18.5,15.75C19.19,15.75 19.75,15.19 19.75,14.5C19.75,13.81 19.19,13.25 18.5,13.25C17.81,13.25 17.25,13.81 17.25,14.5C17.25,15.19 17.81,15.75 18.5,15.75Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M13.5,15.75C14.19,15.75 14.75,15.19 14.75,14.5C14.75,13.81 14.19,13.25 13.5,13.25C12.81,13.25 12.25,13.81 12.25,14.5C12.25,15.19 12.81,15.75 13.5,15.75Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M16,21C18.01,21 19.74,19.77 20.5,18H11.5C12.26,19.77 13.99,21 16,21Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M23.859,19.497C22.519,22.503 19.506,24.6 16,24.6C12.494,24.6 9.481,22.503 8.141,19.497C6.568,19.112 5.4,17.692 5.4,16C5.4,14.308 6.568,12.888 8.141,12.503C9.481,9.497 12.494,7.4 16,7.4C19.506,7.4 22.519,9.497 23.859,12.503C25.432,12.888 26.6,14.308 26.6,16C26.6,17.692 25.432,19.112 23.859,19.497ZM22.716,17.98C21.862,20.882 19.178,23 16,23C12.822,23 10.138,20.882 9.284,17.98C9.191,17.993 9.096,18 9,18C7.895,18 7,17.105 7,16C7,14.896 7.895,14 9,14C9.096,14 9.191,14.007 9.284,14.02C10.138,11.118 12.822,9 16,9C19.178,9 21.862,11.118 22.716,14.02C22.809,14.007 22.904,14 23,14C24.105,14 25,14.896 25,16C25,17.105 24.105,18 23,18C22.904,18 22.809,17.993 22.716,17.98Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+  </group>
+</vector>
diff --git a/res/layout/admin_support_details_dialog.xml b/res/layout/admin_support_details_dialog.xml
index 0233a1b4694d6093f45e6a6856ff962c649e20dd..be0c00d78ab59d4b8987f0f26aa1b267edf2a6d7 100644
--- a/res/layout/admin_support_details_dialog.xml
+++ b/res/layout/admin_support_details_dialog.xml
@@ -40,7 +40,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
             android:gravity="center_horizontal"
-            android:text="@string/disabled_by_policy_title"
+            android:text="@string/e_disabled_by_policy_title"
             android:textAppearance="@style/TextAppearance.AdminDialogTitle"/>
     </LinearLayout>
 
diff --git a/res/values/e_strings.xml b/res/values/e_strings.xml
index 2f8dfa8140cf02c2d94992b95c5dc1f10e0f5d72..c54174b77e2439fc12bf11211baa15b987dcf35a 100644
--- a/res/values/e_strings.xml
+++ b/res/values/e_strings.xml
@@ -62,4 +62,9 @@
     <string name="e_version_reboot_pending_summary">/e/OS v<xliff:g id="version" example="6.0">%1$s</xliff:g> - installed reboot required</string>
 
     <string name="e_developer_options">/e/OS developer options</string>
+
+    <string name="parental_control_dashboard_title">Parental control</string>
+    <string name="parental_control_dashboard_summary">Helps parent to control child device</string>
+
+    <string name="e_disabled_by_policy_title">"This setting is blocked"</string>
 </resources>
\ No newline at end of file
diff --git a/res/xml/parental_control_dashboard_settings.xml b/res/xml/parental_control_dashboard_settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6565301b8f002f3a466c88720ea9b2a76e7a55f7
--- /dev/null
+++ b/res/xml/parental_control_dashboard_settings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2019-2024 Murena SAS
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="parental_control"
+    android:title="@string/parental_control_dashboard_title">
+
+    <Preference>
+        <intent android:action="android.intent.action.MAIN"
+            android:targetPackage="foundation.e.parentalcontrol"
+            android:targetClass="foundation.e.parentalcontrol.MainActivity" />
+    </Preference>
+</PreferenceScreen>
diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml
index 4e4755bc7ec10501e785a89e5fc5ae0c5fe4ed17..e16187113198b025f730caf6e768843fc360597f 100644
--- a/res/xml/top_level_settings.xml
+++ b/res/xml/top_level_settings.xml
@@ -165,6 +165,14 @@
         android:order="-35"
         android:fragment="com.android.settings.privacy.AdvancedPrivacyDashboardFragment"/>
 
+    <com.android.settings.widget.HomepagePreference
+        android:key="top_level_parental_control"
+        android:title="@string/parental_control_dashboard_title"
+        android:summary="@string/parental_control_dashboard_summary"
+        android:icon="@drawable/ic_e_settings_parental_control"
+        android:order="-32"
+        android:fragment="com.android.settings.privacy.ParentalControlDashboardFragment"/>
+
     <com.android.settings.widget.HomepagePreference
         android:fragment="com.android.settings.location.LocationSettings"
         android:icon="@drawable/ic_settings_location"
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 2bbb36818fafd1c5cc449bc1bf2aa2e8f358a030..58b9cceef79b548ca7264a8aa3d53f935897f5b8 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -143,6 +143,7 @@ import com.android.settings.password.ChooseLockPattern;
 import com.android.settings.print.PrintJobSettingsFragment;
 import com.android.settings.print.PrintSettingsFragment;
 import com.android.settings.privacy.AdvancedPrivacyDashboardFragment;
+import com.android.settings.privacy.ParentalControlDashboardFragment;
 import com.android.settings.privacy.PrivacyDashboardFragment;
 import com.android.settings.security.CryptKeeperSettings;
 import com.android.settings.security.LockscreenDashboardFragment;
@@ -326,6 +327,7 @@ public class SettingsGateway {
             AlarmsAndRemindersDetails.class.getName(),
             MediaManagementAppsDetails.class.getName(),
             AdvancedPrivacyDashboardFragment.class.getName(),
+            ParentalControlDashboardFragment.class.getName()
     };
 
     public static final String[] SETTINGS_FOR_RESTRICTED = {
diff --git a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
index af8318b86c05371e9d09f784b0f39a99a8b40552..6ac664ffc574437270f54c1ff1874a6c9ae2296c 100644
--- a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
+++ b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
@@ -42,6 +42,7 @@ import com.android.settings.notification.ConfigureNotificationSettings;
 import com.android.settings.notification.SoundSettings;
 import com.android.settings.notification.zen.ZenModeSettings;
 import com.android.settings.privacy.AdvancedPrivacyDashboardFragment;
+import com.android.settings.privacy.ParentalControlDashboardFragment;
 import com.android.settings.privacy.PrivacyDashboardFragment;
 import com.android.settings.security.LockscreenDashboardFragment;
 import com.android.settings.security.SecuritySettings;
@@ -115,6 +116,8 @@ public class DashboardFragmentRegistry {
                 CategoryKey.CATEGORY_PRIVACY);
         PARENT_TO_CATEGORY_KEY_MAP.put(AdvancedPrivacyDashboardFragment.class.getName(),
                 CategoryKey.CATEGORY_PRIVACY);
+        PARENT_TO_CATEGORY_KEY_MAP.put(ParentalControlDashboardFragment.class.getName(),
+                CategoryKey.CATEGORY_PRIVACY);
         PARENT_TO_CATEGORY_KEY_MAP.put(EnterprisePrivacySettings.class.getName(),
                 CategoryKey.CATEGORY_ENTERPRISE_PRIVACY);
         PARENT_TO_CATEGORY_KEY_MAP.put(LegalSettings.class.getName(),
diff --git a/src/com/android/settings/display/ScreenTimeoutPreferenceController.java b/src/com/android/settings/display/ScreenTimeoutPreferenceController.java
index 2a3359a04b3e1e31acbb067c6603f5e6966f377b..26c6735a190399a41b23a3b25f9132f4dd5d1463 100644
--- a/src/com/android/settings/display/ScreenTimeoutPreferenceController.java
+++ b/src/com/android/settings/display/ScreenTimeoutPreferenceController.java
@@ -60,7 +60,7 @@ public class ScreenTimeoutPreferenceController extends BasePreferenceController
         final RestrictedLockUtils.EnforcedAdmin admin = getPreferenceDisablingAdmin(maxTimeout);
         if (admin != null) {
             preference.setEnabled(false);
-            preference.setSummary(mContext.getText(R.string.disabled_by_policy_title));
+            preference.setSummary(mContext.getText(R.string.e_disabled_by_policy_title));
             ((RestrictedPreference) preference).setDisabledByAdmin(admin);
         } else {
             preference.setSummary(getTimeoutSummary(maxTimeout));
diff --git a/src/com/android/settings/enterprise/DeviceAdminStringProviderImpl.java b/src/com/android/settings/enterprise/DeviceAdminStringProviderImpl.java
index 5d11d4ab3a647c33f08bc15d3a1a87589c9f4f74..266c90768813ae4c17ae357072cfbd20ff7213c7 100644
--- a/src/com/android/settings/enterprise/DeviceAdminStringProviderImpl.java
+++ b/src/com/android/settings/enterprise/DeviceAdminStringProviderImpl.java
@@ -32,7 +32,7 @@ class DeviceAdminStringProviderImpl implements DeviceAdminStringProvider {
 
     @Override
     public String getDefaultDisabledByPolicyTitle() {
-        return mContext.getString(R.string.disabled_by_policy_title);
+        return mContext.getString(R.string.e_disabled_by_policy_title);
     }
 
     @Override
diff --git a/src/com/android/settings/privacy/ParentalControlDashboardFragment.java b/src/com/android/settings/privacy/ParentalControlDashboardFragment.java
new file mode 100644
index 0000000000000000000000000000000000000000..bc85c3d65f394d5c0cc44c032d4a8985c89132b7
--- /dev/null
+++ b/src/com/android/settings/privacy/ParentalControlDashboardFragment.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2019-2022 ECORP SAS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.privacy;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
+
+import com.android.settings.R;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+@SearchIndexable
+public class ParentalControlDashboardFragment extends Fragment {
+
+    private static final String parentalControlPackageName = "foundation.e.parentalcontrol";
+    private static final String parentalControlActivityName = "foundation.e.parentalcontrol.MainActivity";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Activity activity = getActivity();
+        Intent intent = new Intent().setComponent(new ComponentName(parentalControlPackageName,
+                parentalControlActivityName));
+        startActivity(intent);
+
+        if (activity != null) {
+            activity.finish();
+        }
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.parental_control_dashboard_settings);
+}
\ No newline at end of file
diff --git a/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java
index abeef2d2a0a5abff99d460204c478de616f4b11d..5da1087e0f3d920b8219a2f78fbd5168c576f11f 100644
--- a/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java
+++ b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java
@@ -123,7 +123,7 @@ public class LockAfterTimeoutPreferenceController extends AbstractPreferenceCont
     private void updateLockAfterPreferenceSummary(TimeoutListPreference preference) {
         final CharSequence summary;
         if (preference.isDisabledByAdmin()) {
-            summary = mContext.getText(R.string.disabled_by_policy_title);
+            summary = mContext.getText(R.string.e_disabled_by_policy_title);
         } else {
             // Update summary message with current value
             long currentTimeout = Settings.Secure.getLong(mContext.getContentResolver(),