From 5b24b4865adc0871d2ca4a6ecd505d864c3024e9 Mon Sep 17 00:00:00 2001
From: Vladyslav Prykhodko <vlad.pryhodko@icloud.com>
Date: Sat, 26 Jul 2025 21:08:47 +0300
Subject: [PATCH 01/14] UI: Add descriptive default option to Disable on
 property select

---
 .../dynamic-form/dynamic-form-property-panel.component.html     | 2 +-
 ui-ngx/src/assets/locale/locale.constant-en_US.json             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-panel.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-panel.component.html
index 5dbeb8b646..5307a18a7b 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-panel.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-panel.component.html
@@ -116,7 +116,7 @@
             <div class="fixed-title-width" translate>dynamic-form.property.disable-on-property</div>
             <mat-form-field  class="flex" appearance="outline" subscriptSizing="dynamic">
               <mat-select formControlName="disableOnProperty" placeholder="{{ 'widget-config.set' | translate }}">
-                <mat-option [value]="null"></mat-option>
+                <mat-option [value]="null">{{ 'dynamic-form.property.disable-on-property-none' | translate }}</mat-option>
                 <mat-option *ngFor="let prop of booleanPropertyIds" [value]="prop">
                   {{ prop }}
                 </mat-option>
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index a7396ad49e..c561118855 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -1848,6 +1848,7 @@
             "selected-options-limit": "Selected options limit",
             "advanced-ui-settings": "Advanced UI settings",
             "disable-on-property": "Disable on property",
+            "disable-on-property-none": "None (field always enabled)",
             "display-condition-function": "Display condition function",
             "sub-label": "Sub label",
             "vertical-divider-after": "Vertical divider after",

From 1c5f186418dd94bdd480bea2ceee006fbde0487d Mon Sep 17 00:00:00 2001
From: Artem Dzhereleiko <Dgerik2015@gmail.com>
Date: Mon, 28 Jul 2025 09:41:15 +0300
Subject: [PATCH 02/14] UI: Fixed line width for cross connector hp

---
 .../data/json/system/scada_symbols/cross-connector-hp.svg   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/src/main/data/json/system/scada_symbols/cross-connector-hp.svg b/application/src/main/data/json/system/scada_symbols/cross-connector-hp.svg
index 5ac0af8248..e05bf4d048 100644
--- a/application/src/main/data/json/system/scada_symbols/cross-connector-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/cross-connector-hp.svg
@@ -490,13 +490,13 @@
       "default": 6,
       "required": true,
       "subLabel": "Main",
-      "divider": true,
+      "divider": false,
       "fieldSuffix": "px",
-      "condition": "return model.mainLine;",
       "min": 0,
       "max": 99,
       "step": 1,
-      "disabled": false
+      "disabled": false,
+      "visible": true
     },
     {
       "id": "lineColor",

From a7ba9d8c025c34be34e2161d3e36e4a24dd82805 Mon Sep 17 00:00:00 2001
From: Artem Dzhereleiko <Dgerik2015@gmail.com>
Date: Mon, 28 Jul 2025 15:13:08 +0300
Subject: [PATCH 03/14] UI: Fixed font on preview scada symbols

---
 .../scada_symbols/3-phase-voltage-relay-hp.svg       |  2 +-
 .../data/json/system/scada_symbols/battery-hp.svg    |  2 +-
 .../data/json/system/scada_symbols/conical-tank.svg  |  2 +-
 .../json/system/scada_symbols/control-panel-hp.svg   |  6 +++---
 .../json/system/scada_symbols/curcuit-breaker-hp.svg |  2 +-
 .../json/system/scada_symbols/cylindrical-tank.svg   |  2 +-
 .../scada_symbols/dynamic-horizontal-scale-hp.svg    |  4 ++--
 .../scada_symbols/dynamic-vertical-scale-hp.svg      |  6 +++---
 .../data/json/system/scada_symbols/elevated-tank.svg |  2 +-
 .../json/system/scada_symbols/energy-meter-hp.svg    |  2 +-
 .../scada_symbols/four-rate-energy-meter-hp.svg      |  2 +-
 .../data/json/system/scada_symbols/heat-pump-hp.svg  |  2 +-
 .../scada_symbols/horizontal-curcuit-breaker-hp.svg  |  2 +-
 .../horizontal-energy-system-controller-hp.svg       |  2 +-
 .../json/system/scada_symbols/horizontal-tank.svg    |  2 +-
 .../json/system/scada_symbols/large-conical-tank.svg |  2 +-
 .../system/scada_symbols/large-cylindrical-tank.svg  |  2 +-
 .../scada_symbols/large-stand-cylindrical-tank.svg   |  2 +-
 .../scada_symbols/large-stand-vertical-tank.svg      |  2 +-
 .../system/scada_symbols/large-vertical-tank.svg     |  2 +-
 .../scada_symbols/left-analog-water-level-meter.svg  |  2 +-
 .../json/system/scada_symbols/left-heat-pump.svg     |  2 +-
 .../main/data/json/system/scada_symbols/meter.svg    |  2 +-
 .../src/main/data/json/system/scada_symbols/pool.svg |  2 +-
 .../scada_symbols/right-analog-water-level-meter.svg |  2 +-
 .../json/system/scada_symbols/right-heat-pump.svg    |  2 +-
 .../json/system/scada_symbols/sand-filter-hp.svg     | 12 ++++++------
 .../data/json/system/scada_symbols/sand-filter.svg   | 12 ++++++------
 .../scada_symbols/simple-horizontal-scale-hp.svg     |  4 ++--
 .../scada_symbols/simple-vertical-scale-hp.svg       |  6 +++---
 .../system/scada_symbols/small-cylindrical-tank.svg  |  2 +-
 .../json/system/scada_symbols/small-left-meter.svg   |  2 +-
 .../data/json/system/scada_symbols/small-meter.svg   |  2 +-
 .../json/system/scada_symbols/small-right-center.svg |  2 +-
 .../system/scada_symbols/small-spherical-tank.svg    |  2 +-
 .../json/system/scada_symbols/spherical-tank.svg     |  2 +-
 .../system/scada_symbols/stand-cylindrical-tank.svg  |  2 +-
 .../system/scada_symbols/stand-horizontal-tank.svg   |  2 +-
 .../scada_symbols/stand-vertical-short-tank.svg      |  2 +-
 .../system/scada_symbols/stand-vertical-tank.svg     |  2 +-
 .../scada_symbols/three-rate-energy-meter-hp.svg     |  2 +-
 .../scada_symbols/two-rate-energy-meter-hp.svg       |  2 +-
 .../vertical-energy-system-controller-hp.svg         |  2 +-
 .../system/scada_symbols/vertical-short-tank.svg     |  2 +-
 .../data/json/system/scada_symbols/vertical-tank.svg |  2 +-
 .../json/system/scada_symbols/voltage-relay-hp.svg   |  2 +-
 .../system/scada_symbols/voltage-stabilizer-hp.svg   |  2 +-
 47 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/application/src/main/data/json/system/scada_symbols/3-phase-voltage-relay-hp.svg b/application/src/main/data/json/system/scada_symbols/3-phase-voltage-relay-hp.svg
index 8e1a46978e..6107f8f212 100644
--- a/application/src/main/data/json/system/scada_symbols/3-phase-voltage-relay-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/3-phase-voltage-relay-hp.svg
@@ -535,7 +535,7 @@
     }
   ]
 }]]></tb:metadata>
-<rect width="400" height="400" fill="#fff" tb:tag="background"/><rect x="1" y="1" width="398" height="398" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="200" cy="50" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="112" cy="50" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="288" cy="50" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="200" cy="350" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="112" cy="350" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="288" cy="350" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="150" y="180" width="100" height="80" rx="2" fill="#DEDEDE" tb:tag="value-box"/><rect x="151" y="181" width="98" height="78" rx="1" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="270" y="180" width="100" height="80" rx="2" fill="#DEDEDE" tb:tag="value-box"/><rect x="271" y="181" width="98" height="78" rx="1" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="30" y="180" width="100" height="80" rx="2" fill="#DEDEDE" tb:tag="value-box"/><rect x="31" y="181" width="98" height="78" rx="1" stroke="#000" stroke-opacity=".87" stroke-width="2"/><text x="201.6431" y="233.64844" fill="#002878" font-family="Roboto" font-size="32px" font-weight="400" text-anchor="middle" tb:tag="secondPhaseValue" xml:space="preserve"><tspan dominant-baseline="start">220</tspan></text><text x="321.46201" y="233.29332" fill="#002878" font-family="Roboto" font-size="32px" font-weight="400" text-anchor="middle" tb:tag="thirdPhaseValue" xml:space="preserve"><tspan dominant-baseline="start">220</tspan></text><text x="81.372673" y="233.21404" fill="#002878" font-family="Roboto" font-size="32px" font-weight="400" text-anchor="middle" tb:tag="firstPhaseValue" xml:space="preserve"><tspan dominant-baseline="start">220</tspan></text><circle cx="80" cy="146" r="10" fill="#198038" stroke="#198038" stroke-width=".5" tb:tag="firstPhaseIndicator"/><path d="m79.446 125.67v2.332h-8.5664v-2.332h8.5664zm-7.7461-14.73v17.062h-2.9414v-17.062h2.9414zm17.635-0.059v17.121h-2.8242v-13.77l-4.1836 1.418v-2.332l6.668-2.437h0.3398z" fill="#000" fill-opacity=".87"/><circle cx="199" cy="146" r="10" fill="#198038" stroke="#198038" stroke-width=".5" tb:tag="secondPhaseIndicator"/><path d="m198.45 125.67v2.332h-8.566v-2.332h8.566zm-7.746-14.73v17.062h-2.941v-17.062h2.941zm21.362 14.812v2.25h-11.438v-1.934l5.555-6.058c0.609-0.688 1.09-1.281 1.441-1.781 0.352-0.5 0.598-0.95 0.739-1.348 0.148-0.406 0.222-0.801 0.222-1.184 0-0.539-0.101-1.011-0.304-1.418-0.196-0.414-0.485-0.738-0.868-0.972-0.382-0.243-0.847-0.364-1.394-0.364-0.633 0-1.164 0.137-1.594 0.411-0.43 0.273-0.754 0.652-0.972 1.136-0.219 0.477-0.329 1.024-0.329 1.641h-2.824c0-0.992 0.227-1.899 0.68-2.719 0.453-0.828 1.109-1.484 1.969-1.969 0.859-0.492 1.894-0.738 3.105-0.738 1.141 0 2.109 0.192 2.906 0.574 0.797 0.383 1.403 0.926 1.817 1.629 0.422 0.703 0.633 1.535 0.633 2.496 0 0.532-0.086 1.059-0.258 1.582-0.172 0.524-0.418 1.047-0.739 1.571-0.312 0.515-0.683 1.035-1.113 1.558-0.43 0.516-0.902 1.039-1.418 1.571l-3.691 4.066h7.875z" fill="#000" fill-opacity=".87"/><circle cx="320" cy="146" r="10" fill="#198038" stroke="#198038" stroke-width=".5" tb:tag="thirdPhaseIndicator"/><path d="m319.45 125.67v2.332h-8.566v-2.332h8.566zm-7.746-14.73v17.062h-2.941v-17.062h2.941zm13.241 7.253h1.687c0.656 0 1.199-0.113 1.629-0.339 0.438-0.227 0.762-0.54 0.973-0.938s0.316-0.855 0.316-1.371c0-0.539-0.097-1-0.293-1.383-0.187-0.39-0.476-0.691-0.867-0.902-0.383-0.211-0.871-0.317-1.465-0.317-0.5 0-0.953 0.102-1.359 0.305-0.399 0.195-0.715 0.477-0.949 0.844-0.235 0.359-0.352 0.789-0.352 1.289h-2.836c0-0.906 0.238-1.711 0.715-2.414 0.476-0.703 1.125-1.254 1.945-1.653 0.828-0.406 1.758-0.609 2.789-0.609 1.102 0 2.063 0.184 2.883 0.551 0.828 0.359 1.473 0.898 1.934 1.617s0.691 1.609 0.691 2.672c0 0.484-0.113 0.977-0.34 1.477-0.226 0.5-0.562 0.957-1.008 1.371-0.445 0.406-1 0.738-1.664 0.996-0.664 0.25-1.433 0.375-2.308 0.375h-2.121v-1.571zm0 2.204v-1.547h2.121c1 0 1.851 0.117 2.554 0.351 0.711 0.235 1.29 0.559 1.735 0.973 0.445 0.406 0.769 0.871 0.973 1.394 0.21 0.524 0.316 1.079 0.316 1.664 0 0.797-0.145 1.508-0.434 2.133-0.281 0.617-0.683 1.141-1.207 1.571-0.523 0.429-1.136 0.754-1.84 0.972-0.695 0.219-1.453 0.328-2.273 0.328-0.734 0-1.437-0.101-2.109-0.304s-1.274-0.504-1.805-0.903c-0.531-0.406-0.953-0.91-1.266-1.511-0.304-0.61-0.457-1.313-0.457-2.11h2.825c0 0.508 0.117 0.957 0.351 1.348 0.242 0.383 0.578 0.684 1.008 0.902 0.437 0.219 0.937 0.328 1.5 0.328 0.594 0 1.105-0.105 1.535-0.316s0.758-0.523 0.984-0.938c0.235-0.414 0.352-0.914 0.352-1.5 0-0.664-0.129-1.203-0.387-1.617s-0.625-0.718-1.101-0.914c-0.477-0.203-1.039-0.304-1.688-0.304h-1.687z" fill="#000" fill-opacity=".87"/><text x="199.75247" y="299.65625" fill="#000000" font-family="Roboto" font-size="28px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan dominant-baseline="start">v</tspan></text><path d="m134.53 0s-134.53 0-134.53 67v328.36c0 2.6512 3.5818 4.6404 8 4.6404h384c4.418 0 8-1.9892 8-4.6404v-328.36c0-67-132.14-67-132.14-67h-67.858zm134.14 81.2c-2.5774 0-4.6666 1.2536-4.6666 2.8v300.4c0 1.5464 2.0894 2.8 4.6666 2.8h29.332c2.5774 0 4.6666-1.2536 4.6666-2.8v-300.4c0-1.5464-2.0894-2.8-4.6666-2.8z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+<rect width="400" height="400" fill="#fff" tb:tag="background"/><rect x="1" y="1" width="398" height="398" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="200" cy="50" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="112" cy="50" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="288" cy="50" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="200" cy="350" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="112" cy="350" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="288" cy="350" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="150" y="180" width="100" height="80" rx="2" fill="#DEDEDE" tb:tag="value-box"/><rect x="151" y="181" width="98" height="78" rx="1" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="270" y="180" width="100" height="80" rx="2" fill="#DEDEDE" tb:tag="value-box"/><rect x="271" y="181" width="98" height="78" rx="1" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="30" y="180" width="100" height="80" rx="2" fill="#DEDEDE" tb:tag="value-box"/><rect x="31" y="181" width="98" height="78" rx="1" stroke="#000" stroke-opacity=".87" stroke-width="2"/><text x="201.6431" y="233.64844" fill="#002878" font-family="Roboto, sans-serif" font-size="32px" font-weight="400" text-anchor="middle" tb:tag="secondPhaseValue" xml:space="preserve"><tspan dominant-baseline="start">220</tspan></text><text x="321.46201" y="233.29332" fill="#002878" font-family="Roboto, sans-serif" font-size="32px" font-weight="400" text-anchor="middle" tb:tag="thirdPhaseValue" xml:space="preserve"><tspan dominant-baseline="start">220</tspan></text><text x="81.372673" y="233.21404" fill="#002878" font-family="Roboto, sans-serif" font-size="32px" font-weight="400" text-anchor="middle" tb:tag="firstPhaseValue" xml:space="preserve"><tspan dominant-baseline="start">220</tspan></text><circle cx="80" cy="146" r="10" fill="#198038" stroke="#198038" stroke-width=".5" tb:tag="firstPhaseIndicator"/><path d="m79.446 125.67v2.332h-8.5664v-2.332h8.5664zm-7.7461-14.73v17.062h-2.9414v-17.062h2.9414zm17.635-0.059v17.121h-2.8242v-13.77l-4.1836 1.418v-2.332l6.668-2.437h0.3398z" fill="#000" fill-opacity=".87"/><circle cx="199" cy="146" r="10" fill="#198038" stroke="#198038" stroke-width=".5" tb:tag="secondPhaseIndicator"/><path d="m198.45 125.67v2.332h-8.566v-2.332h8.566zm-7.746-14.73v17.062h-2.941v-17.062h2.941zm21.362 14.812v2.25h-11.438v-1.934l5.555-6.058c0.609-0.688 1.09-1.281 1.441-1.781 0.352-0.5 0.598-0.95 0.739-1.348 0.148-0.406 0.222-0.801 0.222-1.184 0-0.539-0.101-1.011-0.304-1.418-0.196-0.414-0.485-0.738-0.868-0.972-0.382-0.243-0.847-0.364-1.394-0.364-0.633 0-1.164 0.137-1.594 0.411-0.43 0.273-0.754 0.652-0.972 1.136-0.219 0.477-0.329 1.024-0.329 1.641h-2.824c0-0.992 0.227-1.899 0.68-2.719 0.453-0.828 1.109-1.484 1.969-1.969 0.859-0.492 1.894-0.738 3.105-0.738 1.141 0 2.109 0.192 2.906 0.574 0.797 0.383 1.403 0.926 1.817 1.629 0.422 0.703 0.633 1.535 0.633 2.496 0 0.532-0.086 1.059-0.258 1.582-0.172 0.524-0.418 1.047-0.739 1.571-0.312 0.515-0.683 1.035-1.113 1.558-0.43 0.516-0.902 1.039-1.418 1.571l-3.691 4.066h7.875z" fill="#000" fill-opacity=".87"/><circle cx="320" cy="146" r="10" fill="#198038" stroke="#198038" stroke-width=".5" tb:tag="thirdPhaseIndicator"/><path d="m319.45 125.67v2.332h-8.566v-2.332h8.566zm-7.746-14.73v17.062h-2.941v-17.062h2.941zm13.241 7.253h1.687c0.656 0 1.199-0.113 1.629-0.339 0.438-0.227 0.762-0.54 0.973-0.938s0.316-0.855 0.316-1.371c0-0.539-0.097-1-0.293-1.383-0.187-0.39-0.476-0.691-0.867-0.902-0.383-0.211-0.871-0.317-1.465-0.317-0.5 0-0.953 0.102-1.359 0.305-0.399 0.195-0.715 0.477-0.949 0.844-0.235 0.359-0.352 0.789-0.352 1.289h-2.836c0-0.906 0.238-1.711 0.715-2.414 0.476-0.703 1.125-1.254 1.945-1.653 0.828-0.406 1.758-0.609 2.789-0.609 1.102 0 2.063 0.184 2.883 0.551 0.828 0.359 1.473 0.898 1.934 1.617s0.691 1.609 0.691 2.672c0 0.484-0.113 0.977-0.34 1.477-0.226 0.5-0.562 0.957-1.008 1.371-0.445 0.406-1 0.738-1.664 0.996-0.664 0.25-1.433 0.375-2.308 0.375h-2.121v-1.571zm0 2.204v-1.547h2.121c1 0 1.851 0.117 2.554 0.351 0.711 0.235 1.29 0.559 1.735 0.973 0.445 0.406 0.769 0.871 0.973 1.394 0.21 0.524 0.316 1.079 0.316 1.664 0 0.797-0.145 1.508-0.434 2.133-0.281 0.617-0.683 1.141-1.207 1.571-0.523 0.429-1.136 0.754-1.84 0.972-0.695 0.219-1.453 0.328-2.273 0.328-0.734 0-1.437-0.101-2.109-0.304s-1.274-0.504-1.805-0.903c-0.531-0.406-0.953-0.91-1.266-1.511-0.304-0.61-0.457-1.313-0.457-2.11h2.825c0 0.508 0.117 0.957 0.351 1.348 0.242 0.383 0.578 0.684 1.008 0.902 0.437 0.219 0.937 0.328 1.5 0.328 0.594 0 1.105-0.105 1.535-0.316s0.758-0.523 0.984-0.938c0.235-0.414 0.352-0.914 0.352-1.5 0-0.664-0.129-1.203-0.387-1.617s-0.625-0.718-1.101-0.914c-0.477-0.203-1.039-0.304-1.688-0.304h-1.687z" fill="#000" fill-opacity=".87"/><text x="199.75247" y="299.65625" fill="#000000" font-family="Roboto, sans-serif" font-size="28px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan dominant-baseline="start">v</tspan></text><path d="m134.53 0s-134.53 0-134.53 67v328.36c0 2.6512 3.5818 4.6404 8 4.6404h384c4.418 0 8-1.9892 8-4.6404v-328.36c0-67-132.14-67-132.14-67h-67.858zm134.14 81.2c-2.5774 0-4.6666 1.2536-4.6666 2.8v300.4c0 1.5464 2.0894 2.8 4.6666 2.8h29.332c2.5774 0 4.6666-1.2536 4.6666-2.8v-300.4c0-1.5464-2.0894-2.8-4.6666-2.8z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
   <rect width="84" height="84" rx="4" fill="#fff" style=""/>
   <rect width="84" height="84" rx="4" style=""/>
   <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
diff --git a/application/src/main/data/json/system/scada_symbols/battery-hp.svg b/application/src/main/data/json/system/scada_symbols/battery-hp.svg
index 8b63a9ab29..3ed3acfe01 100644
--- a/application/src/main/data/json/system/scada_symbols/battery-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/battery-hp.svg
@@ -459,7 +459,7 @@
   <circle cx="516" cy="102.5" r="12"/>
   <circle cx="516" cy="101.5" r="11" stroke="#000" stroke-opacity=".87" stroke-width="2"/>
   <circle cx="132" cy="101.5" r="11" stroke="#1a1a1a" stroke-width="2"/>
- </g><circle cx="204" cy="102" r="10" fill="#198038" tb:tag="indicator"/><text x="221" y="105.37933" fill="#000000" font-family="Roboto" font-size="30px" font-weight="400" tb:tag="label" xml:space="preserve"><tspan dominant-baseline="middle">ON</tspan></text><path d="m103 200h-6s7.858-27.047 14-44c6.324-17.455 18-44 18-44h6s-11.676 26.545-18 44c-6.142 16.953-14 44-14 44z" fill="#1a1a1a" tb:tag="left-bottom-connector"/><path d="m103 0h-6s-6.4394 26.077-9.5 43c-3.2977 18.234-6.5 47-6.5 47h6s2.7023-26.766 6-45c3.0606-16.923 10-45 10-45z" fill="#1a1a1a" tb:tag="left-top-connector"/><path d="m497 0h6s6.439 26.077 9.5 43c3.298 18.234 6.5 47 6.5 47h-6s-2.702-26.766-6-45c-3.061-16.923-10-45-10-45z" fill="#1a1a1a" tb:tag="right-top-connector"/><path d="m0 100h73" stroke="#1a1a1a" stroke-width="6" tb:tag="left-connector"/><path d="m527 100h73" stroke="#1a1a1a" stroke-width="6" tb:tag="right-connector"/><path d="m497 200h6s-7.858-27.047-14-44c-6.324-17.455-18-44-18-44h-6s11.676 26.545 18 44c6.142 16.953 14 44 14 44z" fill="#1a1a1a" tb:tag="right-bottom-connector"/><path d="m201.8 40s-201.8 0-201.8 20.435v100.15c0 0.80861 5.3727 1.4153 12 1.4153h576c6.627 0 12-0.60671 12-1.4153v-100.15c0-20.435-198.21-20.435-198.21-20.435h-101.79zm201.21 24.766c-3.8661 0-6.9999 0.38235-6.9999 0.854v91.622c0 0.47165 3.1341 0.854 6.9999 0.854h43.998c3.8661 0 6.9999-0.38235 6.9999-0.854v-91.622c0-0.47165-3.1341-0.854-6.9999-0.854z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+ </g><circle cx="204" cy="102" r="10" fill="#198038" tb:tag="indicator"/><text x="221" y="105.37933" fill="#000000" font-family="Roboto, sans-serif" font-size="30px" font-weight="400" tb:tag="label" xml:space="preserve"><tspan dominant-baseline="middle">ON</tspan></text><path d="m103 200h-6s7.858-27.047 14-44c6.324-17.455 18-44 18-44h6s-11.676 26.545-18 44c-6.142 16.953-14 44-14 44z" fill="#1a1a1a" tb:tag="left-bottom-connector"/><path d="m103 0h-6s-6.4394 26.077-9.5 43c-3.2977 18.234-6.5 47-6.5 47h6s2.7023-26.766 6-45c3.0606-16.923 10-45 10-45z" fill="#1a1a1a" tb:tag="left-top-connector"/><path d="m497 0h6s6.439 26.077 9.5 43c3.298 18.234 6.5 47 6.5 47h-6s-2.702-26.766-6-45c-3.061-16.923-10-45-10-45z" fill="#1a1a1a" tb:tag="right-top-connector"/><path d="m0 100h73" stroke="#1a1a1a" stroke-width="6" tb:tag="left-connector"/><path d="m527 100h73" stroke="#1a1a1a" stroke-width="6" tb:tag="right-connector"/><path d="m497 200h6s-7.858-27.047-14-44c-6.324-17.455-18-44-18-44h-6s11.676 26.545 18 44c6.142 16.953 14 44 14 44z" fill="#1a1a1a" tb:tag="right-bottom-connector"/><path d="m201.8 40s-201.8 0-201.8 20.435v100.15c0 0.80861 5.3727 1.4153 12 1.4153h576c6.627 0 12-0.60671 12-1.4153v-100.15c0-20.435-198.21-20.435-198.21-20.435h-101.79zm201.21 24.766c-3.8661 0-6.9999 0.38235-6.9999 0.854v91.622c0 0.47165 3.1341 0.854 6.9999 0.854h43.998c3.8661 0 6.9999-0.38235 6.9999-0.854v-91.622c0-0.47165-3.1341-0.854-6.9999-0.854z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
   <rect width="84" height="84" rx="4" fill="#fff" style=""/>
   <rect width="84" height="84" rx="4" style=""/>
   <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
diff --git a/application/src/main/data/json/system/scada_symbols/conical-tank.svg b/application/src/main/data/json/system/scada_symbols/conical-tank.svg
index 592508ee30..59988fa963 100644
--- a/application/src/main/data/json/system/scada_symbols/conical-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/conical-tank.svg
@@ -267,7 +267,7 @@
  </g><g transform="translate(0,44)" filter="url(#filter0_ii_1694_158298)" tb:tag="value-box">
   <path d="m381 272c0-6.627 5.373-12 12-12h216c6.627 0 12 5.373 12 12v56c0 6.627-5.373 12-12 12h-216c-6.627 0-12-5.373-12-12z" fill="#f3f3f3" tb:tag="value-box-background"/>
   <path d="m382.5 272c0-5.799 4.701-10.5 10.5-10.5h216c5.799 0 10.5 4.701 10.5 10.5v56c0 5.799-4.701 10.5-10.5 10.5h-216c-5.799 0-10.5-4.701-10.5-10.5z" stroke="#727171" stroke-width="3"/>
-  <text x="500.74219" y="300.07812" fill="#727171" font-family="Roboto" font-size="32px" font-weight="500" text-anchor="middle" tb:tag="value-text" xml:space="preserve"><tspan dominant-baseline="middle">1660 gal</tspan></text>
+  <text x="500.74219" y="300.07812" fill="#727171" font-family="Roboto, sans-serif" font-size="32px" font-weight="500" text-anchor="middle" tb:tag="value-text" xml:space="preserve"><tspan dominant-baseline="middle">1660 gal</tspan></text>
  </g><ellipse cx="500" cy="16" rx="496" ry="16" fill="#5D5C5C"/><rect transform="rotate(-90 451.5 998.5)" x="451.5" y="998.5" width="11" height="97" rx="5.5" fill="#D9D9D9" stroke="#727171" stroke-width="3"/><g style="display: none;" tb:tag="stand">
   <rect x="107" y="949" width="80" height="24" rx="7" fill="#fff" style=""/>
   <rect x="107" y="949" width="80" height="24" rx="7" fill="url(#paint629_linear_2901_184325)" style=""/>
diff --git a/application/src/main/data/json/system/scada_symbols/control-panel-hp.svg b/application/src/main/data/json/system/scada_symbols/control-panel-hp.svg
index d9b0857156..6fb7d3a501 100644
--- a/application/src/main/data/json/system/scada_symbols/control-panel-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/control-panel-hp.svg
@@ -320,13 +320,13 @@
     }
   ]
 }]]></tb:metadata>
-<rect width="400" height="200" rx="8" fill="#dedede" tb:tag="background"/><rect x="1" y="1" width="398" height="198" rx="7" stroke="#000" stroke-opacity=".87" stroke-width="2"/><text x="198.7832" y="57.511719" fill="#000000" font-family="Roboto" font-size="56px" font-weight="400" text-anchor="middle" tb:tag="label" xml:space="preserve"><tspan dominant-baseline="middle">Heat pump</tspan></text><g tb:tag="onButton">
+<rect width="400" height="200" rx="8" fill="#dedede" tb:tag="background"/><rect x="1" y="1" width="398" height="198" rx="7" stroke="#000" stroke-opacity=".87" stroke-width="2"/><text x="198.7832" y="57.511719" fill="#000000" font-family="Roboto, sans-serif" font-size="56px" font-weight="400" text-anchor="middle" tb:tag="label" xml:space="preserve"><tspan dominant-baseline="middle">Heat pump</tspan></text><g tb:tag="onButton">
   <rect x="29" y="100" width="156" height="72" rx="9.8143" fill="#999" style="stroke-width:.95761"/>
   <path d="m29.957 109.03c0-4.4589 3.9482-8.0734 8.8189-8.0734h136.45c4.8707 0 8.8189 3.6144 8.8189 8.0734v53.938c0 4.4589-3.9482 8.0743-8.8189 8.0743h-136.45c-4.8707 0-8.8189-3.6153-8.8189-8.0743z" shape-rendering="crispEdges" stroke="#999" stroke-width="1.9147"/>
-  <text x="107.44609" y="138.7375" fill="#000000" font-family="Roboto" font-size="34px" font-weight="500" text-anchor="middle" tb:tag="onLabel" xml:space="preserve"><tspan dominant-baseline="middle">On</tspan></text>
+  <text x="107.44609" y="138.7375" fill="#000000" font-family="Roboto, sans-serif" font-size="34px" font-weight="500" text-anchor="middle" tb:tag="onLabel" xml:space="preserve"><tspan dominant-baseline="middle">On</tspan></text>
  </g><g tb:tag="offButton">
   <rect x="214" y="100" width="156" height="72" rx="9.8143" fill="#dedede" style="stroke-width:.95761"/>
   <path d="m214.96 109.03c0-4.4589 3.9482-8.0734 8.8189-8.0734h136.45c4.8707 0 8.8189 3.6144 8.8189 8.0734v53.938c0 4.4589-3.9482 8.0743-8.8189 8.0743h-136.45c-4.8707 0-8.8189-3.6153-8.8189-8.0743z" shape-rendering="crispEdges" stroke="#999" stroke-width="1.9147"/>
-  <text x="290.68408" y="139.33516" fill="#000000" font-family="Roboto" font-size="34px" font-weight="500" text-anchor="middle" tb:tag="offLabel" xml:space="preserve"><tspan dominant-baseline="middle">Off</tspan></text>
+  <text x="290.68408" y="139.33516" fill="#000000" font-family="Roboto, sans-serif" font-size="34px" font-weight="500" text-anchor="middle" tb:tag="offLabel" xml:space="preserve"><tspan dominant-baseline="middle">Off</tspan></text>
  </g>
 </svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/curcuit-breaker-hp.svg b/application/src/main/data/json/system/scada_symbols/curcuit-breaker-hp.svg
index 12f8b4944f..9aca99fcd4 100644
--- a/application/src/main/data/json/system/scada_symbols/curcuit-breaker-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/curcuit-breaker-hp.svg
@@ -425,7 +425,7 @@
 <rect width="200" height="400" fill="#fff" tb:tag="background"/><rect x="1" y="1" width="198" height="398" stroke="#000" stroke-opacity=".87" stroke-width="2"/><g tb:tag="breaker">
   <path d="m50 100h100v198c0 1.105-0.895 2-2 2h-96c-1.1046 0-2-0.895-2-2v-198z"/>
   <path d="m51 101h98v197c0 0.552-0.448 1-1 1h-96c-0.5523 0-1-0.448-1-1v-197z" stroke="#000" stroke-opacity=".87" stroke-width="2" tb:tag="label-box"/>
-  <text x="100" y="201.65533" fill="#000000" font-family="Roboto" font-size="40px" font-weight="400" text-anchor="middle" tb:tag="label" xml:space="preserve"><tspan dominant-baseline="start">ON</tspan></text>
+  <text x="100" y="201.65533" fill="#000000" font-family="Roboto, sans-serif" font-size="40px" font-weight="400" text-anchor="middle" tb:tag="label" xml:space="preserve"><tspan dominant-baseline="start">ON</tspan></text>
   <g tb:tag="breaker-trigger">
    <rect x="24" y="100" width="152" height="40" rx="2" fill="#999"/>
    <rect x="25" y="101" width="150" height="38" rx="1" stroke="#000" stroke-opacity=".87" stroke-width="2"/>
diff --git a/application/src/main/data/json/system/scada_symbols/cylindrical-tank.svg b/application/src/main/data/json/system/scada_symbols/cylindrical-tank.svg
index 5675818fe7..231bc83efe 100644
--- a/application/src/main/data/json/system/scada_symbols/cylindrical-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/cylindrical-tank.svg
@@ -563,7 +563,7 @@
  </g><g transform="translate(-1,409)" filter="url(#filter0_ii_1687_130892)" tb:tag="value-box">
   <path d="m180 62c0-6.6274 5.373-12 12-12h216c6.627 0 12 5.3726 12 12v56c0 6.627-5.373 12-12 12h-216c-6.627 0-12-5.373-12-12z" fill="#f3f3f3" tb:tag="value-box-background"/>
   <path d="m192 51.5h216c5.799 0 10.5 4.701 10.5 10.5v56c0 5.799-4.701 10.5-10.5 10.5h-216c-5.799 0-10.5-4.701-10.5-10.5v-56c0-5.799 4.701-10.5 10.5-10.5z" stroke="#727171" stroke-width="3"/>
-  <text x="301.5625" y="93.546875" fill="#727171" font-family="Roboto" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
+  <text x="301.5625" y="93.546875" fill="#727171" font-family="Roboto, sans-serif" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
  </g><ellipse cx="300" cy="16" rx="292" ry="16" fill="#5D5C5C"/><path d="m201.79 0s-201.79 0-201.79 167.5v820.9c0 6.628 5.3726 11.601 12 11.601h576c6.627 0 12-4.973 12-11.601v-820.9c0-167.5-198.21-167.5-198.21-167.5h-101.79zm201.21 203c-3.866 0-7 3.134-7 7v751c0 3.866 3.134 7 7 7h44c3.866 0 7-3.134 7-7v-751c0-3.866-3.134-7-7-7z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><defs>
   <linearGradient id="paint0_linear_1690_149726" x1="600" x2=".018833" y1="510.96" y2="504.56" gradientUnits="userSpaceOnUse">
    <stop stop-color="#020202" stop-opacity=".35" offset="0"/>
diff --git a/application/src/main/data/json/system/scada_symbols/dynamic-horizontal-scale-hp.svg b/application/src/main/data/json/system/scada_symbols/dynamic-horizontal-scale-hp.svg
index 7b11968223..3e68be83c3 100644
--- a/application/src/main/data/json/system/scada_symbols/dynamic-horizontal-scale-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/dynamic-horizontal-scale-hp.svg
@@ -586,13 +586,13 @@
     }
   ]
 }]]></tb:metadata>
-<text x="409.16602" y="97.234375" fill="#000000" font-family="Roboto" font-size="56px" font-weight="400" text-anchor="middle" tb:tag="label" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">Outdoor</tspan></text><text x="401.15625" y="345.75" fill="#000000" font-family="Roboto" font-size="40px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">°C</tspan></text><g fill="#666" font-family="Roboto" font-size="32px" font-weight="500" text-anchor="middle" style="display: none;" tb:tag="minMaxValue">
+<text x="409.16602" y="97.234375" fill="#000000" font-family="Roboto, sans-serif" font-size="56px" font-weight="400" text-anchor="middle" tb:tag="label" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">Outdoor</tspan></text><text x="401.15625" y="345.75" fill="#000000" font-family="Roboto, sans-serif" font-size="40px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">°C</tspan></text><g fill="#666" font-family="Roboto, sans-serif" font-size="32px" font-weight="500" text-anchor="middle" style="display: none;" tb:tag="minMaxValue">
   <text x="88.070312" y="268" tb:tag="minValue" xml:space="preserve" style=""><tspan dominant-baseline="middle">0</tspan></text>
   <text x="705.02344" y="268" tb:tag="maxValue" xml:space="preserve" style=""><tspan dominant-baseline="middle">100</tspan></text>
  </g><g transform="translate(180)" tb:tag="valueArrowPosition">
   <path d="m80 179 24-42h-48z" fill="#666" tb:tag="valuePointer"/>
  </g><g transform="translate(180)" tb:tag="valueTextPositon">
-  <text x="79.779297" y="273.125" fill="#002878" font-family="Roboto" font-size="60px" font-weight="400" text-anchor="middle" tb:tag="value" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">26</tspan></text>
+  <text x="79.779297" y="273.125" fill="#002878" font-family="Roboto, sans-serif" font-size="60px" font-weight="400" text-anchor="middle" tb:tag="value" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">26</tspan></text>
  </g><g stroke="#000" tb:tag="scale">
   <rect x="80.5" y="183.5" width="652" height="41" fill="#c8dff7" tb:tag="scaleBackground"/>
   <rect x="80.5" y="183.5" width="164" height="41" fill="#ebebeb" tb:tag="lowWarningScale"/>
diff --git a/application/src/main/data/json/system/scada_symbols/dynamic-vertical-scale-hp.svg b/application/src/main/data/json/system/scada_symbols/dynamic-vertical-scale-hp.svg
index 37ba3df7c2..779fc069df 100644
--- a/application/src/main/data/json/system/scada_symbols/dynamic-vertical-scale-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/dynamic-vertical-scale-hp.svg
@@ -579,19 +579,19 @@
     }
   ]
 }]]></tb:metadata>
-<text x="206.16602" y="43.234375" fill="#000000" font-family="Roboto" font-size="56px" font-weight="400" text-anchor="middle" tb:tag="label" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">Outdoor</tspan></text><text x="195.21875" y="770" fill="#000000" font-family="Roboto" font-size="40px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">°C</tspan></text><g stroke="#000" tb:tag="scale">
+<text x="206.16602" y="43.234375" fill="#000000" font-family="Roboto, sans-serif" font-size="56px" font-weight="400" text-anchor="middle" tb:tag="label" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">Outdoor</tspan></text><text x="195.21875" y="770" fill="#000000" font-family="Roboto, sans-serif" font-size="40px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">°C</tspan></text><g stroke="#000" tb:tag="scale">
   <rect x="176.5" y="83" width="41" height="652" fill="#c8dff7" tb:tag="scaleBackground"/>
   <rect transform="scale(1,-1)" x="176.5" y="-735" width="41" height="164" fill="#ebebeb" tb:tag="lowWarningScale"/>
   <rect x="176.5" y="83.5" width="41" height="164" fill="#ebebeb" tb:tag="highWarningScale"/>
   <rect transform="scale(1,-1)" x="176.5" y="-735" width="41" height="81" fill="#666" tb:tag="lowCriticalScale"/>
   <rect x="176.5" y="83.5" width="41" height="81" fill="#666" tb:tag="highCriticalScale"/>
- </g><g fill="#666" font-family="Roboto" font-size="32px" font-weight="500" style="display: none;" tb:tag="minMaxValue">
+ </g><g fill="#666" font-family="Roboto, sans-serif" font-size="32px" font-weight="500" style="display: none;" tb:tag="minMaxValue">
   <text x="237.48438" y="97" tb:tag="maxValue" xml:space="preserve" style=""><tspan dominant-baseline="middle">100</tspan></text>
   <text x="238.89062" y="727" tb:tag="minValue" xml:space="preserve" style=""><tspan dominant-baseline="middle">0</tspan></text>
  </g><g transform="translate(0,-180)" tb:tag="valueArrowPosition">
   <path d="m168 735-42-24v48z" fill="#666" tb:tag="valuePointer"/>
  </g><g transform="translate(0,-180)" tb:tag="valueTextPositon">
-  <text x="223.60547" y="739.125" fill="#002878" font-family="Roboto" font-size="60px" font-weight="400" tb:tag="value" xml:space="preserve"><tspan dominant-baseline="middle">26</tspan></text>
+  <text x="223.60547" y="739.125" fill="#002878" font-family="Roboto, sans-serif" font-size="60px" font-weight="400" tb:tag="value" xml:space="preserve"><tspan dominant-baseline="middle">26</tspan></text>
  </g><g transform="translate(0,-400)" style="display: none;" tb:tag="target">
   <rect transform="rotate(-45)" x="-379.76" y="636.31" width="22" height="22" fill="#dedede" stroke="#000" stroke-width="2" tb:tag="targetBackground" style=""/>
  </g><path d="m134.53 0s-134.53 0-134.53 134v656.72c0 5.3024 3.5817 9.2808 8 9.2808h384c4.418 0 8-3.9784 8-9.2808v-656.72c0-134-132.14-134-132.14-134h-67.86zm134.14 162.4c-2.5773 0-4.6667 2.5072-4.6667 5.6v600.8c0 3.0928 2.0893 5.6 4.6667 5.6h29.333c2.5773 0 4.6667-2.5072 4.6667-5.6v-600.8c0-3.0928-2.0893-5.6-4.6667-5.6z" fill="#000" fill-opacity="0" tb:tag="clickArea"/>
diff --git a/application/src/main/data/json/system/scada_symbols/elevated-tank.svg b/application/src/main/data/json/system/scada_symbols/elevated-tank.svg
index 0d82a10b41..761f9c1642 100644
--- a/application/src/main/data/json/system/scada_symbols/elevated-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/elevated-tank.svg
@@ -557,7 +557,7 @@
  </g><path d="m3.0002 1143.6-1.7e-4 -141.73c16.904 3.91 46.87 7.48 86.628 10.71 43.009 3.48 97.728 6.56 160.31 9.17 125.17 5.22 281.88 8.54 439.46 9.36 157.58 0.81 316.06-0.88 444.77-5.69 64.35-2.41 121.29-5.59 166.96-9.64 42.72-3.78 75.8-8.33 95.87-13.77v141.48c0 4.44-2.78 7.94-6.85 8.68-141.99 25.81-431.84 36.08-714.04 34.75-282.22-1.34-556.2-14.27-666.45-34.72-3.9871-0.74-6.6571-4.16-6.6571-8.6z" stroke="#647484" stroke-width="6"/><path d="m1023 1030v145" stroke="#647484" stroke-width="6"/><path d="m701 1030v150" stroke="#647484" stroke-width="6"/><path d="m379 1023v151" stroke="#647484" stroke-width="6"/><path d="m0 1147c125.45 33.35 1246.3 46.29 1400 0v61.71c0 5.74-3.68 10.62-9.33 11.64-284.6 51.35-1160.4 40.74-1381.5 0.03-5.601-1.04-9.1261-5.87-9.1261-11.56l-1.5804e-4 -61.82z" fill="#E5E5E5" tb:tag="background"/><path d="m0 1147c125.45 33.35 1246.3 46.29 1400 0v61.71c0 5.74-3.68 10.62-9.33 11.64-284.6 51.35-1160.4 40.74-1381.5 0.03-5.601-1.04-9.1261-5.87-9.1261-11.56l-1.5804e-4 -61.82z" fill="url(#paint301_linear_2188_188555)"/><path d="m1.5002 1208.8-1.6e-4 -59.89c16.364 4.02 46.959 7.72 88.25 11.04 42.982 3.45 97.679 6.52 160.25 9.11 125.15 5.18 281.84 8.47 439.41 9.28s316.02-0.87 444.71-5.65c64.33-2.38 121.24-5.55 166.88-9.56 44.11-3.88 77.81-8.56 97.5-14.15v59.71c0 5.09-3.23 9.28-8.1 10.16-142.14 25.65-432.11 35.84-714.3 34.52s-556.29-14.16-666.71-34.49c-4.797-0.88-7.8977-5.01-7.8977-10.08z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m700 0 597.89 200.16c4 1.341 3.46 7.138-0.73 7.694-189.06 25.141-364.28 25.141-597.16 25.141-230.8 0-478.09 0-600.31-24.472-3.9498-0.791-4.1701-6.156-0.3503-7.435l600.66-201.09z" fill="#E5E5E5" tb:tag="background"/><path d="m700 0 597.89 200.16c4 1.341 3.46 7.138-0.73 7.694-189.06 25.141-364.28 25.141-597.16 25.141-230.8 0-478.09 0-600.31-24.472-3.9498-0.791-4.1701-6.156-0.3503-7.435l600.66-201.09z" fill="url(#paint302_linear_2188_188555)"/><path d="m99.815 202.52 600.18-200.93 597.41 200.01c2.51 0.84 2.15 4.439-0.44 4.785-188.96 25.125-364.07 25.127-596.97 25.127-115.41 0-234.9 0-340.83-3.058-105.95-3.059-198.21-9.177-259.19-21.385-2.3046-0.462-2.6651-3.706-0.1686-4.541z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><g filter="url(#filter0_ii_2188_188555)" tb:tag="value-box">
   <path d="m580 634c0-6.627 5.373-12 12-12h216c6.627 0 12 5.373 12 12v56c0 6.627-5.373 12-12 12h-216c-6.627 0-12-5.373-12-12v-56z" fill="#fff" tb:tag="value-box-background"/>
   <path d="m581.5 634c0-5.799 4.701-10.5 10.5-10.5h216c5.799 0 10.5 4.701 10.5 10.5v56c0 5.799-4.701 10.5-10.5 10.5h-216c-5.799 0-10.5-4.701-10.5-10.5v-56z" stroke="#727171" stroke-width="3"/>
-  <text x="705.52533" y="666.35553" fill="#727171" font-family="Roboto" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
+  <text x="705.52533" y="666.35553" fill="#727171" font-family="Roboto, sans-serif" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
  </g><g fill="#D9D9D9" filter="url(#filter1_d_2188_188555)" stroke="#727171" stroke-width="3">
   <rect transform="matrix(0 -1 .99255 -.12187 1087.2 414.35)" x="1.4888" y="-1.6828" width="11" height="77" rx="5.5"/>
   <rect transform="matrix(0 -1 .99255 -.12187 1087.2 368.35)" x="1.4888" y="-1.6828" width="11" height="77" rx="5.5"/>
diff --git a/application/src/main/data/json/system/scada_symbols/energy-meter-hp.svg b/application/src/main/data/json/system/scada_symbols/energy-meter-hp.svg
index 3855d66ec8..0eb47a923f 100644
--- a/application/src/main/data/json/system/scada_symbols/energy-meter-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/energy-meter-hp.svg
@@ -474,7 +474,7 @@
     }
   ]
 }]]></tb:metadata>
-<rect x="1" y="1" width="398" height="398" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><rect x="49" y="143" width="302" height="114" rx="3" fill="#DEDEDE" stroke="#1A1A1A" stroke-width="2" tb:tag="value-box"/><text x="199.83594" y="217.64844" fill="#002878" font-family="Roboto" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="value" xml:space="preserve"><tspan dominant-baseline="start">000023</tspan></text><text x="199.89453" y="341.65625" fill="#000000" font-family="Roboto" font-size="36px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan dominant-baseline="start">kWh</tspan></text><text x="199.70117" y="83.648438" fill="#000000" font-family="Roboto" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="label" xml:space="default"><tspan dominant-baseline="start">T1</tspan></text><path d="m134.53-2e-4s-134.53 0-134.53 67v328.36c0 2.6512 3.5818 4.6404 8 4.6404h384c4.418 0 8-1.9892 8-4.6404v-328.36c0-67-132.14-67-132.14-67h-67.858zm134.14 81.2c-2.5774 0-4.6666 1.2536-4.6666 2.8v300.4c0 1.5464 2.0894 2.8 4.6666 2.8h29.332c2.5774 0 4.6666-1.2536 4.6666-2.8v-300.4c0-1.5464-2.0894-2.8-4.6666-2.8z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+<rect x="1" y="1" width="398" height="398" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><rect x="49" y="143" width="302" height="114" rx="3" fill="#DEDEDE" stroke="#1A1A1A" stroke-width="2" tb:tag="value-box"/><text x="199.83594" y="217.64844" fill="#002878" font-family="Roboto, sans-serif" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="value" xml:space="preserve"><tspan dominant-baseline="start">000023</tspan></text><text x="199.89453" y="341.65625" fill="#000000" font-family="Roboto, sans-serif" font-size="36px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan dominant-baseline="start">kWh</tspan></text><text x="199.70117" y="83.648438" fill="#000000" font-family="Roboto, sans-serif" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="label" xml:space="default"><tspan dominant-baseline="start">T1</tspan></text><path d="m134.53-2e-4s-134.53 0-134.53 67v328.36c0 2.6512 3.5818 4.6404 8 4.6404h384c4.418 0 8-1.9892 8-4.6404v-328.36c0-67-132.14-67-132.14-67h-67.858zm134.14 81.2c-2.5774 0-4.6666 1.2536-4.6666 2.8v300.4c0 1.5464 2.0894 2.8 4.6666 2.8h29.332c2.5774 0 4.6666-1.2536 4.6666-2.8v-300.4c0-1.5464-2.0894-2.8-4.6666-2.8z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
   <rect width="84" height="84" rx="4" fill="#fff" style=""/>
   <rect width="84" height="84" rx="4" style=""/>
   <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
diff --git a/application/src/main/data/json/system/scada_symbols/four-rate-energy-meter-hp.svg b/application/src/main/data/json/system/scada_symbols/four-rate-energy-meter-hp.svg
index e095c1417f..2701e46684 100644
--- a/application/src/main/data/json/system/scada_symbols/four-rate-energy-meter-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/four-rate-energy-meter-hp.svg
@@ -877,7 +877,7 @@
     }
   ]
 }]]></tb:metadata>
-<rect x="1" y="1" width="598" height="398" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><rect x="49" y="81" width="238" height="82" rx="3" fill="#dedede" stroke="#1a1a1a" stroke-width="2" tb:tag="value-box-off-peak"/><rect x="313" y="81" width="238" height="82" rx="3" fill="#dedede" stroke="#1a1a1a" stroke-width="2" tb:tag="value-box-night"/><rect x="49" y="237" width="238" height="82" rx="3" fill="#dedede" stroke="#1a1a1a" stroke-width="2" tb:tag="value-box-peak"/><rect x="313" y="237" width="238" height="82" rx="3" fill="#dedede" stroke="#1a1a1a" stroke-width="2" tb:tag="value-box-export"/><text x="171.2998" y="58.286133" fill="#000000" font-family="Roboto" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="off-peak-label" xml:space="default"><tspan dominant-baseline="start">T1</tspan></text><text x="433.2998" y="58.734375" fill="#000000" font-family="Roboto" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="night-label"><tspan dominant-baseline="start">T2</tspan></text><text x="169.2998" y="214.23438" fill="#000000" font-family="Roboto" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="peak-label" xml:space="default"><tspan dominant-baseline="start">T3</tspan></text><text x="432.31152" y="213.78613" fill="#000000" font-family="Roboto" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="export-label" xml:space="default"><tspan dominant-baseline="start">Export</tspan></text><text x="169.45312" y="139.625" fill="#002878" font-family="Roboto" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="off-peak-rate" xml:space="default"><tspan dominant-baseline="start">000223</tspan></text><text x="433.45312" y="139.625" fill="#002878" font-family="Roboto" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="night-rate" xml:space="default"><tspan dominant-baseline="start">000223</tspan></text><text x="169.45312" y="295.625" fill="#002878" font-family="Roboto" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="peak-rate" xml:space="default"><tspan dominant-baseline="start">000223</tspan></text><text x="433.45312" y="295.625" fill="#002878" font-family="Roboto" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="export-rate" xml:space="default"><tspan dominant-baseline="start">000223</tspan></text><text x="299.89453" y="371.67578" fill="#000000" font-family="Roboto" font-size="36px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan dominant-baseline="start">kWh</tspan></text><path d="m201.8-2e-4s-201.8 0-201.8 67v328.36c0 2.6512 5.3727 4.6404 12 4.6404h576c6.627 0 12-1.9892 12-4.6404v-328.36c0-67-198.21-67-198.21-67h-101.79zm201.21 81.2c-3.8661 0-6.9999 1.2536-6.9999 2.8v300.4c0 1.5464 3.1341 2.8 6.9999 2.8h43.998c3.8661 0 6.9999-1.2536 6.9999-2.8v-300.4c0-1.5464-3.1341-2.8-6.9999-2.8z" fill-opacity="0" fill="#000" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+<rect x="1" y="1" width="598" height="398" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><rect x="49" y="81" width="238" height="82" rx="3" fill="#dedede" stroke="#1a1a1a" stroke-width="2" tb:tag="value-box-off-peak"/><rect x="313" y="81" width="238" height="82" rx="3" fill="#dedede" stroke="#1a1a1a" stroke-width="2" tb:tag="value-box-night"/><rect x="49" y="237" width="238" height="82" rx="3" fill="#dedede" stroke="#1a1a1a" stroke-width="2" tb:tag="value-box-peak"/><rect x="313" y="237" width="238" height="82" rx="3" fill="#dedede" stroke="#1a1a1a" stroke-width="2" tb:tag="value-box-export"/><text x="171.2998" y="58.286133" fill="#000000" font-family="Roboto, sans-serif" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="off-peak-label" xml:space="default"><tspan dominant-baseline="start">T1</tspan></text><text x="433.2998" y="58.734375" fill="#000000" font-family="Roboto, sans-serif" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="night-label"><tspan dominant-baseline="start">T2</tspan></text><text x="169.2998" y="214.23438" fill="#000000" font-family="Roboto, sans-serif" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="peak-label" xml:space="default"><tspan dominant-baseline="start">T3</tspan></text><text x="432.31152" y="213.78613" fill="#000000" font-family="Roboto, sans-serif" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="export-label" xml:space="default"><tspan dominant-baseline="start">Export</tspan></text><text x="169.45312" y="139.625" fill="#002878" font-family="Roboto, sans-serif" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="off-peak-rate" xml:space="default"><tspan dominant-baseline="start">000223</tspan></text><text x="433.45312" y="139.625" fill="#002878" font-family="Roboto, sans-serif" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="night-rate" xml:space="default"><tspan dominant-baseline="start">000223</tspan></text><text x="169.45312" y="295.625" fill="#002878" font-family="Roboto, sans-serif" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="peak-rate" xml:space="default"><tspan dominant-baseline="start">000223</tspan></text><text x="433.45312" y="295.625" fill="#002878" font-family="Roboto, sans-serif" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="export-rate" xml:space="default"><tspan dominant-baseline="start">000223</tspan></text><text x="299.89453" y="371.67578" fill="#000000" font-family="Roboto, sans-serif" font-size="36px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan dominant-baseline="start">kWh</tspan></text><path d="m201.8-2e-4s-201.8 0-201.8 67v328.36c0 2.6512 5.3727 4.6404 12 4.6404h576c6.627 0 12-1.9892 12-4.6404v-328.36c0-67-198.21-67-198.21-67h-101.79zm201.21 81.2c-3.8661 0-6.9999 1.2536-6.9999 2.8v300.4c0 1.5464 3.1341 2.8 6.9999 2.8h43.998c3.8661 0 6.9999-1.2536 6.9999-2.8v-300.4c0-1.5464-3.1341-2.8-6.9999-2.8z" fill-opacity="0" fill="#000" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
   <rect width="84" height="84" rx="4" fill="#fff" style=""/>
   <rect width="84" height="84" rx="4" style=""/>
   <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
diff --git a/application/src/main/data/json/system/scada_symbols/heat-pump-hp.svg b/application/src/main/data/json/system/scada_symbols/heat-pump-hp.svg
index b1e643698c..f8fab04123 100644
--- a/application/src/main/data/json/system/scada_symbols/heat-pump-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/heat-pump-hp.svg
@@ -489,7 +489,7 @@
   <rect x="1" y="1" width="798" height="542" rx="31" stroke="#000" stroke-opacity=".87" stroke-width="2"/>
   <rect x="80" y="72.001" width="180" height="128" rx="8"/>
   <rect x="81" y="73.001" width="178" height="126" rx="7" stroke="#000" stroke-opacity=".87" stroke-width="2" tb:tag="value-box-background"/>
-  <text x="170.51953" y="139.75" dominant-baseline="middle" fill="#002878" font-family="Roboto" font-size="40px" font-weight="500" text-anchor="middle" tb:tag="value-text" xml:space="preserve"><tspan>27</tspan></text>
+  <text x="170.51953" y="139.75" dominant-baseline="middle" fill="#002878" font-family="Roboto, sans-serif" font-size="40px" font-weight="500" text-anchor="middle" tb:tag="value-text" xml:space="preserve"><tspan>27</tspan></text>
   <ellipse cx="542" cy="284" rx="180" ry="180" fill="#fff"/>
   <path d="m720.5 284c0 98.583-79.918 178.5-178.5 178.5s-178.5-79.918-178.5-178.5 79.918-178.5 178.5-178.5 178.5 79.918 178.5 178.5z" stroke="#000" stroke-opacity=".12" stroke-width="2.9985"/>
   <g clip-path="url(#clip1_3215_7169)">
diff --git a/application/src/main/data/json/system/scada_symbols/horizontal-curcuit-breaker-hp.svg b/application/src/main/data/json/system/scada_symbols/horizontal-curcuit-breaker-hp.svg
index 17fd1ba69e..fc4456e377 100644
--- a/application/src/main/data/json/system/scada_symbols/horizontal-curcuit-breaker-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/horizontal-curcuit-breaker-hp.svg
@@ -423,7 +423,7 @@
 }]]></tb:metadata>
 <rect x="1" y="1" width="398" height="198" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><circle cx="49" cy="100" r="19" stroke="#1a1a1a" stroke-width="2"/><circle cx="351" cy="100" r="19" stroke="#1a1a1a" stroke-width="2"/><path d="m0 100h31" stroke="#1A1A1A" stroke-width="6"/><path d="m369 100h31" stroke="#1A1A1A" stroke-width="6"/><g tb:tag="breaker">
   <path d="m101 51h198v97c0 0.552-0.448 1-1 1h-196c-0.552 0-1-0.448-1-1v-97z" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="label-box"/>
-  <text x="200.83984" y="114.56055" fill="#000000" font-family="Roboto" font-size="40px" font-weight="400" text-anchor="middle" tb:tag="label" xml:space="preserve"><tspan dominant-baseline="start">ON</tspan></text>
+  <text x="200.83984" y="114.56055" fill="#000000" font-family="Roboto, sans-serif" font-size="40px" font-weight="400" text-anchor="middle" tb:tag="label" xml:space="preserve"><tspan dominant-baseline="start">ON</tspan></text>
   <rect x="261" y="25" width="38" height="150" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2" tb:tag="breaker-trigger"/>
  </g><g fill="#d12730" style="display: none;" tb:tag="critical">
   <rect width="84" height="84" rx="4" fill="#fff" style=""/>
diff --git a/application/src/main/data/json/system/scada_symbols/horizontal-energy-system-controller-hp.svg b/application/src/main/data/json/system/scada_symbols/horizontal-energy-system-controller-hp.svg
index 13ee85821b..7c125465b4 100644
--- a/application/src/main/data/json/system/scada_symbols/horizontal-energy-system-controller-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/horizontal-energy-system-controller-hp.svg
@@ -364,7 +364,7 @@
     }
   ]
 }]]></tb:metadata>
-<rect x="1" y="17" width="598" height="366" rx="5" fill="#fff" stroke="#000" stroke-opacity=".87" stroke-width="2" tb:tag="background"/><rect x="26" y="1" width="148" height="16" rx="1" fill="#999" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="26" y="383" width="148" height="16" rx="1" fill="#999" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="426" y="383" width="148" height="16" rx="1" fill="#999" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="226" y="1" width="148" height="16" rx="1" fill="#999" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="426" y="1" width="148" height="16" rx="1" fill="#999" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="66" cy="88" r="10" fill="#198038" tb:tag="indicator"/><text x="83.31543" y="91.589844" fill="#000000" font-family="Roboto" font-size="30px" font-weight="400" tb:tag="label" xml:space="preserve"><tspan dominant-baseline="middle">Connected</tspan></text><path d="m201.8 0s-201.8 0-201.8 67v328.36c0 2.6512 5.3727 4.6403 12 4.6403h576c6.627 0 12-1.9892 12-4.6403v-328.36c0-67-198.21-67-198.21-67h-101.79zm201.21 81.2c-3.8661 0-6.9999 1.2536-6.9999 2.8v300.4c0 1.5464 3.1341 2.8 6.9999 2.8h43.998c3.8661 0 6.9999-1.2536 6.9999-2.8v-300.4c0-1.5464-3.1341-2.8-6.9999-2.8z" fill-opacity="0" tb:tag="clickArea"/><g transform="translate(0,316)" fill="#d12730" style="display: none;" tb:tag="critical">
+<rect x="1" y="17" width="598" height="366" rx="5" fill="#fff" stroke="#000" stroke-opacity=".87" stroke-width="2" tb:tag="background"/><rect x="26" y="1" width="148" height="16" rx="1" fill="#999" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="26" y="383" width="148" height="16" rx="1" fill="#999" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="426" y="383" width="148" height="16" rx="1" fill="#999" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="226" y="1" width="148" height="16" rx="1" fill="#999" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="426" y="1" width="148" height="16" rx="1" fill="#999" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="66" cy="88" r="10" fill="#198038" tb:tag="indicator"/><text x="83.31543" y="91.589844" fill="#000000" font-family="Roboto, sans-serif" font-size="30px" font-weight="400" tb:tag="label" xml:space="preserve"><tspan dominant-baseline="middle">Connected</tspan></text><path d="m201.8 0s-201.8 0-201.8 67v328.36c0 2.6512 5.3727 4.6403 12 4.6403h576c6.627 0 12-1.9892 12-4.6403v-328.36c0-67-198.21-67-198.21-67h-101.79zm201.21 81.2c-3.8661 0-6.9999 1.2536-6.9999 2.8v300.4c0 1.5464 3.1341 2.8 6.9999 2.8h43.998c3.8661 0 6.9999-1.2536 6.9999-2.8v-300.4c0-1.5464-3.1341-2.8-6.9999-2.8z" fill-opacity="0" tb:tag="clickArea"/><g transform="translate(0,316)" fill="#d12730" style="display: none;" tb:tag="critical">
   <rect width="84" height="84" rx="4" fill="#fff" style=""/>
   <rect width="84" height="84" rx="4" style=""/>
   <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
diff --git a/application/src/main/data/json/system/scada_symbols/horizontal-tank.svg b/application/src/main/data/json/system/scada_symbols/horizontal-tank.svg
index c02da77258..99dde101de 100644
--- a/application/src/main/data/json/system/scada_symbols/horizontal-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/horizontal-tank.svg
@@ -572,7 +572,7 @@
  </mask><g filter="url(#filter0_ii_1694_158298)" tb:tag="value-box">
   <path d="m381 272c0-6.627 5.373-12 12-12h216c6.627 0 12 5.373 12 12v56c0 6.627-5.373 12-12 12h-216c-6.627 0-12-5.373-12-12v-56z" fill="#f3f3f3" tb:tag="value-box-background"/>
   <path d="m382.5 272c0-5.799 4.701-10.5 10.5-10.5h216c5.799 0 10.5 4.701 10.5 10.5v56c0 5.799-4.701 10.5-10.5 10.5h-216c-5.799 0-10.5-4.701-10.5-10.5v-56z" stroke="#727171" stroke-width="3"/>
-  <text x="499.84497" y="300.37811" fill="#727171" font-family="Roboto" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
+  <text x="499.84497" y="300.37811" fill="#727171" font-family="Roboto, sans-serif" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
  </g><g transform="matrix(1 0 0 .5 .64 .00025)">
   <path d="m335.68-5e-4s-336.32 0-336.32 201v985.08c0 7.9536 8.9543 13.921 20 13.921h960c11.045 0 20-5.9676 20-13.921v-985.08c0-201-330.35-201-330.35-201h-169.65zm335.35 243.6c-6.4433 0-11.667 3.7608-11.667 8.4v901.2c0 4.6392 5.2233 8.4 11.667 8.4h73.333c6.4433 0 11.667-3.7608 11.667-8.4v-901.2c0-4.6392-5.2233-8.4-11.667-8.4z" fill="#000" fill-opacity="0" tb:tag="clickArea"/>
  </g><defs>
diff --git a/application/src/main/data/json/system/scada_symbols/large-conical-tank.svg b/application/src/main/data/json/system/scada_symbols/large-conical-tank.svg
index 6789f8f7c9..ea9405da5f 100644
--- a/application/src/main/data/json/system/scada_symbols/large-conical-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/large-conical-tank.svg
@@ -268,7 +268,7 @@
  </g><g transform="translate(0,235)" filter="url(#filter0_ii_1694_158298)" tb:tag="value-box">
   <path d="m381 272c0-6.627 5.373-12 12-12h216c6.627 0 12 5.373 12 12v56c0 6.627-5.373 12-12 12h-216c-6.627 0-12-5.373-12-12z" fill="#f3f3f3" tb:tag="value-box-background"/>
   <path d="m382.5 272c0-5.799 4.701-10.5 10.5-10.5h216c5.799 0 10.5 4.701 10.5 10.5v56c0 5.799-4.701 10.5-10.5 10.5h-216c-5.799 0-10.5-4.701-10.5-10.5z" stroke="#727171" stroke-width="3"/>
-  <text x="500.74219" y="300.07812" fill="#727171" font-family="Roboto" font-size="32px" font-weight="500" text-anchor="middle" tb:tag="value-text" xml:space="preserve"><tspan dominant-baseline="middle">1660 gal</tspan></text>
+  <text x="500.74219" y="300.07812" fill="#727171" font-family="Roboto, sans-serif" font-size="32px" font-weight="500" text-anchor="middle" tb:tag="value-text" xml:space="preserve"><tspan dominant-baseline="middle">1660 gal</tspan></text>
  </g><ellipse cx="500" cy="16" rx="496" ry="16" fill="#5D5C5C"/><rect transform="rotate(-90 451.5 1398.5)" x="451.5" y="1398.5" width="11" height="97" rx="5.5" fill="#D9D9D9" stroke="#727171" stroke-width="3"/><g style="display: none;" tb:tag="stand">
   <rect x="107" y="1363" width="80" height="24" rx="7" fill="#fff" style=""/>
   <rect x="107" y="1363" width="80" height="24" rx="7" fill="url(#paint629_linear_2901_184330)" style=""/>
diff --git a/application/src/main/data/json/system/scada_symbols/large-cylindrical-tank.svg b/application/src/main/data/json/system/scada_symbols/large-cylindrical-tank.svg
index c9d9361d7d..73e31b4798 100644
--- a/application/src/main/data/json/system/scada_symbols/large-cylindrical-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/large-cylindrical-tank.svg
@@ -563,7 +563,7 @@
  </g><ellipse cx="504" cy="16" rx="496" ry="16" fill="#5D5C5C"/><g filter="url(#filter0_ii_2005_230043)" tb:tag="value-box">
   <path d="m380 487c0-6.627 5.373-12 12-12h216c6.627 0 12 5.373 12 12v56c0 6.627-5.373 12-12 12h-216c-6.627 0-12-5.373-12-12v-56z" fill="#f3f3f3" tb:tag="value-box-background"/>
   <path d="m381.5 487c0-5.799 4.701-10.5 10.5-10.5h216c5.799 0 10.5 4.701 10.5 10.5v56c0 5.799-4.701 10.5-10.5 10.5h-216c-5.799 0-10.5-4.701-10.5-10.5v-56z" stroke="#727171" stroke-width="3"/>
-  <text x="503.10281" y="518.07812" fill="#727171" font-family="Roboto" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
+  <text x="503.10281" y="518.07812" fill="#727171" font-family="Roboto, sans-serif" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
  </g><path d="m336.32-5e-4s-336.32 0-336.32 167.5v820.9c0 6.628 8.9543 11.601 20 11.601h960c11.045 0 20-4.973 20-11.601v-820.9c0-167.5-330.35-167.5-330.35-167.5h-169.65zm335.35 203c-6.4433 0-11.667 3.134-11.667 7v751c0 3.866 5.2233 7 11.667 7h73.333c6.4433 0 11.667-3.134 11.667-7v-751c0-3.866-5.2233-7-11.667-7z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><defs>
   <filter id="filter0_ii_2005_230043" x="376" y="471" width="248" height="88" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
    <feFlood flood-opacity="0" result="BackgroundImageFix"/>
diff --git a/application/src/main/data/json/system/scada_symbols/large-stand-cylindrical-tank.svg b/application/src/main/data/json/system/scada_symbols/large-stand-cylindrical-tank.svg
index 8e5c057209..f9af0f9c60 100644
--- a/application/src/main/data/json/system/scada_symbols/large-stand-cylindrical-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/large-stand-cylindrical-tank.svg
@@ -564,7 +564,7 @@
  </g><ellipse cx="504" cy="16" rx="496" ry="16" fill="#5D5C5C"/><g filter="url(#filter0_ii_2005_230043)" tb:tag="value-box">
   <path d="m380 487c0-6.627 5.373-12 12-12h216c6.627 0 12 5.373 12 12v56c0 6.627-5.373 12-12 12h-216c-6.627 0-12-5.373-12-12v-56z" fill="#f3f3f3" tb:tag="value-box-background"/>
   <path d="m381.5 487c0-5.799 4.701-10.5 10.5-10.5h216c5.799 0 10.5 4.701 10.5 10.5v56c0 5.799-4.701 10.5-10.5 10.5h-216c-5.799 0-10.5-4.701-10.5-10.5v-56z" stroke="#727171" stroke-width="3"/>
-  <text x="503.10281" y="518.07812" fill="#727171" font-family="Roboto" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
+  <text x="503.10281" y="518.07812" fill="#727171" font-family="Roboto, sans-serif" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
  </g><path d="m336.32-5e-4s-336.32 0-336.32 201v985.08c0 7.9536 8.9543 13.921 20 13.921h960c11.045 0 20-5.9676 20-13.921v-985.08c0-201-330.35-201-330.35-201h-169.65zm335.35 243.6c-6.4433 0-11.667 3.7608-11.667 8.4v901.2c0 4.6392 5.2233 8.4 11.667 8.4h73.333c6.4433 0 11.667-3.7608 11.667-8.4v-901.2c0-4.6392-5.2233-8.4-11.667-8.4z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><rect x="122" y="1163" width="80" height="24" rx="7" fill="#fff"/><rect x="122" y="1163" width="80" height="24" rx="7" fill="url(#paint245_linear_1702_237993)" style="fill:url(#paint245_linear_1702_237993)"/><rect x="123.5" y="1164.5" width="77" height="21" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect x="798" y="1163" width="80" height="24" rx="7" fill="#fff"/><rect x="798" y="1163" width="80" height="24" rx="7" fill="url(#paint246_linear_1702_237993)" style="fill:url(#paint246_linear_1702_237993)"/><rect x="799.5" y="1164.5" width="77" height="21" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect transform="rotate(10 168.69 996.46)" x="168.69" y="996.46" width="676" height="8" fill="#727171"/><rect transform="rotate(-10 158.11 1114.7)" x="158.11" y="1114.7" width="687.16" height="8" fill="#727171"/><path d="m146 1163v-169l32 1v168z" fill="#fff"/><path d="m146 1163v-169l32 1v168z" fill="url(#paint247_linear_1702_237993)" style="fill:url(#paint247_linear_1702_237993)"/><path d="m147.5 1161.5v-165.95l29 0.906v165.05z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m822 1163v-167l32-1v168z" fill="#fff"/><path d="m822 1163v-167l32-1v168z" fill="url(#paint248_linear_1702_237993)" style="fill:url(#paint248_linear_1702_237993)"/><path d="m823.5 1161.5v-164.05l29-0.906v164.95z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect transform="rotate(10 135.43 1006.5)" x="135.43" y="1006.5" width="751.02" height="12" fill="#838282"/><rect transform="rotate(-10 130.48 1136)" x="130.48" y="1136" width="748.07" height="12" fill="#838282"/><circle cx="870" cy="885" r="32" fill="url(#paint249_radial_1702_237993)" style="fill:url(#paint249_radial_1702_237993)"/><circle cx="870" cy="885" r="30.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><circle cx="130" cy="885" r="32" fill="url(#paint250_radial_1702_237993)" style="fill:url(#paint250_radial_1702_237993)"/><circle cx="130" cy="885" r="30.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m114 1171v-284c0-8.837 7.163-16 16-16s16 7.163 16 16v284z" fill="#fff"/><path d="m114 1171v-284c0-8.837 7.163-16 16-16s16 7.163 16 16v284z" fill="url(#paint251_linear_1702_237993)" style="fill:url(#paint251_linear_1702_237993)"/><path d="m115.5 1169.5v-282.5c0-8.008 6.492-14.5 14.5-14.5s14.5 6.492 14.5 14.5v282.5z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m854 1171v-284c0-8.837 7.163-16 16-16s16 7.163 16 16v284z" fill="#fff"/><path d="m854 1171v-284c0-8.837 7.163-16 16-16s16 7.163 16 16v284z" fill="url(#paint252_linear_1702_237993)" style="fill:url(#paint252_linear_1702_237993)"/><path d="m855.5 1169.5v-282.5c0-8.008 6.492-14.5 14.5-14.5s14.5 6.492 14.5 14.5v282.5z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect x="80" y="1171" width="100" height="29" rx="7" fill="#fff"/><rect x="80" y="1171" width="100" height="29" rx="7" fill="url(#paint253_linear_1702_237993)" style="fill:url(#paint253_linear_1702_237993)"/><rect x="81.5" y="1172.5" width="97" height="26" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect x="820" y="1171" width="100" height="29" rx="7" fill="#fff"/><rect x="820" y="1171" width="100" height="29" rx="7" fill="url(#paint254_linear_1702_237993)" style="fill:url(#paint254_linear_1702_237993)"/><rect x="821.5" y="1172.5" width="97" height="26" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><defs>
   <filter id="filter0_ii_2005_230043" x="376" y="471" width="248" height="88" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
    <feFlood flood-opacity="0" result="BackgroundImageFix"/>
diff --git a/application/src/main/data/json/system/scada_symbols/large-stand-vertical-tank.svg b/application/src/main/data/json/system/scada_symbols/large-stand-vertical-tank.svg
index 9b6763e0ea..508b83088a 100644
--- a/application/src/main/data/json/system/scada_symbols/large-stand-vertical-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/large-stand-vertical-tank.svg
@@ -564,7 +564,7 @@
  </g><g filter="url(#filter0_ii_1711_311697)" tb:tag="value-box">
   <path d="m380 60c0-6.6274 5.373-12 12-12h216c6.627 0 12 5.3726 12 12v56c0 6.627-5.373 12-12 12h-216c-6.627 0-12-5.373-12-12v-56z" fill="#f3f3f3" tb:tag="value-box-background"/>
   <path d="m381.5 60c0-5.799 4.701-10.5 10.5-10.5h216c5.799 0 10.5 4.701 10.5 10.5v56c0 5.799-4.701 10.5-10.5 10.5h-216c-5.799 0-10.5-4.701-10.5-10.5v-56z" stroke="#727171" stroke-width="3"/>
-  <text x="505" y="90" fill="#727171" font-family="Roboto" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
+  <text x="505" y="90" fill="#727171" font-family="Roboto, sans-serif" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
  </g><mask id="path-316-inside-2_1711_311697" fill="white">
   <path d="m7 181c-3.866 0-7-3.134-7-7s3.134-7 7-7h986c3.866 0 7 3.134 7 7s-3.134 7-7 7h-986z"/>
  </mask><path d="m7 181c-3.866 0-7-3.134-7-7s3.134-7 7-7h986c3.866 0 7 3.134 7 7s-3.134 7-7 7h-986z" fill="#D9D9D9"/><path d="m7 170h986v-6h-986v6zm986 8h-986v6h986v-6zm4-4c0 2.209-1.791 4-4 4v6c5.523 0 10-4.477 10-10h-6zm-4-4c2.209 0 4 1.791 4 4h6c0-5.523-4.477-10-10-10v6zm-990 4c0-2.209 1.7909-4 4-4v-6c-5.5228 0-10 4.477-10 10h6zm-6 0c0 5.523 4.4771 10 10 10v-6c-2.2091 0-4-1.791-4-4h-6z" fill="#727171" mask="url(#path-316-inside-2_1711_311697)"/><path d="m335.68-5e-4s-336.32 0-336.32 201v985.08c0 7.9536 8.9543 13.921 20 13.921h960c11.045 0 20-5.9676 20-13.921v-985.08c0-201-330.35-201-330.35-201h-169.65zm335.35 243.6c-6.4433 0-11.667 3.7608-11.667 8.4v901.2c0 4.6392 5.2233 8.4 11.667 8.4h73.333c6.4433 0 11.667-3.7608 11.667-8.4v-901.2c0-4.6392-5.2233-8.4-11.667-8.4z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><rect x="122" y="1163" width="80" height="24" rx="7" fill="#fff"/><rect x="122" y="1163" width="80" height="24" rx="7" fill="url(#paint245_linear_1711_311696)" style="fill:url(#paint245_linear_1711_311696)"/><rect x="123.5" y="1164.5" width="77" height="21" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect x="798" y="1163" width="80" height="24" rx="7" fill="#fff"/><rect x="798" y="1163" width="80" height="24" rx="7" fill="url(#paint246_linear_1711_311696)" style="fill:url(#paint246_linear_1711_311696)"/><rect x="799.5" y="1164.5" width="77" height="21" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect transform="rotate(10 168.69 996.46)" x="168.69" y="996.46" width="676" height="8" fill="#727171"/><rect transform="rotate(-10 158.11 1114.7)" x="158.11" y="1114.7" width="687.16" height="8" fill="#727171"/><path d="m146 1163v-169l32 1v168z" fill="#fff"/><path d="m146 1163v-169l32 1v168z" fill="url(#paint247_linear_1711_311696)" style="fill:url(#paint247_linear_1711_311696)"/><path d="m147.5 1161.5v-165.95l29 0.906v165.05z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m822 1163v-167l32-1v168z" fill="#fff"/><path d="m822 1163v-167l32-1v168z" fill="url(#paint248_linear_1711_311696)" style="fill:url(#paint248_linear_1711_311696)"/><path d="m823.5 1161.5v-164.05l29-0.906v164.95z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect transform="rotate(10 135.43 1006.5)" x="135.43" y="1006.5" width="751.02" height="12" fill="#838282"/><rect transform="rotate(-10 130.48 1136)" x="130.48" y="1136" width="748.07" height="12" fill="#838282"/><circle cx="870" cy="885" r="32" fill="url(#paint249_radial_1711_311696)" style="fill:url(#paint249_radial_1711_311696)"/><circle cx="870" cy="885" r="30.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><circle cx="130" cy="885" r="32" fill="url(#paint250_radial_1711_311696)" style="fill:url(#paint250_radial_1711_311696)"/><circle cx="130" cy="885" r="30.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m114 1171v-284c0-8.837 7.163-16 16-16s16 7.163 16 16v284z" fill="#fff"/><path d="m114 1171v-284c0-8.837 7.163-16 16-16s16 7.163 16 16v284z" fill="url(#paint251_linear_1711_311696)" style="fill:url(#paint251_linear_1711_311696)"/><path d="m115.5 1169.5v-282.5c0-8.008 6.492-14.5 14.5-14.5s14.5 6.492 14.5 14.5v282.5z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m854 1171v-284c0-8.837 7.163-16 16-16s16 7.163 16 16v284z" fill="#fff"/><path d="m854 1171v-284c0-8.837 7.163-16 16-16s16 7.163 16 16v284z" fill="url(#paint252_linear_1711_311696)" style="fill:url(#paint252_linear_1711_311696)"/><path d="m855.5 1169.5v-282.5c0-8.008 6.492-14.5 14.5-14.5s14.5 6.492 14.5 14.5v282.5z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect x="80" y="1171" width="100" height="29" rx="7" fill="#fff"/><rect x="80" y="1171" width="100" height="29" rx="7" fill="url(#paint253_linear_1711_311696)" style="fill:url(#paint253_linear_1711_311696)"/><rect x="81.5" y="1172.5" width="97" height="26" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect x="820" y="1171" width="100" height="29" rx="7" fill="#fff"/><rect x="820" y="1171" width="100" height="29" rx="7" fill="url(#paint254_linear_1711_311696)" style="fill:url(#paint254_linear_1711_311696)"/><rect x="821.5" y="1172.5" width="97" height="26" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><defs>
diff --git a/application/src/main/data/json/system/scada_symbols/large-vertical-tank.svg b/application/src/main/data/json/system/scada_symbols/large-vertical-tank.svg
index 75ff5ef979..d8283a8d29 100644
--- a/application/src/main/data/json/system/scada_symbols/large-vertical-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/large-vertical-tank.svg
@@ -563,7 +563,7 @@
  </g><g filter="url(#filter0_ii_1711_311697)" tb:tag="value-box">
   <path d="m380 60c0-6.6274 5.373-12 12-12h216c6.627 0 12 5.3726 12 12v56c0 6.627-5.373 12-12 12h-216c-6.627 0-12-5.373-12-12v-56z" fill="#f3f3f3" tb:tag="value-box-background"/>
   <path d="m381.5 60c0-5.799 4.701-10.5 10.5-10.5h216c5.799 0 10.5 4.701 10.5 10.5v56c0 5.799-4.701 10.5-10.5 10.5h-216c-5.799 0-10.5-4.701-10.5-10.5v-56z" stroke="#727171" stroke-width="3"/>
-  <text x="505" y="90" fill="#727171" font-family="Roboto" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
+  <text x="505" y="90" fill="#727171" font-family="Roboto, sans-serif" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
  </g><mask id="path-316-inside-2_1711_311697" fill="white">
   <path d="m7 181c-3.866 0-7-3.134-7-7s3.134-7 7-7h986c3.866 0 7 3.134 7 7s-3.134 7-7 7h-986z"/>
  </mask><path d="m7 181c-3.866 0-7-3.134-7-7s3.134-7 7-7h986c3.866 0 7 3.134 7 7s-3.134 7-7 7h-986z" fill="#D9D9D9"/><path d="m7 170h986v-6h-986v6zm986 8h-986v6h986v-6zm4-4c0 2.209-1.791 4-4 4v6c5.523 0 10-4.477 10-10h-6zm-4-4c2.209 0 4 1.791 4 4h6c0-5.523-4.477-10-10-10v6zm-990 4c0-2.209 1.7909-4 4-4v-6c-5.5228 0-10 4.477-10 10h6zm-6 0c0 5.523 4.4771 10 10 10v-6c-2.2091 0-4-1.791-4-4h-6z" fill="#727171" mask="url(#path-316-inside-2_1711_311697)"/><path d="m335.68-5e-4s-336.32 0-336.32 167.5v820.9c0 6.628 8.9543 11.601 20 11.601h960c11.045 0 20-4.973 20-11.601v-820.9c0-167.5-330.35-167.5-330.35-167.5h-169.65zm335.35 203c-6.4433 0-11.667 3.134-11.667 7v751c0 3.866 5.2233 7 11.667 7h73.333c6.4433 0 11.667-3.134 11.667-7v-751c0-3.866-5.2233-7-11.667-7z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><defs>
diff --git a/application/src/main/data/json/system/scada_symbols/left-analog-water-level-meter.svg b/application/src/main/data/json/system/scada_symbols/left-analog-water-level-meter.svg
index 2cdc9e587a..89c8b64a08 100644
--- a/application/src/main/data/json/system/scada_symbols/left-analog-water-level-meter.svg
+++ b/application/src/main/data/json/system/scada_symbols/left-analog-water-level-meter.svg
@@ -679,7 +679,7 @@
 }]]></tb:metadata>
 <mask id="path-1-inside-1_2109_178192" fill="white">
   <path d="m164 100c0 45.287-36.713 82-82 82s-82-36.713-82-82 36.713-82 82-82 82 36.713 82 82zm-154.16 0c0 39.855 32.309 72.164 72.164 72.164s72.164-32.309 72.164-72.164-32.309-72.164-72.164-72.164-72.164 32.309-72.164 72.164z"/>
- </mask><path d="m164 100c0 45.287-36.713 82-82 82s-82-36.713-82-82 36.713-82 82-82 82 36.713 82 82zm-154.16 0c0 39.855 32.309 72.164 72.164 72.164s72.164-32.309 72.164-72.164-32.309-72.164-72.164-72.164-72.164 32.309-72.164 72.164z" fill="#1C943E" mask="url(#path-1-inside-1_2109_178192)" stroke="#727171" stroke-width="6" tb:tag="border"/><circle cx="82" cy="100" r="72.16" fill="#fff" tb:tag="background"/><text x="73.014542" y="138.46992" fill="#727272" font-family="Roboto" font-size="14px" font-weight="500" tb:tag="label" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">Water</tspan></text><g transform="translate(107.49 137.34)" tb:tag="icon">
+ </mask><path d="m164 100c0 45.287-36.713 82-82 82s-82-36.713-82-82 36.713-82 82-82 82 36.713 82 82zm-154.16 0c0 39.855 32.309 72.164 72.164 72.164s72.164-32.309 72.164-72.164-32.309-72.164-72.164-72.164-72.164 32.309-72.164 72.164z" fill="#1C943E" mask="url(#path-1-inside-1_2109_178192)" stroke="#727171" stroke-width="6" tb:tag="border"/><circle cx="82" cy="100" r="72.16" fill="#fff" tb:tag="background"/><text x="73.014542" y="138.46992" fill="#727272" font-family="Roboto, sans-serif" font-size="14px" font-weight="500" tb:tag="label" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">Water</tspan></text><g transform="translate(107.49 137.34)" tb:tag="icon">
   <path d="m-4.003-2c0.942 0 1.44-0.498 1.804-0.862 0.326-0.327 0.487-0.472 0.861-0.472s0.535 0.145 0.861 0.472c0.364 0.364 0.862 0.862 1.804 0.862 0.944 0 1.442-0.498 1.807-0.862 0.327-0.327 0.488-0.472 0.863-0.472 0.376 0 0.536 0.145 0.864 0.472 0.364 0.364 0.862 0.862 1.806 0.862v-1.334c-0.376 0-0.536-0.144-0.864-0.471-0.364-0.364-0.862-0.862-1.806-0.862-0.943 0-1.441 0.498-1.806 0.861-0.327 0.328-0.487 0.472-0.864 0.472-0.374 0-0.534-0.144-0.861-0.471-0.363-0.364-0.861-0.862-1.804-0.862s-1.441 0.498-1.804 0.862c-0.327 0.327-0.487 0.471-0.861 0.471s-0.534-0.144-0.86-0.471c-0.364-0.364-0.862-0.862-1.804-0.862v1.333c0.374 0 0.534 0.145 0.861 0.472 0.363 0.364 0.861 0.862 1.803 0.862zm0 3.333c0.942 0 1.44-0.498 1.804-0.862 0.326-0.327 0.487-0.471 0.861-0.471s0.535 0.144 0.861 0.471c0.364 0.364 0.862 0.862 1.804 0.862 0.944 0 1.442-0.498 1.807-0.862 0.327-0.327 0.488-0.471 0.863-0.471 0.376 0 0.536 0.144 0.864 0.471 0.364 0.364 0.862 0.862 1.806 0.862v-1.333c-0.376 0-0.536-0.145-0.864-0.472-0.364-0.364-0.862-0.862-1.806-0.862-0.943 0-1.441 0.498-1.806 0.862-0.327 0.327-0.487 0.472-0.864 0.472-0.374 0-0.534-0.145-0.861-0.472-0.363-0.364-0.861-0.862-1.804-0.862s-1.441 0.498-1.804 0.862c-0.327 0.327-0.487 0.472-0.861 0.472s-0.534-0.145-0.86-0.472c-0.364-0.364-0.862-0.862-1.804-0.862v1.334c0.374 0 0.534 0.144 0.861 0.471 0.363 0.364 0.861 0.862 1.803 0.862zm0 3.333c0.942 0 1.44-0.498 1.804-0.862 0.326-0.326 0.487-0.471 0.861-0.471s0.535 0.145 0.861 0.471c0.364 0.364 0.862 0.862 1.804 0.862 0.944 0 1.442-0.498 1.807-0.862 0.327-0.326 0.488-0.471 0.863-0.471 0.376 0 0.536 0.145 0.864 0.471 0.364 0.364 0.862 0.862 1.806 0.862v-1.333c-0.376 0-0.536-0.145-0.864-0.471-0.364-0.364-0.862-0.862-1.806-0.862-0.943 0-1.441 0.498-1.806 0.861-0.327 0.327-0.487 0.472-0.864 0.472-0.374 0-0.534-0.145-0.861-0.471-0.363-0.364-0.861-0.862-1.804-0.862s-1.441 0.498-1.804 0.862c-0.327 0.326-0.487 0.471-0.861 0.471s-0.534-0.145-0.86-0.471c-0.364-0.364-0.862-0.862-1.804-0.862v1.333c0.374 0 0.534 0.145 0.861 0.471 0.363 0.364 0.861 0.862 1.803 0.862z" fill="#000000" fill-opacity=".54"/>
  </g><path d="m47.56 104.72v2.285h-7.5683v-2.285h7.5683zm-6.6113-11.934v14.219h-2.9297v-14.219h2.9297zm5.625 5.7911v2.2267h-6.582v-2.2267h6.582zm0.9766-5.7911v2.295h-7.5586v-2.295h7.5586z" fill="#000" fill-opacity=".54"/><path d="m122.22 92.781v14.219h-2.93v-14.219h2.93zm5.664 6.0743v2.2855h-6.465v-2.2855h6.465zm0.683-6.0743v2.295h-7.148v-2.295h7.148z" fill="#000" fill-opacity=".54"/><path d="m74.941 57.752v14.248h-2.8125v-11.006l-3.3789 1.0743v-2.2168l5.8887-2.0996h0.3027zm11.07 0.0292-5.2148 15.44h-2.0899l5.2149-15.44h2.0898zm11.207 12.022v2.1973h-9.7266v-1.875l4.5996-4.9316c0.4622-0.5144 0.8268-0.9668 1.0937-1.3575 0.267-0.3971 0.459-0.7519 0.5762-1.0644 0.1237-0.319 0.1856-0.6218 0.1856-0.9082 0-0.4297-0.0716-0.7975-0.2149-1.1035-0.1432-0.3125-0.3548-0.5534-0.6347-0.7227-0.2735-0.1693-0.612-0.2539-1.0157-0.2539-0.4297 0-0.8008 0.1042-1.1132 0.3125-0.306 0.2083-0.5404 0.4981-0.7032 0.8691-0.1562 0.3711-0.2344 0.7911-0.2344 1.2598h-2.8222c0-0.8463 0.2018-1.6211 0.6055-2.3242 0.4036-0.7096 0.9733-1.2728 1.7089-1.6895 0.7357-0.4231 1.6081-0.6347 2.6172-0.6347 0.9961 0 1.836 0.1627 2.5196 0.4883 0.6901 0.319 1.2109 0.7812 1.5625 1.3867 0.358 0.5989 0.5371 1.3151 0.5371 2.1484 0 0.4688-0.0749 0.9277-0.2246 1.377-0.1498 0.4427-0.3646 0.8854-0.6446 1.3281-0.2734 0.4362-0.6054 0.8789-0.9961 1.3281-0.3906 0.4492-0.8235 0.9147-1.2988 1.3965l-2.4707 2.7734h6.0938z" fill="#000" fill-opacity=".54"/><path d="m46.03 47.681 3.0894 4.577c0.1181-0.0797 0.2364-0.159 0.3549-0.2377l-3.0552-4.5982c-0.13 0.0858-0.2597 0.1721-0.3891 0.2589z" fill="#636363"/><path d="m49.607 45.448 2.7755 4.7603c0.1236-0.0721 0.2474-0.1437 0.3715-0.2148l-2.7399-4.7795c-0.136 0.0776-0.2717 0.1556-0.4071 0.234z" fill="#636363"/><path d="m53.324 43.454 2.4512 4.9242c0.1279-0.0636 0.2559-0.1267 0.3841-0.1894l-2.4147-4.9412c-0.1405 0.0683-0.2807 0.1371-0.4206 0.2064z" fill="#636363"/><path d="m57.161 41.707 2.1187 5.0681c0.1315-0.055 0.2633-0.1095 0.3952-0.1635l-2.0813-5.0829c-0.1444 0.0589-0.2886 0.1183-0.4326 0.1783z" fill="#636363"/><path d="m61.103 40.215 1.7791 5.1914c0.1352-0.0464 0.2706-0.0922 0.4062-0.1376l-1.7409-5.2037c-0.1483 0.0494-0.2964 0.0994-0.4444 0.1499z" fill="#636363"/><path d="m65.136 38.984 1.4335 5.2928c0.1379-0.0374 0.2759-0.0742 0.414-0.1105l-1.3949-5.3027c-0.151 0.0396-0.3019 0.0797-0.4526 0.1204z" fill="#636363"/><path d="m69.239 38.02 1.0837 5.3715c0.14-0.0282 0.28-0.056 0.4202-0.0832l-1.0447-5.3788c-0.1531 0.0296-0.3062 0.0597-0.4592 0.0905z" fill="#636363"/><path d="m73.396 37.325 0.7305 5.4268c0.1417-0.019 0.2835-0.0376 0.4253-0.0556l-0.6912-5.4316c-0.1549 0.0196-0.3098 0.0397-0.4646 0.0604z" fill="#636363"/><path d="m77.59 36.904 0.3754 5.458c0.1426-0.0098 0.2853-0.0191 0.4279-0.0279l-0.3359-5.46c-0.1558 0.0094-0.3116 0.0193-0.4674 0.0299z" fill="#636363"/><path d="m146.38 100.92c1e-3 0.156 1e-3 0.312 1e-3 0.468l-5.419-0.019c1e-3 -0.086 1e-3 -0.172 1e-3 -0.258 0-0.057 0-0.114-1e-3 -0.171l5.418-0.02z" fill="#636363"/><path d="m146.26 97.176-5.403 0.3324c-9e-3 -0.1426-0.018-0.2853-0.028-0.4278l5.4-0.3715c0.011 0.1556 0.022 0.3112 0.031 0.4669z" fill="#636363"/><path d="m145.79 92.52c0.021 0.1546 0.042 0.3093 0.062 0.464l-5.365 0.6827c-0.018-0.1418-0.037-0.2836-0.056-0.4253l5.359-0.7214z" fill="#636363"/><path d="m145.09 88.369c0.031 0.1528 0.061 0.3056 0.091 0.4585l-5.303 1.0299c-0.016-0.0819-0.032-0.1637-0.048-0.2455l-0.035-0.1747 5.295-1.0682z" fill="#636363"/><path d="m144.12 84.274c0.041 0.1504 0.081 0.301 0.121 0.4518l-5.218 1.3726c-0.037-0.1381-0.073-0.2761-0.111-0.4139l5.208-1.4105z" fill="#636363"/><path d="m142.88 80.25c0.051 0.1476 0.101 0.2954 0.151 0.4433l-5.112 1.7102c-0.045-0.1356-0.091-0.271-0.137-0.4062l5.098-1.7473z" fill="#636363"/><path d="m141.38 76.317c0.06 0.1436 0.12 0.2874 0.179 0.4315l-4.985 2.0411c-0.054-0.1319-0.108-0.2636-0.163-0.3952l4.969-2.0774z" fill="#636363"/><path d="m139.63 72.49c0.07 0.1395 0.139 0.2793 0.207 0.4194l-4.838 2.3643c-0.036-0.0724-0.071-0.1447-0.107-0.2169-9e-3 -0.0184-0.018-0.0368-0.027-0.0551-0.018-0.0374-0.037-0.0747-0.056-0.1121l4.821-2.3996z" fill="#636363"/><path d="m137.63 68.785c0.078 0.135 0.157 0.2703 0.234 0.4059l-4.673 2.6788c-0.03-0.0536-0.061-0.1071-0.092-0.1606-0.041-0.0704-0.081-0.1407-0.122-0.2109l4.653-2.7132z" fill="#636363"/><path d="m135.4 65.219c0.087 0.129 0.173 0.2582 0.259 0.3879l-4.489 2.9828c-0.079-0.1185-0.158-0.2368-0.238-0.3549l4.468-3.0158z" fill="#636363"/><path d="m132.93 61.806c0.096 0.1233 0.191 0.247 0.285 0.371l-4.289 3.2743c-0.086-0.1134-0.174-0.2265-0.261-0.3395l4.265-3.3058z" fill="#636363"/><path d="m130.25 58.56c0.104 0.1172 0.207 0.2348 0.309 0.3527l-4.071 3.551c-0.094-0.1079-0.188-0.2156-0.283-0.323l4.045-3.5807z" fill="#636363"/><path d="m127.36 55.493c0.068 0.0684 0.137 0.1369 0.206 0.2057 0.042 0.0423 0.084 0.0846 0.126 0.1271l-3.837 3.8093c-0.025-0.0258-0.051-0.0516-0.077-0.0774-0.025-0.0252-0.05-0.0503-0.075-0.0755-0.051-0.0509-0.102-0.1017-0.153-0.1524l3.81-3.8368z" fill="#636363"/><path d="m124.28 52.622c0.117 0.1027 0.235 0.2058 0.352 0.3094l-3.583 4.0489c-0.108-0.095-0.215-0.1896-0.323-0.2838l3.554-4.0745z" fill="#636363"/><path d="m121.02 49.961c0.124 0.0945 0.248 0.1895 0.371 0.2849l-3.311 4.2721c-0.113-0.0876-0.226-0.1746-0.34-0.2612l3.28-4.2958z" fill="#636363"/><path d="m117.59 47.52c0.129 0.0861 0.259 0.1726 0.387 0.2595l-3.022 4.4785c-0.118-0.0797-0.237-0.159-0.355-0.2377l2.99-4.5003z" fill="#636363"/><path d="m114 45.306c0.136 0.0778 0.271 0.156 0.406 0.2348l-2.722 4.6677c-0.052-0.0306-0.105-0.0611-0.157-0.0915-0.071-0.0413-0.143-0.0824-0.214-0.1233l2.687-4.6877z" fill="#636363"/><path d="m110.29 43.331c0.14 0.0687 0.28 0.1378 0.419 0.2074l-2.409 4.8393c-0.128-0.0636-0.256-0.1267-0.384-0.1894l2.374-4.8573z" fill="#636363"/><path d="m106.45 41.604c0.022 0.0091 0.045 0.0182 0.067 0.0273 0.122 0.0503 0.243 0.101 0.365 0.152l-2.087 4.9924c-0.132-0.0551-0.263-0.1095-0.395-0.1636l2.05-5.0081z" fill="#636363"/><path d="m102.5 40.13c0.148 0.0499 0.296 0.1002 0.443 0.1512l-1.756 5.1259c-0.135-0.0464-0.271-0.0922-0.406-0.1376l1.719-5.1395z" fill="#636363"/><path d="m98.47 38.916c0.1507 0.04 0.3014 0.0806 0.4519 0.1217l-1.419 5.2389c-0.1379-0.0373-0.2759-0.0742-0.414-0.1105l1.3811-5.2501z" fill="#636363"/><path d="m94.366 37.969c0.153 0.0301 0.3059 0.0607 0.4587 0.0919l-1.0754 5.3301c-0.1399-0.0282-0.28-0.056-0.4201-0.0832l1.0368-5.3388z" fill="#636363"/><path d="m90.208 37.292c0.1548 0.0201 0.3096 0.0407 0.4642 0.0619l-0.7267 5.3985c-0.1417-0.019-0.2834-0.0376-0.4252-0.0556l0.6877-5.4048z" fill="#636363"/><path d="m86.481 36.919-0.3744 5.4434c-0.1426-0.0098-0.2852-0.0191-0.4279-0.0279l0.3351-5.4469c0.1558 0.0099 0.3115 0.0204 0.4672 0.0314z" fill="#636363"/><path d="m82.27 36.759-0.0198 5.464c-0.1429-5e-4 -0.2859-5e-4 -0.4288 0l-0.0197-5.4648c0.1561-3e-4 0.3122 0 0.4683 8e-4z" fill="#636363"/><path d="m42.984 49.866c-0.1241 0.0947-0.2478 0.1899-0.3713 0.2856l3.3842 4.3667c0.1129-0.0876 0.2261-0.1746 0.3395-0.2612l-3.3524-4.3911z" fill="#636363"/><path d="m39.717 52.534c-0.118 0.1029-0.2356 0.2063-0.353 0.3102l3.6614 4.137c0.1074-0.095 0.215-0.1896 0.323-0.2838l-3.6314-4.1634z" fill="#636363"/><path d="m36.628 55.409c-0.0558 0.0554-0.1114 0.1108-0.167 0.1664-0.0555 0.0555-0.111 0.1112-0.1663 0.1669l3.9204 3.8924c0.0507-0.051 0.1015-0.102 0.1524-0.1529s0.1019-0.1017 0.1529-0.1523l-3.8924-3.9205z" fill="#636363"/><path d="m33.729 58.479c-0.1039 0.1174-0.2073 0.235-0.3102 0.353l4.1634 3.6314c0.0942-0.1079 0.1888-0.2156 0.2838-0.323l-4.137-3.6614z" fill="#636363"/><path d="m31.037 61.728c-0.0957 0.1235-0.1909 0.2473-0.2856 0.3713l4.3911 3.3524c0.0866-0.1134 0.1736-0.2266 0.2612-0.3395l-4.3667-3.3842z" fill="#636363"/><path d="m28.564 65.144c-0.0872 0.1292-0.1739 0.2587-0.2601 0.3884l4.6015 3.0573c0.0787-0.1185 0.158-0.2368 0.2377-0.3549l-4.5791-3.0908z" fill="#636363"/><path d="m26.321 68.715c-0.0789 0.1353-0.1572 0.2708-0.2351 0.4066l4.7929 2.7476c0.0711-0.1241 0.1427-0.2479 0.2148-0.3715l-4.7726-2.7827z" fill="#636363"/><path d="m24.317 72.428c-0.0696 0.1399-0.1387 0.2801-0.2073 0.4204l4.9636 2.4256c0.0627-0.1282 0.1258-0.2562 0.1894-0.3841l-4.9457-2.4619z" fill="#636363"/><path d="m22.563 76.264c-0.0602 0.144-0.1198 0.2882-0.1789 0.4325l5.1125 2.0935c0.054-0.1319 0.1085-0.2637 0.1635-0.3952l-5.0971-2.1308z" fill="#636363"/><path d="m21.065 80.206c-0.0507 0.148-0.1008 0.2961-0.1504 0.4444l5.2391 1.7528c0.0454-0.1356 0.0912-0.271 0.1376-0.4062l-5.2263-1.791z" fill="#636363"/><path d="m19.83 84.24c-0.0409 0.1508-0.0812 0.3018-0.1209 0.4529l5.3428 1.4054c0.0363-0.1381 0.0731-0.2761 0.1105-0.414l-5.3324-1.4443z" fill="#636363"/><path d="m18.861 88.345c-0.0309 0.1531-0.0612 0.3063-0.0909 0.4595l5.4232 1.0533c0.0272-0.1402 0.0549-0.2802 0.0832-0.4202l-5.4155-1.0926z" fill="#636363"/><path d="m18.162 92.505c-0.0208 0.1549-0.0411 0.3099-0.0608 0.4649l5.4803 0.6974c0.0181-0.1418 0.0366-0.2836 0.0557-0.4253l-5.4752-0.737z" fill="#636363"/><path d="m17.736 96.701c-0.0107 0.1559-0.0208 0.3118-0.0304 0.4678l5.5141 0.3392c0.0088-0.1426 0.0181-0.2853 0.0279-0.4279l-5.5116-0.3791z" fill="#636363"/><path d="m17.583 100.92c-5e-4 0.156-5e-4 0.312 0 0.468l5.5246-0.019c-6e-4 -0.143-6e-4 -0.286 0-0.429l-5.5246-0.02z" fill="#636363"/><path d="m146.38 100.68c2e-3 0.276 3e-3 0.552 1e-3 0.828l-10.942-0.051c1e-3 -0.232 1e-3 -0.465-1e-3 -0.698l10.942-0.079z" fill="#636363"/><path d="m127.19 55.328c0.093 0.0916 0.185 0.1835 0.278 0.2757 0.128 0.1285 0.256 0.2575 0.384 0.387l-7.783 7.6729c-0.091-0.0926-0.183-0.1849-0.275-0.2771-0.092-0.0921-0.185-0.1838-0.277-0.275l7.673-7.7835z" fill="#636363"/><path d="m81.569 36.76c0.3111-0.0017 0.622-0.0012 0.9328 0.0016l-0.079 10.985c-0.2582-0.0018-0.5165-0.0018-0.7747 0l-0.0791-10.987z" fill="#636363"/><path d="m28.476 100.76c-0.0021 0.259-0.0024 0.518-9e-4 0.777l-10.892 0.078c-0.0022-0.311-0.0022-0.622 0-0.933l10.892 0.078z" fill="#636363"/><path d="m44.494 63.055c-0.186 0.1825-0.3707 0.3664-0.5542 0.5518l-7.8099-7.6994c0.1097-0.1113 0.2199-0.2223 0.3306-0.333 0.1106-0.1107 0.2216-0.2209 0.3329-0.3306l7.7006 7.8112z" fill="#636363"/><path d="m146.49 101.48c0.085-16.605-6.208-33.236-18.877-45.906-25.17-25.171-65.98-25.171-91.151 0-3.4777 3.4776-6.4748 7.2538-8.9915 11.246-1.9761 3.186-3.6752 6.5459-5.0739 10.044-3.1689 7.9254-4.7321 16.401-4.5989 24.936l0.7563-0.012c-0.1644-16.46 6.0328-32.971 18.592-45.53 24.793-24.793 64.99-24.793 89.783 0 12.478 12.478 18.676 28.858 18.594 45.212l0.967 0.01z" fill="#636363"/><g transform="rotate(45,82,100)" tb:tag="pointer">
   <circle cx="82" cy="100" r="50" fill="#fff" fill-opacity=".01"/>
diff --git a/application/src/main/data/json/system/scada_symbols/left-heat-pump.svg b/application/src/main/data/json/system/scada_symbols/left-heat-pump.svg
index 6232f3dda3..f7f45f50fd 100644
--- a/application/src/main/data/json/system/scada_symbols/left-heat-pump.svg
+++ b/application/src/main/data/json/system/scada_symbols/left-heat-pump.svg
@@ -584,7 +584,7 @@
  </g><g filter="url(#filter2_ii_1826_356092)">
   <path d="m124 82c0-6.6274 5.373-12 12-12h157c6.627 0 12 5.3726 12 12v56c0 6.627-5.373 12-12 12h-157c-6.627 0-12-5.373-12-12z" fill="#fff" tb:tag="value-box-background"/>
   <path d="m125 82c0-6.0751 4.925-11 11-11h157c6.075 0 11 4.9249 11 11v56c0 6.075-4.925 11-11 11h-157c-6.075 0-11-4.925-11-11z" stroke="#fff" stroke-width="2"/>
-  <text x="214.69531" y="113.5625" fill="#000000" font-family="Roboto" font-size="40px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">27</tspan></text>
+  <text x="214.69531" y="113.5625" fill="#000000" font-family="Roboto, sans-serif" font-size="40px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">27</tspan></text>
  </g><circle cx="530" cy="280.2" r="180" fill="#b6b4b4"/><circle cx="530" cy="280.2" r="180" fill="url(#paint34_radial_1826_356092)" style="fill:url(#paint34_radial_1826_356092)"/><circle cx="530" cy="280.2" r="178.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><g transform="translate(349.75 99.867)" tb:tag="fan">
   <circle cx="180" cy="180.2" r="180" fill="#b6b4b4"/>
   <circle cx="180" cy="180.2" r="178.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/>
diff --git a/application/src/main/data/json/system/scada_symbols/meter.svg b/application/src/main/data/json/system/scada_symbols/meter.svg
index 6fdd27d2fa..f426e49747 100644
--- a/application/src/main/data/json/system/scada_symbols/meter.svg
+++ b/application/src/main/data/json/system/scada_symbols/meter.svg
@@ -720,7 +720,7 @@
  </g><g filter="url(#filter0_ii_2475_365165)" tb:tag="value-box">
   <rect x="21.5" y="362" width="56" height="30" rx="4" fill="#f3f3f3" fill-opacity=".75" tb:tag="value-box-background"/>
   <rect x="22.5" y="363" width="54" height="28" rx="3" stroke="#fff" stroke-width="2"/>
-  <text x="50.492188" y="378.0625" fill="#727171" font-family="Roboto" font-size="14px" font-weight="500" text-anchor="middle" tb:tag="value-text" xml:space="preserve"><tspan dominant-baseline="middle">37%</tspan></text>
+  <text x="50.492188" y="378.0625" fill="#727171" font-family="Roboto, sans-serif" font-size="14px" font-weight="500" text-anchor="middle" tb:tag="value-text" xml:space="preserve"><tspan dominant-baseline="middle">37%</tspan></text>
  </g><path d="m37.56 0s-25.56 0-25.56 67v328.36c0 2.6512 0.68053 4.6404 1.52 4.6404h72.96c0.83942 0 1.52-1.9892 1.52-4.6404v-328.36c0-67-25.107-67-25.107-67h-12.893zm25.487 81.2c-0.48969 0-0.88669 1.2536-0.88669 2.8v300.4c0 1.5464 0.39697 2.8 0.88669 2.8h5.5733c0.48969 0 0.88669-1.2536 0.88669-2.8v-300.4c0-1.5464-0.39697-2.8-0.88669-2.8z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><defs>
   <filter id="filter0_ii_2475_365165" x="19.5" y="360" width="60" height="34" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
    <feFlood flood-opacity="0" result="BackgroundImageFix"/>
diff --git a/application/src/main/data/json/system/scada_symbols/pool.svg b/application/src/main/data/json/system/scada_symbols/pool.svg
index 75f21e9457..b6f03a7b6d 100644
--- a/application/src/main/data/json/system/scada_symbols/pool.svg
+++ b/application/src/main/data/json/system/scada_symbols/pool.svg
@@ -232,7 +232,7 @@
  </g><g filter="url(#filter0_ii_2028_445065)" tb:tag="value-box">
   <path d="m1076 372.19c0-8.9433 6.8853-16.194 15.378-16.194h276.79c8.4922 0 15.377 7.251 15.377 16.194v75.573c0 8.9433-6.8852 16.194-15.377 16.194h-276.79c-8.4922 0-15.378-7.251-15.378-16.194z" fill="#f3f3f3" tb:tag="value-box-background"/>
   <path d="m1078 372.16c0-7.8336 6.0222-14.184 13.451-14.184h276.7c7.4286 0 13.451 6.3503 13.451 14.184v75.647c0 7.8336-6.0221 14.184-13.451 14.184h-276.7c-7.4285 0-13.451-6.3503-13.451-14.184z" stroke="#727171" stroke-width="3.9464"/>
-  <text x="1235.9021" y="410.52652" fill="#727171" font-family="Roboto" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
+  <text x="1235.9021" y="410.52652" fill="#727171" font-family="Roboto, sans-serif" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
  </g><path d="m2388 0c6.63 0 12 5.3726 12 12v15c0 6.6274-5.37 12-12 12h-2376c-6.6274 0-12-5.3726-12-12v-15c0-6.6274 5.3726-12 12-12h2376z" fill="#647484"/><path d="m2388 0c6.63 0 12 5.3726 12 12v15c0 6.6274-5.37 12-12 12h-2376c-6.6274 0-12-5.3726-12-12v-15c0-6.6274 5.3726-12 12-12h2376z" fill="url(#paint1846_linear_2028_445065)"/><path d="m2388 2c5.52 0 10 4.4772 10 10v15c0 5.5229-4.48 10-10 10h-2376c-5.523 0-10-4.4772-10-10v-15c0-5.5228 4.477-10 10-10h2376z" stroke="#000" stroke-opacity=".12" stroke-width="4"/><path d="m807.17 0s-807.17 0-807.17 134v656.72c0 5.3024 21.49 9.2807 48 9.2807h2304c26.508 0 48-3.9784 48-9.2807v-656.72c0-134-792.84-134-792.84-134h-407.16zm804.84 162.4c-15.464 0-28.001 2.5072-28.001 5.6v600.8c0 3.0928 12.536 5.6 28.001 5.6h176c15.464 0 28.001-2.5072 28.001-5.6v-600.8c0-3.0928-12.536-5.6-28.001-5.6z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><defs>
   <filter id="filter0_ii_2028_445065" x="1076" y="356" width="308" height="108" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
    <feFlood flood-opacity="0" result="BackgroundImageFix"/>
diff --git a/application/src/main/data/json/system/scada_symbols/right-analog-water-level-meter.svg b/application/src/main/data/json/system/scada_symbols/right-analog-water-level-meter.svg
index 1b1be4f007..a66f39715b 100644
--- a/application/src/main/data/json/system/scada_symbols/right-analog-water-level-meter.svg
+++ b/application/src/main/data/json/system/scada_symbols/right-analog-water-level-meter.svg
@@ -679,7 +679,7 @@
 }]]></tb:metadata>
 <mask id="path-1-inside-1_2089_217152" fill="white">
   <path d="m200 100c0 45.287-36.713 82-82 82s-82-36.713-82-82 36.713-82 82-82 82 36.713 82 82zm-154.16 0c0 39.855 32.309 72.164 72.164 72.164s72.164-32.309 72.164-72.164-32.309-72.164-72.164-72.164-72.164 32.309-72.164 72.164z"/>
- </mask><path d="m200 100c0 45.287-36.713 82-82 82s-82-36.713-82-82 36.713-82 82-82 82 36.713 82 82zm-154.16 0c0 39.855 32.309 72.164 72.164 72.164s72.164-32.309 72.164-72.164-32.309-72.164-72.164-72.164-72.164 32.309-72.164 72.164z" fill="#1C943E" mask="url(#path-1-inside-1_2089_217152)" stroke="#727171" stroke-width="6" tb:tag="border"/><circle cx="118" cy="100" r="72.16" fill="#fff" tb:tag="background"/><text x="109.52754" y="137.37793" fill="#727272" font-family="Roboto" font-size="14px" font-weight="500" tb:tag="label" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">Water</tspan></text><g transform="translate(143.49 136.34)" tb:tag="icon">
+ </mask><path d="m200 100c0 45.287-36.713 82-82 82s-82-36.713-82-82 36.713-82 82-82 82 36.713 82 82zm-154.16 0c0 39.855 32.309 72.164 72.164 72.164s72.164-32.309 72.164-72.164-32.309-72.164-72.164-72.164-72.164 32.309-72.164 72.164z" fill="#1C943E" mask="url(#path-1-inside-1_2089_217152)" stroke="#727171" stroke-width="6" tb:tag="border"/><circle cx="118" cy="100" r="72.16" fill="#fff" tb:tag="background"/><text x="109.52754" y="137.37793" fill="#727272" font-family="Roboto, sans-serif" font-size="14px" font-weight="500" tb:tag="label" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">Water</tspan></text><g transform="translate(143.49 136.34)" tb:tag="icon">
   <path d="m-4.003-1.168c0.942 0 1.44-0.498 1.804-0.862 0.326-0.327 0.487-0.472 0.861-0.472s0.535 0.145 0.861 0.472c0.364 0.364 0.862 0.862 1.804 0.862 0.944 0 1.442-0.498 1.807-0.862 0.327-0.327 0.488-0.472 0.863-0.472 0.376 0 0.536 0.145 0.864 0.472 0.364 0.364 0.862 0.862 1.806 0.862v-1.334c-0.376 0-0.536-0.144-0.864-0.471-0.364-0.364-0.862-0.862-1.806-0.862-0.943 0-1.441 0.498-1.806 0.861-0.327 0.328-0.487 0.472-0.864 0.472-0.374 0-0.534-0.144-0.861-0.471-0.363-0.364-0.861-0.862-1.804-0.862s-1.441 0.498-1.804 0.862c-0.327 0.327-0.487 0.471-0.861 0.471s-0.534-0.144-0.86-0.471c-0.364-0.364-0.862-0.862-1.804-0.862v1.333c0.374 0 0.534 0.145 0.861 0.472 0.363 0.364 0.861 0.862 1.803 0.862zm0 3.333c0.942 0 1.44-0.498 1.804-0.862 0.326-0.327 0.487-0.471 0.861-0.471s0.535 0.144 0.861 0.471c0.364 0.364 0.862 0.862 1.804 0.862 0.944 0 1.442-0.498 1.807-0.862 0.327-0.327 0.488-0.471 0.863-0.471 0.376 0 0.536 0.144 0.864 0.471 0.364 0.364 0.862 0.862 1.806 0.862v-1.333c-0.376 0-0.536-0.145-0.864-0.472-0.364-0.364-0.862-0.862-1.806-0.862-0.943 0-1.441 0.498-1.806 0.862-0.327 0.327-0.487 0.472-0.864 0.472-0.374 0-0.534-0.145-0.861-0.472-0.363-0.364-0.861-0.862-1.804-0.862s-1.441 0.498-1.804 0.862c-0.327 0.327-0.487 0.472-0.861 0.472s-0.534-0.145-0.86-0.472c-0.364-0.364-0.862-0.862-1.804-0.862v1.334c0.374 0 0.534 0.144 0.861 0.471 0.363 0.364 0.861 0.862 1.803 0.862zm0 3.333c0.942 0 1.44-0.498 1.804-0.862 0.326-0.326 0.487-0.471 0.861-0.471s0.535 0.145 0.861 0.471c0.364 0.364 0.862 0.862 1.804 0.862 0.944 0 1.442-0.498 1.807-0.862 0.327-0.326 0.488-0.471 0.863-0.471 0.376 0 0.536 0.145 0.864 0.471 0.364 0.364 0.862 0.862 1.806 0.862v-1.333c-0.376 0-0.536-0.145-0.864-0.471-0.364-0.364-0.862-0.862-1.806-0.862-0.943 0-1.441 0.498-1.806 0.861-0.327 0.327-0.487 0.472-0.864 0.472-0.374 0-0.534-0.145-0.861-0.471-0.363-0.364-0.861-0.862-1.804-0.862s-1.441 0.498-1.804 0.862c-0.327 0.326-0.487 0.471-0.861 0.471s-0.534-0.145-0.86-0.471c-0.364-0.364-0.862-0.862-1.804-0.862v1.333c0.374 0 0.534 0.145 0.861 0.471 0.363 0.364 0.861 0.862 1.803 0.862z" fill="#000000" fill-opacity=".54"/>
  </g><path d="m83.56 104.72v2.285h-7.5683v-2.285h7.5683zm-6.6113-11.934v14.219h-2.9297v-14.219h2.9297zm5.625 5.7911v2.2267h-6.582v-2.2267h6.582zm0.9766-5.7911v2.295h-7.5586v-2.295h7.5586z" fill="#000" fill-opacity=".54"/><path d="m158.22 92.781v14.219h-2.93v-14.219h2.93zm5.664 6.0743v2.2855h-6.465v-2.2855h6.465zm0.683-6.0743v2.295h-7.148v-2.295h7.148z" fill="#000" fill-opacity=".54"/><path d="m110.94 57.752v14.248h-2.812v-11.006l-3.379 1.0743v-2.2168l5.889-2.0996h0.302zm11.071 0.0292-5.215 15.44h-2.09l5.215-15.44h2.09zm11.207 12.022v2.1973h-9.727v-1.875l4.6-4.9316c0.462-0.5144 0.827-0.9668 1.094-1.3575 0.266-0.3971 0.459-0.7519 0.576-1.0644 0.123-0.319 0.185-0.6218 0.185-0.9082 0-0.4297-0.071-0.7975-0.215-1.1035-0.143-0.3125-0.354-0.5534-0.634-0.7227-0.274-0.1693-0.612-0.2539-1.016-0.2539-0.43 0-0.801 0.1042-1.113 0.3125-0.306 0.2083-0.541 0.4981-0.703 0.8691-0.157 0.3711-0.235 0.7911-0.235 1.2598h-2.822c0-0.8463 0.202-1.6211 0.605-2.3242 0.404-0.7096 0.974-1.2728 1.709-1.6895 0.736-0.4231 1.609-0.6347 2.618-0.6347 0.996 0 1.836 0.1627 2.519 0.4883 0.69 0.319 1.211 0.7812 1.563 1.3867 0.358 0.5989 0.537 1.3151 0.537 2.1484 0 0.4688-0.075 0.9277-0.225 1.377-0.15 0.4427-0.364 0.8854-0.644 1.3281-0.274 0.4362-0.606 0.8789-0.996 1.3281-0.391 0.4492-0.824 0.9147-1.299 1.3965l-2.471 2.7734h6.094z" fill="#000" fill-opacity=".54"/><path d="m82.03 47.681 3.0894 4.577c0.1181-0.0797 0.2364-0.159 0.3549-0.2377l-3.0552-4.5982c-0.13 0.0858-0.2597 0.1721-0.3891 0.2589z" fill="#636363"/><path d="m85.607 45.448 2.7755 4.7603c0.1236-0.0721 0.2474-0.1437 0.3715-0.2148l-2.7399-4.7795c-0.136 0.0776-0.2717 0.1556-0.4071 0.234z" fill="#636363"/><path d="m89.324 43.454 2.4512 4.9242c0.1279-0.0636 0.2559-0.1267 0.3841-0.1894l-2.4147-4.9412c-0.1405 0.0683-0.2807 0.1371-0.4206 0.2064z" fill="#636363"/><path d="m93.161 41.707 2.1187 5.0681c0.1315-0.055 0.2633-0.1095 0.3952-0.1635l-2.0813-5.0829c-0.1444 0.0589-0.2886 0.1183-0.4326 0.1783z" fill="#636363"/><path d="m97.103 40.215 1.7791 5.1914c0.1352-0.0464 0.2706-0.0922 0.4062-0.1376l-1.7409-5.2037c-0.1483 0.0494-0.2964 0.0994-0.4444 0.1499z" fill="#636363"/><path d="m101.14 38.984 1.433 5.2928c0.138-0.0374 0.276-0.0742 0.414-0.1105l-1.395-5.3027c-0.151 0.0396-0.301 0.0797-0.452 0.1204z" fill="#636363"/><path d="m105.24 38.02 1.083 5.3715c0.14-0.0282 0.281-0.056 0.421-0.0832l-1.045-5.3788c-0.153 0.0296-0.306 0.0597-0.459 0.0905z" fill="#636363"/><path d="m109.4 37.325 0.731 5.4268c0.142-0.019 0.283-0.0376 0.425-0.0556l-0.691-5.4316c-0.155 0.0196-0.31 0.0397-0.465 0.0604z" fill="#636363"/><path d="m113.59 36.904 0.376 5.458c0.142-0.0098 0.285-0.0191 0.427-0.0279l-0.335-5.46c-0.156 0.0094-0.312 0.0193-0.468 0.0299z" fill="#636363"/><path d="m182.38 100.92c1e-3 0.156 1e-3 0.312 1e-3 0.468l-5.419-0.019c1e-3 -0.086 1e-3 -0.172 1e-3 -0.258 0-0.057 0-0.114-1e-3 -0.171l5.418-0.02z" fill="#636363"/><path d="m182.26 97.176-5.403 0.3324c-9e-3 -0.1426-0.018-0.2853-0.028-0.4278l5.4-0.3715c0.011 0.1556 0.022 0.3112 0.031 0.4669z" fill="#636363"/><path d="m181.79 92.52c0.021 0.1546 0.042 0.3093 0.062 0.464l-5.365 0.6827c-0.018-0.1418-0.037-0.2836-0.056-0.4253l5.359-0.7214z" fill="#636363"/><path d="m181.09 88.369c0.031 0.1528 0.061 0.3056 0.091 0.4585l-5.303 1.0299c-0.016-0.0819-0.032-0.1637-0.048-0.2455l-0.035-0.1747 5.295-1.0682z" fill="#636363"/><path d="m180.12 84.274c0.041 0.1504 0.081 0.301 0.121 0.4518l-5.218 1.3726c-0.037-0.1381-0.073-0.2761-0.111-0.4139l5.208-1.4105z" fill="#636363"/><path d="m178.88 80.25c0.051 0.1476 0.101 0.2954 0.151 0.4433l-5.112 1.7102c-0.045-0.1356-0.091-0.271-0.137-0.4062l5.098-1.7473z" fill="#636363"/><path d="m177.38 76.317c0.06 0.1436 0.12 0.2874 0.179 0.4315l-4.985 2.0411c-0.054-0.1319-0.108-0.2636-0.163-0.3952l4.969-2.0774z" fill="#636363"/><path d="m175.63 72.49c0.07 0.1395 0.139 0.2793 0.207 0.4194l-4.838 2.3643c-0.036-0.0724-0.071-0.1447-0.107-0.2169-9e-3 -0.0184-0.018-0.0368-0.027-0.0551-0.018-0.0374-0.037-0.0747-0.056-0.1121l4.821-2.3996z" fill="#636363"/><path d="m173.63 68.785c0.078 0.135 0.157 0.2703 0.234 0.4059l-4.673 2.6788c-0.03-0.0536-0.061-0.1071-0.092-0.1606-0.041-0.0704-0.081-0.1407-0.122-0.2109l4.653-2.7132z" fill="#636363"/><path d="m171.4 65.219c0.087 0.129 0.173 0.2582 0.259 0.3879l-4.489 2.9828c-0.079-0.1185-0.158-0.2368-0.238-0.3549l4.468-3.0158z" fill="#636363"/><path d="m168.93 61.806c0.096 0.1233 0.191 0.247 0.285 0.371l-4.289 3.2743c-0.086-0.1134-0.174-0.2265-0.261-0.3395l4.265-3.3058z" fill="#636363"/><path d="m166.25 58.56c0.104 0.1172 0.207 0.2348 0.309 0.3527l-4.071 3.551c-0.094-0.1079-0.188-0.2156-0.283-0.323l4.045-3.5807z" fill="#636363"/><path d="m163.36 55.493c0.068 0.0684 0.137 0.1369 0.206 0.2057 0.042 0.0423 0.084 0.0846 0.126 0.1271l-3.837 3.8093c-0.025-0.0258-0.051-0.0516-0.077-0.0774-0.025-0.0252-0.05-0.0503-0.075-0.0755-0.051-0.0509-0.102-0.1017-0.153-0.1524l3.81-3.8368z" fill="#636363"/><path d="m160.28 52.622c0.117 0.1027 0.235 0.2058 0.352 0.3094l-3.583 4.0489c-0.108-0.095-0.215-0.1896-0.323-0.2838l3.554-4.0745z" fill="#636363"/><path d="m157.02 49.961c0.124 0.0945 0.248 0.1895 0.371 0.2849l-3.311 4.2721c-0.113-0.0876-0.226-0.1746-0.34-0.2612l3.28-4.2958z" fill="#636363"/><path d="m153.59 47.52c0.129 0.0861 0.259 0.1726 0.387 0.2595l-3.022 4.4785c-0.118-0.0797-0.237-0.159-0.355-0.2377l2.99-4.5003z" fill="#636363"/><path d="m150 45.306c0.136 0.0778 0.271 0.156 0.406 0.2348l-2.722 4.6677c-0.052-0.0306-0.105-0.0611-0.157-0.0915-0.071-0.0413-0.143-0.0824-0.214-0.1233l2.687-4.6877z" fill="#636363"/><path d="m146.29 43.331c0.14 0.0687 0.28 0.1378 0.419 0.2074l-2.409 4.8393c-0.128-0.0636-0.256-0.1267-0.384-0.1894l2.374-4.8573z" fill="#636363"/><path d="m142.45 41.604c0.022 0.0091 0.045 0.0182 0.067 0.0273 0.122 0.0503 0.243 0.101 0.365 0.152l-2.087 4.9924c-0.132-0.0551-0.263-0.1095-0.395-0.1636l2.05-5.0081z" fill="#636363"/><path d="m138.5 40.13c0.148 0.0499 0.296 0.1002 0.443 0.1512l-1.756 5.1259c-0.135-0.0464-0.271-0.0922-0.406-0.1376l1.719-5.1395z" fill="#636363"/><path d="m134.47 38.916c0.151 0.04 0.301 0.0806 0.452 0.1217l-1.419 5.2389c-0.138-0.0373-0.276-0.0742-0.414-0.1105l1.381-5.2501z" fill="#636363"/><path d="m130.37 37.969c0.153 0.0301 0.306 0.0607 0.459 0.0919l-1.075 5.3301c-0.14-0.0282-0.28-0.056-0.42-0.0832l1.036-5.3388z" fill="#636363"/><path d="m126.21 37.292c0.155 0.0201 0.309 0.0407 0.464 0.0619l-0.727 5.3985c-0.141-0.019-0.283-0.0376-0.425-0.0556l0.688-5.4048z" fill="#636363"/><path d="m122.48 36.919-0.374 5.4434c-0.143-0.0098-0.286-0.0191-0.428-0.0279l0.335-5.4469c0.156 0.0099 0.311 0.0204 0.467 0.0314z" fill="#636363"/><path d="m118.27 36.759-0.019 5.464c-0.143-5e-4 -0.286-5e-4 -0.429 0l-0.02-5.4648c0.156-3e-4 0.312 0 0.468 8e-4z" fill="#636363"/><path d="m78.984 49.866c-0.1241 0.0947-0.2478 0.1899-0.3713 0.2856l3.3842 4.3667c0.1129-0.0876 0.2261-0.1746 0.3395-0.2612l-3.3524-4.3911z" fill="#636363"/><path d="m75.717 52.534c-0.118 0.1029-0.2356 0.2063-0.353 0.3102l3.6614 4.137c0.1074-0.095 0.215-0.1896 0.323-0.2838l-3.6314-4.1634z" fill="#636363"/><path d="m72.628 55.409c-0.0558 0.0554-0.1114 0.1108-0.167 0.1664-0.0555 0.0555-0.111 0.1112-0.1663 0.1669l3.9204 3.8924c0.0507-0.051 0.1015-0.102 0.1524-0.1529s0.1019-0.1017 0.1529-0.1523l-3.8924-3.9205z" fill="#636363"/><path d="m69.729 58.479c-0.1039 0.1174-0.2073 0.235-0.3102 0.353l4.1634 3.6314c0.0942-0.1079 0.1888-0.2156 0.2838-0.323l-4.137-3.6614z" fill="#636363"/><path d="m67.037 61.728c-0.0957 0.1235-0.1909 0.2473-0.2856 0.3713l4.3911 3.3524c0.0866-0.1134 0.1736-0.2266 0.2612-0.3395l-4.3667-3.3842z" fill="#636363"/><path d="m64.564 65.144c-0.0872 0.1292-0.1739 0.2587-0.2601 0.3884l4.6015 3.0573c0.0787-0.1185 0.158-0.2368 0.2377-0.3549l-4.5791-3.0908z" fill="#636363"/><path d="m62.321 68.715c-0.0789 0.1353-0.1572 0.2708-0.2351 0.4066l4.7929 2.7476c0.0711-0.1241 0.1427-0.2479 0.2148-0.3715l-4.7726-2.7827z" fill="#636363"/><path d="m60.317 72.428c-0.0696 0.1399-0.1387 0.2801-0.2073 0.4204l4.9636 2.4256c0.0627-0.1282 0.1258-0.2562 0.1894-0.3841l-4.9457-2.4619z" fill="#636363"/><path d="m58.563 76.264c-0.0602 0.144-0.1198 0.2882-0.1789 0.4325l5.1125 2.0935c0.054-0.1319 0.1085-0.2637 0.1635-0.3952l-5.0971-2.1308z" fill="#636363"/><path d="m57.065 80.206c-0.0507 0.148-0.1008 0.2961-0.1504 0.4444l5.2391 1.7528c0.0454-0.1356 0.0912-0.271 0.1376-0.4062l-5.2263-1.791z" fill="#636363"/><path d="m55.83 84.24c-0.0409 0.1508-0.0812 0.3018-0.1209 0.4529l5.3428 1.4054c0.0363-0.1381 0.0731-0.2761 0.1105-0.414l-5.3324-1.4443z" fill="#636363"/><path d="m54.861 88.345c-0.0309 0.1531-0.0612 0.3063-0.0909 0.4595l5.4232 1.0533c0.0272-0.1402 0.0549-0.2802 0.0832-0.4202l-5.4155-1.0926z" fill="#636363"/><path d="m54.162 92.505c-0.0208 0.1549-0.0411 0.3099-0.0608 0.4649l5.4803 0.6974c0.0181-0.1418 0.0366-0.2836 0.0557-0.4253l-5.4752-0.737z" fill="#636363"/><path d="m53.736 96.701c-0.0107 0.1559-0.0208 0.3118-0.0304 0.4678l5.5141 0.3392c0.0088-0.1426 0.0181-0.2853 0.0279-0.4279l-5.5116-0.3791z" fill="#636363"/><path d="m53.583 100.92c-5e-4 0.156-5e-4 0.312 0 0.468l5.5246-0.019c-6e-4 -0.143-6e-4 -0.286 0-0.429l-5.5246-0.02z" fill="#636363"/><path d="m182.38 100.68c2e-3 0.276 3e-3 0.552 1e-3 0.828l-10.942-0.051c1e-3 -0.232 1e-3 -0.465-1e-3 -0.698l10.942-0.079z" fill="#636363"/><path d="m163.19 55.328c0.093 0.0916 0.185 0.1835 0.278 0.2757 0.128 0.1285 0.256 0.2575 0.384 0.387l-7.783 7.6729c-0.091-0.0926-0.183-0.1849-0.275-0.2771-0.092-0.0921-0.185-0.1838-0.277-0.275l7.673-7.7835z" fill="#636363"/><path d="m117.57 36.76c0.311-0.0017 0.622-0.0012 0.933 0.0016l-0.079 10.985c-0.259-0.0018-0.517-0.0018-0.775 0l-0.079-10.987z" fill="#636363"/><path d="m64.476 100.76c-0.0021 0.259-0.0024 0.518-9e-4 0.777l-10.892 0.078c-0.0022-0.311-0.0022-0.622 0-0.933l10.892 0.078z" fill="#636363"/><path d="m80.494 63.055c-0.186 0.1825-0.3707 0.3664-0.5542 0.5518l-7.8099-7.6994c0.1097-0.1113 0.2199-0.2223 0.3306-0.333 0.1106-0.1107 0.2216-0.2209 0.3329-0.3306l7.7006 7.8112z" fill="#636363"/><path d="m182.49 101.48c0.085-16.605-6.208-33.236-18.877-45.906-25.17-25.171-65.98-25.171-91.151 0-3.4777 3.4776-6.4748 7.2538-8.9915 11.246-1.9761 3.186-3.6752 6.5459-5.0739 10.044-3.1689 7.9254-4.7321 16.401-4.5989 24.936l0.7563-0.012c-0.1644-16.46 6.0328-32.971 18.592-45.53 24.793-24.793 64.99-24.793 89.783 0 12.478 12.478 18.676 28.858 18.594 45.212l0.967 0.01z" fill="#636363"/><g transform="rotate(45,117,100)" tb:tag="pointer">
   <circle cx="118" cy="100" r="50" fill="#fff" fill-opacity=".01"/>
diff --git a/application/src/main/data/json/system/scada_symbols/right-heat-pump.svg b/application/src/main/data/json/system/scada_symbols/right-heat-pump.svg
index a0802c6e66..954e32f36c 100644
--- a/application/src/main/data/json/system/scada_symbols/right-heat-pump.svg
+++ b/application/src/main/data/json/system/scada_symbols/right-heat-pump.svg
@@ -584,7 +584,7 @@
  </g><g filter="url(#filter2_ii_1826_356190)">
   <path d="m499 82c0-6.6274 5.373-12 12-12h157c6.627 0 12 5.3726 12 12v56c0 6.627-5.373 12-12 12h-157c-6.627 0-12-5.373-12-12v-56z" fill="#FFFEFE" tb:tag="value-box-background"/>
   <path d="m500 82c0-6.0751 4.925-11 11-11h157c6.075 0 11 4.9249 11 11v56c0 6.075-4.925 11-11 11h-157c-6.075 0-11-4.925-11-11v-56z" stroke="#fff" stroke-width="2"/>
-  <text x="589.51953" y="113.75" fill="#000000" font-family="Roboto" font-size="40px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">27</tspan></text>
+  <text x="589.51953" y="113.75" fill="#000000" font-family="Roboto, sans-serif" font-size="40px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">27</tspan></text>
  </g><circle cx="274" cy="278.2" r="180" fill="#B6B4B4"/><circle cx="274" cy="278.2" r="180" fill="url(#paint7_radial_1826_356190)"/><circle cx="274" cy="278.2" r="178.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><g transform="translate(93.999 97.999)" tb:tag="fan">
   <circle cx="180" cy="180.2" r="180" fill="#b6b4b4"/>
   <circle cx="180" cy="180.2" r="178.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/>
diff --git a/application/src/main/data/json/system/scada_symbols/sand-filter-hp.svg b/application/src/main/data/json/system/scada_symbols/sand-filter-hp.svg
index 773837608e..0d99ba911e 100644
--- a/application/src/main/data/json/system/scada_symbols/sand-filter-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/sand-filter-hp.svg
@@ -621,32 +621,32 @@
   <g tb:tag="filter">
    <rect x="75" y="410" width="208.86" height="96.012" rx="9.8143" fill="#999"/>
    <path d="m76 419.81c0-4.868 3.9463-8.814 8.8143-8.814h189.24c4.868 0 8.814 3.946 8.814 8.814v76.383c0 4.868-3.946 8.815-8.814 8.815h-189.24c-4.868 0-8.8143-3.947-8.8143-8.815z" stroke="#999" stroke-width="2"/>
-   <text x="180.79984" y="460.00018" fill="#000000" font-family="Roboto" font-size="28px" font-weight="500" text-anchor="middle" xml:space="preserve"><tspan dominant-baseline="middle">Filter</tspan></text>
+   <text x="180.79984" y="460.00018" fill="#000000" font-family="Roboto, sans-serif" font-size="28px" font-weight="500" text-anchor="middle" xml:space="preserve"><tspan dominant-baseline="middle">Filter</tspan></text>
   </g>
   <g tb:tag="backwash">
    <path d="m75 539.7c0-5.42 4.394-9.814 9.8143-9.814h189.24c5.42 0 9.814 4.394 9.814 9.814v76.383c0 5.421-4.394 9.815-9.814 9.815h-189.24c-5.4203 0-9.8143-4.394-9.8143-9.815z" fill="#fff"/>
    <path d="m76 539.7c0-4.868 3.9463-8.814 8.8143-8.814h189.24c4.868 0 8.814 3.946 8.814 8.814v76.383c0 4.868-3.946 8.815-8.814 8.815h-189.24c-4.868 0-8.8143-3.947-8.8143-8.815z" stroke="#999" stroke-width="2"/>
-   <text x="183.43652" y="579.61719" fill="#000000" font-family="Roboto" font-size="28px" font-weight="500" text-anchor="middle" xml:space="preserve"><tspan dominant-baseline="middle">Backwash</tspan></text>
+   <text x="183.43652" y="579.61719" fill="#000000" font-family="Roboto, sans-serif" font-size="28px" font-weight="500" text-anchor="middle" xml:space="preserve"><tspan dominant-baseline="middle">Backwash</tspan></text>
   </g>
   <g tb:tag="rinse">
    <path d="m75 659.58c0-5.42 4.394-9.814 9.8143-9.814h189.24c5.42 0 9.814 4.394 9.814 9.814v76.384c0 5.42-4.394 9.814-9.814 9.814h-189.24c-5.4203 0-9.8143-4.394-9.8143-9.814z" fill="#fff"/>
    <path d="m76 659.58c0-4.868 3.9463-8.814 8.8143-8.814h189.24c4.868 0 8.814 3.946 8.814 8.814v76.384c0 4.868-3.946 8.814-8.814 8.814h-189.24c-4.868 0-8.8143-3.946-8.8143-8.814z" stroke="#999" stroke-width="2"/>
-   <text x="181.64941" y="699.61719" fill="#000000" font-family="Roboto" font-size="28px" font-weight="500" text-anchor="middle" xml:space="preserve"><tspan dominant-baseline="middle">Rinse</tspan></text>
+   <text x="181.64941" y="699.61719" fill="#000000" font-family="Roboto, sans-serif" font-size="28px" font-weight="500" text-anchor="middle" xml:space="preserve"><tspan dominant-baseline="middle">Rinse</tspan></text>
   </g>
   <g tb:tag="waste">
    <path d="m315.69 419.81c0-5.42 4.394-9.814 9.814-9.814h189.24c5.42 0 9.815 4.394 9.815 9.814v76.383c0 5.421-4.395 9.815-9.815 9.815h-189.24c-5.42 0-9.814-4.394-9.814-9.814z" fill="#fff"/>
    <path d="m316.69 419.81c0-4.868 3.946-8.814 8.814-8.814h189.24c4.868 0 8.815 3.946 8.815 8.814v76.383c0 4.869-3.947 8.815-8.815 8.815h-189.24c-4.868 0-8.814-3.946-8.814-8.814z" stroke="#999" stroke-width="2"/>
-   <text x="421.99316" y="459.75586" fill="#000000" font-family="Roboto" font-size="28px" font-weight="500" text-anchor="middle" xml:space="preserve"><tspan dominant-baseline="middle">Waste</tspan></text>
+   <text x="421.99316" y="459.75586" fill="#000000" font-family="Roboto, sans-serif" font-size="28px" font-weight="500" text-anchor="middle" xml:space="preserve"><tspan dominant-baseline="middle">Waste</tspan></text>
   </g>
   <g tb:tag="recirculate">
    <path d="m315.69 539.7c0-5.42 4.394-9.814 9.815-9.814h189.24c5.42 0 9.814 4.394 9.814 9.814v76.383c0 5.421-4.394 9.815-9.814 9.815h-189.24c-5.421 0-9.815-4.394-9.815-9.815z" fill="#fff"/>
    <path d="m316.69 539.7c0-4.868 3.947-8.814 8.815-8.814h189.24c4.868 0 8.814 3.946 8.814 8.814v76.383c0 4.868-3.946 8.815-8.814 8.815h-189.24c-4.868 0-8.815-3.947-8.815-8.815z" stroke="#999" stroke-width="2"/>
-   <text x="425.14062" y="579.61719" fill="#000000" font-family="Roboto" font-size="28px" font-weight="500" text-anchor="middle" xml:space="preserve"><tspan dominant-baseline="middle">Recirculate</tspan></text>
+   <text x="425.14062" y="579.61719" fill="#000000" font-family="Roboto, sans-serif" font-size="28px" font-weight="500" text-anchor="middle" xml:space="preserve"><tspan dominant-baseline="middle">Recirculate</tspan></text>
   </g>
   <g tb:tag="closed">
    <path d="m315.69 659.58c0-5.42 4.394-9.814 9.815-9.814h189.24c5.42 0 9.814 4.394 9.814 9.814v76.383c0 5.42-4.394 9.814-9.814 9.814h-189.24c-5.421 0-9.815-4.394-9.815-9.814z" fill="#fff"/>
    <path d="m316.69 659.58c0-4.868 3.947-8.814 8.815-8.814h189.24c4.868 0 8.814 3.946 8.814 8.814v76.383c0 4.868-3.946 8.814-8.814 8.814h-189.24c-4.868 0-8.815-3.946-8.815-8.814z" stroke="#999" stroke-width="2"/>
-   <text x="422.45215" y="699.61719" fill="#000000" font-family="Roboto" font-size="28px" font-weight="500" text-anchor="middle" xml:space="preserve"><tspan dominant-baseline="middle">Closed</tspan></text>
+   <text x="422.45215" y="699.61719" fill="#000000" font-family="Roboto, sans-serif" font-size="28px" font-weight="500" text-anchor="middle" xml:space="preserve"><tspan dominant-baseline="middle">Closed</tspan></text>
   </g>
  </g>
 </svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/sand-filter.svg b/application/src/main/data/json/system/scada_symbols/sand-filter.svg
index 243d5ed6e8..c0f6b8b417 100644
--- a/application/src/main/data/json/system/scada_symbols/sand-filter.svg
+++ b/application/src/main/data/json/system/scada_symbols/sand-filter.svg
@@ -408,37 +408,37 @@
    <path d="m74 470c0-6.627 5.3726-12 12-12h186c6.627 0 12 5.373 12 12v56c0 6.627-5.373 12-12 12h-186c-6.6274 0-12-5.373-12-12v-56z" fill="#fff"/>
    <path d="m75.5 470c0-5.799 4.701-10.5 10.5-10.5h186c5.799 0 10.5 4.701 10.5 10.5v56c0 5.799-4.701 10.5-10.5 10.5h-186c-5.799 0-10.5-4.701-10.5-10.5v-56z" stroke="#198038" stroke-width="3"/>
    <circle cx="179.5" cy="483" r="10" fill="#198038"/>
-   <text x="178.02383" y="512.61719" fill="#000000" font-family="Roboto" font-size="28px" font-weight="500" text-anchor="middle" xml:space="preserve"><tspan dominant-baseline="middle">Filter</tspan></text>
+   <text x="178.02383" y="512.61719" fill="#000000" font-family="Roboto, sans-serif" font-size="28px" font-weight="500" text-anchor="middle" xml:space="preserve"><tspan dominant-baseline="middle">Filter</tspan></text>
   </g>
   <g filter="url(#filter1_ii_1830_321985)">
    <path d="m74 574c0-6.627 5.3726-12 12-12h186c6.627 0 12 5.373 12 12v56c0 6.627-5.373 12-12 12h-186c-6.6274 0-12-5.373-12-12v-56z" fill="#fff"/>
    <path d="m75.5 574c0-5.799 4.701-10.5 10.5-10.5h186c5.799 0 10.5 4.701 10.5 10.5v56c0 5.799-4.701 10.5-10.5 10.5h-186c-5.799 0-10.5-4.701-10.5-10.5v-56z" stroke="#000" stroke-opacity=".12" stroke-width="3"/>
    <circle cx="179.5" cy="587" r="10" fill="#000" fill-opacity=".12"/>
-   <text x="179.43652" y="617.61719" fill="#727272" font-family="Roboto" font-size="28px" font-weight="500" text-anchor="middle" xml:space="preserve"><tspan dominant-baseline="middle">Backwash</tspan></text>
+   <text x="179.43652" y="617.61719" fill="#727272" font-family="Roboto, sans-serif" font-size="28px" font-weight="500" text-anchor="middle" xml:space="preserve"><tspan dominant-baseline="middle">Backwash</tspan></text>
   </g>
   <g filter="url(#filter2_ii_1830_321985)">
    <path d="m74 678c0-6.627 5.3726-12 12-12h186c6.627 0 12 5.373 12 12v56c0 6.627-5.373 12-12 12h-186c-6.6274 0-12-5.373-12-12v-56z" fill="#fff"/>
    <path d="m75.5 678c0-5.799 4.701-10.5 10.5-10.5h186c5.799 0 10.5 4.701 10.5 10.5v56c0 5.799-4.701 10.5-10.5 10.5h-186c-5.799 0-10.5-4.701-10.5-10.5v-56z" stroke="#000" stroke-opacity=".12" stroke-width="3"/>
    <circle cx="179" cy="691" r="10" fill="#000" fill-opacity=".12"/>
-   <text x="177.64941" y="722.61719" fill="#727272" font-family="Roboto" font-size="28px" font-weight="500" text-anchor="middle" xml:space="preserve"><tspan dominant-baseline="middle">Rinse</tspan></text>
+   <text x="177.64941" y="722.61719" fill="#727272" font-family="Roboto, sans-serif" font-size="28px" font-weight="500" text-anchor="middle" xml:space="preserve"><tspan dominant-baseline="middle">Rinse</tspan></text>
   </g>
   <g filter="url(#filter3_ii_1830_321985)">
    <path d="m316 470c0-6.627 5.373-12 12-12h186c6.627 0 12 5.373 12 12v56c0 6.627-5.373 12-12 12h-186c-6.627 0-12-5.373-12-12v-56z" fill="#fff"/>
    <path d="m317.5 470c0-5.799 4.701-10.5 10.5-10.5h186c5.799 0 10.5 4.701 10.5 10.5v56c0 5.799-4.701 10.5-10.5 10.5h-186c-5.799 0-10.5-4.701-10.5-10.5v-56z" stroke="#000" stroke-opacity=".12" stroke-width="3"/>
    <circle cx="421" cy="483" r="10" fill="#000" fill-opacity=".12"/>
-   <text x="420.99316" y="512.75586" fill="#727272" font-family="Roboto" font-size="28px" font-weight="500" text-anchor="middle" xml:space="preserve"><tspan dominant-baseline="middle">Waste</tspan></text>
+   <text x="420.99316" y="512.75586" fill="#727272" font-family="Roboto, sans-serif" font-size="28px" font-weight="500" text-anchor="middle" xml:space="preserve"><tspan dominant-baseline="middle">Waste</tspan></text>
   </g>
   <g filter="url(#filter4_ii_1830_321985)">
    <path d="m316 574c0-6.627 5.373-12 12-12h186c6.627 0 12 5.373 12 12v56c0 6.627-5.373 12-12 12h-186c-6.627 0-12-5.373-12-12v-56z" fill="#fff"/>
    <path d="m317.5 574c0-5.799 4.701-10.5 10.5-10.5h186c5.799 0 10.5 4.701 10.5 10.5v56c0 5.799-4.701 10.5-10.5 10.5h-186c-5.799 0-10.5-4.701-10.5-10.5v-56z" stroke="#000" stroke-opacity=".12" stroke-width="3"/>
    <circle cx="421.5" cy="587" r="10" fill="#000" fill-opacity=".12"/>
-   <text x="420.14062" y="617.61719" fill="#727272" font-family="Roboto" font-size="28px" font-weight="500" text-anchor="middle" xml:space="preserve"><tspan dominant-baseline="middle">Recirculate</tspan></text>
+   <text x="420.14062" y="617.61719" fill="#727272" font-family="Roboto, sans-serif" font-size="28px" font-weight="500" text-anchor="middle" xml:space="preserve"><tspan dominant-baseline="middle">Recirculate</tspan></text>
   </g>
   <g filter="url(#filter5_ii_1830_321985)">
    <path d="m316 678c0-6.627 5.373-12 12-12h186c6.627 0 12 5.373 12 12v56c0 6.627-5.373 12-12 12h-186c-6.627 0-12-5.373-12-12v-56z" fill="#fff"/>
    <path d="m317.5 678c0-5.799 4.701-10.5 10.5-10.5h186c5.799 0 10.5 4.701 10.5 10.5v56c0 5.799-4.701 10.5-10.5 10.5h-186c-5.799 0-10.5-4.701-10.5-10.5v-56z" stroke="#000" stroke-opacity=".12" stroke-width="3"/>
    <circle cx="421.5" cy="691" r="10" fill="#000" fill-opacity=".12"/>
-   <text x="421.45215" y="721.61719" fill="#727272" font-family="Roboto" font-size="28px" font-weight="500" text-anchor="middle" xml:space="preserve"><tspan dominant-baseline="middle">Closed</tspan></text>
+   <text x="421.45215" y="721.61719" fill="#727272" font-family="Roboto, sans-serif" font-size="28px" font-weight="500" text-anchor="middle" xml:space="preserve"><tspan dominant-baseline="middle">Closed</tspan></text>
   </g>
  </g>
  <defs>
diff --git a/application/src/main/data/json/system/scada_symbols/simple-horizontal-scale-hp.svg b/application/src/main/data/json/system/scada_symbols/simple-horizontal-scale-hp.svg
index 9425ed48f2..76e3bc9eef 100644
--- a/application/src/main/data/json/system/scada_symbols/simple-horizontal-scale-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/simple-horizontal-scale-hp.svg
@@ -490,13 +490,13 @@
     }
   ]
 }]]></tb:metadata>
-<text x="409.16602" y="97.234375" fill="#000000" font-family="Roboto" font-size="56px" font-weight="400" text-anchor="middle" tb:tag="label" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">Outdoor</tspan></text><text x="401.15625" y="345.75" fill="#000000" font-family="Roboto" font-size="40px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">°C</tspan></text><g fill="#666" font-family="Roboto" font-size="32px" font-weight="500" text-anchor="middle" style="display: none;" tb:tag="minMaxValue">
+<text x="409.16602" y="97.234375" fill="#000000" font-family="Roboto, sans-serif" font-size="56px" font-weight="400" text-anchor="middle" tb:tag="label" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">Outdoor</tspan></text><text x="401.15625" y="345.75" fill="#000000" font-family="Roboto, sans-serif" font-size="40px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">°C</tspan></text><g fill="#666" font-family="Roboto, sans-serif" font-size="32px" font-weight="500" text-anchor="middle" style="display: none;" tb:tag="minMaxValue">
   <text x="88.070312" y="268" tb:tag="minValue" xml:space="preserve" style=""><tspan dominant-baseline="middle">0</tspan></text>
   <text x="705.02344" y="268" tb:tag="maxValue" xml:space="preserve" style=""><tspan dominant-baseline="middle">100</tspan></text>
  </g><g transform="translate(180)" tb:tag="valueArrowPosition">
   <path d="m80 179 24-42h-48z" fill="#666" tb:tag="valuePointer"/>
  </g><g transform="translate(180)" tb:tag="valueTextPositon">
-  <text x="79.779297" y="273.125" fill="#002878" font-family="Roboto" font-size="60px" font-weight="400" text-anchor="middle" tb:tag="value" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">26</tspan></text>
+  <text x="79.779297" y="273.125" fill="#002878" font-family="Roboto, sans-serif" font-size="60px" font-weight="400" text-anchor="middle" tb:tag="value" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">26</tspan></text>
  </g><g stroke="#000" tb:tag="scale">
   <rect x="80.5" y="183.5" width="652" height="41" fill="#c8dff7" tb:tag="scaleBackground"/>
   <rect x="80.5" y="183.5" width="164" height="41" fill="#ebebeb" tb:tag="lowWarningScale"/>
diff --git a/application/src/main/data/json/system/scada_symbols/simple-vertical-scale-hp.svg b/application/src/main/data/json/system/scada_symbols/simple-vertical-scale-hp.svg
index 4e14130ef3..c6fb05fd26 100644
--- a/application/src/main/data/json/system/scada_symbols/simple-vertical-scale-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/simple-vertical-scale-hp.svg
@@ -490,19 +490,19 @@
     }
   ]
 }]]></tb:metadata>
-<text x="206.16602" y="43.234375" fill="#000000" font-family="Roboto" font-size="56px" font-weight="400" text-anchor="middle" tb:tag="label" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">Outdoor</tspan></text><text x="195.21875" y="770" fill="#000000" font-family="Roboto" font-size="40px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">°C</tspan></text><g stroke="#000" tb:tag="scale">
+<text x="206.16602" y="43.234375" fill="#000000" font-family="Roboto, sans-serif" font-size="56px" font-weight="400" text-anchor="middle" tb:tag="label" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">Outdoor</tspan></text><text x="195.21875" y="770" fill="#000000" font-family="Roboto, sans-serif" font-size="40px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan transform="translate(0,-144)" dominant-baseline="middle">°C</tspan></text><g stroke="#000" tb:tag="scale">
   <rect x="176.5" y="83" width="41" height="652" fill="#c8dff7" tb:tag="scaleBackground"/>
   <rect transform="scale(1,-1)" x="176.5" y="-735" width="41" height="164" fill="#ebebeb" tb:tag="lowWarningScale"/>
   <rect x="176.5" y="83.5" width="41" height="164" fill="#ebebeb" tb:tag="highWarningScale"/>
   <rect transform="scale(1,-1)" x="176.5" y="-735" width="41" height="81" fill="#666" tb:tag="lowCriticalScale"/>
   <rect x="176.5" y="83.5" width="41" height="81" fill="#666" tb:tag="highCriticalScale"/>
- </g><g fill="#666" font-family="Roboto" font-size="32px" font-weight="500" style="display: none;" tb:tag="minMaxValue">
+ </g><g fill="#666" font-family="Roboto, sans-serif" font-size="32px" font-weight="500" style="display: none;" tb:tag="minMaxValue">
   <text x="237.48438" y="97" tb:tag="maxValue" xml:space="preserve" style=""><tspan dominant-baseline="middle">100</tspan></text>
   <text x="238.89062" y="727" tb:tag="minValue" xml:space="preserve" style=""><tspan dominant-baseline="middle">0</tspan></text>
  </g><g transform="translate(0,-180)" tb:tag="valueArrowPosition">
   <path d="m168 735-42-24v48z" fill="#666" tb:tag="valuePointer"/>
  </g><g transform="translate(0,-180)" tb:tag="valueTextPositon">
-  <text x="223.60547" y="739.125" fill="#002878" font-family="Roboto" font-size="60px" font-weight="400" tb:tag="value" xml:space="preserve"><tspan dominant-baseline="middle">26</tspan></text>
+  <text x="223.60547" y="739.125" fill="#002878" font-family="Roboto, sans-serif" font-size="60px" font-weight="400" tb:tag="value" xml:space="preserve"><tspan dominant-baseline="middle">26</tspan></text>
  </g><g transform="translate(0,-400)" style="display: none;" tb:tag="target">
   <rect transform="rotate(-45)" x="-379.76" y="636.31" width="22" height="22" fill="#dedede" stroke="#000" stroke-width="2" tb:tag="targetBackground" style=""/>
  </g><path d="m134.53 0s-134.53 0-134.53 134v656.72c0 5.3024 3.5817 9.2808 8 9.2808h384c4.418 0 8-3.9784 8-9.2808v-656.72c0-134-132.14-134-132.14-134h-67.86zm134.14 162.4c-2.5773 0-4.6667 2.5072-4.6667 5.6v600.8c0 3.0928 2.0893 5.6 4.6667 5.6h29.333c2.5773 0 4.6667-2.5072 4.6667-5.6v-600.8c0-3.0928-2.0893-5.6-4.6667-5.6z" fill="#000" fill-opacity="0" tb:tag="clickArea"/>
diff --git a/application/src/main/data/json/system/scada_symbols/small-cylindrical-tank.svg b/application/src/main/data/json/system/scada_symbols/small-cylindrical-tank.svg
index 95c4fd3eb5..fda5351233 100644
--- a/application/src/main/data/json/system/scada_symbols/small-cylindrical-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/small-cylindrical-tank.svg
@@ -534,7 +534,7 @@
  </g><g transform="translate(-201,6)" filter="url(#filter0_ii_1694_158298)" tb:tag="value-box">
   <path d="m381 272c0-6.627 5.373-12 12-12h216c6.627 0 12 5.373 12 12v56c0 6.627-5.373 12-12 12h-216c-6.627 0-12-5.373-12-12z" fill="#f3f3f3" tb:tag="value-box-background"/>
   <path d="m382.5 272c0-5.799 4.701-10.5 10.5-10.5h216c5.799 0 10.5 4.701 10.5 10.5v56c0 5.799-4.701 10.5-10.5 10.5h-216c-5.799 0-10.5-4.701-10.5-10.5z" stroke="#727171" stroke-width="3"/>
-  <text x="500.74219" y="300.07812" fill="#727171" font-family="Roboto" font-size="32px" font-weight="500" text-anchor="middle" tb:tag="value-text" xml:space="preserve"><tspan dominant-baseline="middle">1660 gal</tspan></text>
+  <text x="500.74219" y="300.07812" fill="#727171" font-family="Roboto, sans-serif" font-size="32px" font-weight="500" text-anchor="middle" tb:tag="value-text" xml:space="preserve"><tspan dominant-baseline="middle">1660 gal</tspan></text>
  </g><path d="m201.79 0s-201.79 0-201.79 100.5v492.54c0 3.9768 5.3726 6.9606 12 6.9606h576c6.627 0 12-2.9838 12-6.9606v-492.54c0-100.5-198.21-100.5-198.21-100.5h-101.79zm201.21 121.8c-3.866 0-7 1.8804-7 4.2v450.6c0 2.3196 3.134 4.2 7 4.2h44c3.866 0 7-1.8804 7-4.2v-450.6c0-2.3196-3.134-4.2-7-4.2z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><defs>
   <pattern id="pattern17033" patternTransform="translate(-79.813 574.69)" xlink:href="#liquid"/>
   <linearGradient id="paint0_linear_2901_184349" x1="600" x2=".019179" y1="110.96" y2="104.56" gradientUnits="userSpaceOnUse">
diff --git a/application/src/main/data/json/system/scada_symbols/small-left-meter.svg b/application/src/main/data/json/system/scada_symbols/small-left-meter.svg
index 3d5d6fdcb9..1c70a5ee27 100644
--- a/application/src/main/data/json/system/scada_symbols/small-left-meter.svg
+++ b/application/src/main/data/json/system/scada_symbols/small-left-meter.svg
@@ -720,6 +720,6 @@
  </g><g transform="translate(-12)" filter="url(#filter0_ii_3742_299961)" style="display: none;" tb:tag="value-box">
   <rect x="22" y="164" width="56" height="28" rx="4" fill="#fffefe" fill-opacity=".75" tb:tag="value-box-background" style=""/>
   <rect x="23" y="165" width="54" height="26" rx="3" stroke="#fff" stroke-width="2" style=""/>
-  <text x="49.853027" y="179.5625" fill="#727171" font-family="Roboto" font-size="14px" font-weight="500" text-anchor="middle" tb:tag="value-text" xml:space="preserve" style=""><tspan dominant-baseline="middle">37%</tspan></text>
+  <text x="49.853027" y="179.5625" fill="#727171" font-family="Roboto, sans-serif" font-size="14px" font-weight="500" text-anchor="middle" tb:tag="value-text" xml:space="preserve" style=""><tspan dominant-baseline="middle">37%</tspan></text>
  </g><path d="m25.56-0.12402s-25.56 0-25.56 33.5v164.18c0 1.3256 0.68053 2.3202 1.52 2.3202h72.96c0.83942 0 1.52-0.9946 1.52-2.3202v-164.18c0-33.5-25.107-33.5-25.107-33.5h-12.893zm25.487 40.6c-0.48969 0-0.88669 0.6268-0.88669 1.4v150.2c0 0.7732 0.39697 1.4 0.88669 1.4h5.5733c0.48969 0 0.88669-0.6268 0.88669-1.4v-150.2c0-0.7732-0.39697-1.4-0.88669-1.4z" fill-opacity="0" fill="#000" tb:tag="clickArea"/>
 </svg>
\ No newline at end of file
diff --git a/application/src/main/data/json/system/scada_symbols/small-meter.svg b/application/src/main/data/json/system/scada_symbols/small-meter.svg
index a639475227..d66d70e048 100644
--- a/application/src/main/data/json/system/scada_symbols/small-meter.svg
+++ b/application/src/main/data/json/system/scada_symbols/small-meter.svg
@@ -657,7 +657,7 @@
  </g><g filter="url(#filter0_ii_3742_299961)" tb:tag="value-box">
   <rect x="22" y="164" width="56" height="28" rx="4" fill="#FFFEFE" fill-opacity=".75" tb:tag="value-box-background"/>
   <rect x="23" y="165" width="54" height="26" rx="3" stroke="#fff" stroke-width="2"/>
-  <text x="49.853027" y="179.5625" fill="#727171" font-family="Roboto" font-size="14px" font-weight="500" text-anchor="middle" tb:tag="value-text" xml:space="preserve"><tspan dominant-baseline="middle">37%</tspan></text>
+  <text x="49.853027" y="179.5625" fill="#727171" font-family="Roboto, sans-serif" font-size="14px" font-weight="500" text-anchor="middle" tb:tag="value-text" xml:space="preserve"><tspan dominant-baseline="middle">37%</tspan></text>
  </g><g tb:tag="progressBar">
   <rect x="69" y="10.5" width="6" height="134" ry="1.12" stroke="#cecece" tb:tag="progressBorder"/>
   <rect transform="scale(1,-1)" x="69" y="-144.5" width="6" height="50" ry="1.12" fill="#4d94e1" stroke="#4d94e1" tb:tag="progressFill"/>
diff --git a/application/src/main/data/json/system/scada_symbols/small-right-center.svg b/application/src/main/data/json/system/scada_symbols/small-right-center.svg
index 8afe7bc88e..d2f96e7848 100644
--- a/application/src/main/data/json/system/scada_symbols/small-right-center.svg
+++ b/application/src/main/data/json/system/scada_symbols/small-right-center.svg
@@ -669,7 +669,7 @@
  </g><g transform="translate(12)" filter="url(#filter0_ii_3742_299961)" style="display: none;" tb:tag="value-box">
   <rect x="22" y="164" width="56" height="28" rx="4" fill="#fffefe" fill-opacity=".75" tb:tag="value-box-background" style=""/>
   <rect x="23" y="165" width="54" height="26" rx="3" stroke="#fff" stroke-width="2" style=""/>
-  <text x="49.853027" y="179.5625" fill="#727171" font-family="Roboto" font-size="14px" font-weight="500" text-anchor="middle" tb:tag="value-text" xml:space="preserve" style=""><tspan dominant-baseline="middle">37%</tspan></text>
+  <text x="49.853027" y="179.5625" fill="#727171" font-family="Roboto, sans-serif" font-size="14px" font-weight="500" text-anchor="middle" tb:tag="value-text" xml:space="preserve" style=""><tspan dominant-baseline="middle">37%</tspan></text>
  </g><path d="m49.56 0s-25.56 0-25.56 33.5v164.18c0 1.3256 0.68053 2.3202 1.52 2.3202h72.96c0.83942 0 1.52-0.9946 1.52-2.3202v-164.18c0-33.5-25.107-33.5-25.107-33.5h-12.893zm25.487 40.6c-0.48969 0-0.88669 0.6268-0.88669 1.4v150.2c0 0.7732 0.39697 1.4 0.88669 1.4h5.5733c0.48969 0 0.88669-0.6268 0.88669-1.4v-150.2c0-0.7732-0.39697-1.4-0.88669-1.4z" fill-opacity="0" tb:tag="clickArea"/><path d="m8 200c2.2091 0 4-1.791 4-4v-192c0-2.2091-1.7909-4-4-4h-4c-2.2091 0-4 1.7909-4 4v192c0 2.209 1.7909 4 4 4h4z" fill="#93979B"/><path d="m8 200c2.2091 0 4-1.791 4-4v-192c0-2.2091-1.7909-4-4-4h-4c-2.2091 0-4 1.7909-4 4v192c0 2.209 1.7909 4 4 4h4z" fill="url(#paint1_linear_3742_299973)"/><path d="m8 198.5c1.3807 0 2.5-1.119 2.5-2.5v-192c0-1.3807-1.1193-2.5-2.5-2.5h-4c-1.3807 0-2.5 1.1193-2.5 2.5v192c0 1.381 1.1193 2.5 2.5 2.5h4z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m12 146c0 2.209 1.7908 4 3.9999 4h4c2.2092 0 4.0001-1.791 4.0001-4v-92c0-2.2091-1.7909-4-4-4h-4c-2.2091 0-4 1.7909-4 4v92z" fill="#647484"/><path d="m12 146c0 2.209 1.7908 4 3.9999 4h4c2.2092 0 4.0001-1.791 4.0001-4v-92c0-2.2091-1.7909-4-4-4h-4c-2.2091 0-4 1.7909-4 4v92z" fill="url(#paint2_linear_3742_299973)"/><path d="m13.5 146c0 1.38 1.1193 2.5 2.4999 2.5h4c1.3808 0 2.5001-1.119 2.5001-2.5v-92c0-1.3807-1.1193-2.5-2.5-2.5h-4c-1.3807 0-2.5 1.1193-2.5 2.5v92z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><defs>
   <linearGradient id="paint0_linear_3742_299973" x1="100" x2="24" y1="100" y2="100.09" gradientUnits="userSpaceOnUse">
    <stop stop-color="#020202" stop-opacity=".35" offset="0"/>
diff --git a/application/src/main/data/json/system/scada_symbols/small-spherical-tank.svg b/application/src/main/data/json/system/scada_symbols/small-spherical-tank.svg
index 8b0a1a20b0..ae0dea7fca 100644
--- a/application/src/main/data/json/system/scada_symbols/small-spherical-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/small-spherical-tank.svg
@@ -539,7 +539,7 @@
  </g><rect x="79" y="563" width="80" height="24" rx="7" fill="#fff"/><rect x="79" y="563" width="80" height="24" rx="7" fill="url(#paint145_linear_1711_268272)"/><rect x="80.5" y="564.5" width="77" height="21" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect x="441" y="563" width="80" height="24" rx="7" fill="#fff"/><rect x="441" y="563" width="80" height="24" rx="7" fill="url(#paint146_linear_1711_268272)"/><rect x="442.5" y="564.5" width="77" height="21" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m103 563v-38l32 25v13h-32z" fill="#fff"/><path d="m103 563v-38l32 25v13h-32z" fill="url(#paint147_linear_1711_268272)"/><path d="m104.5 561.5v-33.425l29 22.657v10.768h-29z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m465 563v-13l32-24v37h-32z" fill="#fff"/><path d="m465 563v-13l32-24v37h-32z" fill="url(#paint148_linear_1711_268272)"/><path d="m466.5 561.5v-10.75l29-21.75v32.5h-29z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><circle cx="513" cy="406" r="32" fill="url(#paint149_radial_1711_268272)"/><circle cx="513" cy="406" r="30.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><circle cx="87" cy="406" r="32" fill="url(#paint150_radial_1711_268272)"/><circle cx="87" cy="406" r="30.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m71 571v-165c0-8.837 7.1634-16 16-16s16 7.163 16 16v165h-32z" fill="#fff"/><path d="m71 571v-165c0-8.837 7.1634-16 16-16s16 7.163 16 16v165h-32z" fill="url(#paint151_linear_1711_268272)"/><path d="m72.5 569.5v-163.5c0-8.008 6.4919-14.5 14.5-14.5s14.5 6.492 14.5 14.5v163.5h-29z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m497 571v-165c0-8.837 7.163-16 16-16s16 7.163 16 16v165h-32z" fill="#fff"/><path d="m497 571v-165c0-8.837 7.163-16 16-16s16 7.163 16 16v165h-32z" fill="url(#paint152_linear_1711_268272)"/><path d="m498.5 569.5v-163.5c0-8.008 6.492-14.5 14.5-14.5s14.5 6.492 14.5 14.5v163.5h-29z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect x="37" y="571" width="100" height="29" rx="7" fill="#fff"/><rect x="37" y="571" width="100" height="29" rx="7" fill="url(#paint153_linear_1711_268272)"/><rect x="38.5" y="572.5" width="97" height="26" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect x="463" y="571" width="100" height="29" rx="7" fill="#fff"/><rect x="463" y="571" width="100" height="29" rx="7" fill="url(#paint154_linear_1711_268272)"/><rect x="464.5" y="572.5" width="97" height="26" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><g transform="translate(-201)" filter="url(#filter0_ii_1694_158298)" tb:tag="value-box">
   <path d="m381 272c0-6.627 5.373-12 12-12h216c6.627 0 12 5.373 12 12v56c0 6.627-5.373 12-12 12h-216c-6.627 0-12-5.373-12-12z" fill="#f3f3f3" tb:tag="value-box-background"/>
   <path d="m382.5 272c0-5.799 4.701-10.5 10.5-10.5h216c5.799 0 10.5 4.701 10.5 10.5v56c0 5.799-4.701 10.5-10.5 10.5h-216c-5.799 0-10.5-4.701-10.5-10.5z" stroke="#727171" stroke-width="3"/>
-  <text x="500.74219" y="300.07812" fill="#727171" font-family="Roboto" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
+  <text x="500.74219" y="300.07812" fill="#727171" font-family="Roboto, sans-serif" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
  </g><path d="m201.79 0s-201.79 0-201.79 100.5v492.54c0 3.9768 5.3726 6.9605 12 6.9605h576c6.627 0 12-2.9838 12-6.9605v-492.54c0-100.5-198.21-100.5-198.21-100.5h-101.79zm201.21 121.8c-3.866 0-7.0002 1.8804-7.0002 4.2v450.6c0 2.3196 3.134 4.2 7.0002 4.2h44c3.866 0 7.0002-1.8804 7.0002-4.2v-450.6c0-2.3196-3.134-4.2-7.0002-4.2z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><defs>
   <radialGradient id="paint0_radial_1711_268272" cx="0" cy="0" r="1" gradientTransform="translate(300 300.7) rotate(180.27) scale(300 300.7)" gradientUnits="userSpaceOnUse">
    <stop stop-color="#fff" stop-opacity=".15" offset=".00034187"/>
diff --git a/application/src/main/data/json/system/scada_symbols/spherical-tank.svg b/application/src/main/data/json/system/scada_symbols/spherical-tank.svg
index 44cd98e6f9..8be8a6f0d5 100644
--- a/application/src/main/data/json/system/scada_symbols/spherical-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/spherical-tank.svg
@@ -569,7 +569,7 @@
  </g><rect x="182" y="963" width="80" height="24" rx="7" fill="#fff"/><rect x="182" y="963" width="80" height="24" rx="7" fill="url(#paint245_linear_1711_251491)"/><rect x="183.5" y="964.5" width="77" height="21" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect x="738" y="963" width="80" height="24" rx="7" fill="#fff"/><rect x="738" y="963" width="80" height="24" rx="7" fill="url(#paint246_linear_1711_251491)"/><rect x="739.5" y="964.5" width="77" height="21" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m206 963v-59l32 22v37h-32z" fill="#fff"/><path d="m206 963v-59l32 22v37h-32z" fill="url(#paint247_linear_1711_251491)"/><path d="m207.5 961.5v-54.648l29 19.937v34.711h-29z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m762 963v-37l32-22v59h-32z" fill="#fff"/><path d="m762 963v-37l32-22v59h-32z" fill="url(#paint248_linear_1711_251491)"/><path d="m763.5 961.5v-34.711l29-19.937v54.648h-29z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><circle cx="810" cy="788" r="32" fill="url(#paint249_radial_1711_251491)"/><circle cx="810" cy="788" r="30.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><circle cx="190" cy="788" r="32" fill="url(#paint250_radial_1711_251491)"/><circle cx="190" cy="788" r="30.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m174 971v-183c0-8.837 7.163-16 16-16s16 7.163 16 16v183h-32z" fill="#fff"/><path d="m174 971v-183c0-8.837 7.163-16 16-16s16 7.163 16 16v183h-32z" fill="url(#paint251_linear_1711_251491)"/><path d="m175.5 969.5v-181.5c0-8.008 6.492-14.5 14.5-14.5s14.5 6.492 14.5 14.5v181.5h-29z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m794 971v-183c0-8.837 7.163-16 16-16s16 7.163 16 16v183h-32z" fill="#fff"/><path d="m794 971v-183c0-8.837 7.163-16 16-16s16 7.163 16 16v183h-32z" fill="url(#paint252_linear_1711_251491)"/><path d="m795.5 969.5v-181.5c0-8.008 6.492-14.5 14.5-14.5s14.5 6.492 14.5 14.5v181.5h-29z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect x="140" y="971" width="100" height="29" rx="7" fill="#fff"/><rect x="140" y="971" width="100" height="29" rx="7" fill="url(#paint253_linear_1711_251491)"/><rect x="141.5" y="972.5" width="97" height="26" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect x="760" y="971" width="100" height="29" rx="7" fill="#fff"/><rect x="760" y="971" width="100" height="29" rx="7" fill="url(#paint254_linear_1711_251491)"/><rect x="761.5" y="972.5" width="97" height="26" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><g transform="translate(-1.6394 200)" filter="url(#filter0_ii_1694_158298)" tb:tag="value-box">
   <path d="m381 272c0-6.627 5.373-12 12-12h216c6.627 0 12 5.373 12 12v56c0 6.627-5.373 12-12 12h-216c-6.627 0-12-5.373-12-12z" fill="#f3f3f3" tb:tag="value-box-background"/>
   <path d="m382.5 272c0-5.799 4.701-10.5 10.5-10.5h216c5.799 0 10.5 4.701 10.5 10.5v56c0 5.799-4.701 10.5-10.5 10.5h-216c-5.799 0-10.5-4.701-10.5-10.5z" stroke="#727171" stroke-width="3"/>
-  <text x="499.84497" y="300.37811" fill="#727171" font-family="Roboto" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
+  <text x="499.84497" y="300.37811" fill="#727171" font-family="Roboto, sans-serif" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
  </g><path d="m336.32 0s-336.32 0-336.32 167.5v820.9c0 6.628 8.9543 11.601 20 11.601h960c11.045 0 20-4.973 20-11.601v-820.9c0-167.5-330.35-167.5-330.35-167.5h-169.65zm335.35 203c-6.4433 0-11.667 3.134-11.667 7v751c0 3.866 5.2233 7 11.667 7h73.333c6.4433 0 11.667-3.134 11.667-7v-751c0-3.866-5.2233-7-11.667-7z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><defs>
   <radialGradient id="paint0_radial_1711_251491" cx="0" cy="0" r="1" gradientTransform="translate(500 501.16) rotate(180.27) scale(500.01 501.17)" gradientUnits="userSpaceOnUse">
    <stop stop-color="#fff" stop-opacity=".15" offset=".00034187"/>
diff --git a/application/src/main/data/json/system/scada_symbols/stand-cylindrical-tank.svg b/application/src/main/data/json/system/scada_symbols/stand-cylindrical-tank.svg
index 9666f987d7..ef07d408e2 100644
--- a/application/src/main/data/json/system/scada_symbols/stand-cylindrical-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/stand-cylindrical-tank.svg
@@ -564,7 +564,7 @@
  </g><g transform="translate(-1,409)" filter="url(#filter0_ii_1687_130892)" tb:tag="value-box">
   <path d="m180 62c0-6.6274 5.373-12 12-12h216c6.627 0 12 5.3726 12 12v56c0 6.627-5.373 12-12 12h-216c-6.627 0-12-5.373-12-12z" fill="#f3f3f3" tb:tag="value-box-background"/>
   <path d="m192 51.5h216c5.799 0 10.5 4.701 10.5 10.5v56c0 5.799-4.701 10.5-10.5 10.5h-216c-5.799 0-10.5-4.701-10.5-10.5v-56c0-5.799 4.701-10.5 10.5-10.5z" stroke="#727171" stroke-width="3"/>
-  <text x="301.5625" y="93.546875" fill="#727171" font-family="Roboto" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
+  <text x="301.5625" y="93.546875" fill="#727171" font-family="Roboto, sans-serif" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
  </g><ellipse cx="300" cy="16" rx="292" ry="16" fill="#5D5C5C"/><rect x="58" y="1163" width="80" height="24" rx="7" fill="#fff"/><rect x="58" y="1163" width="80" height="24" rx="7" fill="url(#paint147_linear_1690_149725)" style="fill:url(#paint147_linear_1690_149725)"/><rect x="59.5" y="1164.5" width="77" height="21" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect x="462" y="1163" width="80" height="24" rx="7" fill="#fff"/><rect x="462" y="1163" width="80" height="24" rx="7" fill="url(#paint148_linear_1690_149725)" style="fill:url(#paint148_linear_1690_149725)"/><rect x="463.5" y="1164.5" width="77" height="21" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect transform="rotate(15 96 1004.5)" x="96" y="1004.5" width="423.92" height="8" fill="#727171"/><rect transform="rotate(-15 94 1114.2)" x="94" y="1114.2" width="423.92" height="8" fill="#727171"/><path d="m82 1163v-169l32 2v167z" fill="#fff"/><path d="m82 1163v-169l32 2v167z" fill="url(#paint149_linear_1690_149725)" style="fill:url(#paint149_linear_1690_149725)"/><path d="m83.5 1161.5v-165.9l29 1.812v164.09z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m486 1163v-167l32-2v169z" fill="#fff"/><path d="m486 1163v-167l32-2v169z" fill="url(#paint150_linear_1690_149725)" style="fill:url(#paint150_linear_1690_149725)"/><path d="m487.5 1161.5v-164.09l29-1.812v165.9z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect transform="rotate(15 68.875 1013)" x="68.875" y="1013" width="483.9" height="12" fill="#838282"/><rect transform="rotate(-15 63.922 1138.8)" x="63.922" y="1138.8" width="487.78" height="12" fill="#838282"/><circle cx="534" cy="885" r="32" fill="url(#paint151_radial_1690_149725)" style="fill:url(#paint151_radial_1690_149725)"/><circle cx="534" cy="885" r="30.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><circle cx="66" cy="885" r="32" fill="url(#paint152_radial_1690_149725)" style="fill:url(#paint152_radial_1690_149725)"/><circle cx="66" cy="885" r="30.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m50 1171v-284c0-8.837 7.1634-16 16-16s16 7.163 16 16v284z" fill="#fff"/><path d="m50 1171v-284c0-8.837 7.1634-16 16-16s16 7.163 16 16v284z" fill="url(#paint153_linear_1690_149725)" style="fill:url(#paint153_linear_1690_149725)"/><path d="m51.5 1169.5v-282.5c0-8.008 6.4919-14.5 14.5-14.5s14.5 6.492 14.5 14.5v282.5z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m518 1171v-284c0-8.837 7.163-16 16-16s16 7.163 16 16v284z" fill="#fff"/><path d="m518 1171v-284c0-8.837 7.163-16 16-16s16 7.163 16 16v284z" fill="url(#paint154_linear_1690_149725)" style="fill:url(#paint154_linear_1690_149725)"/><path d="m519.5 1169.5v-282.5c0-8.008 6.492-14.5 14.5-14.5s14.5 6.492 14.5 14.5v282.5z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect x="16" y="1171" width="100" height="29" rx="7" fill="#fff"/><rect x="16" y="1171" width="100" height="29" rx="7" fill="url(#paint155_linear_1690_149725)" style="fill:url(#paint155_linear_1690_149725)"/><rect x="17.5" y="1172.5" width="97" height="26" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect x="484" y="1171" width="100" height="29" rx="7" fill="#fff"/><rect x="484" y="1171" width="100" height="29" rx="7" fill="url(#paint156_linear_1690_149725)" style="fill:url(#paint156_linear_1690_149725)"/><rect x="485.5" y="1172.5" width="97" height="26" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m201.79 0s-201.79 0-201.79 201v985.08c0 7.9536 5.3726 13.921 12 13.921h576c6.627 0 12-5.9676 12-13.921v-985.08c0-201-198.21-201-198.21-201h-101.79zm201.21 243.6c-3.866 0-7 3.7608-7 8.4v901.2c0 4.6392 3.134 8.4 7 8.4h44c3.866 0 7-3.7608 7-8.4v-901.2c0-4.6392-3.134-8.4-7-8.4z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><defs>
   <linearGradient id="paint0_linear_1690_149726" x1="600" x2=".018833" y1="510.96" y2="504.56" gradientUnits="userSpaceOnUse">
    <stop stop-color="#020202" stop-opacity=".35" offset="0"/>
diff --git a/application/src/main/data/json/system/scada_symbols/stand-horizontal-tank.svg b/application/src/main/data/json/system/scada_symbols/stand-horizontal-tank.svg
index 03995acbd5..cdb6885b3f 100644
--- a/application/src/main/data/json/system/scada_symbols/stand-horizontal-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/stand-horizontal-tank.svg
@@ -573,7 +573,7 @@
  </mask><g filter="url(#filter0_ii_1694_158298)" tb:tag="value-box">
   <path d="m381 272c0-6.627 5.373-12 12-12h216c6.627 0 12 5.373 12 12v56c0 6.627-5.373 12-12 12h-216c-6.627 0-12-5.373-12-12v-56z" fill="#f3f3f3" tb:tag="value-box-background"/>
   <path d="m382.5 272c0-5.799 4.701-10.5 10.5-10.5h216c5.799 0 10.5 4.701 10.5 10.5v56c0 5.799-4.701 10.5-10.5 10.5h-216c-5.799 0-10.5-4.701-10.5-10.5v-56z" stroke="#727171" stroke-width="3"/>
-  <text x="499.84497" y="300.37811" fill="#727171" font-family="Roboto" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
+  <text x="499.84497" y="300.37811" fill="#727171" font-family="Roboto, sans-serif" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
  </g><g transform="matrix(1 0 0 .5 .64 .00025)">
   <path d="m335.68-5e-4s-336.32 0-336.32 201v985.08c0 7.9536 8.9543 13.921 20 13.921h960c11.045 0 20-5.9676 20-13.921v-985.08c0-201-330.35-201-330.35-201h-169.65zm335.35 243.6c-6.4433 0-11.667 3.7608-11.667 8.4v901.2c0 4.6392 5.2233 8.4 11.667 8.4h73.333c6.4433 0 11.667-3.7608 11.667-8.4v-901.2c0-4.6392-5.2233-8.4-11.667-8.4z" fill="#000" fill-opacity="0" tb:tag="clickArea"/>
  </g><rect x="108" y="763" width="80" height="24" rx="7" fill="#fff"/><rect x="108" y="763" width="80" height="24" rx="7" fill="url(#paint245_linear_1694_158297)" style="fill:url(#paint245_linear_1694_158297)"/><rect x="109.5" y="764.5" width="77" height="21" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect x="812" y="763" width="80" height="24" rx="7" fill="#fff"/><rect x="812" y="763" width="80" height="24" rx="7" fill="url(#paint246_linear_1694_158297)" style="fill:url(#paint246_linear_1694_158297)"/><rect x="813.5" y="764.5" width="77" height="21" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect transform="rotate(10 150.46 600.73)" x="150.46" y="600.73" width="710.35" height="8" fill="#727171"/><rect transform="rotate(-10 145.52 726.54)" x="145.52" y="726.53" width="715.97" height="8" fill="#727171"/><path d="m132 763v-167l32 3v164z" fill="#fff"/><path d="m132 763v-167l32 3v164z" fill="url(#paint247_linear_1694_158297)" style="fill:url(#paint247_linear_1694_158297)"/><path d="m133.5 761.5v-163.85l29 2.719v161.13z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m836 763v-164l32-3v167z" fill="#fff"/><path d="m836 763v-164l32-3v167z" fill="url(#paint248_linear_1694_158297)" style="fill:url(#paint248_linear_1694_158297)"/><path d="m837.5 761.5v-161.13l29-2.719v163.85z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect transform="rotate(10 117.91 607.86)" x="117.91" y="607.85" width="781.6" height="12" fill="#838282"/><rect transform="rotate(-10 110.33 744.6)" x="110.33" y="744.6" width="793.89" height="12" fill="#838282"/><circle cx="892" cy="485" r="32" fill="url(#paint249_radial_1694_158297)" style="fill:url(#paint249_radial_1694_158297)"/><circle cx="892" cy="485" r="30.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><circle cx="108" cy="485" r="32" fill="url(#paint250_radial_1694_158297)" style="fill:url(#paint250_radial_1694_158297)"/><circle cx="108" cy="485" r="30.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m92 771v-284c0-8.837 7.1634-16 16-16 8.837 0 16 7.163 16 16v284z" fill="#fff"/><path d="m92 771v-284c0-8.837 7.1634-16 16-16 8.837 0 16 7.163 16 16v284z" fill="url(#paint251_linear_1694_158297)" style="fill:url(#paint251_linear_1694_158297)"/><path d="m93.5 769.5v-282.5c0-8.008 6.4919-14.5 14.5-14.5 8.008 0 14.5 6.492 14.5 14.5v282.5z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m876 771v-284c0-8.837 7.163-16 16-16s16 7.163 16 16v284z" fill="#fff"/><path d="m876 771v-284c0-8.837 7.163-16 16-16s16 7.163 16 16v284z" fill="url(#paint252_linear_1694_158297)" style="fill:url(#paint252_linear_1694_158297)"/><path d="m877.5 769.5v-282.5c0-8.008 6.492-14.5 14.5-14.5s14.5 6.492 14.5 14.5v282.5z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect x="58" y="771" width="100" height="29" rx="7" fill="#fff"/><rect x="58" y="771" width="100" height="29" rx="7" fill="url(#paint253_linear_1694_158297)" style="fill:url(#paint253_linear_1694_158297)"/><rect x="59.5" y="772.5" width="97" height="26" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect x="842" y="771" width="100" height="29" rx="7" fill="#fff"/><rect x="842" y="771" width="100" height="29" rx="7" fill="url(#paint254_linear_1694_158297)" style="fill:url(#paint254_linear_1694_158297)"/><rect x="843.5" y="772.5" width="97" height="26" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><defs>
diff --git a/application/src/main/data/json/system/scada_symbols/stand-vertical-short-tank.svg b/application/src/main/data/json/system/scada_symbols/stand-vertical-short-tank.svg
index b448d24463..611aecec4d 100644
--- a/application/src/main/data/json/system/scada_symbols/stand-vertical-short-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/stand-vertical-short-tank.svg
@@ -537,7 +537,7 @@
  </mask><path d="m8 125c-3.866 0-7-3.134-7-7s3.134-7 7-7h786c3.866 0 7 3.134 7 7s-3.134 7-7 7h-786z" fill="#D9D9D9"/><path d="m8 114h786v-6h-786v6zm786 8h-786v6h786v-6zm4-4c0 2.209-1.791 4-4 4v6c5.523 0 10-4.477 10-10h-6zm-4-4c2.209 0 4 1.791 4 4h6c0-5.523-4.477-10-10-10v6zm-790 4c0-2.209 1.7909-4 4-4v-6c-5.5228 0-10 4.477-10 10h6zm-6 0c0 5.523 4.4772 10 10 10v-6c-2.2092 0-4-1.791-4-4h-6z" fill="#727171" mask="url(#path-234-inside-2_1693_189770)"/><g filter="url(#filter0_ii_1693_189770)" tb:tag="value-box">
   <path d="m281 31c0-6.6274 5.373-12 12-12h216c6.627 0 12 5.3726 12 12v56c0 6.6274-5.373 12-12 12h-216c-6.627 0-12-5.3726-12-12z" fill="#f3f3f3" tb:tag="value-box-background"/>
   <path d="m282.5 31c0-5.799 4.701-10.5 10.5-10.5h216c5.799 0 10.5 4.701 10.5 10.5v56c0 5.799-4.701 10.5-10.5 10.5h-216c-5.799 0-10.5-4.701-10.5-10.5z" stroke="#727171" stroke-width="3"/>
-  <text x="399.12082" y="62.601822" fill="#727171" font-family="Roboto" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
+  <text x="399.12082" y="62.601822" fill="#727171" font-family="Roboto, sans-serif" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
  </g><defs>
   <filter id="filter0_ii_1693_189770" x="277" y="15" width="248" height="88" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
    <feFlood flood-opacity="0" result="BackgroundImageFix"/>
diff --git a/application/src/main/data/json/system/scada_symbols/stand-vertical-tank.svg b/application/src/main/data/json/system/scada_symbols/stand-vertical-tank.svg
index c4dcc662fc..dd665214ca 100644
--- a/application/src/main/data/json/system/scada_symbols/stand-vertical-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/stand-vertical-tank.svg
@@ -566,7 +566,7 @@
  </mask><path d="m7 181c-3.866 0-7-3.134-7-7s3.134-7 7-7h586c3.866 0 7 3.134 7 7s-3.134 7-7 7z" fill="#d9d9d9"/><path d="m7 170h586v-6h-586zm586 8h-586v6h586zm4-4c0 2.209-1.791 4-4 4v6c5.523 0 10-4.477 10-10zm-4-4c2.209 0 4 1.791 4 4h6c0-5.523-4.477-10-10-10zm-590 4c0-2.209 1.7909-4 4-4v-6c-5.5228 0-10 4.477-10 10zm-6 0c0 5.523 4.4771 10 10 10v-6c-2.2091 0-4-1.791-4-4z" fill="#727171" mask="url(#path-215-inside-2_1687_130892)"/><g filter="url(#filter0_ii_1687_130892)" tb:tag="value-box">
   <path d="m180 62c0-6.6274 5.373-12 12-12h216c6.627 0 12 5.3726 12 12v56c0 6.627-5.373 12-12 12h-216c-6.627 0-12-5.373-12-12z" fill="#f3f3f3" tb:tag="value-box-background"/>
   <path d="m192 51.5h216c5.799 0 10.5 4.701 10.5 10.5v56c0 5.799-4.701 10.5-10.5 10.5h-216c-5.799 0-10.5-4.701-10.5-10.5v-56c0-5.799 4.701-10.5 10.5-10.5z" stroke="#727171" stroke-width="3"/>
-  <text x="301.5625" y="93.546875" fill="#727171" font-family="Roboto" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
+  <text x="301.5625" y="93.546875" fill="#727171" font-family="Roboto, sans-serif" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
  </g><rect x="58" y="1163" width="80" height="24" rx="7" fill="#fff"/><rect x="58" y="1163" width="80" height="24" rx="7" fill="url(#paint147_linear_1687_130893)" style="fill:url(#paint147_linear_1687_130893)"/><rect x="59.5" y="1164.5" width="77" height="21" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect x="462" y="1163" width="80" height="24" rx="7" fill="#fff"/><rect x="462" y="1163" width="80" height="24" rx="7" fill="url(#paint148_linear_1687_130893)" style="fill:url(#paint148_linear_1687_130893)"/><rect x="463.5" y="1164.5" width="77" height="21" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect transform="rotate(15 96 1004.5)" x="96" y="1004.5" width="423.92" height="8" fill="#727171"/><rect transform="rotate(-15 94 1114.2)" x="94" y="1114.2" width="423.92" height="8" fill="#727171"/><path d="m82 1163v-163h32v163z" fill="#fff"/><path d="m82 1163v-163h32v163z" fill="url(#paint149_linear_1687_130893)" style="fill:url(#paint149_linear_1687_130893)"/><path d="m83.5 1161.5v-160h29v160z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m486 1163v-163h32v163z" fill="#fff"/><path d="m486 1163v-163h32v163z" fill="url(#paint150_linear_1687_130893)" style="fill:url(#paint150_linear_1687_130893)"/><path d="m487.5 1161.5v-160h29v160z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect transform="rotate(15 68.875 1013)" x="68.875" y="1013" width="483.9" height="12" fill="#838282"/><rect transform="rotate(-15 63.922 1138.8)" x="63.922" y="1138.8" width="487.78" height="12" fill="#838282"/><circle cx="534" cy="885" r="32" fill="url(#paint151_radial_1687_130893)" style="fill:url(#paint151_radial_1687_130893)"/><circle cx="534" cy="885" r="30.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><circle cx="66" cy="885" r="32" fill="url(#paint152_radial_1687_130893)" style="fill:url(#paint152_radial_1687_130893)"/><circle cx="66" cy="885" r="30.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m50 1171v-284c0-8.837 7.1634-16 16-16s16 7.163 16 16v284z" fill="#fff"/><path d="m50 1171v-284c0-8.837 7.1634-16 16-16s16 7.163 16 16v284z" fill="url(#paint153_linear_1687_130893)" style="fill:url(#paint153_linear_1687_130893)"/><path d="m51.5 1169.5v-282.5c0-8.008 6.4919-14.5 14.5-14.5s14.5 6.492 14.5 14.5v282.5z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><path d="m518 1171v-284c0-8.837 7.163-16 16-16s16 7.163 16 16v284z" fill="#fff"/><path d="m518 1171v-284c0-8.837 7.163-16 16-16s16 7.163 16 16v284z" fill="url(#paint154_linear_1687_130893)" style="fill:url(#paint154_linear_1687_130893)"/><path d="m519.5 1169.5v-282.5c0-8.008 6.492-14.5 14.5-14.5s14.5 6.492 14.5 14.5v282.5z" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect x="16" y="1171" width="100" height="29" rx="7" fill="#fff"/><rect x="16" y="1171" width="100" height="29" rx="7" fill="url(#paint155_linear_1687_130893)" style="fill:url(#paint155_linear_1687_130893)"/><rect x="17.5" y="1172.5" width="97" height="26" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><rect x="484" y="1171" width="100" height="29" rx="7" fill="#fff"/><rect x="484" y="1171" width="100" height="29" rx="7" fill="url(#paint156_linear_1687_130893)" style="fill:url(#paint156_linear_1687_130893)"/><rect x="485.5" y="1172.5" width="97" height="26" rx="5.5" stroke="#000" stroke-opacity=".12" stroke-width="3"/><defs>
   <filter id="filter0_ii_1687_130892" x="176" y="46" width="248" height="88" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
    <feFlood flood-opacity="0" result="BackgroundImageFix"/>
diff --git a/application/src/main/data/json/system/scada_symbols/three-rate-energy-meter-hp.svg b/application/src/main/data/json/system/scada_symbols/three-rate-energy-meter-hp.svg
index 526f6aa719..b35fe93c04 100644
--- a/application/src/main/data/json/system/scada_symbols/three-rate-energy-meter-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/three-rate-energy-meter-hp.svg
@@ -745,7 +745,7 @@
     }
   ]
 }]]></tb:metadata>
-<rect x="1" y="1" width="598" height="398" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><rect x="49" y="81" width="238" height="82" rx="3" fill="#DEDEDE" stroke="#1A1A1A" stroke-width="2" tb:tag="value-box-off-peak"/><rect x="313" y="81" width="238" height="82" rx="3" fill="#DEDEDE" stroke="#1A1A1A" stroke-width="2" tb:tag="value-box-night"/><rect x="181" y="237" width="238" height="82" rx="3" fill="#DEDEDE" stroke="#1A1A1A" stroke-width="2" tb:tag="value-box-peak"/><text x="171.2998" y="58.286133" fill="#000000" font-family="Roboto" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="off-peak-label" xml:space="default"><tspan dominant-baseline="start">T1</tspan></text><text x="432.2998" y="58.734375" fill="#000000" font-family="Roboto" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="night-label"><tspan dominant-baseline="start">T2</tspan></text><text x="301.61865" y="214.39307" fill="#000000" font-family="Roboto" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="peak-label" xml:space="default"><tspan dominant-baseline="start">T3</tspan></text><text x="170.09232" y="139.47266" fill="#002878" font-family="Roboto" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="off-peak-rate" xml:space="default"><tspan dominant-baseline="start">000223</tspan></text><text x="434.09232" y="139.47266" fill="#002878" font-family="Roboto" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="night-rate" xml:space="default"><tspan dominant-baseline="start">000223</tspan></text><text x="302.09232" y="295.47266" fill="#002878" font-family="Roboto" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="peak-rate" xml:space="default"><tspan dominant-baseline="start">000223</tspan></text><text x="299.89453" y="371.67578" fill="#000000" font-family="Roboto" font-size="36px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan dominant-baseline="start">kWh</tspan></text><path d="m201.8-2e-4s-201.8 0-201.8 67v328.36c0 2.6512 5.3727 4.6404 12 4.6404h576c6.627 0 12-1.9892 12-4.6404v-328.36c0-67-198.21-67-198.21-67h-101.79zm201.21 81.2c-3.8661 0-6.9999 1.2536-6.9999 2.8v300.4c0 1.5464 3.1341 2.8 6.9999 2.8h43.998c3.8661 0 6.9999-1.2536 6.9999-2.8v-300.4c0-1.5464-3.1341-2.8-6.9999-2.8z" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+<rect x="1" y="1" width="598" height="398" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><rect x="49" y="81" width="238" height="82" rx="3" fill="#DEDEDE" stroke="#1A1A1A" stroke-width="2" tb:tag="value-box-off-peak"/><rect x="313" y="81" width="238" height="82" rx="3" fill="#DEDEDE" stroke="#1A1A1A" stroke-width="2" tb:tag="value-box-night"/><rect x="181" y="237" width="238" height="82" rx="3" fill="#DEDEDE" stroke="#1A1A1A" stroke-width="2" tb:tag="value-box-peak"/><text x="171.2998" y="58.286133" fill="#000000" font-family="Roboto, sans-serif" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="off-peak-label" xml:space="default"><tspan dominant-baseline="start">T1</tspan></text><text x="432.2998" y="58.734375" fill="#000000" font-family="Roboto, sans-serif" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="night-label"><tspan dominant-baseline="start">T2</tspan></text><text x="301.61865" y="214.39307" fill="#000000" font-family="Roboto, sans-serif" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="peak-label" xml:space="default"><tspan dominant-baseline="start">T3</tspan></text><text x="170.09232" y="139.47266" fill="#002878" font-family="Roboto, sans-serif" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="off-peak-rate" xml:space="default"><tspan dominant-baseline="start">000223</tspan></text><text x="434.09232" y="139.47266" fill="#002878" font-family="Roboto, sans-serif" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="night-rate" xml:space="default"><tspan dominant-baseline="start">000223</tspan></text><text x="302.09232" y="295.47266" fill="#002878" font-family="Roboto, sans-serif" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="peak-rate" xml:space="default"><tspan dominant-baseline="start">000223</tspan></text><text x="299.89453" y="371.67578" fill="#000000" font-family="Roboto, sans-serif" font-size="36px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan dominant-baseline="start">kWh</tspan></text><path d="m201.8-2e-4s-201.8 0-201.8 67v328.36c0 2.6512 5.3727 4.6404 12 4.6404h576c6.627 0 12-1.9892 12-4.6404v-328.36c0-67-198.21-67-198.21-67h-101.79zm201.21 81.2c-3.8661 0-6.9999 1.2536-6.9999 2.8v300.4c0 1.5464 3.1341 2.8 6.9999 2.8h43.998c3.8661 0 6.9999-1.2536 6.9999-2.8v-300.4c0-1.5464-3.1341-2.8-6.9999-2.8z" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
   <rect width="84" height="84" rx="4" fill="#fff" style=""/>
   <rect width="84" height="84" rx="4" style=""/>
   <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
diff --git a/application/src/main/data/json/system/scada_symbols/two-rate-energy-meter-hp.svg b/application/src/main/data/json/system/scada_symbols/two-rate-energy-meter-hp.svg
index e87548f059..325972b596 100644
--- a/application/src/main/data/json/system/scada_symbols/two-rate-energy-meter-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/two-rate-energy-meter-hp.svg
@@ -613,7 +613,7 @@
     }
   ]
 }]]></tb:metadata>
-<rect x="1" y="1" width="398" height="398" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><rect x="49" y="237" width="302" height="82" rx="3" fill="#DEDEDE" stroke="#1A1A1A" stroke-width="2" tb:tag="value-box-night"/><rect x="49" y="81" width="302" height="82" rx="3" fill="#DEDEDE" stroke="#1A1A1A" stroke-width="2" tb:tag="value-box-day"/><text x="199.70117" y="58.076347" fill="#000000" font-family="Roboto" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="day-label" xml:space="default"><tspan dominant-baseline="start">T1</tspan></text><text x="199.70117" y="214.37646" fill="#000000" font-family="Roboto" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="night-label"><tspan dominant-baseline="start">T2</tspan></text><text x="200.33984" y="139.47266" fill="#002878" font-family="Roboto" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="day-rate" xml:space="default"><tspan dominant-baseline="start">000023</tspan></text><text x="200.33984" y="295.47266" fill="#002878" font-family="Roboto" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="night-rate" xml:space="default"><tspan dominant-baseline="start">000023</tspan></text><text x="199.89453" y="371.67578" fill="#000000" font-family="Roboto" font-size="36px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan dominant-baseline="start">kWh</tspan></text><path d="m134.53-2e-4s-134.53 0-134.53 67v328.36c0 2.6512 3.5818 4.6404 8 4.6404h384c4.418 0 8-1.9892 8-4.6404v-328.36c0-67-132.14-67-132.14-67h-67.858zm134.14 81.2c-2.5774 0-4.6666 1.2536-4.6666 2.8v300.4c0 1.5464 2.0894 2.8 4.6666 2.8h29.332c2.5774 0 4.6666-1.2536 4.6666-2.8v-300.4c0-1.5464-2.0894-2.8-4.6666-2.8z" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+<rect x="1" y="1" width="398" height="398" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><rect x="49" y="237" width="302" height="82" rx="3" fill="#DEDEDE" stroke="#1A1A1A" stroke-width="2" tb:tag="value-box-night"/><rect x="49" y="81" width="302" height="82" rx="3" fill="#DEDEDE" stroke="#1A1A1A" stroke-width="2" tb:tag="value-box-day"/><text x="199.70117" y="58.076347" fill="#000000" font-family="Roboto, sans-serif" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="day-label" xml:space="default"><tspan dominant-baseline="start">T1</tspan></text><text x="199.70117" y="214.37646" fill="#000000" font-family="Roboto, sans-serif" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="night-label"><tspan dominant-baseline="start">T2</tspan></text><text x="200.33984" y="139.47266" fill="#002878" font-family="Roboto, sans-serif" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="day-rate" xml:space="default"><tspan dominant-baseline="start">000023</tspan></text><text x="200.33984" y="295.47266" fill="#002878" font-family="Roboto, sans-serif" font-size="48px" font-weight="400" text-anchor="middle" tb:tag="night-rate" xml:space="default"><tspan dominant-baseline="start">000023</tspan></text><text x="199.89453" y="371.67578" fill="#000000" font-family="Roboto, sans-serif" font-size="36px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan dominant-baseline="start">kWh</tspan></text><path d="m134.53-2e-4s-134.53 0-134.53 67v328.36c0 2.6512 3.5818 4.6404 8 4.6404h384c4.418 0 8-1.9892 8-4.6404v-328.36c0-67-132.14-67-132.14-67h-67.858zm134.14 81.2c-2.5774 0-4.6666 1.2536-4.6666 2.8v300.4c0 1.5464 2.0894 2.8 4.6666 2.8h29.332c2.5774 0 4.6666-1.2536 4.6666-2.8v-300.4c0-1.5464-2.0894-2.8-4.6666-2.8z" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
   <rect width="84" height="84" rx="4" fill="#fff" style=""/>
   <rect width="84" height="84" rx="4" style=""/>
   <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
diff --git a/application/src/main/data/json/system/scada_symbols/vertical-energy-system-controller-hp.svg b/application/src/main/data/json/system/scada_symbols/vertical-energy-system-controller-hp.svg
index 6da68556a2..15edf756bd 100644
--- a/application/src/main/data/json/system/scada_symbols/vertical-energy-system-controller-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/vertical-energy-system-controller-hp.svg
@@ -364,7 +364,7 @@
     }
   ]
 }]]></tb:metadata>
-<rect x="17" y="1" width="366" height="598" rx="5" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><rect transform="matrix(1 0 0 -1 382 173)" x="1" y="-1" width="16" height="148" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect transform="matrix(1 0 0 -1 0 173)" x="1" y="-1" width="16" height="148" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect transform="matrix(1 0 0 -1 382 373)" x="1" y="-1" width="16" height="148" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect transform="matrix(1 0 0 -1 382 573)" x="1" y="-1" width="16" height="148" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect transform="matrix(1 0 0 -1 0 573)" x="1" y="-1" width="16" height="148" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><circle cx="66" cy="86" r="10" fill="#198038" tb:tag="indicator"/><text x="83.31543" y="89.589844" fill="#000000" font-family="Roboto" font-size="30px" font-weight="400" tb:tag="label" xml:space="preserve"><tspan dominant-baseline="middle">Connected</tspan></text><path d="m134.53 0s-134.53 0-134.53 100.5v492.54c0 3.9768 3.5818 6.9604 8 6.9604h384c4.418 0 8-2.9838 8-6.9604v-492.54c0-100.5-132.14-100.5-132.14-100.5h-67.86zm134.14 121.8c-2.5774 0-4.6666 1.8804-4.6666 4.2v450.6c0 2.3196 2.0894 4.2 4.6666 4.2h29.332c2.5774 0 4.6666-1.8804 4.6666-4.2v-450.6c0-2.3196-2.0894-4.2-4.6666-4.2z" fill-opacity="0" fill="#000" tb:tag="clickArea"/><g transform="translate(0,516)" fill="#d12730" style="display: none;" tb:tag="critical">
+<rect x="17" y="1" width="366" height="598" rx="5" fill="#fff" stroke="#1A1A1A" stroke-width="2" tb:tag="background"/><rect transform="matrix(1 0 0 -1 382 173)" x="1" y="-1" width="16" height="148" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect transform="matrix(1 0 0 -1 0 173)" x="1" y="-1" width="16" height="148" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect transform="matrix(1 0 0 -1 382 373)" x="1" y="-1" width="16" height="148" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect transform="matrix(1 0 0 -1 382 573)" x="1" y="-1" width="16" height="148" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><rect transform="matrix(1 0 0 -1 0 573)" x="1" y="-1" width="16" height="148" rx="1" fill="#999" stroke="#1A1A1A" stroke-width="2"/><circle cx="66" cy="86" r="10" fill="#198038" tb:tag="indicator"/><text x="83.31543" y="89.589844" fill="#000000" font-family="Roboto, sans-serif" font-size="30px" font-weight="400" tb:tag="label" xml:space="preserve"><tspan dominant-baseline="middle">Connected</tspan></text><path d="m134.53 0s-134.53 0-134.53 100.5v492.54c0 3.9768 3.5818 6.9604 8 6.9604h384c4.418 0 8-2.9838 8-6.9604v-492.54c0-100.5-132.14-100.5-132.14-100.5h-67.86zm134.14 121.8c-2.5774 0-4.6666 1.8804-4.6666 4.2v450.6c0 2.3196 2.0894 4.2 4.6666 4.2h29.332c2.5774 0 4.6666-1.8804 4.6666-4.2v-450.6c0-2.3196-2.0894-4.2-4.6666-4.2z" fill-opacity="0" fill="#000" tb:tag="clickArea"/><g transform="translate(0,516)" fill="#d12730" style="display: none;" tb:tag="critical">
   <rect width="84" height="84" rx="4" fill="#fff" style=""/>
   <rect width="84" height="84" rx="4" style=""/>
   <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
diff --git a/application/src/main/data/json/system/scada_symbols/vertical-short-tank.svg b/application/src/main/data/json/system/scada_symbols/vertical-short-tank.svg
index 5d8aa42ab5..86a7ceef05 100644
--- a/application/src/main/data/json/system/scada_symbols/vertical-short-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/vertical-short-tank.svg
@@ -536,7 +536,7 @@
  </mask><path d="m8 125c-3.866 0-7-3.134-7-7s3.134-7 7-7h786c3.866 0 7 3.134 7 7s-3.134 7-7 7h-786z" fill="#D9D9D9"/><path d="m8 114h786v-6h-786v6zm786 8h-786v6h786v-6zm4-4c0 2.209-1.791 4-4 4v6c5.523 0 10-4.477 10-10h-6zm-4-4c2.209 0 4 1.791 4 4h6c0-5.523-4.477-10-10-10v6zm-790 4c0-2.209 1.7909-4 4-4v-6c-5.5228 0-10 4.477-10 10h6zm-6 0c0 5.523 4.4772 10 10 10v-6c-2.2092 0-4-1.791-4-4h-6z" fill="#727171" mask="url(#path-234-inside-2_1693_189770)"/><g filter="url(#filter0_ii_1693_189770)" tb:tag="value-box">
   <path d="m281 31c0-6.6274 5.373-12 12-12h216c6.627 0 12 5.3726 12 12v56c0 6.6274-5.373 12-12 12h-216c-6.627 0-12-5.3726-12-12z" fill="#f3f3f3" tb:tag="value-box-background"/>
   <path d="m282.5 31c0-5.799 4.701-10.5 10.5-10.5h216c5.799 0 10.5 4.701 10.5 10.5v56c0 5.799-4.701 10.5-10.5 10.5h-216c-5.799 0-10.5-4.701-10.5-10.5z" stroke="#727171" stroke-width="3"/>
-  <text x="399.12082" y="62.601822" fill="#727171" font-family="Roboto" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
+  <text x="399.12082" y="62.601822" fill="#727171" font-family="Roboto, sans-serif" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
  </g><defs>
   <filter id="filter0_ii_1693_189770" x="277" y="15" width="248" height="88" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
    <feFlood flood-opacity="0" result="BackgroundImageFix"/>
diff --git a/application/src/main/data/json/system/scada_symbols/vertical-tank.svg b/application/src/main/data/json/system/scada_symbols/vertical-tank.svg
index 5e51330ded..66c1cab666 100644
--- a/application/src/main/data/json/system/scada_symbols/vertical-tank.svg
+++ b/application/src/main/data/json/system/scada_symbols/vertical-tank.svg
@@ -566,7 +566,7 @@
  </mask><path d="m7 181c-3.866 0-7-3.134-7-7s3.134-7 7-7h586c3.866 0 7 3.134 7 7s-3.134 7-7 7z" fill="#d9d9d9"/><path d="m7 170h586v-6h-586zm586 8h-586v6h586zm4-4c0 2.209-1.791 4-4 4v6c5.523 0 10-4.477 10-10zm-4-4c2.209 0 4 1.791 4 4h6c0-5.523-4.477-10-10-10zm-590 4c0-2.209 1.7909-4 4-4v-6c-5.5228 0-10 4.477-10 10zm-6 0c0 5.523 4.4771 10 10 10v-6c-2.2091 0-4-1.791-4-4z" fill="#727171" mask="url(#path-215-inside-2_1687_130892)"/><g filter="url(#filter0_ii_1687_130892)" tb:tag="value-box">
   <path d="m180 62c0-6.6274 5.373-12 12-12h216c6.627 0 12 5.3726 12 12v56c0 6.627-5.373 12-12 12h-216c-6.627 0-12-5.373-12-12z" fill="#f3f3f3" tb:tag="value-box-background"/>
   <path d="m192 51.5h216c5.799 0 10.5 4.701 10.5 10.5v56c0 5.799-4.701 10.5-10.5 10.5h-216c-5.799 0-10.5-4.701-10.5-10.5v-56c0-5.799 4.701-10.5 10.5-10.5z" stroke="#727171" stroke-width="3"/>
-  <text x="301.5625" y="93.546875" fill="#727171" font-family="Roboto" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
+  <text x="301.5625" y="93.546875" fill="#727171" font-family="Roboto, sans-serif" font-size="32px" font-weight="500" tb:tag="value-text" xml:space="preserve" text-anchor="middle"><tspan dominant-baseline="middle">1660 gal</tspan></text>
  </g><defs>
   <filter id="filter0_ii_1687_130892" x="176" y="46" width="248" height="88" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse">
    <feFlood flood-opacity="0" result="BackgroundImageFix"/>
diff --git a/application/src/main/data/json/system/scada_symbols/voltage-relay-hp.svg b/application/src/main/data/json/system/scada_symbols/voltage-relay-hp.svg
index fa27214864..c943eaf15c 100644
--- a/application/src/main/data/json/system/scada_symbols/voltage-relay-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/voltage-relay-hp.svg
@@ -426,7 +426,7 @@
     }
   ]
 }]]></tb:metadata>
-<rect width="200" height="400" fill="#fff" tb:tag="background"/><rect x="1" y="1" width="198" height="398" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="100" cy="50" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="52" cy="50" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="148" cy="50" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="100" cy="350" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="52" cy="350" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="148" cy="350" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="36" y="137" width="128" height="80" rx="2" fill="#DEDEDE" tb:tag="value-box"/><rect x="37" y="138" width="126" height="78" rx="1" stroke="#000" stroke-opacity=".87" stroke-width="2"/><text x="99.890625" y="190.70906" fill="#002878" font-family="Roboto" font-size="32px" font-weight="400" text-anchor="middle" tb:tag="value" xml:space="preserve"><tspan dominant-baseline="start">220</tspan></text><text x="99.643097" y="257.79694" fill="black" font-family="Roboto" font-size="28px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan dominant-baseline="start">v</tspan></text><path d="m67.265 0s-67.265 0-67.265 67v328.36c0 2.6512 1.7909 4.6404 4 4.6404h192c2.209 0 4-1.9892 4-4.6404v-328.36c0-67-66.07-67-66.07-67h-33.929zm67.07 81.2c-1.2887 0-2.3333 1.2536-2.3333 2.8v300.4c0 1.5464 1.0447 2.8 2.3333 2.8h14.666c1.2887 0 2.3333-1.2536 2.3333-2.8v-300.4c0-1.5464-1.0447-2.8-2.3333-2.8z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+<rect width="200" height="400" fill="#fff" tb:tag="background"/><rect x="1" y="1" width="198" height="398" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="100" cy="50" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="52" cy="50" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="148" cy="50" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="100" cy="350" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="52" cy="350" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><circle cx="148" cy="350" r="19" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="36" y="137" width="128" height="80" rx="2" fill="#DEDEDE" tb:tag="value-box"/><rect x="37" y="138" width="126" height="78" rx="1" stroke="#000" stroke-opacity=".87" stroke-width="2"/><text x="99.890625" y="190.70906" fill="#002878" font-family="Roboto, sans-serif" font-size="32px" font-weight="400" text-anchor="middle" tb:tag="value" xml:space="preserve"><tspan dominant-baseline="start">220</tspan></text><text x="99.643097" y="257.79694" fill="black" font-family="Roboto, sans-serif" font-size="28px" font-weight="400" text-anchor="middle" tb:tag="units" xml:space="preserve"><tspan dominant-baseline="start">v</tspan></text><path d="m67.265 0s-67.265 0-67.265 67v328.36c0 2.6512 1.7909 4.6404 4 4.6404h192c2.209 0 4-1.9892 4-4.6404v-328.36c0-67-66.07-67-66.07-67h-33.929zm67.07 81.2c-1.2887 0-2.3333 1.2536-2.3333 2.8v300.4c0 1.5464 1.0447 2.8 2.3333 2.8h14.666c1.2887 0 2.3333-1.2536 2.3333-2.8v-300.4c0-1.5464-1.0447-2.8-2.3333-2.8z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
   <rect width="84" height="84" rx="4" fill="#fff" style=""/>
   <rect width="84" height="84" rx="4" style=""/>
   <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>
diff --git a/application/src/main/data/json/system/scada_symbols/voltage-stabilizer-hp.svg b/application/src/main/data/json/system/scada_symbols/voltage-stabilizer-hp.svg
index 2ccad581d4..c3bba6ad4d 100644
--- a/application/src/main/data/json/system/scada_symbols/voltage-stabilizer-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/voltage-stabilizer-hp.svg
@@ -570,7 +570,7 @@
     }
   ]
 }]]></tb:metadata>
-<rect width="400" height="200" fill="#fff" tb:tag="background"/><rect x="1" y="1" width="398" height="198" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="213" y="81" width="126" height="78" rx="1" fill="#dedede" stroke="#000" stroke-opacity=".87" stroke-width="2" tb:tag="out-value-box"/><text x="275.76855" y="136.65625" fill="#002878" font-family="Roboto" font-size="44px" font-weight="400" text-anchor="middle" tb:tag="out-value" xml:space="default"><tspan dominant-baseline="start">220</tspan></text><rect x="61" y="81" width="126" height="78" rx="1" fill="#dedede" stroke="#000" stroke-opacity=".87" stroke-width="2" tb:tag="in-value-box"/><text x="123.76855" y="136.65625" fill="#002878" font-family="Roboto" font-size="44px" font-weight="400" text-anchor="middle" tb:tag="in-value" xml:space="default"><tspan dominant-baseline="start">230</tspan></text><text x="123.29346" y="57.832031" fill="#000000" font-family="Roboto" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="in-label" xml:space="default"><tspan dominant-baseline="start">in</tspan></text><text x="275.96484" y="55.873047" fill="#000000" font-family="Roboto" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="out-label" xml:space="default"><tspan dominant-baseline="start">out</tspan></text><path d="m134.53 0s-134.53 0-134.53 33.5v164.18c0 1.3256 3.5818 2.3202 8 2.3202h384c4.418 0 8-0.9946 8-2.3202v-164.18c0-33.5-132.14-33.5-132.14-33.5h-67.858zm134.14 40.6c-2.5774 0-4.6666 0.6268-4.6666 1.4v150.2c0 0.7732 2.0894 1.4 4.6666 1.4h29.332c2.5774 0 4.6666-0.6268 4.6666-1.4v-150.2c0-0.7732-2.0894-1.4-4.6666-1.4z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
+<rect width="400" height="200" fill="#fff" tb:tag="background"/><rect x="1" y="1" width="398" height="198" stroke="#000" stroke-opacity=".87" stroke-width="2"/><rect x="213" y="81" width="126" height="78" rx="1" fill="#dedede" stroke="#000" stroke-opacity=".87" stroke-width="2" tb:tag="out-value-box"/><text x="275.76855" y="136.65625" fill="#002878" font-family="Roboto, sans-serif" font-size="44px" font-weight="400" text-anchor="middle" tb:tag="out-value" xml:space="default"><tspan dominant-baseline="start">220</tspan></text><rect x="61" y="81" width="126" height="78" rx="1" fill="#dedede" stroke="#000" stroke-opacity=".87" stroke-width="2" tb:tag="in-value-box"/><text x="123.76855" y="136.65625" fill="#002878" font-family="Roboto, sans-serif" font-size="44px" font-weight="400" text-anchor="middle" tb:tag="in-value" xml:space="default"><tspan dominant-baseline="start">230</tspan></text><text x="123.29346" y="57.832031" fill="#000000" font-family="Roboto, sans-serif" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="in-label" xml:space="default"><tspan dominant-baseline="start">in</tspan></text><text x="275.96484" y="55.873047" fill="#000000" font-family="Roboto, sans-serif" font-size="34px" font-weight="400" text-anchor="middle" tb:tag="out-label" xml:space="default"><tspan dominant-baseline="start">out</tspan></text><path d="m134.53 0s-134.53 0-134.53 33.5v164.18c0 1.3256 3.5818 2.3202 8 2.3202h384c4.418 0 8-0.9946 8-2.3202v-164.18c0-33.5-132.14-33.5-132.14-33.5h-67.858zm134.14 40.6c-2.5774 0-4.6666 0.6268-4.6666 1.4v150.2c0 0.7732 2.0894 1.4 4.6666 1.4h29.332c2.5774 0 4.6666-0.6268 4.6666-1.4v-150.2c0-0.7732-2.0894-1.4-4.6666-1.4z" fill="#000" fill-opacity="0" tb:tag="clickArea"/><g fill="#d12730" style="display: none;" tb:tag="critical">
   <rect width="84" height="84" rx="4" fill="#fff" style=""/>
   <rect width="84" height="84" rx="4" style=""/>
   <rect x="2" y="2" width="80" height="80" rx="2" stroke="#000" stroke-opacity=".87" stroke-width="4" style=""/>

From db1eb1682f291c380fb66d6a44b06bd563315cb5 Mon Sep 17 00:00:00 2001
From: Artem Dzhereleiko <Dgerik2015@gmail.com>
Date: Mon, 28 Jul 2025 17:24:37 +0300
Subject: [PATCH 04/14] UI: Fixed edit and improve create new

---
 .../template/template-notification-dialog.component.ts |  4 ++++
 .../notification/template-autocomplete.component.html  |  5 ++++-
 .../notification/template-autocomplete.component.ts    | 10 ++++++++++
 ui-ngx/src/assets/locale/locale.constant-en_US.json    |  1 +
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.ts
index 98595de798..0f13409a3e 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.ts
@@ -40,6 +40,7 @@ export interface TemplateNotificationDialogData {
   predefinedType?: NotificationType;
   isAdd?: boolean;
   isCopy?: boolean;
+  name?: string;
 }
 
 @Component({
@@ -85,6 +86,9 @@ export class TemplateNotificationDialogComponent
       this.hideSelectType = true;
       this.templateNotificationForm.get('notificationType').setValue(this.data.predefinedType, {emitEvent: false});
     }
+    if (isDefinedAndNotNull(this.data?.name)) {
+      this.templateNotificationForm.get('name').setValue(this.data.name, {emitEvent: false});
+    }
 
     if (data.isAdd || data.isCopy) {
       this.dialogTitle = 'notification.add-notification-template';
diff --git a/ui-ngx/src/app/shared/components/notification/template-autocomplete.component.html b/ui-ngx/src/app/shared/components/notification/template-autocomplete.component.html
index d5e67a1f60..446dc18e34 100644
--- a/ui-ngx/src/app/shared/components/notification/template-autocomplete.component.html
+++ b/ui-ngx/src/app/shared/components/notification/template-autocomplete.component.html
@@ -29,7 +29,7 @@
           (click)="clear()">
     <mat-icon class="material-icons">close</mat-icon>
   </button>
-  <button *ngIf="selectTemplateFormGroup.get('templateName').value && !disabled && allowEdit"
+  <button *ngIf="selectTemplateFormGroup.get('templateName').value?.id && !disabled && allowEdit"
           type="button"
           matSuffix mat-icon-button aria-label="Edit"
           matTooltip="{{ 'notification.edit-notification-template' | translate }}"
@@ -62,6 +62,9 @@
         </div>
         <ng-template #searchNotEmpty>
           <span>{{ 'notification.no-template-matching' | translate : {template: truncate.transform(searchText, true, 6, &apos;...&apos;)} }}</span>
+          <span *ngIf="allowCreate">
+            <a translate (click)="createTemplateBySearchText($event, searchText)">notification.create-new-template</a>
+          </span>
         </ng-template>
       </div>
     </mat-option>
diff --git a/ui-ngx/src/app/shared/components/notification/template-autocomplete.component.ts b/ui-ngx/src/app/shared/components/notification/template-autocomplete.component.ts
index 97c2a56bf5..3bf066d43b 100644
--- a/ui-ngx/src/app/shared/components/notification/template-autocomplete.component.ts
+++ b/ui-ngx/src/app/shared/components/notification/template-autocomplete.component.ts
@@ -221,6 +221,16 @@ export class TemplateAutocompleteComponent implements ControlValueAccessor, OnIn
       predefinedType: this.notificationTypes
     });
   }
+  createTemplateBySearchText($event: Event, searchText: string) {
+    if ($event) {
+      $event.stopPropagation();
+    }
+    this.openNotificationTemplateDialog({
+      isAdd: true,
+      predefinedType: this.notificationTypes,
+      name: searchText
+    });
+  }
 
   private openNotificationTemplateDialog(dialogData?: TemplateNotificationDialogData) {
     this.dialog.open<TemplateNotificationDialogComponent, TemplateNotificationDialogData,
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index a7396ad49e..f714c1a6ff 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -4071,6 +4071,7 @@
         "no-severity-found": "No severity found",
         "no-severity-matching": "'{{severity}}' not found.",
         "no-template-matching": "No resource matching '{{template}}' were found.",
+        "create-new-template": "Create a new one!",
         "not-found-slack-recipient": "Slack recipient not found",
         "notification": "Notification",
         "notification-center": "Notification center",

From 7acf8de9f88d0f270d10f938001838b806365ce1 Mon Sep 17 00:00:00 2001
From: Artem Dzhereleiko <Dgerik2015@gmail.com>
Date: Mon, 28 Jul 2025 17:55:30 +0300
Subject: [PATCH 05/14] UI: Ref

---
 .../template-autocomplete.component.html        |  2 +-
 .../template-autocomplete.component.ts          | 17 +++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/ui-ngx/src/app/shared/components/notification/template-autocomplete.component.html b/ui-ngx/src/app/shared/components/notification/template-autocomplete.component.html
index 446dc18e34..d712f11114 100644
--- a/ui-ngx/src/app/shared/components/notification/template-autocomplete.component.html
+++ b/ui-ngx/src/app/shared/components/notification/template-autocomplete.component.html
@@ -63,7 +63,7 @@
         <ng-template #searchNotEmpty>
           <span>{{ 'notification.no-template-matching' | translate : {template: truncate.transform(searchText, true, 6, &apos;...&apos;)} }}</span>
           <span *ngIf="allowCreate">
-            <a translate (click)="createTemplateBySearchText($event, searchText)">notification.create-new-template</a>
+            <a translate (click)="createTemplateByName($event, searchText)">notification.create-new-template</a>
           </span>
         </ng-template>
       </div>
diff --git a/ui-ngx/src/app/shared/components/notification/template-autocomplete.component.ts b/ui-ngx/src/app/shared/components/notification/template-autocomplete.component.ts
index 3bf066d43b..8054483027 100644
--- a/ui-ngx/src/app/shared/components/notification/template-autocomplete.component.ts
+++ b/ui-ngx/src/app/shared/components/notification/template-autocomplete.component.ts
@@ -212,23 +212,16 @@ export class TemplateAutocompleteComponent implements ControlValueAccessor, OnIn
   }
 
   createTemplate($event: Event, button: MatButton) {
-    if ($event) {
-      $event.stopPropagation();
-    }
+    $event?.stopPropagation();
     button._elementRef.nativeElement.blur();
-    this.openNotificationTemplateDialog({
-      isAdd: true,
-      predefinedType: this.notificationTypes
-    });
+    this.createTemplateByName($event);
   }
-  createTemplateBySearchText($event: Event, searchText: string) {
-    if ($event) {
-      $event.stopPropagation();
-    }
+  createTemplateByName($event: Event, name?: string) {
+    $event?.stopPropagation();
     this.openNotificationTemplateDialog({
       isAdd: true,
       predefinedType: this.notificationTypes,
-      name: searchText
+      name
     });
   }
 

From 0bf3171bbf1e314424bb09f61ff377619364c6dc Mon Sep 17 00:00:00 2001
From: Vladyslav Prykhodko <vprykhodko@thingsboard.io>
Date: Mon, 28 Jul 2025 17:57:43 +0300
Subject: [PATCH 06/14] Update template-autocomplete.component.ts

---
 .../components/notification/template-autocomplete.component.ts   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui-ngx/src/app/shared/components/notification/template-autocomplete.component.ts b/ui-ngx/src/app/shared/components/notification/template-autocomplete.component.ts
index 8054483027..3e703e5d6a 100644
--- a/ui-ngx/src/app/shared/components/notification/template-autocomplete.component.ts
+++ b/ui-ngx/src/app/shared/components/notification/template-autocomplete.component.ts
@@ -216,6 +216,7 @@ export class TemplateAutocompleteComponent implements ControlValueAccessor, OnIn
     button._elementRef.nativeElement.blur();
     this.createTemplateByName($event);
   }
+  
   createTemplateByName($event: Event, name?: string) {
     $event?.stopPropagation();
     this.openNotificationTemplateDialog({

From f2ad1ef79650e409ef5482ac1c99066afb65d639 Mon Sep 17 00:00:00 2001
From: VIacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Wed, 30 Jul 2025 12:23:06 +0300
Subject: [PATCH 07/14] Fix Slack files upload support

---
 .../provider/DefaultSlackService.java         | 98 ++++++++++++++++---
 .../notification/targets/slack/SlackFile.java | 29 ++++++
 .../engine/api/notification/SlackService.java |  3 +
 3 files changed, 114 insertions(+), 16 deletions(-)
 create mode 100644 common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/slack/SlackFile.java

diff --git a/application/src/main/java/org/thingsboard/server/service/notification/provider/DefaultSlackService.java b/application/src/main/java/org/thingsboard/server/service/notification/provider/DefaultSlackService.java
index 85f0642c55..ec835d152f 100644
--- a/application/src/main/java/org/thingsboard/server/service/notification/provider/DefaultSlackService.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/provider/DefaultSlackService.java
@@ -15,20 +15,25 @@
  */
 package org.thingsboard.server.service.notification.provider;
 
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.slack.api.Slack;
 import com.slack.api.methods.MethodsClient;
 import com.slack.api.methods.SlackApiRequest;
 import com.slack.api.methods.SlackApiTextResponse;
+import com.slack.api.methods.SlackFilesUploadV2Exception;
 import com.slack.api.methods.request.chat.ChatPostMessageRequest;
 import com.slack.api.methods.request.conversations.ConversationsListRequest;
+import com.slack.api.methods.request.conversations.ConversationsOpenRequest;
+import com.slack.api.methods.request.files.FilesUploadV2Request;
 import com.slack.api.methods.request.users.UsersListRequest;
 import com.slack.api.methods.response.conversations.ConversationsListResponse;
 import com.slack.api.methods.response.users.UsersListResponse;
 import com.slack.api.model.ConversationType;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.notification.SlackService;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
@@ -36,6 +41,8 @@ import org.thingsboard.server.common.data.notification.settings.NotificationSett
 import org.thingsboard.server.common.data.notification.settings.SlackNotificationDeliveryMethodConfig;
 import org.thingsboard.server.common.data.notification.targets.slack.SlackConversation;
 import org.thingsboard.server.common.data.notification.targets.slack.SlackConversationType;
+import org.thingsboard.server.common.data.notification.targets.slack.SlackFile;
+import org.thingsboard.server.common.data.util.CollectionsUtil;
 import org.thingsboard.server.common.data.util.ThrowingBiFunction;
 import org.thingsboard.server.dao.notification.NotificationSettingsService;
 
@@ -58,11 +65,40 @@ public class DefaultSlackService implements SlackService {
 
     @Override
     public void sendMessage(TenantId tenantId, String token, String conversationId, String message) {
-        ChatPostMessageRequest request = ChatPostMessageRequest.builder()
-                .channel(conversationId)
-                .text(message)
-                .build();
-        sendRequest(token, request, MethodsClient::chatPostMessage);
+        sendMessage(tenantId, token, conversationId, message, null);
+    }
+
+    @Override
+    public void sendMessage(TenantId tenantId, String token, String conversationId, String message, List<SlackFile> files) {
+        if (CollectionsUtil.isNotEmpty(files)) {
+            if (conversationId.startsWith("U")) { // direct message
+                /*
+                 * files.uploadV2 requires an existing channel ID, while chat.postMessage auto‑opens DMs
+                 * */
+                conversationId = sendRequest(token, ConversationsOpenRequest.builder()
+                        .users(List.of(conversationId))
+                        .build(), MethodsClient::conversationsOpen).getChannel().getId();
+            }
+
+            FilesUploadV2Request request = FilesUploadV2Request.builder()
+                    .initialComment(message)
+                    .channel(conversationId)
+                    .uploadFiles(files.stream()
+                            .map(file -> FilesUploadV2Request.UploadFile.builder()
+                                    .filename(file.getName())
+                                    .title(file.getName())
+                                    .fileData(file.getData())
+                                    .build())
+                            .toList())
+                    .build();
+            sendRequest(token, request, MethodsClient::filesUploadV2);
+        } else {
+            ChatPostMessageRequest request = ChatPostMessageRequest.builder()
+                    .channel(conversationId)
+                    .text(message)
+                    .build();
+            sendRequest(token, request, MethodsClient::chatPostMessage);
+        }
     }
 
     @Override
@@ -128,22 +164,52 @@ public class DefaultSlackService implements SlackService {
         R response;
         try {
             response = method.apply(client, request);
+        } catch (SlackFilesUploadV2Exception e) {
+            if (e.getGetURLResponses() != null) {
+                e.getGetURLResponses().forEach(this::checkResponse);
+            }
+            if (e.getCompleteResponse() != null) {
+                checkResponse(e.getCompleteResponse());
+            }
+            if (e.getFileInfoResponses() != null) {
+                e.getFileInfoResponses().forEach(this::checkResponse);
+            }
+            throw new RuntimeException("Failed to upload Slack file: " + e.toString(), e);
         } catch (Exception e) {
             throw new RuntimeException(e.getMessage(), e);
         }
 
-        if (!response.isOk()) {
-            String error = response.getError();
-            if (error == null) {
-                error = "unknown error";
-            } else if (error.contains("missing_scope")) {
-                String neededScope = response.getNeeded();
-                error = "bot token scope '" + neededScope + "' is needed";
-            }
-            throw new RuntimeException("Slack API error: " + error);
-        }
-
+        checkResponse(response);
         return response;
     }
 
+
+    private void checkResponse(SlackApiTextResponse response) {
+        if (response.isOk()) {
+            return;
+        }
+
+        String error = response.getError();
+        if (error != null) {
+            switch (error) {
+                case "missing_scope" -> {
+                    String neededScope = response.getNeeded();
+                    error = "bot token scope '" + neededScope + "' is needed";
+                }
+                case "not_in_channel" -> {
+                    error = "app needs to be added to the channel";
+                }
+                default -> {
+                    error = null;
+                }
+            }
+        }
+        if (error == null) {
+            ObjectNode responseJson = (ObjectNode) JacksonUtil.valueToTree(response);
+            responseJson.remove("httpResponseHeaders");
+            error = responseJson.toString();
+        }
+        throw new RuntimeException("Slack API error: " + error);
+    }
+
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/slack/SlackFile.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/slack/SlackFile.java
new file mode 100644
index 0000000000..1be73221c8
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/slack/SlackFile.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright © 2016-2025 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.common.data.notification.targets.slack;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class SlackFile {
+
+    private final String name;
+    private final String type; // one of https://api.slack.com/types/file#file_types
+    private final byte[] data;
+
+}
diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/notification/SlackService.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/notification/SlackService.java
index e68310fce9..1ac800f488 100644
--- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/notification/SlackService.java
+++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/notification/SlackService.java
@@ -18,6 +18,7 @@ package org.thingsboard.rule.engine.api.notification;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.notification.targets.slack.SlackConversation;
 import org.thingsboard.server.common.data.notification.targets.slack.SlackConversationType;
+import org.thingsboard.server.common.data.notification.targets.slack.SlackFile;
 
 import java.util.List;
 
@@ -25,6 +26,8 @@ public interface SlackService {
 
     void sendMessage(TenantId tenantId, String token, String conversationId, String message);
 
+    void sendMessage(TenantId tenantId, String token, String conversationId, String message, List<SlackFile> files);
+
     List<SlackConversation> listConversations(TenantId tenantId, String token, SlackConversationType conversationType);
 
     String getToken(TenantId tenantId);

From 8a57fb31d0d396a87122682f9348780fc244b869 Mon Sep 17 00:00:00 2001
From: Ekaterina Chantsova <chantsova.ekaterina@gmail.com>
Date: Tue, 29 Jul 2025 19:24:22 +0300
Subject: [PATCH 08/14] UI: add missing services and models to public-api

---
 ui-ngx/src/app/core/http/public-api.ts        |  5 +++++
 ui-ngx/src/app/shared/models/public-api.ts    |  6 ++++++
 .../app/shared/models/widget/public-api.ts    | 21 +++++++++++++++++++
 ui-ngx/src/app/shared/pipe/public-api.ts      |  1 +
 4 files changed, 33 insertions(+)
 create mode 100644 ui-ngx/src/app/shared/models/widget/public-api.ts

diff --git a/ui-ngx/src/app/core/http/public-api.ts b/ui-ngx/src/app/core/http/public-api.ts
index 63cc393ce6..43354f6b60 100644
--- a/ui-ngx/src/app/core/http/public-api.ts
+++ b/ui-ngx/src/app/core/http/public-api.ts
@@ -21,11 +21,13 @@ export * from './asset.service';
 export * from './asset-profile.service';
 export * from './attribute.service';
 export * from './audit-log.service';
+export * from './calculated-fields.service';
 export * from './component-descriptor.service';
 export * from './customer.service';
 export * from './dashboard.service';
 export * from './device.service';
 export * from './device-profile.service';
+export * from './domain.service';
 export * from './entities-version-control.service';
 export * from './entity.service';
 export * from './edge.service';
@@ -34,6 +36,8 @@ export * from './entity-view.service';
 export * from './event.service';
 export * from './http-utils';
 export * from './image.service';
+export * from './mobile-app.service';
+export * from './mobile-application.service';
 export * from './notification.service';
 export * from './oauth2.service';
 export * from './ota-package.service';
@@ -42,6 +46,7 @@ export * from './resource.service';
 export * from './rule-chain.service';
 export * from './tenant.service';
 export * from './tenant-profile.service';
+export * from './two-factor-authentication.service';
 export * from './ui-settings.service';
 export * from './user.service';
 export * from './user-settings.service';
diff --git a/ui-ngx/src/app/shared/models/public-api.ts b/ui-ngx/src/app/shared/models/public-api.ts
index 91e1a2b033..bd7fe18262 100644
--- a/ui-ngx/src/app/shared/models/public-api.ts
+++ b/ui-ngx/src/app/shared/models/public-api.ts
@@ -18,6 +18,8 @@ export * from './id/public-api';
 export * from './page/public-api';
 export * from './telemetry/telemetry.models';
 export * from './time/time.models';
+export * from './widget/public-api';
+export * from './action-widget-settings.models';
 export * from './alarm.models';
 export * from './alias.models';
 export * from './api-usage.models';
@@ -25,18 +27,22 @@ export * from './asset.models';
 export * from './audit-log.models';
 export * from './authority.enum';
 export * from './base-data';
+export * from './calculated-field.models';
 export * from './component-descriptor.models';
 export * from './constants';
 export * from './contact-based.model';
+export * from './country.models';
 export * from './customer.model';
 export * from './dashboard.models';
 export * from './device.models';
+export * from './dynamic-form.models';
 export * from './edge.models';
 export * from './entity.models';
 export * from './entity-type.models';
 export * from './entity-view.models';
 export * from './error.models';
 export * from './event.models';
+export * from './js-function.models';
 export * from './limited-api.models';
 export * from './login.models';
 export * from './material.models';
diff --git a/ui-ngx/src/app/shared/models/widget/public-api.ts b/ui-ngx/src/app/shared/models/widget/public-api.ts
new file mode 100644
index 0000000000..e9240e526a
--- /dev/null
+++ b/ui-ngx/src/app/shared/models/widget/public-api.ts
@@ -0,0 +1,21 @@
+///
+/// Copyright © 2016-2025 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+export * from './widget-model.definition';
+export * from './maps/map.models';
+export * from './maps/map-model.definition';
+export * from './maps/marker-shape.models';
+export * from './rpc/knob.component.models';
diff --git a/ui-ngx/src/app/shared/pipe/public-api.ts b/ui-ngx/src/app/shared/pipe/public-api.ts
index 3d30e2f5e7..5deaff7e1b 100644
--- a/ui-ngx/src/app/shared/pipe/public-api.ts
+++ b/ui-ngx/src/app/shared/pipe/public-api.ts
@@ -14,6 +14,7 @@
 /// limitations under the License.
 ///
 
+export * from './custom-translate.pipe';
 export * from './date-ago.pipe';
 export * from './enum-to-array.pipe';
 export * from './highlight.pipe';

From 850bb69c4e996902144e49f1dbd1a2d461c2553e Mon Sep 17 00:00:00 2001
From: Artem Dzhereleiko <Dgerik2015@gmail.com>
Date: Wed, 30 Jul 2025 15:10:46 +0300
Subject: [PATCH 09/14] UI: Add ellipsis to entity list and subtype list chip
 and fixed api usage state display value

---
 .../home/components/entity/entity-filter-view.component.ts | 3 +++
 .../shared/components/entity/entity-list.component.html    | 1 +
 .../components/entity/entity-subtype-list.component.html   | 1 +
 ui-ngx/src/styles.scss                                     | 7 +++++++
 4 files changed, 12 insertions(+)

diff --git a/ui-ngx/src/app/modules/home/components/entity/entity-filter-view.component.ts b/ui-ngx/src/app/modules/home/components/entity/entity-filter-view.component.ts
index ac7333079d..7eae04452d 100644
--- a/ui-ngx/src/app/modules/home/components/entity/entity-filter-view.component.ts
+++ b/ui-ngx/src/app/modules/home/components/entity/entity-filter-view.component.ts
@@ -128,6 +128,9 @@ export class EntityFilterViewComponent implements ControlValueAccessor {
               {edgeTypes});
           }
           break;
+        case AliasFilterType.apiUsageState:
+          this.filterDisplayValue = this.translate.instant('alias.filter-type-apiUsageState');
+          break;
         case AliasFilterType.entityViewType:
           const entityViewTypesQuoted = [];
           this.filter.entityViewTypes.forEach((entityViewType) => {
diff --git a/ui-ngx/src/app/shared/components/entity/entity-list.component.html b/ui-ngx/src/app/shared/components/entity/entity-list.component.html
index 9510f2a952..6bf7cdb78d 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-list.component.html
+++ b/ui-ngx/src/app/shared/components/entity/entity-list.component.html
@@ -25,6 +25,7 @@
   <mat-chip-grid #chipList formControlName="entities">
     <mat-chip-row
       *ngFor="let entity of entities"
+      class="tb-chip-row-ellipsis"
       [removable]="!disabled"
       (removed)="remove(entity)">
       {{entity.name}}
diff --git a/ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.html b/ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.html
index 595010fb19..6635921d7f 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.html
+++ b/ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.html
@@ -22,6 +22,7 @@
   <mat-chip-grid #chipList formControlName="entitySubtypeList">
     <mat-chip-row
       *ngFor="let entitySubtype of entitySubtypeList"
+      class="tb-chip-row-ellipsis"
       [removable]="!disabled"
       (removed)="remove(entitySubtype)">
       {{customTranslate(entitySubtype)}}
diff --git a/ui-ngx/src/styles.scss b/ui-ngx/src/styles.scss
index d3cc76b687..147f3087da 100644
--- a/ui-ngx/src/styles.scss
+++ b/ui-ngx/src/styles.scss
@@ -1255,6 +1255,13 @@ pre.tb-highlight {
     }
   }
 
+  .tb-chip-row-ellipsis {
+    overflow: hidden;
+    .mdc-evolution-chip__cell--primary, .mdc-evolution-chip__text-label {
+      overflow: hidden;
+    }
+  }
+
   @media #{$mat-lt-md} {
     .mat-mdc-form-field {
       .mat-mdc-form-field-infix {

From 7a38efb416f69660a65e42befee5d0241acc4b5c Mon Sep 17 00:00:00 2001
From: Ekaterina Chantsova <chantsova.ekaterina@gmail.com>
Date: Wed, 30 Jul 2025 15:25:24 +0300
Subject: [PATCH 10/14] UI: fixed widget preview height in widget type
 autocomplete

---
 .../home/pages/widget/widget-type-autocomplete.component.scss  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/modules/home/pages/widget/widget-type-autocomplete.component.scss b/ui-ngx/src/app/modules/home/pages/widget/widget-type-autocomplete.component.scss
index e28d8ec14a..c8f678d679 100644
--- a/ui-ngx/src/app/modules/home/pages/widget/widget-type-autocomplete.component.scss
+++ b/ui-ngx/src/app/modules/home/pages/widget/widget-type-autocomplete.component.scss
@@ -24,7 +24,8 @@
       }
       .tb-widget-type-option-image-preview {
         width: 36px;
-        max-height: 100%;
+        height: 100%;
+        max-height: 36px;
         object-fit: contain;
         border-radius: 6px;
       }

From d4116e368d61e515e893a5f76f6c72a23f0f3bd6 Mon Sep 17 00:00:00 2001
From: Artem Dzhereleiko <Dgerik2015@gmail.com>
Date: Wed, 30 Jul 2025 16:39:57 +0300
Subject: [PATCH 11/14] UI: Refactorign chip

---
 ...lated-field-arguments-table.component.html |  2 +-
 ...lated-field-arguments-table.component.scss |  6 -----
 .../string-items-list.component.html          |  1 +
 .../string-items-list.component.scss          | 22 -------------------
 .../components/string-items-list.component.ts |  2 +-
 ui-ngx/src/styles.scss                        |  2 +-
 6 files changed, 4 insertions(+), 31 deletions(-)
 delete mode 100644 ui-ngx/src/app/shared/components/string-items-list.component.scss

diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.html
index b4b5a939e1..4086b3e7b0 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.html
@@ -80,7 +80,7 @@
           {{ 'entity.key' | translate }}
         </mat-header-cell>
         <mat-cell *matCellDef="let argument" class="w-1/4 xs:w-1/3">
-          <mat-chip>
+          <mat-chip class="tb-chip-row-ellipsis">
             <div tbTruncateWithTooltip class="key-text">{{ argument.refEntityKey.key }}</div>
           </mat-chip>
         </mat-cell>
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.scss b/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.scss
index ae8fd25170..430958d0f4 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.scss
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.scss
@@ -55,12 +55,6 @@
 }
 
 :host ::ng-deep {
-  .mat-mdc-standard-chip {
-    .mdc-evolution-chip__cell--primary, .mdc-evolution-chip__action--primary, .mdc-evolution-chip__text-label {
-      overflow: hidden;
-    }
-  }
-
   .arguments-table:not(.arguments-table-with-error) {
     .mdc-data-table__row:last-child .mat-mdc-cell {
       border-bottom: none;
diff --git a/ui-ngx/src/app/shared/components/string-items-list.component.html b/ui-ngx/src/app/shared/components/string-items-list.component.html
index d467fbe5f0..0469be2589 100644
--- a/ui-ngx/src/app/shared/components/string-items-list.component.html
+++ b/ui-ngx/src/app/shared/components/string-items-list.component.html
@@ -23,6 +23,7 @@
   <mat-label *ngIf="label">{{ label }}</mat-label>
   <mat-chip-grid #itemsChipList formControlName="items" [required]="required">
     <mat-chip-row *ngFor="let item of itemList"
+                  class="tb-chip-row-ellipsis"
                   [removable]="!disabled"
                   [contentEditable]="editable && !disabled"
                   (removed)="removeItems(item)">
diff --git a/ui-ngx/src/app/shared/components/string-items-list.component.scss b/ui-ngx/src/app/shared/components/string-items-list.component.scss
deleted file mode 100644
index 726344037c..0000000000
--- a/ui-ngx/src/app/shared/components/string-items-list.component.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright © 2016-2025 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-.tb-string-items-list {
-  .mat-mdc-standard-chip {
-    .mdc-evolution-chip__cell--primary, .mat-mdc-chip-action-label {
-      overflow: hidden;
-    }
-  }
-}
diff --git a/ui-ngx/src/app/shared/components/string-items-list.component.ts b/ui-ngx/src/app/shared/components/string-items-list.component.ts
index 5fe6f44609..1c210fdf1f 100644
--- a/ui-ngx/src/app/shared/components/string-items-list.component.ts
+++ b/ui-ngx/src/app/shared/components/string-items-list.component.ts
@@ -39,7 +39,7 @@ export interface StringItemsOption {
 @Component({
   selector: 'tb-string-items-list',
   templateUrl: './string-items-list.component.html',
-  styleUrls: ['./string-items-list.component.scss'],
+  styleUrls: [],
   providers: [
     {
       provide: NG_VALUE_ACCESSOR,
diff --git a/ui-ngx/src/styles.scss b/ui-ngx/src/styles.scss
index 147f3087da..a8cf53534e 100644
--- a/ui-ngx/src/styles.scss
+++ b/ui-ngx/src/styles.scss
@@ -1257,7 +1257,7 @@ pre.tb-highlight {
 
   .tb-chip-row-ellipsis {
     overflow: hidden;
-    .mdc-evolution-chip__cell--primary, .mdc-evolution-chip__text-label {
+    .mdc-evolution-chip__cell--primary, .mdc-evolution-chip__action--primary, .mdc-evolution-chip__text-label {
       overflow: hidden;
     }
   }

From 9fa36fa31028c4dd7d4eada9aed0ba326b53368a Mon Sep 17 00:00:00 2001
From: Artem Dzhereleiko <Dgerik2015@gmail.com>
Date: Wed, 30 Jul 2025 17:50:46 +0300
Subject: [PATCH 12/14] UI: Fixed adaptive for alarm type list in filter panel

---
 .../alarm/alarm-filter-config.component.scss        | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-filter-config.component.scss b/ui-ngx/src/app/modules/home/components/alarm/alarm-filter-config.component.scss
index 2ee3c0089d..c9e5eee944 100644
--- a/ui-ngx/src/app/modules/home/components/alarm/alarm-filter-config.component.scss
+++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-filter-config.component.scss
@@ -13,6 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+@import '../scss/constants';
+
 :host {
   display: flex;
   max-width: 100%;
@@ -39,16 +42,12 @@
 
     tb-entity-subtype-list {
       flex: 1;
-      width: 180px;
+      @media #{$mat-gt-xs} {
+        width: 180px;
+      }
       .mdc-evolution-chip-set__chips {
         width: 100%;
       }
     }
-
-    .mat-mdc-chip {
-      .mdc-evolution-chip__cell, .mat-mdc-chip-action, .mat-mdc-chip-action-label {
-        overflow: hidden;
-      }
-    }
   }
 }

From 1a01cba35fad7c2ed83531f968302ad944bb7930 Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Thu, 31 Jul 2025 14:56:31 +0300
Subject: [PATCH 13/14] UI: Fixed bug dublicate alias when create alias in
 alias-select.component

---
 .../lib/settings/common/alias/entity-alias-select.component.ts   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/alias/entity-alias-select.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/alias/entity-alias-select.component.ts
index 1af25bd01e..d65d4067e5 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/alias/entity-alias-select.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/alias/entity-alias-select.component.ts
@@ -251,7 +251,6 @@ export class EntityAliasSelectComponent implements ControlValueAccessor, OnInit,
               }, 0);
             }
           } else {
-            this.entityAliasList.push(newAlias);
             this.modelValue = newAlias.id;
             this.selectEntityAliasFormGroup.get('entityAlias').patchValue(newAlias, {emitEvent: true});
             this.propagateChange(this.modelValue);

From 0c00b02a0d612973d446053a6aa8d3994bb85503 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Thu, 31 Jul 2025 16:23:42 +0300
Subject: [PATCH 14/14] Update cross-connector-hp.svg

---
 .../main/data/json/system/scada_symbols/cross-connector-hp.svg | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/src/main/data/json/system/scada_symbols/cross-connector-hp.svg b/application/src/main/data/json/system/scada_symbols/cross-connector-hp.svg
index e05bf4d048..926f9bc33f 100644
--- a/application/src/main/data/json/system/scada_symbols/cross-connector-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/cross-connector-hp.svg
@@ -489,7 +489,6 @@
       "type": "number",
       "default": 6,
       "required": true,
-      "subLabel": "Main",
       "divider": false,
       "fieldSuffix": "px",
       "min": 0,
@@ -584,4 +583,4 @@
   ]
 }]]></tb:metadata>
 <path d="M87 100H113C113 100 100 100 100 86C100 100 87 100 87 100Z" id="path12" fill="#1A1A1A" tb:tag="line-color"/><path d="M87 100H113C113 100 100 100 100 114C100 100 87 100 87 100Z" id="path10" fill="#1A1A1A" tb:tag="line-color"/><path d="M0 100H85C93.2843 100 100 93.2843 100 85V0" stroke-width="6" id="path8" stroke="#1A1A1A" tb:tag="line"/><path d="M200 100H115C106.716 100 100 93.2843 100 85V0" stroke-width="6" id="path6" stroke="#1A1A1A" tb:tag="line"/><path d="M0 100H85C93.2843 100 100 106.716 100 115V200" stroke-width="6" id="path4" stroke="#1A1A1A" tb:tag="line"/><path d="M200 100H115C106.716 100 100 106.716 100 115V200" stroke-width="6" id="path2" stroke="#1A1A1A" tb:tag="line"/><g tb:tag="animationGroup"><g tb:tag="leftLine"/><g tb:tag="topLine"/><g tb:tag="rightLine"/><g tb:tag="bottomLine"/></g>
-</svg>
\ No newline at end of file
+</svg>