diff --git a/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules-table-config.ts b/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules-table-config.ts
index fb31b8b522..2b70d951cb 100644
--- a/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules-table-config.ts
+++ b/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules-table-config.ts
@@ -119,8 +119,8 @@ export class AlarmRulesTableConfig extends EntityTableConfig<any> {
     this.columns.push(new EntityTableColumn<CalculatedFieldAlarmRule>('createRule', 'alarm-rule.severities', '67%',
       entity => Object.keys(entity.configuration.createRules).map((severity) => this.translate.instant(alarmSeverityTranslations.get(severity as AlarmSeverity))).join(', '),
       () => ({}), false));
-    this.columns.push(new EntityTableColumn<CalculatedFieldAlarmRule>('clearRule', 'alarm-rule.cleared', '60px',
-      entity => checkBoxCell(!!entity.configuration.clearRule), ()=> { return {padding: '0 14px'}}, false));
+    this.columns.push(new EntityTableColumn<CalculatedFieldAlarmRule>('clearRule', 'alarm-rule.cleared', '70px',
+      entity => checkBoxCell(!!entity.configuration.clearRule), ()=> { return {padding: 0, textAlign: 'center'}}, false));
 
     this.cellActionDescriptors.push(
       {
diff --git a/ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule.component.html b/ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule.component.html
index e1f2f41bfd..cd6b2c3796 100644
--- a/ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule.component.html
+++ b/ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule.component.html
@@ -18,7 +18,7 @@
 <div class="tb-form-panel no-border no-padding" [formGroup]="alarmRuleFormGroup">
   <tb-cf-alarm-rule-condition formControlName="condition" [arguments]="arguments">
   </tb-cf-alarm-rule-condition>
-  @if (!disabled || alarmRuleFormGroup.get('dashboardId').value) {
+  @if (!disabled || alarmRuleFormGroup.get('alarmDetails').value) {
     <div class="tb-form-row space-between column-xs">
       <div class="min-w-40 xs:min-w-fit" translate>
         alarm-rule.alarm-rule-additional-info
diff --git a/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-complex-filter-predicate-dialog.component.ts b/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-complex-filter-predicate-dialog.component.ts
index dab366f960..c8766b0b17 100644
--- a/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-complex-filter-predicate-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-complex-filter-predicate-dialog.component.ts
@@ -15,7 +15,6 @@
 ///
 
 import { Component, Inject } from '@angular/core';
-import { ErrorStateMatcher } from '@angular/material/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
@@ -41,7 +40,7 @@ export interface AlarmRuleComplexFilterPredicateDialogData {
 @Component({
   selector: 'tb-alarm-rule-complex-filter-predicate-dialog',
   templateUrl: './alarm-rule-complex-filter-predicate-dialog.component.html',
-  providers: [{provide: ErrorStateMatcher, useExisting: AlarmRuleComplexFilterPredicateDialogComponent}],
+  providers: [],
   styleUrls: []
 })
 
diff --git a/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-list.component.ts b/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-list.component.ts
index 86b7520910..11e2728659 100644
--- a/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-list.component.ts
+++ b/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-list.component.ts
@@ -102,6 +102,14 @@ export class AlarmRuleFilterListComponent implements ControlValueAccessor, Valid
     };
   }
 
+  setDisabledState(isDisabled: boolean): void {
+    if (isDisabled) {
+      this.filterListFormGroup.disable({emitEvent: false});
+    } else {
+      this.filterListFormGroup.enable({emitEvent: false});
+    }
+  }
+
   writeValue(filters: Array<AlarmRuleFilter>): void {
     const keyFilterControls: Array<AbstractControl> = [];
     if (filters) {
diff --git a/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-predicate-list.component.html b/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-predicate-list.component.html
index 210f3f9424..4eaa1eafb6 100644
--- a/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-predicate-list.component.html
+++ b/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-predicate-list.component.html
@@ -46,7 +46,7 @@
                 [formControl]="predicateControl">
               </tb-alarm-rule-filter-predicate>
               <button mat-icon-button color="primary"
-                      [class.!hidden]="disabled"
+                      [disabled]="disabled"
                       type="button"
                       (click)="removePredicate($index)"
                       matTooltip="{{ 'filter.remove-filter' | translate }}"
diff --git a/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-predicate-value.component.ts b/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-predicate-value.component.ts
index ae5208d103..ab89117898 100644
--- a/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-predicate-value.component.ts
+++ b/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-predicate-value.component.ts
@@ -107,6 +107,16 @@ export class AlarmRuleFilterPredicateValueComponent implements ControlValueAcces
     ).subscribe(value => this.updateValueModeValidators(value))
   }
 
+  setDisabledState?(isDisabled: boolean): void {
+    if (isDisabled) {
+      this.filterPredicateValueFormGroup.disable({emitEvent: false});
+      this.dynamicModeControl.disable({emitEvent: false});
+    } else {
+      this.filterPredicateValueFormGroup.enable({emitEvent: false});
+      this.dynamicModeControl.enable({emitEvent: false});
+    }
+  }
+
   private updateValueModeValidators(isDynamicMode: boolean): void {
     if (isDynamicMode) {
       this.filterPredicateValueFormGroup.get('staticValue').disable({emitEvent: false});
diff --git a/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-predicate.component.ts b/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-predicate.component.ts
index a49d4cf42e..f37970bb50 100644
--- a/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-predicate.component.ts
+++ b/ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-predicate.component.ts
@@ -14,7 +14,7 @@
 /// limitations under the License.
 ///
 
-import { Component, DestroyRef, forwardRef, Input } from '@angular/core';
+import { booleanAttribute, Component, DestroyRef, forwardRef, Input } from '@angular/core';
 import {
   ControlValueAccessor,
   FormBuilder,
@@ -61,6 +61,9 @@ import { CalculatedFieldArgument } from "@shared/models/calculated-field.models"
 })
 export class AlarmRuleFilterPredicateComponent implements ControlValueAccessor, Validator {
 
+  @Input({ transform: booleanAttribute })
+  disabled: boolean;
+
   @Input()
   valueType: EntityKeyValueType;
 
@@ -115,6 +118,15 @@ export class AlarmRuleFilterPredicateComponent implements ControlValueAccessor,
     };
   }
 
+  setDisabledState?(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+    if (isDisabled) {
+      this.filterPredicateFormGroup.disable({emitEvent: false});
+    } else {
+      this.filterPredicateFormGroup.enable({emitEvent: false});
+    }
+  }
+
   writeValue(predicate: AlarmRuleFilterPredicate): void {
     this.type = predicate.type;
     this.filterPredicateFormGroup.patchValue(predicate, {emitEvent: false});
diff --git a/ui-ngx/src/app/modules/home/pages/device-profile/device-profile-tabs.component.html b/ui-ngx/src/app/modules/home/pages/device-profile/device-profile-tabs.component.html
index 809ee5c3fc..9a1671d31b 100644
--- a/ui-ngx/src/app/modules/home/pages/device-profile/device-profile-tabs.component.html
+++ b/ui-ngx/src/app/modules/home/pages/device-profile/device-profile-tabs.component.html
@@ -50,9 +50,9 @@
     <mat-tab #alarmRules="matTab" label="{{'alarm-rule.alarm-rules-tab' | translate }}">
       <section class="flex flex-col h-full">
         @if (hasOldRules && !isEdit) {
-          <div class="flex flex-row items-center justify-end" style="padding: 16px 16px 0;">
+          <div class="flex flex-row items-center justify-start" style="padding: 16px 16px 0;">
             <tb-toggle-select [(ngModel)]="alarmRulesOldVersion" appearance="fill">
-              <tb-toggle-option [value]="false">{{ 'alarm-rule.alarm-rules-new' | translate }}</tb-toggle-option>
+              <tb-toggle-option [value]="false">{{ 'alarm-rule.alarm-rules-actual' | translate }}</tb-toggle-option>
               <tb-toggle-option [value]="true">{{ 'alarm-rule.alarm-rules-old' | translate }}</tb-toggle-option>
             </tb-toggle-select>
           </div>
@@ -65,7 +65,11 @@
           </div>
         } @else {
           <div class="relative h-full">
-            <tb-alarm-rules-table [active]="alarmRules.isActive" [entityId]="entity.id" [entityName]="entity.name" [ownerId]="entity.tenantId"></tb-alarm-rules-table>
+            <tb-alarm-rules-table [active]="alarmRules.isActive"
+                                  [entityId]="entity.id"
+                                  [entityName]="entity.name"
+                                  [ownerId]="entity.tenantId">
+            </tb-alarm-rules-table>
           </div>
         }
       </section>
diff --git a/ui-ngx/src/app/modules/home/pages/device-profile/device-profile-tabs.component.ts b/ui-ngx/src/app/modules/home/pages/device-profile/device-profile-tabs.component.ts
index d071dec703..629c9eeeef 100644
--- a/ui-ngx/src/app/modules/home/pages/device-profile/device-profile-tabs.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/device-profile/device-profile-tabs.component.ts
@@ -61,7 +61,7 @@ export class DeviceProfileTabsComponent extends EntityTabsComponent<DeviceProfil
   protected setEntity(entity: DeviceProfile) {
     this.isTransportTypeChanged = false;
     this.hasOldRules = !!entity?.profileData?.alarms?.length;
-    this.alarmRulesOldVersion = this.isEdit || false;
+    this.alarmRulesOldVersion = false;
     super.setEntity(entity);
   }
 
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 7f807f6beb..0c501f5c5e 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -1251,9 +1251,9 @@
         "alarm-rule": "Alarm rule",
         "alarm-rules": "Alarm rules",
         "alarm-rules-old": "Old",
-        "alarm-rules-new": "New",
+        "alarm-rules-actual": "Actual",
         "severities": "Severities",
-        "cleared": "Cleared",
+        "cleared": "Clear condition",
         "delete-title": "Are you sure you want to delete the alarm rule '{{title}}'?",
         "delete-text": "Be careful, after the confirmation the alarm rule and all related data will become unrecoverable.",
         "delete-multiple-title": "Are you sure you want to delete { count, plural, =1 {1 alarm rule} other {# alarm rules} }?",