diff --git a/ui-ngx/src/app/modules/home/pages/admin/general-settings.component.html b/ui-ngx/src/app/modules/home/pages/admin/general-settings.component.html
index 0bef085781..da0e9fede3 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/general-settings.component.html
+++ b/ui-ngx/src/app/modules/home/pages/admin/general-settings.component.html
@@ -27,7 +27,7 @@
     <mat-progress-bar color="warn" mode="indeterminate" *ngIf="isLoading$ | async">
     </mat-progress-bar>
     <div style="height: 4px;" *ngIf="!(isLoading$ | async)"></div>
-    <mat-card-content style="padding-top: 16px;">
+    <mat-card-content>
       <form [formGroup]="generalSettings" (ngSubmit)="save()">
         <fieldset [disabled]="isLoading$ | async">
           <mat-form-field class="mat-block">
diff --git a/ui-ngx/src/app/modules/home/pages/admin/notification-settings.component.html b/ui-ngx/src/app/modules/home/pages/admin/notification-settings.component.html
index edfff9e593..f5fa148993 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/notification-settings.component.html
+++ b/ui-ngx/src/app/modules/home/pages/admin/notification-settings.component.html
@@ -16,12 +16,14 @@
 
 -->
 <div>
-  <mat-card class="settings-card">
-    <mat-card-title>
-      <div fxLayout="row">
-        <span class="mat-headline" translate>admin.notification.notification-settings</span>
-      </div>
-    </mat-card-title>
+  <mat-card appearance="outlined" class="settings-card">
+    <mat-card-header>
+      <mat-card-title>
+        <div fxLayout="row">
+          <span class="mat-headline-5" translate>admin.notification.notification-settings</span>
+        </div>
+      </mat-card-title>
+    </mat-card-header>
     <mat-progress-bar color="warn" mode="indeterminate" *ngIf="isLoading$ | async">
     </mat-progress-bar>
     <div style="height: 4px;" *ngIf="!(isLoading$ | async)"></div>
diff --git a/ui-ngx/src/app/modules/home/pages/notification-center/rule-table/rule-notification-dialog.component.html b/ui-ngx/src/app/modules/home/pages/notification-center/rule-table/rule-notification-dialog.component.html
index 8abc108e50..a3db4399f9 100644
--- a/ui-ngx/src/app/modules/home/pages/notification-center/rule-table/rule-notification-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/notification-center/rule-table/rule-notification-dialog.component.html
@@ -112,8 +112,8 @@
             <legend translate>notification.clear-rule</legend>
             <mat-form-field fxFlex class="mat-block" floatLabel="always">
               <mat-label translate>alarm.alarm-status-list</mat-label>
-              <mat-select formControlName="alarmStatus" multiple
-                          placeholder="{{ !alarmTemplateForm.get('triggerConfig.clearRule.alarmStatus').value?.length ? ('alarm.any-status' | translate) : '' }}">
+              <mat-select formControlName="alarmStatuses" multiple
+                          placeholder="{{ !alarmTemplateForm.get('triggerConfig.clearRule.alarmStatuses').value?.length ? ('alarm.any-status' | translate) : '' }}">
                 <mat-option *ngFor="let searchStatus of alarmSearchStatuses" [value]="searchStatus">
                   {{ alarmSearchStatusTranslationMap.get(searchStatus) | translate }}
                 </mat-option>
@@ -232,8 +232,8 @@
             </mat-form-field>
             <mat-form-field fxFlex class="mat-block" floatLabel="always">
               <mat-label translate>alarm.alarm-status-list</mat-label>
-              <mat-select formControlName="alarmStatus" multiple
-                          placeholder="{{ !alarmCommentTemplateForm.get('triggerConfig.alarmStatus').value?.length ? ('alarm.any-status' | translate) : '' }}">
+              <mat-select formControlName="alarmStatuses" multiple
+                          placeholder="{{ !alarmCommentTemplateForm.get('triggerConfig.alarmStatuses').value?.length ? ('alarm.any-status' | translate) : '' }}">
                 <mat-option *ngFor="let searchStatus of alarmSearchStatuses" [value]="searchStatus">
                   {{ alarmSearchStatusTranslationMap.get(searchStatus) | translate }}
                 </mat-option>
diff --git a/ui-ngx/src/app/modules/home/pages/notification-center/rule-table/rule-notification-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/notification-center/rule-table/rule-notification-dialog.component.ts
index efa2d88b05..b9c64b7235 100644
--- a/ui-ngx/src/app/modules/home/pages/notification-center/rule-table/rule-notification-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/notification-center/rule-table/rule-notification-dialog.component.ts
@@ -151,7 +151,7 @@ export class RuleNotificationDialogComponent extends
         alarmTypes: [null],
         alarmSeverities: [[]],
         clearRule: this.fb.group({
-          alarmStatus: [[]]
+          alarmStatuses: [[]]
         })
       })
     });
@@ -189,7 +189,7 @@ export class RuleNotificationDialogComponent extends
       triggerConfig: this.fb.group({
         alarmTypes: [null],
         alarmSeverities: [[]],
-        alarmStatus: [[]]
+        alarmStatuses: [[]]
       })
     });
 
diff --git a/ui-ngx/src/app/modules/home/pages/notification-center/targets-table/target-notification-dialog.componet.ts b/ui-ngx/src/app/modules/home/pages/notification-center/targets-table/target-notification-dialog.componet.ts
index 324c8dba95..c54fcfa2a6 100644
--- a/ui-ngx/src/app/modules/home/pages/notification-center/targets-table/target-notification-dialog.componet.ts
+++ b/ui-ngx/src/app/modules/home/pages/notification-center/targets-table/target-notification-dialog.componet.ts
@@ -150,10 +150,15 @@ export class TargetNotificationDialogComponent extends
   }
 
   save() {
-    let formValue = deepTrim(this.targetNotificationForm.value);
+    let formValue: NotificationTarget = deepTrim(this.targetNotificationForm.value);
     if (isDefined(this.data.target)) {
       formValue = Object.assign({}, this.data.target, formValue);
     }
+    if (formValue.configuration.type === NotificationTargetType.PLATFORM_USERS && !formValue.configuration.usersFilter) {
+      formValue.configuration.usersFilter = {
+        type: NotificationTargetConfigType.ALL_USERS
+      }
+    }
     this.notificationService.saveNotificationTarget(formValue).subscribe(
       (target) => this.dialogRef.close(target)
     );
diff --git a/ui-ngx/src/app/shared/components/notification/notification.component.ts b/ui-ngx/src/app/shared/components/notification/notification.component.ts
index 2173c30023..3e73753d14 100644
--- a/ui-ngx/src/app/shared/components/notification/notification.component.ts
+++ b/ui-ngx/src/app/shared/components/notification/notification.component.ts
@@ -101,7 +101,7 @@ export class NotificationComponent implements OnInit {
           const stateObject: StateObject = {};
           if (this.notification.additionalConfig.actionButtonConfig.setEntityIdInState) {
             stateObject.params = {
-              entityId: this.notification.info.originatorId ?? null
+              entityId: this.notification.info.stateEntityId ?? null
             };
           } else {
             stateObject.params = {};
diff --git a/ui-ngx/src/app/shared/models/notification.models.ts b/ui-ngx/src/app/shared/models/notification.models.ts
index 3c4ffbb994..28bf639ab0 100644
--- a/ui-ngx/src/app/shared/models/notification.models.ts
+++ b/ui-ngx/src/app/shared/models/notification.models.ts
@@ -45,7 +45,7 @@ export interface NotificationInfo {
   alarmSeverity?: AlarmSeverity;
   alarmStatus?: AlarmStatus;
   alarmType?: string;
-  originatorId?: EntityId;
+  stateEntityId?: EntityId;
 }
 
 export interface NotificationRequest extends Omit<BaseData<NotificationRequestId>, 'label'> {
@@ -112,9 +112,9 @@ export interface NotificationRule extends Omit<BaseData<NotificationRuleId>, 'la
 export interface NotificationRuleTriggerConfig {
   alarmTypes?: Array<string>;
   alarmSeverities?: Array<AlarmSeverity>;
-  alarmStatus?: Array<AlarmSearchStatus>;
+  alarmStatuses?: Array<AlarmSearchStatus>;
   clearRule?: {
-    alarmStatus: Array<AlarmSearchStatus>;
+    alarmStatuses: Array<AlarmSearchStatus>;
   };
   devices?: Array<string>;
   deviceProfiles?: Array<string>;
@@ -209,11 +209,11 @@ interface PushDeliveryMethodAdditionalConfig {
   actionButtonConfig: {
     enabled: boolean;
     text: string;
-    linkType: ActionButtonLinkType,
+    linkType: ActionButtonLinkType;
     link?: string;
     dashboardId?: string;
     dashboardState?: string;
-    setEntityIdInState?: boolean
+    setEntityIdInState?: boolean;
   };
 }
 
@@ -242,7 +242,7 @@ export const NotificationDeliveryMethodTranslateMap = new Map<NotificationDelive
   [NotificationDeliveryMethod.PUSH, 'notification.delivery-method-type.push'],
   [NotificationDeliveryMethod.SMS, 'notification.delivery-method-type.sms'],
   [NotificationDeliveryMethod.EMAIL, 'notification.delivery-method-type.email'],
-  [NotificationDeliveryMethod.SLACK, 'notification.delivery-method-type.slack'],
+  [NotificationDeliveryMethod.SLACK, 'notification.delivery-method-type.slack']
 ]);
 
 export enum NotificationRequestStatus {
@@ -353,7 +353,7 @@ export const NotificationTemplateTypeTranslateMap = new Map<NotificationType, No
       name: 'notification.template-type.alarm-comment',
       hint: 'notification.template-hint.alarm-comment'
     }
-  ],
+  ]
 ]);
 
 export enum TriggerType {
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index 12f33f3a34..ceac31ef1d 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -2861,8 +2861,8 @@
         "targets-required": "Recipients is required",
         "template": "Template",
         "template-hint": {
-            "alarm": "Available params: ${alarmType}, ${alarmSeverity}, ${alarmStatus}, ${alarmOriginatorEntityType}, ${alarmOriginatorId}, ${alarmId}",
-            "alarm-comment": "Available params: ${comment}, ${alarmType}, ${alarmId}",
+            "alarm": "Available params: ${alarmType}, ${alarmSeverity}, ${alarmStatus}, ${alarmOriginatorEntityType}, ${alarmOriginatorId}, ${alarmId}, ${alarmAction}",
+            "alarm-comment": "Available params: ${comment}, ${alarmType}, ${alarmId}, ${alarmType}, ${alarmSeverity}, ${alarmStatus}, ${alarmOriginatorEntityType}, ${alarmOriginatorId}, ${alarmId}, ${alarmAction}",
             "device-inactivity": "Available params: ${deviceName}, ${deviceType}, ${deviceId}",
             "entity-action": "Available params: ${actionType}, ${entityType}, ${entityName}, ${entityId}, ${originatorUserName}, ${originatorUserId}",
             "general": "Available params: ${recipientEmail}, ${recipientFirstName}, ${recipientLastName}"