diff --git a/companion/src/companion.qrc b/companion/src/companion.qrc
index cbd77a2d8..1ce2967b6 100644
--- a/companion/src/companion.qrc
+++ b/companion/src/companion.qrc
@@ -15,6 +15,7 @@
     <file>images/simulator/icons/svg/camera.svg</file>
     <file>images/simulator/icons/svg/camera-active.svg</file>
     <file>images/simulator/icons/svg/console.svg</file>
+    <file>images/simulator/icons/svg/console-active.svg</file>
     <file>images/simulator/icons/svg/eraser.svg</file>
     <file>images/simulator/icons/svg/eraser-active.svg</file>
     <file>images/simulator/icons/svg/fixed_x.svg</file>
@@ -33,14 +34,17 @@
     <file>images/simulator/icons/svg/toggle_lock.svg</file>
     <file>images/simulator/icons/svg/toggle_lock-on.svg</file>
     <file>images/simulator/icons/svg/radio_outputs.svg</file>
+    <file>images/simulator/icons/svg/radio_outputs-active.svg</file>
     <file>images/simulator/icons/svg/reload_script.svg</file>
     <file>images/simulator/icons/svg/reload_script-active.svg</file>
     <file>images/simulator/icons/svg/restart.svg</file>
     <file>images/simulator/icons/svg/restart-active.svg</file>
     <file>images/simulator/icons/svg/telemetry.svg</file>
+    <file>images/simulator/icons/svg/telemetry-active.svg</file>
     <file>images/simulator/icons/svg/trainer.svg</file>
+    <file>images/simulator/icons/svg/trainer-active.svg</file>
     <file>images/simulator/icons/svg/word_wrap.svg</file>
-    <file>images/simulator/icons/svg/word_wrap-active.svg</file>
+    <file>images/simulator/icons/svg/word_wrap-on.svg</file>
     <file>images/simulator/Horus/middle.png</file>
     <file>images/simulator/Horus/left.png</file>
     <file>images/simulator/Horus/right.png</file>
diff --git a/companion/src/images/simulator/icons/svg/camera-active.svg b/companion/src/images/simulator/icons/svg/camera-active.svg
index 11858cd98..53db3bd93 100644
--- a/companion/src/images/simulator/icons/svg/camera-active.svg
+++ b/companion/src/images/simulator/icons/svg/camera-active.svg
@@ -1 +1,53 @@
-<svg version="1.2" baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 6h-1.586l-1-1c-.579-.579-1.595-1-2.414-1h-4c-.819 0-1.835.421-2.414 1l-1 1h-1.586c-1.654 0-3 1.346-3 3v8c0 1.654 1.346 3 3 3h14c1.654 0 3-1.346 3-3v-8c0-1.654-1.346-3-3-3zm-7 10c-1.933 0-3.5-1.568-3.5-3.5 0-1.934 1.567-3.5 3.5-3.5s3.5 1.566 3.5 3.5c0 1.932-1.567 3.5-3.5 3.5zm6-4.701c-.719 0-1.3-.58-1.3-1.299s.581-1.301 1.3-1.301 1.3.582 1.3 1.301-.581 1.299-1.3 1.299z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg5332"
+   viewBox="0 0 64.000001 64.000001"
+   height="64"
+   width="64">
+  <defs
+     id="defs5334" />
+  <metadata
+     id="metadata5337">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-988.36216)"
+     id="layer1">
+    <path
+       id="path6537"
+       d="m 18.817586,1033.1534 c -2.003825,-0.7073 -3.457036,-2.1866 -4.13535,-4.2095 -0.277505,-0.8277 -0.289265,-1.1387 -0.289265,-7.6504 0,-6.3546 0.01745,-6.8438 0.272479,-7.6693 0.615999,-1.9932 1.929935,-3.3663 3.958827,-4.1373 0.683013,-0.2595 1.201275,-0.3291 2.888021,-0.3877 1.902622,-0.066 2.068978,-0.093 2.234764,-0.3643 0.09853,-0.1611 0.571783,-0.9613 1.051717,-1.7783 0.658724,-1.1214 0.983189,-1.5378 1.323858,-1.6995 0.670602,-0.3182 11.165398,-0.3186 11.775534,0 0.499476,0.2604 0.629457,0.4367 1.677451,2.2751 l 0.835283,1.4651 2.078074,0.088 c 2.401585,0.1024 3.161571,0.3205 4.473867,1.2866 0.998498,0.735 1.566768,1.4411 2.148637,2.6696 l 0.449898,0.9499 0.0385,6.9923 c 0.03339,6.0829 0.0093,7.0933 -0.18434,7.769 -0.589336,2.0549 -2.23303,3.7437 -4.323807,4.4422 -0.84773,0.2834 -1.07511,0.2883 -13.110118,0.2854 l -12.247417,0 -0.916547,-0.3235 z"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:2.21017289;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       id="path6535"
+       d="m 34.313422,1030.5706 c 3.191745,-0.8042 5.775519,-3.2111 6.79891,-6.3335 0.362189,-1.1051 0.402193,-1.4096 0.398343,-3.032 -0.0035,-1.5896 -0.04804,-1.9284 -0.37338,-2.8573 -0.546668,-1.5609 -1.272035,-2.7034 -2.473253,-3.8955 -0.868074,-0.8613 -1.320892,-1.1833 -2.371213,-1.686 -1.724935,-0.8255 -2.500938,-0.9977 -4.419694,-0.9806 -1.3037,0.012 -1.789903,0.078 -2.659024,0.3631 -2.573677,0.8441 -4.593833,2.5556 -5.727803,4.8525 -0.826058,1.6733 -1.095012,2.944 -1.007199,4.7588 0.217877,4.502 3.338466,8.0392 7.937336,8.9969 0.81339,0.1694 2.876191,0.071 3.896977,-0.1864 z"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.1632489;stroke-opacity:1" />
+    <path
+       id="path6533"
+       d="m 30.434149,1027.6409 c -0.934321,-0.2194 -2.398328,-1.0873 -3.118181,-1.8484 -2.480698,-2.623 -2.418499,-6.5741 0.143591,-9.1202 2.522587,-2.507 6.557199,-2.5048 9.122058,0 1.603993,1.5694 2.303559,3.9386 1.80349,6.1077 -0.518332,2.2485 -2.614507,4.3444 -4.863113,4.8629 -0.736116,0.1697 -2.350973,0.166 -3.087845,-0.012 z"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.1632489;stroke-opacity:1" />
+    <path
+       id="path6529"
+       d="m 21.270726,1012.8887 c -0.0976,-0.5202 -0.682222,-1.113 -1.223284,-1.2405 -0.478723,-0.1128 -1.244048,0.1971 -1.543771,0.625 -0.450084,0.6426 -0.196298,1.7722 0.482702,2.1487 0.452294,0.2506 1.373692,0.2394 1.730711,-0.056 0.357018,-0.2951 0.650413,-0.9615 0.553642,-1.4773 z"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.1632489;stroke-opacity:1" />
+    <circle
+       r="26.662109"
+       id="path7511-3-8-6-2-5-2-6-2-3"
+       style="fill:none;stroke:#000000;stroke-width:4.03292418;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       cx="32"
+       cy="1020.3622" />
+  </g>
+</svg>
diff --git a/companion/src/images/simulator/icons/svg/camera.svg b/companion/src/images/simulator/icons/svg/camera.svg
index 24e159004..7a2d298d3 100644
--- a/companion/src/images/simulator/icons/svg/camera.svg
+++ b/companion/src/images/simulator/icons/svg/camera.svg
@@ -1 +1,57 @@
-<svg version="1.2" baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 20h-14c-1.654 0-3-1.346-3-3v-8c0-1.654 1.346-3 3-3h1.586l1-1c.579-.579 1.596-1 2.414-1h4c.818 0 1.835.421 2.414 1l1 1h1.586c1.654 0 3 1.346 3 3v8c0 1.654-1.346 3-3 3zm-14-12c-.552 0-1 .448-1 1v8c0 .552.448 1 1 1h14c.552 0 1-.448 1-1v-8c0-.552-.448-1-1-1h-2c-.266 0-.52-.105-.707-.293l-1.293-1.293c-.201-.201-.715-.414-1-.414h-4c-.285 0-.799.213-1 .414l-1.293 1.293c-.187.188-.441.293-.707.293h-2zM12 10c1.379 0 2.5 1.121 2.5 2.5s-1.121 2.5-2.5 2.5-2.5-1.121-2.5-2.5 1.121-2.5 2.5-2.5m0-1c-1.934 0-3.5 1.566-3.5 3.5 0 1.932 1.566 3.5 3.5 3.5s3.5-1.568 3.5-3.5c0-1.934-1.566-3.5-3.5-3.5zM18 8.699c-.719 0-1.3.582-1.3 1.301s.581 1.299 1.3 1.299 1.3-.58 1.3-1.299-.581-1.301-1.3-1.301z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg5332"
+   viewBox="0 0 64.000001 64.000001"
+   height="64"
+   width="64">
+  <defs
+     id="defs5334" />
+  <metadata
+     id="metadata5337">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-988.36216)"
+     id="layer1">
+    <g
+       id="g6539"
+       transform="translate(0,-2.2617187e-5)">
+      <circle
+         cy="1020.3622"
+         cx="32"
+         style="fill:none;stroke:#000000;stroke-width:4.359375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path7511-3-8-6-2-5-2-6-2"
+         r="28.820312" />
+      <path
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:2.21017289;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 18.817586,1033.1534 c -2.003825,-0.7073 -3.457036,-2.1866 -4.13535,-4.2095 -0.277505,-0.8277 -0.289265,-1.1387 -0.289265,-7.6504 0,-6.3546 0.01745,-6.8438 0.272479,-7.6693 0.615999,-1.9932 1.929935,-3.3663 3.958827,-4.1373 0.683013,-0.2595 1.201275,-0.3291 2.888021,-0.3877 1.902622,-0.066 2.068978,-0.093 2.234764,-0.3643 0.09853,-0.1611 0.571783,-0.9613 1.051717,-1.7783 0.658724,-1.1214 0.983189,-1.5378 1.323858,-1.6995 0.670602,-0.3182 11.165398,-0.3186 11.775534,0 0.499476,0.2604 0.629457,0.4367 1.677451,2.2751 l 0.835283,1.4651 2.078074,0.088 c 2.401585,0.1024 3.161571,0.3205 4.473867,1.2866 0.998498,0.735 1.566768,1.4411 2.148637,2.6696 l 0.449898,0.9499 0.0385,6.9923 c 0.03339,6.0829 0.0093,7.0933 -0.18434,7.769 -0.589336,2.0549 -2.23303,3.7437 -4.323807,4.4422 -0.84773,0.2834 -1.07511,0.2883 -13.110118,0.2854 l -12.247417,0 -0.916547,-0.3235 z"
+         id="path6537" />
+      <path
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.1632489;stroke-opacity:1"
+         d="m 34.313422,1030.5706 c 3.191745,-0.8042 5.775519,-3.2111 6.79891,-6.3335 0.362189,-1.1051 0.402193,-1.4096 0.398343,-3.032 -0.0035,-1.5896 -0.04804,-1.9284 -0.37338,-2.8573 -0.546668,-1.5609 -1.272035,-2.7034 -2.473253,-3.8955 -0.868074,-0.8613 -1.320892,-1.1833 -2.371213,-1.686 -1.724935,-0.8255 -2.500938,-0.9977 -4.419694,-0.9806 -1.3037,0.012 -1.789903,0.078 -2.659024,0.3631 -2.573677,0.8441 -4.593833,2.5556 -5.727803,4.8525 -0.826058,1.6733 -1.095012,2.944 -1.007199,4.7588 0.217877,4.502 3.338466,8.0392 7.937336,8.9969 0.81339,0.1694 2.876191,0.071 3.896977,-0.1864 z"
+         id="path6535" />
+      <path
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.1632489;stroke-opacity:1"
+         d="m 30.434149,1027.6409 c -0.934321,-0.2194 -2.398328,-1.0873 -3.118181,-1.8484 -2.480698,-2.623 -2.418499,-6.5741 0.143591,-9.1202 2.522587,-2.507 6.557199,-2.5048 9.122058,0 1.603993,1.5694 2.303559,3.9386 1.80349,6.1077 -0.518332,2.2485 -2.614507,4.3444 -4.863113,4.8629 -0.736116,0.1697 -2.350973,0.166 -3.087845,-0.012 z"
+         id="path6533" />
+      <path
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.1632489;stroke-opacity:1"
+         d="m 21.270726,1012.8887 c -0.0976,-0.5202 -0.682222,-1.113 -1.223284,-1.2405 -0.478723,-0.1128 -1.244048,0.1971 -1.543771,0.625 -0.450084,0.6426 -0.196298,1.7722 0.482702,2.1487 0.452294,0.2506 1.373692,0.2394 1.730711,-0.056 0.357018,-0.2951 0.650413,-0.9615 0.553642,-1.4773 z"
+         id="path6529" />
+    </g>
+  </g>
+</svg>
diff --git a/companion/src/images/simulator/icons/svg/console-active.svg b/companion/src/images/simulator/icons/svg/console-active.svg
new file mode 100644
index 000000000..a60ccd064
--- /dev/null
+++ b/companion/src/images/simulator/icons/svg/console-active.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg5332"
+   viewBox="0 0 64.000001 64.000001"
+   height="64"
+   width="64">
+  <defs
+     id="defs5334" />
+  <metadata
+     id="metadata5337">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <circle
+     cy="32.000004"
+     cx="32"
+     style="fill:none;stroke:#000000;stroke-width:4.359375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path7511-3-8-6-2-5-2-6"
+     r="28.820312" />
+  <path
+     id="path5361-4"
+     d="m 8.1113332,30.95822 9.1263358,8.3942 -8.9368928,7.6254"
+     style="fill:none;stroke:#000000;stroke-width:4.54343081;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     id="text3339"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:24.54616547px;line-height:120.00000477%;font-family:Arial;-inkscape-font-specification:'Arial, Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1">
+    <path
+       id="path3344"
+       style=""
+       d="m 37.969558,48.949154 -3.859309,0 -1.534135,-3.991149 -7.023464,0 -1.450237,3.991149 -3.763426,0 6.843682,-17.570644 3.751441,0 7.035448,17.570644 z m -6.53206,-6.951551 -2.421058,-6.520075 -2.373115,6.520075 4.794173,0 z" />
+    <path
+       id="path3346"
+       style=""
+       d="m 39.875242,31.37851 7.023463,0 q 2.085465,0 3.104227,0.179782 1.030747,0.167796 1.833771,0.719125 0.81501,0.55133 1.354354,1.474209 0.539345,0.910893 0.539345,2.049509 0,1.234499 -0.671185,2.265246 -0.659198,1.030748 -1.797814,1.546121 1.606047,0.467432 2.468999,1.594063 0.862951,1.12663 0.862951,2.64878 0,1.198543 -0.563316,2.337159 -0.55133,1.126631 -1.52215,1.809801 -0.958834,0.671184 -2.373115,0.826995 -0.886922,0.09588 -4.278799,0.119854 l -5.980731,0 0,-17.570644 z m 3.547688,2.924446 0,4.063061 2.325174,0 q 2.073479,0 2.576868,-0.05993 0.910892,-0.107869 1.426266,-0.623243 0.527359,-0.527359 0.527359,-1.378324 0,-0.81501 -0.455446,-1.318398 -0.443461,-0.515373 -1.330383,-0.623242 -0.527359,-0.05993 -3.032315,-0.05993 l -2.037523,0 z m 0,6.987507 0,4.698289 3.284008,0 q 1.917669,0 2.433043,-0.107869 0.791039,-0.143825 1.282441,-0.695155 0.503388,-0.563315 0.503388,-1.498179 0,-0.791038 -0.383533,-1.342368 -0.383534,-0.55133 -1.114646,-0.803024 -0.719126,-0.251694 -3.140183,-0.251694 l -2.864518,0 z" />
+  </g>
+</svg>
diff --git a/companion/src/images/simulator/icons/svg/console.svg b/companion/src/images/simulator/icons/svg/console.svg
index 9ce925a6e..5f42e9976 100644
--- a/companion/src/images/simulator/icons/svg/console.svg
+++ b/companion/src/images/simulator/icons/svg/console.svg
@@ -1,10 +1,49 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="68" height="53" viewBox="-0.462891 -0.018555 68 53" id="svg2" xml:space="preserve"><metadata id="metadata14"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata>
-<defs id="defs4">
-</defs>
-<path d="M 60.37793,0 H 6.289551 C 2.81543,0 0,2.802734 0,6.260742 v 40.071289 c 0,3.458008 2.81543,6.260742 6.289551,6.260742 H 60.37793 c 3.473633,0 6.288086,-2.802734 6.288086,-6.260742 V 6.260742 C 66.666016,2.802734 63.851563,0 60.37793,0 z M 20.739258,5.193359 c 1.229492,0 2.226074,0.991699 2.226074,2.215332 0,1.224121 -0.996582,2.21582 -2.226074,2.21582 -1.229492,0 -2.226074,-0.991699 -2.226074,-2.21582 0,-1.223632 0.996582,-2.215332 2.226074,-2.215332 z m -6.660645,0 c 1.229492,0 2.226074,0.991699 2.226074,2.215332 0,1.224121 -0.996582,2.21582 -2.226074,2.21582 -1.229004,0 -2.226074,-0.991699 -2.226074,-2.21582 0,-1.223632 0.99707,-2.215332 2.226074,-2.215332 z m -6.67041,0 c 1.223633,0 2.215332,0.991699 2.215332,2.215332 0,1.224121 -0.991699,2.21582 -2.215332,2.21582 -1.223633,0 -2.215332,-0.991699 -2.215332,-2.21582 0,-1.223632 0.991699,-2.215332 2.215332,-2.215332 z M 64.444336,45.18457 c 0,2.962891 -2.22168,5.185547 -5.18457,5.185547 H 7.407715 c -2.963379,0 -5.185547,-2.222656 -5.185547,-5.185547 V 13.333496 c 0,0.0049 62.14502,0 62.222168,0 V 45.18457 z" id="path6" />
-
-
-<path d="m 5.3691063,21.009388 0,6.863626 54.9094277,0 0,-6.863626 z m 0,13.727252 0,6.863625 34.3183947,0 0,-6.863625 z" id="path3386" /></svg>
\ No newline at end of file
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg5332"
+   viewBox="0 0 64.000001 64.000001"
+   height="64"
+   width="64">
+  <defs
+     id="defs5334" />
+  <metadata
+     id="metadata5337">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-988.36216)"
+     id="layer1">
+    <g
+       id="g5962"
+       transform="translate(0,-2.2617187e-5)">
+      <circle
+         cy="1020.3622"
+         cx="32"
+         style="fill:none;stroke:#000000;stroke-width:4.359375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path7511-3-8-6-2-5-2-6"
+         r="28.820312" />
+      <path
+         id="path5361-4"
+         d="m 15.97574,1019.3204 9.126336,8.3942 -8.936893,7.6254"
+         style="fill:none;stroke:#000000;stroke-width:4.54343081;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path5363-3"
+         d="m 30.356373,1035.2409 13.806832,0"
+         style="fill:none;stroke:#000000;stroke-width:4.54343081;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/companion/src/images/simulator/icons/svg/eraser-active.svg b/companion/src/images/simulator/icons/svg/eraser-active.svg
index 8b529097c..59ba7b0aa 100644
--- a/companion/src/images/simulator/icons/svg/eraser-active.svg
+++ b/companion/src/images/simulator/icons/svg/eraser-active.svg
@@ -1,12 +1,33 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.2" width="64" height="64" viewBox="0 0 64 64" id="svg3254" xml:space="preserve"><metadata id="metadata11"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs id="defs9" />
-<g id="layer1">
-	<g transform="matrix(1.5756397,0,0,1.6644338,54.170963,-1788.6456)" id="g3219">
-		<g transform="matrix(0.63466286,0,0,0.60080491,-55.333181,1055.0231)" id="g3488">
-			<path d="M 90.122,87.857 H 62.31 L 90.594,59.568 c 2.043,-2.042 2.043,-5.366 0,-7.409 L 80.59,42.157 c -0.795,-0.796 -1.785,-1.26 -2.817,-1.436 0.002,0 -4.577,0.241 -8.999,0.744 -1.358,0.153 -2.492,0.923 -3.284,1.714 L 37.616,71.055 c -2.043,2.043 -2.043,5.365 0,7.407 l 10.003,10.003 c 0.982,0.984 2.296,1.527 3.691,1.527 0.109,0 6.752,-0.131 6.821,-0.135 0.335,-0.031 1.14,-0.123 1.14,-0.123 h 30.851 c 0.518,0 0.938,-0.421 0.938,-0.939 0.001,-0.517 -0.421,-0.938 -0.938,-0.938 z M 60.339,86.862 c -1.226,1.225 -3.218,1.225 -4.446,0 L 45.89,76.86 c -1.226,-1.228 -1.226,-3.222 0,-4.445 L 60.138,58.167 74.544,72.655 60.339,86.862 z M 72.661,42.961 75.489,42.73 60.095,58.125 57.737,57.887 72.661,42.961 z M 39.098,76.983 c -1.227,-1.227 -1.227,-3.221 0,-4.448 l 15.049,-15.049 3.346,0.359 -13.086,13.086 c -2.042,2.042 -2.042,5.368 0,7.409 l 9.508,9.508 c -0.152,0.003 -0.289,0.005 -0.435,0.008 H 50.904 C 50.222,87.768 49.59,87.475 49.099,86.983 l -10.001,-10 z" id="path3495" style="fill:#042fb5" />
-		</g>
-	</g>
-</g>
-</svg>
\ No newline at end of file
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg3254"
+   height="64"
+   width="64"
+   version="1.1">
+  <defs
+     id="defs3256" />
+  <metadata
+     id="metadata3259">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     d="M 34.720404,45.186814 52.10144,17.094529 c 1.25533,-2.028627 0.626297,-4.699942 -1.40233,-5.955275 L 40.764783,4.9921938 C 39.97448,4.5031479 39.091005,4.3170345 38.228028,4.3714288 c 0.0015,1.308e-4 -3.633307,1.0604815 -7.092404,2.3015 -1.063335,0.3806651 -1.829347,1.214316 -2.315397,1.9991581 L 11.690516,36.355735 c -1.255331,2.028628 -0.626617,4.698591 1.402012,5.953923 l 9.933987,6.147615 c 0.975952,0.605082 2.134546,0.792499 3.256228,0.528368 0.08739,-0.02058 5.402948,-1.383525 5.45772,-1.399275 0.263445,-0.08865 0.892584,-0.314309 0.892584,-0.314309 0.810732,-0.489373 1.461711,-1.26464 2.087357,-2.085243 z m -1.773055,-0.426415 c -0.753518,1.215825 -2.355407,1.593033 -3.573617,0.841504 l -9.933667,-6.146266 c -1.218053,-0.754894 -1.595473,-2.357682 -0.841609,-3.574063 l 8.756087,-14.149305 14.321501,8.919985 z M 34.542891,7.140056 36.772178,6.4187491 27.312007,21.707101 25.371326,21.962018 Z M 14.003992,40.839832 C 12.785808,40.086395 12.408388,38.483607 13.162064,37.264416 L 22.41019,22.319349 25.167971,21.974721 17.126272,34.97019 c -1.255333,2.028628 -0.625876,4.701744 1.40233,5.955274 l 9.442443,5.843061 c -0.121437,0.03147 -0.231009,0.05882 -0.347986,0.08903 l -2.070834,0.487634 c -0.564878,0.05838 -1.1286,-0.05802 -1.6159,-0.360723 z"
+     id="path3495" />
+  <path
+     id="path3388"
+     d="m 9.4915253,53.559323 44.2033897,-14.915255 1.423729,1.898305 -6.576271,2.779661 3.186441,-0.406779 -0.20339,0.813559 -4.745763,1.898305 7.457627,-1.559322 0,0.542373 6.847458,-1.152542 0.406779,1.220339 L 36,52.135594 l -9.762712,2.305085 -7.728813,3.525423 -8.067797,1.016949 0.0678,-1.084745 5.694915,-2.169492 -0.20339,-0.474576 -5.016949,1.694915 -6.5762717,0.813559 -0.4067791,-1.084745 8.8813558,-2.847458 -3.1864407,0.271186 z"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+</svg>
diff --git a/companion/src/images/simulator/icons/svg/eraser.svg b/companion/src/images/simulator/icons/svg/eraser.svg
index f7fe40f63..a056fcb3d 100644
--- a/companion/src/images/simulator/icons/svg/eraser.svg
+++ b/companion/src/images/simulator/icons/svg/eraser.svg
@@ -1,21 +1,40 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64" id="svg3254">
-  <defs id="defs3256" />
-  <metadata id="metadata3259">
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg3254"
+   height="64"
+   width="64"
+   version="1.1">
+  <defs
+     id="defs3256" />
+  <metadata
+     id="metadata3259">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1">
-    <g transform="matrix(1.5756397,0,0,1.6644338,54.170963,-1788.6456)" id="g3219" style="display:inline">
-      <g transform="matrix(0.63466286,0,0,0.60080491,-55.333181,1055.0231)" id="g3488">
-        <path d="M 90.121527,87.856832 H 62.310073 l 28.28445,-28.288377 c 2.042733,-2.042734 2.042733,-5.366031 0,-7.408767 L 80.591011,42.156731 c -0.795799,-0.795799 -1.785502,-1.260389 -2.817798,-1.4358 0.0017,5.61e-4 -4.576959,0.241542 -8.998683,0.744239 -1.35902,0.153556 -2.493313,0.923575 -3.284066,1.713768 l -27.874789,27.87647 c -2.042735,2.042734 -2.042735,5.364349 0,7.407085 L 47.618633,88.46601 c 0.982417,0.9841 2.296044,1.526587 3.691493,1.526587 0.108722,0 6.752515,-0.131138 6.821447,-0.1345 0.335131,-0.03137 1.139336,-0.122734 1.139336,-0.122734 h 30.850057 c 0.51783,0 0.939264,-0.421436 0.939264,-0.939266 0.0012,-0.517828 -0.420314,-0.939265 -0.938703,-0.939265 z M 60.338511,86.862085 c -1.225641,1.223959 -3.218499,1.223959 -4.445821,0 L 45.889735,76.860247 c -1.226203,-1.227882 -1.226203,-3.221858 0,-4.446378 L 60.13788,58.166282 74.542946,72.65541 60.338511,86.862085 z M 72.66105,42.961495 75.488937,42.730042 60.094728,58.12481 57.736476,57.886631 72.66105,42.961495 z M 39.097989,76.98298 c -1.226762,-1.226201 -1.226762,-3.220177 0,-4.44806 l 15.048988,-15.04899 3.346276,0.359231 -13.085832,13.085834 c -2.042737,2.042734 -2.042737,5.368272 0,7.408766 l 9.508103,9.508104 c -0.151875,0.0034 -0.288618,0.0052 -0.434887,0.0084 H 50.90438 C 50.222349,87.768285 49.590193,87.47462 49.099826,86.98257 L 39.097989,76.98299 z" id="path3495" />
+  <g
+     id="layer1">
+    <g
+       style="display:inline"
+       id="g3219"
+       transform="matrix(1.5756397,0,0,1.6644338,54.170963,-1788.6456)">
+      <g
+         id="g3488"
+         transform="matrix(0.63466286,0,0,0.60080491,-55.333181,1055.0231)">
+        <path
+           id="path3495"
+           d="M 90.121527,87.856832 H 62.310073 l 28.28445,-28.288377 c 2.042733,-2.042734 2.042733,-5.366031 0,-7.408767 L 80.591011,42.156731 c -0.795799,-0.795799 -1.785502,-1.260389 -2.817798,-1.4358 0.0017,5.61e-4 -4.576959,0.241542 -8.998683,0.744239 -1.35902,0.153556 -2.493313,0.923575 -3.284066,1.713768 l -27.874789,27.87647 c -2.042735,2.042734 -2.042735,5.364349 0,7.407085 L 47.618633,88.46601 c 0.982417,0.9841 2.296044,1.526587 3.691493,1.526587 0.108722,0 6.752515,-0.131138 6.821447,-0.1345 0.335131,-0.03137 1.139336,-0.122734 1.139336,-0.122734 h 30.850057 c 0.51783,0 0.939264,-0.421436 0.939264,-0.939266 0.0012,-0.517828 -0.420314,-0.939265 -0.938703,-0.939265 z M 60.338511,86.862085 c -1.225641,1.223959 -3.218499,1.223959 -4.445821,0 L 45.889735,76.860247 c -1.226203,-1.227882 -1.226203,-3.221858 0,-4.446378 L 60.13788,58.166282 74.542946,72.65541 60.338511,86.862085 z M 72.66105,42.961495 75.488937,42.730042 60.094728,58.12481 57.736476,57.886631 72.66105,42.961495 z M 39.097989,76.98298 c -1.226762,-1.226201 -1.226762,-3.220177 0,-4.44806 l 15.048988,-15.04899 3.346276,0.359231 -13.085832,13.085834 c -2.042737,2.042734 -2.042737,5.368272 0,7.408766 l 9.508103,9.508104 c -0.151875,0.0034 -0.288618,0.0052 -0.434887,0.0084 H 50.90438 C 50.222349,87.768285 49.590193,87.47462 49.099826,86.98257 L 39.097989,76.98299 z" />
       </g>
     </g>
   </g>
diff --git a/companion/src/images/simulator/icons/svg/fixed_x-on.svg b/companion/src/images/simulator/icons/svg/fixed_x-on.svg
index 3a9a7022b..4c824b71e 100644
--- a/companion/src/images/simulator/icons/svg/fixed_x-on.svg
+++ b/companion/src/images/simulator/icons/svg/fixed_x-on.svg
@@ -1,18 +1,47 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.2" width="24" height="24" viewBox="0 0 24 24" id="svg2">
-  <metadata id="metadata12">
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg2"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata12">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <defs id="defs10" />
-  <g id="g4">
-    <path d="m 8.6983048,19.732203 c 0,1.839023 1.4965692,3.335593 3.3355932,3.335593 1.839024,0 3.335594,-1.49657 3.335594,-3.335593 0,-1.447648 -0.932854,-2.669587 -2.223729,-3.129899 l 0,-9.3051922 c 1.290875,-0.461423 2.223729,-1.683362 2.223729,-3.13101 0,-1.839024 -1.49657,-3.33559301 -3.335594,-3.33559301 -1.839024,-1e-8 -3.3355932,1.49656901 -3.3355932,3.33559301 0,1.447648 0.932854,2.669587 2.2237292,3.13101 l 0,9.3040812 c -1.2908752,0.461423 -2.2237292,1.683362 -2.2237292,3.13101 z m 3.3355932,1.111864 c -0.613749,0 -1.111864,-0.499227 -1.111864,-1.111864 0,-0.612638 0.498115,-1.111865 1.111864,-1.111865 0.613749,0 1.111865,0.499227 1.111865,1.111865 0,0.612637 -0.498116,1.111864 -1.111865,1.111864 z m 0,-17.7898292 c 0.613749,0 1.111865,0.499227 1.111865,1.111864 0,0.612637 -0.498116,1.111865 -1.111865,1.111865 -0.613749,0 -1.111864,-0.499228 -1.111864,-1.111865 0,-0.612637 0.498115,-1.111864 1.111864,-1.111864 z" id="path6" />
-  </g>
+  <defs
+     id="defs10" />
+  <path
+     id="path3336"
+     d="m 11.998047,14.830593 a 3.1280487,3.1280487 0 0 0 3.128906,-3.128906 3.1280487,3.1280487 0 0 0 -3.128906,-3.1289062 3.1280487,3.1280487 0 0 0 -3.1289061,3.1289062 3.1280487,3.1280487 0 0 0 3.1289061,3.128906 z m 0,-1.007813 A 2.1213202,2.1213202 0 0 1 9.8769529,11.701687 2.1213202,2.1213202 0 0 1 11.998047,9.5805928 2.1213202,2.1213202 0 0 1 14.11914,11.701687 2.1213202,2.1213202 0 0 1 11.998047,13.82278 Z"
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <path
+     id="rect4153"
+     d="m 11.294665,22.801039 1.677734,0 0,-9.142578 a 2.2112069,2.3010933 0 0 1 -1.033203,0.267578 2.2112069,2.3010933 0 0 1 -0.644531,-0.09961 l 0,8.97461 z m 0,-13.3750002 a 2.2112069,2.3010933 0 0 1 0.644531,-0.101563 2.2112069,2.3010933 0 0 1 1.033203,0.267579 l 0,-8.68945395 -1.677734,0 0,8.52343795 z"
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <circle
+     r="0"
+     cy="13.5"
+     cx="74.440681"
+     id="path3336-6"
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <circle
+     r="0"
+     style="opacity:1;fill:#fffdfd;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="circle3343-7"
+     cx="74.440681"
+     cy="13.5" />
 </svg>
diff --git a/companion/src/images/simulator/icons/svg/fixed_x.svg b/companion/src/images/simulator/icons/svg/fixed_x.svg
index 767a9a43a..fb0ce9ba3 100644
--- a/companion/src/images/simulator/icons/svg/fixed_x.svg
+++ b/companion/src/images/simulator/icons/svg/fixed_x.svg
@@ -1,18 +1,47 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.2" width="24" height="24" viewBox="0 0 24 24" id="svg2">
-  <metadata id="metadata12">
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg2"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata12">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <defs id="defs10" />
-  <g id="g4">
-    <path d="M 18.719627,16.714495 C 18.255424,13.416386 15.423783,10.867797 12,10.867797 9.8080542,10.867797 7.9784136,9.3042237 7.5617627,7.2345559 8.8298305,6.7409153 9.7355932,5.514739 9.7355932,4.0745763 c 0,-1.8726644 -1.5239457,-3.3966102 -3.3966101,-3.3966102 -1.8726645,0 -3.3966102,1.5239458 -3.3966102,3.3966102 0,1.5013017 0.9850169,2.7625762 2.338,3.2109288 C 5.7445763,10.583614 8.5762169,13.132203 12,13.132203 c 2.191946,0 4.021586,1.563573 4.438237,3.633241 -1.268068,0.493641 -2.17383,1.719817 -2.17383,3.15998 0,1.872664 1.523946,3.39661 3.39661,3.39661 1.872664,0 3.39661,-1.523946 3.39661,-3.39661 0,-1.501302 -0.985017,-2.762577 -2.338,-3.210929 z M 6.3389831,2.9423729 c 0.6249762,0 1.1322033,0.5083593 1.1322033,1.1322034 0,0.623844 -0.5072271,1.1322034 -1.1322033,1.1322034 -0.6249763,0 -1.1322034,-0.5083594 -1.1322034,-1.1322034 0,-0.6238441 0.5072271,-1.1322034 1.1322034,-1.1322034 z M 17.661017,21.057627 c -0.624976,0 -1.132203,-0.508359 -1.132203,-1.132203 0,-0.623844 0.507227,-1.132204 1.132203,-1.132204 0.624976,0 1.132203,0.50836 1.132203,1.132204 0,0.623844 -0.507227,1.132203 -1.132203,1.132203 z" id="path6" />
-  </g>
+  <defs
+     id="defs10" />
+  <path
+     id="path3336"
+     d="m 11.998047,14.830593 a 3.1280487,3.1280487 0 0 0 3.128906,-3.128906 3.1280487,3.1280487 0 0 0 -3.128906,-3.1289062 3.1280487,3.1280487 0 0 0 -3.1289061,3.1289062 3.1280487,3.1280487 0 0 0 3.1289061,3.128906 z m 0,-1.007813 A 2.1213202,2.1213202 0 0 1 9.8769529,11.701687 2.1213202,2.1213202 0 0 1 11.998047,9.5805928 2.1213202,2.1213202 0 0 1 14.11914,11.701687 2.1213202,2.1213202 0 0 1 11.998047,13.82278 Z"
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <path
+     id="rect4153"
+     d="M 11.294922 0.90234375 L 11.294922 2.5429688 L 12.972656 2.5429688 L 12.972656 0.90234375 L 11.294922 0.90234375 z M 11.294922 4.1191406 L 11.294922 5.6445312 L 12.972656 5.6445312 L 12.972656 4.1191406 L 11.294922 4.1191406 z M 11.294922 7.2207031 L 11.294922 9.4257812 A 2.2112069 2.3010933 0 0 1 11.939453 9.3242188 A 2.2112069 2.3010933 0 0 1 12.972656 9.5917969 L 12.972656 7.2207031 L 11.294922 7.2207031 z M 12.972656 13.658203 A 2.2112069 2.3010933 0 0 1 11.939453 13.925781 A 2.2112069 2.3010933 0 0 1 11.294922 13.826172 L 11.294922 16.220703 L 12.972656 16.220703 L 12.972656 13.658203 z M 11.294922 17.796875 L 11.294922 19.423828 L 12.972656 19.423828 L 12.972656 17.796875 L 11.294922 17.796875 z M 11.294922 21 L 11.294922 22.800781 L 12.972656 22.800781 L 12.972656 21 L 11.294922 21 z "
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <circle
+     r="0"
+     cy="13.5"
+     cx="74.440681"
+     id="path3336-6"
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <circle
+     r="0"
+     style="opacity:1;fill:#fffdfd;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="circle3343-7"
+     cx="74.440681"
+     cy="13.5" />
 </svg>
diff --git a/companion/src/images/simulator/icons/svg/fixed_y-on.svg b/companion/src/images/simulator/icons/svg/fixed_y-on.svg
index 319b784ef..6c95694ba 100644
--- a/companion/src/images/simulator/icons/svg/fixed_y-on.svg
+++ b/companion/src/images/simulator/icons/svg/fixed_y-on.svg
@@ -1,18 +1,47 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.2" width="24" height="24" viewBox="0 0 24 24" id="svg2">
-  <metadata id="metadata12">
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg2"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata12">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <defs id="defs10" />
-  <g id="g4">
-    <path d="m 4.2508478,8.6135588 c -1.839023,0 -3.33559301,1.4965692 -3.33559301,3.3355932 0,1.839024 1.49657001,3.335594 3.33559301,3.335594 1.447648,0 2.669587,-0.932854 3.129899,-2.223729 l 9.3051922,0 c 0.461423,1.290875 1.683362,2.223729 3.13101,2.223729 1.839024,0 3.335593,-1.49657 3.335593,-3.335594 0,-1.839024 -1.496569,-3.3355932 -3.335593,-3.3355932 -1.447648,0 -2.669587,0.932854 -3.13101,2.2237292 l -9.3040812,0 C 6.9204348,9.5464128 5.6984958,8.6135588 4.2508478,8.6135588 z m -1.111864,3.3355932 c 0,-0.613749 0.499227,-1.111864 1.111864,-1.111864 0.612638,0 1.111865,0.498115 1.111865,1.111864 0,0.613749 -0.499227,1.111865 -1.111865,1.111865 -0.612637,0 -1.111864,-0.498116 -1.111864,-1.111865 z m 17.7898292,0 c 0,0.613749 -0.499227,1.111865 -1.111864,1.111865 -0.612637,0 -1.111865,-0.498116 -1.111865,-1.111865 0,-0.613749 0.499228,-1.111864 1.111865,-1.111864 0.612637,0 1.111864,0.498115 1.111864,1.111864 z" id="path6" />
-  </g>
+  <defs
+     id="defs10" />
+  <path
+     id="path3336"
+     d="M 9.0192742,11.85182 A 3.1280487,3.1280487 0 0 0 12.14818,14.980726 3.1280487,3.1280487 0 0 0 15.277086,11.85182 3.1280487,3.1280487 0 0 0 12.14818,8.7229136 3.1280487,3.1280487 0 0 0 9.0192742,11.85182 Z m 1.0078128,0 A 2.1213202,2.1213202 0 0 1 12.14818,9.7307256 2.1213202,2.1213202 0 0 1 14.269274,11.85182 2.1213202,2.1213202 0 0 1 12.14818,13.972913 2.1213202,2.1213202 0 0 1 10.027087,11.85182 Z"
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <path
+     id="rect4153"
+     d="M 1.0488281 11.148438 L 1.0488281 12.826172 L 10.191406 12.826172 A 2.3010933 2.2112069 0 0 1 9.9238281 11.792969 A 2.3010933 2.2112069 0 0 1 10.023438 11.148438 L 1.0488281 11.148438 z M 14.423828 11.148438 A 2.3010933 2.2112069 0 0 1 14.525391 11.792969 A 2.3010933 2.2112069 0 0 1 14.257812 12.826172 L 22.947266 12.826172 L 22.947266 11.148438 L 14.423828 11.148438 z "
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <circle
+     r="0"
+     cy="13.5"
+     cx="74.440681"
+     id="path3336-6"
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <circle
+     r="0"
+     style="opacity:1;fill:#fffdfd;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="circle3343-7"
+     cx="74.440681"
+     cy="13.5" />
 </svg>
diff --git a/companion/src/images/simulator/icons/svg/fixed_y.svg b/companion/src/images/simulator/icons/svg/fixed_y.svg
index e6b15140a..d80dba81b 100644
--- a/companion/src/images/simulator/icons/svg/fixed_y.svg
+++ b/companion/src/images/simulator/icons/svg/fixed_y.svg
@@ -1,18 +1,47 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.2" width="24" height="24" viewBox="0 0 24 24" id="svg2">
-  <metadata id="metadata12">
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg2"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata12">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <defs id="defs10" />
-  <g id="g4">
-    <path d="M 16.714495,5.280373 C 13.416386,5.744576 10.867797,8.576217 10.867797,12 c 0,2.191946 -1.5635734,4.021586 -3.6332412,4.438237 -0.4936406,-1.268067 -1.7198169,-2.17383 -3.1599796,-2.17383 -1.8726644,0 -3.3966102,1.523946 -3.3966102,3.39661 0,1.872664 1.5239458,3.39661 3.3966102,3.39661 1.5013017,0 2.7625762,-0.985017 3.2109288,-2.338 3.298109,-0.464203 5.846698,-3.295844 5.846698,-6.719627 0,-2.191946 1.563573,-4.021586 3.633241,-4.438237 0.493641,1.268068 1.719817,2.17383 3.15998,2.17383 1.872664,0 3.39661,-1.523946 3.39661,-3.39661 0,-1.872664 -1.523946,-3.39661 -3.39661,-3.39661 -1.501302,0 -2.762577,0.985017 -3.210929,2.338 z M 2.9423728,17.661017 c 0,-0.624976 0.5083593,-1.132203 1.1322034,-1.132203 0.623844,0 1.1322034,0.507227 1.1322034,1.132203 0,0.624976 -0.5083594,1.132203 -1.1322034,1.132203 -0.6238441,0 -1.1322034,-0.507227 -1.1322034,-1.132203 z M 21.057627,6.338983 c 0,0.624976 -0.508359,1.132203 -1.132203,1.132203 -0.623844,0 -1.132204,-0.507227 -1.132204,-1.132203 0,-0.624976 0.50836,-1.132203 1.132204,-1.132203 0.623844,0 1.132203,0.507227 1.132203,1.132203 z" id="path6" />
-  </g>
+  <defs
+     id="defs10" />
+  <path
+     id="path3336"
+     d="m 9.0190163,11.851562 a 3.1280487,3.1280487 0 0 0 3.1289057,3.128906 3.1280487,3.1280487 0 0 0 3.128907,-3.128906 3.1280487,3.1280487 0 0 0 -3.128907,-3.1289057 3.1280487,3.1280487 0 0 0 -3.1289057,3.1289057 z m 1.0078127,0 a 2.1213202,2.1213202 0 0 1 2.121093,-2.1210937 2.1213202,2.1213202 0 0 1 2.121095,2.1210937 2.1213202,2.1213202 0 0 1 -2.121095,2.121093 2.1213202,2.1213202 0 0 1 -2.121093,-2.121093 z"
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <path
+     id="rect4153"
+     d="m 22.947266,11.148437 -1.640625,0 0,1.677734 1.640625,0 0,-1.677734 z m -3.216797,0 -1.525391,0 0,1.677734 1.525391,0 0,-1.677734 z m -3.101563,0 -2.205078,0 a 2.3010933,2.2112069 0 0 1 0.101563,0.644531 2.3010933,2.2112069 0 0 1 -0.267579,1.033203 l 2.371094,0 0,-1.677734 z m -6.4375,1.677734 a 2.3010933,2.2112069 0 0 1 -0.2675777,-1.033203 2.3010933,2.2112069 0 0 1 0.099609,-0.644531 l -2.3945307,0 0,1.677734 2.5624997,0 z m -4.1386717,-1.677734 -1.626953,0 0,1.677734 1.626953,0 0,-1.677734 z m -3.203125,0 -1.800781,0 0,1.677734 1.800781,0 0,-1.677734 z"
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <circle
+     r="0"
+     cy="13.5"
+     cx="74.440681"
+     id="path3336-6"
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <circle
+     r="0"
+     style="opacity:1;fill:#fffdfd;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="circle3343-7"
+     cx="74.440681"
+     cy="13.5" />
 </svg>
diff --git a/companion/src/images/simulator/icons/svg/hold_x-on.svg b/companion/src/images/simulator/icons/svg/hold_x-on.svg
index 81808417a..d9be149a5 100644
--- a/companion/src/images/simulator/icons/svg/hold_x-on.svg
+++ b/companion/src/images/simulator/icons/svg/hold_x-on.svg
@@ -1,19 +1,75 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.2" width="24" height="24" viewBox="0 0 24 24" id="svg2">
-  <metadata id="metadata12">
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg2"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata12">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <defs id="defs10" />
-  <g id="g4">
-    <path d="m 4.2508478,1.2237283 c -1.839023,0 -3.33559301,1.4965692 -3.33559301,3.3355927 0,1.839025 1.49657001,3.335595 3.33559301,3.335595 1.447648,0 2.669587,-0.932855 3.129899,-2.22373 l 9.3051922,0 c 0.461423,1.290875 1.683362,2.22373 3.13101,2.22373 1.839024,0 3.335593,-1.49657 3.335593,-3.335595 0,-1.8390235 -1.496569,-3.3355927 -3.335593,-3.3355927 -1.447648,0 -2.669587,0.932854 -3.13101,2.2237292 l -9.3040812,0 C 6.9204348,2.1565823 5.6984958,1.2237283 4.2508478,1.2237283 z M 3.1389838,4.559321 c 0,-0.6137485 0.499227,-1.1118635 1.111864,-1.1118635 0.612638,0 1.111865,0.498115 1.111865,1.1118635 0,0.61375 -0.499227,1.111865 -1.111865,1.111865 -0.612637,0 -1.111864,-0.498115 -1.111864,-1.111865 z m 17.7898292,0 c 0,0.61375 -0.499227,1.111865 -1.111864,1.111865 -0.612637,0 -1.111865,-0.498115 -1.111865,-1.111865 0,-0.6137485 0.499228,-1.1118635 1.111865,-1.1118635 0.612637,0 1.111864,0.498115 1.111864,1.1118635 z" id="path6" />
-    <path d="m 11.881357,9.7203386 c -2.0268766,0 -3.6852308,1.6583534 -3.6852308,3.6852304 v 1.842616 H 6.3535111 v 7.370458 H 17.409201 v -7.370458 h -1.842613 v -1.842616 c 0,-2.026877 -1.658354,-3.6852304 -3.685231,-3.6852304 z m 0,1.8426154 c 1.031864,0 1.842614,0.81075 1.842614,1.842615 v 1.842616 h -3.685228 v -1.842616 c 0,-1.031865 0.81075,-1.842615 1.842614,-1.842615 z" id="path3043" />
-  </g>
+  <defs
+     id="defs10" />
+  <path
+     id="path3336"
+     d="M 9.0192742,11.85182 A 3.1280487,3.1280487 0 0 0 12.14818,14.980726 3.1280487,3.1280487 0 0 0 15.277086,11.85182 3.1280487,3.1280487 0 0 0 12.14818,8.7229136 3.1280487,3.1280487 0 0 0 9.0192742,11.85182 Z m 1.0078128,0 A 2.1213202,2.1213202 0 0 1 12.14818,9.7307256 2.1213202,2.1213202 0 0 1 14.269274,11.85182 2.1213202,2.1213202 0 0 1 12.14818,13.972913 2.1213202,2.1213202 0 0 1 10.027087,11.85182 Z"
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,1,0,0,0)"
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="rect4151"
+     width="12.340152"
+     height="1.6779661"
+     x="-18.021896"
+     y="5.6419506" />
+  <rect
+     transform="matrix(0,-1,1,0,0,0)"
+     y="1.5233065"
+     x="-18.021896"
+     height="1.6779661"
+     width="12.340152"
+     id="rect4153"
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,1,0,0,0)"
+     y="17.086863"
+     x="-18.021896"
+     height="1.6779661"
+     width="12.340152"
+     id="rect4155"
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <rect
+     transform="matrix(0,-1,1,0,0,0)"
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="rect4157"
+     width="12.340152"
+     height="1.6779661"
+     x="-18.021896"
+     y="20.798727" />
+  <circle
+     r="0"
+     cy="13.5"
+     cx="74.440681"
+     id="path3336-6"
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <circle
+     r="0"
+     style="opacity:1;fill:#fffdfd;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="circle3343-7"
+     cx="74.440681"
+     cy="13.5" />
 </svg>
diff --git a/companion/src/images/simulator/icons/svg/hold_x.svg b/companion/src/images/simulator/icons/svg/hold_x.svg
index c65cf5514..4c9a292d1 100644
--- a/companion/src/images/simulator/icons/svg/hold_x.svg
+++ b/companion/src/images/simulator/icons/svg/hold_x.svg
@@ -1,19 +1,59 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.2" width="24" height="24" viewBox="0 0 24 24" id="svg2">
-  <metadata id="metadata12">
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg2"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata12">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <defs id="defs10" />
-  <g id="g4">
-    <path d="m 4.2508478,1.2237283 c -1.839023,0 -3.33559301,1.4965692 -3.33559301,3.3355927 0,1.839025 1.49657001,3.335595 3.33559301,3.335595 1.447648,0 2.669587,-0.932855 3.129899,-2.22373 l 9.3051922,0 c 0.461423,1.290875 1.683362,2.22373 3.13101,2.22373 1.839024,0 3.335593,-1.49657 3.335593,-3.335595 0,-1.8390235 -1.496569,-3.3355927 -3.335593,-3.3355927 -1.447648,0 -2.669587,0.932854 -3.13101,2.2237292 l -9.3040812,0 C 6.9204348,2.1565823 5.6984958,1.2237283 4.2508478,1.2237283 z M 3.1389838,4.559321 c 0,-0.6137485 0.499227,-1.1118635 1.111864,-1.1118635 0.612638,0 1.111865,0.498115 1.111865,1.1118635 0,0.61375 -0.499227,1.111865 -1.111865,1.111865 -0.612637,0 -1.111864,-0.498115 -1.111864,-1.111865 z m 17.7898292,0 c 0,0.61375 -0.499227,1.111865 -1.111864,1.111865 -0.612637,0 -1.111865,-0.498115 -1.111865,-1.111865 0,-0.6137485 0.499228,-1.1118635 1.111865,-1.1118635 0.612637,0 1.111864,0.498115 1.111864,1.1118635 z" id="path6" />
-    <path d="m 11.999999,8.1864411 c -1.999576,0 -3.6355917,1.6360178 -3.6355917,3.6355939 h 1.8177947 c 0,-1.017967 0.799831,-1.817797 1.817797,-1.817797 1.017966,0 1.817797,0.79983 1.817797,1.817797 v 3.635593 H 6.5466099 v 7.271187 H 17.453389 v -7.271187 h -1.817796 v -3.635593 c 0,-1.9995761 -1.636018,-3.6355939 -3.635594,-3.6355939 z" id="path3014" />
-  </g>
+  <defs
+     id="defs10" />
+  <path
+     id="path3336"
+     d="m 8.7009423,11.864221 a 3.1280487,3.1280487 0 0 0 3.1289067,3.128906 3.1280487,3.1280487 0 0 0 3.128906,-3.128906 3.1280487,3.1280487 0 0 0 -3.128906,-3.1289059 3.1280487,3.1280487 0 0 0 -3.1289067,3.1289059 z m 1.0078124,0 a 2.1213202,2.1213202 0 0 1 2.1210943,-2.1210939 2.1213202,2.1213202 0 0 1 2.121094,2.1210939 2.1213202,2.1213202 0 0 1 -2.121094,2.121094 2.1213202,2.1213202 0 0 1 -2.1210943,-2.121094 z"
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <circle
+     r="0"
+     cy="13.5"
+     cx="74.440681"
+     id="path3336-6"
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <circle
+     r="0"
+     style="opacity:1;fill:#fffdfd;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="circle3343-7"
+     cx="74.440681"
+     cy="13.5" />
+  <path
+     id="path4154"
+     d="M 3.2141393,18.8352 7.8153934,11.926279 3.3352254,5.1991721"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.82534468px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.82534468px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 0.48159108,18.8352 5.0828452,11.926279 0.60267718,5.1991721"
+     id="path4156" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.82534468px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 20.479931,18.8352 15.878677,11.926279 20.358845,5.1991721"
+     id="path4158" />
+  <path
+     id="path4160"
+     d="M 23.212479,18.8352 18.611225,11.926279 23.091393,5.1991721"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.82534468px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
 </svg>
diff --git a/companion/src/images/simulator/icons/svg/hold_y-on.svg b/companion/src/images/simulator/icons/svg/hold_y-on.svg
index 4058d326c..5f5bbcce3 100644
--- a/companion/src/images/simulator/icons/svg/hold_y-on.svg
+++ b/companion/src/images/simulator/icons/svg/hold_y-on.svg
@@ -1,19 +1,71 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.2" width="24" height="24" viewBox="0 0 24 24" id="svg2">
-  <metadata id="metadata12">
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg2"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata12">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <defs id="defs10" />
-  <g id="g4">
-    <path d="m 2.2915249,19.783051 c 0,1.839023 1.4965695,3.335593 3.3355925,3.335593 1.839025,0 3.335595,-1.49657 3.335595,-3.335593 0,-1.447648 -0.932855,-2.669587 -2.22373,-3.129899 l 0,-9.3051925 c 1.290875,-0.461423 2.22373,-1.683362 2.22373,-3.13101 0,-1.839024 -1.49657,-3.33559299 -3.335595,-3.33559299 -1.839023,0 -3.3355925,1.49656899 -3.3355925,3.33559299 0,1.447648 0.932854,2.669587 2.2237295,3.13101 l 0,9.3040815 c -1.2908755,0.461423 -2.2237295,1.683362 -2.2237295,3.13101 z m 3.3355925,1.111864 c -0.613748,0 -1.111863,-0.499227 -1.111863,-1.111864 0,-0.612638 0.498115,-1.111865 1.111863,-1.111865 0.61375,0 1.111865,0.499227 1.111865,1.111865 0,0.612637 -0.498115,1.111864 -1.111865,1.111864 z m 0,-17.7898295 c 0.61375,0 1.111865,0.499227 1.111865,1.111864 0,0.612637 -0.498115,1.111865 -1.111865,1.111865 -0.613748,0 -1.111863,-0.499228 -1.111863,-1.111865 0,-0.612637 0.498115,-1.111864 1.111863,-1.111864 z" id="path6" />
-    <path d="m 17.135593,5.4491533 c -2.026877,0 -3.685231,1.6583532 -3.685231,3.6852302 v 1.8426155 h -1.842615 v 7.370459 h 11.05569 V 10.976999 H 20.820824 V 9.1343835 c 0,-2.026877 -1.658354,-3.6852302 -3.685231,-3.6852302 z m 0,1.8426152 c 1.031864,0 1.842614,0.81075 1.842614,1.842615 V 10.976999 H 15.292979 V 9.1343835 c 0,-1.031865 0.81075,-1.842615 1.842614,-1.842615 z" id="path3043" />
-  </g>
+  <defs
+     id="defs10" />
+  <path
+     id="path3336"
+     d="M 12 8.8710938 A 3.1280487 3.1280487 0 0 0 8.8710938 12 A 3.1280487 3.1280487 0 0 0 12 15.128906 A 3.1280487 3.1280487 0 0 0 15.128906 12 A 3.1280487 3.1280487 0 0 0 12 8.8710938 z M 12 9.8789062 A 2.1213202 2.1213202 0 0 1 14.121094 12 A 2.1213202 2.1213202 0 0 1 12 14.121094 A 2.1213202 2.1213202 0 0 1 9.8789062 12 A 2.1213202 2.1213202 0 0 1 12 9.8789062 z "
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <rect
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="rect4151"
+     width="12.340152"
+     height="1.6779661"
+     x="5.8299241"
+     y="5.4937701" />
+  <rect
+     y="1.3751261"
+     x="5.8299241"
+     height="1.6779661"
+     width="12.340152"
+     id="rect4153"
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <rect
+     y="16.938683"
+     x="5.8299241"
+     height="1.6779661"
+     width="12.340152"
+     id="rect4155"
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <rect
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="rect4157"
+     width="12.340152"
+     height="1.6779661"
+     x="5.8299241"
+     y="20.650547" />
+  <circle
+     r="0"
+     cy="13.5"
+     cx="74.440681"
+     id="path3336-6"
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <circle
+     r="0"
+     style="opacity:1;fill:#fffdfd;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="circle3343-7"
+     cx="74.440681"
+     cy="13.5" />
 </svg>
diff --git a/companion/src/images/simulator/icons/svg/hold_y.svg b/companion/src/images/simulator/icons/svg/hold_y.svg
index e620307b1..6bbc69eaf 100644
--- a/companion/src/images/simulator/icons/svg/hold_y.svg
+++ b/companion/src/images/simulator/icons/svg/hold_y.svg
@@ -1,19 +1,59 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.2" width="24" height="24" viewBox="0 0 24 24" id="svg2">
-  <metadata id="metadata12">
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg2"
+   viewBox="0 0 24 24"
+   height="24"
+   width="24"
+   version="1.2">
+  <metadata
+     id="metadata12">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <defs id="defs10" />
-  <g id="g4">
-    <path d="m 2.2915249,19.783051 c 0,1.839023 1.4965695,3.335593 3.3355925,3.335593 1.839025,0 3.335595,-1.49657 3.335595,-3.335593 0,-1.447648 -0.932855,-2.669587 -2.22373,-3.129899 l 0,-9.3051925 c 1.290875,-0.461423 2.22373,-1.683362 2.22373,-3.13101 0,-1.839024 -1.49657,-3.33559299 -3.335595,-3.33559299 -1.839023,0 -3.3355925,1.49656899 -3.3355925,3.33559299 0,1.447648 0.932854,2.669587 2.2237295,3.13101 l 0,9.3040815 c -1.2908755,0.461423 -2.2237295,1.683362 -2.2237295,3.13101 z m 3.3355925,1.111864 c -0.613748,0 -1.111863,-0.499227 -1.111863,-1.111864 0,-0.612638 0.498115,-1.111865 1.111863,-1.111865 0.61375,0 1.111865,0.499227 1.111865,1.111865 0,0.612637 -0.498115,1.111864 -1.111865,1.111864 z m 0,-17.7898295 c 0.61375,0 1.111865,0.499227 1.111865,1.111864 0,0.612637 -0.498115,1.111865 -1.111865,1.111865 -0.613748,0 -1.111863,-0.499228 -1.111863,-1.111865 0,-0.612637 0.498115,-1.111864 1.111863,-1.111864 z" id="path6" />
-    <path d="m 17.084745,3.7627115 c -1.999576,0 -3.635591,1.6360178 -3.635591,3.6355939 h 1.817794 c 0,-1.017967 0.799831,-1.817797 1.817797,-1.817797 1.017966,0 1.817797,0.79983 1.817797,1.817797 v 3.6355926 h -7.271186 v 7.271188 H 22.538135 V 11.033898 H 20.720339 V 7.3983054 c 0,-1.9995761 -1.636018,-3.6355939 -3.635594,-3.6355939 z" id="path3014" />
-  </g>
+  <defs
+     id="defs10" />
+  <path
+     id="path3336"
+     d="M 12 8.8710938 A 3.1280487 3.1280487 0 0 0 8.8710938 12 A 3.1280487 3.1280487 0 0 0 12 15.128906 A 3.1280487 3.1280487 0 0 0 15.128906 12 A 3.1280487 3.1280487 0 0 0 12 8.8710938 z M 12 9.8789062 A 2.1213202 2.1213202 0 0 1 14.121094 12 A 2.1213202 2.1213202 0 0 1 12 14.121094 A 2.1213202 2.1213202 0 0 1 9.8789062 12 A 2.1213202 2.1213202 0 0 1 12 9.8789062 z "
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <circle
+     r="0"
+     cy="13.5"
+     cx="74.440681"
+     id="path3336-6"
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <circle
+     r="0"
+     style="opacity:1;fill:#fffdfd;fill-opacity:1;stroke:none;stroke-width:0.70899999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="circle3343-7"
+     cx="74.440681"
+     cy="13.5" />
+  <path
+     id="path4154"
+     d="m 5.0290206,3.3842908 6.9089214,4.6012541 6.727107,-4.480168"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.82534468px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.82534468px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 5.0290206,0.65174257 11.937942,5.2529967 18.665049,0.77282867"
+     id="path4156" />
+  <path
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.82534468px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 5.0290206,20.650082 6.9089214,-4.601254 6.727107,4.480168"
+     id="path4158" />
+  <path
+     id="path4160"
+     d="m 5.0290206,23.38263 6.9089214,-4.601254 6.727107,4.480168"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.82534468px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
 </svg>
diff --git a/companion/src/images/simulator/icons/svg/info-active.svg b/companion/src/images/simulator/icons/svg/info-active.svg
index 142f05adf..248968da3 100644
--- a/companion/src/images/simulator/icons/svg/info-active.svg
+++ b/companion/src/images/simulator/icons/svg/info-active.svg
@@ -1,15 +1,40 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.2" width="64" height="64" viewBox="0 0 64 64" id="svg3254" xml:space="preserve"><metadata id="metadata11"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs id="defs9" />
-
-<g id="layer1">
-	
-		<g transform="matrix(1.5756397,0,0,1.6644338,54.170963,-1788.6456)" id="g3219">
-		<g transform="matrix(0.63466286,0,0,0.60080491,-55.333181,1055.0231)" id="g3488">
-			<path d="m 89.528,64.797 c 0,13.331 -10.805,24.134 -24.135,24.134 -13.33,0 -24.134,-10.804 -24.134,-24.134 0,-13.331 10.804,-24.135 24.134,-24.135 13.33,0 24.135,10.803 24.135,24.135 z" id="path3474" style="fill:none;stroke:#7d0297;stroke-width:6;stroke-miterlimit:10" />
-			<path d="m 68.948,59.507 -3.057,14.439 c -0.129,0.552 -0.17,0.976 -0.17,1.358 0,1.189 0.551,1.572 1.742,1.572 0.762,0 1.104,-0.126 1.358,-0.253 -0.214,3.014 -2.38,4.373 -4.673,4.373 -2.548,0 -4.544,-1.528 -4.544,-5.099 0,-0.804 0.128,-1.738 0.34,-2.76 l 2.889,-13.632 6.115,0.002 0,0 z m -1.91,-11.035 c 1.868,0 3.398,1.528 3.398,3.396 0,1.87 -1.531,3.357 -3.398,3.357 -1.87,0 -3.355,-1.487 -3.355,-3.357 -10e-4,-1.868 1.485,-3.396 3.355,-3.396 z" id="path3476" style="fill:#9b0297;stroke:#7d0297;stroke-miterlimit:10" />
-		</g>
-	</g>
-</g>
-</svg>
\ No newline at end of file
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg5332"
+   viewBox="0 0 64.000001 64.000001"
+   height="64"
+   width="64">
+  <defs
+     id="defs5334" />
+  <metadata
+     id="metadata5337">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-988.36216)"
+     id="layer1">
+    <path
+       id="path3476"
+       d="m 35.552054,1014.4088 -3.057829,14.4391 c -0.128038,0.552 -0.168924,0.9759 -0.168924,1.359 0,1.1894 0.549807,1.5724 1.741952,1.5724 0.761768,0 1.103917,-0.1264 1.358378,-0.2533 -0.214113,3.0137 -2.379985,4.3726 -4.673358,4.3726 -2.54837,0 -4.544783,-1.5284 -4.544783,-5.0978 0,-0.8043 0.128038,-1.7393 0.339998,-2.7604 l 2.888907,-13.6322 6.115659,0 z m -1.910875,-11.0355 c 1.868375,0 3.397828,1.5279 3.397828,3.3957 0,1.87 -1.529991,3.3575 -3.397828,3.3575 -1.869988,0 -3.354789,-1.4875 -3.354789,-3.3575 -5.38e-4,-1.8678 1.484801,-3.3957 3.354789,-3.3957 z" />
+    <circle
+       r="26.662109"
+       id="path7511-3-8-6-2-5-2-6-2-3"
+       style="fill:none;stroke:#000000;stroke-width:4.03292418;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       cx="32"
+       cy="1020.3622" />
+  </g>
+</svg>
diff --git a/companion/src/images/simulator/icons/svg/info.svg b/companion/src/images/simulator/icons/svg/info.svg
index 85f9f6e73..9a3c23d3c 100644
--- a/companion/src/images/simulator/icons/svg/info.svg
+++ b/companion/src/images/simulator/icons/svg/info.svg
@@ -1,23 +1,44 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64" id="svg3254">
-  <defs id="defs3256" />
-  <metadata id="metadata3259">
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg5332"
+   viewBox="0 0 64.000001 64.000001"
+   height="64"
+   width="64">
+  <defs
+     id="defs5334" />
+  <metadata
+     id="metadata5337">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1">
-    <g transform="matrix(1.5756397,0,0,1.6644338,54.170963,-1788.6456)" id="g3219" style="display:inline">
-      <g transform="matrix(0.63466286,0,0,0.60080491,-55.333181,1055.0231)" id="g3488">
-        <path d="m 89.527433,64.796857 c 0,13.330947 -10.804079,24.134502 -24.134474,24.134502 -13.329856,0 -24.133935,-10.803555 -24.133935,-24.134502 0,-13.330947 10.804079,-24.135039 24.133935,-24.135039 13.330395,0 24.134474,10.803554 24.134474,24.135039 z" id="path3474" style="fill:none;stroke:#000000;stroke-width:6;stroke-miterlimit:10" />
-        <path d="m 68.948411,59.507519 -3.057829,14.43917 c -0.128038,0.551959 -0.168924,0.975881 -0.168924,1.358917 0,1.189456 0.549807,1.572493 1.741952,1.572493 0.761768,0 1.103917,-0.126424 1.358378,-0.253385 -0.214113,3.013719 -2.379985,4.372636 -4.673358,4.372636 -2.54837,0 -4.544783,-1.528378 -4.544783,-5.097822 0,-0.804269 0.128038,-1.739264 0.339998,-2.760335 l 2.888907,-13.632212 h 6.115659 z M 67.037536,48.472098 c 1.868375,0 3.397828,1.527841 3.397828,3.395679 0,1.869991 -1.529991,3.357484 -3.397828,3.357484 -1.869988,0 -3.354789,-1.487493 -3.354789,-3.357484 -5.38e-4,-1.867838 1.484801,-3.395679 3.354789,-3.395679 z" id="path3476" />
-      </g>
+  <g
+     transform="translate(0,-988.36216)"
+     id="layer1">
+    <g
+       id="g5857"
+       transform="translate(0,-2.2617187e-5)">
+      <circle
+         cy="1020.3622"
+         cx="32"
+         style="fill:none;stroke:#000000;stroke-width:4.359375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path7511-3-8-6-2-5-2-6"
+         r="28.820312" />
+      <path
+         d="m 35.552054,1014.4088 -3.057829,14.4391 c -0.128038,0.552 -0.168924,0.9759 -0.168924,1.359 0,1.1894 0.549807,1.5724 1.741952,1.5724 0.761768,0 1.103917,-0.1264 1.358378,-0.2533 -0.214113,3.0137 -2.379985,4.3726 -4.673358,4.3726 -2.54837,0 -4.544783,-1.5284 -4.544783,-5.0978 0,-0.8043 0.128038,-1.7393 0.339998,-2.7604 l 2.888907,-13.6322 6.115659,0 z m -1.910875,-11.0355 c 1.868375,0 3.397828,1.5279 3.397828,3.3957 0,1.87 -1.529991,3.3575 -3.397828,3.3575 -1.869988,0 -3.354789,-1.4875 -3.354789,-3.3575 -5.38e-4,-1.8678 1.484801,-3.3957 3.354789,-3.3957 z"
+         id="path3476" />
     </g>
   </g>
 </svg>
diff --git a/companion/src/images/simulator/icons/svg/joystick_settings-active.svg b/companion/src/images/simulator/icons/svg/joystick_settings-active.svg
index 504b8d0a8..81f67903b 100644
--- a/companion/src/images/simulator/icons/svg/joystick_settings-active.svg
+++ b/companion/src/images/simulator/icons/svg/joystick_settings-active.svg
@@ -1,18 +1,85 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.2" width="64" height="64" viewBox="0 0 64 64" id="svg3254" xml:space="preserve"><defs id="defs14" />
-<g id="layer1">
-	<g transform="matrix(1.5756397,0,0,1.6644338,54.170963,-1788.6456)" id="g3219">
-		<path d="m -15.805,1110.28 c 0.028,-0.49 0.111,-1.315 0.185,-1.835 0.124,-0.872 0.086,-0.983 -0.492,-1.433 l -0.626,-0.488 -1.778,0.613 c -0.978,0.336 -1.851,0.593 -1.94,0.57 -0.209,-0.053 -2.69,-4.165 -2.633,-4.364 0.024,-0.084 0.698,-0.667 1.497,-1.297 l 1.454,-1.147 -0.125,-0.736 c -0.121,-0.715 -0.164,-0.754 -1.498,-1.329 -2.442,-1.053 -2.267,-0.627 -1.441,-3.512 l 0.721,-2.515 1.515,0.148 c 2.351,0.229 2.385,0.224 2.887,-0.387 0.461,-0.561 0.461,-0.563 -0.086,-2.002 -0.301,-0.793 -0.597,-1.58 -0.659,-1.749 -0.087,-0.24 0.416,-0.594 2.277,-1.604 l 2.389,-1.296 1.163,1.353 c 1.257,1.461 1.43,1.563 2.337,1.378 0.534,-0.108 0.666,-0.264 1.223,-1.445 1.103,-2.335 0.67,-2.168 3.638,-1.405 l 2.587,0.664 -0.083,1.073 c -0.045,0.59 -0.107,1.323 -0.136,1.629 -0.096,0.995 -0.056,1.161 0.365,1.491 0.662,0.52 0.897,0.508 2.701,-0.135 l 1.708,-0.608 1.334,2.195 c 0.734,1.207 1.316,2.259 1.294,2.337 -0.022,0.079 -0.683,0.649 -1.468,1.269 -1.428,1.125 -1.428,1.126 -1.332,1.817 0.104,0.75 0.136,0.774 2.283,1.7 l 1.385,0.597 -0.722,2.521 -0.723,2.52 -0.542,-0.037 c -0.299,-0.02 -1.117,-0.084 -1.819,-0.139 -1.469,-0.119 -1.685,-0.063 -2.141,0.568 -0.301,0.417 -0.273,0.62 0.286,2.103 0.341,0.902 0.595,1.724 0.566,1.827 -0.061,0.21 -4.383,2.584 -4.603,2.528 -0.079,-0.02 -0.697,-0.665 -1.372,-1.433 l -1.229,-1.397 -0.767,0.171 c -0.743,0.166 -0.792,0.221 -1.574,1.77 -0.444,0.88 -0.818,1.618 -0.83,1.642 -0.012,0.023 -1.194,-0.26 -2.627,-0.628 l -2.604,-0.669 0.055,-0.894 z m 4.699,-1.662 c 0.403,-0.767 0.767,-1.407 0.808,-1.42 0.042,-0.019 0.917,-0.124 1.947,-0.246 l 1.872,-0.222 1.078,1.219 1.077,1.219 0.773,-0.435 0.773,-0.435 -0.576,-1.473 -0.576,-1.472 1.224,-1.497 1.223,-1.496 1.603,0.143 1.602,0.145 0.291,-0.806 0.291,-0.805 -1.302,-0.573 c -0.716,-0.316 -1.401,-0.658 -1.521,-0.761 -0.12,-0.103 -0.33,-0.99 -0.467,-1.97 l -0.249,-1.781 1.26,-1.001 1.261,-1.001 -0.458,-0.73 -0.459,-0.73 -1.453,0.494 c -0.8,0.272 -1.54,0.473 -1.645,0.446 -0.335,-0.086 -2.939,-2.101 -3.011,-2.329 -0.038,-0.121 0,-0.833 0.083,-1.584 l 0.152,-1.365 -0.9,-0.231 -0.9,-0.231 -0.652,1.36 c -0.358,0.748 -0.76,1.401 -0.892,1.452 -0.293,0.114 -3.494,0.461 -3.709,0.404 -0.084,-0.022 -0.594,-0.55 -1.134,-1.173 l -0.98,-1.133 -0.802,0.42 -0.802,0.419 0.566,1.472 0.566,1.473 -0.474,0.566 c -0.26,0.311 -0.769,0.944 -1.129,1.406 -0.36,0.462 -0.808,0.868 -0.994,0.904 -0.186,0.035 -0.977,0.02 -1.758,-0.064 l -1.42,-0.127 -0.226,0.787 c -0.254,0.886 -0.301,0.836 1.483,1.596 l 1.282,0.546 0.283,1.875 0.283,1.875 -1.299,1.022 -1.299,1.023 0.363,0.629 c 0.199,0.347 0.453,0.654 0.563,0.682 0.111,0.028 0.865,-0.16 1.677,-0.421 l 1.476,-0.472 1.462,1.078 c 0.804,0.593 1.495,1.163 1.534,1.268 0.04,0.104 0.005,0.795 -0.077,1.535 -0.082,0.739 -0.109,1.411 -0.059,1.493 0.049,0.082 0.436,0.212 0.86,0.29 l 0.77,0.141 0.737,-1.398 z m -1.432,-4.941 c -2.207,-1.374 -3.184,-3.549 -2.667,-5.939 1.055,-4.879 7.628,-6.017 10.666,-1.848 0.253,0.348 0.578,1.186 0.721,1.863 0.468,2.204 -0.517,4.48 -2.466,5.699 -1.396,0.874 -2.844,1.122 -4.5,0.772 -0.73,-0.154 -1.518,-0.402 -1.754,-0.547 l 0,0 z m 3.043,-1.343 c 2.247,-0.02 3.962,-2.039 3.536,-4.18 -0.487,-2.451 -3.773,-3.601 -5.816,-2.036 -1.947,1.491 -1.879,4.26 0.138,5.587 0.793,0.522 1.176,0.635 2.143,0.628 l -10e-4,10e-4 z" id="path4448-4-4" style="fill:#007f00" />
-		<path d="m -24.424,1077.473 h 13.202 c 3.947,0 7.146,3.199 7.146,7.146 v 7.859 c 0,3.947 -3.199,7.146 -7.146,7.146 h -13.202 c -3.946,0 -7.146,-3.199 -7.146,-7.146 v -7.859 c 0,-3.947 3.199,-7.146 7.146,-7.146 z" id="rect3980-2-6" style="fill:#757575" />
-		<path d="m -24.761,1077.181 h 13.995 c 3.919,0 7.096,3.177 7.096,7.096 v 8.227 c 0,3.919 -3.177,7.096 -7.096,7.096 h -13.995 c -3.919,0 -7.096,-3.177 -7.096,-7.096 v -8.227 c 0,-3.919 3.177,-7.096 7.096,-7.096 z" id="rect3980-9" style="fill:none;stroke:#009100;stroke-width:1.23500001;stroke-linecap:round;stroke-linejoin:round" />
-		<g transform="matrix(1.4151129,0,0,1.4016181,-59.15926,-361.58526)" id="g4236-1">
-			
-				<path d="m 34.219,1033.737 c 0,2.697 -2.186,4.884 -4.883,4.884 -2.697,0 -4.884,-2.186 -4.884,-4.884 0,-2.697 2.187,-4.884 4.884,-4.884 2.697,10e-4 4.883,2.187 4.883,4.884 z" id="path3984-8-3" style="fill:#008700;fill-opacity:1;stroke:#000100;stroke-width:0.38479999;stroke-linecap:round;stroke-linejoin:round" />
-			<path d="m 30.369,1028.415 -2.629,6.561 6.798,-2.771 -4.169,-3.79 z" id="path4007-7" style="fill:#ffffff" />
-			<path d="m 34.988,1030.354 c 0,1.421 -1.152,2.572 -2.574,2.572 -1.421,0 -2.574,-1.151 -2.574,-2.572 0,-1.421 1.152,-2.573 2.574,-2.573 1.421,10e-4 2.574,1.153 2.574,2.573 z" id="path4004-0" style="fill:#ffffff;stroke:#000000;stroke-width:0.43849999" />
-		</g>
-	</g>
-</g>
-</svg>
\ No newline at end of file
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg5332"
+   viewBox="0 0 64.000001 64.000001"
+   height="64"
+   width="64">
+  <defs
+     id="defs5334" />
+  <metadata
+     id="metadata5337">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-988.36216)"
+     id="layer1">
+    <circle
+       r="26.662109"
+       id="path7511-3-8-6-2-5-2-6-2"
+       style="fill:none;stroke:#000000;stroke-width:4.03292418;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       cx="32"
+       cy="1020.3622" />
+    <path
+       id="path6700"
+       d="m 14.03679,1030.0123 c -2.35397,-0.7404 -2.770983,-5.7332 -1.120218,-13.4122 0.987656,-4.5944 2.475067,-8.7912 4.188046,-11.8168 1.229617,-2.1719 1.873402,-3.1037 2.610178,-3.778 1.504901,-1.37737 2.967128,-1.37137 5.395579,0.022 2.201718,1.2632 4.0896,1.7225 7.074552,1.7211 2.999245,0 4.913924,-0.4947 7.284808,-1.8772 2.656429,-1.54897 4.551968,-1.08027 6.319358,1.5624 0.681911,1.0196 2.022303,3.4016 2.535611,4.506 1.632208,3.5117 3.357153,9.8902 3.868976,14.3068 0.206417,1.7812 0.206698,4.5038 6.33e-4,5.6858 -0.325523,1.8667 -1.091397,2.9477 -2.243528,3.1667 -0.855362,0.1626 -2.481083,-0.479 -3.915795,-1.5455 -1.121505,-0.8337 -2.918598,-2.4684 -3.968669,-3.6102 -0.949211,-1.0321 -1.899385,-1.7431 -2.948415,-2.2063 -4.08595,-1.8044 -10.574009,-1.7161 -14.30132,0.1944 -1.070496,0.5488 -1.193141,0.6492 -3.132713,2.5664 -0.990096,0.9786 -2.194672,2.0957 -2.676836,2.4824 -2.158366,1.7309 -3.797692,2.4012 -4.970247,2.0324 z"
+       style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       id="path6698"
+       d="m 41.765778,1015.1083 c 0.568081,-0.3537 0.79519,-1.1501 0.503341,-1.7651 -0.474937,-1.0009 -1.912339,-1.0833 -2.485963,-0.1425 -0.762667,1.2509 0.730264,2.6873 1.982622,1.9076 z"
+       style="fill:#000000;fill-opacity:1" />
+    <path
+       id="path6696"
+       d="m 24.07221,1014.7677 c 0.291529,-0.3263 0.299033,-0.3652 0.299033,-1.5474 l 0,-1.2126 1.222411,0 c 1.203103,0 1.227163,-0.01 1.523294,-0.3008 0.362081,-0.3621 0.479435,-0.8888 0.325457,-1.4606 -0.197205,-0.7324 -0.38323,-0.8207 -1.814833,-0.8608 l -1.256329,-0.035 -0.0016,-1.1263 c -9.57e-4,-0.6826 -0.05326,-1.2302 -0.132821,-1.3902 -0.342577,-0.689 -1.606617,-0.8094 -2.205777,-0.2102 -0.294573,0.2945 -0.299604,0.3201 -0.299604,1.522 l 0,1.2224 -1.212623,0 c -1.190606,0 -1.218884,0.01 -1.557457,0.3081 -0.324066,0.2895 -0.344835,0.3505 -0.344835,1.0118 0,0.6612 0.02077,0.7222 0.344835,1.0117 0.338573,0.3025 0.366851,0.3082 1.557457,0.3082 l 1.212623,0 0,1.2 c 0,1.066 0.02522,1.2321 0.225764,1.4871 0.307439,0.3908 0.571593,0.4849 1.243841,0.443 0.486296,-0.03 0.616931,-0.086 0.87112,-0.3703 z"
+       style="fill:#000000;fill-opacity:1" />
+    <path
+       id="path6694"
+       d="m 44.971269,1012.161 c 1.026948,-0.5311 0.940958,-2.094 -0.13898,-2.5261 -1.456158,-0.5827 -2.622851,1.2236 -1.478744,2.2895 0.158362,0.1475 0.359205,0.2941 0.446317,0.3258 0.311523,0.1133 0.860548,0.072 1.171407,-0.089 z"
+       style="fill:#000000;fill-opacity:1" />
+    <path
+       id="path6692"
+       d="m 38.46863,1011.7501 c 1.047319,-0.4376 1.045723,-2.0367 -0.0025,-2.5342 -0.939802,-0.4459 -1.987167,0.2186 -1.987167,1.2607 0,0.5356 0.226698,0.9299 0.700872,1.219 0.401565,0.2448 0.793586,0.2614 1.288824,0.055 z"
+       style="fill:#000000;fill-opacity:1" />
+    <path
+       id="path6657"
+       d="m 41.912778,1008.6746 c 0.302866,-0.1566 0.717835,-0.8453 0.723272,-1.2003 0.0047,-0.3094 -0.425646,-1.0206 -0.724465,-1.1971 -0.408551,-0.2414 -1.040571,-0.2308 -1.459089,0.025 -1.156022,0.7048 -0.680367,2.5384 0.658506,2.5384 0.265072,0 0.625873,-0.074 0.801776,-0.1654 z"
+       style="fill:#000000;fill-opacity:1" />
+    <path
+       id="path5108-2-2-7-1-7-0-6"
+       d="m 23.681102,1038.8276 c -0.187887,2.2169 0.87114,3.4268 3.363249,3.4791 l 7.576969,-7.7314 3.32459,-0.077 2.126185,-2.1262 0.07737,-2.0489 -1.198395,-1.3144 -1.85559,1.9716 -2.164845,-0.077 -0.07728,-1.7784 2.087527,-2.1262 -1.314372,-1.2756 -2.242163,0.04 -2.087535,2.0102 -0.115969,3.5954 z"
+       style="fill:#030000;fill-opacity:1;stroke:none" />
+    <path
+       id="rect7808-9-3-1"
+       d="m 35.565335,1035.5075 3.626322,3.6263 c 0.78845,0.7757 -1.951438,3.5883 -2.763458,2.7634 l -3.626322,-3.6263 z"
+       style="fill:#000000;fill-opacity:1;stroke:none" />
+    <rect
+       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
+       y="708.09564"
+       x="743.69879"
+       height="2.0641963"
+       width="2.6759293"
+       id="rect7828-7-5"
+       style="fill:#000000;fill-opacity:1;stroke:none" />
+    <rect
+       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
+       y="708.50305"
+       x="744.7854"
+       height="1.1639781"
+       width="5.4537458"
+       id="rect7828-5-9-9"
+       style="fill:#000000;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/companion/src/images/simulator/icons/svg/joystick_settings.svg b/companion/src/images/simulator/icons/svg/joystick_settings.svg
index 709113b4f..ed504de68 100644
--- a/companion/src/images/simulator/icons/svg/joystick_settings.svg
+++ b/companion/src/images/simulator/icons/svg/joystick_settings.svg
@@ -1,18 +1,89 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64" id="svg3254">
-  <defs id="defs3256" />
-  <g id="layer1">
-    <g transform="matrix(1.5756397,0,0,1.6644338,54.170963,-1788.6456)" id="g3219" style="display:inline">
-      <path d="m -15.804948,1110.2798 c 0.02792,-0.4898 0.111136,-1.3157 0.184859,-1.8355 0.123657,-0.8723 0.08577,-0.9827 -0.492201,-1.433 l -0.626209,-0.4877 -1.777652,0.6121 c -0.977654,0.3367 -1.850646,0.5934 -1.93993,0.5706 -0.209502,-0.053 -2.689644,-4.1649 -2.632607,-4.3638 0.02374,-0.084 0.697501,-0.6667 1.497265,-1.2975 l 1.454108,-1.1468 -0.124527,-0.7365 c -0.120885,-0.7155 -0.164131,-0.7535 -1.497938,-1.3292 -2.44191,-1.0527 -2.267523,-0.6268 -1.440666,-3.5118 l 0.720895,-2.5154 1.514864,0.1484 c 2.351578,0.2286 2.38512,0.2241 2.886555,-0.3865 0.46072,-0.5613 0.460632,-0.5632 -0.08611,-2.0025 -0.301026,-0.7927 -0.597509,-1.5798 -0.658862,-1.7492 -0.08688,-0.2399 0.415749,-0.5938 2.277221,-1.604 l 2.388763,-1.296 1.163547,1.3525 c 1.256899,1.4608 1.429425,1.5626 2.336111,1.3777 0.534545,-0.1079 0.6655389,-0.2639 1.2237319,-1.4449 1.103253,-2.3349 0.669842,-2.1676 3.63823,-1.4051 l 2.5864222,0.6644 -0.08233,1.0727 c -0.04525,0.5897 -0.106624,1.3225 -0.13632,1.6292 -0.09658,0.9949 -0.05598,1.1608 0.364627,1.491 0.662023,0.52 0.896696,0.5082 2.700966,-0.1353 l 1.7083605,-0.6084 1.3346706,2.1946 c 0.7340447,1.2072 1.3163479,2.2587 1.293957,2.3369 -0.022277,0.079 -0.6830622,0.6486 -1.4682671,1.2681 -1.4272235,1.1253 -1.4275789,1.126 -1.3315798,1.8165 0.1043322,0.7506 0.1364398,0.7747 2.2822984,1.7003 l 1.3858308,0.5978 -0.7223669,2.5201 -0.7223225,2.5202 -0.5422814,-0.037 c -0.298063,-0.02 -1.1164862,-0.084 -1.8185439,-0.139 -1.4690987,-0.1191 -1.6855317,-0.063 -2.1413967,0.5689 -0.301053,0.4164 -0.273356,0.6196 0.286068,2.1021 0.340623,0.9027 0.595434,1.7246 0.566195,1.8267 -0.06023,0.2102 -4.382702,2.5844 -4.602492,2.5278 -0.07857,-0.02 -0.6959462,-0.665 -1.3718942,-1.433 l -1.229018,-1.3965 -0.766457,0.1704 c -0.7422,0.1664 -0.792091,0.2214 -1.573926,1.7702 -0.4440739,0.8797 -0.8174139,1.6184 -0.8295809,1.6415 -0.01212,0.023 -1.193959,-0.2601 -2.626425,-0.6279 l -2.604472,-0.6689 z m 4.698467,-1.6615 c 0.403855,-0.7674 0.767853,-1.4066 0.808909,-1.4203 0.04113,-0.019 0.9169169,-0.1243 1.9464349,-0.2459 l 1.871875,-0.222 1.077619,1.2191 1.0776392,1.2188 0.773489,-0.4349 0.773546,-0.4351 -0.576268,-1.4725 -0.576236,-1.4723 1.223979,-1.4966 1.223979,-1.4964 1.602289,0.1426 1.6022575,0.1447 0.2911834,-0.8051 0.2911833,-0.8052 -1.3025821,-0.5732 c -0.7163951,-0.3152 -1.4008151,-0.6576 -1.5208931,-0.761 -0.120186,-0.1023 -0.330355,-0.9896 -0.467303,-1.9693 l -0.248971,-1.781 1.260465,-1.0013 1.260498,-1.0011 -0.4582964,-0.7303 -0.4582966,-0.73 -1.453181,0.4944 c -0.799225,0.2721 -1.539222,0.4726 -1.644418,0.4457 -0.334467,-0.086 -2.9395742,-2.1009 -3.0111132,-2.3288 -0.03776,-0.1207 -2.67e-4,-0.8331 0.08334,-1.5839 l 0.151989,-1.3651 -0.899838,-0.2311 -0.899838,-0.2312 -0.6519,1.3603 c -0.358534,0.7477 -0.760015,1.4012 -0.892146,1.4517 -0.292503,0.1138 -3.4946249,0.461 -3.7094449,0.4042 -0.08435,-0.022 -0.594311,-0.5499 -1.133242,-1.1734 l -0.979951,-1.1327 -0.802188,0.4195 -0.802183,0.4194 0.565688,1.4723 0.565656,1.4727 -0.473649,0.5663 c -0.260497,0.3113 -0.768691,0.9439 -1.129281,1.4055 -0.360602,0.4618 -0.807843,0.8684 -0.993907,0.9035 -0.186153,0.035 -0.977356,0.02 -1.758448,-0.064 l -1.420172,-0.1263 -0.225496,0.7868 c -0.254113,0.8864 -0.301382,0.8358 1.483423,1.5961 l 1.282044,0.5461 0.282546,1.8745 0.282558,1.875 -1.298844,1.022 -1.298875,1.0223 0.362538,0.6296 c 0.199386,0.3465 0.452953,0.653 0.563447,0.6813 0.110489,0.028 0.865211,-0.1591 1.677192,-0.4206 l 1.476309,-0.4724 1.462237,1.0779 c 0.804213,0.5929 1.494834,1.1635 1.534647,1.2682 0.03986,0.1047 0.0051,0.7951 -0.07726,1.5345 -0.08232,0.7394 -0.1092,1.4112 -0.05978,1.4929 0.04931,0.082 0.43654,0.2121 0.86019,0.2901 l 0.770373,0.141 z m -1.430842,-4.9409 c -2.207116,-1.3739 -3.183887,-3.5489 -2.667303,-5.9392 1.054562,-4.879 7.6275429,-6.0176 10.6654331,-1.8479 0.253141,0.3474 0.577949,1.1857 0.721795,1.8626 0.468134,2.2036 -0.516507,4.4794 -2.4659632,5.6991 -1.396417,0.8738 -2.844407,1.1219 -4.5005469,0.7719 -0.729507,-0.1537 -1.518069,-0.4011 -1.75356,-0.5459 z m 3.0421429,-1.3428 c 2.247258,-0.02 3.961584,-2.0393 3.53624,-4.1801 -0.486895,-2.451 -3.773255,-3.6015 -5.8168439,-2.0363 -1.947032,1.4913 -1.878862,4.2604 0.137582,5.5872 0.793779,0.5223 1.176595,0.6349 2.1432949,0.6282 z" id="path4448-4-4" style="fill:#000000;fill-opacity:1;display:inline" />
-      <rect width="27.494143" height="22.15127" ry="7.1462564" x="-31.570469" y="1077.4731" id="rect3980-2-6" style="fill:#757575;fill-opacity:1;stroke:none" />
-      <rect width="28.186502" height="22.418978" ry="7.0958796" x="-31.85692" y="1077.1814" id="rect3980-9" style="fill:none;stroke:#000100;stroke-width:1.23500371;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <g transform="matrix(1.4151129,0,0,1.4016181,-59.15926,-361.58526)" id="g4236-1">
-        <path d="m -4.4642859,77.678574 a 4.2857141,4.2857141 0 1 1 -8.5714281,0 4.2857141,4.2857141 0 1 1 8.5714281,0 z" transform="matrix(1.13953,0,0,1.13953,39.306585,945.21999)" id="path3984-8-3" style="fill:#0c0000;fill-opacity:1;stroke:#000100;stroke-width:0.38477078;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-        <path d="m 30.368507,1028.4151 -2.629324,6.5608 6.79834,-2.7712 z" id="path4007-7" style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        <path d="m 34.987833,1030.3543 c 0,1.4208 -1.152235,2.5723 -2.573586,2.5723 -1.421352,0 -2.573587,-1.1515 -2.573587,-2.5723 0,-1.4207 1.152235,-2.5724 2.573587,-2.5724 1.421351,0 2.573586,1.1517 2.573586,2.5724 z" id="path4004-0" style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.43845785;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      </g>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg5332"
+   viewBox="0 0 64.000001 64.000001"
+   height="64"
+   width="64">
+  <defs
+     id="defs5334" />
+  <metadata
+     id="metadata5337">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-988.36216)"
+     id="layer1">
+    <g
+       id="g6707"
+       transform="translate(0,-2.2617187e-5)">
+      <circle
+         cy="1020.3622"
+         cx="32"
+         style="fill:none;stroke:#000000;stroke-width:4.359375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path7511-3-8-6-2-5-2-6-2"
+         r="28.820312" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 14.03679,1030.0123 c -2.35397,-0.7404 -2.770983,-5.7332 -1.120218,-13.4122 0.987656,-4.5944 2.475067,-8.7912 4.188046,-11.8168 1.229617,-2.1719 1.873402,-3.1037 2.610178,-3.778 1.504901,-1.37735 2.967128,-1.37135 5.395579,0.022 2.201718,1.2632 4.0896,1.7225 7.074552,1.7211 2.999245,0 4.913924,-0.4947 7.284808,-1.8772 2.656429,-1.54895 4.551968,-1.08025 6.319358,1.5624 0.681911,1.0196 2.022303,3.4016 2.535611,4.506 1.632208,3.5117 3.357153,9.8902 3.868976,14.3068 0.206417,1.7812 0.206698,4.5038 6.33e-4,5.6858 -0.325523,1.8667 -1.091397,2.9477 -2.243528,3.1667 -0.855362,0.1626 -2.481083,-0.479 -3.915795,-1.5455 -1.121505,-0.8337 -2.918598,-2.4684 -3.968669,-3.6102 -0.949211,-1.0321 -1.899385,-1.7431 -2.948415,-2.2063 -4.08595,-1.8044 -10.574009,-1.7161 -14.30132,0.1944 -1.070496,0.5488 -1.193141,0.6492 -3.132713,2.5664 -0.990096,0.9786 -2.194672,2.0957 -2.676836,2.4824 -2.158366,1.7309 -3.797692,2.4012 -4.970247,2.0324 z"
+         id="path6700" />
+      <path
+         style="fill:#000000;fill-opacity:1"
+         d="m 41.765778,1015.1083 c 0.568081,-0.3537 0.79519,-1.1501 0.503341,-1.7651 -0.474937,-1.0009 -1.912339,-1.0833 -2.485963,-0.1425 -0.762667,1.2509 0.730264,2.6873 1.982622,1.9076 z"
+         id="path6698" />
+      <path
+         style="fill:#000000;fill-opacity:1"
+         d="m 24.07221,1014.7677 c 0.291529,-0.3263 0.299033,-0.3652 0.299033,-1.5474 l 0,-1.2126 1.222411,0 c 1.203103,0 1.227163,-0.01 1.523294,-0.3008 0.362081,-0.3621 0.479435,-0.8888 0.325457,-1.4606 -0.197205,-0.7324 -0.38323,-0.8207 -1.814833,-0.8608 l -1.256329,-0.035 -0.0016,-1.1263 c -9.57e-4,-0.6826 -0.05326,-1.2302 -0.132821,-1.3902 -0.342577,-0.689 -1.606617,-0.8094 -2.205777,-0.2102 -0.294573,0.2945 -0.299604,0.3201 -0.299604,1.522 l 0,1.2224 -1.212623,0 c -1.190606,0 -1.218884,0.01 -1.557457,0.3081 -0.324066,0.2895 -0.344835,0.3505 -0.344835,1.0118 0,0.6612 0.02077,0.7222 0.344835,1.0117 0.338573,0.3025 0.366851,0.3082 1.557457,0.3082 l 1.212623,0 0,1.2 c 0,1.066 0.02522,1.2321 0.225764,1.4871 0.307439,0.3908 0.571593,0.4849 1.243841,0.443 0.486296,-0.03 0.616931,-0.086 0.87112,-0.3703 z"
+         id="path6696" />
+      <path
+         style="fill:#000000;fill-opacity:1"
+         d="m 44.971269,1012.161 c 1.026948,-0.5311 0.940958,-2.094 -0.13898,-2.5261 -1.456158,-0.5827 -2.622851,1.2236 -1.478744,2.2895 0.158362,0.1475 0.359205,0.2941 0.446317,0.3258 0.311523,0.1133 0.860548,0.072 1.171407,-0.089 z"
+         id="path6694" />
+      <path
+         style="fill:#000000;fill-opacity:1"
+         d="m 38.46863,1011.7501 c 1.047319,-0.4376 1.045723,-2.0367 -0.0025,-2.5342 -0.939802,-0.4459 -1.987167,0.2186 -1.987167,1.2607 0,0.5356 0.226698,0.9299 0.700872,1.219 0.401565,0.2448 0.793586,0.2614 1.288824,0.055 z"
+         id="path6692" />
+      <path
+         style="fill:#000000;fill-opacity:1"
+         d="m 41.912778,1008.6746 c 0.302866,-0.1566 0.717835,-0.8453 0.723272,-1.2003 0.0047,-0.3094 -0.425646,-1.0206 -0.724465,-1.1971 -0.408551,-0.2414 -1.040571,-0.2308 -1.459089,0.025 -1.156022,0.7048 -0.680367,2.5384 0.658506,2.5384 0.265072,0 0.625873,-0.074 0.801776,-0.1654 z"
+         id="path6657" />
+      <path
+         style="fill:#030000;fill-opacity:1;stroke:none"
+         d="m 23.681102,1038.8276 c -0.187887,2.2169 0.87114,3.4268 3.363249,3.4791 l 7.576969,-7.7314 3.32459,-0.077 2.126185,-2.1262 0.07737,-2.0489 -1.198395,-1.3144 -1.85559,1.9716 -2.164845,-0.077 -0.07728,-1.7784 2.087527,-2.1262 -1.314372,-1.2756 -2.242163,0.04 -2.087535,2.0102 -0.115969,3.5954 z"
+         id="path5108-2-2-7-1-7-0-6" />
+      <path
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         d="m 35.565335,1035.5075 3.626322,3.6263 c 0.78845,0.7757 -1.951438,3.5883 -2.763458,2.7634 l -3.626322,-3.6263 z"
+         id="rect7808-9-3-1" />
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         id="rect7828-7-5"
+         width="2.6759293"
+         height="2.0641963"
+         x="743.69879"
+         y="708.09564"
+         transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" />
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         id="rect7828-5-9-9"
+         width="5.4537458"
+         height="1.1639781"
+         x="744.7854"
+         y="708.50305"
+         transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" />
     </g>
   </g>
 </svg>
diff --git a/companion/src/images/simulator/icons/svg/radio_outputs-active.svg b/companion/src/images/simulator/icons/svg/radio_outputs-active.svg
new file mode 100644
index 000000000..696dc6b6d
--- /dev/null
+++ b/companion/src/images/simulator/icons/svg/radio_outputs-active.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg5332"
+   viewBox="0 0 64.000001 64.000001"
+   height="64"
+   width="64">
+  <defs
+     id="defs5334" />
+  <metadata
+     id="metadata5337">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(1.8755013,0,0,1.8755013,-218.60064,-1883.4128)"
+     id="g4416">
+    <rect
+       ry="1.8592992"
+       y="1017.7581"
+       x="122.49059"
+       height="6.8816891"
+       width="7.2173815"
+       id="rect9178-6-67"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       rx="1.8592992" />
+    <path
+       id="rect9178-53"
+       d="m 121.64625,1021.6774 c -1.64577,0.3942 -2.86526,1.8494 -2.86526,3.6193 l 0,6.3639 c 0,2.0735 1.66637,3.7399 3.73992,3.7399 l 7.0576,0 c 2.07355,0 3.73992,-1.6664 3.73992,-3.7399 l 0,-6.3639 c 0,-1.7358 -1.1772,-3.162 -2.77478,-3.5891 l 0,1.2064 c 0,1.3936 -1.10978,2.5335 -2.50334,2.5335 l -3.86056,0 c -1.39356,0 -2.5335,-1.1399 -2.5335,-2.5335 z m 0.57305,4.2527 c 1.3934,0 2.5335,1.14 2.5335,2.5335 0,1.3934 -1.1401,2.5335 -2.5335,2.5335 -1.3934,0 -2.53349,-1.1401 -2.53349,-2.5335 0,-1.3935 1.14009,-2.5335 2.53349,-2.5335 z m 7.7513,0.03 c 1.3934,0 2.53349,1.1401 2.53349,2.5335 0,1.3934 -1.14009,2.5335 -2.53349,2.5335 -1.3934,0 -2.5335,-1.1401 -2.5335,-2.5335 0,-1.3934 1.1401,-2.5335 2.5335,-2.5335 z m -7.7513,0.935 c -0.86656,0 -1.53819,0.7018 -1.53819,1.5684 0,0.8665 0.67163,1.5381 1.53819,1.5381 0.86657,0 1.56836,-0.6716 1.56836,-1.5381 0,-0.8666 -0.70179,-1.5684 -1.56836,-1.5684 z m 7.7513,0.061 c -0.86657,0 -1.56836,0.6716 -1.56836,1.5382 0,0.8666 0.70179,1.5683 1.56836,1.5683 0.86656,0 1.53819,-0.7017 1.53819,-1.5683 0,-0.8666 -0.67163,-1.5382 -1.53819,-1.5382 z"
+       style="fill:#040404;fill-opacity:1;stroke:none" />
+  </g>
+  <path
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.359375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 32,1 C 14.904983,1 0.99998932,14.905 1,32 c 1.2e-6,2.941019 0.4209024,5.782843 1.1894531,8.480469 0.3727265,-3.603568 1.7256364,-6.45992 3.1914063,-7.623047 C 5.3718622,32.572027 5.3593751,32.287623 5.359375,32 5.3593658,17.261 17.260965,5.359375 32,5.359375 46.739035,5.359375 58.640634,17.261 58.640625,32 58.640619,46.7391 46.739024,58.640625 32,58.640625 c -0.652395,0 -1.29701,-0.03227 -1.9375,-0.07813 -3.220423,1.812983 -6.704115,2.268517 -9.509766,2.236328 C 24.096895,62.212362 27.957339,63 32,63 49.095004,63 62.999993,49.095 63,32 63.000011,14.905 49.095017,1 32,1 Z"
+     id="path7511-3-8-6-2-5" />
+  <path
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40400004;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="m 32,20.257812 c -3.61005,0 -6.845221,1.641126 -9.001953,4.214844 l 1.685547,1.720703 c 1.708453,-2.152308 4.343595,-3.53125 7.316406,-3.53125 5.172408,0 9.339851,4.165491 9.339844,9.337891 7e-6,5.02858 -3.942185,9.095423 -8.914063,9.318359 l -0.111328,2.410157 C 38.640304,43.559629 43.744149,38.365652 43.744141,32 43.74415,25.5284 38.471627,20.257812 32,20.257812 Z"
+     id="path4251-9" />
+  <path
+     id="path5021-2"
+     d="M 39.742188 6.9082031 A 6.4425364 6.4425364 0 0 0 33.300781 13.349609 A 6.4425364 6.4425364 0 0 0 39.742188 19.792969 A 6.4425364 6.4425364 0 0 0 46.185547 13.349609 A 6.4425364 6.4425364 0 0 0 39.742188 6.9082031 z M 39.796875 9.2890625 A 4.0677967 4.0677967 0 0 1 43.865234 13.355469 A 4.0677967 4.0677967 0 0 1 39.796875 17.423828 A 4.0677967 4.0677967 0 0 1 35.728516 13.355469 A 4.0677967 4.0677967 0 0 1 39.796875 9.2890625 z "
+     style="fill:#000000;fill-opacity:1;stroke:none" />
+  <path
+     id="path5023-0"
+     d="M 51.648438 26.556641 A 5.3467021 5.3467021 0 0 0 46.302734 31.904297 A 5.3467021 5.3467021 0 0 0 51.648438 37.25 A 5.3467021 5.3467021 0 0 0 56.996094 31.904297 A 5.3467021 5.3467021 0 0 0 51.648438 26.556641 z M 51.626953 28.609375 A 3.2881355 3.2881355 0 0 1 54.916016 31.898438 A 3.2881355 3.2881355 0 0 1 51.626953 35.185547 A 3.2881355 3.2881355 0 0 1 48.339844 31.898438 A 3.2881355 3.2881355 0 0 1 51.626953 28.609375 z "
+     style="fill:#000000;fill-opacity:1;stroke:none" />
+  <path
+     style="fill:none;stroke:#000000;stroke-width:2.14189005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 47.871459,32.1264 -6.219647,0.061"
+     id="path5025-2" />
+  <path
+     style="fill:none;stroke:#000000;stroke-width:2.14189005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 38.064723,17.299766 35.165895,23.0418"
+     id="path5027-3" />
+  <path
+     id="path3393"
+     d="M 21.781039,30.295659 32.883928,30.774846 35.5173,41.907749 37.047251,25.332528 Z"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+</svg>
diff --git a/companion/src/images/simulator/icons/svg/radio_outputs.svg b/companion/src/images/simulator/icons/svg/radio_outputs.svg
index bba407aea..db467b8d5 100644
--- a/companion/src/images/simulator/icons/svg/radio_outputs.svg
+++ b/companion/src/images/simulator/icons/svg/radio_outputs.svg
@@ -1,33 +1,90 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64" id="svg3254">
-  <defs id="defs3256" />
-  <metadata id="metadata3259">
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="64"
+   height="64"
+   viewBox="0 0 64.000001 64.000001"
+   id="svg5332"
+   version="1.1">
+  <defs
+     id="defs5334" />
+  <metadata
+     id="metadata5337">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g transform="matrix(1.1234718,0,0,1.1234718,-4.5608191,-1.4655251)" id="layer1">
-    <g transform="translate(-72.000133,-1072.4267)" id="g3209" style="display:inline">
-      <path d="m 99.349441,1094.4654 0,8.8551 -8.045911,0 0,22.5193 37.84818,0 0,-22.5193 -8.27712,0 0,-8.8551 -21.525149,0 z" id="rect5128-4-3" style="fill:none;stroke:#000000;stroke-width:3.11534309;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path d="m 100.09052,1103.3954 0,2.9404 20.02752,0 0.0179,-3.0711" id="path5261-5-2" style="fill:none;stroke:#000000;stroke-width:1.70797408;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <g transform="translate(59.145039,46.442959)" id="g5674-3-35">
-        <path d="m 35.901786,1064.1033 0,12.0312 13.9375,0 0,-8.1562 -9,3.625 3.0625,-7.5 -8,0 z" id="rect5190-1-4-3-4" style="fill:#000000;fill-opacity:1;stroke:none" />
-        <path d="m 50.388469,1065.2434 c 0,1.7268 -1.39996,3.1264 -3.1269,3.1264 -1.72692,0 -3.12688,-1.3996 -3.12688,-3.1264 0,-1.7268 1.39996,-3.1266 3.12688,-3.1266 1.72694,0 3.1269,1.3998 3.1269,3.1266 z" id="path4004-69-7-4-5-5-7-1" style="fill:none;stroke:#000000;stroke-width:1.19000506;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <g
+     id="layer1"
+     transform="translate(0,-988.36216)">
+    <g
+       transform="translate(0,-4e-5)"
+       id="g5340">
+      <g
+         transform="matrix(1.8898538,0,0,1.8898538,-206.632,-920.79926)"
+         id="g4360">
+        <g
+           transform="matrix(0.99240551,0,0,0.99240551,-6.3331053,13.624687)"
+           id="g4416">
+          <rect
+             ry="1.8592992"
+             y="1017.7581"
+             x="122.49059"
+             height="6.8816891"
+             width="7.2173815"
+             id="rect9178-6-67"
+             style="fill:#000000;fill-opacity:1;stroke:none"
+             rx="1.8592992" />
+          <path
+             id="rect9178-53"
+             d="m 121.64625,1021.6774 c -1.64577,0.3942 -2.86526,1.8494 -2.86526,3.6193 l 0,6.3639 c 0,2.0735 1.66637,3.7399 3.73992,3.7399 l 7.0576,0 c 2.07355,0 3.73992,-1.6664 3.73992,-3.7399 l 0,-6.3639 c 0,-1.7358 -1.1772,-3.162 -2.77478,-3.5891 l 0,1.2064 c 0,1.3936 -1.10978,2.5335 -2.50334,2.5335 l -3.86056,0 c -1.39356,0 -2.5335,-1.1399 -2.5335,-2.5335 z m 0.57305,4.2527 c 1.3934,0 2.5335,1.14 2.5335,2.5335 0,1.3934 -1.1401,2.5335 -2.5335,2.5335 -1.3934,0 -2.53349,-1.1401 -2.53349,-2.5335 0,-1.3935 1.14009,-2.5335 2.53349,-2.5335 z m 7.7513,0.03 c 1.3934,0 2.53349,1.1401 2.53349,2.5335 0,1.3934 -1.14009,2.5335 -2.53349,2.5335 -1.3934,0 -2.5335,-1.1401 -2.5335,-2.5335 0,-1.3934 1.1401,-2.5335 2.5335,-2.5335 z m -7.7513,0.935 c -0.86656,0 -1.53819,0.7018 -1.53819,1.5684 0,0.8665 0.67163,1.5381 1.53819,1.5381 0.86657,0 1.56836,-0.6716 1.56836,-1.5381 0,-0.8666 -0.70179,-1.5684 -1.56836,-1.5684 z m 7.7513,0.061 c -0.86657,0 -1.56836,0.6716 -1.56836,1.5382 0,0.8666 0.70179,1.5683 1.56836,1.5683 0.86656,0 1.53819,-0.7017 1.53819,-1.5683 0,-0.8666 -0.67163,-1.5382 -1.53819,-1.5382 z"
+             style="fill:#040404;fill-opacity:1;stroke:none" />
+        </g>
       </g>
-      <g transform="translate(75.782819,46.495259)" id="g5674-0-8">
-        <path d="m 35.901786,1064.1033 0,12.0312 13.9375,0 0,-8.1562 -9,3.625 3.0625,-7.5 -8,0 z" id="rect5190-1-4-7-8" style="fill:#000000;fill-opacity:1;stroke:none" />
-        <path d="m 50.388469,1065.2434 c 0,1.7268 -1.39996,3.1264 -3.1269,3.1264 -1.72692,0 -3.12688,-1.3996 -3.12688,-3.1264 0,-1.7268 1.39996,-3.1266 3.12688,-3.1266 1.72694,0 3.1269,1.3998 3.1269,3.1266 z" id="path4004-69-7-4-5-5-0-9" style="fill:none;stroke:#000000;stroke-width:1.19000506;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      </g>
-    </g>
-    <g transform="translate(-120.71403,-1067.1752)" id="g3138" style="display:inline">
-      <path d="m 144.85461,1081.6667 -4.46467,0 -3.88859,-3.8125 -3.85772,3.7822 -4.51611,0 8.43041,-8.2653 z" id="path3956-37" style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.89009798px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path d="m 145.06641,1091.87 -4.46467,0 -3.88858,-3.8125 -3.85772,3.7822 -4.51611,0 8.43041,-8.2653 z" id="path3956-3-0" style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.89009798px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="path7511-3-8-6-2-5"
+         transform="translate(0,988.3622)"
+         d="M 32,1 C 14.904983,1 0.99998932,14.905 1,32 c 1.2e-6,2.941019 0.4209024,5.782843 1.1894531,8.480469 0.3727265,-3.603568 1.7256364,-6.45992 3.1914063,-7.623047 C 5.3718622,32.572027 5.3593751,32.287623 5.359375,32 5.3593658,17.261 17.260965,5.359375 32,5.359375 46.739035,5.359375 58.640634,17.261 58.640625,32 58.640619,46.7391 46.739024,58.640625 32,58.640625 c -0.652395,0 -1.29701,-0.03227 -1.9375,-0.07813 -3.220423,1.812983 -6.704115,2.268517 -9.509766,2.236328 C 24.096895,62.212362 27.957339,63 32,63 49.095004,63 62.999993,49.095 63,32 63.000011,14.905 49.095017,1 32,1 Z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.359375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         id="path4251-9"
+         transform="translate(0,988.3622)"
+         d="m 32,20.257812 c -3.61005,0 -6.845221,1.641126 -9.001953,4.214844 l 1.685547,1.720703 c 1.708453,-2.152308 4.343595,-3.53125 7.316406,-3.53125 5.172408,0 9.339851,4.165491 9.339844,9.337891 7e-6,5.02858 -3.942185,9.095423 -8.914063,9.318359 l -0.111328,2.410157 C 38.640304,43.559629 43.744149,38.365652 43.744141,32 43.74415,25.5284 38.471627,20.257812 32,20.257812 Z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40400004;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <circle
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         id="path5021-2"
+         cx="39.742958"
+         cy="1001.7123"
+         r="5.2899938" />
+      <circle
+         id="path5023-0"
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         cx="51.648651"
+         cy="1020.2657"
+         r="3.8551764" />
+      <path
+         id="path5025-2"
+         d="m 49.405521,1020.4886 -7.753709,0.061"
+         style="fill:none;stroke:#000000;stroke-width:2.14189005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path5027-3"
+         d="m 39.285062,1002.984 -4.119167,8.42"
+         style="fill:none;stroke:#000000;stroke-width:2.14189005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path5283"
+         d="m 25.957486,1018.1934 7.582463,0.4142 1.712269,7.6273 1.174923,-11.3133 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
   </g>
 </svg>
diff --git a/companion/src/images/simulator/icons/svg/reload_script-active.svg b/companion/src/images/simulator/icons/svg/reload_script-active.svg
index cc8576d64..91eae3a1a 100644
--- a/companion/src/images/simulator/icons/svg/reload_script-active.svg
+++ b/companion/src/images/simulator/icons/svg/reload_script-active.svg
@@ -1,13 +1,57 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.2" width="64" height="64" viewBox="0 0 64 64" id="svg3254" xml:space="preserve"><metadata id="metadata10"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs id="defs8" />
-
-<g id="layer1">
-	
-		<g transform="matrix(1.5756397,0,0,1.6644338,54.170963,-1788.6456)" id="g3219">
-		<path d="m -14.05,1077.797 c -9.455,0 -17.192,7.323 -17.192,16.275 0,8.951 7.736,16.275 17.192,16.275 4.727,0 9.112,-1.749 12.206,-4.719 l -3.095,-2.93 c -2.32,2.197 -5.545,3.58 -9.155,3.58 -7.135,0 -12.894,-5.452 -12.894,-12.206 0,-6.754 5.759,-12.206 12.894,-12.206 3.567,0 6.662,1.465 8.982,3.702 l -4.684,4.435 H 3.1 v -12.206 l -5.114,4.841 c -3.095,-2.93 -7.349,-4.841 -12.077,-4.841 h 0.041 z" id="path3441" style="fill:#002ad8" />
-		<path d="m -17.177,1085.626 c 2.553,-0.958 5.429,0.219 6.441,2.636 l -3.075,1.154 c -0.341,-0.815 -1.286,-1.202 -2.147,-0.879 -0.861,0.323 -1.27,1.218 -0.928,2.032 0.341,0.815 5.075,3.621 6.122,6.125 1.049,2.504 -0.232,5.14 -2.785,6.098 -2.553,0.958 -5.43,-0.219 -6.441,-2.637 l 3.075,-1.153 c 0.341,0.815 1.286,1.202 2.147,0.879 0.861,-0.323 1.27,-1.218 0.928,-2.032 -0.439,-1.048 -5.318,-4.204 -6.122,-6.125 -0.987,-2.359 0.232,-5.14 2.785,-6.098 l 0,0 z" id="path3452" style="fill:#002ad8" />
-	</g>
-</g>
-</svg>
\ No newline at end of file
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg5332"
+   viewBox="0 0 64.000001 64.000001"
+   height="64"
+   width="64">
+  <defs
+     id="defs5334" />
+  <metadata
+     id="metadata5337">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-988.36216)"
+     id="layer1">
+    <g
+       id="g6116"
+       transform="matrix(0.93996508,-0.34127063,0.34127063,0.93996508,-346.29853,72.177979)">
+      <rect
+         style="fill:none;stroke:#000000;stroke-width:2.86239505;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect7803-0-2-1-4-5-96-1-0"
+         width="30.724201"
+         height="34.655006"
+         x="16.687479"
+         y="1002.8078"
+         rx="2.5002778"
+         ry="2.8531349" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.359375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 32,989.3622 c -14.80378,0 -27.2084401,10.42959 -30.2695312,24.3262 l 12.0734662,-5.979 -4.582272,-1.1911 C 13.890279,998.83877 22.3347,993.72158 32,993.72158 c 12.433892,0 22.847298,8.46872 25.800781,19.96682 l 4.46875,0 C 59.20844,999.79179 46.80378,989.3622 32,989.3622 Z M 1.7089844,1026.9384 C 4.7334431,1040.8836 17.161678,1051.3622 32,1051.3622 c 14.838322,0 27.266557,-10.4786 30.291016,-24.4238 l -12.189761,5.2541 5.12329,1.2478 C 50.66162,1041.543 41.982195,1047.0028 32,1047.0028 c -12.468173,0 -22.9038891,-8.5178 -25.8242188,-20.0644 z"
+         id="path7511-3-8-6-2-5-2-6" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16.78224373px;line-height:120.00000477%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         x="20.080101"
+         y="1033.3553"
+         id="text6112"><tspan
+           id="tspan6114"
+           x="20.080101"
+           y="1033.3553">&lt;/&gt;</tspan></text>
+    </g>
+  </g>
+</svg>
diff --git a/companion/src/images/simulator/icons/svg/reload_script.svg b/companion/src/images/simulator/icons/svg/reload_script.svg
index c561fc4b0..f44816e90 100644
--- a/companion/src/images/simulator/icons/svg/reload_script.svg
+++ b/companion/src/images/simulator/icons/svg/reload_script.svg
@@ -1,21 +1,57 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64" id="svg3254">
-  <defs id="defs3256" />
-  <metadata id="metadata3259">
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg5332"
+   viewBox="0 0 64.000001 64.000001"
+   height="64"
+   width="64">
+  <defs
+     id="defs5334" />
+  <metadata
+     id="metadata5337">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1">
-    <g transform="matrix(1.5756397,0,0,1.6644338,54.170963,-1788.6456)" id="g3219" style="display:inline">
-      <path d="m -14.0496,1077.7967 c -9.455526,0 -17.191866,7.3233 -17.191866,16.2746 0,8.9506 7.73634,16.2746 17.191866,16.2746 4.7277622,0 9.1116881,-1.7493 12.2062302,-4.7194 l -3.0945421,-2.9297 c -2.3209027,2.1969 -5.5443771,3.5805 -9.1546711,3.5805 -7.134623,0 -12.893898,-5.4523 -12.893898,-12.206 0,-6.7545 5.759275,-12.206 12.893898,-12.206 3.567319,0 6.6618533,1.4649 8.9827563,3.7023 l -4.6847867,4.4351 H 3.0992902 v -12.206 l -5.1145825,4.8414 c -3.0945344,-2.9297 -7.3495203,-4.8414 -12.0772907,-4.8414 z" id="path3441" />
-      <path d="m -17.17734,1085.626 c 2.552571,-0.9574 5.429568,0.2195 6.44112,2.6363 l -3.075396,1.1539 c -0.341196,-0.8151 -1.285932,-1.2018 -2.147034,-0.8789 -0.86111,0.3231 -1.269543,1.2173 -0.928348,2.0325 0.341197,0.8151 5.074068,3.6209 6.122113,6.1244 1.0481409,2.5039 -0.232373,5.1401 -2.784956,6.0978 -2.552568,0.9575 -5.429564,-0.2194 -6.441212,-2.6365 l 3.075393,-1.1538 c 0.341197,0.815 1.28603,1.2019 2.147128,0.879 0.861114,-0.323 1.269453,-1.2176 0.928257,-2.0327 -0.438699,-1.0479 -5.317867,-4.2032 -6.122117,-6.1243 -0.987208,-2.3585 0.232468,-5.1399 2.785052,-6.0977 z" id="path3452" />
+  <g
+     transform="translate(0,-988.36216)"
+     id="layer1">
+    <g
+       id="g6116"
+       transform="translate(-2e-7,-4e-5)">
+      <rect
+         style="fill:none;stroke:#000000;stroke-width:2.86239505;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect7803-0-2-1-4-5-96-1-0"
+         width="30.724201"
+         height="34.655006"
+         x="16.687479"
+         y="1002.8078"
+         rx="2.5002778"
+         ry="2.8531349" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.359375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 32,989.3622 c -14.80378,0 -27.2084401,10.42959 -30.2695312,24.3262 l 12.0734662,-5.979 -4.582272,-1.1911 C 13.890279,998.83877 22.3347,993.72158 32,993.72158 c 12.433892,0 22.847298,8.46872 25.800781,19.96682 l 4.46875,0 C 59.20844,999.79179 46.80378,989.3622 32,989.3622 Z M 1.7089844,1026.9384 C 4.7334431,1040.8836 17.161678,1051.3622 32,1051.3622 c 14.838322,0 27.266557,-10.4786 30.291016,-24.4238 l -12.189761,5.2541 5.12329,1.2478 C 50.66162,1041.543 41.982195,1047.0028 32,1047.0028 c -12.468173,0 -22.9038891,-8.5178 -25.8242188,-20.0644 z"
+         id="path7511-3-8-6-2-5-2-6" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16.78224373px;line-height:120.00000477%;font-family:Arial;-inkscape-font-specification:'Arial, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         x="20.080101"
+         y="1033.3553"
+         id="text6112"><tspan
+           id="tspan6114"
+           x="20.080101"
+           y="1033.3553">&lt;/&gt;</tspan></text>
     </g>
   </g>
 </svg>
diff --git a/companion/src/images/simulator/icons/svg/restart-active.svg b/companion/src/images/simulator/icons/svg/restart-active.svg
index 031008c58..b825a62ae 100644
--- a/companion/src/images/simulator/icons/svg/restart-active.svg
+++ b/companion/src/images/simulator/icons/svg/restart-active.svg
@@ -1,13 +1,39 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.2" width="64" height="64" viewBox="0 0 64 64" id="svg3254" xml:space="preserve"><metadata id="metadata10"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs id="defs8" />
-
-<g id="layer1">
-	
-		<g transform="matrix(1.5756397,0,0,1.6644338,54.170963,-1788.6456)" id="g3219">
-		<path d="m -14.747,1077.753 v 15.251 h 4.027 v -15.251 h -4.027 z" id="path3397" style="fill:#720000" />
-		<path d="m -28.493,1098.125 c 1.281,7.768 9.042,13.131 17.248,11.919 8.205,-1.212 13.871,-8.56 12.59,-16.328 -0.64,-3.884 -2.837,-7.249 -5.98,-9.389 l -2.266,2.939 c 2.328,1.609 4.033,4.07 4.522,7.036 0.966,5.861 -3.252,11.331 -9.443,12.245 -6.192,0.915 -11.97,-3.079 -12.936,-8.939 -0.483,-2.931 0.441,-5.671 2.178,-7.881 l 4.7,3.248 -1.746,-10.593 -11.19,1.653 5.131,3.546 c -2.267,2.939 -3.443,6.694 -2.803,10.578 l -0.005,-0.034 z" id="path3408" style="fill:#720000" />
-	</g>
-</g>
-</svg>
\ No newline at end of file
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="64"
+   height="64"
+   viewBox="0 0 64.000001 64.000001"
+   id="svg5332"
+   version="1.1">
+  <defs
+     id="defs5334" />
+  <metadata
+     id="metadata5337">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     id="path7511-3-8-6-2-5-2-6"
+     d="M 21.445681,2.851991 C 7.5263028,7.8921108 -0.58640746,21.921932 1.2666527,36.030558 L 10.58321,26.2982 5.8691667,26.738347 C 7.6442729,17.928082 13.842004,10.241599 22.929883,6.9509347 34.620954,2.7176709 47.295535,7.1351279 53.987235,16.940765 l 4.201779,-1.521438 C 50.579521,3.3950694 35.36506,-2.1881287 21.445681,2.851991 Z M 5.7575691,48.496296 C 13.349148,60.578675 28.602462,66.199929 42.554319,61.148049 56.506176,56.096169 64.624366,42.01224 62.720333,27.870436 l -9.672705,9.090358 5.242044,-0.571029 C 56.758002,45.561897 50.455953,53.650532 41.07011,57.049087 29.346806,61.294022 16.634552,56.83805 9.9575122,46.975523 Z"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.359375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="rect9178-6"
+     d="m 22.183626,15.276817 c -2.01487,0.729572 -3.049649,2.93909 -2.320077,4.953961 l 2.240275,6.187002 c 0.729572,2.014871 2.93909,3.049649 4.953961,2.320077 l 6.843873,-2.478124 c 2.014872,-0.729572 3.04965,-2.939089 2.320078,-4.953961 L 33.981461,15.11877 C 33.251889,13.103899 31.042371,12.069121 29.0275,12.798693 l -6.843874,2.478124 z m 1.506954,1.413748 5.084463,-1.841053 c 1.49651,-0.541876 3.137303,0.226553 3.67918,1.723062 l 1.664244,4.596169 c 0.541877,1.496511 -0.226552,3.137304 -1.723061,3.679181 l -5.084464,1.841052 c -1.496509,0.541877 -3.137303,-0.226552 -3.67918,-1.723063 l -1.664244,-4.596169 c -0.541877,-1.496509 0.226552,-3.137303 1.723062,-3.679179 z"
+     style="fill:#000000;fill-opacity:1;stroke:none" />
+  <path
+     id="rect9178"
+     d="m 19.671267,24.858645 c -2.940082,1.936773 -4.294736,5.647214 -3.04114,9.109292 l 4.507468,12.448343 c 1.468632,4.055947 5.908502,6.135296 9.964527,4.666635 l 13.80528,-4.998805 c 4.056044,-1.468669 6.135339,-5.908567 4.666706,-9.964513 L 45.066641,23.671254 c -1.229444,-3.395377 -4.542399,-5.351541 -7.969843,-5.055245 l 0.854477,2.359823 c 0.987069,2.726004 -0.376381,5.741789 -3.102286,6.728822 l -7.551612,2.734392 c -2.725905,0.987033 -5.763103,-0.435305 -6.750172,-3.161309 z m 4.133067,7.912767 c 2.725613,-0.986927 5.763265,0.435689 6.750192,3.161301 0.986928,2.725612 -0.43569,5.763264 -3.161302,6.750192 -2.725612,0.986926 -5.763265,-0.43569 -6.750192,-3.161302 -0.986927,-2.725612 0.435691,-5.763264 3.161302,-6.750191 z m 15.183447,-5.431455 c 2.725612,-0.986927 5.763265,0.43569 6.750192,3.161302 0.986927,2.725612 -0.43569,5.763265 -3.161302,6.750192 -2.725611,0.986927 -5.763264,-0.43569 -6.750191,-3.161302 -0.986927,-2.725613 0.43569,-5.763265 3.161301,-6.750192 z m -14.49995,7.319079 c -1.695086,0.613779 -2.511777,2.462268 -1.897975,4.157414 0.613801,1.695145 2.403183,2.532951 4.098268,1.919171 1.695087,-0.61378 2.592215,-2.424354 1.978413,-4.119499 -0.613801,-1.695146 -2.48362,-2.570867 -4.178706,-1.957086 z M 39.693235,29.28822 c -1.695086,0.61378 -2.592143,2.42455 -1.978342,4.119695 0.613802,1.695146 2.483549,2.57067 4.178635,1.956889 1.695086,-0.61378 2.511848,-2.462072 1.898046,-4.157217 -0.613801,-1.695145 -2.403253,-2.533147 -4.098339,-1.919367 z"
+     style="fill:#040404;fill-opacity:1;stroke:none" />
+</svg>
diff --git a/companion/src/images/simulator/icons/svg/restart.svg b/companion/src/images/simulator/icons/svg/restart.svg
index 95ee5b5ca..268bfd407 100644
--- a/companion/src/images/simulator/icons/svg/restart.svg
+++ b/companion/src/images/simulator/icons/svg/restart.svg
@@ -1,21 +1,39 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64" id="svg3254">
-  <defs id="defs3256" />
-  <metadata id="metadata3259">
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="64"
+   height="64"
+   viewBox="0 0 64.000001 64.000001"
+   id="svg5332"
+   version="1.1">
+  <defs
+     id="defs5334" />
+  <metadata
+     id="metadata5337">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1">
-    <g transform="matrix(1.5756397,0,0,1.6644338,54.170963,-1788.6456)" id="g3219" style="display:inline">
-      <path d="m -14.746549,1077.7527 0,15.2513 4.027731,0 0,-15.2513 z" id="path3397" />
-      <path d="m -28.493102,1098.125 c 1.280572,7.768 9.04186,13.1318 17.247791,11.9196 8.205389,-1.2122 13.8717377,-8.5597 12.5911658,-16.3278 -0.64028535,-3.8839 -2.8375946,-7.2486 -5.9796213,-9.3887 l -2.2664742,2.9392 c 2.3282028,1.609 4.0331007,4.0698 4.5220467,7.036 0.9662505,5.8611 -3.2519743,11.331 -9.443375,12.2456 -6.192048,0.9148 -11.969592,-3.0784 -12.935843,-8.9396 -0.483125,-2.9307 0.440618,-5.6713 2.177425,-7.881 l 4.700237,3.248 -1.746236,-10.5928 -11.189608,1.653 5.130941,3.5462 c -2.266583,2.939 -3.442915,6.6935 -2.802629,10.5777 z" id="path3408" />
-    </g>
-  </g>
+  <path
+     id="path7511-3-8-6-2-5-2-6"
+     d="M 32,1 C 17.19622,1 4.7915597,11.42959 1.7304686,25.32624 l 12.0734664,-5.979 -4.5822722,-1.1911 C 13.890279,10.47657 22.3347,5.35938 32,5.35938 c 12.433892,0 22.847298,8.46876 25.800781,19.96686 l 4.46875,0 C 59.20844,11.42959 46.80378,1 32,1 Z M 1.7089842,38.57624 C 4.7334429,52.52144 17.161678,63.00004 32,63.00004 c 14.838322,0 27.266557,-10.4786 30.291016,-24.4238 l -12.189761,5.2541 5.12329,1.2478 C 50.66162,53.18084 41.982195,58.64064 32,58.64064 c -12.468173,0 -22.9038893,-8.5178 -25.824219,-20.0644 z"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.359375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="rect9178-6"
+     d="m 28.463682,12.933789 c -2.14289,0 -3.868106,1.725215 -3.868106,3.868106 l 0,6.580108 c 0,2.142891 1.725216,3.868106 3.868106,3.868106 l 7.278716,0 c 2.142891,0 3.868106,-1.725215 3.868106,-3.868106 l 0,-6.580108 c 0,-2.142891 -1.725215,-3.868106 -3.868106,-3.868106 l -7.278716,0 z m 0.935599,1.842348 5.407517,0 c 1.591594,0 2.872743,1.281149 2.872743,2.872743 l 0,4.888198 c 0,1.591595 -1.281149,2.872744 -2.872743,2.872744 l -5.407517,0 c -1.591594,0 -2.872743,-1.281149 -2.872743,-2.872744 l 0,-4.888198 c 0,-1.591594 1.281149,-2.872743 2.872743,-2.872743 z"
+     style="fill:#000000;fill-opacity:1;stroke:none" />
+  <path
+     id="rect9178"
+     d="m 22.83917,21.087821 c -3.423834,0.820082 -5.960822,3.847647 -5.960822,7.529697 l 0,13.239279 c 0,4.313651 3.466686,7.780382 7.78042,7.780382 l 14.682432,0 c 4.313755,0 7.780445,-3.466731 7.780445,-7.780382 l 0,-13.239279 c 0,-3.61111 -2.449035,-6.578344 -5.772595,-7.466662 l 0,2.50976 c 0,2.899207 -2.308755,5.270622 -5.207857,5.270622 l -8.031422,0 c -2.899102,0 -5.270601,-2.371415 -5.270601,-5.270622 z m 1.192157,8.847197 c 2.898791,0 5.270623,2.371831 5.270623,5.270621 0,2.898791 -2.371832,5.270622 -5.270623,5.270622 -2.89879,0 -5.270622,-2.371831 -5.270622,-5.270622 0,-2.89879 2.371832,-5.270621 5.270622,-5.270621 z m 16.125566,0.06241 c 2.89879,0 5.270622,2.371832 5.270622,5.270623 0,2.89879 -2.371832,5.270622 -5.270622,5.270622 -2.89879,0 -5.270622,-2.371832 -5.270622,-5.270622 0,-2.898791 2.371832,-5.270623 5.270622,-5.270623 z m -16.125566,1.945148 c -1.802787,0 -3.200027,1.460005 -3.200027,3.262856 0,1.80285 1.39724,3.19982 3.200027,3.19982 1.802788,0 3.262751,-1.39697 3.262751,-3.19982 0,-1.802851 -1.459963,-3.262856 -3.262751,-3.262856 z m 16.125566,0.126903 c -1.802788,0 -3.262751,1.397178 -3.262751,3.200028 0,1.802851 1.459963,3.262647 3.262751,3.262647 1.802787,0 3.200027,-1.459796 3.200027,-3.262647 0,-1.80285 -1.39724,-3.200028 -3.200027,-3.200028 z"
+     style="fill:#040404;fill-opacity:1;stroke:none" />
 </svg>
diff --git a/companion/src/images/simulator/icons/svg/rf_out-active.svg b/companion/src/images/simulator/icons/svg/rf_out-active.svg
new file mode 100644
index 000000000..0cf07b268
--- /dev/null
+++ b/companion/src/images/simulator/icons/svg/rf_out-active.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg5332"
+   viewBox="0 0 64.000001 64.000001"
+   height="64"
+   width="64">
+  <defs
+     id="defs5334" />
+  <metadata
+     id="metadata5337">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-988.36216)"
+     id="layer1">
+    <path
+       id="path3382"
+       d="m 31.103871,1022.2231 c -0.994982,-0.7345 -1.522912,-1.8248 -1.535396,-3.1708 -0.0082,-0.8789 0.782326,-2.3642 1.541643,-2.8965 0.683629,-0.4792 1.758058,-0.7766 2.574482,-0.713 0.736377,0.058 2.074248,0.7323 2.535916,1.2794 0.501094,0.5934 0.905282,1.7099 0.903757,2.4963 -0.006,3.0668 -3.544635,4.833 -6.020503,3.0049 z"
+       style="fill:#000000;fill-opacity:1" />
+    <path
+       id="path3380"
+       d="m 29.316097,1012.6301 c -0.674862,-0.8293 -0.530481,-1.9527 0.329924,-2.5668 0.385686,-0.2753 1.655027,-0.4802 2.933475,-0.4737 2.995693,0.015 6.497335,1.5723 8.599978,3.824 0.950638,1.018 1.772013,2.2001 2.110676,3.0377 0.225706,0.5582 0.223669,0.7635 -0.01335,1.3606 -0.259346,0.6532 -0.329574,0.7219 -0.987505,0.9659 -0.615071,0.2283 -0.784284,0.2237 -1.28509,-0.034 -0.452308,-0.2318 -0.69656,-0.5059 -1.129075,-1.2587 -0.929827,-1.6182 -1.711864,-2.3225 -3.704297,-3.3361 -1.542536,-0.7907 -1.812688,-0.8798 -2.810651,-0.9791 -0.606608,-0.061 -1.501855,-0.065 -1.989487,-0.012 -1.086886,0.1205 -1.64356,-0.023 -2.054598,-0.5273 z"
+       style="fill:#000000;fill-opacity:1" />
+    <path
+       id="path3378"
+       d="m 27.74395,1006.3811 c -0.325853,-0.4771 -0.275645,-1.3164 0.108382,-1.8121 0.364771,-0.4709 1.126859,-0.7306 2.667576,-0.9092 6.448172,-0.7476 12.56804,1.9553 16.346602,7.2194 1.228303,1.7111 2.094997,3.516 1.995248,4.1549 -0.179341,1.148 -1.323919,1.7251 -2.365092,1.1928 -0.380085,-0.1945 -0.593476,-0.4798 -1.102016,-1.4733 -1.511035,-2.9524 -3.404027,-4.8757 -6.216361,-6.3161 -2.982315,-1.5289 -5.406639,-1.9117 -9.010043,-1.4276 -1.410097,0.1895 -1.963404,0.046 -2.424301,-0.6288 z"
+       style="fill:#000000;fill-opacity:1" />
+    <path
+       id="path3377"
+       d="m 26.067015,1000.4894 c -0.377182,-0.4434 -0.468199,-1.14765 -0.229859,-1.77807 0.227692,-0.60223 0.245093,-0.61466 1.329571,-0.94657 2.253034,-0.68975 6.369752,-0.87475 9.323243,-0.41902 2.809085,0.43337 3.92781,0.82088 7.148899,2.47585 3.222513,1.65201 4.21659,2.35661 6.183378,4.35901 2.083937,2.1217 4.346959,5.582 5.093797,7.7889 0.325825,0.9629 0.334374,1.1126 0.09047,1.5884 -0.217511,0.4243 -0.397065,0.5726 -0.934398,0.7721 -0.592092,0.2197 -0.731187,0.2128 -1.266548,-0.061 -0.543355,-0.2786 -0.651124,-0.419 -1.116051,-1.453 -1.827851,-4.0659 -4.316809,-6.9508 -8.045544,-9.3256 -2.194335,-1.3975 -4.871502,-2.3985 -7.622016,-2.8493 -1.610709,-0.2639 -4.650632,-0.2736 -6.223563,-0.019 -2.674039,0.4318 -2.888821,0.4503 -3.210047,0.2758 -0.180977,-0.093 -0.413348,-0.2805 -0.521331,-0.4074 z"
+       style="fill:#000000;fill-opacity:1" />
+    <path
+       id="path4196"
+       d="m 16.287361,1035.29 c -0.552127,-0.093 -0.992698,-0.4693 -1.200278,-1.0242 -0.217617,-0.5816 -0.07451,-1.2133 0.377201,-1.665 0.16455,-0.1645 0.362532,-0.2931 0.569302,-0.3698 0.316666,-0.1172 0.323334,-0.1174 6.059435,-0.1174 l 5.742421,0 0.03354,0.2097 c 0.0469,0.2933 0.243449,0.5607 0.530344,0.7215 l 0.244371,0.1369 3.478273,0 3.478273,0 0.244375,-0.1369 c 0.286891,-0.1608 0.483439,-0.4282 0.53034,-0.7215 l 0.03354,-0.2097 5.74242,0 c 5.736102,0 5.742766,0 6.059439,0.1174 0.600716,0.2226 1.056489,0.869 1.056489,1.4985 0,0.5174 -0.383936,1.1734 -0.815569,1.3937 -0.110692,0.056 -0.346737,0.1296 -0.524545,0.1624 -0.379166,0.07 -31.225897,0.074 -31.639368,0.01 z"
+       style="fill:#010101" />
+    <path
+       id="path4194"
+       d="m 17.689453,1009.6286 -0.376953,0.1231 c -1.087372,0.3568 -1.808991,1.062 -2.175781,2.125 l -0.132813,0.3808 0,7.5313 0,7.5312 0.13086,0.3848 c 0.351213,1.0345 1.090215,1.7714 2.105468,2.1016 0.18618,0.06 0.413527,0.1208 0.503907,0.1328 l 0,0 c 0.09038,0.01 6.634688,0.028 14.542968,0.018 l 14.376953,-0.012 0.357422,-0.1308 c 1.033508,-0.3858 1.746704,-1.1083 2.087891,-2.1133 l 0.130859,-0.3848 0,-7.5312 0,-2.9317 -2.117187,0.7168 -0.0059,2.2989 -0.01367,7.2285 -0.15625,0.2304 c -0.100721,0.1485 -0.256407,0.2821 -0.435547,0.3711 l -0.279297,0.1387 -14.111328,0 -14.109375,0 -0.279297,-0.1387 c -0.17914,-0.089 -0.334822,-0.2226 -0.435547,-0.3711 l -0.15625,-0.2304 -0.01367,-7.2285 -0.01563,-7.2286 0.142578,-0.289 c 0.106978,-0.2187 0.205212,-0.3259 0.398438,-0.4395 l 0.255859,-0.1523 10.076172,0 c -0.301461,-0.8367 -0.473022,-1.3216 -0.761719,-2.1348 l -9.533203,0 z"
+       style="fill:#010101" />
+    <circle
+       r="28.820312"
+       id="path7511-3-8-6-2-5-2-6-2"
+       style="fill:none;stroke:#000000;stroke-width:4.359375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       cx="32"
+       cy="1020.3622" />
+  </g>
+</svg>
diff --git a/companion/src/images/simulator/icons/svg/rf_out.svg b/companion/src/images/simulator/icons/svg/rf_out.svg
new file mode 100644
index 000000000..81fc7f9d6
--- /dev/null
+++ b/companion/src/images/simulator/icons/svg/rf_out.svg
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   viewBox="0 0 64.000001 64.000001"
+   id="svg5332"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="rf_out.svg">
+  <defs
+     id="defs5334" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.979899"
+     inkscape:cx="108.41307"
+     inkscape:cy="-22.766153"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     borderlayer="true"
+     units="px"
+     width="64px"
+     inkscape:window-width="1280"
+     inkscape:window-height="1000"
+     inkscape:window-x="1280"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5337">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Vrstva 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-988.36216)">
+    <path
+       style="fill:#000000;fill-opacity:1"
+       d="m 31.517527,1021.6653 c -0.811444,-0.599 -1.24199,-1.4882 -1.252171,-2.5859 -0.0067,-0.7168 0.638015,-1.9281 1.257265,-2.3622 0.557524,-0.3908 1.43376,-0.6334 2.099583,-0.5815 0.600542,0.047 1.691624,0.5972 2.068131,1.0434 0.40866,0.4839 0.73829,1.3945 0.737046,2.0358 -0.0049,2.5011 -2.890777,3.9415 -4.909937,2.4506 z m -1.554794,-8.5065 c -0.567303,-0.6971 -0.445933,-1.6415 0.277341,-2.1577 0.324215,-0.2314 1.391249,-0.4037 2.465939,-0.3982 2.51824,0.013 5.461792,1.3217 7.229316,3.2145 0.799126,0.8558 1.48959,1.8495 1.774277,2.5536 0.189733,0.4692 0.188021,0.6418 -0.01122,1.1437 -0.218012,0.5491 -0.277047,0.6069 -0.830117,0.812 -0.517041,0.1919 -0.659285,0.188 -1.080273,-0.029 -0.380219,-0.1949 -0.585542,-0.4253 -0.949123,-1.0581 -0.781632,-1.3603 -1.439028,-1.9524 -3.113908,-2.8044 -1.296687,-0.6647 -1.523782,-0.7396 -2.36269,-0.8231 -0.509927,-0.051 -1.26249,-0.055 -1.672403,-0.01 -0.913659,0.1013 -1.38161,-0.019 -1.727137,-0.4432 z m -1.883262,-5.434 c -0.293134,-0.4292 -0.247967,-1.1843 0.0975,-1.6302 0.328144,-0.4236 1.01371,-0.6572 2.399723,-0.8179 5.800707,-0.6725 11.306075,1.759 14.705229,6.4945 1.104969,1.5393 1.884637,3.163 1.794904,3.7377 -0.161333,1.0327 -1.190983,1.5519 -2.127611,1.073 -0.341921,-0.1749 -0.533885,-0.4316 -0.991362,-1.3253 -1.359311,-2.656 -3.062227,-4.3862 -5.592173,-5.6819 -2.682859,-1.3754 -4.863755,-1.7198 -8.105339,-1.2843 -1.268508,0.1705 -1.766257,0.041 -2.180875,-0.5656 z m -1.518341,-5.018 c -0.333758,-0.3923 -0.414297,-1.0155 -0.203396,-1.5733 0.201479,-0.5329 0.216876,-0.5439 1.176503,-0.8376 1.993652,-0.61034 5.636429,-0.77404 8.249897,-0.37078 2.485687,0.38348 3.475618,0.72638 6.325877,2.19078 2.851518,1.4618 3.731151,2.0853 5.471511,3.8572 1.844022,1.8774 3.846512,4.9393 4.50737,6.8922 0.288314,0.852 0.295879,0.9845 0.08005,1.4055 -0.19247,0.3755 -0.351353,0.5067 -0.826825,0.6832 -0.523927,0.1944 -0.647008,0.1883 -1.120735,-0.054 -0.480801,-0.2465 -0.576163,-0.3707 -0.987565,-1.2857 -1.617418,-3.5978 -3.819833,-6.1506 -7.119294,-8.252 -1.941711,-1.2366 -4.310667,-2.1223 -6.744526,-2.5212 -1.425275,-0.2336 -4.115224,-0.2421 -5.50707,-0.017 -2.366188,0.3821 -2.556243,0.3984 -2.840488,0.244 -0.160142,-0.082 -0.365761,-0.2482 -0.461312,-0.3605 z"
+       id="path3377"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssssssssscsssssssssssscsssssssssssssssscs" />
+    <path
+       style="fill:#010101"
+       d="m 16.287361,1035.29 c -0.552127,-0.093 -0.992698,-0.4693 -1.200278,-1.0242 -0.217617,-0.5816 -0.07451,-1.2133 0.377201,-1.665 0.16455,-0.1645 0.362532,-0.2931 0.569302,-0.3698 0.316666,-0.1172 0.323334,-0.1174 6.059435,-0.1174 l 5.742421,0 0.03354,0.2097 c 0.0469,0.2933 0.243449,0.5607 0.530344,0.7215 l 0.244371,0.1369 3.478273,0 3.478273,0 0.244375,-0.1369 c 0.286891,-0.1608 0.483439,-0.4282 0.53034,-0.7215 l 0.03354,-0.2097 5.74242,0 c 5.736102,0 5.742766,0 6.059439,0.1174 0.600716,0.2226 1.056489,0.869 1.056489,1.4985 0,0.5174 -0.383936,1.1734 -0.815569,1.3937 -0.110692,0.056 -0.346737,0.1296 -0.524545,0.1624 -0.379166,0.07 -31.225897,0.074 -31.639368,0.01 z"
+       id="path4196"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#010101"
+       d="m 17.689453,1009.6286 -0.376953,0.1231 c -1.087372,0.3568 -1.808991,1.062 -2.175781,2.125 l -0.132813,0.3808 0,7.5313 0,7.5312 0.13086,0.3848 c 0.351213,1.0345 1.090215,1.7714 2.105468,2.1016 0.18618,0.06 0.413527,0.1208 0.503907,0.1328 l 0,0 c 0.09038,0.01 6.634688,0.028 14.542968,0.018 l 14.376953,-0.012 0.357422,-0.1308 c 1.033508,-0.3858 1.746704,-1.1083 2.087891,-2.1133 l 0.130859,-0.3848 0,-7.5312 0,-2.9317 -2.117187,0.7168 -0.0059,2.2989 -0.01367,7.2285 -0.15625,0.2304 c -0.100721,0.1485 -0.256407,0.2821 -0.435547,0.3711 l -0.279297,0.1387 -14.111328,0 -14.109375,0 -0.279297,-0.1387 c -0.17914,-0.089 -0.334822,-0.2226 -0.435547,-0.3711 l -0.15625,-0.2304 -0.01367,-7.2285 -0.01563,-7.2286 0.142578,-0.289 c 0.106978,-0.2187 0.205212,-0.3259 0.398438,-0.4395 l 0.255859,-0.1523 10.076172,0 c -0.301461,-0.8367 -0.473022,-1.3216 -0.761719,-2.1348 l -9.533203,0 z"
+       id="path4194"
+       inkscape:connector-curvature="0" />
+    <circle
+       cy="1020.3622"
+       cx="32"
+       style="fill:none;stroke:#000000;stroke-width:4.359375;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path7511-3-8-6-2-5-2-6-2"
+       r="28.820312" />
+  </g>
+</svg>
diff --git a/companion/src/images/simulator/icons/svg/telemetry-active.svg b/companion/src/images/simulator/icons/svg/telemetry-active.svg
new file mode 100644
index 000000000..1e803d922
--- /dev/null
+++ b/companion/src/images/simulator/icons/svg/telemetry-active.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="64"
+   height="64"
+   viewBox="0 0 64.000001 64.000001"
+   id="svg5332"
+   version="1.1">
+  <defs
+     id="defs5334" />
+  <metadata
+     id="metadata5337">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     id="path7511-3-8-6-2-5-2"
+     d="M 31.489076,1 C 14.394066,1 0.4890765,14.905 0.4890765,32 c 0,17.095 13.9049895,31 30.9999995,31 17.095011,0 31.000001,-13.905 31.000001,-31 0,-4.368869 -0.913278,-8.527463 -2.550781,-12.300781 l -3.5625,2.771484 c 1.129824,2.957915 1.753906,6.169006 1.753906,9.529297 0,14.7391 -11.901596,26.640625 -26.640626,26.640625 C 16.750047,58.640625 4.8484515,46.7391 4.8484515,32 c 0,-14.739 11.9015955,-26.640625 26.6406245,-26.640625 2.460106,0 4.837798,0.3379936 7.097657,0.9589844 L 38.549624,1.8203125 C 36.279809,1.2894147 33.918497,1 31.489076,1 Z"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.359375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="path7147-38-9-7"
+     d="m 40.736477,15.9366 0,3.3269 c 4.065857,0.1025 7.700353,1.6628 10.904472,3.9668 l 2.271765,-2.0475 c -3.81729,-2.9957 -8.212698,-5.1397 -13.176237,-5.2462 z"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.20479071;marker:none;enable-background:accumulate" />
+  <path
+     id="path7149-4-2-8"
+     d="m 40.736477,9.09102 0,3.26278 c 6.010142,0.1127 11.53244,2.4234 16.015945,6.206 l 2.214971,-2.1114 C 53.909718,11.9799 47.616004,9.20811 40.736477,9.09102 Z"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.96289933;marker:none;enable-background:accumulate" />
+  <path
+     id="path7151-4-6-4"
+     d="m 40.736477,2.50117 0,3.1989 c 7.852038,0.12079 14.955899,3.34857 20.61627,8.57303 l 2.158176,-2.0473 C 57.311078,6.34169 49.436765,2.62503 40.736477,2.50117 Z"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.79512143;marker:none;enable-background:accumulate" />
+  <path
+     id="path7254-4-8-5"
+     d="m 41.918202,19.030988 c -15.869433,0 -21.196555,12.627716 -21.196555,12.627716 l 0,1.578498 c 0,0 4.782277,13.830349 21.12139,13.830349 15.13199,0 20.069078,-13.680136 20.069078,-13.680136 l 0,-1.728711 c 0,0 -5.262009,-12.627716 -19.993913,-12.627716 z m -1.428136,2.104576 c 0.391584,-0.0397 0.800564,0 1.202641,0 6.433221,0 11.650588,5.142194 11.650588,11.575428 0,6.433234 -5.217367,11.6506 -11.650588,11.6506 -6.433219,0 -11.650587,-5.217366 -11.650587,-11.6506 0,-6.031165 4.574184,-10.978942 10.447946,-11.575428 z"
+     style="fill:#000000;fill-opacity:1;stroke:none" />
+  <circle
+     id="path7259-4-9-0"
+     style="fill:#030000;fill-opacity:1;stroke:none"
+     cx="44.113647"
+     cy="35.082993"
+     r="5.9723058" />
+  <g
+     transform="matrix(0.52500254,0,0,0.52500254,0.4993988,14.4037)"
+     id="layer1-3">
+    <g
+       transform="matrix(1.5756397,0,0,1.6644338,54.170963,-1788.6456)"
+       id="g3219"
+       style="display:inline">
+      <g
+         transform="matrix(0.63466286,0,0,0.60080491,-55.333181,1055.0231)"
+         id="g3488">
+        <path
+           d="m 60.353163,39.726048 -3.12794,10.182437 -5.191046,17.037284 -0.199657,-0.399311 -0.598967,-2.262764 -12.511754,0 0,6.655188 7.720019,0 2.528972,7.720019 3.127938,9.783127 3.127939,-9.982783 5.191046,-16.637971 5.191049,16.637971 2.728627,8.917954 3.52725,-8.518642 3.926561,-9.783127 0.865176,1.863452 10.807846,0 0,-6.655188 -6.681629,0 -2.528973,-4.991392 -3.327593,-6.455534 -2.728629,6.854847 -3.127938,7.919673 -5.590359,-17.702803 z"
+           id="path3506" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/companion/src/images/simulator/icons/svg/telemetry.svg b/companion/src/images/simulator/icons/svg/telemetry.svg
index 6adfbeb07..c271c037e 100644
--- a/companion/src/images/simulator/icons/svg/telemetry.svg
+++ b/companion/src/images/simulator/icons/svg/telemetry.svg
@@ -1,21 +1,77 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64" id="svg3254">
-  <defs id="defs3256" />
-  <metadata id="metadata3259">
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg5332"
+   viewBox="0 0 64.000001 64.000001"
+   height="64"
+   width="64">
+  <defs
+     id="defs5334" />
+  <metadata
+     id="metadata5337">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1">
-    <g transform="matrix(1.5756397,0,0,1.6644338,54.170963,-1788.6456)" id="g3219" style="display:inline">
-      <g transform="matrix(0.63466286,0,0,0.60080491,-55.333181,1055.0231)" id="g3488">
-        <path d="M 60.353163,39.726048 57.225223,49.908485 52.034177,66.945769 51.83452,66.546458 51.235553,64.283694 H 38.723799 v 6.655188 h 7.720019 l 2.528972,7.720019 3.127938,9.783127 3.127939,-9.982783 5.191046,-16.637971 5.191049,16.637971 2.728627,8.917954 3.52725,-8.518642 3.926561,-9.783127 0.865176,1.863452 H 92.031861 V 64.283694 H 80.784593 L 78.25562,59.292302 74.928027,52.836768 72.199398,59.691615 69.07146,67.611288 63.481101,49.908485 60.353163,39.726048 z" id="path3506" />
+  <g
+     transform="translate(0,-988.36216)"
+     id="layer1">
+    <g
+       id="g5553"
+       transform="translate(-0.5109235,-4e-5)">
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.359375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="M 32,1 C 14.90499,1 1,14.905 1,32 1,49.095 14.90499,63 32,63 49.09501,63 63,49.095 63,32 63,27.631131 62.086722,23.472537 60.449219,19.699219 l -3.5625,2.771484 C 58.016543,25.428618 58.640625,28.639709 58.640625,32 58.640625,46.7391 46.739029,58.640625 32,58.640625 17.260971,58.640625 5.359375,46.7391 5.359375,32 5.359375,17.261 17.260971,5.359375 32,5.359375 c 2.460105,0 4.837797,0.3379936 7.097656,0.9589844 L 39.060547,1.8203125 C 36.790732,1.2894147 34.42942,1 32,1 Z"
+         transform="translate(0,988.3622)"
+         id="path7511-3-8-6-2-5-2" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.20479071;marker:none;enable-background:accumulate"
+         d="m 41.2474,1004.2988 0,3.3269 c 4.065858,0.1025 7.700354,1.6628 10.904473,3.9668 l 2.271765,-2.0475 c -3.81729,-2.9957 -8.212698,-5.1397 -13.176238,-5.2462 z"
+         id="path7147-38-9-7" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.96289933;marker:none;enable-background:accumulate"
+         d="m 41.2474,997.45322 0,3.26278 c 6.010142,0.1127 11.53244,2.4234 16.015945,6.206 l 2.214971,-2.1114 c -5.057675,-4.4685 -11.351389,-7.24029 -18.230916,-7.35738 z"
+         id="path7149-4-2-8" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.79512143;marker:none;enable-background:accumulate"
+         d="m 41.2474,990.86337 0,3.1989 c 7.852038,0.12079 14.955899,3.34857 20.61627,8.57303 l 2.158177,-2.0473 C 57.822001,994.70389 49.947688,990.98723 41.2474,990.86337 Z"
+         id="path7151-4-6-4" />
+      <path
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         d="m 42.234218,1010.852 c -11.990815,0 -16.015945,9.5414 -16.015945,9.5414 l 0,1.1927 c 0,0 3.61345,10.4501 15.959151,10.4501 11.433609,0 15.164033,-10.3366 15.164033,-10.3366 l 0,-1.3062 c 0,0 -3.975932,-9.5414 -15.107239,-9.5414 z m -1.079088,1.5902 c 0.295878,-0.03 0.6049,0 0.908706,0 4.860889,0 8.80309,3.8854 8.80309,8.7463 0,4.8609 -3.942201,8.8031 -8.80309,8.8031 -4.860889,0 -8.80309,-3.9422 -8.80309,-8.8031 0,-4.5571 3.456216,-8.2956 7.894384,-8.7463 z"
+         id="path7254-4-8-5" />
+      <circle
+         r="4.5126262"
+         cy="1021.444"
+         cx="42.048923"
+         style="fill:#030000;fill-opacity:1;stroke:none"
+         id="path7259-4-9-0" />
+      <g
+         id="layer1-3"
+         transform="matrix(0.52500254,0,0,0.52500254,1.0103223,1002.7659)">
+        <g
+           style="display:inline"
+           id="g3219"
+           transform="matrix(1.5756397,0,0,1.6644338,54.170963,-1788.6456)">
+          <g
+             id="g3488"
+             transform="matrix(0.63466286,0,0,0.60080491,-55.333181,1055.0231)">
+            <path
+               id="path3506"
+               d="m 60.353163,39.726048 -3.12794,10.182437 -5.191046,17.037284 -0.199657,-0.399311 -0.598967,-2.262764 -12.511754,0 0,6.655188 7.720019,0 2.528972,7.720019 3.127938,9.783127 3.127939,-9.982783 5.191046,-16.637971 5.191049,16.637971 2.728627,8.917954 3.52725,-8.518642 3.926561,-9.783127 0.865176,1.863452 15.373485,0 0,-6.655188 -11.247268,0 -2.528973,-4.991392 -3.327593,-6.455534 -2.728629,6.854847 -3.127938,7.919673 -5.590359,-17.702803 -3.127938,-10.182437 z" />
+          </g>
+        </g>
       </g>
     </g>
   </g>
diff --git a/companion/src/images/simulator/icons/svg/trainer-active.svg b/companion/src/images/simulator/icons/svg/trainer-active.svg
new file mode 100644
index 000000000..4c97159c7
--- /dev/null
+++ b/companion/src/images/simulator/icons/svg/trainer-active.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="64"
+   height="64"
+   viewBox="0 0 64.000001 64.000001"
+   id="svg5332"
+   version="1.1">
+  <defs
+     id="defs5334" />
+  <metadata
+     id="metadata5337">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     id="path3387"
+     d="M 42.798828 14.162109 C 32.851229 14.162105 24.787105 22.226229 24.787109 32.173828 C 24.787105 42.121427 32.851229 50.185551 42.798828 50.185547 C 43.72275 50.178247 44.644742 50.099917 45.556641 49.951172 C 53.316083 49.894362 60.862923 40.817052 60.802734 32.380859 C 60.805734 32.314469 60.808347 32.248061 60.810547 32.181641 C 60.810551 22.234042 52.746427 14.169918 42.798828 14.169922 L 42.798828 14.162109 z M 41.515625 16.871094 L 44.316406 16.871094 L 44.316406 24.103516 L 41.515625 24.103516 L 41.515625 16.871094 z M 51.144531 18.185547 A 10.278627 7.6807337 76.219691 0 1 59.521484 26.503906 A 10.278627 7.6807337 76.219691 0 1 54.509766 38.316406 A 10.278627 7.6807337 76.219691 0 1 49.972656 37.654297 L 39.304688 34.398438 L 44.941406 22.880859 A 10.278627 7.6807337 76.219691 0 1 45.666016 21.402344 L 46.085938 20.542969 L 46.21875 20.613281 A 10.278627 7.6807337 76.219691 0 1 49.613281 18.349609 A 10.278627 7.6807337 76.219691 0 1 51.144531 18.185547 z M 44.427734 29.320312 L 42.863281 32.585938 L 46.037109 33.720703 A 10.278627 7.6807337 76.219691 0 1 44.603516 30.162109 A 10.278627 7.6807337 76.219691 0 1 44.427734 29.320312 z M 27.402344 30.167969 L 35.333984 30.167969 L 35.333984 32.966797 L 27.402344 32.966797 L 27.402344 30.167969 z M 41.697266 38.714844 L 44.810547 38.714844 L 44.810547 46.302734 L 41.697266 46.302734 L 41.697266 39.865234 L 41.697266 38.714844 z "
+     style="fill:#060000;fill-opacity:1;stroke:none;stroke-width:2.74752069;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <path
+     id="path3506-4"
+     d="m 13.384792,17.01835 -1.642176,5.345805 -2.7253124,8.944618 -0.1048205,-0.20964 -0.3144591,-1.187956 -6.5687027,0 0,3.49399 4.0530296,0 1.3277167,4.05303 1.6421754,5.136166 1.642176,-5.240986 2.725312,-8.734977 2.725314,8.734977 1.432536,4.681948 1.851816,-4.472308 2.061454,-5.136167 0.45422,0.978317 3.386698,0 0,-3.49399 -1.220424,0 -1.327717,-2.620494 -1.746995,-3.389172 -1.432537,3.598812 -1.642176,4.157849 -2.934952,-9.294017 z" />
+  <path
+     id="path7511-3-8-6-2-5-2-6"
+     d="M 32 1 C 14.90499 1 1 14.90499 1 32 C 1 49.09501 14.90499 63 32 63 C 49.09501 63 63 49.09501 63 32 C 63 14.90499 49.09501 1 32 1 z M 32 5.359375 C 42.528499 5.359375 51.604627 11.435277 55.933594 20.277344 A 10.278627 7.6807337 76.219691 0 1 59.521484 26.503906 A 10.278627 7.6807337 76.219691 0 1 58.429688 35.314453 C 56.802243 48.481755 45.615547 58.640625 32 58.640625 C 17.260971 58.640625 5.359375 46.739029 5.359375 32 C 5.359375 17.260971 17.260971 5.359375 32 5.359375 z "
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.359375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <ellipse
+     style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:2.005;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="ellipse3393"
+     cx="44.019794"
+     cy="39.866295"
+     rx="5.3665624"
+     ry="7.1817222"
+     transform="matrix(0.9712162,-0.2381997,0.2381997,0.9712162,0,0)" />
+</svg>
diff --git a/companion/src/images/simulator/icons/svg/trainer.svg b/companion/src/images/simulator/icons/svg/trainer.svg
index 3bb8e4d70..e0990b293 100644
--- a/companion/src/images/simulator/icons/svg/trainer.svg
+++ b/companion/src/images/simulator/icons/svg/trainer.svg
@@ -1,35 +1,57 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64" id="svg3254">
-  <defs id="defs3256" />
-  <metadata id="metadata3259">
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg5332"
+   viewBox="0 0 64.000001 64.000001"
+   height="64"
+   width="64">
+  <defs
+     id="defs5334" />
+  <metadata
+     id="metadata5337">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1">
-    <g transform="matrix(1.5756397,0,0,1.6644338,54.170963,-1788.6456)" id="g3219" style="display:inline">
-      <rect width="35.110096" height="17.12899" ry="5.0985756" x="-31.308317" y="1079.7126" id="rect3980-2-6" style="fill:#757575;fill-opacity:1;stroke:none" />
-      <rect width="35.110096" height="17.008244" ry="5.062634" x="-31.51074" y="1079.5045" id="rect3980-9" style="fill:none;stroke:#000100;stroke-width:1.23500371;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <g transform="translate(-50.80414,53.000428)" id="g4236-1">
-        <path d="m -4.4642859,77.678574 a 4.2857141,4.2857141 0 1 1 -8.5714281,0 4.2857141,4.2857141 0 1 1 8.5714281,0 z" transform="matrix(1.13953,0,0,1.13953,39.306585,945.21999)" id="path3984-8-3" style="fill:#0c0000;fill-opacity:1;stroke:#000100;stroke-width:0.54189169;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-        <path d="m 30.368507,1028.4151 -2.629324,6.5608 6.79834,-2.7712 z" id="path4007-7" style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        <path d="m 34.753087,1030.3543 c 0,1.2916 -1.047136,2.3385 -2.338841,2.3385 -1.291706,0 -2.338842,-1.0469 -2.338842,-2.3385 0,-1.2916 1.047136,-2.3386 2.338842,-2.3386 1.291705,0 2.338841,1.047 2.338841,2.3386 z" id="path4004-0" style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.61750185;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <g
+     transform="translate(0,-988.36216)"
+     id="layer1">
+    <path
+       id="path7511-3-8-6-2-5-2-6-1"
+       transform="translate(0,988.36216)"
+       d="M 32 1 C 14.90499 1 1 14.905 1 32 C 1 49.095 14.90499 63 32 63 C 41.554811 63 50.109963 58.652738 55.800781 51.835938 C 53.64343 52.811837 51.321081 53.053034 49.1875 52.365234 C 44.551325 56.279434 38.558237 58.640625 32 58.640625 C 17.260971 58.640625 5.359375 46.7391 5.359375 32 C 5.359375 17.261 17.260971 5.359375 32 5.359375 C 46.383112 5.359375 58.057523 16.6933 58.613281 30.9375 C 58.875394 31.0533 59.136806 31.175766 59.390625 31.322266 C 60.982864 32.241566 62.123278 33.627419 62.828125 35.261719 C 62.940829 34.189019 63 33.102 63 32 C 63 14.905 49.095009 1 32 1 z M 58.572266 33.816406 C 58.516873 34.642129 58.421478 35.45668 58.292969 36.259766 A 5.0874057 6.9803934 30.000001 0 1 58.042969 43.796875 A 5.0874057 6.9803934 30.000001 0 1 53.585938 47.583984 C 52.924545 48.499415 52.225196 49.386368 51.455078 50.208984 C 54.324858 50.325384 57.601891 48.471078 59.595703 45.017578 C 62.094522 40.689578 61.412466 35.874006 58.572266 33.816406 z "
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.359375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    <path
+       id="path8516-6-6"
+       transform="translate(0,988.36216)"
+       d="M 42.798828 14.162109 A 18.011712 18.011712 0 0 0 24.787109 32.173828 A 18.011712 18.011712 0 0 0 42.798828 50.185547 A 18.011712 18.011712 0 0 0 45.556641 49.951172 C 44.264551 48.444072 43.536408 46.487534 43.386719 44.365234 L 38.242188 28.537109 L 39.082031 28.263672 L 39.210938 27.484375 L 40.714844 27.732422 L 40.726562 27.732422 L 40.728516 27.742188 L 56.396484 30.328125 C 57.431436 30.462625 58.443509 30.783178 59.390625 31.330078 C 59.911742 31.630878 60.376252 31.988659 60.802734 32.380859 A 18.011712 18.011712 0 0 0 60.810547 32.181641 A 18.011712 18.011712 0 0 0 42.798828 14.169922 L 42.798828 14.162109 z M 41.515625 16.871094 L 44.316406 16.871094 L 44.316406 24.103516 L 41.515625 24.103516 L 41.515625 16.871094 z M 27.402344 30.167969 L 35.333984 30.167969 L 35.333984 32.966797 L 27.402344 32.966797 L 27.402344 30.167969 z M 41.638672 30.533203 L 44.292969 38.697266 C 44.553788 38.029466 44.863887 37.368263 45.234375 36.726562 C 46.421901 34.669764 48.044724 33.012872 49.859375 31.888672 L 41.638672 30.533203 z M 55.800781 32.193359 A 7.0300808 9.6459236 30.000001 0 0 47.421875 37.738281 A 7.0300808 9.6459236 30.000001 0 0 48.6875 49.607422 A 7.0300808 9.6459236 30.000001 0 0 59.599609 44.767578 A 7.0300808 9.6459236 30.000001 0 0 58.333984 32.900391 A 7.0300808 9.6459236 30.000001 0 0 55.800781 32.193359 z M 55.292969 34.697266 A 5.0874057 6.9803934 30.000001 0 1 57.126953 35.207031 A 5.0874057 6.9803934 30.000001 0 1 58.042969 43.796875 A 5.0874057 6.9803934 30.000001 0 1 50.146484 47.298828 A 5.0874057 6.9803934 30.000001 0 1 49.230469 38.708984 A 5.0874057 6.9803934 30.000001 0 1 55.292969 34.697266 z "
+       style="fill:#060000;fill-opacity:1;stroke:none;stroke-width:2.74752069;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <g
+       transform="matrix(0.52500254,0,0,0.52500254,-4.1333866,1001.6548)"
+       id="layer1-3-5">
+      <g
+         transform="matrix(1.5756397,0,0,1.6644338,54.170963,-1788.6456)"
+         id="g3219-4"
+         style="display:inline">
+        <g
+           transform="matrix(0.63466286,0,0,0.60080491,-55.333181,1055.0231)"
+           id="g3488-7">
+          <path
+             d="m 66.38199,39.726048 -3.12794,10.182437 -5.191046,17.037284 -0.199657,-0.399311 -0.598967,-2.262764 -12.511754,0 0,6.655188 7.720019,0 2.528972,7.720019 3.127938,9.783127 3.127939,-9.982783 5.191046,-16.637971 5.191049,16.637971 2.728627,8.917954 3.52725,-8.518642 3.926561,-9.783127 0.865176,1.863452 6.450822,0 0,-6.655188 -2.324605,0 -2.528973,-4.991392 -3.327593,-6.455534 -2.728629,6.854847 -3.127938,7.919673 -5.590359,-17.702803 z"
+             id="path3506-4" />
+        </g>
       </g>
-      <g transform="translate(-35.406682,53.115808)" id="g4236-8-9">
-        <path d="m -4.4642859,77.678574 a 4.2857141,4.2857141 0 1 1 -8.5714281,0 4.2857141,4.2857141 0 1 1 8.5714281,0 z" transform="matrix(1.13953,0,0,1.13953,39.306585,945.21999)" id="path3984-8-7-6" style="fill:#0c0000;fill-opacity:1;stroke:#000100;stroke-width:0.54189169;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-        <path d="m 30.368507,1028.4151 -2.629324,6.5608 6.79834,-2.7712 z" id="path4007-0-6" style="fill:#ffffff;fill-opacity:1;stroke:none" />
-        <path d="m 34.753087,1030.3543 c 0,1.2916 -1.047136,2.3385 -2.338841,2.3385 -1.291706,0 -2.338842,-1.0469 -2.338842,-2.3385 0,-1.2916 1.047136,-2.3386 2.338842,-2.3386 1.291705,0 2.338841,1.047 2.338841,2.3386 z" id="path4004-6-2" style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.61750185;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      </g>
-    </g>
-    <g transform="matrix(1,0,0,-1,-92.41515,1131.1661)" id="g3138" style="display:inline">
-      <path d="m 144.85461,1081.6667 -4.46467,0 -3.88859,-3.8125 -3.85772,3.7822 -4.51611,0 8.43041,-8.2653 z" id="path3956-37" style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path d="m 145.06641,1091.87 -4.46467,0 -3.88858,-3.8125 -3.85772,3.7822 -4.51611,0 8.43041,-8.2653 z" id="path3956-3-0" style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
   </g>
 </svg>
diff --git a/companion/src/images/simulator/icons/svg/word_wrap-active.svg b/companion/src/images/simulator/icons/svg/word_wrap-active.svg
deleted file mode 100644
index 4a5fffbe2..000000000
--- a/companion/src/images/simulator/icons/svg/word_wrap-active.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.2" width="64" height="64" viewBox="0 0 64 64" id="svg3254" xml:space="preserve"><metadata id="metadata9"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs id="defs7" />
-
-<g id="layer1">
-	<g transform="matrix(1.2799322,0,0,1.3520619,50.823596,-1446.5167)" id="g3219">
-		<path d="m -31.496,1077.031 v 4.123 H 3.353 v -4.123 h -34.849 z m 0,8.247 v 4.124 h 21.78 v -4.124 h -21.78 z m 0,12.371 v 4.124 H 3.353 v -4.124 h -34.849 z m 0,8.247 v 4.124 h 26.137 v -4.124 h -26.137 z" id="path3386" style="fill:#041eb5" />
-	</g>
-</g>
-</svg>
\ No newline at end of file
diff --git a/companion/src/images/simulator/icons/svg/word_wrap-on.svg b/companion/src/images/simulator/icons/svg/word_wrap-on.svg
new file mode 100644
index 000000000..2010c5714
--- /dev/null
+++ b/companion/src/images/simulator/icons/svg/word_wrap-on.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="64"
+   height="64"
+   id="svg3254"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="word_wrap-active.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1215"
+     inkscape:window-height="1000"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="3.6875"
+     inkscape:cx="55.878768"
+     inkscape:cy="27.766927"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3254" />
+  <defs
+     id="defs3256" />
+  <metadata
+     id="metadata3259">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="fill:#000000;fill-opacity:1"
+     d="m 6.6852387,56.408075 0,-2.638845 9.3616333,0 9.361634,0 0,2.638845 0,2.638852 -9.361634,0 -9.3616333,0 0,-2.638852 z"
+     id="path3361"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#000000;fill-opacity:1"
+     d="m 34.707354,53.329462 -4.962398,-4.963595 4.962398,-4.963589 4.962399,-4.96359 1.884348,1.884348 1.884348,1.884348 -1.756452,1.75982 -1.756447,1.759815 3.593877,0 c 3.906893,0 4.54727,-0.06969 5.731269,-0.623753 2.01929,-0.944942 3.318869,-3.399692 2.939637,-5.552633 C 51.782312,37.234272 50.06821,35.480689 47.789619,35.048564 47.347178,34.964654 40.123145,34.9203 26.89927,34.9203 l -20.2140313,0 0,-2.640988 0,-2.640987 21.1422163,0.03354 21.14221,0.03354 1.06811,0.356534 c 4.601585,1.536009 7.539568,5.534734 7.539568,10.261697 0,2.947286 -1.040609,5.452602 -3.134532,7.546525 -1.135085,1.135081 -2.237448,1.873897 -3.557775,2.384457 -1.775584,0.686604 -2.355578,0.750076 -6.854035,0.750076 l -4.105451,0 1.756447,1.759815 1.756452,1.75982 -1.884348,1.884346 -1.884348,1.884348 -4.962399,-4.963588 z"
+     id="path3359"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#000000;fill-opacity:1"
+     d="m 6.6852387,44.350575 0,-2.638852 9.3616333,0 9.361634,0 0,2.638852 0,2.638847 -9.361634,0 -9.3616333,0 0,-2.638847 z"
+     id="path3355"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#000000;fill-opacity:1"
+     d="m 6.6852387,20.02057 0,-2.638846 25.4460523,0 25.446052,0 0,2.638846 0,2.638853 -25.446052,0 -25.4460523,0 0,-2.638853 z"
+     id="path3353"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#000000;fill-opacity:1"
+     d="m 6.6852387,8.1548255 0,-2.638852 25.4460523,0 25.446052,0 0,2.638852 0,2.6388475 -25.446052,0 -25.4460523,0 0,-2.6388475 z"
+     id="path3347"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/companion/src/images/simulator/icons/svg/word_wrap.svg b/companion/src/images/simulator/icons/svg/word_wrap.svg
index a6abd2061..986080934 100644
--- a/companion/src/images/simulator/icons/svg/word_wrap.svg
+++ b/companion/src/images/simulator/icons/svg/word_wrap.svg
@@ -1,20 +1,77 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64" id="svg3254">
-  <defs id="defs3256" />
-  <metadata id="metadata3259">
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="64"
+   height="64"
+   id="svg3254"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="word_wrap.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1215"
+     inkscape:window-height="1000"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="2.6074563"
+     inkscape:cx="94.851293"
+     inkscape:cy="-2.6463556"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3254" />
+  <defs
+     id="defs3256" />
+  <metadata
+     id="metadata3259">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1">
-    <g transform="matrix(1.2799322,0,0,1.3520619,50.823596,-1446.5167)" id="g3219" style="display:inline">
-      <path d="m -31.495574,1077.0304 0,4.1237 34.8489745,0 0,-4.1237 z m 0,8.2474 0,4.1237 21.7806103,0 0,-4.1237 z m 0,12.3711 0,4.1237 34.8489745,0 0,-4.1237 z m 0,8.2474 0,4.1237 26.1367347,0 0,-4.1237 z" id="path3386" />
-    </g>
-  </g>
+  <path
+     style="fill:#000000;fill-opacity:1"
+     d="m 6.6852387,56.408075 0,-2.638845 9.3616333,0 9.361634,0 0,2.638845 0,2.638852 -9.361634,0 -9.3616333,0 0,-2.638852 z"
+     id="path3361"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#000000;fill-opacity:1"
+     d="m 6.6852387,44.350575 0,-2.638852 9.3616333,0 9.361634,0 0,2.638852 0,2.638847 -9.361634,0 -9.3616333,0 0,-2.638847 z"
+     id="path3355"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#000000;fill-opacity:1"
+     d="m 6.6852387,20.02057 0,-2.638846 25.4460523,0 25.446052,0 0,2.638846 0,2.638853 -25.446052,0 -25.4460523,0 0,-2.638853 z"
+     id="path3353"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#000000;fill-opacity:1"
+     d="m 6.6852387,8.1548255 0,-2.638852 25.4460523,0 25.446052,0 0,2.638852 0,2.6388475 -25.446052,0 -25.4460523,0 0,-2.6388475 z"
+     id="path3347"
+     inkscape:connector-curvature="0" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path4201"
+     d="m 6.6852387,31.681587 0,-2.638846 25.4460523,0 25.446052,0 0,2.638846 0,2.638853 -25.446052,0 -25.4460523,0 0,-2.638853 z"
+     style="fill:#000000;fill-opacity:1" />
 </svg>