diff --git a/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rule-filter-config.component.html b/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rule-filter-config.component.html
index e65b8919ce..929e7d581e 100644
--- a/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rule-filter-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rule-filter-config.component.html
@@ -67,56 +67,6 @@
     </div>
   }
 }
-<ng-template #componentMode>
-  @if (buttonMode) {
-    <button color="primary"
-            matTooltip="{{buttonDisplayValue}}"
-            matTooltipPosition="above"
-            mat-stroked-button
-            (click)="toggleAlarmRuleFilterPanel($event)">
-      <mat-icon>filter_list</mat-icon>{{buttonDisplayValue}}
-    </button>
-  } @else {
-    <div class="tb-form-panel tb-alarm-filter-config-component no-padding no-border" [formGroup]="alarmRuleFilterConfigForm">
-      <div class="tb-form-row column-xs">
-        <div class="fixed-title-width" translate>alarm-rule.alarm-rule-type-list</div>
-        <tb-entity-subtype-list subscriptSizing="dynamic"
-                                formControlName="name"
-                                appearance="outline"
-                                [additionalClasses]="['tb-chips', 'flex']"
-                                [entityType]="entityType.CALCULATED_FIELD">
-        </tb-entity-subtype-list>
-      </div>
-      <div class="tb-form-row column-xs">
-        <div class="fixed-title-width" translate>entity.entity-type</div>
-        <mat-form-field class="flex-1" appearance="outline" subscriptSizing="dynamic">
-          <mat-select formControlName="entityType" placeholder="{{ 'alarm-rule.any-type' | translate }}">
-            <mat-option>{{ 'alarm-rule.any-type' | translate }}</mat-option>
-            @for (type of listEntityTypes; track type) {
-              <mat-option [value]="type">
-                {{ entityTypeTranslations.get(type)?.type | translate }}
-              </mat-option>
-            }
-          </mat-select>
-        </mat-form-field>
-      </div>
-      @if (alarmRuleFilterConfigForm.get('entityType').value) {
-        <div class="tb-form-row column-xs">
-          <div class="fixed-title-width" translate>entity.entities</div>
-          <tb-entity-list appearance="outline"
-                          subscriptSizing="dynamic"
-                          class="flex flex-1"
-                          inlineField
-                          syncIdsWithDB
-                          labelText="{{'entity.entity-list' | translate}}"
-                          [entityType]="alarmRuleFilterConfigForm.get('entityType').value"
-                          formControlName="entities">
-          </tb-entity-list>
-        </div>
-      }
-    </div>
-  }
-</ng-template>
 <ng-template #alarmRuleFilterPanel>
   <form class="mat-content mat-padding flex flex-col" (ngSubmit)="update()">
     <ng-container *ngTemplateOutlet="alarmFilter"></ng-container>
diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-comment-dialog.component.html b/ui-ngx/src/app/modules/home/components/alarm/alarm-comment-dialog.component.html
index 5f18a32d62..a5935e1f2b 100644
--- a/ui-ngx/src/app/modules/home/components/alarm/alarm-comment-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-comment-dialog.component.html
@@ -25,8 +25,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content style="padding: 0">
diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-filter-config.component.html b/ui-ngx/src/app/modules/home/components/alarm/alarm-filter-config.component.html
index 839dc49238..ca1578c054 100644
--- a/ui-ngx/src/app/modules/home/components/alarm/alarm-filter-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-filter-config.component.html
@@ -72,61 +72,6 @@
     </div>
   }
 }
-<ng-template #componentMode>
-  @if (buttonMode) {
-    <button color="primary"
-            matTooltip="{{buttonDisplayValue}}"
-            matTooltipPosition="above"
-            mat-stroked-button
-            (click)="toggleAlarmFilterPanel($event)">
-      <mat-icon>filter_list</mat-icon>{{buttonDisplayValue}}
-    </button>
-  } @else {
-    <div class="tb-form-panel tb-alarm-filter-config-component no-padding no-border" [formGroup]="alarmFilterConfigForm">
-      <div class="tb-form-row space-between column-xs">
-        <div class="fixed-title-width" translate>alarm.alarm-status-list</div>
-        <mat-chip-listbox multiple formControlName="statusList">
-          @for (searchStatus of alarmSearchStatuses; track searchStatus) {
-            <mat-chip-option [value]="searchStatus">
-              {{ alarmSearchStatusTranslationMap.get(searchStatus) | translate }}
-            </mat-chip-option>
-          }
-        </mat-chip-listbox>
-      </div>
-      <div class="tb-form-row space-between column-xs">
-        <div class="fixed-title-width" translate>alarm.alarm-severity-list</div>
-        <mat-chip-listbox multiple formControlName="severityList">
-          @for (alarmSeverity of alarmSeverities; track alarmSeverity) {
-            <mat-chip-option [value]="alarmSeverity">
-              {{ alarmSeverityTranslationMap.get(alarmSeverityEnum[alarmSeverity]) | translate }}
-            </mat-chip-option>
-          }
-        </mat-chip-listbox>
-      </div>
-      <div class="tb-form-row column-xs">
-        <div class="fixed-title-width" translate>alarm.alarm-type-list</div>
-        <tb-entity-subtype-list subscriptSizing="dynamic"
-                                formControlName="typeList"
-                                appearance="outline"
-                                [additionalClasses]="['tb-chips', 'flex']"
-                                [entityType]="entityType.ALARM">
-        </tb-entity-subtype-list>
-      </div>
-      <div class="tb-form-row column-xs">
-        <div class="fixed-title-width" translate>alarm.assignee</div>
-        <tb-alarm-assignee-select class="flex-1" inline="true"
-                                  [userMode]="userMode"
-                                  formControlName="assigneeId">
-        </tb-alarm-assignee-select>
-      </div>
-      @if (propagatedFilter) {
-        <mat-slide-toggle class="mat-slide" formControlName="searchPropagatedAlarms">
-          {{ 'alarm.search-propagated-alarms' | translate }}
-        </mat-slide-toggle>
-      }
-    </div>
-  }
-</ng-template>
 <ng-template #alarmFilterPanel>
   <form class="mat-content mat-padding flex flex-col" (ngSubmit)="update()">
     <ng-container *ngTemplateOutlet="alarmFilter"></ng-container>
diff --git a/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.html b/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.html
index 7028814b79..eddcf3f9b2 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.html
@@ -28,8 +28,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content>
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/table-header/calculated-fields-filter-config.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/table-header/calculated-fields-filter-config.component.html
index 74075f56ee..79062b1a0e 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/table-header/calculated-fields-filter-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/table-header/calculated-fields-filter-config.component.html
@@ -69,58 +69,6 @@
     </div>
   }
 }
-<ng-template #componentMode>
-  @if (buttonMode) {
-    <button color="primary"
-            matTooltip="{{buttonDisplayValue}}"
-            matTooltipPosition="above"
-            mat-stroked-button
-            (click)="toggleCfFilterPanel($event)">
-      <mat-icon>filter_list</mat-icon>{{buttonDisplayValue}}
-    </button>
-  } @else {
-    <div class="tb-form-panel tb-calculated-fields-config-component no-padding no-border" [formGroup]="cfFilterForm">
-      <div class="tb-form-row column-xs">
-        <div class="fixed-title-width" translate>calculated-fields.calculated-field-types</div>
-        <tb-string-items-list subscriptSizing="dynamic"
-                              formControlName="types"
-                              appearance="outline"
-                              fieldClass="flex"
-                              class="flex-1"
-                              placeholder="{{ !cfFilterForm.get('types').value?.length ? ('calculated-fields.any-type' | translate) : '' }}"
-                              [predefinedValues]="types">
-        </tb-string-items-list>
-      </div>
-      <div class="tb-form-row column-xs">
-        <div class="fixed-title-width" translate>entity.entity-type</div>
-        <mat-form-field class="flex-1" appearance="outline" subscriptSizing="dynamic">
-          <mat-select formControlName="entityType" placeholder="{{ 'alarm-rule.any-type' | translate }}">
-            <mat-option>{{ 'alarm-rule.any-type' | translate }}</mat-option>
-            @for (type of listEntityTypes; track type) {
-              <mat-option [value]="type">
-                {{ entityTypeTranslations.get(type)?.type | translate }}
-              </mat-option>
-            }
-          </mat-select>
-        </mat-form-field>
-      </div>
-      @if (cfFilterForm.get('entityType').value) {
-        <div class="tb-form-row column-xs">
-          <div class="fixed-title-width" translate>entity.entities</div>
-          <tb-entity-list appearance="outline"
-                          subscriptSizing="dynamic"
-                          class="flex flex-1"
-                          inlineField
-                          syncIdsWithDB
-                          labelText="{{'entity.entity-list' | translate}}"
-                          [entityType]="cfFilterForm.get('entityType').value"
-                          formControlName="entities">
-          </tb-entity-list>
-        </div>
-      }
-    </div>
-  }
-</ng-template>
 <ng-template #calculatedFieldsFilterPanel>
   <form class="mat-content mat-padding flex flex-col" (ngSubmit)="update()">
     <ng-container *ngTemplateOutlet="calculatedFieldsFilter"></ng-container>
diff --git a/ui-ngx/src/app/modules/home/components/device/device-info-filter.component.html b/ui-ngx/src/app/modules/home/components/device/device-info-filter.component.html
index 3fe16989cf..0029a3ba3f 100644
--- a/ui-ngx/src/app/modules/home/components/device/device-info-filter.component.html
+++ b/ui-ngx/src/app/modules/home/components/device/device-info-filter.component.html
@@ -53,42 +53,6 @@
     </div>
   }
 }
-<ng-template #componentMode>
-  @if (buttonMode) {
-    <button color="primary"
-            matTooltip="{{buttonDisplayValue}}"
-            matTooltipPosition="above"
-            mat-stroked-button
-            (click)="toggleDeviceFilterPanel($event)">
-      <mat-icon>filter_list</mat-icon>{{buttonDisplayValue}}
-    </button>
-  } @else {
-    <div class="tb-device-filter-config-component tb-form-panel no-padding no-border" [formGroup]="deviceInfoFilterForm">
-      <div class="tb-form-row column-xs">
-        <div class="fixed-title-width" translate>device-profile.device-profile</div>
-        <tb-device-profile-autocomplete
-          class="flex-1"
-          formControlName="deviceProfileId"
-          [inlineField]="true"
-          [displayAllOnEmpty]="true"
-          (deviceProfileChanged)="deviceProfileChanged($event)"
-          [editProfileEnabled]="false"
-          [addNewProfile]="false">
-        </tb-device-profile-autocomplete>
-      </div>
-      <div class="tb-form-row column-xs">
-        <div class="fixed-title-width" translate>device.device-state</div>
-        <mat-form-field class="flex-1" appearance="outline" subscriptSizing="dynamic">
-          <mat-select formControlName="active" placeholder="{{ 'device.any' | translate }}">
-            <mat-option>{{ 'device.any' | translate }}</mat-option>
-            <mat-option [value]="true">{{ 'device.active' | translate }}</mat-option>
-            <mat-option [value]="false">{{ 'device.inactive' | translate }}</mat-option>
-          </mat-select>
-        </mat-form-field>
-      </div>
-    </div>
-  }
-</ng-template>
 <ng-template #deviceFilterPanel>
   <form class="mat-content mat-padding flex flex-col" (ngSubmit)="update()">
     <ng-container *ngTemplateOutlet="deviceFilter"></ng-container>
diff --git a/ui-ngx/src/app/modules/home/components/entity/add-entity-dialog.component.html b/ui-ngx/src/app/modules/home/components/entity/add-entity-dialog.component.html
index b10c1b89db..795bde21c1 100644
--- a/ui-ngx/src/app/modules/home/components/entity/add-entity-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/entity/add-entity-dialog.component.html
@@ -29,8 +29,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content>
diff --git a/ui-ngx/src/app/modules/home/components/profile/asset-profile-dialog.component.html b/ui-ngx/src/app/modules/home/components/profile/asset-profile-dialog.component.html
index 011b703fee..d47b4fa65c 100644
--- a/ui-ngx/src/app/modules/home/components/profile/asset-profile-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/asset-profile-dialog.component.html
@@ -28,8 +28,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content>
diff --git a/ui-ngx/src/app/modules/home/components/profile/device-profile-dialog.component.html b/ui-ngx/src/app/modules/home/components/profile/device-profile-dialog.component.html
index a180367e77..dcb15e48b8 100644
--- a/ui-ngx/src/app/modules/home/components/profile/device-profile-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/device-profile-dialog.component.html
@@ -28,8 +28,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content>
diff --git a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-add-instances-dialog.component.html b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-add-instances-dialog.component.html
index 6f63601f0b..1f36c01fe4 100644
--- a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-add-instances-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-add-instances-dialog.component.html
@@ -28,8 +28,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content>
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant-profile-dialog.component.html b/ui-ngx/src/app/modules/home/components/profile/tenant-profile-dialog.component.html
index 037e7eec22..19ef843762 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant-profile-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant-profile-dialog.component.html
@@ -28,8 +28,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content>
diff --git a/ui-ngx/src/app/modules/home/components/relation/relation-dialog.component.html b/ui-ngx/src/app/modules/home/components/relation/relation-dialog.component.html
index 1bb6e97703..896adb0c46 100644
--- a/ui-ngx/src/app/modules/home/components/relation/relation-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/relation/relation-dialog.component.html
@@ -28,8 +28,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content>
diff --git a/ui-ngx/src/app/modules/home/components/resources/resources-dialog.component.html b/ui-ngx/src/app/modules/home/components/resources/resources-dialog.component.html
index 7ab487e78c..a5757e7e58 100644
--- a/ui-ngx/src/app/modules/home/components/resources/resources-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/resources/resources-dialog.component.html
@@ -28,8 +28,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content>
diff --git a/ui-ngx/src/app/modules/home/components/widget/action/manage-widget-actions-dialog.component.html b/ui-ngx/src/app/modules/home/components/widget/action/manage-widget-actions-dialog.component.html
index c97d715c41..8b0ca22543 100644
--- a/ui-ngx/src/app/modules/home/components/widget/action/manage-widget-actions-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/action/manage-widget-actions-dialog.component.html
@@ -28,8 +28,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content style="position: relative; height: 500px;">
diff --git a/ui-ngx/src/app/modules/home/components/widget/dialog/embed-dashboard-dialog.component.html b/ui-ngx/src/app/modules/home/components/widget/dialog/embed-dashboard-dialog.component.html
index 1b523be28d..a31ad603f1 100644
--- a/ui-ngx/src/app/modules/home/components/widget/dialog/embed-dashboard-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/dialog/embed-dashboard-dialog.component.html
@@ -26,8 +26,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div class="dashboard-state-dialog-content flex flex-1 flex-col" mat-dialog-content style="padding: 8px;">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps-legacy/dialogs/select-entity-dialog.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/maps-legacy/dialogs/select-entity-dialog.component.html
index 813d32609f..afc11a7633 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/maps-legacy/dialogs/select-entity-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps-legacy/dialogs/select-entity-dialog.component.html
@@ -26,8 +26,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/persistent-add-dialog.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/persistent-add-dialog.component.html
index f8d8b7c0e3..5f7d83fbad 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/persistent-add-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/persistent-add-dialog.component.html
@@ -28,8 +28,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content class="add-dialog">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/persistent-details-dialog.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/persistent-details-dialog.component.html
index af0e848655..bffb4e21cc 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/persistent-details-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/persistent-details-dialog.component.html
@@ -28,8 +28,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/key/data-key-config-dialog.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/key/data-key-config-dialog.component.html
index bee0b3ab1c..802adb5211 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/key/data-key-config-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/key/data-key-config-dialog.component.html
@@ -34,8 +34,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content style="padding: 0; height: 800px; overflow: auto;">
diff --git a/ui-ngx/src/app/modules/home/dialogs/add-entities-to-customer-dialog.component.html b/ui-ngx/src/app/modules/home/dialogs/add-entities-to-customer-dialog.component.html
index eb07e82ce8..c397f8b1a0 100644
--- a/ui-ngx/src/app/modules/home/dialogs/add-entities-to-customer-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/dialogs/add-entities-to-customer-dialog.component.html
@@ -28,8 +28,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content>
diff --git a/ui-ngx/src/app/modules/home/dialogs/add-entities-to-edge-dialog.component.html b/ui-ngx/src/app/modules/home/dialogs/add-entities-to-edge-dialog.component.html
index c95d297864..599b217e61 100644
--- a/ui-ngx/src/app/modules/home/dialogs/add-entities-to-edge-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/dialogs/add-entities-to-edge-dialog.component.html
@@ -28,8 +28,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content>
diff --git a/ui-ngx/src/app/modules/home/dialogs/assign-to-customer-dialog.component.html b/ui-ngx/src/app/modules/home/dialogs/assign-to-customer-dialog.component.html
index 3344e70837..1e105ff86a 100644
--- a/ui-ngx/src/app/modules/home/dialogs/assign-to-customer-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/dialogs/assign-to-customer-dialog.component.html
@@ -28,8 +28,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content>
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 4c9971bb42..e6dc6b74b9 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
@@ -26,8 +26,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <mat-card-content>
@@ -72,8 +71,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <mat-card-content>
diff --git a/ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/client-dialog.component.html b/ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/client-dialog.component.html
index 31c40945e1..fc26b51e86 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/client-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/client-dialog.component.html
@@ -29,8 +29,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content style="padding: 0">
diff --git a/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.html b/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.html
index 5ee5643d76..b3b126b5d7 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.html
+++ b/ui-ngx/src/app/modules/home/pages/admin/security-settings.component.html
@@ -26,8 +26,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <mat-card-content>
diff --git a/ui-ngx/src/app/modules/home/pages/admin/send-test-sms-dialog.component.html b/ui-ngx/src/app/modules/home/pages/admin/send-test-sms-dialog.component.html
index b9fddd605d..3245013330 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/send-test-sms-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/admin/send-test-sms-dialog.component.html
@@ -28,8 +28,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content tb-toast toastTarget="sendTestSmsDialogContent">
diff --git a/ui-ngx/src/app/modules/home/pages/dashboard/import-dashboard-file-dialog.component.html b/ui-ngx/src/app/modules/home/pages/dashboard/import-dashboard-file-dialog.component.html
index 0cebbc0286..3286044628 100644
--- a/ui-ngx/src/app/modules/home/pages/dashboard/import-dashboard-file-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/dashboard/import-dashboard-file-dialog.component.html
@@ -28,8 +28,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content>
diff --git a/ui-ngx/src/app/modules/home/pages/dashboard/make-dashboard-public-dialog.component.html b/ui-ngx/src/app/modules/home/pages/dashboard/make-dashboard-public-dialog.component.html
index 518115993a..e21f996584 100644
--- a/ui-ngx/src/app/modules/home/pages/dashboard/make-dashboard-public-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/dashboard/make-dashboard-public-dialog.component.html
@@ -28,8 +28,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content tb-toast toastTarget="makeDashboardPublicDialogContent">
diff --git a/ui-ngx/src/app/modules/home/pages/dashboard/manage-dashboard-customers-dialog.component.html b/ui-ngx/src/app/modules/home/pages/dashboard/manage-dashboard-customers-dialog.component.html
index ba5c6eb2f1..f53a8b37ca 100644
--- a/ui-ngx/src/app/modules/home/pages/dashboard/manage-dashboard-customers-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/dashboard/manage-dashboard-customers-dialog.component.html
@@ -29,8 +29,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content>
diff --git a/ui-ngx/src/app/modules/home/pages/mobile/applications/mobile-app-dialog.component.html b/ui-ngx/src/app/modules/home/pages/mobile/applications/mobile-app-dialog.component.html
index ab4417c23b..79bd13c8b1 100644
--- a/ui-ngx/src/app/modules/home/pages/mobile/applications/mobile-app-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/mobile/applications/mobile-app-dialog.component.html
@@ -29,8 +29,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div></div>
   }
   <div mat-dialog-content class="!p-0">
diff --git a/ui-ngx/src/app/modules/home/pages/mobile/qr-code-widget/mobile-qr-code-widget-settings.component.html b/ui-ngx/src/app/modules/home/pages/mobile/qr-code-widget/mobile-qr-code-widget-settings.component.html
index 83419e2191..5a4cc4599a 100644
--- a/ui-ngx/src/app/modules/home/pages/mobile/qr-code-widget/mobile-qr-code-widget-settings.component.html
+++ b/ui-ngx/src/app/modules/home/pages/mobile/qr-code-widget/mobile-qr-code-widget-settings.component.html
@@ -25,8 +25,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <mat-card-content style="padding-top: 16px">
diff --git a/ui-ngx/src/app/modules/home/pages/user/activation-link-dialog.component.html b/ui-ngx/src/app/modules/home/pages/user/activation-link-dialog.component.html
index a5a6042e2e..c8e1b97f5f 100644
--- a/ui-ngx/src/app/modules/home/pages/user/activation-link-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/user/activation-link-dialog.component.html
@@ -28,8 +28,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content tb-toast toastTarget="activationLinkDialogContent">
diff --git a/ui-ngx/src/app/modules/home/pages/user/add-user-dialog.component.html b/ui-ngx/src/app/modules/home/pages/user/add-user-dialog.component.html
index d2e86b8779..60ae3ad1c2 100644
--- a/ui-ngx/src/app/modules/home/pages/user/add-user-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/user/add-user-dialog.component.html
@@ -29,8 +29,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content>
diff --git a/ui-ngx/src/app/modules/home/pages/widget/save-widget-type-as-dialog.component.html b/ui-ngx/src/app/modules/home/pages/widget/save-widget-type-as-dialog.component.html
index 856de848d1..b76b922008 100644
--- a/ui-ngx/src/app/modules/home/pages/widget/save-widget-type-as-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/widget/save-widget-type-as-dialog.component.html
@@ -28,8 +28,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content>
diff --git a/ui-ngx/src/app/modules/home/pages/widget/select-widget-type-dialog.component.html b/ui-ngx/src/app/modules/home/pages/widget/select-widget-type-dialog.component.html
index f0ca976d37..60ecf4ea6d 100644
--- a/ui-ngx/src/app/modules/home/pages/widget/select-widget-type-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/widget/select-widget-type-dialog.component.html
@@ -29,8 +29,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content>
diff --git a/ui-ngx/src/app/modules/home/pages/widget/widgets-bundle-dialog.component.html b/ui-ngx/src/app/modules/home/pages/widget/widgets-bundle-dialog.component.html
index dd4b56bef8..c3a965b752 100644
--- a/ui-ngx/src/app/modules/home/pages/widget/widgets-bundle-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/widget/widgets-bundle-dialog.component.html
@@ -28,8 +28,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content>
diff --git a/ui-ngx/src/app/shared/components/image/image-dialog.component.html b/ui-ngx/src/app/shared/components/image/image-dialog.component.html
index d0ff71778c..ee830aa102 100644
--- a/ui-ngx/src/app/shared/components/image/image-dialog.component.html
+++ b/ui-ngx/src/app/shared/components/image/image-dialog.component.html
@@ -28,8 +28,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content>
diff --git a/ui-ngx/src/app/shared/components/image/upload-image-dialog.component.html b/ui-ngx/src/app/shared/components/image/upload-image-dialog.component.html
index bc1c5c2cfb..edde51a8a7 100644
--- a/ui-ngx/src/app/shared/components/image/upload-image-dialog.component.html
+++ b/ui-ngx/src/app/shared/components/image/upload-image-dialog.component.html
@@ -28,8 +28,7 @@
   @if (isLoading$ | async) {
     <mat-progress-bar color="warn" mode="indeterminate">
     </mat-progress-bar>
-  }
-  @if (!(isLoading$ | async)) {
+  } @else {
     <div style="height: 4px;"></div>
   }
   <div mat-dialog-content class="relative">