diff --git a/src/gui/res/Barrier.qrc b/src/gui/res/Barrier.qrc
index 39da79e6..ee6127d0 100644
--- a/src/gui/res/Barrier.qrc
+++ b/src/gui/res/Barrier.qrc
@@ -54,5 +54,8 @@
         <file>image/spinning-wheel.gif</file>
         <file>icons/16x16/padlock.png</file>
         <file>icons/16x16/barrier-transfering.png</file>
+        <file>icons/32x32/barrier-connected-mask.png</file>
+        <file>icons/32x32/barrier-disconnected-mask.png</file>
+        <file>icons/32x32/barrier-transfering-mask.png</file>
     </qresource>
 </RCC>
diff --git a/src/gui/res/icons/32x32/barrier-connected-mask.png b/src/gui/res/icons/32x32/barrier-connected-mask.png
new file mode 100644
index 00000000..7e17314e
Binary files /dev/null and b/src/gui/res/icons/32x32/barrier-connected-mask.png differ
diff --git a/src/gui/res/icons/32x32/barrier-connected-mask.svg b/src/gui/res/icons/32x32/barrier-connected-mask.svg
new file mode 100644
index 00000000..e710bff2
--- /dev/null
+++ b/src/gui/res/icons/32x32/barrier-connected-mask.svg
@@ -0,0 +1,114 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="6.1439996"
+   inkscape:export-xdpi="6.1439996"
+   inkscape:export-filename="/Users/daniel/Documents/Projects/barrier/src/gui/res/icons/16x16/barrier-connected2.png"
+   inkscape:version="1.0beta1 (32d4812, 2019-09-19)"
+   sodipodi:docname="barrier-connected.svg"
+   xml:space="preserve"
+   style="enable-background:new 0 0 500 500;"
+   viewBox="0 0 500 500"
+   y="0px"
+   x="0px"
+   id="Layer_1"
+   version="1.1">
+  <metadata
+   id="metadata3769">
+    <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 />
+
+
+      </cc:Work>
+
+
+    </rdf:RDF>
+
+
+  </metadata>
+
+
+  <defs
+   id="defs3767" />
+
+
+  <sodipodi:namedview
+   inkscape:document-rotation="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:window-maximized="0"
+   inkscape:window-y="23"
+   inkscape:window-x="0"
+   inkscape:cy="560"
+   inkscape:cx="400"
+   inkscape:zoom="0.35"
+   showgrid="false"
+   id="namedview3765"
+   inkscape:window-height="1035"
+   inkscape:window-width="1600"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0"
+   guidetolerance="10"
+   gridtolerance="10"
+   objecttolerance="10"
+   borderopacity="1"
+   bordercolor="#666666"
+   pagecolor="#ffffff" />
+
+
+  <style
+   id="style3754"
+   type="text/css">
+	.st0{fill:#3F96B9;}
+	.st1{fill:#5D7DBD;}
+	.st2{fill:#196260;}
+	.st3{fill:#97C33D;}
+</style>
+
+
+  <path
+   id="path3758"
+   style="fill:#000000;fill-opacity:1;stroke-width:113.38582677;stroke-miterlimit:4;stroke-dasharray:none"
+   d="M 208.92773 63.982422 C 205.33457 63.989839 201.75572 64.077891 198.19531 64.248047 C 166.11331 65.781284 155.9386 96.232598 158.8418 110.98047 C 162.3116 128.60661 175.6547 145.03532 201.17188 144.74805 C 234.8387 144.36902 274.55668 155.22284 308.83984 174.3418 C 328.46906 152.78912 352.20206 134.77401 379.11719 121.6543 C 329.91472 85.187932 267.50995 63.861491 208.92773 63.982422 z M 461.23047 229.19336 C 461.14679 229.22471 461.06407 229.25756 460.98047 229.28906 A 165 165 0 0 1 461.35742 229.58789 C 461.31331 229.4571 461.27486 229.32404 461.23047 229.19336 z " />
+
+
+  <path
+   id="path3762"
+   style="fill:#000000;fill-opacity:1;stroke-width:113.38582677;stroke-miterlimit:4;stroke-dasharray:none"
+   d="m 163.16016,154.06445 c 0.24078,23.52501 -4.88694,46.19659 -14.44141,66.57422 20.25274,20.32232 46.9064,33.15132 76.96484,39.47071 11.24207,-26.49781 16.13886,-54.62798 14.70508,-87.98243 -10.98012,-2.4768 -21.58009,-4.43174 -36.08789,-4.99414 -16.13136,0.32407 -29.99886,-1.41943 -41.14062,-13.06836 z M 54.447266,301.49609 c -4.440357,1.30022 -8.977109,2.42138 -13.613282,3.33399 -1.13569,0.22849 -2.312497,0.36038 -3.466796,0.58789 -20.324201,5.37891 -33.2705698,25.89072 -29.1308599,47.01172 4.0713009,20.60749 22.9741349,34.58694 43.2402339,32.74804 1.667491,-0.2832 3.315378,-0.55083 4.992188,-0.85351 29.823413,-5.86765 53.8902,-14.8631 77.54297,-27.68555 -31.66639,-12.35179 -56.65893,-31.70018 -79.564454,-55.14258 z"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="cccccccccccccc" />
+
+
+  <path
+   id="path3756"
+   style="fill:#000000;fill-opacity:1;stroke-width:113.38582677;stroke-miterlimit:4;stroke-dasharray:none"
+   d="M 48.044922 83.142578 C 28.954084 83.503095 9.2123555 97.093877 8.0878906 117.92188 C 2.0242998 230.23527 80.84571 332.7332 194.02148 356.32031 A 165 165 0 0 1 215.30273 277.91016 C 214.29378 277.73837 213.28878 277.55747 212.28906 277.36719 C 139.33013 263.00789 88.885816 198.64775 88.947266 126.89844 C 88.96652 104.41725 77.647355 86.548954 53.927734 83.460938 C 51.988078 83.208417 50.019836 83.105283 48.044922 83.142578 z " />
+
+
+  <path
+   id="path3760"
+   style="fill:#000000;fill-opacity:1;stroke-width:113.38582677;stroke-miterlimit:4;stroke-dasharray:none"
+   d="M 458.02539 122.87695 C 456.77519 122.86833 455.51624 122.91912 454.25195 123.03125 C 453.03915 123.25585 451.82615 123.4009 450.62305 123.63281 C 398.11964 133.95371 353.1195 161.21828 320.23438 198.61914 A 165 165 0 0 1 359 194 A 165 165 0 0 1 435.7168 212.91797 C 445.35833 208.56785 455.56561 205.24658 466.25977 203.14258 C 466.87406 203.01858 467.49027 202.95126 468.13477 202.84375 C 488.52347 197.50195 501.51813 176.94243 497.36133 155.76172 C 493.57843 136.46881 476.77846 123.00624 458.02539 122.87695 z " />
+
+
+<path
+   id="circle2502"
+   style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:113.386;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.332155"
+   d="M 359 230.66602 A 128.33333 128.33333 0 0 0 230.66602 359 A 128.33333 128.33333 0 0 0 359 487.33398 A 128.33333 128.33333 0 0 0 487.33398 359 A 128.33333 128.33333 0 0 0 359 230.66602 z M 424.85547 296.02734 A 18.89765 18.89765 0 0 1 437.22852 300.73438 A 18.89765 18.89765 0 0 1 438.93945 327.40625 L 351.25977 427.10742 A 18.89954 18.89954 0 0 1 325.02734 429.19336 L 271.99414 385.35352 A 18.89765 18.89765 0 0 1 269.4707 358.74609 A 18.89765 18.89765 0 0 1 296.07617 356.22266 L 334.98242 388.38477 L 410.55859 302.44531 A 18.89765 18.89765 0 0 1 424.49023 296.0293 A 18.89765 18.89765 0 0 1 424.85547 296.02734 z " />
+
+</svg>
diff --git a/src/gui/res/icons/32x32/barrier-disconnected-mask.png b/src/gui/res/icons/32x32/barrier-disconnected-mask.png
new file mode 100644
index 00000000..bedfa75d
Binary files /dev/null and b/src/gui/res/icons/32x32/barrier-disconnected-mask.png differ
diff --git a/src/gui/res/icons/32x32/barrier-disconnected-mask.svg b/src/gui/res/icons/32x32/barrier-disconnected-mask.svg
new file mode 100644
index 00000000..aae4aea0
--- /dev/null
+++ b/src/gui/res/icons/32x32/barrier-disconnected-mask.svg
@@ -0,0 +1,102 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 500 500"
+   style="enable-background:new 0 0 500 500;"
+   xml:space="preserve"
+   sodipodi:docname="barrier-foo.svg"
+   inkscape:version="1.0beta1 (32d4812, 2019-09-19)"
+   inkscape:export-filename="/home/ian/src/barrier.git/res/barrier.png"
+   inkscape:export-xdpi="49.150002"
+   inkscape:export-ydpi="49.150002">
+  <metadata
+   id="metadata3769">
+    <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 />
+
+      </cc:Work>
+
+    </rdf:RDF>
+
+  </metadata>
+
+  <defs
+   id="defs3767" />
+
+  <sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1035"
+   id="namedview3765"
+   showgrid="false"
+   inkscape:zoom="0.35355339"
+   inkscape:cx="-672.59049"
+   inkscape:cy="-25.818972"
+   inkscape:window-x="0"
+   inkscape:window-y="23"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+
+  <style
+   type="text/css"
+   id="style3754">
+	.st0{fill:#3F96B9;}
+	.st1{fill:#5D7DBD;}
+	.st2{fill:#196260;}
+	.st3{fill:#97C33D;}
+</style>
+
+  <path
+   d="M 208.92773 63.982422 C 205.33457 63.989839 201.75572 64.077891 198.19531 64.248047 C 166.11331 65.781284 155.9386 96.232599 158.8418 110.98047 C 162.3116 128.60661 175.6547 145.03532 201.17188 144.74805 C 234.8387 144.36902 274.55668 155.22284 308.83984 174.3418 C 328.46906 152.78912 352.20206 134.77401 379.11719 121.6543 C 329.91472 85.187935 267.50995 63.861491 208.92773 63.982422 z M 461.23047 229.19336 C 433.75784 239.48583 410.4292 258.03313 393.10547 281.19727 C 401.63731 295.34291 418.53512 303.36814 435.80859 299.96289 C 455.53659 296.07959 469.1128 278.63474 468.6582 259.35742 C 468.2597 257.10893 467.93894 254.85983 467.49414 252.58203 C 465.92526 244.60302 463.81575 236.80429 461.23047 229.19336 z "
+   style="fill:#000000;fill-opacity:1"
+   id="path3758" />
+
+  <path
+   sodipodi:nodetypes="cccccccccccccc"
+   inkscape:connector-curvature="0"
+   d="m 163.16016,154.06445 c 0.24078,23.52501 -4.88694,46.19659 -14.44141,66.57422 20.25274,20.32232 46.9064,33.15132 76.96484,39.47071 11.24207,-26.49781 16.13886,-54.62798 14.70508,-87.98243 -10.98012,-2.4768 -21.58009,-4.43174 -36.08789,-4.99414 -16.13136,0.32407 -29.99886,-1.41943 -41.14062,-13.06836 z M 54.447266,301.49609 c -4.440357,1.30022 -8.977109,2.42138 -13.613282,3.33399 -1.13569,0.22849 -2.312497,0.36038 -3.466796,0.58789 -20.324201,5.37891 -33.2705698,25.89072 -29.1308599,47.01172 4.0713009,20.60749 22.9741349,34.58694 43.2402339,32.74804 1.667491,-0.2832 3.315378,-0.55083 4.992188,-0.85351 29.823413,-5.86765 53.8902,-14.8631 77.54297,-27.68555 -31.66639,-12.35179 -56.65893,-31.70018 -79.564454,-55.14258 z"
+   style="fill:#000000;fill-opacity:1"
+   id="path3762" />
+
+  <path
+   class="st0"
+   d="m 196.90869,356.69147 c 21.74407,4.28031 42.98725,-10.13468 47.31436,-32.13466 3.97759,-20.209 -7.7089,-39.89847 -26.5175,-46.26266 -1.8194,-0.26571 -3.62598,-0.5869 -5.41698,-0.92779 C 139.32964,263.00706 88.885416,198.6481 88.946866,126.89879 88.96612,104.4176 77.646542,86.549919 53.926921,83.461903 33.237257,80.768352 9.328315,94.939572 8.0875262,117.92219 1.9767374,231.10981 82.070866,334.34191 196.66358,356.87018 c 0.0467,0.0186 0.13284,0.0186 0.207,0.0186 z"
+   id="path3756"
+   inkscape:connector-curvature="0"
+   style="fill:#000000;fill-opacity:1;stroke-width:0.999999"
+   sodipodi:nodetypes="ccccsssccc" />
+
+  <path
+   class="st2"
+   d="m 454.25179,123.03077 c 20.22858,-1.794 39.0743,12.1518 43.10939,32.7309 4.1568,21.18071 -8.8369,41.7407 -29.2256,47.0825 -0.6445,0.10751 -1.26071,0.1739 -1.875,0.2979 -73.01749,14.3657 -123.57474,85.14129 -123.3252,156.96256 0.0568,16.34024 -13.64233,39.82782 -39.26405,39.84442 -27.53579,0.0179 -40.84582,-21.96106 -41.53764,-36.13118 -5.55175,-113.71384 73.49121,-217.57908 188.4902,-240.18509 1.2031,-0.23191 2.4151,-0.37741 3.6279,-0.60201"
+   id="path3760"
+   inkscape:connector-curvature="0"
+   style="fill:#000000;fill-opacity:1"
+   sodipodi:nodetypes="ccccssscc" />
+
+</svg>
diff --git a/src/gui/res/icons/32x32/barrier-transfering-mask.png b/src/gui/res/icons/32x32/barrier-transfering-mask.png
new file mode 100644
index 00000000..90b69d12
Binary files /dev/null and b/src/gui/res/icons/32x32/barrier-transfering-mask.png differ
diff --git a/src/gui/res/icons/32x32/barrier-transfering-mask.svg b/src/gui/res/icons/32x32/barrier-transfering-mask.svg
new file mode 100644
index 00000000..ef7126a6
--- /dev/null
+++ b/src/gui/res/icons/32x32/barrier-transfering-mask.svg
@@ -0,0 +1,148 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="6.1440001"
+   inkscape:export-xdpi="6.1440001"
+   inkscape:export-filename="/Users/daniel/Documents/Projects/barrier/src/gui/res/icons/16x16/barrier-transfering2.png"
+   inkscape:version="1.0beta1 (32d4812, 2019-09-19)"
+   sodipodi:docname="barrier-transferring.svg"
+   xml:space="preserve"
+   style="enable-background:new 0 0 500 500;"
+   viewBox="0 0 500 500"
+   y="0px"
+   x="0px"
+   id="Layer_1"
+   version="1.1">
+  <metadata
+   id="metadata3769">
+    <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="defs3767">
+  <inkscape:path-effect
+     effect="fillet_chamfer"
+     id="path-effect874"
+     is_visible="true"
+     satellites_param="F,0,0,1,0,10,0,1 @ F,0,0,1,0,10,0,1 @ F,0,0,1,0,22.763694,0,1 @ F,0,0,1,0,4.6597885e-05,0,1 @ F,0,0,1,0,10.886678,0,1 @ F,0,0,1,0,4.6584863e-05,0,1 @ F,0,0,1,0,22.763694,0,1 @ F,0,0,1,0,10,0,1 @ F,0,0,1,0,10,0,1"
+     unit="px"
+     method="auto"
+     mode="F"
+     radius="10"
+     chamfer_steps="1"
+     flexible="false"
+     use_knot_distance="false"
+     apply_no_radius="true"
+     apply_with_radius="true"
+     only_selected="false"
+     hide_knots="false" />
+  <inkscape:path-effect
+     hide_knots="false"
+     only_selected="false"
+     apply_with_radius="true"
+     apply_no_radius="true"
+     use_knot_distance="false"
+     flexible="false"
+     chamfer_steps="1"
+     radius="10"
+     mode="F"
+     method="auto"
+     unit="px"
+     satellites_param="F,0,0,1,0,10,0,1 @ F,0,0,1,0,10,0,1 @ F,0,0,1,0,22.763694,0,1 @ F,0,0,1,0,4.6597885e-05,0,1 @ F,0,0,1,0,10.886678,0,1 @ F,0,0,1,0,4.6584863e-05,0,1 @ F,0,0,1,0,22.763694,0,1 @ F,0,0,1,0,10,0,1 @ F,0,0,1,0,10,0,1"
+     is_visible="true"
+     id="path-effect870"
+     effect="fillet_chamfer" />
+</defs>
+
+
+  <sodipodi:namedview
+   inkscape:document-rotation="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:window-maximized="0"
+   inkscape:window-y="23"
+   inkscape:window-x="0"
+   inkscape:cy="235.51537"
+   inkscape:cx="-886.92239"
+   inkscape:zoom="0.24748737"
+   showgrid="false"
+   id="namedview3765"
+   inkscape:window-height="1035"
+   inkscape:window-width="1600"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0"
+   guidetolerance="10"
+   gridtolerance="10"
+   objecttolerance="10"
+   borderopacity="1"
+   bordercolor="#666666"
+   pagecolor="#ffffff" />
+
+
+  <style
+   id="style3754"
+   type="text/css">
+	.st0{fill:#3F96B9;}
+	.st1{fill:#5D7DBD;}
+	.st2{fill:#196260;}
+	.st3{fill:#97C33D;}
+</style>
+
+
+  <path
+   d="M 359.27734 108.21094 L 359.27734 132.55664 C 365.67653 128.62358 372.29397 124.98025 379.11719 121.6543 C 372.71637 116.91034 366.08754 112.42856 359.27734 108.21094 z M 461.23047 229.19336 C 448.78642 233.85545 437.20343 240.2242 426.63281 247.93555 C 427.32332 248.09983 428.00806 248.28771 428.6875 248.49414 C 428.98032 248.58313 429.26812 248.68657 429.55859 248.7832 C 429.98853 248.92619 430.41747 249.07106 430.8418 249.23047 C 431.16859 249.35328 431.49129 249.48482 431.81445 249.61719 C 432.20554 249.77731 432.59315 249.94531 432.97852 250.11914 C 433.29471 250.26184 433.60982 250.40488 433.92188 250.55664 C 434.32764 250.75387 434.72672 250.96357 435.125 251.17578 C 435.39583 251.32017 435.67035 251.45625 435.9375 251.60742 C 436.57194 251.96623 437.19461 252.34423 437.80664 252.74023 C 438.02384 252.88085 438.23309 253.03257 438.44727 253.17773 C 438.87539 253.46776 439.29942 253.76249 439.71484 254.07031 C 439.94593 254.24162 440.17149 254.41902 440.39844 254.5957 C 440.78856 254.89927 441.17344 255.20827 441.55078 255.52734 C 441.77623 255.71807 442.00003 255.90935 442.2207 256.10547 C 442.60765 256.44921 442.98385 256.80415 443.35547 257.16406 C 443.53383 257.33689 443.71594 257.50518 443.89062 257.68164 C 444.42629 258.22248 444.94793 258.77577 445.44727 259.34961 C 445.52294 259.4366 445.59121 259.52946 445.66602 259.61719 C 446.08728 260.11107 446.49598 260.61625 446.88867 261.13281 C 447.04472 261.33814 447.1924 261.54902 447.34375 261.75781 C 447.6497 262.17974 447.94631 262.60731 448.23242 263.04297 C 448.38282 263.27201 448.53104 263.50166 448.67578 263.73438 C 448.95168 264.17788 449.21409 264.62952 449.46875 265.08594 C 449.5924 265.30759 449.72135 265.5254 449.83984 265.75 C 450.19652 266.42591 450.53561 267.11108 450.84375 267.8125 C 451.14496 268.49814 451.41239 269.19713 451.66406 269.90039 C 451.72111 270.05969 451.77749 270.21879 451.83203 270.37891 C 452.06677 271.06871 452.28446 271.76363 452.47266 272.4668 C 452.50323 272.58078 452.52728 272.69626 452.55664 272.81055 C 452.70936 273.40644 452.84304 274.00607 452.96289 274.60938 C 453.00574 274.82419 453.04917 275.0383 453.08789 275.25391 C 453.20598 275.91459 453.3092 276.57741 453.38867 277.24414 C 453.41929 277.4989 453.43981 277.75434 453.46484 278.00977 C 453.50973 278.47248 453.54565 278.93605 453.57227 279.40039 C 453.58861 279.68041 453.60744 279.95984 453.61719 280.24023 C 453.6375 280.8435 453.64092 281.4469 453.63086 282.05078 C 453.62483 282.4392 453.60835 282.8267 453.58984 283.21484 C 453.5759 283.50077 453.55778 283.78669 453.53711 284.07227 C 453.48422 284.81374 453.40655 285.55196 453.30859 286.28906 C 453.28314 286.47925 453.2628 286.6696 453.23438 286.85938 C 453.16302 287.33865 453.07854 287.81495 452.98828 288.29102 C 452.96879 288.39344 452.9481 288.4954 452.92773 288.59766 C 452.73735 289.55706 452.50869 290.5066 452.24219 291.44727 C 452.23431 291.47505 452.22865 291.50348 452.2207 291.53125 C 452.21827 291.53977 452.21533 291.54813 452.21289 291.55664 C 452.06962 292.05641 451.9165 292.55197 451.75195 293.04492 C 451.7485 293.05527 451.74565 293.06583 451.74219 293.07617 C 462.43797 285.39716 468.97586 272.8277 468.6582 259.35742 C 468.2597 257.10893 467.93894 254.85983 467.49414 252.58203 C 465.92526 244.60302 463.81575 236.80429 461.23047 229.19336 z "
+   style="fill:#000000;fill-opacity:1"
+   id="path3758" />
+
+
+  <path
+   d="M 53.083984 301.87891 C 49.07799 303.01375 44.998206 304.01037 40.833984 304.83008 C 39.698294 305.05857 38.521487 305.19046 37.367188 305.41797 C 17.042987 310.79688 4.0966182 331.30869 8.2363281 352.42969 C 12.307629 373.03718 31.210464 387.01663 51.476562 385.17773 C 53.144053 384.89453 54.79194 384.6269 56.46875 384.32422 C 77.389116 380.20821 95.473066 374.54685 112.57227 367.11133 L 55.820312 305.32617 C 54.82468 304.2425 53.920669 303.08325 53.083984 301.87891 z "
+   style="fill:#000000;fill-opacity:1"
+   id="path3762" />
+
+
+  <path
+   d="M 48.044922 83.142578 C 28.954084 83.503095 9.2123555 97.093877 8.0878906 117.92188 C 5.2049772 171.32089 21.516937 222.49852 51.578125 264.03711 C 57.777775 253.83012 69.446281 247.02325 81.429688 247.02344 L 81.433594 247.02344 L 141.15625 247.02344 L 141.15625 242.33984 C 108.58757 213.6735 88.90887 171.7289 88.947266 126.89844 C 88.96652 104.41725 77.647355 86.548954 53.927734 83.460938 C 51.988078 83.208417 50.019836 83.105283 48.044922 83.142578 z M 188.87695 270.79492 A 24.778213 24.778213 0 0 1 177.49414 283.36328 A 24.778213 24.778213 0 0 1 158.08789 296.44922 C 168.01464 296.16786 172.89889 294.01125 180.52148 286.38867 C 186.05078 280.85937 188.69577 276.76351 189.84375 271.14648 C 189.52112 271.03002 189.19843 270.91344 188.87695 270.79492 z "
+   style="fill:#000000;fill-opacity:1;stroke-width:0.999999"
+   id="path3756" />
+
+
+  <path
+   d="M 458.02539 122.87695 C 456.77519 122.86833 455.51624 122.91912 454.25195 123.03125 C 453.03915 123.25585 451.82615 123.4009 450.62305 123.63281 C 416.60828 130.31929 385.74205 144.11691 359.27734 163.17383 L 359.27734 247.02344 L 388.2207 247.02344 C 408.86762 225.17574 435.57914 209.17878 466.25977 203.14258 C 466.87406 203.01858 467.49027 202.95126 468.13477 202.84375 C 488.52347 197.50195 501.51813 176.94243 497.36133 155.76172 C 493.57843 136.46881 476.77846 123.00624 458.02539 122.87695 z M 309.85156 263.95508 C 309.90432 265.81634 310.02219 267.50059 310.23047 269.05859 C 310.50817 271.13593 310.94528 272.98927 311.59766 274.74023 C 311.76075 275.17798 311.93801 275.60832 312.12891 276.03516 C 312.12915 276.03571 312.12866 276.03656 312.12891 276.03711 C 312.51053 276.89024 312.94993 277.72623 313.45312 278.55859 C 313.95663 279.39147 314.52481 280.22199 315.16406 281.06445 C 315.80331 281.90692 316.51371 282.76013 317.30273 283.64258 C 317.30307 283.64296 317.3024 283.64415 317.30273 283.64453 C 318.09151 284.52666 318.95966 285.43622 319.91211 286.38867 C 320.93784 287.4144 321.90898 288.34218 322.84766 289.18164 C 322.848 289.18195 322.84926 289.18133 322.84961 289.18164 C 323.78828 290.0211 324.69232 290.77163 325.58398 291.44141 C 327.81313 293.11584 329.95672 294.28671 332.33008 295.08203 C 332.33066 295.08223 332.33145 295.08184 332.33203 295.08203 C 335.17961 296.036 338.3563 296.45178 342.40234 296.55078 C 343.07745 296.56732 343.77593 296.57422 344.50195 296.57422 L 344.50195 284.11719 A 24.778213 24.778213 0 0 1 344.28125 284.21289 A 24.778213 24.778213 0 0 1 344.11719 284.2832 A 24.778213 24.778213 0 0 1 344.01953 284.32227 A 24.778213 24.778213 0 0 1 343.77148 284.42383 A 24.778213 24.778213 0 0 1 343.73047 284.44141 A 24.778213 24.778213 0 0 1 343.50781 284.5293 A 24.778213 24.778213 0 0 1 343.33984 284.59375 A 24.778213 24.778213 0 0 1 342.98633 284.72656 A 24.778213 24.778213 0 0 1 342.94922 284.74023 A 24.778213 24.778213 0 0 1 342.72266 284.82031 A 24.778213 24.778213 0 0 1 342.41992 284.92383 A 24.778213 24.778213 0 0 1 342.15625 285.01172 A 24.778213 24.778213 0 0 1 341.83984 285.11133 A 24.778213 24.778213 0 0 1 341.54492 285.20117 A 24.778213 24.778213 0 0 1 341.52734 285.20703 A 24.778213 24.778213 0 0 1 341.51562 285.21094 A 24.778213 24.778213 0 0 1 341.125 285.32227 A 24.778213 24.778213 0 0 1 340.7207 285.43164 A 24.778213 24.778213 0 0 1 340.36719 285.51953 A 24.778213 24.778213 0 0 1 340.31445 285.5332 A 24.778213 24.778213 0 0 1 340.14062 285.57422 A 24.778213 24.778213 0 0 1 339.9082 285.62695 A 24.778213 24.778213 0 0 1 339.86328 285.63672 A 24.778213 24.778213 0 0 1 339.49805 285.71484 A 24.778213 24.778213 0 0 1 339.18555 285.77734 A 24.778213 24.778213 0 0 1 338.91211 285.82812 A 24.778213 24.778213 0 0 1 338.57422 285.88672 A 24.778213 24.778213 0 0 1 338.5 285.90039 A 24.778213 24.778213 0 0 1 338.26172 285.9375 A 24.778213 24.778213 0 0 1 338.25977 285.9375 A 24.778213 24.778213 0 0 1 337.92383 285.98633 A 24.778213 24.778213 0 0 1 337.84766 285.99805 A 24.778213 24.778213 0 0 1 337.66992 286.02148 A 24.778213 24.778213 0 0 1 337.58594 286.03125 A 24.778213 24.778213 0 0 1 337.25586 286.07031 A 24.778213 24.778213 0 0 1 336.83984 286.11328 A 24.778213 24.778213 0 0 1 336.59961 286.13477 A 24.778213 24.778213 0 0 1 336.58203 286.13672 A 24.778213 24.778213 0 0 1 336.27344 286.16016 A 24.778213 24.778213 0 0 1 335.91797 286.18359 A 24.778213 24.778213 0 0 1 335.61328 286.19922 A 24.778213 24.778213 0 0 1 335.58594 286.20117 A 24.778213 24.778213 0 0 1 335.55859 286.20117 A 24.778213 24.778213 0 0 1 335.16797 286.21484 A 24.778213 24.778213 0 0 1 334.78125 286.22266 A 24.778213 24.778213 0 0 1 334.75 286.22266 A 24.778213 24.778213 0 0 1 334.6875 286.22266 A 24.778213 24.778213 0 0 1 334.50977 286.22461 A 24.778213 24.778213 0 0 1 334.44922 286.22461 A 24.778213 24.778213 0 0 1 334.15039 286.2207 A 24.778213 24.778213 0 0 1 334.0918 286.2207 A 24.778213 24.778213 0 0 1 333.97266 286.21875 A 24.778213 24.778213 0 0 1 333.91211 286.2168 A 24.778213 24.778213 0 0 1 333.88281 286.2168 A 24.778213 24.778213 0 0 1 333.49414 286.20312 A 24.778213 24.778213 0 0 1 333.15039 286.1875 A 24.778213 24.778213 0 0 1 332.85547 286.16992 A 24.778213 24.778213 0 0 1 332.83594 286.16797 A 24.778213 24.778213 0 0 1 332.82617 286.16797 A 24.778213 24.778213 0 0 1 332.48438 286.14062 A 24.778213 24.778213 0 0 1 332.41992 286.13672 A 24.778213 24.778213 0 0 1 332.03125 286.09961 A 24.778213 24.778213 0 0 1 331.98828 286.0957 A 24.778213 24.778213 0 0 1 331.65234 286.06055 A 24.778213 24.778213 0 0 1 331.52344 286.04492 A 24.778213 24.778213 0 0 1 331.28516 286.01367 A 24.778213 24.778213 0 0 1 331.05859 285.98242 A 24.778213 24.778213 0 0 1 330.86719 285.95508 A 24.778213 24.778213 0 0 1 330.70312 285.93164 A 24.778213 24.778213 0 0 1 330.4668 285.89258 A 24.778213 24.778213 0 0 1 330.21094 285.84961 A 24.778213 24.778213 0 0 1 330.08203 285.82617 A 24.778213 24.778213 0 0 1 329.86328 285.78516 A 24.778213 24.778213 0 0 1 329.63867 285.74219 A 24.778213 24.778213 0 0 1 329.4043 285.69336 A 24.778213 24.778213 0 0 1 329.25 285.66016 A 24.778213 24.778213 0 0 1 329.02734 285.61133 A 24.778213 24.778213 0 0 1 328.84766 285.57031 A 24.778213 24.778213 0 0 1 328.58789 285.50781 A 24.778213 24.778213 0 0 1 328.38477 285.45703 A 24.778213 24.778213 0 0 1 328.25 285.42188 A 24.778213 24.778213 0 0 1 328.0293 285.36523 A 24.778213 24.778213 0 0 1 327.75586 285.28906 A 24.778213 24.778213 0 0 1 327.68555 285.26953 A 24.778213 24.778213 0 0 1 327.32031 285.16016 A 24.778213 24.778213 0 0 1 326.94531 285.04297 A 24.778213 24.778213 0 0 1 326.875 285.02148 A 24.778213 24.778213 0 0 1 326.58789 284.92578 A 24.778213 24.778213 0 0 1 326.43359 284.87305 A 24.778213 24.778213 0 0 1 326.12891 284.76758 A 24.778213 24.778213 0 0 1 326.12695 284.76562 A 24.778213 24.778213 0 0 1 326.125 284.76562 A 24.778213 24.778213 0 0 1 325.74805 284.625 A 24.778213 24.778213 0 0 1 325.51172 284.53516 A 24.778213 24.778213 0 0 1 325.16016 284.39453 A 24.778213 24.778213 0 0 1 325.07812 284.36328 A 24.778213 24.778213 0 0 1 324.78516 284.24023 A 24.778213 24.778213 0 0 1 324.70703 284.20703 A 24.778213 24.778213 0 0 1 324.4082 284.07422 A 24.778213 24.778213 0 0 1 324.2793 284.01562 A 24.778213 24.778213 0 0 1 324.13672 283.95117 A 24.778213 24.778213 0 0 1 323.81055 283.79883 A 24.778213 24.778213 0 0 1 323.43555 283.61523 A 24.778213 24.778213 0 0 1 323.09375 283.44141 A 24.778213 24.778213 0 0 1 323.02344 283.40625 A 24.778213 24.778213 0 0 1 322.73633 283.25195 A 24.778213 24.778213 0 0 1 322.60156 283.17969 A 24.778213 24.778213 0 0 1 322.32617 283.02539 A 24.778213 24.778213 0 0 1 322.0332 282.85742 A 24.778213 24.778213 0 0 1 321.75781 282.69531 A 24.778213 24.778213 0 0 1 321.41992 282.48828 A 24.778213 24.778213 0 0 1 321.32031 282.42578 A 24.778213 24.778213 0 0 1 321.23047 282.36914 A 24.778213 24.778213 0 0 1 320.89648 282.1543 A 24.778213 24.778213 0 0 1 320.54883 281.92188 A 24.778213 24.778213 0 0 1 320.22266 281.69531 A 24.778213 24.778213 0 0 1 320.17578 281.66406 A 24.778213 24.778213 0 0 1 319.90625 281.46875 A 24.778213 24.778213 0 0 1 319.80273 281.39258 A 24.778213 24.778213 0 0 1 319.60742 281.24805 A 24.778213 24.778213 0 0 1 319.33984 281.04297 A 24.778213 24.778213 0 0 1 319.10352 280.85938 A 24.778213 24.778213 0 0 1 318.89062 280.6875 A 24.778213 24.778213 0 0 1 318.8418 280.64648 A 24.778213 24.778213 0 0 1 318.54883 280.4043 A 24.778213 24.778213 0 0 1 318.26758 280.16406 A 24.778213 24.778213 0 0 1 318.1582 280.07031 A 24.778213 24.778213 0 0 1 317.94336 279.87891 A 24.778213 24.778213 0 0 1 317.90039 279.83984 A 24.778213 24.778213 0 0 1 317.60938 279.57227 A 24.778213 24.778213 0 0 1 317.43359 279.4082 A 24.778213 24.778213 0 0 1 317.37109 279.34766 A 24.778213 24.778213 0 0 1 317.17383 279.1582 A 24.778213 24.778213 0 0 1 317.10547 279.08984 A 24.778213 24.778213 0 0 1 316.9082 278.89258 A 24.778213 24.778213 0 0 1 316.73438 278.71484 A 24.778213 24.778213 0 0 1 316.69141 278.67188 A 24.778213 24.778213 0 0 1 316.45117 278.41797 A 24.778213 24.778213 0 0 1 316.39844 278.36328 A 24.778213 24.778213 0 0 1 316.14062 278.08203 A 24.778213 24.778213 0 0 1 315.98047 277.9043 A 24.778213 24.778213 0 0 1 315.91602 277.83203 A 24.778213 24.778213 0 0 1 315.77734 277.67383 A 24.778213 24.778213 0 0 1 315.65625 277.53125 A 24.778213 24.778213 0 0 1 315.52539 277.37695 A 24.778213 24.778213 0 0 1 315.3457 277.16016 A 24.778213 24.778213 0 0 1 315.2832 277.08398 A 24.778213 24.778213 0 0 1 315.05859 276.80469 A 24.778213 24.778213 0 0 1 314.83789 276.52148 A 24.778213 24.778213 0 0 1 314.75586 276.41406 A 24.778213 24.778213 0 0 1 314.55078 276.13867 A 24.778213 24.778213 0 0 1 314.41016 275.94727 A 24.778213 24.778213 0 0 1 314.36719 275.88477 A 24.778213 24.778213 0 0 1 314.22852 275.69141 A 24.778213 24.778213 0 0 1 314.07227 275.4668 A 24.778213 24.778213 0 0 1 314.06055 275.44727 A 24.778213 24.778213 0 0 1 313.85352 275.14062 A 24.778213 24.778213 0 0 1 313.79883 275.05859 A 24.778213 24.778213 0 0 1 313.64258 274.81641 A 24.778213 24.778213 0 0 1 313.55469 274.67969 A 24.778213 24.778213 0 0 1 313.4082 274.44531 A 24.778213 24.778213 0 0 1 313.34766 274.3457 A 24.778213 24.778213 0 0 1 313.20312 274.10742 A 24.778213 24.778213 0 0 1 313.11914 273.96289 A 24.778213 24.778213 0 0 1 312.99023 273.74023 A 24.778213 24.778213 0 0 1 312.91797 273.61328 A 24.778213 24.778213 0 0 1 312.75391 273.31641 A 24.778213 24.778213 0 0 1 312.57031 272.97656 A 24.778213 24.778213 0 0 1 312.5293 272.89648 A 24.778213 24.778213 0 0 1 312.36523 272.57617 A 24.778213 24.778213 0 0 1 312.25781 272.36133 A 24.778213 24.778213 0 0 1 312.2168 272.27539 A 24.778213 24.778213 0 0 1 312.14453 272.12695 A 24.778213 24.778213 0 0 1 312.00977 271.83984 A 24.778213 24.778213 0 0 1 311.95703 271.72266 A 24.778213 24.778213 0 0 1 311.89062 271.57617 A 24.778213 24.778213 0 0 1 311.79492 271.35938 A 24.778213 24.778213 0 0 1 311.66406 271.05469 A 24.778213 24.778213 0 0 1 311.51562 270.69727 A 24.778213 24.778213 0 0 1 311.46484 270.56836 A 24.778213 24.778213 0 0 1 311.39648 270.39453 A 24.778213 24.778213 0 0 1 311.27734 270.08008 A 24.778213 24.778213 0 0 1 311.26172 270.03711 A 24.778213 24.778213 0 0 1 311.16016 269.75977 A 24.778213 24.778213 0 0 1 311.0918 269.56445 A 24.778213 24.778213 0 0 1 311.02344 269.36523 A 24.778213 24.778213 0 0 1 310.96875 269.19922 A 24.778213 24.778213 0 0 1 310.90039 268.98828 A 24.778213 24.778213 0 0 1 310.80859 268.69531 A 24.778213 24.778213 0 0 1 310.68945 268.29492 A 24.778213 24.778213 0 0 1 310.58984 267.9375 A 24.778213 24.778213 0 0 1 310.53906 267.74805 A 24.778213 24.778213 0 0 1 310.50586 267.62109 A 24.778213 24.778213 0 0 1 310.4375 267.34961 A 24.778213 24.778213 0 0 1 310.37305 267.07812 A 24.778213 24.778213 0 0 1 310.28125 266.66992 A 24.778213 24.778213 0 0 1 310.11914 265.84961 A 24.778213 24.778213 0 0 1 310.05859 265.50586 A 24.778213 24.778213 0 0 1 310.0332 265.3418 A 24.778213 24.778213 0 0 1 309.98438 265.02344 A 24.778213 24.778213 0 0 1 309.92773 264.60938 A 24.778213 24.778213 0 0 1 309.88086 264.2168 A 24.778213 24.778213 0 0 1 309.85156 263.95508 z "
+   style="fill:#000000;fill-opacity:1"
+   id="path3760" />
+
+
+<path
+   transform="translate(793.9799,36.365491)"
+   inkscape:connector-curvature="0"
+   inkscape:original-d="M -628.04883,-2.9160156 V 235.43359 h -107.26562 l 95.77539,104.26953 95.77539,104.26758 95.77539,-104.26758 95.77539,-104.26953 H -459.47852 V -2.9160156 Z"
+   inkscape:path-effect="#path-effect870"
+   d="M -628.04883,7.0839844 V 225.43359 a 10,10 135 0 1 -10,10 h -74.50193 a 10,10 113.71569 0 0 -7.36467,16.76473 l 80.37634,87.50477 a 10.001443,10.001443 47.431118 0 0 6e-5,6e-5 l 88.41075,96.24993 a 10,10 180 0 0 14.72922,0 l 88.41075,-96.24993 a 10.000439,10.000439 132.56888 0 0 6e-5,-6e-5 l 80.37634,-87.50477 a 10,10 66.284308 0 0 -7.36467,-16.76473 h -74.50194 a 10,10 45 0 1 -10,-10 V 7.0839844 a 10,10 45 0 0 -10,-10 h -148.57031 a 10,10 135 0 0 -10,10 z"
+   style="fill:#000000;stroke:none;stroke-width:34.4741;stroke-linecap:round;stroke-linejoin:round"
+   id="rect860" />
+</svg>
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index bcbb15bc..070f15a5 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -67,10 +67,17 @@ static const QString barrierConfigFilter(QObject::tr("Barrier Configurations (*.
 
 static const char* barrierIconFiles[] =
 {
+#if defined(Q_OS_MAC)
+    ":/res/icons/32x32/barrier-disconnected-mask.png",
+    ":/res/icons/32x32/barrier-disconnected-mask.png",
+    ":/res/icons/32x32/barrier-connected-mask.png",
+    ":/res/icons/32x32/barrier-transfering-mask.png"
+#else
     ":/res/icons/16x16/barrier-disconnected.png",
     ":/res/icons/16x16/barrier-disconnected.png",
     ":/res/icons/16x16/barrier-connected.png",
     ":/res/icons/16x16/barrier-transfering.png"
+#endif
 };
 
 static const char* barrierLargeIcon = ":/res/icons/256x256/barrier.ico";
@@ -288,8 +295,13 @@ void MainWindow::saveSettings()
 
 void MainWindow::setIcon(qBarrierState state)
 {
-    if (m_pTrayIcon)
-        m_pTrayIcon->setIcon(QIcon(barrierIconFiles[state]));
+    if (m_pTrayIcon) {
+        QIcon icon = QIcon(barrierIconFiles[state]);
+#if defined(Q_OS_MAC)
+        icon.setIsMask(true);
+#endif
+        m_pTrayIcon->setIcon(icon);
+    }
 }
 
 void MainWindow::trayActivated(QSystemTrayIcon::ActivationReason reason)