diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/workers-config-control/workers-config-control.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/workers-config-control/workers-config-control.component.html
index 0062e476c2..b348b49252 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/workers-config-control/workers-config-control.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/workers-config-control/workers-config-control.component.html
@@ -19,7 +19,7 @@
   <div class="tb-form-row column-xs" fxLayoutAlign="space-between center">
     <div class="fixed-title-width tb-required" [style.width.%]="50"
          tb-hint-tooltip-icon="{{ 'gateway.max-number-of-workers-hint' | translate }}">
-      {{ 'gateway.max-number-of-workers' | translate }}
+      <div tbTruncateTooltip>{{ 'gateway.max-number-of-workers' | translate }}</div>
     </div>
     <div class="tb-flex no-gap">
       <mat-form-field class="tb-flex no-gap" appearance="outline" subscriptSizing="dynamic">
@@ -41,7 +41,7 @@
   <div class="tb-form-row column-xs" fxLayoutAlign="space-between center">
     <div class="fixed-title-width tb-required" [style.width.%]="50"
          tb-hint-tooltip-icon="{{ 'gateway.max-messages-queue-for-worker-hint' | translate }}">
-      {{ 'gateway.max-messages-queue-for-worker' | translate }}
+      <div tbTruncateTooltip>{{ 'gateway.max-messages-queue-for-worker' | translate }}</div>
     </div>
     <div class="tb-flex no-gap">
       <mat-form-field class="tb-flex no-gap" appearance="outline" subscriptSizing="dynamic">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/workers-config-control/workers-config-control.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/workers-config-control/workers-config-control.component.ts
index 9a37bdb07c..c05b7c32b6 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/workers-config-control/workers-config-control.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/workers-config-control/workers-config-control.component.ts
@@ -33,6 +33,7 @@ import { CommonModule } from '@angular/common';
 import { WorkersConfig } from '@home/components/widget/lib/gateway/gateway-widget.models';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
+import { TooltipDirective } from '@shared/directives/tooltip/tooltip.directive';
 
 @Component({
   selector: 'tb-workers-config-control',
@@ -42,6 +43,7 @@ import { takeUntil } from 'rxjs/operators';
   imports: [
     CommonModule,
     SharedModule,
+    TooltipDirective,
   ],
   providers: [
     {
diff --git a/ui-ngx/src/app/shared/components/hint-tooltip-icon.component.html b/ui-ngx/src/app/shared/components/hint-tooltip-icon.component.html
index cb98fa4608..f2413f0ad7 100644
--- a/ui-ngx/src/app/shared/components/hint-tooltip-icon.component.html
+++ b/ui-ngx/src/app/shared/components/hint-tooltip-icon.component.html
@@ -15,12 +15,8 @@
     limitations under the License.
 
 -->
-<div class="tb-hint-tooltip">
-  <div class="tb-hint-tooltip-content">
-    <ng-content></ng-content>
-  </div>
-  <tb-icon class="tb-hint-tooltip-icon tb-mat-18"
-           *ngIf="tooltipText"
-           matTooltip="{{ tooltipText }}"
-           [matTooltipPosition]="tooltipPosition">{{ hintIcon }}</tb-icon>
-</div>
+<ng-content class="tb-hint-tooltip-content"></ng-content>
+<tb-icon class="tb-hint-tooltip-icon tb-mat-18"
+         *ngIf="tooltipText"
+         matTooltip="{{ tooltipText }}"
+         [matTooltipPosition]="tooltipPosition">{{ hintIcon }}</tb-icon>
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 60bd53aa43..b83c2ff1b9 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
@@ -13,30 +13,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+:host(.tb-hint-tooltip) {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  gap: 4px;
+}
 
 :host {
-  .tb-hint-tooltip {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    gap: 4px;
+  .tb-hint-tooltip-content {
+    flex: 1 1 auto;
+    min-width: 0;
+    max-width: fit-content;
+  }
 
-    &-content {
-      flex: 1 1 auto;
-      min-width: 0;
-      max-width: fit-content;
-    }
+  .tb-hint-tooltip-icon {
+    color: #E0E0E0;
+    overflow: visible;
+    order: 3;
+    margin-left: 4px;
+    flex-shrink: 0;
 
-    &-icon {
-      color: #E0E0E0;
-      overflow: visible;
-      order: 3;
-      margin-left: 4px;
-      flex-shrink: 0;
-
-      &:hover {
-        color: #9E9E9E;
-      }
+    &:hover {
+      color: #9E9E9E;
     }
   }
 }
diff --git a/ui-ngx/src/app/shared/components/hint-tooltip-icon.component.ts b/ui-ngx/src/app/shared/components/hint-tooltip-icon.component.ts
index 86a346012e..4518875bb6 100644
--- a/ui-ngx/src/app/shared/components/hint-tooltip-icon.component.ts
+++ b/ui-ngx/src/app/shared/components/hint-tooltip-icon.component.ts
@@ -14,7 +14,7 @@
 /// limitations under the License.
 ///
 
-import { Component, Input } from '@angular/core';
+import { Component, HostBinding, Input } from '@angular/core';
 import { TooltipPosition } from '@angular/material/tooltip';
 
 @Component({
@@ -24,6 +24,7 @@ import { TooltipPosition } from '@angular/material/tooltip';
 })
 export class HintTooltipIconComponent {
 
+  @HostBinding('class.tb-hint-tooltip')
   @Input('tb-hint-tooltip-icon') tooltipText: string;
 
   @Input()