diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/sqs-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/external/sqs-config.component.html
index 373c7cd4d4..e803d37921 100644
--- a/ui-ngx/src/app/modules/home/components/rule-node/external/sqs-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/sqs-config.component.html
@@ -63,7 +63,7 @@
     [valRequiredText]="'rule-node-config.value-required' | translate"
     [emptyText]="'rule-node-config.message-attributes-empty' | translate">
   </tb-kv-map-config>
-  <mat-form-field class="mat-block" appearance="outline">
+  <mat-form-field class="mat-block mt-2" appearance="outline">
     <mat-label translate>rule-node-config.aws-access-key-id</mat-label>
     <input required matInput formControlName="accessKeyId">
     @if (sqsConfigForm.get('accessKeyId').hasError('required')) {
@@ -72,7 +72,7 @@
       </mat-error>
     }
   </mat-form-field>
-  <mat-form-field class="mat-block" appearance="outline">
+  <mat-form-field class="mat-block mt-2" appearance="outline">
     <mat-label translate>rule-node-config.aws-secret-access-key</mat-label>
     <input required matInput formControlName="secretAccessKey">
     @if (sqsConfigForm.get('secretAccessKey').hasError('required')) {
@@ -81,7 +81,7 @@
       </mat-error>
     }
   </mat-form-field>
-  <mat-form-field class="mat-block" appearance="outline">
+  <mat-form-field class="mat-block mt-2" appearance="outline">
     <mat-label translate>rule-node-config.aws-region</mat-label>
     <input required matInput formControlName="region">
     @if (sqsConfigForm.get('region').hasError('required')) {
diff --git a/ui-ngx/src/app/shared/components/dialog/node-script-test-dialog.component.html b/ui-ngx/src/app/shared/components/dialog/node-script-test-dialog.component.html
index 98faaac2f2..0878443cfa 100644
--- a/ui-ngx/src/app/shared/components/dialog/node-script-test-dialog.component.html
+++ b/ui-ngx/src/app/shared/components/dialog/node-script-test-dialog.component.html
@@ -61,7 +61,8 @@
               <label translate>rulenode.metadata</label>
             </div>
             <tb-key-val-map
-              subscriptSizing="dynamic"
+              subscriptSizing="fixed"
+              appearance="outline"
               formControlName="metadata"
               [isValueRequired]="false"
               titleText="rulenode.metadata">
diff --git a/ui-ngx/src/app/shared/components/kv-map.component.html b/ui-ngx/src/app/shared/components/kv-map.component.html
index 73ed90cab3..53f1835137 100644
--- a/ui-ngx/src/app/shared/components/kv-map.component.html
+++ b/ui-ngx/src/app/shared/components/kv-map.component.html
@@ -21,11 +21,11 @@
     <div class="flex flex-row items-center justify-start gap-2"
          formArrayName="keyVals"
          >
-      <mat-form-field class="mat-block flex-1" subscriptSizing="{{ subscriptSizing }}">
+      <mat-form-field class="mat-block flex-1" subscriptSizing="{{ subscriptSizing }}" [appearance]="appearance">
         <input [formControl]="keyValControl.get('key')" matInput required
                placeholder="{{ (keyPlaceholderText ? keyPlaceholderText : 'key-val.key') | translate }}"/>
       </mat-form-field>
-      <mat-form-field class="mat-block flex-1" subscriptSizing="{{ subscriptSizing }}">
+      <mat-form-field class="mat-block flex-1" subscriptSizing="{{ subscriptSizing }}" [appearance]="appearance">
         <input [formControl]="keyValControl.get('value')" matInput [required]="isValueRequired"
                placeholder="{{ (valuePlaceholderText ? valuePlaceholderText : 'key-val.value') | translate }}"/>
       </mat-form-field>
diff --git a/ui-ngx/src/app/shared/components/kv-map.component.ts b/ui-ngx/src/app/shared/components/kv-map.component.ts
index 499f527383..5139fb5e09 100644
--- a/ui-ngx/src/app/shared/components/kv-map.component.ts
+++ b/ui-ngx/src/app/shared/components/kv-map.component.ts
@@ -30,7 +30,7 @@ import {
 import { PageComponent } from '@shared/components/page.component';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
-import { SubscriptSizing } from '@angular/material/form-field';
+import { MatFormFieldAppearance, SubscriptSizing } from '@angular/material/form-field';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { coerceBoolean } from '@shared/decorators/coercion';
@@ -70,6 +70,9 @@ export class KeyValMapComponent extends PageComponent implements ControlValueAcc
   @Input()
   subscriptSizing: SubscriptSizing = 'fixed';
 
+  @Input()
+  appearance: MatFormFieldAppearance = 'fill';
+
   kvListFormGroup: UntypedFormGroup;
 
   private destroy$ = new Subject<void>();