diff --git a/ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule-condition-dialog.component.html b/ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule-condition-dialog.component.html
index e5c94ce881..90ae6f7c4b 100644
--- a/ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule-condition-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule-condition-dialog.component.html
@@ -55,9 +55,7 @@
               </div>
             } @else {
               <div class="tb-form-panel no-gap stroked">
-                <div class="tb-form-panel-title tb-required">
-                  {{ 'alarm-rule.script' | translate }}
-                </div>
+                <div class="tb-form-panel-title tb-required">{{ 'alarm-rule.script' | translate }}</div>
                 <tb-js-func formControlName="expression"
                             functionName="expression"
                             class="tb-alarm-rule-script"
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/propagation-configuration/propagation-configuration.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/components/propagation-configuration/propagation-configuration.component.html
index 8abbfb2056..5e6726219f 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/propagation-configuration/propagation-configuration.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/propagation-configuration/propagation-configuration.component.html
@@ -59,9 +59,7 @@
                                   [isScript]="this.propagateConfiguration.get('applyExpressionToResolvedArguments').value"/>
   </div>
   <div class="tb-form-panel no-gap" [class.!hidden]="!this.propagateConfiguration.get('applyExpressionToResolvedArguments').value">
-    <div class="tb-form-panel-title tb-required">
-      {{ 'calculated-fields.script' | translate }}
-    </div>
+    <div class="tb-form-panel-title tb-required">{{ 'calculated-fields.script' | translate }}</div>
     <div>
       <tb-js-func required
                   formControlName="expression"
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/simple-configuration/simple-configuration.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/components/simple-configuration/simple-configuration.component.html
index e6a37043d5..aed0ef8f06 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/simple-configuration/simple-configuration.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/simple-configuration/simple-configuration.component.html
@@ -27,9 +27,7 @@
                                          [isScript]="isScript" />
   </div>
   <div class="tb-form-panel no-gap">
-    <div class="tb-form-panel-title tb-required">
-      {{ (isScript ? 'calculated-fields.type.script' : 'calculated-fields.expression') | translate }}
-    </div>
+    <div class="tb-form-panel-title tb-required">{{ (isScript ? 'calculated-fields.type.script' : 'calculated-fields.expression') | translate }}</div>
     <mat-form-field class="mt-3" appearance="outline" subscriptSizing="dynamic" [class.hidden]="isScript">
       <input matInput formControlName="expressionSIMPLE" maxlength="255" [placeholder]="'(temperature - 32) / 1.8'"
              required>
diff --git a/ui-ngx/src/app/shared/components/hint-tooltip-icon.component.scss b/ui-ngx/src/app/shared/components/hint-tooltip-icon.component.scss
index 2abc704ece..8b1a9ef4d7 100644
--- a/ui-ngx/src/app/shared/components/hint-tooltip-icon.component.scss
+++ b/ui-ngx/src/app/shared/components/hint-tooltip-icon.component.scss
@@ -17,7 +17,6 @@
   display: flex;
   flex-direction: row;
   align-items: center;
-  gap: 4px;
 }
 
 :host {
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 a85c490c62..e023179dd3 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -1108,9 +1108,9 @@
             "geofencing" : "Geofencing",
             "propagation": "Propagation",
             "related-entities-aggregation": "Related entities aggregation",
-            "related-entities-aggregation-hint": "Aggregation of data from related entities",
+            "related-entities-aggregation-hint": "Aggregation of data from related entities.",
             "time-series-data-aggregation": "Time series data aggregation",
-            "time-series-data-aggregation-hint": "Aggregation of historical data from a current entity"
+            "time-series-data-aggregation-hint": "Aggregation of historical data from a current entity."
         },
         "arguments": "Arguments",
         "decimals-by-default": "Decimals by default",
@@ -1287,9 +1287,9 @@
         },
         "aggregate-interval-type": "Aggregate interval type",
         "aggregate-interval-value": "Aggregate interval value",
-        "aggregate-interval-value-required": "Aggregate interval value is required",
-        "aggregate-interval-value-min": "Aggregate interval value should be at least { sec, plural, =0 {0 second} =1 {1 second} other {# seconds} }",
-        "aggregate-interval-value-step-multiple-of": "Aggregate interval value must be a divisor or multiple of 1 day",
+        "aggregate-interval-value-required": "Aggregate interval value is required.",
+        "aggregate-interval-value-min": "Aggregate interval value should be at least { sec, plural, =0 {0 second} =1 {1 second} other {# seconds} }.",
+        "aggregate-interval-value-step-multiple-of": "Aggregate interval value must be a divisor or multiple of 1 day.",
         "aggregate-period": {
             "hour": "Hour",
             "day": "Day",
@@ -1301,23 +1301,23 @@
             "custom": "Custom"
         },
         "aggregate-period-hint-offset": "Your aggregation interval will be: {{ interval }}",
-        "aggregate-period-hint-offset-and-so-on": "Your aggregation interval will be: {{ interval }} and so on",
+        "aggregate-period-hint-offset-and-so-on": "Your aggregation interval will be: {{ interval }} and so on.",
         "entity-aggregation": {
-            "argument-hint": "Data will be fetched from current entity",
+            "argument-hint": "Data will be fetched from current entity.",
             "argument-setting-hint": "Latest telemetry is the only available argument type for this calculated field.",
             "aggregation-interval": "Aggregation interval",
             "aggregation-interval-hint": "Defines how often to perform aggregation. Example: every 1 hour aggregates data at 00:00, 01:00, 02:00, etc.",
             "apply-offset": "Apply offset to aggregation interval",
             "apply-offset-hint": "Defines how much to shift the start of each aggregation period (e.g., +10 minutes - 00:10, 01:10).",
             "offset-value": "Offset value",
-            "offset-value-required": "Offset value is required",
-            "offset-value-min": "Offset value must be a positive integer",
-            "offset-value-max": "Offset value should be less than the aggregate interval value",
+            "offset-value-required": "Offset value is required.",
+            "offset-value-min": "Offset value must be a positive integer.",
+            "offset-value-max": "Offset value should be less than the aggregate interval value.",
             "wait-delay": "Apply await timeout for delayed telemetry",
             "wait-delay-hint": "Defines how long to wait for delayed telemetry after the interval ends. If such telemetry arrives, the result for that interval will be recalculated.",
             "duration": "Duration",
-            "duration-required": "Duration is required",
-            "duration-min": "Duration should be at least 1 minute",
+            "duration-required": "Duration is required.",
+            "duration-min": "Duration should be at least 1 minute.",
             "duration-hint": "How long to wait for delayed data after the interval ends.",
             "produce-intermediate-result": "Produce intermediate result",
             "produce-intermediate-result-hint": "Calculates metrics during the current interval to produce an intermediate result. Updates occur no more often than once every {{ time }}."
@@ -1488,7 +1488,7 @@
         "alarm-rule-additional-info-hint": "Hint: use <code><span style=\"color: #000;\">$&#123;</span>Argument name<span style=\"color: #000;\">&#125;</span></code> to substitute values of the arguments that are used in alarm rule condition.",
         "alarm-rule-additional-info-icon-hint": "Use Argument name to substitute values of the arguments that are used in alarm rule condition.",
         "alarm-rule-mobile-dashboard": "Mobile dashboard",
-        "alarm-rule-mobile-dashboard-hint": "Used by mobile application as an alarm details dashboard",
+        "alarm-rule-mobile-dashboard-hint": "Used by mobile application as an alarm details dashboard.",
         "alarm-rule-no-mobile-dashboard": "No dashboard selected",
         "alarm-rule-condition": "Alarm rule condition",
         "enter-alarm-rule-condition-prompt": "Add condition",
diff --git a/ui-ngx/src/form.scss b/ui-ngx/src/form.scss
index f300b5e42b..517fc535fb 100644
--- a/ui-ngx/src/form.scss
+++ b/ui-ngx/src/form.scss
@@ -178,10 +178,11 @@
     }
 
     &.tb-required::after {
-      font-size: 13px;
-      color: rgba(0, 0, 0, .54);
+      font-size: inherit;
+      color: inherit;
       vertical-align: top;
-      content: " *";
+      content: "*";
+      margin-left: 1px;
     }
   }
   .tb-form-panel-hint {
@@ -298,10 +299,11 @@
       margin: 8px 0;
     }
     .tb-required::after {
-      font-size: 13px;
-      color: rgba(0, 0, 0, .54);
+      font-size: inherit;
+      color: inherit;
       vertical-align: top;
-      content: " *";
+      content: "*";
+      margin-left: 1px;
     }
   }