diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor/AbpAspNetCoreComponentsServerThemingMudBlazorModule.cs b/framework/src/Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor/AbpAspNetCoreComponentsServerThemingMudBlazorModule.cs
index 6fff8f85fc..ecee654648 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor/AbpAspNetCoreComponentsServerThemingMudBlazorModule.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor/AbpAspNetCoreComponentsServerThemingMudBlazorModule.cs
@@ -2,6 +2,7 @@ using Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor.Bundling;
 using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 using Volo.Abp.Modularity;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages;
 
 namespace Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor;
 
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor/Components/PageHeader.razor b/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor/Components/PageHeader.razor
index 540a5ac20a..ff769fdfc7 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor/Components/PageHeader.razor
+++ b/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor/Components/PageHeader.razor
@@ -1,6 +1,7 @@
 @using Microsoft.AspNetCore.Components.Web
 @using Volo.Abp.Ui.Branding
 @inject IBrandingProvider BrandingProvider
+@using global::MudBlazor
 
 <MudGrid Class="entry-row">
     @if (PageLayout.Title.IsNullOrEmpty())
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor/PageToolbars/MudPageToolbarButton.razor b/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor/PageToolbars/MudPageToolbarButton.razor
index 2727fc24f5..c882121561 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor/PageToolbars/MudPageToolbarButton.razor
+++ b/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor/PageToolbars/MudPageToolbarButton.razor
@@ -1,9 +1,9 @@
-@using MudBlazor
+@using global::MudBlazor
 
-<MudButton Variant="Variant.Filled"
-           Color="Color.Primary"
+<MudButton Variant="@Variant.Filled"
+           Color="@Color.Primary"
            Disabled="Disabled"
-           OnClick="@OnClickAsync">
+           OnClick="@OnClickCallback">
     @if (Icon is string iconString && !string.IsNullOrWhiteSpace(iconString))
     {
         <MudIcon Icon="@iconString" Class="me-1" />
@@ -11,25 +11,3 @@
     @Text
 </MudButton>
 
-@code {
-    [Parameter]
-    public string Text { get; set; } = string.Empty;
-
-    [Parameter]
-    public bool Disabled { get; set; }
-
-    [Parameter]
-    public object? Icon { get; set; }
-
-    [Parameter]
-    public Func<Task>? Clicked { get; set; }
-
-    private async Task OnClickAsync()
-    {
-        if (Clicked != null && !Disabled)
-        {
-            await Clicked.Invoke();
-        }
-    }
-}
-
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor/PageToolbars/MudPageToolbarButton.razor.cs b/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor/PageToolbars/MudPageToolbarButton.razor.cs
new file mode 100644
index 0000000000..47ec248ae4
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor/PageToolbars/MudPageToolbarButton.razor.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Web;
+using global::MudBlazor;
+
+namespace Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.PageToolbars;
+
+public partial class MudPageToolbarButton : ComponentBase
+{
+    [Parameter]
+    public string Text { get; set; } = string.Empty;
+
+    [Parameter]
+    public bool Disabled { get; set; }
+
+    [Parameter]
+    public object? Icon { get; set; }
+
+    [Parameter]
+    public Func<Task>? Clicked { get; set; }
+
+    private EventCallback<MouseEventArgs> OnClickCallback => EventCallback.Factory.Create<MouseEventArgs>(this, OnClickAsync);
+
+    private async Task OnClickAsync(MouseEventArgs args)
+    {
+        if (Clicked != null && !Disabled)
+        {
+            await Clicked.Invoke();
+        }
+        await Task.CompletedTask;
+    }
+}
diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/App.razor b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/App.razor
index fedd98d739..84edd134d0 100644
--- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/App.razor
+++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/App.razor
@@ -1,6 +1,6 @@
 @using Microsoft.Extensions.Options
 @using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing
-@using MudBlazor
+@using global::MudBlazor
 @inject IOptions<AbpRouterOptions> RouterOptions
 <CascadingAuthenticationState>
     <Router AppAssembly="RouterOptions.Value.AppAssembly"
diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/AppWithoutAuth.razor b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/AppWithoutAuth.razor
index 580feaa3fa..4593a376c2 100644
--- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/AppWithoutAuth.razor
+++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/AppWithoutAuth.razor
@@ -1,6 +1,6 @@
 @using Microsoft.Extensions.Options
 @using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing
-@using MudBlazor
+@using global::MudBlazor
 @inject IOptions<AbpRouterOptions> RouterOptions
 <Router AppAssembly="RouterOptions.Value.AppAssembly"
         AdditionalAssemblies="RouterOptions.Value.AdditionalAssemblies">
diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/NullLayout.razor b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/NullLayout.razor
index 5febe493c6..138f027ecd 100644
--- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/NullLayout.razor
+++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/NullLayout.razor
@@ -1,8 +1,8 @@
 @using Volo.Abp.Ui.LayoutHooks
 @using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Components.LayoutHooks
 @using Volo.Abp.AspNetCore.Components.Web.Theming.Layout
-@using MudBlazor
 @inherits LayoutComponentBase
+@using global::MudBlazor
 
 <MudThemeProvider />
 <MudPopoverProvider />
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor
index 022bb19b26..0a2ae144bc 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor
@@ -18,7 +18,8 @@
                              Immediate="true" />
             </MudItem>
             <MudItem xs="12" sm="4" Class="d-flex align-items-center">
-                <MudCheckBox Disabled="@_selectAllDisabled"
+                <MudCheckBox T="bool"
+                            Disabled="@_selectAllDisabled"
                             Checked="@GrantAll"
                             Indeterminate="@GrantAny"
                             CheckedChanged="@GrantAllAsync"
@@ -40,7 +41,9 @@
                     {
                         <MudTabPanel Text="@($"{group.DisplayName} ({group.Permissions.Count(x => x.IsGranted)})")">
                             <div style="height: 500px; overflow-y: auto; padding: 8px;">
-                                <MudCheckBox Disabled="@(IsPermissionGroupDisabled(group))"
+                                <MudCheckBox 
+                                            TValue="bool"
+                                             Disabled="@(IsPermissionGroupDisabled(group))"
                                             Checked="@(group.Permissions.All(x => x.IsGranted))"
                                             CheckedChanged="@(b => GroupGrantAllChanged(b, group))"
                                             Label="@L["SelectAllInThisTab"]" />
@@ -50,7 +53,9 @@
                                 {
                                     var depth = GetPermissionDepthOrDefault(permission.Name);
                                     <div style="margin-left: @(depth * 20)px;">
-                                        <MudCheckBox Disabled="@(IsDisabledPermission(permission))"
+                                        <MudCheckBox
+                                                    TValue="bool" 
+                                                    Disabled="@(IsDisabledPermission(permission))"
                                                     Checked="@permission.IsGranted"
                                                     CheckedChanged="@(async (b) => await PermissionChanged(b, group, permission))"
                                                     Label="@GetShownName(permission)" />
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/ResourcePermissionManagementModal.razor b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/ResourcePermissionManagementModal.razor
index 481aa52835..5b21c749d7 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/ResourcePermissionManagementModal.razor
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/ResourcePermissionManagementModal.razor
@@ -90,7 +90,7 @@
         <DialogContent>
             <MudForm @ref="@_createFormRef" Model="@CreateEntity">
                 <MudText Typo="Typo.subtitle1" Class="mb-2">@L["ResourcePermissionTarget"]</MudText>
-                <MudRadioGroup SelectedOption="@CurrentLookupService" SelectedOptionChanged="@OnLookupServiceCheckedValueChanged">
+                <MudRadioGroup T="string" SelectedOption="@CurrentLookupService" SelectedOptionChanged="@OnLookupServiceCheckedValueChanged">
                     @foreach (var keyLookupService in ResourceProviderKeyLookupServices)
                     {
                         <MudRadio Option="@keyLookupService.Name">@keyLookupService.DisplayName</MudRadio>
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor
index d747102064..f47327bc9d 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor
@@ -1,6 +1,7 @@
 @using Volo.Abp.SettingManagement.Localization
 @using MudBlazor
 @inherits Volo.Abp.AspNetCore.Components.AbpComponentBase
+@using global::MudBlazor
 
 @if (EmailSettings != null)
 {
@@ -27,16 +28,16 @@
                                  Variant="Variant.Outlined" />
                 </MudItem>
                 <MudItem xs="12">
-                    <MudNumericField<int> @bind-Value="@EmailSettings.SmtpPort"
+                    <MudNumericField @bind-Value="@EmailSettings.SmtpPort"
                                          Label="@L["SmtpPort"]"
                                          Variant="Variant.Outlined" />
                 </MudItem>
                 <MudItem xs="12">
-                    <MudCheckBox @bind-Checked="@EmailSettings.SmtpEnableSsl"
+                    <MudCheckBox T="bool" @bind-Checked="@EmailSettings.SmtpEnableSsl"
                                 Label="@L["SmtpEnableSsl"]" />
                 </MudItem>
                 <MudItem xs="12">
-                    <MudCheckBox @bind-Checked="@EmailSettings.SmtpUseDefaultCredentials"
+                    <MudCheckBox T="bool" @bind-Checked="@EmailSettings.SmtpUseDefaultCredentials"
                                 Label="@L["SmtpUseDefaultCredentials"]" />
                 </MudItem>
                 @if (!EmailSettings.SmtpUseDefaultCredentials)
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/SettingManagement.razor b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/SettingManagement.razor
index ad3e7c9510..4944f9f12a 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/SettingManagement.razor
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/SettingManagement.razor
@@ -7,6 +7,7 @@
 @using Microsoft.Extensions.Localization
 @using Volo.Abp.UI.Navigation.Localization.Resource
 @inject IStringLocalizer<AbpUiNavigationResource> LUiNavigation
+@using global::MudBlazor
 
 @* ************************* PAGE HEADER ************************* *@
 <PageHeader Title="@L["Settings"]" BreadcrumbItems="@BreadcrumbItems" />
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/TimeZoneSettingGroup/TimeZoneSettingGroupViewComponent.razor b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/TimeZoneSettingGroup/TimeZoneSettingGroupViewComponent.razor
index e244220bbb..296b9e3063 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/TimeZoneSettingGroup/TimeZoneSettingGroupViewComponent.razor
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/TimeZoneSettingGroup/TimeZoneSettingGroupViewComponent.razor
@@ -1,6 +1,7 @@
 @using Volo.Abp.SettingManagement.Localization
 @using MudBlazor
 @inherits Volo.Abp.AspNetCore.Components.AbpComponentBase
+@using global::MudBlazor
 
 @if (TimezoneSettings != null)
 {