diff --git a/res/banner.bmp b/res/banner.bmp
index 418746c8..fa5c98f8 100644
Binary files a/res/banner.bmp and b/res/banner.bmp differ
diff --git a/res/barrier.ico b/res/barrier.ico
index 48590eb6..6e905452 100644
Binary files a/res/barrier.ico and b/res/barrier.ico differ
diff --git a/res/barrier.png b/res/barrier.png
new file mode 100644
index 00000000..3313c31c
Binary files /dev/null and b/res/barrier.png differ
diff --git a/res/barrier.svg b/res/barrier.svg
index dee69030..5195bb14 100644
--- a/res/barrier.svg
+++ b/res/barrier.svg
@@ -1,38 +1,112 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
-<style type="text/css">
+
+<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.svg"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
+   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" /></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="1026"
+     id="namedview3765"
+     showgrid="false"
+     inkscape:zoom="1.1756822"
+     inkscape:cx="213.25905"
+     inkscape:cy="203.41561"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><style
+     type="text/css"
+     id="style3754">
 	.st0{fill:#3F96B9;}
 	.st1{fill:#5D7DBD;}
 	.st2{fill:#196260;}
 	.st3{fill:#97C33D;}
-</style>
-<path class="st0" d="M479.8651733,295.6200867c4.280304-21.7440796-10.1346741-42.9872894-32.1346741-47.3143921
-	c-20.2090149-3.9776001-39.8984985,7.7088928-46.2626953,26.5175171c-0.2657166,1.819397-0.5869141,3.6259766-0.9277954,5.4169922
-	c-14.359314,72.9589844-78.7187195,123.5878906-150.4677124,123.3417969
-	c11.9520874,11.7431946,17.9570007,29.1700134,14.4520874,46.8984985
-	c-2.8778992,14.6503906-11.7040863,26.6102905-23.4286957,33.960907
-	c113.2567902,4.6591797,216.4199066-73.9833984,238.9481964-188.5762024
-	c0.0186157-0.046814,0.0186157-0.1328125,0.0186157-0.2070007L479.8651733,295.6200867z"/>
-<path class="st1" d="M52.7905006,253.030304c22.0043983,4.3378906,43.4062996-9.8677063,47.6694984-31.6538086l0.1128006,0.0332031
-	c0.0195007-0.0619965,0.0278015-0.0991974,0.0370941-0.1381989
-	c14.4345016-73.3715973,79.4389038-124.1621017,151.6889038-123.3051987
-	c-11.7718964-11.7851028-17.6811066-29.0737-14.2055054-46.6987c2.8973999-14.7490005,11.8276062-26.772501,23.6478882-34.1030006
-	C147.8114929,11.6527996,43.75,90.4897003,21.1063995,205.6504059c-0.4447994,2.2778015-0.7670002,4.5263977-1.1654987,6.7748871
-	C19.4862995,231.7026062,33.0625,249.1470032,52.7905006,253.030304"/>
-<path class="st2" d="M292.0644836,20.6728992c-20.2285767-1.7939987-39.074295,12.1518002-43.1093903,32.7309036
-	c-4.1567993,21.1807022,8.8368988,41.7406998,29.2256012,47.0824966c0.6445007,0.1075058,1.2607117,0.1739044,1.875,0.297905
-	c73.0174866,14.3656998,123.6845093,78.8265915,123.3251953,150.6473999
-	c11.781189-11.6268921,28.9794922-17.4261932,46.4813843-13.9848022
-	c14.905304,2.9082031,27.045929,12.0049133,34.3203125,24.0131989
-	c5.2842102-113.726593-73.4912109-217.5790863-188.4902039-240.1850891
-	C294.4892883,21.0429993,293.2772827,20.8974991,292.0644836,20.6728992"/>
-<path class="st3" d="M253.6903992,448.3398132c4.1397095-21.1210022-8.8070984-41.6318054-29.1313019-47.0107117
-	c-1.1542969-0.2275085-2.3296051-0.3594055-3.4653015-0.5878906
-	c-73.319397-14.4326172-124.0634995-79.3623047-123.3247986-151.5361176
-	c-11.7796936,12.0742035-29.282196,18.1923981-47.1146965,14.6786957
-	c-14.5078011-2.8398743-26.3838005-11.5165863-33.7490005-23.0741882
-	C12.0292997,354.2412109,90.7045975,457.6582031,205.457489,480.2354126c1.6768036,0.3026733,3.324707,0.5692749,4.9922028,0.852478
-	C230.7157898,482.9267883,249.6190948,468.9472961,253.6903992,448.3398132"/>
-</svg>
+</style><path
+     class="st1"
+     d="m 444.53004,299.96289 c -22.0044,4.33789 -43.4063,-9.8677 -47.6695,-31.6538 l -0.1128,0.0332 c -0.0195,-0.062 -0.0278,-0.0992 -0.0371,-0.1382 -14.43449,-73.3716 -79.4389,-124.1621 -151.6889,-123.3052 11.7719,-11.7851 17.68111,-29.07369 14.20551,-46.69869 -2.8974,-14.74901 -11.82761,-26.77251 -23.64789,-34.10301 113.92969,-5.5118 217.99118,73.3251 240.63478,188.48581 0.4448,2.2778 0.767,4.52639 1.1655,6.77488 0.4546,19.27732 -13.1216,36.72171 -32.8496,40.60501"
+     id="path3758"
+     inkscape:connector-curvature="0"
+     style="fill:#5d7dbd" /><path
+     class="st3"
+     d="m 8.2366396,352.42909 c -4.1397099,-21.121 8.8071004,-41.6318 29.1313004,-47.01071 1.1543,-0.22751 2.32961,-0.3594 3.4653,-0.58789 73.3194,-14.43262 124.0635,-79.36229 123.3248,-151.53611 11.77969,12.07421 29.2822,18.1924 47.1147,14.6787 14.5078,-2.83988 26.3838,-11.51659 33.749,-23.07419 4.876,113.4316 -73.7993,216.84859 -188.55219,239.4258 -1.67681,0.30268 -3.32471,0.56928 -4.9922,0.85248 -20.2661,1.8389 -39.16941,-12.14059 -43.2407104,-32.74808"
+     id="path3762"
+     inkscape:connector-curvature="0"
+     style="fill:#97c33d" /><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.700776,198.6477 88.946866,126.89879 77.203686,138.85086 59.776886,144.85578 42.048406,141.35087 27.398016,138.47297 15.438136,129.64679 8.0875262,117.92219 3.4283464,231.17885 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:#3f96b9;stroke-width:0.99999911" /><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.68451,78.8266 -123.3252,150.6474 -11.78118,-11.62689 -28.97949,-17.42619 -46.48138,-13.9848 -14.9053,2.90821 -27.04593,12.00492 -34.32031,24.0132 -5.28421,-113.72659 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:#196260" /><path
+     style="fill:#333333;stroke-width:1.05979359"
+     d="m -66.847656,21.962891 c -1.14505,-0.03744 -2.273167,0.278796 -3.386719,0.78125 h 6.320313 c -0.983425,-0.440945 -1.963156,-0.749518 -2.933594,-0.78125 z"
+     id="path3756-3"
+     inkscape:connector-curvature="0" /><path
+     sodipodi:type="spiral"
+     style="fill:#5d7dbd;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.5"
+     id="path3860"
+     sodipodi:cx="301.11868"
+     sodipodi:cy="391.77664"
+     sodipodi:expansion="1"
+     sodipodi:revolution="3"
+     sodipodi:radius="76.230827"
+     sodipodi:argument="-18.215923"
+     sodipodi:t0="0"
+     d="m 301.11868,391.77664 c 3.08016,2.26297 -1.53079,5.26846 -3.7612,5.11942 -6.04427,-0.40388 -8.12919,-7.74783 -6.47764,-12.64183 2.95423,-8.7542 13.70234,-11.37066 21.52246,-7.83585 11.47633,5.18747 14.69271,19.73203 9.19407,30.40308 -7.32883,14.22283 -25.78767,18.04817 -39.28371,10.55229 -16.98339,-9.43281 -21.42072,-31.8555 -11.9105,-48.16433 11.51814,-19.75219 37.93015,-24.80314 57.04495,-13.26873 22.52614,13.59291 28.19173,44.00907 14.62694,65.92559 -15.66109,25.30348 -50.09081,31.58445 -74.80621,15.98515 -28.0832,-17.72491 -34.98006,-56.17456 -17.34337,-83.68683 19.7857,-30.86461 62.25977,-38.37778 92.56746,-18.70159 33.64729,21.84429 41.77706,68.34606 20.05981,101.44808" /><path
+     sodipodi:type="spiral"
+     style="fill:#3f96b9;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.20000005"
+     id="path3860-3"
+     sodipodi:cx="-206.4883"
+     sodipodi:cy="-105.78166"
+     sodipodi:expansion="1"
+     sodipodi:revolution="3"
+     sodipodi:radius="60.984657"
+     sodipodi:argument="-18.215923"
+     sodipodi:t0="0"
+     d="m -206.4883,-105.78166 c 2.46413,1.81037 -1.22463,4.21476 -3.00896,4.09553 -4.83541,-0.3231 -6.50335,-6.19826 -5.18211,-10.11346 2.36338,-7.00336 10.96187,-9.09653 17.21796,-6.26868 9.18107,4.14997 11.75417,15.78562 7.35526,24.322461 -5.86306,11.378267 -20.63013,14.438538 -31.42696,8.441831 -13.58671,-7.546245 -17.13658,-25.484392 -9.52841,-38.531462 9.21452,-15.80175 30.34412,-19.84251 45.63597,-10.61498 18.0209,10.87432 22.55338,35.207251 11.70155,52.740464 -12.52887,20.242788 -40.07265,25.267561 -59.84497,12.788124 -22.46655,-14.179929 -27.98405,-44.939648 -13.87469,-66.949458 15.82856,-24.69169 49.80781,-30.70222 74.05396,-14.96128 26.91783,17.47544 33.42164,54.676853 16.04784,81.158467"
+     transform="scale(-1)" /><path
+     sodipodi:type="spiral"
+     style="fill:#196260;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001"
+     id="path3860-3-5"
+     sodipodi:cx="46.779533"
+     sodipodi:cy="-92.928612"
+     sodipodi:expansion="1"
+     sodipodi:revolution="3"
+     sodipodi:radius="40.656441"
+     sodipodi:argument="-18.215923"
+     sodipodi:t0="0"
+     d="m 46.779533,-92.928612 c 1.64275,1.206917 -0.816425,2.809844 -2.005975,2.730358 -3.223608,-0.215402 -4.335565,-4.13218 -3.454741,-6.742309 1.575589,-4.668907 7.307917,-6.064347 11.478643,-4.179127 6.120709,2.766654 7.836115,10.523753 4.903505,16.214981 -3.908707,7.585512 -13.753422,9.625693 -20.95131,5.627887 -9.057807,-5.03083 -11.424386,-16.989597 -6.352269,-25.687648 6.143012,-10.5345 20.229415,-13.22833 30.423977,-7.07665 12.013938,7.24955 15.035589,23.471504 7.801034,35.160313 -8.35258,13.495193 -26.715102,16.845042 -39.896644,8.525417 -14.977707,-9.453287 -18.656035,-29.959766 -9.249799,-44.63298 10.552374,-16.46112 33.205208,-20.46814 49.369311,-9.97418 17.945219,11.65029 22.281096,36.451235 10.698564,54.105646"
+     transform="scale(1,-1)" /></svg>
\ No newline at end of file
diff --git a/res/dialog.bmp b/res/dialog.bmp
index 2a8ee61b..ad588c24 100644
Binary files a/res/dialog.bmp and b/res/dialog.bmp differ
diff --git a/res/makeicon.sh b/res/makeicon.sh
new file mode 100755
index 00000000..97e60ea5
--- /dev/null
+++ b/res/makeicon.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+if ! which magick >/dev/null 2>&1; then
+    echo "Need ImageMagic for this"
+    exit 10
+fi
+cd $(dirname $0) || exit $?
+if [ ! -r barrier.png ]; then
+    echo "Use inkscape (or another vector graphics editor) to create barrier.png from barrier.svg first"
+    exit 10
+fi
+rm -rf work || exit $?
+mkdir -p work || exit $?
+for s in 16 24 32 48 64 128; do
+    magick convert barrier.png -resize ${s}x${s} work/${s}.png || exit $?
+done
+magick convert work/{16,24,32,48,64,128}.png barrier.png barrier.ico || exit $?
+rm -rf work
+echo Done
diff --git a/src/cmd/barrierc/barrierc.ico b/src/cmd/barrierc/barrierc.ico
index 48590eb6..6e905452 100644
Binary files a/src/cmd/barrierc/barrierc.ico and b/src/cmd/barrierc/barrierc.ico differ
diff --git a/src/cmd/barriers/barriers.ico b/src/cmd/barriers/barriers.ico
index 48590eb6..6e905452 100644
Binary files a/src/cmd/barriers/barriers.ico and b/src/cmd/barriers/barriers.ico differ
diff --git a/src/gui/res/icons/16x16/barrier-connected.png b/src/gui/res/icons/16x16/barrier-connected.png
index 3aac760a..a13b1e3c 100644
Binary files a/src/gui/res/icons/16x16/barrier-connected.png and b/src/gui/res/icons/16x16/barrier-connected.png differ
diff --git a/src/gui/res/icons/16x16/barrier-connected.psd b/src/gui/res/icons/16x16/barrier-connected.psd
deleted file mode 100644
index b63945cb..00000000
Binary files a/src/gui/res/icons/16x16/barrier-connected.psd and /dev/null differ
diff --git a/src/gui/res/icons/16x16/barrier-connected.xcf b/src/gui/res/icons/16x16/barrier-connected.xcf
new file mode 100644
index 00000000..669663ab
Binary files /dev/null and b/src/gui/res/icons/16x16/barrier-connected.xcf differ
diff --git a/src/gui/res/icons/16x16/barrier-disconnected.png b/src/gui/res/icons/16x16/barrier-disconnected.png
index 12efe2d4..68caba48 100644
Binary files a/src/gui/res/icons/16x16/barrier-disconnected.png and b/src/gui/res/icons/16x16/barrier-disconnected.png differ
diff --git a/src/gui/res/icons/16x16/barrier-disconnected.psd b/src/gui/res/icons/16x16/barrier-disconnected.psd
deleted file mode 100644
index 4c58ce46..00000000
Binary files a/src/gui/res/icons/16x16/barrier-disconnected.psd and /dev/null differ
diff --git a/src/gui/res/icons/16x16/barrier-disconnected.xcf b/src/gui/res/icons/16x16/barrier-disconnected.xcf
new file mode 100644
index 00000000..9b9c7161
Binary files /dev/null and b/src/gui/res/icons/16x16/barrier-disconnected.xcf differ
diff --git a/src/gui/res/icons/16x16/barrier-transfering.png b/src/gui/res/icons/16x16/barrier-transfering.png
index 72fefca0..9ebcdfc1 100644
Binary files a/src/gui/res/icons/16x16/barrier-transfering.png and b/src/gui/res/icons/16x16/barrier-transfering.png differ
diff --git a/src/gui/res/icons/16x16/barrier-transfering.xcf b/src/gui/res/icons/16x16/barrier-transfering.xcf
new file mode 100644
index 00000000..6e5bd2b8
Binary files /dev/null and b/src/gui/res/icons/16x16/barrier-transfering.xcf differ
diff --git a/src/gui/res/icons/256x256/barrier.ico b/src/gui/res/icons/256x256/barrier.ico
index cf20e4bc..6e905452 100644
Binary files a/src/gui/res/icons/256x256/barrier.ico and b/src/gui/res/icons/256x256/barrier.ico differ
diff --git a/src/gui/res/image/about.png b/src/gui/res/image/about.png
index 23e58c9b..54d5f076 100644
Binary files a/src/gui/res/image/about.png and b/src/gui/res/image/about.png differ