diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.scss
index 036523e269..76676b4c5e 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.scss
@@ -97,8 +97,3 @@
     background-color: rgb(25, 128, 56);
   }
 }
-
-:host ::ng-deep tb-json-object-edit > div {
-  flex-grow: 1;
-}
-
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector.component.html
index d0d8e32acd..2d992187f6 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector.component.html
@@ -279,7 +279,7 @@
           <span class="fields-label">{{ 'gateway.rpc.oids' | translate }}*</span>
           <div fxFlex fxLayout="row" fxLayoutGap="10px" fxLayoutAlign="center center"
                *ngFor="let control of getFormArrayControls('oid'); let i = index">
-            <mat-form-field appearance="outline" fxFlex>
+            <mat-form-field class="tb-inline-field" appearance="outline" fxFlex subscriptSizing="dynamic">
               <input matInput [formControl]="control" required/>
             </mat-form-field>
             <mat-icon style="cursor:pointer;"
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector.component.scss
index a6b81e2916..a0af50aee8 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector.component.scss
@@ -37,23 +37,7 @@
     margin-left: 10px;
   }
 
-  .fields {
-
-    ::ng-deep .mat-mdc-text-field-wrapper.mdc-text-field--outlined .mat-mdc-form-field-infix {
-      padding-top: 6px;
-      padding-bottom: 6px;
-      min-height: auto;
-    }
-
-    ::ng-deep .mat-mdc-form-field-subscript-wrapper {
-      display: none;
-    }
-    ::ng-deep .mdc-text-field--outlined:not(.mdc-text-field--invalid) .mdc-notched-outline__leading,
-    ::ng-deep .mdc-text-field--outlined:not(.mdc-text-field--invalid) .mdc-notched-outline__notch,
-    ::ng-deep .mdc-text-field--outlined:not(.mdc-text-field--invalid) .mdc-notched-outline__trailing {
-      border-color: #e0e0e0;
-    }
-
+  .fields{
     .fields-label {
       font-weight: 500;
     }
@@ -80,6 +64,4 @@
       margin-bottom: 16px;
     }
   }
-
 }
-
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.html
index 2ea388889c..8368698087 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.html
@@ -46,10 +46,12 @@
     </ng-template>
   </div>
   <section class="result-block" [formGroup]="commandForm">
-  <span>{{ 'gateway.rpc-command-result' | translate }}
-    <div *ngIf="resultTime" class="result-time" fxFlex fxLayout="row" fxLayoutAlign="center center"> <mat-icon
-      class="material-icons">schedule</mat-icon>
-      <span>{{ resultTime | date: 'yyyy/MM/dd HH:mm:ss' }}</span> </div></span>
+    <span>{{ 'gateway.rpc-command-result' | translate }}
+      <div *ngIf="resultTime" class="result-time" fxFlex fxLayout="row" fxLayoutAlign="center center">
+        <mat-icon class="material-icons">schedule</mat-icon>
+        <span>{{ resultTime | date: 'yyyy/MM/dd HH:mm:ss' }}</span>
+      </div>
+    </span>
     <tb-json-content [contentType]="contentTypes.JSON" readonly="true" formControlName="result"></tb-json-content>
   </section>
 </div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.scss
index d3dd9114c4..f74097bbba 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.scss
@@ -81,10 +81,3 @@
     border-radius: 4px;
   }
 }
-
-:host ::ng-deep {
-  .tb-json-content {
-    height: 100%;
-  }
-}
-