diff --git a/ui-ngx/src/app/modules/home/pages/admin/sms-provider.component.html b/ui-ngx/src/app/modules/home/pages/admin/sms-provider.component.html
index ce48b1e66a..ba8e24c302 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/sms-provider.component.html
+++ b/ui-ngx/src/app/modules/home/pages/admin/sms-provider.component.html
@@ -28,67 +28,63 @@
   <div style="height: 4px;" *ngIf="!(isLoading$ | async)"></div>
   <mat-card-content>
     <form [formGroup]="smsProvider" (ngSubmit)="save()">
-      <fieldset [disabled]="isLoading$ | async">
-        <tb-sms-provider-configuration
-          required
-          formControlName="configuration">
-        </tb-sms-provider-configuration>
-        <div fxLayout="row" fxLayoutAlign="end center" fxLayout.xs="column" fxLayoutAlign.xs="end" fxLayoutGap="16px">
-          <button mat-raised-button type="button"
-                  [disabled]="(isLoading$ | async) || smsProvider.invalid" (click)="sendTestSms()">
-            {{'admin.send-test-sms' | translate}}
-          </button>
-          <button mat-raised-button color="primary" [disabled]="(isLoading$ | async) || smsProvider.invalid || !smsProvider.dirty"
-                  type="submit">{{'action.save' | translate}}
-          </button>
-        </div>
-      </fieldset>
+      <tb-sms-provider-configuration
+        required
+        formControlName="configuration">
+      </tb-sms-provider-configuration>
+      <div fxLayout="row" fxLayoutAlign="end center" fxLayout.xs="column" fxLayoutAlign.xs="end" fxLayoutGap="16px">
+        <button mat-raised-button type="button"
+                [disabled]="(isLoading$ | async) || smsProvider.invalid" (click)="sendTestSms()">
+          {{'admin.send-test-sms' | translate}}
+        </button>
+        <button mat-raised-button color="primary" [disabled]="(isLoading$ | async) || smsProvider.invalid || !smsProvider.dirty"
+                type="submit">{{'action.save' | translate}}
+        </button>
+      </div>
     </form>
   </mat-card-content>
 </mat-card>
 <form [formGroup]="notificationSettingsForm" (ngSubmit)="saveNotification()">
-  <fieldset [disabled]="isLoading$ | async" formGroupName="deliveryMethodsConfigs">
-    <mat-card appearance="outlined" class="settings-card">
-      <mat-card-header>
-        <mat-card-title>
-          <span class="mat-headline-5" translate>admin.slack-settings</span>
-        </mat-card-title>
-        <span fxFlex></span>
-        <div tb-help="slackSettings"></div>
-      </mat-card-header>
-      <mat-progress-bar color="warn" mode="indeterminate" *ngIf="isLoading$ | async">
-      </mat-progress-bar>
-      <div style="height: 4px;" *ngIf="!(isLoading$ | async)"></div>
-      <mat-card-content formGroupName="SLACK">
-        <mat-form-field class="mat-block" subscriptSizing="dynamic">
-          <mat-label translate>admin.slack-api-token</mat-label>
-          <input matInput formControlName="botToken"/>
-        </mat-form-field>
-      </mat-card-content>
-      <mat-card-header *ngIf="isSysAdmin()">
-        <mat-card-title>
-          <span class="mat-headline-5" translate>admin.mobile-settings</span>
-        </mat-card-title>
-        <span fxFlex></span>
-        <!--    <div tb-help="mobileSettings"></div>-->
-      </mat-card-header>
-      <mat-card-content formGroupName="MOBILE_APP" *ngIf="isSysAdmin()">
-        <tb-file-input formControlName="firebaseServiceAccountCredentials"
-                       dropLabel="{{ 'admin.select-firebase-service-account-file' | translate }}"
-                       label="{{ 'admin.firebase-service-account-file' | translate }}"
-                       accept=".json,application/json"
-                       allowedExtensions="json"
-                       [existingFileName]="notificationSettingsForm.get('deliveryMethodsConfigs.MOBILE_APP.firebaseServiceAccountCredentialsFileName')?.value"
-                       (fileNameChanged)="notificationSettingsForm?.get('deliveryMethodsConfigs.MOBILE_APP.firebaseServiceAccountCredentialsFileName').patchValue($event)">
-        </tb-file-input>
-      </mat-card-content>
-      <mat-card-actions fxLayoutAlign="end center" fxLayout.xs="column" fxLayoutAlign.xs="end">
-        <button mat-button mat-raised-button color="primary"
-                [disabled]="(isLoading$ | async) || notificationSettingsForm.invalid || !notificationSettingsForm.dirty"
-                type="submit">{{'action.save' | translate}}
-        </button>
-      </mat-card-actions>
-    </mat-card>
-  </fieldset>
+  <mat-card appearance="outlined" class="settings-card" formGroupName="deliveryMethodsConfigs">
+    <mat-card-header>
+      <mat-card-title>
+        <span class="mat-headline-5" translate>admin.slack-settings</span>
+      </mat-card-title>
+      <span fxFlex></span>
+      <div tb-help="slackSettings"></div>
+    </mat-card-header>
+    <mat-progress-bar color="warn" mode="indeterminate" *ngIf="isLoading$ | async">
+    </mat-progress-bar>
+    <div style="height: 4px;" *ngIf="!(isLoading$ | async)"></div>
+    <mat-card-content formGroupName="SLACK">
+      <mat-form-field class="mat-block" subscriptSizing="dynamic">
+        <mat-label translate>admin.slack-api-token</mat-label>
+        <input matInput formControlName="botToken"/>
+      </mat-form-field>
+    </mat-card-content>
+    <mat-card-header *ngIf="isSysAdmin()">
+      <mat-card-title>
+        <span class="mat-headline-5" translate>admin.mobile-settings</span>
+      </mat-card-title>
+      <span fxFlex></span>
+      <!--    <div tb-help="mobileSettings"></div>-->
+    </mat-card-header>
+    <mat-card-content formGroupName="MOBILE_APP" *ngIf="isSysAdmin()">
+      <tb-file-input formControlName="firebaseServiceAccountCredentials"
+                     dropLabel="{{ 'admin.select-firebase-service-account-file' | translate }}"
+                     label="{{ 'admin.firebase-service-account-file' | translate }}"
+                     accept=".json,application/json"
+                     allowedExtensions="json"
+                     [existingFileName]="notificationSettingsForm.get('deliveryMethodsConfigs.MOBILE_APP.firebaseServiceAccountCredentialsFileName')?.value"
+                     (fileNameChanged)="notificationSettingsForm?.get('deliveryMethodsConfigs.MOBILE_APP.firebaseServiceAccountCredentialsFileName').patchValue($event)">
+      </tb-file-input>
+    </mat-card-content>
+    <mat-card-actions fxLayoutAlign="end center" fxLayout.xs="column" fxLayoutAlign.xs="end">
+      <button mat-button mat-raised-button color="primary"
+              [disabled]="(isLoading$ | async) || notificationSettingsForm.invalid || !notificationSettingsForm.dirty"
+              type="submit">{{'action.save' | translate}}
+      </button>
+    </mat-card-actions>
+  </mat-card>
 </form>
 
diff --git a/ui-ngx/src/app/modules/home/pages/admin/sms-provider.component.scss b/ui-ngx/src/app/modules/home/pages/admin/sms-provider.component.scss
index 088ce92552..b8b195dff2 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/sms-provider.component.scss
+++ b/ui-ngx/src/app/modules/home/pages/admin/sms-provider.component.scss
@@ -16,6 +16,7 @@
 :host {
   .mat-mdc-card-header {
     align-items: center;
+    min-height: 64px;
   }
 
   .mdc-card__actions {
diff --git a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts
index 10a0b96540..0262ef88cb 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts
+++ b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts
@@ -328,6 +328,7 @@ export class SentNotificationDialogComponent extends
         return '/settings/outgoing-mail';
       case NotificationDeliveryMethod.SMS:
       case NotificationDeliveryMethod.SLACK:
+      case NotificationDeliveryMethod.MOBILE_APP:
         return '/settings/notifications';
     }
   }