diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/abstract/modbus-version-processor.abstract.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/abstract/modbus-version-processor.abstract.ts
index 6ea8f4516d..b38a07cd0f 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/abstract/modbus-version-processor.abstract.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/abstract/modbus-version-processor.abstract.ts
@@ -20,7 +20,6 @@ import {
   ModbusBasicConfig_v3_5_2,
   ModbusLegacyBasicConfig,
   ModbusLegacySlave,
-  ModbusMasterConfig,
   ModbusSlave,
 } from '../gateway-widget.models';
 import { GatewayConnectorVersionProcessor } from './gateway-connector-version-processor.abstract';
@@ -40,9 +39,9 @@ export class ModbusVersionProcessor extends GatewayConnectorVersionProcessor<any
     return {
       ...this.connector,
       configurationJson: {
-        master: configurationJson.master
+        master: configurationJson.master?.slaves
           ? ModbusVersionMappingUtil.mapMasterToUpgradedVersion(configurationJson.master)
-          : {} as ModbusMasterConfig,
+          : { slaves: [] },
         slave: configurationJson.slave
           ? ModbusVersionMappingUtil.mapSlaveToUpgradedVersion(configurationJson.slave as ModbusLegacySlave)
           : {} as ModbusSlave,
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-basic-config.abstract.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-basic-config.abstract.ts
index 9e7be382d2..f3daa214dd 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-basic-config.abstract.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-basic-config.abstract.ts
@@ -62,11 +62,6 @@ export abstract class ModbusBasicConfigDirective<BasicConfig>
     });
   }
 
-  protected override onBasicFormGroupChange(value: ModbusBasicConfig_v3_5_2): void {
-    super.onBasicFormGroupChange(value);
-    this.basicFormGroup.get('slave').updateValueAndValidity({ emitEvent: !!this.onChange });
-  }
-
   private updateSlaveEnabling(isEnabled: boolean): void {
     if (isEnabled) {
       this.basicFormGroup.get('slave').enable({ emitEvent: false });
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-basic-config.component.ts
index 21c37ed147..b5fab7c92d 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-basic-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-basic-config.component.ts
@@ -58,10 +58,10 @@ import {
 })
 export class ModbusBasicConfigComponent extends ModbusBasicConfigDirective<ModbusBasicConfig_v3_5_2> {
 
-  protected override mapConfigToFormValue(config: ModbusBasicConfig_v3_5_2): ModbusBasicConfig_v3_5_2 {
+  protected override mapConfigToFormValue({ master, slave }: ModbusBasicConfig_v3_5_2): ModbusBasicConfig_v3_5_2 {
     return {
-      master: config.master ?? {} as ModbusMasterConfig,
-      slave: config.slave ?? {} as ModbusSlave,
+      master: master?.slaves ? master : { slaves: [] } as ModbusMasterConfig,
+      slave: slave ?? {} as ModbusSlave,
     };
   }
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-legacy-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-legacy-basic-config.component.ts
index 50f7d833fa..5bca9b0292 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-legacy-basic-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-legacy-basic-config.component.ts
@@ -62,7 +62,9 @@ export class ModbusLegacyBasicConfigComponent extends ModbusBasicConfigDirective
 
   protected override mapConfigToFormValue(config: ModbusLegacyBasicConfig): ModbusBasicConfig_v3_5_2 {
     return {
-      master: config.master ? ModbusVersionMappingUtil.mapMasterToUpgradedVersion(config.master) : {} as ModbusMasterConfig,
+      master: config.master?.slaves
+        ? ModbusVersionMappingUtil.mapMasterToUpgradedVersion(config.master)
+        : { slaves: [] } as ModbusMasterConfig,
       slave: config.slave ? ModbusVersionMappingUtil.mapSlaveToUpgradedVersion(config.slave) : {} as ModbusSlave,
     };
   }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-data-keys-panel/modbus-data-keys-panel.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-data-keys-panel/modbus-data-keys-panel.component.html
index cfb97f674d..fc94fe49ea 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-data-keys-panel/modbus-data-keys-panel.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-data-keys-panel/modbus-data-keys-panel.component.html
@@ -31,9 +31,15 @@
                   </div>
                   <ng-template #tagName>
                     <div class="tb-flex">
-                      <div class="title-container" tbTruncateWithTooltip>{{ 'gateway.key' | translate }}: {{ keyControl.get('tag').value }}</div>
-                      <div class="title-container">{{ 'gateway.address' | translate }}: {{ keyControl.get('address').value }}</div>
-                      <div class="title-container">{{ 'gateway.type' | translate }}: {{ keyControl.get('type').value }}</div>
+                      <div class="title-container tb-flex">{{ 'gateway.key' | translate }}:
+                        <span class="key-label" tbTruncateWithTooltip>{{ keyControl.get('tag').value }}</span>
+                      </div>
+                      <div class="title-container">{{ 'gateway.address' | translate }}:
+                        <span class="key-label">{{ keyControl.get('address').value }}</span>
+                      </div>
+                      <div class="title-container">{{ 'gateway.type' | translate }}:
+                        <span class="key-label">{{ keyControl.get('type').value }}</span>
+                      </div>
                     </div>
                   </ng-template>
                 </mat-panel-title>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-data-keys-panel/modbus-data-keys-panel.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-data-keys-panel/modbus-data-keys-panel.component.scss
index 445ac6c0ae..d242fd4e71 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-data-keys-panel/modbus-data-keys-panel.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-data-keys-panel/modbus-data-keys-panel.component.scss
@@ -23,6 +23,10 @@
       width: 180px;
     }
 
+    .key-label {
+      font-weight: 400;
+    }
+
     .key-panel {
       height: 500px;
       overflow: auto;
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-config/modbus-slave-config.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-config/modbus-slave-config.component.html
index 9360ef499a..134a9baf0a 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-config/modbus-slave-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-config/modbus-slave-config.component.html
@@ -197,6 +197,16 @@
               </mat-form-field>
             </div>
           </div>
+          <div class="tb-form-row column-xs" fxLayoutAlign="space-between center">
+            <div class="fixed-title-width" tb-hint-tooltip-icon="{{ 'gateway.hints.modbus.word-order' | translate }}" translate>gateway.word-order</div>
+            <div class="tb-flex no-gap">
+              <mat-form-field class="tb-flex no-gap" appearance="outline" subscriptSizing="dynamic">
+                <mat-select formControlName="wordOrder">
+                  <mat-option *ngFor="let order of modbusOrderType" [value]="order">{{ order }}</mat-option>
+                </mat-select>
+              </mat-form-field>
+            </div>
+          </div>
           <div *ngIf="protocolType !== ModbusProtocolType.Serial" class="tb-form-panel stroked tb-slide-toggle">
             <mat-expansion-panel class="tb-settings" [expanded]="showSecurityControl.value">
               <mat-expansion-panel-header fxLayout="row wrap">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-config/modbus-slave-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-config/modbus-slave-config.component.ts
index 5f5b4d293c..f4dfa57f96 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-config/modbus-slave-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-config/modbus-slave-config.component.ts
@@ -113,6 +113,7 @@ export class ModbusSlaveConfigComponent implements ControlValueAccessor, Validat
       pollPeriod: [5000, [Validators.required]],
       sendDataToThingsBoard: [false],
       byteOrder:[ModbusOrderType.BIG],
+      wordOrder: [ModbusOrderType.BIG],
       security: [],
       identity: this.fb.group({
         vendorName: ['', [Validators.pattern(noLeadTrailSpacesRegex)]],
@@ -243,6 +244,7 @@ export class ModbusSlaveConfigComponent implements ControlValueAccessor, Validat
       pollPeriod = 5000,
       sendDataToThingsBoard = false,
       byteOrder = ModbusOrderType.BIG,
+      wordOrder = ModbusOrderType.BIG,
       security = {},
       identity = {
         vendorName: '',
@@ -266,6 +268,7 @@ export class ModbusSlaveConfigComponent implements ControlValueAccessor, Validat
       pollPeriod,
       sendDataToThingsBoard: !!sendDataToThingsBoard,
       byteOrder,
+      wordOrder,
       security,
       identity,
       values,
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-dialog/modbus-slave-dialog.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-dialog/modbus-slave-dialog.component.html
index 1cf95ad06e..6304cdc0cb 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-dialog/modbus-slave-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-dialog/modbus-slave-dialog.component.html
@@ -260,7 +260,7 @@
                   </mat-form-field>
                 </div>
               </div>
-              <div *ngIf="protocolType !== ModbusProtocolType.Serial" class="tb-form-row column-xs" fxLayoutAlign="space-between center">
+              <div class="tb-form-row column-xs" fxLayoutAlign="space-between center">
                 <div class="fixed-title-width" tb-hint-tooltip-icon="{{ 'gateway.hints.modbus.word-order' | translate }}" translate>gateway.word-order</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/modbus/modbus-slave-dialog/modbus-slave-dialog.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-dialog/modbus-slave-dialog.component.ts
index 5568a0e34c..0167eaafb7 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-dialog/modbus-slave-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-slave-dialog/modbus-slave-dialog.component.ts
@@ -101,7 +101,7 @@ export class ModbusSlaveDialogComponent extends DialogComponent<ModbusSlaveDialo
     helpBaseUrl + '/docs/iot-gateway/config/modbus/#section-master-description-and-configuration-parameters';
 
   private readonly serialSpecificControlKeys = ['serialPort', 'baudrate', 'stopbits', 'bytesize', 'parity', 'strict'];
-  private readonly tcpUdpSpecificControlKeys = ['port', 'security', 'host', 'wordOrder'];
+  private readonly tcpUdpSpecificControlKeys = ['port', 'security', 'host'];
 
   private destroy$ = new Subject<void>();
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-values/modbus-values.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-values/modbus-values.component.html
index a6b4382638..8d1048e3cb 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-values/modbus-values.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-values/modbus-values.component.html
@@ -48,6 +48,8 @@
               mat-icon-button
               color="primary"
               [disabled]="disabled"
+              matTooltip="{{ 'action.edit' | translate }}"
+              matTooltipPosition="above"
               #attributesButton
               (click)="manageKeys($event, attributesButton, ModbusValueKey.ATTRIBUTES, register)">
         <tb-icon matButtonIcon>edit</tb-icon>
@@ -69,6 +71,8 @@
               mat-icon-button
               color="primary"
               [disabled]="disabled"
+              matTooltip="{{ 'action.edit' | translate }}"
+              matTooltipPosition="above"
               #telemetryButton
               (click)="manageKeys($event, telemetryButton, ModbusValueKey.TIMESERIES, register)">
         <tb-icon matButtonIcon>edit</tb-icon>
@@ -90,6 +94,8 @@
               mat-icon-button
               [disabled]="disabled"
               color="primary"
+              matTooltip="{{ 'action.edit' | translate }}"
+              matTooltipPosition="above"
               #attributesUpdatesButton
               (click)="manageKeys($event, attributesUpdatesButton, ModbusValueKey.ATTRIBUTES_UPDATES, register)">
         <tb-icon matButtonIcon>edit</tb-icon>
@@ -111,6 +117,8 @@
               mat-icon-button
               color="primary"
               [disabled]="disabled"
+              matTooltip="{{ 'action.edit' | translate }}"
+              matTooltipPosition="above"
               #rpcRequestsButton
               (click)="manageKeys($event, rpcRequestsButton, ModbusValueKey.RPC_REQUESTS, register)">
         <tb-icon matButtonIcon>edit</tb-icon>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/dialog/mapping-dialog.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/dialog/mapping-dialog.component.html
index 17c002115c..b56449892b 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/dialog/mapping-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/dialog/mapping-dialog.component.html
@@ -110,6 +110,8 @@
                       <button type="button"
                               mat-icon-button
                               color="primary"
+                              matTooltip="{{ 'action.edit' | translate }}"
+                              matTooltipPosition="above"
                               #attributesButton
                               (click)="manageKeys($event, attributesButton, MappingKeysType.ATTRIBUTES)">
                         <tb-icon matButtonIcon>edit</tb-icon>
@@ -130,6 +132,8 @@
                       <button type="button"
                               mat-icon-button
                               color="primary"
+                              matTooltip="{{ 'action.edit' | translate }}"
+                              matTooltipPosition="above"
                               #telemetryButton
                               (click)="manageKeys($event, telemetryButton, MappingKeysType.TIMESERIES)">
                         <tb-icon matButtonIcon>edit</tb-icon>
@@ -175,6 +179,8 @@
                         <button type="button"
                                 mat-icon-button
                                 color="primary"
+                                matTooltip="{{ 'action.edit' | translate }}"
+                                matTooltipPosition="above"
                                 #keysButton
                                 (click)="manageKeys($event, keysButton, MappingKeysType.CUSTOM)">
                           <tb-icon matButtonIcon>edit</tb-icon>
@@ -666,6 +672,8 @@
               <button type="button"
                       mat-icon-button
                       color="primary"
+                      matTooltip="{{ 'action.edit' | translate }}"
+                      matTooltipPosition="above"
                       #opcAttributesButton
                       (click)="manageKeys($event, opcAttributesButton, MappingKeysType.ATTRIBUTES)">
                 <tb-icon matButtonIcon>edit</tb-icon>
@@ -686,6 +694,8 @@
               <button type="button"
                       mat-icon-button
                       color="primary"
+                      matTooltip="{{ 'action.edit' | translate }}"
+                      matTooltipPosition="above"
                       #opcTelemetryButton
                       (click)="manageKeys($event, opcTelemetryButton, MappingKeysType.TIMESERIES)">
                 <tb-icon matButtonIcon>edit</tb-icon>
@@ -706,6 +716,8 @@
               <button type="button"
                       mat-icon-button
                       color="primary"
+                      matTooltip="{{ 'action.edit' | translate }}"
+                      matTooltipPosition="above"
                       #attributesUpdatesButton
                       (click)="manageKeys($event, attributesUpdatesButton, MappingKeysType.ATTRIBUTES_UPDATES)">
                 <tb-icon matButtonIcon>edit</tb-icon>
@@ -726,6 +738,8 @@
               <button type="button"
                       mat-icon-button
                       color="primary"
+                      matTooltip="{{ 'action.edit' | translate }}"
+                      matTooltipPosition="above"
                       #rpcMethodsButton
                       (click)="manageKeys($event, rpcMethodsButton, MappingKeysType.RPC_METHODS)">
                 <tb-icon matButtonIcon>edit</tb-icon>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts
index 03765613da..04dd274f81 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts
@@ -778,7 +778,7 @@ export class GatewayConnectorComponent extends PageComponent implements AfterVie
           JSON.parse(clientConnectorData.value) : clientConnectorData.value;
 
         if (this.isConnectorSynced(clientConnectorData) && clientConnectorData.value.configurationJson) {
-          this.setFormValue(clientConnectorData.value);
+          this.setFormValue({...clientConnectorData.value, mode: this.connectorForm.get('mode').value ?? clientConnectorData.value.mode});
         }
       }
     }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-widget.models.ts
index 0f940e28ff..a2184089b1 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-widget.models.ts
@@ -1163,14 +1163,15 @@ export interface ModbusSlave {
   pollPeriod: number;
   sendDataToThingsBoard: boolean;
   byteOrder: ModbusOrderType;
+  wordOrder: ModbusOrderType;
   identity: ModbusIdentity;
-  values: ModbusValuesState;
+  values?: ModbusValuesState;
   port: string | number;
   security: ModbusSecurity;
 }
 
 export interface ModbusLegacySlave extends Omit<ModbusSlave, 'values'> {
-  values: ModbusLegacyRegisterValues;
+  values?: ModbusLegacyRegisterValues;
 }
 
 export type ModbusValuesState = ModbusRegisterValues | ModbusValues;
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/utils/modbus-version-mapping.util.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/utils/modbus-version-mapping.util.ts
index fbb78059e1..3f34d49ab2 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/utils/modbus-version-mapping.util.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/utils/modbus-version-mapping.util.ts
@@ -38,6 +38,9 @@ export class ModbusVersionMappingUtil {
   }
 
   static mapSlaveToDowngradedVersion(slave: ModbusSlave): ModbusLegacySlave {
+    if (!slave?.values) {
+      return slave as Omit<ModbusLegacySlave, 'values'>;
+    }
     const values = Object.keys(slave.values).reduce((acc, valueKey) => {
       acc = {
         ...acc,
@@ -54,6 +57,9 @@ export class ModbusVersionMappingUtil {
   }
 
   static mapSlaveToUpgradedVersion(slave: ModbusLegacySlave): ModbusSlave {
+    if (!slave?.values) {
+      return slave as Omit<ModbusSlave, 'values'>;
+    }
     const values = Object.keys(slave.values).reduce((acc, valueKey) => {
       acc = {
         ...acc,