diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/wwwroot/libs/abp/css/theme.css b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/wwwroot/libs/abp/css/theme.css
index fc47596044..ac9aabb57f 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/wwwroot/libs/abp/css/theme.css
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/wwwroot/libs/abp/css/theme.css
@@ -103,3 +103,8 @@ div.dataTables_wrapper div.dataTables_length label {
 .navbar-nav>.nav-item>div>button{
     color:#fff;
 }
+
+.btn span.spinner-border {
+    margin-right: .5rem;
+}
+
diff --git a/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/AccountManage.razor b/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/AccountManage.razor
index a6edb30a64..a2f7ca4f31 100644
--- a/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/AccountManage.razor
+++ b/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/AccountManage.razor
@@ -27,7 +27,7 @@
                                 <TextEdit Role="@TextRole.Password" @bind-Text="@ChangePasswordModel.NewPasswordConfirm"/>
                             </Field>
                             <Field>
-                                <Button form="ChangePasswordForm" Color="Color.Primary" Clicked="@ChangePasswordAsync">@L["Save"]</Button>
+                                <SubmitButton Form="ChangePasswordForm" Clicked="@ChangePasswordAsync" />
                             </Field>
                         </EditForm>
                     </TabPanel>
@@ -59,7 +59,7 @@
                                 <TextEdit @bind-Text="@PersonalInfoModel.PhoneNumber"/>
                             </Field>
                             <Field>
-                                <Button form="UpdatePersonalInfoForm" Color="Color.Primary" Clicked="@UpdatePersonalInfoAsync">@L["Save"]</Button>
+                                <SubmitButton Form="UpdatePersonalInfoForm" Clicked="@UpdatePersonalInfoAsync" />
                             </Field>
                         </EditForm>
                     </TabPanel>
diff --git a/modules/account/src/Volo.Abp.Account.Blazor/_Imports.razor b/modules/account/src/Volo.Abp.Account.Blazor/_Imports.razor
index 4685ac9893..de520acc22 100644
--- a/modules/account/src/Volo.Abp.Account.Blazor/_Imports.razor
+++ b/modules/account/src/Volo.Abp.Account.Blazor/_Imports.razor
@@ -1,5 +1,6 @@
 @using Microsoft.AspNetCore.Components.Web
 @using Volo.Abp.AspNetCore.Components.WebAssembly
 @using Volo.Abp.BlazoriseUI
+@using Volo.Abp.BlazoriseUI.Components
 @using Blazorise
 @using Blazorise.DataGrid
\ No newline at end of file