diff --git a/docs/en/UI/Angular/Component-Replacement.md b/docs/en/UI/Angular/Component-Replacement.md
index f1f890537a..b17c61ae73 100644
--- a/docs/en/UI/Angular/Component-Replacement.md
+++ b/docs/en/UI/Angular/Component-Replacement.md
@@ -31,18 +31,22 @@ export class AppComponent {
 
 ## Available Replaceable Components
 
-| Component key                                      | Description             |
-|----------------------------------------------------|-------------------------|
-| Account.LoginComponent                             | Login page              |
-| Account.RegisterComponent                          | Register page           |
-| Account.ManageProfileComponent                     | Manage Profile page     |
-| Account.AuthWrapperComponent                             | This component wraps register and login pages |
-| Account.ChangePasswordComponent                             | Change password form |
-| Account.PersonalSettingsComponent                             | Personal settings form |
-| Account.TenantBoxComponentInputs                             | Tenant changing box |
-| FeatureManagement.FeatureManagementComponent       | Features modal          |
-| Identity.UsersComponent                            | Users page              |
-| Identity.RolesComponent                            | Roles page              |
-| PermissionManagement.PermissionManagementComponent | Permissions modal       |
-| SettingManagement.SettingManagementComponent       | Setting Management page |
-| TenantManagement.TenantsComponent                  | Tenants page            |
\ No newline at end of file
+| Component key                                      | Description                                   |
+| -------------------------------------------------- | --------------------------------------------- |
+| Account.LoginComponent                             | Login page                                    |
+| Account.RegisterComponent                          | Register page                                 |
+| Account.ManageProfileComponent                     | Manage Profile page                           |
+| Account.AuthWrapperComponent                       | This component wraps register and login pages |
+| Account.ChangePasswordComponent                    | Change password form                          |
+| Account.PersonalSettingsComponent                  | Personal settings form                        |
+| Account.TenantBoxComponentInputs                   | Tenant changing box                           |
+| FeatureManagement.FeatureManagementComponent       | Features modal                                |
+| Identity.UsersComponent                            | Users page                                    |
+| Identity.RolesComponent                            | Roles page                                    |
+| PermissionManagement.PermissionManagementComponent | Permissions modal                             |
+| SettingManagement.SettingManagementComponent       | Setting Management page                       |
+| TenantManagement.TenantsComponent                  | Tenants page                                  |
+
+## What's Next?
+
+- [Custom Setting Page](./Custom-Setting-Page.md)
diff --git a/docs/en/UI/Angular/AddingSettingTab.md b/docs/en/UI/Angular/Custom-Setting-Page.md
similarity index 74%
rename from docs/en/UI/Angular/AddingSettingTab.md
rename to docs/en/UI/Angular/Custom-Setting-Page.md
index 2eb4e9bb61..496067fa76 100644
--- a/docs/en/UI/Angular/AddingSettingTab.md
+++ b/docs/en/UI/Angular/Custom-Setting-Page.md
@@ -1,4 +1,4 @@
-## Creating a Settings Tab
+# Custom Setting Page
 
 There are several settings tabs from different modules. You can add custom settings tabs to your project in 3 steps.
 
@@ -11,12 +11,11 @@ import { Component } from '@angular/core';
 @Component({
   selector: 'app-your-custom-settings',
   template: `
-    your-custom-settings works! mySetting: {%{{{ mySetting$ | async }}}%}
+    custom-settings works! 
   `,
 })
 export class YourCustomSettingsComponent {
-  @Select(ConfigState.getSetting('MyProjectName.MySetting1')) // Gets a setting. MyProjectName.MySetting1 is a setting key.
-  mySetting$: Observable<string>; // The selected setting is set to the mySetting variable as Observable.
+  // Your component logic
 }
 ```
 
diff --git a/docs/en/UI/Angular/images/custom-settings.png b/docs/en/UI/Angular/images/custom-settings.png
index 32d7516849..05dd3f695a 100644
Binary files a/docs/en/UI/Angular/images/custom-settings.png and b/docs/en/UI/Angular/images/custom-settings.png differ
diff --git a/docs/en/docs-nav.json b/docs/en/docs-nav.json
index c3af945e85..9cd9db14f7 100644
--- a/docs/en/docs-nav.json
+++ b/docs/en/docs-nav.json
@@ -328,6 +328,10 @@
             {
               "text": "Component Replacement",
               "path": "UI/Angular/Component-Replacement.md"
+            },
+            {
+              "text": "Custom Setting Page",
+              "path": "UI/Angular/Custom-Setting-Page.md"
             }
           ]
         }