UI: Refactoring connector settings

1 year ago · 166475a524
15 changed files with 376 additions and 733 deletions
--- a/application/src/main/data/json/system/scada_symbols/bottom-right-elbow-connector-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/bottom-right-elbow-connector-hp.svg
@ -7,7 +7,7 @@
  "tags": [
    {
      "tag": "line",
-      "stateRenderFunction": "element.stroke(ctx.properties.lineColor);\nif (ctx.properties.mainLine) {\n    element.attr({'stroke-width': ctx.properties.mainLineSize});\n} else {\n    element.attr({'stroke-width': ctx.properties.secondaryLineSize});\n}",
+      "stateRenderFunction": "element.stroke(ctx.properties.lineColor);\nelement.attr({'stroke-width': ctx.properties.lineSize});",
      "actions": null
    }
  ],
@ -53,8 +53,8 @@
    },
    {
      "id": "animationDirection",
-      "name": "{i18n:scada.symbol.animation-direction}",
-      "hint": "{i18n:scada.symbol.animation-direction-hint}",
+      "name": "{i18n:scada.symbol.arrow-direction}",
+      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
      "group": null,
      "type": "value",
      "valueType": "BOOLEAN",
@ -131,48 +131,22 @@
  ],
  "properties": [
    {
-      "id": "mainLine",
-      "name": "{i18n:scada.symbol.main-line}",
-      "type": "switch",
-      "default": true,
-      "disabled": false,
-      "visible": true
-    },
-    {
-      "id": "mainLineSize",
-      "name": "{i18n:scada.symbol.main-line}",
+      "id": "lineSize",
+      "name": "{i18n:scada.symbol.line}",
      "type": "number",
      "default": 6,
      "required": true,
-      "subLabel": "Main",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
-      "condition": "return model.mainLine;",
      "min": 0,
      "max": 99,
      "step": 1,
      "disabled": false,
      "visible": true
    },
-    {
-      "id": "secondaryLineSize",
-      "name": "{i18n:scada.symbol.main-line}",
-      "type": "number",
-      "default": 2,
-      "required": true,
-      "subLabel": "Secondary",
-      "divider": true,
-      "fieldSuffix": "px",
-      "condition": "return !model.mainLine;",
-      "min": 0,
-      "max": 99,
-      "step": 1,
-      "disabled": false,
-      "visible": false
-    },
    {
      "id": "lineColor",
-      "name": "{i18n:scada.symbol.main-line}",
+      "name": "{i18n:scada.symbol.line}",
      "type": "color",
      "default": "#1A1A1A",
      "disabled": false,
@ -180,12 +154,11 @@
    },
    {
      "id": "flowAnimationWidth",
-      "name": "{i18n:scada.symbol.flow}",
-      "group": "{i18n:scada.symbol.animation}",
+      "name": "{i18n:scada.symbol.flow-line}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 4,
-      "subLabel": "Width",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
      "min": 1,
      "step": 1,
@ -194,8 +167,8 @@
    },
    {
      "id": "flowAnimationColor",
-      "name": "{i18n:scada.symbol.flow}",
-      "group": "{i18n:scada.symbol.animation}",
+      "name": "{i18n:scada.symbol.flow-line}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "color",
      "default": "#C8DFF7",
      "disabled": false,
@ -203,14 +176,14 @@
    },
    {
      "id": "flowStyleDash",
-      "name": "{i18n:scada.symbol.flow-style}",
+      "name": "{i18n:scada.symbol.flow-line-style}",
      "hint": "{i18n:scada.symbol.flow-style-hint}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 10,
      "required": true,
      "subLabel": "{i18n:scada.symbol.dash}",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
      "min": 0,
      "step": 1,
@ -219,14 +192,14 @@
    },
    {
      "id": "flowStyleGap",
-      "name": "{i18n:scada.symbol.flow-style}",
+      "name": "{i18n:scada.symbol.flow-line-style}",
      "hint": "{i18n:scada.symbol.flow-style-hint}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 10,
      "subLabel": "{i18n:scada.symbol.gap}",
      "fieldSuffix": "px",
-      "min": 1,
+      "min": 0,
      "step": 1,
      "disabled": false,
      "visible": true
@ -234,7 +207,7 @@
    {
      "id": "flowDashCap",
      "name": "{i18n:scada.symbol.flow-dash-cap}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "select",
      "default": "butt",
      "items": [
--- a/application/src/main/data/json/system/scada_symbols/bottom-tee-connector-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/bottom-tee-connector-hp.svg
@ -7,7 +7,7 @@
  "tags": [
    {
      "tag": "line",
-      "stateRenderFunction": "element.stroke(ctx.properties.lineColor);\nif (ctx.properties.mainLine) {\n    element.attr({'stroke-width': ctx.properties.mainLineSize});\n} else {\n    element.attr({'stroke-width': ctx.properties.secondaryLineSize});\n}",
+      "stateRenderFunction": "element.stroke(ctx.properties.lineColor);\nelement.attr({'stroke-width': ctx.properties.lineSize});",
      "actions": null
    },
    {
@ -58,8 +58,8 @@
    },
    {
      "id": "leftFlowDirection",
-      "name": "{i18n:scada.symbol.animation-direction}",
-      "hint": "{i18n:scada.symbol.animation-direction-hint}",
+      "name": "{i18n:scada.symbol.arrow-direction}",
+      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
      "group": "{i18n:scada.symbol.left-connector}",
      "type": "value",
      "valueType": "BOOLEAN",
@ -174,8 +174,8 @@
    },
    {
      "id": "rightFlowDirection",
-      "name": "{i18n:scada.symbol.flow-direction}",
-      "hint": "{i18n:scada.symbol.flow-direction-hint}",
+      "name": "{i18n:scada.symbol.arrow-direction}",
+      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
      "group": "{i18n:scada.symbol.right-connector}",
      "type": "value",
      "valueType": "BOOLEAN",
@ -290,8 +290,8 @@
    },
    {
      "id": "bottomFlowDirection",
-      "name": "{i18n:scada.symbol.animation-direction}",
-      "hint": "{i18n:scada.symbol.animation-direction-hint}",
+      "name": "{i18n:scada.symbol.arrow-direction}",
+      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
      "group": "{i18n:scada.symbol.bottom-connector}",
      "type": "value",
      "valueType": "BOOLEAN",
@ -368,48 +368,22 @@
  ],
  "properties": [
    {
-      "id": "mainLine",
-      "name": "{i18n:scada.symbol.main-line}",
-      "type": "switch",
-      "default": true,
-      "disabled": false,
-      "visible": true
-    },
-    {
-      "id": "mainLineSize",
-      "name": "{i18n:scada.symbol.main-line}",
+      "id": "lineSize",
+      "name": "{i18n:scada.symbol.line}",
      "type": "number",
      "default": 6,
      "required": true,
-      "subLabel": "Main",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
-      "condition": "return model.mainLine;",
      "min": 0,
      "max": 99,
      "step": 1,
      "disabled": false,
      "visible": true
    },
-    {
-      "id": "secondaryLineSize",
-      "name": "{i18n:scada.symbol.main-line}",
-      "type": "number",
-      "default": 2,
-      "required": true,
-      "subLabel": "Secondary",
-      "divider": true,
-      "fieldSuffix": "px",
-      "condition": "return !model.mainLine;",
-      "min": 0,
-      "max": 99,
-      "step": 1,
-      "disabled": false,
-      "visible": false
-    },
    {
      "id": "lineColor",
-      "name": "{i18n:scada.symbol.main-line}",
+      "name": "{i18n:scada.symbol.line}",
      "type": "color",
      "default": "#1A1A1A",
      "disabled": false,
@ -417,12 +391,11 @@
    },
    {
      "id": "flowAnimationWidth",
-      "name": "{i18n:scada.symbol.flow}",
-      "group": "{i18n:scada.symbol.animation}",
+      "name": "{i18n:scada.symbol.flow-line}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 4,
-      "subLabel": "Width",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
      "min": 1,
      "step": 1,
@ -431,8 +404,8 @@
    },
    {
      "id": "flowAnimationColor",
-      "name": "{i18n:scada.symbol.flow}",
-      "group": "{i18n:scada.symbol.animation}",
+      "name": "{i18n:scada.symbol.flow-line}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "color",
      "default": "#C8DFF7",
      "disabled": false,
@ -440,14 +413,14 @@
    },
    {
      "id": "flowStyleDash",
-      "name": "{i18n:scada.symbol.flow-style}",
+      "name": "{i18n:scada.symbol.flow-line-style}",
      "hint": "{i18n:scada.symbol.flow-style-hint}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 10,
      "required": true,
      "subLabel": "{i18n:scada.symbol.dash}",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
      "min": 0,
      "step": 1,
@ -456,14 +429,14 @@
    },
    {
      "id": "flowStyleGap",
-      "name": "{i18n:scada.symbol.flow-style}",
+      "name": "{i18n:scada.symbol.flow-line-style}",
      "hint": "{i18n:scada.symbol.flow-style-hint}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 10,
      "subLabel": "{i18n:scada.symbol.gap}",
      "fieldSuffix": "px",
-      "min": 1,
+      "min": 0,
      "step": 1,
      "disabled": false,
      "visible": true
@ -471,7 +444,7 @@
    {
      "id": "flowDashCap",
      "name": "{i18n:scada.symbol.flow-dash-cap}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "select",
      "default": "butt",
      "items": [
--- 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
@ -7,7 +7,7 @@
  "tags": [
    {
      "tag": "line",
-      "stateRenderFunction": "element.stroke(ctx.properties.lineColor);\nif (ctx.properties.mainLine) {\n    element.attr({'stroke-width': ctx.properties.mainLineSize});\n} else {\n    element.attr({'stroke-width': ctx.properties.secondaryLineSize});\n}",
+      "stateRenderFunction": "element.stroke(ctx.properties.lineColor);\nelement.attr({'stroke-width': ctx.properties.lineSize});",
      "actions": null
    },
    {
@ -58,8 +58,8 @@
    },
    {
      "id": "leftFlowDirection",
-      "name": "{i18n:scada.symbol.animation-direction}",
-      "hint": "{i18n:scada.symbol.animation-direction-hint}",
+      "name": "{i18n:scada.symbol.arrow-direction}",
+      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
      "group": "{i18n:scada.symbol.left-connector}",
      "type": "value",
      "valueType": "BOOLEAN",
@ -174,8 +174,8 @@
    },
    {
      "id": "topFlowDirection",
-      "name": "{i18n:scada.symbol.animation-direction}",
-      "hint": "{i18n:scada.symbol.animation-direction-hint}",
+      "name": "{i18n:scada.symbol.arrow-direction}",
+      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
      "group": "{i18n:scada.symbol.top-connector}",
      "type": "value",
      "valueType": "BOOLEAN",
@ -290,8 +290,8 @@
    },
    {
      "id": "rightFlowDirection",
-      "name": "{i18n:scada.symbol.flow-direction}",
-      "hint": "{i18n:scada.symbol.flow-direction-hint}",
+      "name": "{i18n:scada.symbol.arrow-direction}",
+      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
      "group": "{i18n:scada.symbol.right-connector}",
      "type": "value",
      "valueType": "BOOLEAN",
@ -406,8 +406,8 @@
    },
    {
      "id": "bottomFlowDirection",
-      "name": "{i18n:scada.symbol.animation-direction}",
-      "hint": "{i18n:scada.symbol.animation-direction-hint}",
+      "name": "{i18n:scada.symbol.arrow-direction}",
+      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
      "group": "{i18n:scada.symbol.bottom-connector}",
      "type": "value",
      "valueType": "BOOLEAN",
@ -483,17 +483,9 @@
    }
  ],
  "properties": [
-    {
-      "id": "mainLine",
-      "name": "{i18n:scada.symbol.main-line}",
-      "type": "switch",
-      "default": true,
-      "disabled": false,
-      "visible": true
-    },
    {
      "id": "mainLineSize",
-      "name": "{i18n:scada.symbol.main-line}",
+      "name": "{i18n:scada.symbol.line}",
      "type": "number",
      "default": 6,
      "required": true,
@ -504,28 +496,11 @@
      "min": 0,
      "max": 99,
      "step": 1,
-      "disabled": false,
-      "visible": true
-    },
-    {
-      "id": "secondaryLineSize",
-      "name": "{i18n:scada.symbol.main-line}",
-      "type": "number",
-      "default": 2,
-      "required": true,
-      "subLabel": "Secondary",
-      "divider": true,
-      "fieldSuffix": "px",
-      "condition": "return !model.mainLine;",
-      "min": 0,
-      "max": 99,
-      "step": 1,
-      "disabled": false,
-      "visible": false
+      "disabled": false
    },
    {
      "id": "lineColor",
-      "name": "{i18n:scada.symbol.main-line}",
+      "name": "{i18n:scada.symbol.line}",
      "type": "color",
      "default": "#1A1A1A",
      "disabled": false,
@ -533,12 +508,11 @@
    },
    {
      "id": "flowAnimationWidth",
-      "name": "{i18n:scada.symbol.flow}",
-      "group": "{i18n:scada.symbol.animation}",
+      "name": "{i18n:scada.symbol.flow-line}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 4,
-      "subLabel": "Width",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
      "min": 1,
      "step": 1,
@ -547,8 +521,8 @@
    },
    {
      "id": "flowAnimationColor",
-      "name": "{i18n:scada.symbol.flow}",
-      "group": "{i18n:scada.symbol.animation}",
+      "name": "{i18n:scada.symbol.flow-line}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "color",
      "default": "#C8DFF7",
      "disabled": false,
@ -556,14 +530,14 @@
    },
    {
      "id": "flowStyleDash",
-      "name": "{i18n:scada.symbol.flow-style}",
+      "name": "{i18n:scada.symbol.flow-line-style}",
      "hint": "{i18n:scada.symbol.flow-style-hint}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 10,
      "required": true,
      "subLabel": "{i18n:scada.symbol.dash}",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
      "min": 0,
      "step": 1,
@ -572,14 +546,14 @@
    },
    {
      "id": "flowStyleGap",
-      "name": "{i18n:scada.symbol.flow-style}",
+      "name": "{i18n:scada.symbol.flow-line-style}",
      "hint": "{i18n:scada.symbol.flow-style-hint}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 10,
      "subLabel": "{i18n:scada.symbol.gap}",
      "fieldSuffix": "px",
-      "min": 1,
+      "min": 0,
      "step": 1,
      "disabled": false,
      "visible": true
@ -587,7 +561,7 @@
    {
      "id": "flowDashCap",
      "name": "{i18n:scada.symbol.flow-dash-cap}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "select",
      "default": "butt",
      "items": [
--- a/application/src/main/data/json/system/scada_symbols/horizontal-connector-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/horizontal-connector-hp.svg
@ -12,7 +12,7 @@
    },
    {
      "tag": "line",
-      "stateRenderFunction": "element.stroke(ctx.properties.lineColor);\nif (ctx.properties.mainLine) {\n    element.attr({'stroke-width': ctx.properties.mainLineSize});\n} else {\n    element.attr({'stroke-width': ctx.properties.secondaryLineSize});\n}",
+      "stateRenderFunction": "element.stroke(ctx.properties.lineColor);\nelement.attr({'stroke-width': ctx.properties.lineSize});",
      "actions": null
    }
  ],
@ -53,18 +53,18 @@
      "defaultWidgetActionSettings": null
    },
    {
-      "id": "arrowDirection",
-      "name": "{i18n:scada.symbol.arrow-direction}",
-      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
+      "id": "flowAnimation",
+      "name": "{i18n:scada.symbol.flow-animation}",
+      "hint": "{i18n:scada.symbol.flow-animation-hint}",
      "group": null,
      "type": "value",
      "valueType": "BOOLEAN",
-      "trueLabel": "{i18n:scada.symbol.forward}",
-      "falseLabel": "{i18n:scada.symbol.reverse}",
-      "stateLabel": "{i18n:scada.symbol.forward}",
+      "trueLabel": "{i18n:scada.symbol.present}",
+      "falseLabel": "{i18n:scada.symbol.absent}",
+      "stateLabel": "{i18n:scada.symbol.flow-present}",
      "defaultGetValueSettings": {
        "action": "DO_NOTHING",
-        "defaultValue": true,
+        "defaultValue": false,
        "executeRpc": {
          "method": "getState",
          "requestTimeout": 5000,
@ -72,34 +72,38 @@
          "persistentPollingInterval": 1000
        },
        "getAttribute": {
-          "scope": null,
-          "key": "state"
+          "key": "state",
+          "scope": null
        },
        "getTimeSeries": {
          "key": "state"
        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
        "dataToValue": {
          "type": "NONE",
-          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
-          "compareToValue": true
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
        }
      },
      "defaultSetValueSettings": null,
      "defaultWidgetActionSettings": null
    },
    {
-      "id": "flowAnimation",
-      "name": "{i18n:scada.symbol.flow-animation}",
-      "hint": "{i18n:scada.symbol.flow-animation-hint}",
+      "id": "arrowDirection",
+      "name": "{i18n:scada.symbol.arrow-direction}",
+      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
      "group": null,
      "type": "value",
      "valueType": "BOOLEAN",
-      "trueLabel": "{i18n:scada.symbol.present}",
-      "falseLabel": "{i18n:scada.symbol.absent}",
-      "stateLabel": "{i18n:scada.symbol.flow-present}",
+      "trueLabel": "{i18n:scada.symbol.forward}",
+      "falseLabel": "{i18n:scada.symbol.reverse}",
+      "stateLabel": "{i18n:scada.symbol.forward}",
      "defaultGetValueSettings": {
        "action": "DO_NOTHING",
-        "defaultValue": false,
+        "defaultValue": true,
        "executeRpc": {
          "method": "getState",
          "requestTimeout": 5000,
@ -107,20 +111,16 @@
          "persistentPollingInterval": 1000
        },
        "getAttribute": {
-          "key": "state",
-          "scope": null
+          "scope": null,
+          "key": "state"
        },
        "getTimeSeries": {
          "key": "state"
        },
-        "getAlarmStatus": {
-          "severityList": null,
-          "typeList": null
-        },
        "dataToValue": {
          "type": "NONE",
-          "compareToValue": true,
-          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
        }
      },
      "defaultSetValueSettings": null,
@ -167,48 +167,22 @@
  ],
  "properties": [
    {
-      "id": "mainLine",
-      "name": "{i18n:scada.symbol.main-line}",
-      "type": "switch",
-      "default": true,
-      "disabled": false,
-      "visible": true
-    },
-    {
-      "id": "mainLineSize",
-      "name": "{i18n:scada.symbol.main-line}",
+      "id": "lineSize",
+      "name": "{i18n:scada.symbol.line}",
      "type": "number",
      "default": 6,
      "required": true,
-      "subLabel": "Main",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
-      "condition": "return model.mainLine;",
      "min": 0,
      "max": 99,
      "step": 1,
      "disabled": false,
      "visible": true
    },
-    {
-      "id": "secondaryLineSize",
-      "name": "{i18n:scada.symbol.main-line}",
-      "type": "number",
-      "default": 2,
-      "required": true,
-      "subLabel": "Secondary",
-      "divider": true,
-      "fieldSuffix": "px",
-      "condition": "return !model.mainLine;",
-      "min": 0,
-      "max": 99,
-      "step": 1,
-      "disabled": false,
-      "visible": false
-    },
    {
      "id": "lineColor",
-      "name": "{i18n:scada.symbol.main-line}",
+      "name": "{i18n:scada.symbol.line}",
      "type": "color",
      "default": "#1A1A1A",
      "disabled": false,
@ -216,11 +190,10 @@
    },
    {
      "id": "flowAnimationWidth",
-      "name": "{i18n:scada.symbol.flow}",
-      "group": "{i18n:scada.symbol.animation}",
+      "name": "{i18n:scada.symbol.flow-line}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 4,
-      "subLabel": "Width",
      "fieldSuffix": "px",
      "min": 1,
      "step": 1,
@ -229,8 +202,8 @@
    },
    {
      "id": "flowAnimationColor",
-      "name": "{i18n:scada.symbol.flow}",
-      "group": "{i18n:scada.symbol.animation}",
+      "name": "{i18n:scada.symbol.flow-line}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "color",
      "default": "#C8DFF7",
      "disabled": false,
@ -238,14 +211,14 @@
    },
    {
      "id": "flowStyleDash",
-      "name": "{i18n:scada.symbol.flow-style}",
+      "name": "{i18n:scada.symbol.flow-line-style}",
      "hint": "{i18n:scada.symbol.flow-style-hint}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 10,
      "required": true,
      "subLabel": "{i18n:scada.symbol.dash}",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
      "min": 0,
      "step": 1,
@ -254,14 +227,14 @@
    },
    {
      "id": "flowStyleGap",
-      "name": "{i18n:scada.symbol.flow-style}",
+      "name": "{i18n:scada.symbol.flow-line-style}",
      "hint": "{i18n:scada.symbol.flow-style-hint}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 10,
      "subLabel": "{i18n:scada.symbol.gap}",
      "fieldSuffix": "px",
-      "min": 1,
+      "min": 0,
      "step": 1,
      "disabled": false,
      "visible": true
@ -269,7 +242,7 @@
    {
      "id": "flowDashCap",
      "name": "{i18n:scada.symbol.flow-dash-cap}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "select",
      "default": "butt",
      "items": [
--- a/application/src/main/data/json/system/scada_symbols/left-bottom-elbow-connector-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/left-bottom-elbow-connector-hp.svg
@ -7,7 +7,7 @@
  "tags": [
    {
      "tag": "line",
-      "stateRenderFunction": "element.stroke(ctx.properties.lineColor);\nif (ctx.properties.mainLine) {\n    element.attr({'stroke-width': ctx.properties.mainLineSize});\n} else {\n    element.attr({'stroke-width': ctx.properties.secondaryLineSize});\n}",
+      "stateRenderFunction": "element.stroke(ctx.properties.lineColor);\nelement.attr({'stroke-width': ctx.properties.lineSize});",
      "actions": null
    }
  ],
@ -32,8 +32,8 @@
          "persistentPollingInterval": 1000
        },
        "getAttribute": {
-          "key": "state",
-          "scope": null
+          "scope": "SHARED_SCOPE",
+          "key": "flow"
        },
        "getTimeSeries": {
          "key": "state"
@ -44,8 +44,8 @@
        },
        "dataToValue": {
          "type": "NONE",
-          "compareToValue": true,
-          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
        }
      },
      "defaultSetValueSettings": null,
@ -53,8 +53,8 @@
    },
    {
      "id": "animationDirection",
-      "name": "{i18n:scada.symbol.animation-direction}",
-      "hint": "{i18n:scada.symbol.animation-direction-hint}",
+      "name": "{i18n:scada.symbol.arrow-direction}",
+      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
      "group": null,
      "type": "value",
      "valueType": "BOOLEAN",
@ -131,49 +131,22 @@
  ],
  "properties": [
    {
-      "id": "mainLine",
-      "name": "{i18n:scada.symbol.main-line}",
-      "type": "switch",
-      "default": true,
-      "disabled": false,
-      "visible": true
-    },
-    {
-      "id": "mainLineSize",
-      "name": "{i18n:scada.symbol.main-line}",
+      "id": "lineSize",
+      "name": "{i18n:scada.symbol.line}",
      "type": "number",
      "default": 6,
      "required": true,
-      "subLabel": "Main",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
-      "condition": "return model.mainLine;",
      "min": 0,
      "max": 99,
      "step": 1,
      "disabled": false,
      "visible": true
    },
-    {
-      "id": "secondaryLineSize",
-      "name": "{i18n:scada.symbol.main-line}",
-      "type": "number",
-      "default": 2,
-      "required": true,
-      "subLabel": "Secondary",
-      "divider": true,
-      "fieldSuffix": "px",
-      "disableOnProperty": "mainLine",
-      "condition": "return !model.mainLine;",
-      "min": 0,
-      "max": 99,
-      "step": 1,
-      "disabled": false,
-      "visible": false
-    },
    {
      "id": "lineColor",
-      "name": "{i18n:scada.symbol.main-line}",
+      "name": "{i18n:scada.symbol.line}",
      "type": "color",
      "default": "#1A1A1A",
      "disabled": false,
@ -181,12 +154,11 @@
    },
    {
      "id": "flowAnimationWidth",
-      "name": "{i18n:scada.symbol.flow}",
-      "group": "{i18n:scada.symbol.animation}",
+      "name": "{i18n:scada.symbol.flow-line}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 4,
-      "subLabel": "Width",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
      "min": 1,
      "step": 1,
@ -195,8 +167,8 @@
    },
    {
      "id": "flowAnimationColor",
-      "name": "{i18n:scada.symbol.flow}",
-      "group": "{i18n:scada.symbol.animation}",
+      "name": "{i18n:scada.symbol.flow-line}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "color",
      "default": "#C8DFF7",
      "disabled": false,
@ -204,14 +176,14 @@
    },
    {
      "id": "flowStyleDash",
-      "name": "{i18n:scada.symbol.flow-style}",
+      "name": "{i18n:scada.symbol.flow-line-style}",
      "hint": "{i18n:scada.symbol.flow-style-hint}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 10,
      "required": true,
      "subLabel": "{i18n:scada.symbol.dash}",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
      "min": 0,
      "step": 1,
@ -220,14 +192,14 @@
    },
    {
      "id": "flowStyleGap",
-      "name": "{i18n:scada.symbol.flow-style}",
+      "name": "{i18n:scada.symbol.flow-line-style}",
      "hint": "{i18n:scada.symbol.flow-style-hint}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 10,
      "subLabel": "{i18n:scada.symbol.gap}",
      "fieldSuffix": "px",
-      "min": 1,
+      "min": 0,
      "step": 1,
      "disabled": false,
      "visible": true
@ -235,7 +207,7 @@
    {
      "id": "flowDashCap",
      "name": "{i18n:scada.symbol.flow-dash-cap}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "select",
      "default": "butt",
      "items": [
--- a/application/src/main/data/json/system/scada_symbols/left-tee-connector-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/left-tee-connector-hp.svg
@ -7,7 +7,7 @@
  "tags": [
    {
      "tag": "line",
-      "stateRenderFunction": "element.stroke(ctx.properties.lineColor);\nif (ctx.properties.mainLine) {\n    element.attr({'stroke-width': ctx.properties.mainLineSize});\n} else {\n    element.attr({'stroke-width': ctx.properties.secondaryLineSize});\n}",
+      "stateRenderFunction": "element.stroke(ctx.properties.lineColor);\nelement.attr({'stroke-width': ctx.properties.lineSize});",
      "actions": null
    },
    {
@ -58,8 +58,8 @@
    },
    {
      "id": "leftFlowDirection",
-      "name": "{i18n:scada.symbol.animation-direction}",
-      "hint": "{i18n:scada.symbol.animation-direction-hint}",
+      "name": "{i18n:scada.symbol.arrow-direction}",
+      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
      "group": "{i18n:scada.symbol.left-connector}",
      "type": "value",
      "valueType": "BOOLEAN",
@ -174,8 +174,8 @@
    },
    {
      "id": "topFlowDirection",
-      "name": "{i18n:scada.symbol.animation-direction}",
-      "hint": "{i18n:scada.symbol.animation-direction-hint}",
+      "name": "{i18n:scada.symbol.arrow-direction}",
+      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
      "group": "{i18n:scada.symbol.top-connector}",
      "type": "value",
      "valueType": "BOOLEAN",
@ -290,8 +290,8 @@
    },
    {
      "id": "bottomFlowDirection",
-      "name": "{i18n:scada.symbol.flow-direction}",
-      "hint": "{i18n:scada.symbol.flow-direction-hint}",
+      "name": "{i18n:scada.symbol.arrow-direction}",
+      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
      "group": "{i18n:scada.symbol.bottom-connector}",
      "type": "value",
      "valueType": "BOOLEAN",
@ -368,48 +368,22 @@
  ],
  "properties": [
    {
-      "id": "mainLine",
-      "name": "{i18n:scada.symbol.main-line}",
-      "type": "switch",
-      "default": true,
-      "disabled": false,
-      "visible": true
-    },
-    {
-      "id": "mainLineSize",
-      "name": "{i18n:scada.symbol.main-line}",
+      "id": "lineSize",
+      "name": "{i18n:scada.symbol.line}",
      "type": "number",
      "default": 6,
      "required": true,
-      "subLabel": "Main",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
-      "condition": "return model.mainLine;",
      "min": 0,
      "max": 99,
      "step": 1,
      "disabled": false,
      "visible": true
    },
-    {
-      "id": "secondaryLineSize",
-      "name": "{i18n:scada.symbol.main-line}",
-      "type": "number",
-      "default": 2,
-      "required": true,
-      "subLabel": "Secondary",
-      "divider": true,
-      "fieldSuffix": "px",
-      "condition": "return !model.mainLine;",
-      "min": 0,
-      "max": 99,
-      "step": 1,
-      "disabled": false,
-      "visible": false
-    },
    {
      "id": "lineColor",
-      "name": "{i18n:scada.symbol.main-line}",
+      "name": "{i18n:scada.symbol.line}",
      "type": "color",
      "default": "#1A1A1A",
      "disabled": false,
@ -417,12 +391,11 @@
    },
    {
      "id": "flowAnimationWidth",
-      "name": "{i18n:scada.symbol.flow}",
-      "group": "{i18n:scada.symbol.animation}",
+      "name": "{i18n:scada.symbol.flow-line}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 4,
-      "subLabel": "Width",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
      "min": 1,
      "step": 1,
@ -431,8 +404,8 @@
    },
    {
      "id": "flowAnimationColor",
-      "name": "{i18n:scada.symbol.flow}",
-      "group": "{i18n:scada.symbol.animation}",
+      "name": "{i18n:scada.symbol.flow-line}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "color",
      "default": "#C8DFF7",
      "disabled": false,
@ -440,14 +413,14 @@
    },
    {
      "id": "flowStyleDash",
-      "name": "{i18n:scada.symbol.flow-style}",
+      "name": "{i18n:scada.symbol.flow-line-style}",
      "hint": "{i18n:scada.symbol.flow-style-hint}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 10,
      "required": true,
      "subLabel": "{i18n:scada.symbol.dash}",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
      "min": 0,
      "step": 1,
@ -456,14 +429,14 @@
    },
    {
      "id": "flowStyleGap",
-      "name": "{i18n:scada.symbol.flow-style}",
+      "name": "{i18n:scada.symbol.flow-line-style}",
      "hint": "{i18n:scada.symbol.flow-style-hint}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 10,
      "subLabel": "{i18n:scada.symbol.gap}",
      "fieldSuffix": "px",
-      "min": 1,
+      "min": 0,
      "step": 1,
      "disabled": false,
      "visible": true
@ -471,7 +444,7 @@
    {
      "id": "flowDashCap",
      "name": "{i18n:scada.symbol.flow-dash-cap}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "select",
      "default": "butt",
      "items": [
--- a/application/src/main/data/json/system/scada_symbols/left-top-elbow-connector-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/left-top-elbow-connector-hp.svg
@ -7,7 +7,7 @@
  "tags": [
    {
      "tag": "line",
-      "stateRenderFunction": "element.stroke(ctx.properties.lineColor);\nif (ctx.properties.mainLine) {\n    element.attr({'stroke-width': ctx.properties.mainLineSize});\n} else {\n    element.attr({'stroke-width': ctx.properties.secondaryLineSize});\n}",
+      "stateRenderFunction": "element.stroke(ctx.properties.lineColor);\nelement.attr({'stroke-width': ctx.properties.lineSize});",
      "actions": null
    }
  ],
@ -53,8 +53,8 @@
    },
    {
      "id": "animationDirection",
-      "name": "{i18n:scada.symbol.animation-direction}",
-      "hint": "{i18n:scada.symbol.animation-direction-hint}",
+      "name": "{i18n:scada.symbol.arrow-direction}",
+      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
      "group": null,
      "type": "value",
      "valueType": "BOOLEAN",
@ -131,48 +131,22 @@
  ],
  "properties": [
    {
-      "id": "mainLine",
-      "name": "{i18n:scada.symbol.main-line}",
-      "type": "switch",
-      "default": true,
-      "disabled": false,
-      "visible": true
-    },
-    {
-      "id": "mainLineSize",
-      "name": "{i18n:scada.symbol.main-line}",
+      "id": "lineSize",
+      "name": "{i18n:scada.symbol.line}",
      "type": "number",
      "default": 6,
      "required": true,
-      "subLabel": "Main",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
-      "condition": "return model.mainLine;",
      "min": 0,
      "max": 99,
      "step": 1,
      "disabled": false,
      "visible": true
    },
-    {
-      "id": "secondaryLineSize",
-      "name": "{i18n:scada.symbol.main-line}",
-      "type": "number",
-      "default": 2,
-      "required": true,
-      "subLabel": "Secondary",
-      "divider": true,
-      "fieldSuffix": "px",
-      "condition": "return !model.mainLine;",
-      "min": 0,
-      "max": 99,
-      "step": 1,
-      "disabled": false,
-      "visible": false
-    },
    {
      "id": "lineColor",
-      "name": "{i18n:scada.symbol.main-line}",
+      "name": "{i18n:scada.symbol.line}",
      "type": "color",
      "default": "#1A1A1A",
      "disabled": false,
@ -180,12 +154,11 @@
    },
    {
      "id": "flowAnimationWidth",
-      "name": "{i18n:scada.symbol.flow}",
-      "group": "{i18n:scada.symbol.animation}",
+      "name": "{i18n:scada.symbol.flow-line}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 4,
-      "subLabel": "Width",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
      "min": 1,
      "step": 1,
@ -194,8 +167,8 @@
    },
    {
      "id": "flowAnimationColor",
-      "name": "{i18n:scada.symbol.flow}",
-      "group": "{i18n:scada.symbol.animation}",
+      "name": "{i18n:scada.symbol.flow-line}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "color",
      "default": "#C8DFF7",
      "disabled": false,
@ -203,14 +176,14 @@
    },
    {
      "id": "flowStyleDash",
-      "name": "{i18n:scada.symbol.flow-style}",
+      "name": "{i18n:scada.symbol.flow-line-style}",
      "hint": "{i18n:scada.symbol.flow-style-hint}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 10,
      "required": true,
      "subLabel": "{i18n:scada.symbol.dash}",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
      "min": 0,
      "step": 1,
@ -219,14 +192,14 @@
    },
    {
      "id": "flowStyleGap",
-      "name": "{i18n:scada.symbol.flow-style}",
+      "name": "{i18n:scada.symbol.flow-line-style}",
      "hint": "{i18n:scada.symbol.flow-style-hint}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 10,
      "subLabel": "{i18n:scada.symbol.gap}",
      "fieldSuffix": "px",
-      "min": 1,
+      "min": 0,
      "step": 1,
      "disabled": false,
      "visible": true
@ -234,7 +207,7 @@
    {
      "id": "flowDashCap",
      "name": "{i18n:scada.symbol.flow-dash-cap}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "select",
      "default": "butt",
      "items": [
--- a/application/src/main/data/json/system/scada_symbols/long-horizontal-connector-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/long-horizontal-connector-hp.svg
@ -12,7 +12,7 @@
    },
    {
      "tag": "line",
-      "stateRenderFunction": "element.stroke(ctx.properties.lineColor);\nif (ctx.properties.mainLine) {\n    element.attr({'stroke-width': ctx.properties.mainLineSize});\n} else {\n    element.attr({'stroke-width': ctx.properties.secondaryLineSize});\n}",
+      "stateRenderFunction": "element.stroke(ctx.properties.lineColor);\nelement.attr({'stroke-width': ctx.properties.lineSize});",
      "actions": null
    }
  ],
@ -53,18 +53,18 @@
      "defaultWidgetActionSettings": null
    },
    {
-      "id": "arrowDirection",
-      "name": "{i18n:scada.symbol.arrow-direction}",
-      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
+      "id": "flowAnimation",
+      "name": "{i18n:scada.symbol.flow-animation}",
+      "hint": "{i18n:scada.symbol.flow-animation-hint}",
      "group": null,
      "type": "value",
      "valueType": "BOOLEAN",
-      "trueLabel": "{i18n:scada.symbol.forward}",
-      "falseLabel": "{i18n:scada.symbol.reverse}",
-      "stateLabel": "{i18n:scada.symbol.forward}",
+      "trueLabel": "{i18n:scada.symbol.present}",
+      "falseLabel": "{i18n:scada.symbol.absent}",
+      "stateLabel": "{i18n:scada.symbol.flow-present}",
      "defaultGetValueSettings": {
        "action": "DO_NOTHING",
-        "defaultValue": true,
+        "defaultValue": false,
        "executeRpc": {
          "method": "getState",
          "requestTimeout": 5000,
@ -72,34 +72,38 @@
          "persistentPollingInterval": 1000
        },
        "getAttribute": {
-          "scope": null,
-          "key": "state"
+          "key": "state",
+          "scope": null
        },
        "getTimeSeries": {
          "key": "state"
        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
        "dataToValue": {
          "type": "NONE",
-          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
-          "compareToValue": true
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
        }
      },
      "defaultSetValueSettings": null,
      "defaultWidgetActionSettings": null
    },
    {
-      "id": "flowAnimation",
-      "name": "{i18n:scada.symbol.flow-animation}",
-      "hint": "{i18n:scada.symbol.flow-animation-hint}",
+      "id": "arrowDirection",
+      "name": "{i18n:scada.symbol.arrow-direction}",
+      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
      "group": null,
      "type": "value",
      "valueType": "BOOLEAN",
-      "trueLabel": "{i18n:scada.symbol.present}",
-      "falseLabel": "{i18n:scada.symbol.absent}",
-      "stateLabel": "{i18n:scada.symbol.flow-present}",
+      "trueLabel": "{i18n:scada.symbol.forward}",
+      "falseLabel": "{i18n:scada.symbol.reverse}",
+      "stateLabel": "{i18n:scada.symbol.forward}",
      "defaultGetValueSettings": {
        "action": "DO_NOTHING",
-        "defaultValue": false,
+        "defaultValue": true,
        "executeRpc": {
          "method": "getState",
          "requestTimeout": 5000,
@ -107,20 +111,16 @@
          "persistentPollingInterval": 1000
        },
        "getAttribute": {
-          "key": "state",
-          "scope": null
+          "scope": null,
+          "key": "state"
        },
        "getTimeSeries": {
          "key": "state"
        },
-        "getAlarmStatus": {
-          "severityList": null,
-          "typeList": null
-        },
        "dataToValue": {
          "type": "NONE",
-          "compareToValue": true,
-          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
        }
      },
      "defaultSetValueSettings": null,
@ -167,39 +167,13 @@
  ],
  "properties": [
    {
-      "id": "mainLine",
-      "name": "{i18n:scada.symbol.main-line}",
-      "type": "switch",
-      "default": true,
-      "disabled": false,
-      "visible": true
-    },
-    {
-      "id": "mainLineSize",
-      "name": "{i18n:scada.symbol.main-line}",
+      "id": "lineSize",
+      "name": "{i18n:scada.symbol.line}",
      "type": "number",
      "default": 6,
      "required": true,
-      "subLabel": "Main",
-      "divider": true,
-      "fieldSuffix": "px",
-      "condition": "return model.mainLine;",
-      "min": 0,
-      "max": 99,
-      "step": 1,
-      "disabled": false,
-      "visible": false
-    },
-    {
-      "id": "secondaryLineSize",
-      "name": "{i18n:scada.symbol.main-line}",
-      "type": "number",
-      "default": 2,
-      "required": true,
-      "subLabel": "Secondary",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
-      "condition": "return !model.mainLine;",
      "min": 0,
      "max": 99,
      "step": 1,
@ -208,7 +182,7 @@
    },
    {
      "id": "lineColor",
-      "name": "{i18n:scada.symbol.main-line}",
+      "name": "{i18n:scada.symbol.line}",
      "type": "color",
      "default": "#1A1A1A",
      "disabled": false,
@ -216,12 +190,11 @@
    },
    {
      "id": "flowAnimationWidth",
-      "name": "{i18n:scada.symbol.flow}",
-      "group": "{i18n:scada.symbol.animation}",
+      "name": "{i18n:scada.symbol.flow-line}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 4,
-      "subLabel": "Width",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
      "min": 1,
      "step": 1,
@ -230,8 +203,8 @@
    },
    {
      "id": "flowAnimationColor",
-      "name": "{i18n:scada.symbol.flow}",
-      "group": "{i18n:scada.symbol.animation}",
+      "name": "{i18n:scada.symbol.flow-line}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "color",
      "default": "#C8DFF7",
      "disabled": false,
@ -239,14 +212,14 @@
    },
    {
      "id": "flowStyleDash",
-      "name": "{i18n:scada.symbol.flow-style}",
+      "name": "{i18n:scada.symbol.flow-line-style}",
      "hint": "{i18n:scada.symbol.flow-style-hint}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 10,
      "required": true,
      "subLabel": "{i18n:scada.symbol.dash}",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
      "min": 0,
      "step": 1,
@ -255,14 +228,14 @@
    },
    {
      "id": "flowStyleGap",
-      "name": "{i18n:scada.symbol.flow-style}",
+      "name": "{i18n:scada.symbol.flow-line-style}",
      "hint": "{i18n:scada.symbol.flow-style-hint}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 10,
      "subLabel": "{i18n:scada.symbol.gap}",
      "fieldSuffix": "px",
-      "min": 1,
+      "min": 0,
      "step": 1,
      "disabled": false,
      "visible": true
@ -270,7 +243,7 @@
    {
      "id": "flowDashCap",
      "name": "{i18n:scada.symbol.flow-dash-cap}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "select",
      "default": "butt",
      "items": [
--- a/application/src/main/data/json/system/scada_symbols/long-vertical-connector-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/long-vertical-connector-hp.svg
@ -12,7 +12,7 @@
    },
    {
      "tag": "line",
-      "stateRenderFunction": "element.stroke(ctx.properties.lineColor);\nif (ctx.properties.mainLine) {\n    element.attr({'stroke-width': ctx.properties.mainLineSize});\n} else {\n    element.attr({'stroke-width': ctx.properties.secondaryLineSize});\n}",
+      "stateRenderFunction": "element.stroke(ctx.properties.lineColor);\nelement.attr({'stroke-width': ctx.properties.lineSize});",
      "actions": null
    }
  ],
@ -53,18 +53,18 @@
      "defaultWidgetActionSettings": null
    },
    {
-      "id": "arrowDirection",
-      "name": "{i18n:scada.symbol.arrow-direction}",
-      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
+      "id": "flowAnimation",
+      "name": "{i18n:scada.symbol.flow-animation}",
+      "hint": "{i18n:scada.symbol.flow-animation-hint}",
      "group": null,
      "type": "value",
      "valueType": "BOOLEAN",
-      "trueLabel": "{i18n:scada.symbol.forward}",
-      "falseLabel": "{i18n:scada.symbol.reverse}",
-      "stateLabel": "{i18n:scada.symbol.forward}",
+      "trueLabel": "{i18n:scada.symbol.present}",
+      "falseLabel": "{i18n:scada.symbol.absent}",
+      "stateLabel": "{i18n:scada.symbol.flow-present}",
      "defaultGetValueSettings": {
        "action": "DO_NOTHING",
-        "defaultValue": true,
+        "defaultValue": false,
        "executeRpc": {
          "method": "getState",
          "requestTimeout": 5000,
@ -72,34 +72,38 @@
          "persistentPollingInterval": 1000
        },
        "getAttribute": {
-          "scope": null,
-          "key": "state"
+          "key": "state",
+          "scope": null
        },
        "getTimeSeries": {
          "key": "state"
        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
        "dataToValue": {
          "type": "NONE",
-          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
-          "compareToValue": true
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
        }
      },
      "defaultSetValueSettings": null,
      "defaultWidgetActionSettings": null
    },
    {
-      "id": "flowAnimation",
-      "name": "{i18n:scada.symbol.flow-animation}",
-      "hint": "{i18n:scada.symbol.flow-animation-hint}",
+      "id": "arrowDirection",
+      "name": "{i18n:scada.symbol.arrow-direction}",
+      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
      "group": null,
      "type": "value",
      "valueType": "BOOLEAN",
-      "trueLabel": "{i18n:scada.symbol.present}",
-      "falseLabel": "{i18n:scada.symbol.absent}",
-      "stateLabel": "{i18n:scada.symbol.flow-present}",
+      "trueLabel": "{i18n:scada.symbol.forward}",
+      "falseLabel": "{i18n:scada.symbol.reverse}",
+      "stateLabel": "{i18n:scada.symbol.forward}",
      "defaultGetValueSettings": {
        "action": "DO_NOTHING",
-        "defaultValue": false,
+        "defaultValue": true,
        "executeRpc": {
          "method": "getState",
          "requestTimeout": 5000,
@ -107,20 +111,16 @@
          "persistentPollingInterval": 1000
        },
        "getAttribute": {
-          "key": "state",
-          "scope": null
+          "scope": null,
+          "key": "state"
        },
        "getTimeSeries": {
          "key": "state"
        },
-        "getAlarmStatus": {
-          "severityList": null,
-          "typeList": null
-        },
        "dataToValue": {
          "type": "NONE",
-          "compareToValue": true,
-          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
        }
      },
      "defaultSetValueSettings": null,
@ -167,48 +167,22 @@
  ],
  "properties": [
    {
-      "id": "mainLine",
-      "name": "{i18n:scada.symbol.main-line}",
-      "type": "switch",
-      "default": true,
-      "disabled": false,
-      "visible": true
-    },
-    {
-      "id": "mainLineSize",
-      "name": "{i18n:scada.symbol.main-line}",
+      "id": "lineSize",
+      "name": "{i18n:scada.symbol.line}",
      "type": "number",
      "default": 6,
      "required": true,
-      "subLabel": "Main",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
-      "condition": "return model.mainLine;",
      "min": 0,
      "max": 99,
      "step": 1,
      "disabled": false,
      "visible": true
    },
-    {
-      "id": "secondaryLineSize",
-      "name": "{i18n:scada.symbol.main-line}",
-      "type": "number",
-      "default": 2,
-      "required": true,
-      "subLabel": "Secondary",
-      "divider": true,
-      "fieldSuffix": "px",
-      "condition": "return !model.mainLine;",
-      "min": 0,
-      "max": 99,
-      "step": 1,
-      "disabled": false,
-      "visible": false
-    },
    {
      "id": "lineColor",
-      "name": "{i18n:scada.symbol.main-line}",
+      "name": "{i18n:scada.symbol.line}",
      "type": "color",
      "default": "#1A1A1A",
      "disabled": false,
@ -216,12 +190,11 @@
    },
    {
      "id": "flowAnimationWidth",
-      "name": "{i18n:scada.symbol.flow}",
-      "group": "{i18n:scada.symbol.animation}",
+      "name": "{i18n:scada.symbol.flow-line}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 4,
-      "subLabel": "Width",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
      "min": 1,
      "step": 1,
@ -230,8 +203,8 @@
    },
    {
      "id": "flowAnimationColor",
-      "name": "{i18n:scada.symbol.flow}",
-      "group": "{i18n:scada.symbol.animation}",
+      "name": "{i18n:scada.symbol.flow-line}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "color",
      "default": "#C8DFF7",
      "disabled": false,
@ -239,14 +212,14 @@
    },
    {
      "id": "flowStyleDash",
-      "name": "{i18n:scada.symbol.flow-style}",
+      "name": "{i18n:scada.symbol.flow-line-style}",
      "hint": "{i18n:scada.symbol.flow-style-hint}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 10,
      "required": true,
      "subLabel": "{i18n:scada.symbol.dash}",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
      "min": 0,
      "step": 1,
@ -255,22 +228,20 @@
    },
    {
      "id": "flowStyleGap",
-      "name": "{i18n:scada.symbol.flow-style}",
+      "name": "{i18n:scada.symbol.flow-line-style}",
      "hint": "{i18n:scada.symbol.flow-style-hint}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 10,
      "subLabel": "{i18n:scada.symbol.gap}",
      "fieldSuffix": "px",
-      "min": 1,
-      "step": 1,
-      "disabled": false,
-      "visible": true
+      "min": 0,
+      "step": 1
    },
    {
      "id": "flowDashCap",
      "name": "{i18n:scada.symbol.flow-dash-cap}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "select",
      "default": "butt",
      "items": [
--- a/application/src/main/data/json/system/scada_symbols/right-tee-connector-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/right-tee-connector-hp.svg
@ -7,7 +7,7 @@
  "tags": [
    {
      "tag": "line",
-      "stateRenderFunction": "element.stroke(ctx.properties.lineColor);\nif (ctx.properties.mainLine) {\n    element.attr({'stroke-width': ctx.properties.mainLineSize});\n} else {\n    element.attr({'stroke-width': ctx.properties.secondaryLineSize});\n}",
+      "stateRenderFunction": "element.stroke(ctx.properties.lineColor);\nelement.attr({'stroke-width': ctx.properties.lineSize});",
      "actions": null
    },
    {
@ -58,8 +58,8 @@
    },
    {
      "id": "topFlowDirection",
-      "name": "{i18n:scada.symbol.animation-direction}",
-      "hint": "{i18n:scada.symbol.animation-direction-hint}",
+      "name": "{i18n:scada.symbol.arrow-direction}",
+      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
      "group": "{i18n:scada.symbol.top-connector}",
      "type": "value",
      "valueType": "BOOLEAN",
@ -174,8 +174,8 @@
    },
    {
      "id": "rightFlowDirection",
-      "name": "{i18n:scada.symbol.flow-direction}",
-      "hint": "{i18n:scada.symbol.flow-direction-hint}",
+      "name": "{i18n:scada.symbol.arrow-direction}",
+      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
      "group": "{i18n:scada.symbol.right-connector}",
      "type": "value",
      "valueType": "BOOLEAN",
@ -290,8 +290,8 @@
    },
    {
      "id": "bottomFlowDirection",
-      "name": "{i18n:scada.symbol.animation-direction}",
-      "hint": "{i18n:scada.symbol.animation-direction-hint}",
+      "name": "{i18n:scada.symbol.arrow-direction}",
+      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
      "group": "{i18n:scada.symbol.bottom-connector}",
      "type": "value",
      "valueType": "BOOLEAN",
@ -368,48 +368,22 @@
  ],
  "properties": [
    {
-      "id": "mainLine",
-      "name": "{i18n:scada.symbol.main-line}",
-      "type": "switch",
-      "default": true,
-      "disabled": false,
-      "visible": true
-    },
-    {
-      "id": "mainLineSize",
-      "name": "{i18n:scada.symbol.main-line}",
+      "id": "lineSize",
+      "name": "{i18n:scada.symbol.line}",
      "type": "number",
      "default": 6,
      "required": true,
-      "subLabel": "Main",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
-      "condition": "return model.mainLine;",
      "min": 0,
      "max": 99,
      "step": 1,
      "disabled": false,
      "visible": true
    },
-    {
-      "id": "secondaryLineSize",
-      "name": "{i18n:scada.symbol.main-line}",
-      "type": "number",
-      "default": 2,
-      "required": true,
-      "subLabel": "Secondary",
-      "divider": true,
-      "fieldSuffix": "px",
-      "condition": "return !model.mainLine;",
-      "min": 0,
-      "max": 99,
-      "step": 1,
-      "disabled": false,
-      "visible": false
-    },
    {
      "id": "lineColor",
-      "name": "{i18n:scada.symbol.main-line}",
+      "name": "{i18n:scada.symbol.line}",
      "type": "color",
      "default": "#1A1A1A",
      "disabled": false,
@ -417,12 +391,11 @@
    },
    {
      "id": "flowAnimationWidth",
-      "name": "{i18n:scada.symbol.flow}",
-      "group": "{i18n:scada.symbol.animation}",
+      "name": "{i18n:scada.symbol.flow-line}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 4,
-      "subLabel": "Width",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
      "min": 1,
      "step": 1,
@ -431,8 +404,8 @@
    },
    {
      "id": "flowAnimationColor",
-      "name": "{i18n:scada.symbol.flow}",
-      "group": "{i18n:scada.symbol.animation}",
+      "name": "{i18n:scada.symbol.flow-line}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "color",
      "default": "#C8DFF7",
      "disabled": false,
@ -440,14 +413,14 @@
    },
    {
      "id": "flowStyleDash",
-      "name": "{i18n:scada.symbol.flow-style}",
+      "name": "{i18n:scada.symbol.flow-line-style}",
      "hint": "{i18n:scada.symbol.flow-style-hint}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 10,
      "required": true,
      "subLabel": "{i18n:scada.symbol.dash}",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
      "min": 0,
      "step": 1,
@ -456,14 +429,14 @@
    },
    {
      "id": "flowStyleGap",
-      "name": "{i18n:scada.symbol.flow-style}",
+      "name": "{i18n:scada.symbol.flow-line-style}",
      "hint": "{i18n:scada.symbol.flow-style-hint}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 10,
      "subLabel": "{i18n:scada.symbol.gap}",
      "fieldSuffix": "px",
-      "min": 1,
+      "min": 0,
      "step": 1,
      "disabled": false,
      "visible": true
@ -471,7 +444,7 @@
    {
      "id": "flowDashCap",
      "name": "{i18n:scada.symbol.flow-dash-cap}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "select",
      "default": "butt",
      "items": [
--- a/application/src/main/data/json/system/scada_symbols/top-right-elbow-connector-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/top-right-elbow-connector-hp.svg
@ -7,7 +7,7 @@
  "tags": [
    {
      "tag": "line",
-      "stateRenderFunction": "element.stroke(ctx.properties.lineColor);\nif (ctx.properties.mainLine) {\n    element.attr({'stroke-width': ctx.properties.mainLineSize});\n} else {\n    element.attr({'stroke-width': ctx.properties.secondaryLineSize});\n}",
+      "stateRenderFunction": "element.stroke(ctx.properties.lineColor);\nelement.attr({'stroke-width': ctx.properties.lineSize});",
      "actions": null
    }
  ],
@ -53,8 +53,8 @@
    },
    {
      "id": "animationDirection",
-      "name": "{i18n:scada.symbol.animation-direction}",
-      "hint": "{i18n:scada.symbol.animation-direction-hint}",
+      "name": "{i18n:scada.symbol.arrow-direction}",
+      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
      "group": null,
      "type": "value",
      "valueType": "BOOLEAN",
@ -131,48 +131,22 @@
  ],
  "properties": [
    {
-      "id": "mainLine",
-      "name": "{i18n:scada.symbol.main-line}",
-      "type": "switch",
-      "default": true,
-      "disabled": false,
-      "visible": true
-    },
-    {
-      "id": "mainLineSize",
-      "name": "{i18n:scada.symbol.main-line}",
+      "id": "lineSize",
+      "name": "{i18n:scada.symbol.line}",
      "type": "number",
      "default": 6,
      "required": true,
-      "subLabel": "Main",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
-      "condition": "return model.mainLine;",
      "min": 0,
      "max": 99,
      "step": 1,
      "disabled": false,
      "visible": true
    },
-    {
-      "id": "secondaryLineSize",
-      "name": "{i18n:scada.symbol.main-line}",
-      "type": "number",
-      "default": 2,
-      "required": true,
-      "subLabel": "Secondary",
-      "divider": true,
-      "fieldSuffix": "px",
-      "condition": "return !model.mainLine;",
-      "min": 0,
-      "max": 99,
-      "step": 1,
-      "disabled": false,
-      "visible": false
-    },
    {
      "id": "lineColor",
-      "name": "{i18n:scada.symbol.main-line}",
+      "name": "{i18n:scada.symbol.line}",
      "type": "color",
      "default": "#1A1A1A",
      "disabled": false,
@ -180,12 +154,11 @@
    },
    {
      "id": "flowAnimationWidth",
-      "name": "{i18n:scada.symbol.flow}",
-      "group": "{i18n:scada.symbol.animation}",
+      "name": "{i18n:scada.symbol.flow-line}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 4,
-      "subLabel": "Width",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
      "min": 1,
      "step": 1,
@ -194,8 +167,8 @@
    },
    {
      "id": "flowAnimationColor",
-      "name": "{i18n:scada.symbol.flow}",
-      "group": "{i18n:scada.symbol.animation}",
+      "name": "{i18n:scada.symbol.flow-line}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "color",
      "default": "#C8DFF7",
      "disabled": false,
@ -203,14 +176,14 @@
    },
    {
      "id": "flowStyleDash",
-      "name": "{i18n:scada.symbol.flow-style}",
+      "name": "{i18n:scada.symbol.flow-line-style}",
      "hint": "{i18n:scada.symbol.flow-style-hint}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 10,
      "required": true,
      "subLabel": "{i18n:scada.symbol.dash}",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
      "min": 0,
      "step": 1,
@ -219,14 +192,14 @@
    },
    {
      "id": "flowStyleGap",
-      "name": "{i18n:scada.symbol.flow-style}",
+      "name": "{i18n:scada.symbol.flow-line-style}",
      "hint": "{i18n:scada.symbol.flow-style-hint}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 10,
      "subLabel": "{i18n:scada.symbol.gap}",
      "fieldSuffix": "px",
-      "min": 1,
+      "min": 0,
      "step": 1,
      "disabled": false,
      "visible": true
@ -234,7 +207,7 @@
    {
      "id": "flowDashCap",
      "name": "{i18n:scada.symbol.flow-dash-cap}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "select",
      "default": "butt",
      "items": [
--- a/application/src/main/data/json/system/scada_symbols/top-tee-connector-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/top-tee-connector-hp.svg
@ -7,7 +7,7 @@
  "tags": [
    {
      "tag": "line",
-      "stateRenderFunction": "element.stroke(ctx.properties.lineColor);\nif (ctx.properties.mainLine) {\n    element.attr({'stroke-width': ctx.properties.mainLineSize});\n} else {\n    element.attr({'stroke-width': ctx.properties.secondaryLineSize});\n}",
+      "stateRenderFunction": "element.stroke(ctx.properties.lineColor);\nelement.attr({'stroke-width': ctx.properties.lineSize});",
      "actions": null
    },
    {
@ -58,8 +58,8 @@
    },
    {
      "id": "leftFlowDirection",
-      "name": "{i18n:scada.symbol.animation-direction}",
-      "hint": "{i18n:scada.symbol.animation-direction-hint}",
+      "name": "{i18n:scada.symbol.arrow-direction}",
+      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
      "group": "{i18n:scada.symbol.left-connector}",
      "type": "value",
      "valueType": "BOOLEAN",
@ -174,8 +174,8 @@
    },
    {
      "id": "topFlowDirection",
-      "name": "{i18n:scada.symbol.animation-direction}",
-      "hint": "{i18n:scada.symbol.animation-direction-hint}",
+      "name": "{i18n:scada.symbol.arrow-direction}",
+      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
      "group": "{i18n:scada.symbol.top-connector}",
      "type": "value",
      "valueType": "BOOLEAN",
@ -290,8 +290,8 @@
    },
    {
      "id": "rightFlowDirection",
-      "name": "{i18n:scada.symbol.flow-direction}",
-      "hint": "{i18n:scada.symbol.flow-direction-hint}",
+      "name": "{i18n:scada.symbol.arrow-direction}",
+      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
      "group": "{i18n:scada.symbol.right-connector}",
      "type": "value",
      "valueType": "BOOLEAN",
@ -368,48 +368,22 @@
  ],
  "properties": [
    {
-      "id": "mainLine",
-      "name": "{i18n:scada.symbol.main-line}",
-      "type": "switch",
-      "default": true,
-      "disabled": false,
-      "visible": true
-    },
-    {
-      "id": "mainLineSize",
-      "name": "{i18n:scada.symbol.main-line}",
+      "id": "lineSize",
+      "name": "{i18n:scada.symbol.line}",
      "type": "number",
      "default": 6,
      "required": true,
-      "subLabel": "Main",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
-      "condition": "return model.mainLine;",
      "min": 0,
      "max": 99,
      "step": 1,
      "disabled": false,
      "visible": true
    },
-    {
-      "id": "secondaryLineSize",
-      "name": "{i18n:scada.symbol.main-line}",
-      "type": "number",
-      "default": 2,
-      "required": true,
-      "subLabel": "Secondary",
-      "divider": true,
-      "fieldSuffix": "px",
-      "condition": "return !model.mainLine;",
-      "min": 0,
-      "max": 99,
-      "step": 1,
-      "disabled": false,
-      "visible": false
-    },
    {
      "id": "lineColor",
-      "name": "{i18n:scada.symbol.main-line}",
+      "name": "{i18n:scada.symbol.line}",
      "type": "color",
      "default": "#1A1A1A",
      "disabled": false,
@ -417,12 +391,11 @@
    },
    {
      "id": "flowAnimationWidth",
-      "name": "{i18n:scada.symbol.flow}",
-      "group": "{i18n:scada.symbol.animation}",
+      "name": "{i18n:scada.symbol.flow-line}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 4,
-      "subLabel": "Width",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
      "min": 1,
      "step": 1,
@ -431,8 +404,8 @@
    },
    {
      "id": "flowAnimationColor",
-      "name": "{i18n:scada.symbol.flow}",
-      "group": "{i18n:scada.symbol.animation}",
+      "name": "{i18n:scada.symbol.flow-line}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "color",
      "default": "#C8DFF7",
      "disabled": false,
@ -440,14 +413,14 @@
    },
    {
      "id": "flowStyleDash",
-      "name": "{i18n:scada.symbol.flow-style}",
+      "name": "{i18n:scada.symbol.flow-line-style}",
      "hint": "{i18n:scada.symbol.flow-style-hint}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 10,
      "required": true,
      "subLabel": "{i18n:scada.symbol.dash}",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
      "min": 0,
      "step": 1,
@ -456,14 +429,14 @@
    },
    {
      "id": "flowStyleGap",
-      "name": "{i18n:scada.symbol.flow-style}",
+      "name": "{i18n:scada.symbol.flow-line-style}",
      "hint": "{i18n:scada.symbol.flow-style-hint}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 10,
      "subLabel": "{i18n:scada.symbol.gap}",
      "fieldSuffix": "px",
-      "min": 1,
+      "min": 0,
      "step": 1,
      "disabled": false,
      "visible": true
@ -471,7 +444,7 @@
    {
      "id": "flowDashCap",
      "name": "{i18n:scada.symbol.flow-dash-cap}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "select",
      "default": "butt",
      "items": [
--- a/application/src/main/data/json/system/scada_symbols/vertical-connector-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/vertical-connector-hp.svg
@ -12,7 +12,7 @@
    },
    {
      "tag": "line",
-      "stateRenderFunction": "element.stroke(ctx.properties.lineColor);\nif (ctx.properties.mainLine) {\n    element.attr({'stroke-width': ctx.properties.mainLineSize});\n} else {\n    element.attr({'stroke-width': ctx.properties.secondaryLineSize});\n}",
+      "stateRenderFunction": "element.stroke(ctx.properties.lineColor);\nelement.attr({'stroke-width': ctx.properties.lineSize});",
      "actions": null
    }
  ],
@ -53,18 +53,18 @@
      "defaultWidgetActionSettings": null
    },
    {
-      "id": "arrowDirection",
-      "name": "{i18n:scada.symbol.arrow-direction}",
-      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
+      "id": "flowAnimation",
+      "name": "{i18n:scada.symbol.flow-animation}",
+      "hint": "{i18n:scada.symbol.flow-animation-hint}",
      "group": null,
      "type": "value",
      "valueType": "BOOLEAN",
-      "trueLabel": "{i18n:scada.symbol.forward}",
-      "falseLabel": "{i18n:scada.symbol.reverse}",
-      "stateLabel": "{i18n:scada.symbol.forward}",
+      "trueLabel": "{i18n:scada.symbol.present}",
+      "falseLabel": "{i18n:scada.symbol.absent}",
+      "stateLabel": "{i18n:scada.symbol.flow-present}",
      "defaultGetValueSettings": {
        "action": "DO_NOTHING",
-        "defaultValue": true,
+        "defaultValue": false,
        "executeRpc": {
          "method": "getState",
          "requestTimeout": 5000,
@ -72,34 +72,38 @@
          "persistentPollingInterval": 1000
        },
        "getAttribute": {
-          "scope": null,
-          "key": "state"
+          "key": "state",
+          "scope": null
        },
        "getTimeSeries": {
          "key": "state"
        },
+        "getAlarmStatus": {
+          "severityList": null,
+          "typeList": null
+        },
        "dataToValue": {
          "type": "NONE",
-          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
-          "compareToValue": true
+          "compareToValue": true,
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
        }
      },
      "defaultSetValueSettings": null,
      "defaultWidgetActionSettings": null
    },
    {
-      "id": "flowAnimation",
-      "name": "{i18n:scada.symbol.flow-animation}",
-      "hint": "{i18n:scada.symbol.flow-animation-hint}",
+      "id": "arrowDirection",
+      "name": "{i18n:scada.symbol.arrow-direction}",
+      "hint": "{i18n:scada.symbol.arrow-direction-hint}",
      "group": null,
      "type": "value",
      "valueType": "BOOLEAN",
-      "trueLabel": "{i18n:scada.symbol.present}",
-      "falseLabel": "{i18n:scada.symbol.absent}",
-      "stateLabel": "{i18n:scada.symbol.flow-present}",
+      "trueLabel": "{i18n:scada.symbol.forward}",
+      "falseLabel": "{i18n:scada.symbol.reverse}",
+      "stateLabel": "{i18n:scada.symbol.forward}",
      "defaultGetValueSettings": {
        "action": "DO_NOTHING",
-        "defaultValue": false,
+        "defaultValue": true,
        "executeRpc": {
          "method": "getState",
          "requestTimeout": 5000,
@ -107,20 +111,16 @@
          "persistentPollingInterval": 1000
        },
        "getAttribute": {
-          "key": "state",
-          "scope": null
+          "scope": null,
+          "key": "state"
        },
        "getTimeSeries": {
          "key": "state"
        },
-        "getAlarmStatus": {
-          "severityList": null,
-          "typeList": null
-        },
        "dataToValue": {
          "type": "NONE",
-          "compareToValue": true,
-          "dataToValueFunction": "/* Should return boolean value */\nreturn data;"
+          "dataToValueFunction": "/* Should return boolean value */\nreturn data;",
+          "compareToValue": true
        }
      },
      "defaultSetValueSettings": null,
@ -167,48 +167,22 @@
  ],
  "properties": [
    {
-      "id": "mainLine",
-      "name": "{i18n:scada.symbol.main-line}",
-      "type": "switch",
-      "default": true,
-      "disabled": false,
-      "visible": true
-    },
-    {
-      "id": "mainLineSize",
-      "name": "{i18n:scada.symbol.main-line}",
+      "id": "lineSize",
+      "name": "{i18n:scada.symbol.line}",
      "type": "number",
      "default": 6,
      "required": true,
-      "subLabel": "Main",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
-      "condition": "return model.mainLine;",
      "min": 0,
      "max": 99,
      "step": 1,
      "disabled": false,
      "visible": true
    },
-    {
-      "id": "secondaryLineSize",
-      "name": "{i18n:scada.symbol.main-line}",
-      "type": "number",
-      "default": 2,
-      "required": true,
-      "subLabel": "Secondary",
-      "divider": true,
-      "fieldSuffix": "px",
-      "condition": "return !model.mainLine;",
-      "min": 0,
-      "max": 99,
-      "step": 1,
-      "disabled": false,
-      "visible": false
-    },
    {
      "id": "lineColor",
-      "name": "{i18n:scada.symbol.main-line}",
+      "name": "{i18n:scada.symbol.line}",
      "type": "color",
      "default": "#1A1A1A",
      "disabled": false,
@ -216,12 +190,11 @@
    },
    {
      "id": "flowAnimationWidth",
-      "name": "{i18n:scada.symbol.flow}",
-      "group": "{i18n:scada.symbol.animation}",
+      "name": "{i18n:scada.symbol.flow-line}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 4,
-      "subLabel": "Width",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
      "min": 1,
      "step": 1,
@ -230,8 +203,8 @@
    },
    {
      "id": "flowAnimationColor",
-      "name": "{i18n:scada.symbol.flow}",
-      "group": "{i18n:scada.symbol.animation}",
+      "name": "{i18n:scada.symbol.flow-line}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "color",
      "default": "#C8DFF7",
      "disabled": false,
@ -239,14 +212,14 @@
    },
    {
      "id": "flowStyleDash",
-      "name": "{i18n:scada.symbol.flow-style}",
+      "name": "{i18n:scada.symbol.flow-line-style}",
      "hint": "{i18n:scada.symbol.flow-style-hint}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 10,
      "required": true,
      "subLabel": "{i18n:scada.symbol.dash}",
-      "divider": true,
+      "divider": false,
      "fieldSuffix": "px",
      "min": 0,
      "step": 1,
@ -255,14 +228,14 @@
    },
    {
      "id": "flowStyleGap",
-      "name": "{i18n:scada.symbol.flow-style}",
+      "name": "{i18n:scada.symbol.flow-line-style}",
      "hint": "{i18n:scada.symbol.flow-style-hint}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "number",
      "default": 10,
      "subLabel": "{i18n:scada.symbol.gap}",
      "fieldSuffix": "px",
-      "min": 1,
+      "min": 0,
      "step": 1,
      "disabled": false,
      "visible": true
@ -270,7 +243,7 @@
    {
      "id": "flowDashCap",
      "name": "{i18n:scada.symbol.flow-dash-cap}",
-      "group": "{i18n:scada.symbol.animation}",
+      "group": "{i18n:scada.symbol.flow}",
      "type": "select",
      "default": "butt",
      "items": [
--- a/ui-ngx/src/app/modules/home/components/widget/lib/scada/scada-symbol.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/scada/scada-symbol.models.ts
@ -190,7 +190,7 @@ const tbNamespaceRegex = /<svg.*(xmlns:tb="https:\/\/thingsboard.io\/svg").*>/gm

 const tbTagRegex = /tb:tag="([^"]*)"/gms;

-let syncTime = Date.now();
+const syncTime = Date.now();

 const generateElementId = () => {
  const id = guid();
@ -1279,9 +1279,6 @@ class FlowConnectorAnimation implements ConnectorScadaSymbolAnimation {
    if (!this.element.node.childElementCount) {
      this.element.add(this._animation);
    }
-    if (!syncTime) {
-      syncTime = Date.now();
-    }
    const animateElement = this.element.node.getElementsByTagName('animate')[0];
    const offset = ((Date.now() - syncTime) % 1000) * -1;
    (animateElement as SVGAnimationElement).beginElementAt(offset);
@ -1310,7 +1307,7 @@ class FlowConnectorAnimation implements ConnectorScadaSymbolAnimation {
    this._strokeLineCap = linecap;
    this._dashWidth = dashWidth - offset;
    this._dashGap = dashGap - offset;
-    const dashArray = `${this._dashWidth}${this._dashGap ? ` ${this._dashGap}` : ''}`;
+    const dashArray = `${this._dashWidth} ${this._dashGap}`;
    const values = `${this._dashWidth + (this._dashGap || this._dashWidth)};0`;
    this._animation.stroke({width, color, linecap, dasharray: dashArray});
    this._animation.findOne('animate').attr('values', values);
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@ -3438,16 +3438,15 @@
            "arrow-presence": "Arrow presence",
            "arrow-presence-hint": "Indicates whether arrow is present in connector.",
            "arrow-present": "Arrow present",
-            "arrow-direction": "Arrow/Animation direction",
+            "arrow-direction": "Flow direction",
            "arrow-direction-hint": "Indicates flow direction.",
-            "animation-direction": "Flow animation direction",
-            "animation-direction-hint": "Indicates animation flow direction.",
-            "flow-animation": "Flow animation",
-            "flow-animation-hint": "Indicates whether animation is present in connector.",
+            "flow-animation": "Flow presence",
+            "flow-animation-hint": "Indicates whether fluid is flowing in connector.",
            "flow": "Flow",
-            "flow-style": "Flow style",
+            "flow-line": "Line",
+            "flow-line-style": "Line style",
            "flow-style-hint": "Set the Dash and Gap values so that their sum is divisible by 100 without a remainder for perfect animation synchronization.",
-            "flow-dash-cap": "Flow dash cap",
+            "flow-dash-cap": "Dash cap",
            "dash-cap-butt": "Butt",
            "dash-cap-round": "Round",
            "dash-cap-square": "Square",