diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs
index 8bfee863b1..87882015fc 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs
@@ -1,15 +1,24 @@
 using Volo.Abp.AspNetCore.Components.Web.Theming;
+using Volo.Abp.FeatureManagement.Blazor.Settings;
 using Volo.Abp.Features;
 using Volo.Abp.Modularity;
+using Volo.Abp.SettingManagement.Blazor;
 
 namespace Volo.Abp.FeatureManagement.Blazor;
 
 [DependsOn(
     typeof(AbpAspNetCoreComponentsWebThemingModule),
     typeof(AbpFeatureManagementApplicationContractsModule),
-    typeof(AbpFeaturesModule)
+    typeof(AbpFeaturesModule),
+    typeof(AbpSettingManagementBlazorModule)
 )]
 public class AbpFeatureManagementBlazorModule : AbpModule
 {
-
+    public override void ConfigureServices(ServiceConfigurationContext context)
+    {
+        Configure<SettingManagementComponentOptions>(options =>
+        {
+            options.Contributors.Add(new FeatureSettingManagementComponentContributor());
+        });
+    }
 }
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureSettingGroup/FeatureSettingManagementComponent.razor b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureSettingGroup/FeatureSettingManagementComponent.razor
new file mode 100644
index 0000000000..15f8e65ee4
--- /dev/null
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureSettingGroup/FeatureSettingManagementComponent.razor
@@ -0,0 +1,12 @@
+@inherits Volo.Abp.AspNetCore.Components.AbpComponentBase
+
+@if (Settings != null && Settings.HasManageHostFeaturesPermission)
+{
+    <Form>
+        <Button Color="Color.Primary" onclick="@OnManageHostFeaturesClicked">
+            <Icon Name="@("fa-cog")"/> @L["ManageHostFeatures"]
+        </Button>
+    </Form>
+    
+    <FeatureManagementModal @ref="FeatureManagementModal"/>
+}
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureSettingGroup/FeatureSettingManagementComponent.razor.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureSettingGroup/FeatureSettingManagementComponent.razor.cs
new file mode 100644
index 0000000000..09b31b9609
--- /dev/null
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureSettingGroup/FeatureSettingManagementComponent.razor.cs
@@ -0,0 +1,40 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+using Microsoft.Extensions.Localization;
+using Volo.Abp.AspNetCore.Components;
+using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.FeatureManagement.Localization;
+using Volo.Abp.Features;
+
+namespace Volo.Abp.FeatureManagement.Blazor.Components.FeatureSettingGroup;
+
+public partial class FeatureSettingManagementComponent : AbpComponentBase
+{
+    [Inject]
+    protected IStringLocalizer<AbpFeatureManagementResource> L { get; set; }
+    
+    [Inject]
+    protected PermissionChecker PermissionChecker { get; set; }
+    
+    protected FeatureManagementModal FeatureManagementModal;
+    
+    protected FeatureSettingViewModel Settings;
+
+    protected async override Task OnInitializedAsync()
+    {
+        Settings = new FeatureSettingViewModel 
+        {
+            HasManageHostFeaturesPermission = await PermissionChecker.IsGrantedAsync(FeatureManagementPermissions.ManageHostFeatures)
+        };
+    }
+
+    protected virtual async Task OnManageHostFeaturesClicked()
+    {
+       await FeatureManagementModal.OpenAsync(TenantFeatureValueProvider.ProviderName);
+    }
+}
+
+public class FeatureSettingViewModel
+{
+    public bool HasManageHostFeaturesPermission { get; set; }
+}
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Settings/FeatureSettingManagementComponentContributor.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Settings/FeatureSettingManagementComponentContributor.cs
new file mode 100644
index 0000000000..caeb17de26
--- /dev/null
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Settings/FeatureSettingManagementComponentContributor.cs
@@ -0,0 +1,41 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Localization;
+using Volo.Abp.FeatureManagement.Blazor.Components.FeatureSettingGroup;
+using Volo.Abp.FeatureManagement.Localization;
+using Volo.Abp.SettingManagement.Blazor;
+
+namespace Volo.Abp.FeatureManagement.Blazor.Settings;
+
+public class FeatureSettingManagementComponentContributor: ISettingComponentContributor
+{
+    public virtual async Task ConfigureAsync(SettingComponentCreationContext context)
+    {
+        if (!await CheckPermissionsInternalAsync(context))
+        {
+            return;
+        }
+
+        var l = context.ServiceProvider.GetRequiredService<IStringLocalizer<AbpFeatureManagementResource>>();
+        context.Groups.Add(
+            new SettingComponentGroup(
+                "Volo.Abp.Feature",
+                l["Permission:FeatureManagement"],
+                typeof(FeatureSettingManagementComponent)
+            )
+        );
+    }
+
+    public virtual async Task<bool> CheckPermissionsAsync(SettingComponentCreationContext context)
+    {
+        return await CheckPermissionsInternalAsync(context);
+    }
+
+    protected virtual async Task<bool> CheckPermissionsInternalAsync(SettingComponentCreationContext context)
+    {
+        var authorizationService = context.ServiceProvider.GetRequiredService<IAuthorizationService>();
+
+        return await authorizationService.IsGrantedAsync(FeatureManagementPermissions.ManageHostFeatures);
+    }
+}
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj
index 22dab36cff..49d7ffd6c6 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj
@@ -14,6 +14,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\Volo.Abp.FeatureManagement.Application.Contracts\Volo.Abp.FeatureManagement.Application.Contracts.csproj" />
+        <ProjectReference Include="..\..\..\setting-management\src\Volo.Abp.SettingManagement.Blazor\Volo.Abp.SettingManagement.Blazor.csproj" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/Components/FeatureSettingGroup/Default.cshtml b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/Components/FeatureSettingGroup/Default.cshtml
index 9e975306a4..66f7b4861c 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/Components/FeatureSettingGroup/Default.cshtml
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/Components/FeatureSettingGroup/Default.cshtml
@@ -8,6 +8,6 @@
 <form id="FeatureSettingsForm">
     @if (Model.HasManageHostFeaturesPermission)
     {
-        <abp-button id="ManageHostFeatures" icon="cog" text="@L["ManageHostFeatures"].Value"/>
+        <abp-button button-type="Primary" id="ManageHostFeatures" icon="cog" text="@L["ManageHostFeatures"].Value"/>
     }
 </form>
\ No newline at end of file
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs
index 0f0e689f2f..6fe3005a98 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs
@@ -54,11 +54,6 @@ public partial class TenantManagement
 
     protected override ValueTask SetToolbarItemsAsync()
     {
-        Toolbar.AddButton(L["ManageHostFeatures"],
-            async () => await FeatureManagementModal.OpenAsync(FeatureProviderName),
-            "fa fa-cog",
-            requiredPolicyName: FeatureManagementPermissions.ManageHostFeatures);
-
         Toolbar.AddButton(L["NewTenant"],
             OpenCreateModalAsync,
             IconName.Add,