diff --git a/src/app/organizations/settings/adjust-seats.component.html b/src/app/organizations/settings/adjust-seats.component.html
index e85aa8061b6..e07179be7e3 100644
--- a/src/app/organizations/settings/adjust-seats.component.html
+++ b/src/app/organizations/settings/adjust-seats.component.html
@@ -1,5 +1,7 @@
 <form #form class="card" (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
     <div class="card-body">
+        <button type="button" class="close" attr.aria-label="{{'cancel' | i18n}}" title="{{'cancel' | i18n}}"
+            (click)="cancel()"><span aria-hidden="true">&times;</span></button>
         <h3 class="card-body-header">{{(add ? 'addSeats' : 'removeSeats') | i18n}}</h3>
         <div class="row">
             <div class="form-group col-6">
diff --git a/src/app/organizations/settings/download-license.component.html b/src/app/organizations/settings/download-license.component.html
index 802413c4ff4..5e2b9549f93 100644
--- a/src/app/organizations/settings/download-license.component.html
+++ b/src/app/organizations/settings/download-license.component.html
@@ -1,5 +1,7 @@
 <form #form class="card" (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
     <div class="card-body">
+        <button type="button" class="close" attr.aria-label="{{'cancel' | i18n}}" title="{{'cancel' | i18n}}"
+            (click)="cancel()"><span aria-hidden="true">&times;</span></button>
         <h3 class="card-body-header">{{'downloadLicense' | i18n}}</h3>
         <div class="row">
             <div class="form-group col-6">
diff --git a/src/app/organizations/settings/organization-subscription.component.html b/src/app/organizations/settings/organization-subscription.component.html
index 1e7a9c8b0cc..cf9bcb58f63 100644
--- a/src/app/organizations/settings/organization-subscription.component.html
+++ b/src/app/organizations/settings/organization-subscription.component.html
@@ -77,6 +77,8 @@
         </div>
         <div class="card mt-3" *ngIf="showUpdateLicense">
             <div class="card-body">
+                <button type="button" class="close" attr.aria-label="{{'cancel' | i18n}}" title="{{'cancel' | i18n}}"
+                    (click)="closeUpdateLicense(false)"><span aria-hidden="true">&times;</span></button>
                 <h3 class="card-body-header">{{'updateLicense' | i18n}}</h3>
                 <app-update-license [organizationId]="organizationId" (onUpdated)="closeUpdateLicense(true)"
                     (onCanceled)="closeUpdateLicense(false)"></app-update-license>
diff --git a/src/app/settings/add-credit.component.html b/src/app/settings/add-credit.component.html
index 88c9f32663e..55a4d673414 100644
--- a/src/app/settings/add-credit.component.html
+++ b/src/app/settings/add-credit.component.html
@@ -1,5 +1,7 @@
 <form #form class="card" (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
     <div class="card-body">
+        <button type="button" class="close" attr.aria-label="{{'cancel' | i18n}}" title="{{'cancel' | i18n}}"
+            (click)="cancel()"><span aria-hidden="true">&times;</span></button>
         <h3 class="card-body-header">{{'addCredit' | i18n}}</h3>
         <div class="mb-4 text-lg" *ngIf="showOptions">
             <div class="form-check form-check-inline">
diff --git a/src/app/settings/adjust-payment.component.html b/src/app/settings/adjust-payment.component.html
index 4fcf5144736..2fca7509824 100644
--- a/src/app/settings/adjust-payment.component.html
+++ b/src/app/settings/adjust-payment.component.html
@@ -1,5 +1,7 @@
 <form #form class="card" (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
     <div class="card-body">
+        <button type="button" class="close" attr.aria-label="{{'cancel' | i18n}}" title="{{'cancel' | i18n}}"
+            (click)="cancel()"><span aria-hidden="true">&times;</span></button>
         <h3 class="card-body-header">{{(currentType != null ? 'changePaymentMethod' : 'addPaymentMethod') | i18n}}</h3>
         <app-payment [hideBank]="!organizationId" [hideCredit]="true"></app-payment>
         <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
diff --git a/src/app/settings/adjust-storage.component.html b/src/app/settings/adjust-storage.component.html
index 5885a62071c..5e4f40f32b8 100644
--- a/src/app/settings/adjust-storage.component.html
+++ b/src/app/settings/adjust-storage.component.html
@@ -1,5 +1,7 @@
 <form #form class="card" (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate>
     <div class="card-body">
+        <button type="button" class="close" attr.aria-label="{{'cancel' | i18n}}" title="{{'cancel' | i18n}}"
+            (click)="cancel()"><span aria-hidden="true">&times;</span></button>
         <h3 class="card-body-header">{{(add ? 'addStorage' : 'removeStorage') | i18n}}</h3>
         <div class="row">
             <div class="form-group col-6">
diff --git a/src/app/settings/user-subscription.component.html b/src/app/settings/user-subscription.component.html
index f864acbaee9..02550309f46 100644
--- a/src/app/settings/user-subscription.component.html
+++ b/src/app/settings/user-subscription.component.html
@@ -66,6 +66,8 @@
         </div>
         <div class="card mt-3" *ngIf="showUpdateLicense">
             <div class="card-body">
+                <button type="button" class="close" attr.aria-label="{{'cancel' | i18n}}" title="{{'cancel' | i18n}}"
+                    (click)="closeUpdateLicense(false)"><span aria-hidden="true">&times;</span></button>
                 <h3 class="card-body-header">{{'updateLicense' | i18n}}</h3>
                 <app-update-license (onUpdated)="closeUpdateLicense(true)" (onCanceled)="closeUpdateLicense(false)">
                 </app-update-license>