diff --git a/npm/ng-packs/packages/account/src/lib/components/reset-password/reset-password.component.html b/npm/ng-packs/packages/account/src/lib/components/reset-password/reset-password.component.html
index 368750a45a..8777254cfd 100644
--- a/npm/ng-packs/packages/account/src/lib/components/reset-password/reset-password.component.html
+++ b/npm/ng-packs/packages/account/src/lib/components/reset-password/reset-password.component.html
@@ -27,7 +27,7 @@
       formControlName="confirmPassword"
     />
   </div>
-  <button class="me-2 btn btn-secondary" type="button" routerLink="/account/login">
+  <button class="me-2 btn btn-outline-primary" type="button" routerLink="/account/login">
     {{ 'AbpAccount::Cancel' | abpLocalization }}
   </button>
   <abp-button
diff --git a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
index 4dce1433e5..a3324960e0 100644
--- a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
+++ b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
@@ -117,9 +117,14 @@
   </ng-template>
 
   <ng-template #abpFooter>
+    <button abpClose type="button" class="btn btn-link">
+      {{ 'AbpFeatureManagement::Cancel' | abpLocalization }}
+    </button>
+
     <abp-button
       *ngIf="groups.length"
       iconClass="fa fa-refresh"
+      buttonClass="btn btn-outline-primary"
       [disabled]="modalBusy"
       (click)="resetToDefault()"
       aria-hidden="true"
@@ -127,9 +132,6 @@
       {{ 'AbpFeatureManagement::ResetToDefault' | abpLocalization }}
     </abp-button>
 
-    <button abpClose type="button" class="btn btn-secondary">
-      {{ 'AbpFeatureManagement::Cancel' | abpLocalization }}
-    </button>
     <abp-button
       *ngIf="groups.length"
       iconClass="fa fa-check"
diff --git a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html
index af51baa372..5b0f779b05 100644
--- a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html
+++ b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html
@@ -21,7 +21,7 @@
     </ng-template>
 
     <ng-template #abpFooter>
-      <button type="button" class="btn btn-secondary" abpClose>
+      <button type="button" class="btn btn-outline-primary" abpClose>
         {{ 'AbpIdentity::Cancel' | abpLocalization }}
       </button>
       <abp-button iconClass="fa fa-check" [disabled]="form?.invalid" (click)="save()">{{
diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
index fd38cc2a28..7d36566114 100644
--- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
+++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
@@ -69,7 +69,7 @@
     </ng-template>
 
     <ng-template #abpFooter>
-      <button type="button" class="btn btn-secondary" abpClose>
+      <button type="button" class="btn btn-outline-primary" abpClose>
         {{ 'AbpIdentity::Cancel' | abpLocalization }}
       </button>
       <abp-button iconClass="fa fa-check" [disabled]="form?.invalid" (click)="save()">{{
diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html
index 581a5bd002..384070d2e7 100644
--- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html
+++ b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html
@@ -95,7 +95,7 @@
       </div>
     </ng-template>
     <ng-template #abpFooter>
-      <button type="button" class="btn btn-secondary" abpClose>
+      <button type="button" class="btn btn-outline-primary" abpClose>
         {{ 'AbpIdentity::Cancel' | abpLocalization }}
       </button>
       <abp-button iconClass="fa fa-check" (click)="submit()">{{
diff --git a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html
index bb0a27a6b2..1be0edefbc 100644
--- a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html
+++ b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html
@@ -39,7 +39,7 @@
     </ng-template>
 
     <ng-template #abpFooter>
-      <button abpClose type="button" class="btn btn-secondary">
+      <button abpClose type="button" class="btn btn-outline-primary">
         {{ 'AbpTenantManagement::Cancel' | abpLocalization }}
       </button>
       <abp-button iconClass="fa fa-check" (click)="save()" [disabled]="tenantForm?.invalid">{{
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/tenant-box/tenant-box.component.html b/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/tenant-box/tenant-box.component.html
index 1804050cf8..9e1466310d 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/tenant-box/tenant-box.component.html
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/tenant-box/tenant-box.component.html
@@ -49,7 +49,7 @@
       </form>
     </ng-template>
     <ng-template #abpFooter>
-      <button abpClose type="button" class="btn btn-secondary">
+      <button abpClose type="button" class="btn btn-outline-primary">
         {{ 'AbpTenantManagement::Cancel' | abpLocalization }}
       </button>
       <abp-button
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.html b/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.html
index 735055971d..1ec6dcb9be 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.html
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.html
@@ -25,14 +25,14 @@
     <div class="footer">
       <button
         id="cancel"
-        class="confirmation-button confirmation-button--reject"
+        class="btn btn-outline-primary me-2"
         [innerHTML]="data.options?.cancelText || 'AbpUi::Cancel' | abpLocalization"
         *ngIf="!data?.options?.hideCancelBtn"
         (click)="close(reject)"
       ></button>
       <button
         id="confirm"
-        class="confirmation-button confirmation-button--approve"
+        class="btn btn-primary"
         [innerHTML]="data.options?.yesText || 'AbpUi::Yes' | abpLocalization"
         *ngIf="!data?.options?.hideYesBtn"
         (click)="close(confirm)"
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.scss b/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.scss
index a6d25a4946..3620032498 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.scss
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/confirmation/confirmation.component.scss
@@ -31,8 +31,7 @@
       display: flex;
       align-items: center;
       justify-content: center;
-      margin: 0 0 10px 0;
-      padding: 20px;
+      padding: 40px 20px 10px;
       .icon {
         width: 100px;
         height: 100px;
@@ -54,29 +53,19 @@
       }
       .message {
         display: block;
-        margin: 10px auto;
-        padding: 20px;
+        padding: 8px 20px 20px 20px;
         font-size: 16px;
         font-weight: 400;
         text-align: center;
+        margin-bottom: 0;
       }
     }
     .footer {
       display: flex;
       align-items: center;
       justify-content: flex-end;
-      margin: 10px 0 0 0;
       padding: 20px;
       width: 100%;
-      .confirmation-button {
-        display: inline-block;
-        margin: 0px 5px;
-        padding: 10px 20px;
-        border: none;
-        border-radius: 6px;
-        font-size: 14px;
-        font-weight: 600;
-      }
     }
   }
 }