diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/gauge/analog-gauge-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/gauge/analog-gauge-basic-config.component.ts
index 6e422105ec..10862565f6 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/gauge/analog-gauge-basic-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/gauge/analog-gauge-basic-config.component.ts
@@ -131,7 +131,7 @@ export class GaugeBasicConfigComponent extends BasicWidgetConfigComponent {
 
     this.widgetConfig.config.settings.defaultColor = config.defaultColor;
     this.widgetConfig.config.settings.colorPlate = config.colorPlate;
-    this.widgetConfig.config.settings.highlights = config.highlights.rangeList;
+    this.widgetConfig.config.settings.highlights = config.highlights;
     return this.widgetConfig;
   }
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/gauge/analogue-compass-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/gauge/analogue-compass-widget-settings.component.html
index 96c16c0359..0f3b318664 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/gauge/analogue-compass-widget-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/gauge/analogue-compass-widget-settings.component.html
@@ -86,7 +86,7 @@
       </mat-slide-toggle>
       <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
         <mat-form-field class="number" appearance="outline" subscriptSizing="dynamic">
-          <input matInput min="0" formControlName="borderOuterWidth" placeholder="{{ 'widget-config.set' | translate }}">
+          <input matInput type="number" min="0" formControlName="borderOuterWidth" placeholder="{{ 'widget-config.set' | translate }}">
         </mat-form-field>
         <tb-color-input asBoxInput
                         colorClearButton
@@ -102,7 +102,7 @@
       <div translate>widgets.gauge.needle-circle</div>
       <div fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="8px">
         <mat-form-field class="number" appearance="outline" subscriptSizing="dynamic">
-          <input matInput min="0" formControlName="needleCircleSize" placeholder="{{ 'widget-config.set' | translate }}">
+          <input matInput type="number" min="0" formControlName="needleCircleSize" placeholder="{{ 'widget-config.set' | translate }}">
         </mat-form-field>
         <tb-color-input asBoxInput
                         colorClearButton