diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
index f89082404a..039abf3ef1 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
@@ -9,61 +9,69 @@
 @inject AbpBlazorMessageLocalizerHelper<IdentityResource> LH
 
 @inherits AbpCrudPageBase<IIdentityRoleAppService, IdentityRoleDto, Guid, GetIdentityRolesInput, IdentityRoleCreateDto, IdentityRoleUpdateDto>
-@* ************************* PAGE HEADER ************************* *@
-<Row Class="justify-content-between">
-    <Column ColumnSize="ColumnSize.IsAuto">
-        <Heading Size="HeadingSize.Is1">@L["Roles"]</Heading>
-    </Column>
-    <Column ColumnSize="ColumnSize.IsAuto">
-        @if ( HasCreatePermission )
-        {
-            <Button Color="Color.Primary" Clicked="OpenCreateModalAsync">@L["NewRole"]</Button>
-        }
-    </Column>
-</Row>
 
-@* ************************* DATA GRID ************************* *@
-<DataGrid TItem="IdentityRoleDto"
-          Data="Entities"
-          ReadData="OnDataGridReadAsync"
-          TotalItems="TotalCount"
-          ShowPager="true"
-          PageSize="PageSize">
-    <DataGridColumns>
-        <DataGridEntityActionsColumn TItem="IdentityRoleDto" @ref="@EntityActionsColumn">
-            <DisplayTemplate>
-                <EntityActions TItem="IdentityRoleDto" EntityActionsColumn="@EntityActionsColumn">
-                    <EntityAction TItem="IdentityRoleDto"
-                                  RequiredPolicy="@UpdatePolicyName"
-                                  Clicked="() => OpenEditModalAsync(context)"
-                                  Text="@L["Edit"]"></EntityAction>
-                    <EntityAction TItem="IdentityRoleDto"
-                                  RequiredPolicy="@ManagePermissionsPolicyName"
-                                  Clicked="() => PermissionManagementModal.OpenAsync(PermissionProviderName, context.Name)"
-                                  Text="@L["Permissions"]"></EntityAction>
-                    <EntityAction TItem="IdentityRoleDto"
-                                  RequiredPolicy="@DeletePolicyName"
-                                  Clicked="() => DeleteEntityAsync(context)"
-                                  ConfirmationMessage="()=> GetDeleteConfirmationMessage(context)"
-                                  Text="@L["Delete"]"></EntityAction>
-                </EntityActions>
-            </DisplayTemplate>
-        </DataGridEntityActionsColumn>
-        <DataGridColumn TItem="IdentityRoleDto" Field="@nameof(IdentityRoleDto.Name)" Caption="@L["RoleName"].Value">
-            <DisplayTemplate>
-                @(context.Name)
-                @if (context.IsDefault)
+<Card>
+    <CardHeader>
+        @* ************************* PAGE HEADER ************************* *@
+        <Row Class="justify-content-between">
+            <Column ColumnSize="ColumnSize.IsAuto">
+                <Heading Size="HeadingSize.Is1">@L["Roles"]</Heading>
+            </Column>
+            <Column ColumnSize="ColumnSize.IsAuto">
+                @if ( HasCreatePermission )
                 {
-                    <Badge Color="Color.Primary" Margin="Margin.Is1.FromLeft">@L["DisplayName:IsDefault"]</Badge>
+                    <Button Color="Color.Primary" Clicked="OpenCreateModalAsync">
+                        <Icon Margin="Margin.Is1.FromRight" Name="IconName.Add"></Icon>@L["NewRole"]
+                    </Button>
                 }
-                @if (context.IsPublic)
-                {
-                    <Badge Color="Color.Light" Margin="Margin.Is1.FromLeft">@L["DisplayName:IsPublic"]</Badge>
-                }
-            </DisplayTemplate>
-        </DataGridColumn>
-    </DataGridColumns>
-</DataGrid>
+            </Column>
+        </Row>
+    </CardHeader>
+    <CardBody>
+        @* ************************* DATA GRID ************************* *@
+        <DataGrid TItem="IdentityRoleDto"
+                  Data="Entities"
+                  ReadData="OnDataGridReadAsync"
+                  TotalItems="TotalCount"
+                  ShowPager="true"
+                  PageSize="PageSize">
+            <DataGridColumns>
+                <DataGridEntityActionsColumn TItem="IdentityRoleDto" @ref="@EntityActionsColumn">
+                    <DisplayTemplate>
+                        <EntityActions TItem="IdentityRoleDto" EntityActionsColumn="@EntityActionsColumn">
+                            <EntityAction TItem="IdentityRoleDto"
+                                          RequiredPolicy="@UpdatePolicyName"
+                                          Clicked="() => OpenEditModalAsync(context)"
+                                          Text="@L["Edit"]"></EntityAction>
+                            <EntityAction TItem="IdentityRoleDto"
+                                          RequiredPolicy="@ManagePermissionsPolicyName"
+                                          Clicked="() => PermissionManagementModal.OpenAsync(PermissionProviderName, context.Name)"
+                                          Text="@L["Permissions"]"></EntityAction>
+                            <EntityAction TItem="IdentityRoleDto"
+                                          RequiredPolicy="@DeletePolicyName"
+                                          Clicked="() => DeleteEntityAsync(context)"
+                                          ConfirmationMessage="()=> GetDeleteConfirmationMessage(context)"
+                                          Text="@L["Delete"]"></EntityAction>
+                        </EntityActions>
+                    </DisplayTemplate>
+                </DataGridEntityActionsColumn>
+                <DataGridColumn TItem="IdentityRoleDto" Field="@nameof(IdentityRoleDto.Name)" Caption="@L["RoleName"].Value">
+                    <DisplayTemplate>
+                        @(context.Name)
+                        @if (context.IsDefault)
+                        {
+                            <Badge Color="Color.Primary" Margin="Margin.Is1.FromLeft">@L["DisplayName:IsDefault"]</Badge>
+                        }
+                        @if (context.IsPublic)
+                        {
+                            <Badge Color="Color.Light" Margin="Margin.Is1.FromLeft">@L["DisplayName:IsPublic"]</Badge>
+                        }
+                    </DisplayTemplate>
+                </DataGridColumn>
+            </DataGridColumns>
+        </DataGrid>
+    </CardBody>
+</Card>
 
 @* ************************* CREATE MODAL ************************* *@
 @if (HasCreatePermission)
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
index 6697a341e5..6da99733ac 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
@@ -8,63 +8,71 @@
 @inject AbpBlazorMessageLocalizerHelper<IdentityResource> LH
 
 @inherits AbpCrudPageBase<IIdentityUserAppService, IdentityUserDto, Guid, GetIdentityUsersInput, IdentityUserCreateDto, IdentityUserUpdateDto>
-@* ************************* PAGE HEADER ************************* *@
-<Row Class="justify-content-between">
-    <Column ColumnSize="ColumnSize.IsAuto">
-        <h1>@L["Users"]</h1>
-    </Column>
-    <Column ColumnSize="ColumnSize.IsAuto">
-        @if (HasCreatePermission)
-        {
-            <Button Color="Color.Primary" Clicked="OpenCreateModalAsync">@L["NewUser"]</Button>
-        }
-    </Column>
-</Row>
 
-@* ************************* DATA GRID ************************* *@
-<DataGrid TItem="IdentityUserDto"
-          Data="Entities"
-          ReadData="OnDataGridReadAsync"
-          TotalItems="TotalCount"
-          ShowPager="true"
-          PageSize="PageSize">
-    <DataGridColumns>
-        <DataGridEntityActionsColumn TItem="IdentityUserDto" @ref="@EntityActionsColumn">
-            <DisplayTemplate>
-                <EntityActions TItem="IdentityUserDto" EntityActionsColumn="@EntityActionsColumn">
-                    <EntityAction TItem="IdentityUserDto"
-                                  RequiredPolicy="@UpdatePolicyName"
-                                  Clicked="() => OpenEditModalAsync(context)"
-                                  Text="@L["Edit"]" />
-                    <EntityAction TItem="IdentityUserDto"
-                                  RequiredPolicy="@ManagePermissionsPolicyName"
-                                  Clicked="() => PermissionManagementModal.OpenAsync(PermissionProviderName, context.Id.ToString())"
-                                  Text="@L["Permissions"]" />
-                    <EntityAction TItem="IdentityUserDto"
-                                  RequiredPolicy="@DeletePolicyName"
-                                  Clicked="() => DeleteEntityAsync(context)"
-                                  ConfirmationMessage="()=>GetDeleteConfirmationMessage(context)"
-                                  Text="@L["Delete"]" />
-                </EntityActions>
-            </DisplayTemplate>
-        </DataGridEntityActionsColumn>
-        <DataGridColumn TItem="IdentityUserDto" Field="@nameof(IdentityUserDto.UserName)" Caption="@L["UserName"].Value">
-            <DisplayTemplate>
-                @(context.As<IdentityUserDto>().UserName)
-            </DisplayTemplate>
-        </DataGridColumn>
-        <DataGridColumn TItem="IdentityUserDto" Field="@nameof(IdentityUserDto.Email)" Caption="@L["Email"].Value">
-            <DisplayTemplate>
-                @(context.As<IdentityUserDto>().Email)
-            </DisplayTemplate>
-        </DataGridColumn>
-        <DataGridColumn TItem="IdentityUserDto" Field="@nameof(IdentityUserDto.PhoneNumber)" Caption="@L["PhoneNumber"].Value">
-            <DisplayTemplate>
-                @(context.As<IdentityUserDto>().PhoneNumber)
-            </DisplayTemplate>
-        </DataGridColumn>
-    </DataGridColumns>
-</DataGrid>
+<Card>
+    <CardHeader>
+        @* ************************* PAGE HEADER ************************* *@
+        <Row Class="justify-content-between">
+            <Column ColumnSize="ColumnSize.IsAuto">
+                <h1>@L["Users"]</h1>
+            </Column>
+            <Column ColumnSize="ColumnSize.IsAuto">
+                @if (HasCreatePermission)
+                {
+                    <Button Color="Color.Primary" Clicked="OpenCreateModalAsync">
+                        <Icon Margin="Margin.Is1.FromRight" Name="IconName.Add"></Icon>@L["NewUser"]
+                    </Button>
+                }
+            </Column>
+        </Row>
+    </CardHeader>
+    <CardBody>
+        @* ************************* DATA GRID ************************* *@
+        <DataGrid TItem="IdentityUserDto"
+                  Data="Entities"
+                  ReadData="OnDataGridReadAsync"
+                  TotalItems="TotalCount"
+                  ShowPager="true"
+                  PageSize="PageSize">
+            <DataGridColumns>
+                <DataGridEntityActionsColumn TItem="IdentityUserDto" @ref="@EntityActionsColumn">
+                    <DisplayTemplate>
+                        <EntityActions TItem="IdentityUserDto" EntityActionsColumn="@EntityActionsColumn">
+                            <EntityAction TItem="IdentityUserDto"
+                                          RequiredPolicy="@UpdatePolicyName"
+                                          Clicked="() => OpenEditModalAsync(context)"
+                                          Text="@L["Edit"]" />
+                            <EntityAction TItem="IdentityUserDto"
+                                          RequiredPolicy="@ManagePermissionsPolicyName"
+                                          Clicked="() => PermissionManagementModal.OpenAsync(PermissionProviderName, context.Id.ToString())"
+                                          Text="@L["Permissions"]" />
+                            <EntityAction TItem="IdentityUserDto"
+                                          RequiredPolicy="@DeletePolicyName"
+                                          Clicked="() => DeleteEntityAsync(context)"
+                                          ConfirmationMessage="()=>GetDeleteConfirmationMessage(context)"
+                                          Text="@L["Delete"]" />
+                        </EntityActions>
+                    </DisplayTemplate>
+                </DataGridEntityActionsColumn>
+                <DataGridColumn TItem="IdentityUserDto" Field="@nameof(IdentityUserDto.UserName)" Caption="@L["UserName"].Value">
+                    <DisplayTemplate>
+                        @(context.As<IdentityUserDto>().UserName)
+                    </DisplayTemplate>
+                </DataGridColumn>
+                <DataGridColumn TItem="IdentityUserDto" Field="@nameof(IdentityUserDto.Email)" Caption="@L["Email"].Value">
+                    <DisplayTemplate>
+                        @(context.As<IdentityUserDto>().Email)
+                    </DisplayTemplate>
+                </DataGridColumn>
+                <DataGridColumn TItem="IdentityUserDto" Field="@nameof(IdentityUserDto.PhoneNumber)" Caption="@L["PhoneNumber"].Value">
+                    <DisplayTemplate>
+                        @(context.As<IdentityUserDto>().PhoneNumber)
+                    </DisplayTemplate>
+                </DataGridColumn>
+            </DataGridColumns>
+        </DataGrid>
+    </CardBody>
+</Card>
 
 @* ************************* CREATE MODAL ************************* *@
 @if (HasCreatePermission)
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
index 5f0067c6f5..59d2d70489 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
@@ -6,57 +6,65 @@
 @using Volo.Abp.TenantManagement.Localization
 @inject AbpBlazorMessageLocalizerHelper<AbpTenantManagementResource> LH
 @inherits AbpCrudPageBase<ITenantAppService, TenantDto, Guid, GetTenantsInput, TenantCreateDto, TenantUpdateDto>
-@* ************************* PAGE HEADER ************************* *@
-<Row Class="justify-content-between">
-    <Column ColumnSize="ColumnSize.IsAuto">
-        <Heading Size="HeadingSize.Is1">@L["Tenants"]</Heading>
-    </Column>
-    <Column ColumnSize="ColumnSize.IsAuto">
-        @if (HasCreatePermission)
-        {
-            <Button Color="Color.Primary" Clicked="OpenCreateModalAsync">@L["NewTenant"]</Button>
-        }
-    </Column>
-</Row>
 
-@* ************************* DATA GRID ************************* *@
-<DataGrid TItem="TenantDto"
-          Data="Entities"
-          ReadData="OnDataGridReadAsync"
-          TotalItems="TotalCount"
-          ShowPager="true"
-          PageSize="PageSize">
-    <DataGridColumns>
-        <DataGridEntityActionsColumn TItem="TenantDto" @ref="@EntityActionsColumn">
-            <DisplayTemplate>
-                <EntityActions TItem="TenantDto" EntityActionsColumn="@EntityActionsColumn">
-                    <EntityAction TItem="TenantDto"
-                                  RequiredPolicy="@UpdatePolicyName"
-                                  Clicked="() => OpenEditModalAsync(context)"
-                                  Text="@L["Edit"]"></EntityAction>
-                    <EntityAction TItem="TenantDto"
-                                  RequiredPolicy="@ManageConnectionStringsPolicyName"
-                                  Clicked="() => OpenEditConnectionStringModalAsync(context)"
-                                  Text="@L["ConnectionStrings"]"></EntityAction>
-                    <EntityAction TItem="TenantDto"
-                                  RequiredPolicy="@ManageFeaturesPolicyName"
-                                  Clicked="() => FeatureManagementModal.OpenAsync(FeatureProviderName, context.Id.ToString())"
-                                  Text="@L["Features"]"></EntityAction>
-                    <EntityAction TItem="TenantDto"
-                                  RequiredPolicy="@DeletePolicyName"
-                                  Clicked="() => DeleteEntityAsync(context)"
-                                  ConfirmationMessage="()=>GetDeleteConfirmationMessage(context)"
-                                  Text="@L["Delete"]"></EntityAction>
-                </EntityActions>
-            </DisplayTemplate>
-        </DataGridEntityActionsColumn>
-        <DataGridColumn TItem="TenantDto" Field="@nameof(TenantDto.Name)" Caption="@L["TenantName"].Value">
-            <DisplayTemplate>
-                @(context.Name)
-            </DisplayTemplate>
-        </DataGridColumn>
-    </DataGridColumns>
-</DataGrid>
+<Card>
+    <CardHeader>
+        @* ************************* PAGE HEADER ************************* *@
+        <Row Class="justify-content-between">
+            <Column ColumnSize="ColumnSize.IsAuto">
+                <Heading Size="HeadingSize.Is1">@L["Tenants"]</Heading>
+            </Column>
+            <Column ColumnSize="ColumnSize.IsAuto">
+                @if (HasCreatePermission)
+                {
+                    <Button Color="Color.Primary" Clicked="OpenCreateModalAsync">
+                        <Icon Margin="Margin.Is1.FromRight" Name="IconName.Add"></Icon>@L["NewTenant"]
+                    </Button>
+                }
+            </Column>
+        </Row>
+    </CardHeader>
+    <CardBody>
+        @* ************************* DATA GRID ************************* *@
+        <DataGrid TItem="TenantDto"
+                  Data="Entities"
+                  ReadData="OnDataGridReadAsync"
+                  TotalItems="TotalCount"
+                  ShowPager="true"
+                  PageSize="PageSize">
+            <DataGridColumns>
+                <DataGridEntityActionsColumn TItem="TenantDto" @ref="@EntityActionsColumn">
+                    <DisplayTemplate>
+                        <EntityActions TItem="TenantDto" EntityActionsColumn="@EntityActionsColumn">
+                            <EntityAction TItem="TenantDto"
+                                          RequiredPolicy="@UpdatePolicyName"
+                                          Clicked="() => OpenEditModalAsync(context)"
+                                          Text="@L["Edit"]"></EntityAction>
+                            <EntityAction TItem="TenantDto"
+                                          RequiredPolicy="@ManageConnectionStringsPolicyName"
+                                          Clicked="() => OpenEditConnectionStringModalAsync(context)"
+                                          Text="@L["ConnectionStrings"]"></EntityAction>
+                            <EntityAction TItem="TenantDto"
+                                          RequiredPolicy="@ManageFeaturesPolicyName"
+                                          Clicked="() => FeatureManagementModal.OpenAsync(FeatureProviderName, context.Id.ToString())"
+                                          Text="@L["Features"]"></EntityAction>
+                            <EntityAction TItem="TenantDto"
+                                          RequiredPolicy="@DeletePolicyName"
+                                          Clicked="() => DeleteEntityAsync(context)"
+                                          ConfirmationMessage="()=>GetDeleteConfirmationMessage(context)"
+                                          Text="@L["Delete"]"></EntityAction>
+                        </EntityActions>
+                    </DisplayTemplate>
+                </DataGridEntityActionsColumn>
+                <DataGridColumn TItem="TenantDto" Field="@nameof(TenantDto.Name)" Caption="@L["TenantName"].Value">
+                    <DisplayTemplate>
+                        @(context.Name)
+                    </DisplayTemplate>
+                </DataGridColumn>
+            </DataGridColumns>
+        </DataGrid>
+    </CardBody>
+</Card>
 
 @* ************************* CREATE MODAL ************************* *@
 @if (HasCreatePermission)