diff --git a/mac_osx/icons/README.md b/mac_osx/icons/README.md
new file mode 100644
index 00000000..3aa2ff8a
--- /dev/null
+++ b/mac_osx/icons/README.md
@@ -0,0 +1,26 @@
+# macOS icons
+
+This folder contains vector graphics to create the macOS icons from.
+
+There are two variants for 16x16 sized and 32x32 sized icons.
+In both variants, the stroke width of the logo is increased to keep it at least
+someone legible on the small icon sizes. The 16x16 stroke width is even heavier
+than the 32x32 stroke width.
+
+Use the SVG files to generate the following PNG file in folder ending with
+`.iconset` (use grayscale with alpha channel):
+
+* `icon_16x16.png`
+* `icon_16x16@2x.png'
+* `icon_32x32.png`
+* `icon_32x32@2x.png'
+
+Then the folder can be converted to an ICNS file with `iconutil`:
+
+```shell
+iconutil -c icns -o output.icns input.iconset
+```
+
+The ICNS file can then be assigned to the respective layout in the bundle file
+with Ukelele.
+
diff --git a/mac_osx/icons/bone-icon-16.svg b/mac_osx/icons/bone-icon-16.svg
new file mode 100644
index 00000000..b0e8da02
--- /dev/null
+++ b/mac_osx/icons/bone-icon-16.svg
@@ -0,0 +1,82 @@
+<?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"
+   width="134.47168"
+   height="134.47168"
+   id="svg44668"
+   sodipodi:version="0.32"
+   inkscape:version="1.0.2 (e86c8708, 2021-01-15)"
+   version="1.0"
+   sodipodi:docname="bone-icon-16.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/Users/jgosmann/Documents/projects/neo-layout/mac_osx/test.iconset/icon_16x16.png"
+   inkscape:export-xdpi="11.42"
+   inkscape:export-ydpi="11.42">
+  <defs
+     id="defs44670">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 615.78477 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 615.78477 : 1"
+       inkscape:persp3d-origin="372.04724 : 440.39107 : 1"
+       id="perspective44676" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.2796268"
+     inkscape:cx="68.608943"
+     inkscape:cy="137.39433"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1323"
+     inkscape:window-x="1920"
+     inkscape:window-y="25"
+     inkscape:document-rotation="0"
+     inkscape:snap-page="true"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata44673">
+    <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="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(46.55321,-504.50721)">
+    <path
+       id="rect896"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.00157;stroke-dasharray:2.00315, 2.00315"
+       d="M 19.513672 0 C 8.7026853 0 0 8.7026853 0 19.513672 L 0 114.95703 C 0 125.76802 8.7026853 134.47266 19.513672 134.47266 L 114.95703 134.47266 C 125.76802 134.47266 134.4707 125.76802 134.4707 114.95703 L 134.4707 19.513672 C 134.4707 8.7026853 125.76802 0 114.95703 0 L 19.513672 0 z M 6.9121094 41.662109 C 11.065648 41.677681 15.219505 41.691535 19.373047 41.707031 C 19.385897 44.684868 19.386153 47.662773 19.392578 50.640625 C 18.972314 53.774435 20.736383 49.728251 22.347656 49.789062 C 28.456843 48.598205 35.259894 50.145704 39.767578 54.634766 C 40.840788 55.572039 41.743574 56.624707 42.505859 57.759766 C 45.922319 52.668332 51.522736 49.019644 57.751953 48.675781 C 62.446232 48.340352 67.449851 49.882638 70.986328 53 C 78.025637 47.486238 89.338754 48.366033 95.425781 55.007812 C 98.977055 51.747698 103.25198 49.267249 108.16992 49.095703 C 113.61214 48.605294 119.52969 50.200998 123.22656 54.412109 C 126.09729 57.016075 123.37204 60.680622 123.18359 63.726562 C 120.48518 65.330692 117.43115 64.151699 114.5332 64.339844 C 112.38377 60.61106 106.74109 61.264799 104.56641 64.619141 C 107.43944 64.580098 110.32146 64.697857 113.18945 64.560547 C 117.93299 64.455196 121.13947 68.674293 125.34766 70.222656 C 122.54591 72.490025 119.74087 74.753707 116.93945 77.021484 L 102.65039 77.021484 C 104.83066 80.274656 109.83098 80.86964 113.54297 80.275391 C 118.23241 78.938666 122.00632 82.851852 126.0625 84.462891 C 128.54474 85.36238 128.16957 88.980576 125.58398 89.349609 C 117.48068 93.165968 107.62402 94.295016 99.337891 90.326172 C 92.798956 87.791458 89.490344 80.889423 88.628906 74.310547 C 87.555524 70.480767 88.797878 65.321389 84.791016 62.951172 C 81.452865 60.87075 76.446064 63.169838 76.355469 67.28125 C 76.104168 73.461469 76.710454 80.529571 72.251953 85.496094 C 66.695639 92.421228 56.262223 93.720392 48.642578 89.628906 C 46.191005 88.475492 44.263645 86.731618 42.789062 84.646484 C 40.778306 87.624665 37.886686 89.945224 34.287109 90.892578 C 23.186535 94.905057 9.3949827 87.530862 7.1699219 75.810547 C 6.2920661 65.129417 7.0348029 54.367013 6.8984375 43.654297 L 6.8964844 43.654297 L 6.9121094 41.662109 z M 19.460938 59.541016 C 19.531085 63.762434 19.149908 68.035365 19.554688 72.259766 C 19.215996 77.345437 25.118222 80.141349 29.494141 78.984375 C 33.824875 78.172778 33.995416 72.893378 33.601562 69.416016 C 33.934996 65.620848 30.774496 62.462124 27.101562 62.138672 C 24.312558 62.395442 21.331191 61.834558 19.460938 59.541016 z M 58.849609 61.095703 C 56.546732 61.201307 54.222999 62.221207 52.878906 64.128906 C 51.067054 67.936191 50.285707 72.745514 51.935547 76.767578 C 54.156749 80.051436 59.960039 79.832586 62.460938 76.900391 C 64.617508 72.893184 63.356924 67.996922 64.507812 63.669922 C 64.068179 61.947149 61.513051 61.293122 59.833984 61.105469 C 59.508828 61.083163 59.178592 61.080617 58.849609 61.095703 z M 99.878906 63.255859 C 99.986816 63.710585 100.08689 64.168363 100.17383 64.630859 C 100.98979 64.673603 101.79324 64.705661 102.4707 64.619141 C 101.60673 64.164644 100.74282 63.710473 99.878906 63.255859 z "
+       transform="translate(-46.55321,504.50721)" />
+    <g
+       id="g1971"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       transform="matrix(3.7795276,0,0,3.7795276,-91.424824,415.23666)">
+      <g
+         id="g948"
+         style="fill:#ff0000" />
+    </g>
+  </g>
+</svg>
diff --git a/mac_osx/icons/bone-icon-32.svg b/mac_osx/icons/bone-icon-32.svg
new file mode 100644
index 00000000..632b84eb
--- /dev/null
+++ b/mac_osx/icons/bone-icon-32.svg
@@ -0,0 +1,83 @@
+<?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"
+   width="134.47168"
+   height="134.47168"
+   id="svg44668"
+   sodipodi:version="0.32"
+   inkscape:version="1.0.2 (e86c8708, 2021-01-15)"
+   version="1.0"
+   sodipodi:docname="bone-icon-32.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/Users/jgosmann/Documents/projects/neo-layout/mac_osx/test.iconset/icon_16x16.png"
+   inkscape:export-xdpi="11.42"
+   inkscape:export-ydpi="11.42">
+  <defs
+     id="defs44670">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 615.78477 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 615.78477 : 1"
+       inkscape:persp3d-origin="372.04724 : 440.39107 : 1"
+       id="perspective44676" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.2796268"
+     inkscape:cx="68.608943"
+     inkscape:cy="137.39433"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1323"
+     inkscape:window-x="1920"
+     inkscape:window-y="25"
+     inkscape:document-rotation="0"
+     inkscape:snap-page="true"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata44673">
+    <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="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(46.55321,-504.50721)">
+    <path
+       id="rect896"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.00157;stroke-dasharray:2.00315, 2.00315"
+       d="M 19.513672 0 C 8.7026853 0 0 8.7026853 0 19.513672 L 0 114.95703 C 0 125.76802 8.7026853 134.47266 19.513672 134.47266 L 114.95703 134.47266 C 125.76802 134.47266 134.4707 125.76802 134.4707 114.95703 L 134.4707 19.513672 C 134.4707 8.7026853 125.76802 0 114.95703 0 L 19.513672 0 z M 8.8671875 43.658203 C 11.694448 43.669164 14.522349 43.676539 17.349609 43.6875 C 17.366239 48.395162 17.36637 53.102866 17.376953 57.810547 C 17.664844 63.692663 16.791067 69.705077 17.962891 75.5 C 20.139385 80.654017 26.883407 82.501683 31.802734 80.285156 C 36.07896 78.031114 35.974021 72.251154 35.441406 68.070312 C 35.384041 63.034273 30.209048 59.872211 25.59375 60.054688 C 23.502651 60.467683 22.000898 59.326637 20.626953 57.916016 C 17.658735 56.539047 19.20966 54.915043 21.083984 53.277344 C 22.090869 51.453869 23.820028 51.300648 25.712891 51.527344 C 32.836242 50.750724 39.635346 55.448856 42.472656 61.828125 C 45.07938 55.732601 51.070203 51.084291 57.800781 50.664062 C 61.283548 50.38747 64.798883 51.258511 67.751953 53.123047 C 69.150681 53.607687 70.591751 55.582149 70.740234 55.964844 C 77.288602 48.973435 89.935214 50.112458 95.242188 58.025391 C 98.593959 54.258313 103.06638 51.31429 108.23438 51.085938 C 113.2546 50.600215 118.63379 52.046993 121.96484 56.023438 C 123.52832 57.636763 121.42122 60.21866 121.33398 62.271484 C 119.92329 63.055241 117.29554 62.186177 115.41016 62.320312 C 112.49147 58.443318 106.22085 59.258128 103.41406 62.859375 C 100.89864 61.540775 98.38527 60.217263 95.873047 58.892578 C 97.488873 61.211239 98.089847 63.869595 98.455078 66.609375 L 112.71484 66.609375 C 116.23563 66.043376 118.72015 69.21027 121.70703 70.558594 C 119.87032 72.041008 118.03319 73.52395 116.19922 75.009766 L 100.36719 75.009766 C 99.995497 74.757138 99.705453 74.416511 99.457031 74.037109 C 99.706821 75.213683 100.04124 76.363316 100.53516 77.460938 C 103.16118 82.334264 109.29655 82.878264 114.19727 82.207031 C 117.17082 81.269682 119.48703 83.456657 122.01562 84.642578 C 123.37571 85.658235 128.13784 86.854445 124.26172 87.591797 C 116.02666 91.751704 105.58566 92.171083 97.626953 87.146484 C 91.274898 82.972669 90.573828 74.724084 89.714844 67.863281 C 89.672808 62.928106 84.553427 58.848921 79.761719 60.541016 C 75.877215 61.195138 74.159848 65.196833 74.197266 68.763672 C 74.272951 74.495609 74.367621 81.16967 69.621094 85.269531 C 64.134792 91.105035 54.718724 91.206896 48.212891 87.085938 C 45.606939 85.516667 43.846402 83.187624 42.708984 80.523438 C 41.052122 84.746593 37.520593 88.200544 32.957031 89.144531 C 22.697575 92.521959 10.286941 85.239484 8.9335938 74.371094 C 8.4806172 64.818187 8.904816 55.221707 8.8515625 45.652344 L 8.8671875 43.658203 z M 58.806641 59.074219 C 55.287647 59.207327 51.807589 61.083536 50.367188 64.431641 C 48.964491 69.000523 47.998002 74.616078 50.78125 78.855469 C 54.949479 82.666162 63.722061 81.718228 65.234375 75.628906 C 66.290447 70.237614 65.177139 64.327437 68.158203 59.382812 C 68.625372 58.597231 66.492098 61.63499 66.150391 62.054688 C 64.304291 59.921636 61.543635 58.97069 58.806641 59.074219 z "
+       transform="translate(-46.55321,504.50721)" />
+    <g
+       id="g1971"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       transform="matrix(3.7795276,0,0,3.7795276,95.85931,564.76642)">
+      <g
+         id="g948"
+         style="fill:#ff0000"
+         transform="translate(-49.560509,-39.566021)" />
+    </g>
+  </g>
+</svg>
diff --git a/mac_osx/icons/icon-square.svg b/mac_osx/icons/icon-square.svg
new file mode 100644
index 00000000..ce5f0181
--- /dev/null
+++ b/mac_osx/icons/icon-square.svg
@@ -0,0 +1,75 @@
+<?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"
+   width="134.47168"
+   height="134.47168"
+   id="svg44668"
+   sodipodi:version="0.32"
+   inkscape:version="1.0.2 (e86c8708, 2021-01-15)"
+   version="1.0"
+   sodipodi:docname="base.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/Users/jgosmann/Documents/projects/neo-layout/mac_osx/test.iconset/icon_512x512.png"
+   inkscape:export-xdpi="365.51935"
+   inkscape:export-ydpi="365.51935">
+  <defs
+     id="defs44670">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 615.78477 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 615.78477 : 1"
+       inkscape:persp3d-origin="372.04724 : 440.39107 : 1"
+       id="perspective44676" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.2796268"
+     inkscape:cx="68.608943"
+     inkscape:cy="137.39433"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1323"
+     inkscape:window-x="1920"
+     inkscape:window-y="25"
+     inkscape:document-rotation="0"
+     inkscape:snap-page="true"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata44673">
+    <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="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(46.55321,-504.50721)">
+    <path
+       id="rect896"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.00157;stroke-dasharray:2.00315, 2.00315"
+       d="M 19.513672,0 C 8.7026856,0 0,8.7026856 0,19.513672 v 95.443358 c 0,10.81099 8.7026856,19.51563 19.513672,19.51563 h 95.443358 c 10.81099,0 19.51367,-8.70464 19.51367,-19.51563 V 19.513672 C 134.4707,8.7026856 125.76802,0 114.95703,0 Z"
+       transform="translate(-46.55321,504.50721)"
+       sodipodi:nodetypes="sssssssss" />
+  </g>
+</svg>
diff --git a/mac_osx/icons/neo-icon-16.svg b/mac_osx/icons/neo-icon-16.svg
new file mode 100644
index 00000000..9a546f5c
--- /dev/null
+++ b/mac_osx/icons/neo-icon-16.svg
@@ -0,0 +1,81 @@
+<?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"
+   width="134.47168"
+   height="134.47168"
+   id="svg44668"
+   sodipodi:version="0.32"
+   inkscape:version="1.0.2 (e86c8708, 2021-01-15)"
+   version="1.0"
+   sodipodi:docname="neo-icon-template.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/Users/jgosmann/Documents/projects/neo-layout/mac_osx/test.iconset/icon_512x512.png"
+   inkscape:export-xdpi="365.51935"
+   inkscape:export-ydpi="365.51935">
+  <defs
+     id="defs44670">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 615.78477 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 615.78477 : 1"
+       inkscape:persp3d-origin="372.04724 : 440.39107 : 1"
+       id="perspective44676" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective44676-2" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.2796268"
+     inkscape:cx="68.608943"
+     inkscape:cy="137.39433"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1323"
+     inkscape:window-x="1920"
+     inkscape:window-y="25"
+     inkscape:document-rotation="0"
+     inkscape:snap-page="true"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata44673">
+    <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="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(46.55321,-504.50721)">
+    <path
+       id="rect896"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.00157;stroke-dasharray:2.00315, 2.00315"
+       d="M 19.513672 0 C 8.7026855 0 0 8.7026855 0 19.513672 L 0 114.95703 C 0 125.76802 8.7026855 134.47266 19.513672 134.47266 L 114.95703 134.47266 C 125.76802 134.47266 134.4707 125.76802 134.4707 114.95703 L 134.4707 19.513672 C 134.4707 8.7026855 125.76802 0 114.95703 0 L 19.513672 0 z M 101.29492 42.806641 C 102.57473 42.807172 103.85429 42.881301 105.12305 43.048828 C 109.35189 43.553388 113.43058 45.459448 116.35352 48.585938 C 120.65914 52.982297 122.69862 59.155791 122.9707 65.212891 C 123.13983 70.101441 122.87914 75.12746 121.14648 79.75 C 120.05268 82.7884 117.99726 85.36364 115.61523 87.5 C 113.15368 89.84795 109.85592 91.193442 106.48047 91.451172 C 103.99808 91.596772 101.48763 91.857691 99.015625 91.431641 C 95.552485 91.121191 92.259136 89.639122 89.628906 87.382812 C 87.704406 85.684133 85.705604 83.985208 84.308594 81.804688 C 81.658194 77.570798 80.241844 72.729642 78.527344 68.076172 C 76.959514 69.348152 75.391619 70.620068 73.824219 71.892578 L 54.076172 71.892578 C 53.744092 71.294238 53.373802 70.716409 53.076172 70.099609 C 51.959572 67.691079 52.234509 64.963558 51.917969 62.392578 L 72.5625 62.392578 C 74.22349 63.395718 75.886868 64.394924 77.548828 65.396484 C 76.767498 63.313864 75.941263 61.244566 74.945312 59.253906 C 73.910993 57.378496 72.973618 55.253105 71.085938 54.078125 C 68.677818 52.656455 65.666746 52.595256 63.009766 53.253906 C 60.983916 53.753446 59.394802 55.166613 57.982422 56.626953 C 54.755112 54.924733 51.526588 53.224798 48.298828 51.523438 C 49.708058 50.098367 51.014943 48.558966 52.601562 47.322266 C 57.257173 43.611026 63.48962 42.409626 69.3125 43.066406 C 73.76627 43.532286 78.045427 45.665871 80.935547 49.113281 C 84.334927 53.495111 85.970754 58.889299 87.802734 64.042969 C 88.142744 65.005049 88.542079 66.125242 88.849609 66.982422 C 89.908639 69.844622 91.069673 72.696341 92.720703 75.275391 C 94.578693 78.260391 97.494207 80.746663 101.0293 81.376953 C 104.25983 82.107373 108.04384 81.049251 109.93945 78.207031 C 111.75156 75.442701 111.90226 72.004381 112.02734 68.800781 C 112.20705 64.305291 111.56414 59.497353 108.78125 55.814453 C 106.64487 53.143693 102.90019 52.406927 99.65625 52.841797 C 97.04032 53.174477 95.037421 55.022616 93.144531 56.691406 C 89.950401 54.995806 86.847708 53.136747 83.673828 51.404297 C 84.782188 50.250667 85.821863 49.027523 87.001953 47.945312 C 90.502973 44.671692 95.264395 42.984598 100.01562 42.830078 C 100.44175 42.814743 100.86832 42.806464 101.29492 42.806641 z M 30.931641 43.261719 C 34.290681 43.254889 37.658187 44.016512 40.654297 45.544922 C 44.615647 47.503642 47.612594 51.018369 49.521484 54.949219 C 51.294994 58.581319 51.416593 62.695182 51.908203 66.632812 C 52.259843 69.430753 52.415636 72.340486 53.597656 74.941406 C 55.178486 78.479856 58.6408 80.898789 62.375 81.693359 C 66.52031 82.626009 70.756237 81.817513 74.935547 81.626953 C 78.360237 83.442393 81.784021 85.259525 85.207031 87.078125 C 82.850011 88.030645 80.517061 89.042258 78.144531 89.955078 C 73.083011 91.598078 67.623955 92.095742 62.359375 91.263672 C 57.385905 90.451232 52.352761 88.691233 48.619141 85.189453 C 44.881511 81.417313 43.254499 76.130699 42.443359 71.005859 C 41.774739 67.330039 41.700533 63.5412 40.664062 59.9375 C 39.274452 55.9468 35.108094 53.006981 30.839844 53.394531 C 28.299534 53.407701 26.024444 54.797753 24.271484 56.539062 C 22.044394 58.887702 21.639867 62.295219 21.466797 65.386719 C 21.346157 73.820799 21.576378 82.256486 21.517578 90.691406 L 11.509766 90.691406 C 11.516866 83.332946 11.564609 75.973654 11.537109 68.615234 C 11.385659 64.863234 11.348734 61.037474 12.402344 57.396484 C 13.346354 53.843084 15.454031 50.668969 18.244141 48.292969 C 21.679791 45.148429 26.258251 43.262679 30.931641 43.261719 z "
+       transform="translate(-46.55321,504.50721)" />
+  </g>
+</svg>
diff --git a/mac_osx/icons/neo-icon-32.svg b/mac_osx/icons/neo-icon-32.svg
new file mode 100644
index 00000000..e11c06ed
--- /dev/null
+++ b/mac_osx/icons/neo-icon-32.svg
@@ -0,0 +1,85 @@
+<?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"
+   width="134.47168"
+   height="134.47168"
+   id="svg44668"
+   sodipodi:version="0.32"
+   inkscape:version="1.0.2 (e86c8708, 2021-01-15)"
+   version="1.0"
+   sodipodi:docname="neo-icon-template-32.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/Users/jgosmann/Documents/projects/neo-layout/mac_osx/test.iconset/icon_16x162x.png"
+   inkscape:export-xdpi="22.844793"
+   inkscape:export-ydpi="22.844793">
+  <defs
+     id="defs44670">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 615.78477 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 615.78477 : 1"
+       inkscape:persp3d-origin="372.04724 : 440.39107 : 1"
+       id="perspective44676" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective44676-2" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.2796268"
+     inkscape:cx="68.608943"
+     inkscape:cy="137.39433"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1323"
+     inkscape:window-x="1920"
+     inkscape:window-y="25"
+     inkscape:document-rotation="0"
+     inkscape:snap-page="true"
+     inkscape:window-maximized="1"
+     showguides="false" />
+  <metadata
+     id="metadata44673">
+    <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="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(46.55321,-504.50721)">
+    <path
+       id="rect896"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.00157;stroke-dasharray:2.00315, 2.00315"
+       d="M 19.513672 0 C 8.7026855 0 0 8.7026855 0 19.513672 L 0 114.95703 C 0 125.76802 8.7026855 134.47266 19.513672 134.47266 L 114.95703 134.47266 C 125.76802 134.47266 134.4707 125.76802 134.4707 114.95703 L 134.4707 19.513672 C 134.4707 8.7026855 125.76802 0 114.95703 0 L 19.513672 0 z M 101.29492 42.806641 C 102.57473 42.807172 103.85429 42.881301 105.12305 43.048828 C 109.35189 43.553388 113.43058 45.459448 116.35352 48.585938 C 120.65914 52.982297 122.69862 59.155791 122.9707 65.212891 C 123.13983 70.101441 122.87914 75.12746 121.14648 79.75 C 120.05268 82.7884 117.99726 85.36364 115.61523 87.5 C 113.15368 89.84795 109.85592 91.193442 106.48047 91.451172 C 103.99808 91.596772 101.48763 91.857691 99.015625 91.431641 C 95.552485 91.121191 92.259136 89.639122 89.628906 87.382812 C 87.704406 85.684133 85.705604 83.985208 84.308594 81.804688 C 81.658194 77.570798 80.241844 72.729642 78.527344 68.076172 C 76.959514 69.348152 75.391619 70.620068 73.824219 71.892578 L 54.076172 71.892578 C 53.744092 71.294238 53.373802 70.716409 53.076172 70.099609 C 51.959572 67.691079 52.234509 64.963558 51.917969 62.392578 L 72.5625 62.392578 C 74.22349 63.395718 75.886868 64.394924 77.548828 65.396484 C 76.767498 63.313864 75.941263 61.244566 74.945312 59.253906 C 73.910993 57.378496 72.973618 55.253105 71.085938 54.078125 C 68.677818 52.656455 65.666746 52.595256 63.009766 53.253906 C 60.983916 53.753446 59.394802 55.166613 57.982422 56.626953 C 54.755112 54.924733 51.526588 53.224798 48.298828 51.523438 C 49.708058 50.098367 51.014943 48.558966 52.601562 47.322266 C 57.257173 43.611026 63.48962 42.409626 69.3125 43.066406 C 73.76627 43.532286 78.045427 45.665871 80.935547 49.113281 C 84.334927 53.495111 85.970754 58.889299 87.802734 64.042969 C 88.142744 65.005049 88.542079 66.125242 88.849609 66.982422 C 89.908639 69.844622 91.069673 72.696341 92.720703 75.275391 C 94.578693 78.260391 97.494207 80.746663 101.0293 81.376953 C 104.25983 82.107373 108.04384 81.049251 109.93945 78.207031 C 111.75156 75.442701 111.90226 72.004381 112.02734 68.800781 C 112.20705 64.305291 111.56414 59.497353 108.78125 55.814453 C 106.64487 53.143693 102.90019 52.406927 99.65625 52.841797 C 97.04032 53.174477 95.037421 55.022616 93.144531 56.691406 C 89.950401 54.995806 86.847708 53.136747 83.673828 51.404297 C 84.782188 50.250667 85.821863 49.027523 87.001953 47.945312 C 90.502973 44.671692 95.264395 42.984598 100.01562 42.830078 C 100.44175 42.814743 100.86832 42.806464 101.29492 42.806641 z M 30.931641 43.261719 C 34.290681 43.254889 37.658187 44.016512 40.654297 45.544922 C 44.615647 47.503642 47.612594 51.018369 49.521484 54.949219 C 51.294994 58.581319 51.416593 62.695182 51.908203 66.632812 C 52.259843 69.430753 52.415636 72.340486 53.597656 74.941406 C 55.178486 78.479856 58.6408 80.898789 62.375 81.693359 C 66.52031 82.626009 70.756237 81.817513 74.935547 81.626953 C 78.360237 83.442393 81.784021 85.259525 85.207031 87.078125 C 82.850011 88.030645 80.517061 89.042258 78.144531 89.955078 C 73.083011 91.598078 67.623955 92.095742 62.359375 91.263672 C 57.385905 90.451232 52.352761 88.691233 48.619141 85.189453 C 44.881511 81.417313 43.254499 76.130699 42.443359 71.005859 C 41.774739 67.330039 41.700533 63.5412 40.664062 59.9375 C 39.274452 55.9468 35.108094 53.006981 30.839844 53.394531 C 28.299534 53.407701 26.024444 54.797753 24.271484 56.539062 C 22.044394 58.887702 21.639867 62.295219 21.466797 65.386719 C 21.346157 73.820799 21.576378 82.256486 21.517578 90.691406 L 11.509766 90.691406 C 11.516866 83.332946 11.564609 75.973654 11.537109 68.615234 C 11.385659 64.863234 11.348734 61.037474 12.402344 57.396484 C 13.346354 53.843084 15.454031 50.668969 18.244141 48.292969 C 21.679791 45.148429 26.258251 43.262679 30.931641 43.261719 z "
+       transform="translate(-46.55321,504.50721)"
+       inkscape:export-filename="/Users/jgosmann/Documents/projects/neo-layout/mac_osx/test.iconset/icon_32x322x.png"
+       inkscape:export-xdpi="45.689999"
+       inkscape:export-ydpi="45.689999" />
+  </g>
+</svg>
diff --git a/mac_osx/icons/neoqwertz-icon-32.svg b/mac_osx/icons/neoqwertz-icon-32.svg
new file mode 100644
index 00000000..f2226d21
--- /dev/null
+++ b/mac_osx/icons/neoqwertz-icon-32.svg
@@ -0,0 +1,95 @@
+<?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"
+   width="134.47168"
+   height="134.47168"
+   id="svg44668"
+   sodipodi:version="0.32"
+   inkscape:version="1.0.2 (e86c8708, 2021-01-15)"
+   version="1.0"
+   sodipodi:docname="neoqwertz-icon-32.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/Users/jgosmann/Documents/projects/neo-layout/mac_osx/test.iconset/icon_32x32@2x.png"
+   inkscape:export-xdpi="45.689999"
+   inkscape:export-ydpi="45.689999">
+  <defs
+     id="defs44670">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 615.78477 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 615.78477 : 1"
+       inkscape:persp3d-origin="372.04724 : 440.39107 : 1"
+       id="perspective44676" />
+    <inkscape:path-effect
+       effect="bspline"
+       id="path-effect1275"
+       is_visible="true"
+       lpeversion="1"
+       weight="33.333333"
+       steps="2"
+       helper_size="0"
+       apply_no_weight="true"
+       apply_with_weight="true"
+       only_selected="false" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.2764217"
+     inkscape:cx="-42.381701"
+     inkscape:cy="83.818151"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1323"
+     inkscape:window-x="1920"
+     inkscape:window-y="25"
+     inkscape:document-rotation="0"
+     inkscape:snap-page="true"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false" />
+  <metadata
+     id="metadata44673">
+    <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="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(46.55321,-504.50721)">
+    <path
+       id="rect896"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.00157;stroke-dasharray:2.00315, 2.00315"
+       d="M 19.513672 0 C 8.7026845 0 0 8.7026845 0 19.513672 L 0 114.95703 C 0 125.76802 8.7026845 134.47266 19.513672 134.47266 L 114.95703 134.47266 C 125.76802 134.47266 134.4707 125.76802 134.4707 114.95703 L 134.4707 19.513672 C 134.4707 8.7026845 125.76802 0 114.95703 0 L 19.513672 0 z M 82.388672 35.275391 C 85.374187 35.23323 88.450118 35.86202 90.789062 37.804688 C 95.566921 41.582026 96.589549 48.206021 95.849609 53.921875 C 95.607449 57.516317 93.834822 61.06824 90.982422 63.259766 C 92.427362 62.641482 93.993837 62.294366 95.556641 62.269531 C 96.324843 62.26852 97.093118 62.270237 97.861328 62.269531 C 97.864645 60.46506 97.86583 58.661172 97.851562 56.857422 C 97.393079 55.180026 99.053188 54.311488 99.919922 53.140625 C 100.21446 52.812679 100.51015 52.486149 100.80469 52.158203 C 101.86253 53.24569 102.9162 54.33687 103.97461 55.423828 C 103.97461 57.70519 103.97298 59.986215 103.97266 62.267578 C 106.73566 62.267168 109.4987 62.267729 112.26172 62.267578 C 112.39307 62.260722 112.53002 62.25867 112.67773 62.267578 C 114.00065 62.267504 115.32356 62.265763 116.64648 62.265625 C 116.86204 62.263435 117.07742 62.261965 117.29297 62.259766 C 117.3819 62.26416 117.47321 62.262143 117.5625 62.265625 C 119.0892 62.265437 120.61587 62.266027 122.14258 62.265625 C 122.1434 62.266811 122.14371 62.268346 122.14453 62.269531 C 124.79653 62.271538 127.4305 62.466099 129.76367 63.818359 C 133.48597 65.818499 134.55759 70.999866 132.30078 74.480469 C 129.6249 78.206731 125.32455 80.26633 121.56445 82.710938 C 120.9142 83.348034 118.90978 84.032697 119.7207 85.121094 C 123.15527 85.747462 126.71219 85.375292 130.19531 85.417969 C 131.66731 86.108889 132.91011 87.476276 134.29102 88.427734 C 132.88107 89.421333 131.54162 90.598191 130.0918 91.484375 C 126.307 91.581669 122.45177 91.819221 118.70312 91.199219 C 114.23051 90.452562 111.77608 84.587194 114.47656 80.908203 C 117.47688 77.074993 122.44514 75.621522 125.98438 72.386719 C 127.39089 71.710537 128.02972 69.094136 126.06055 68.736328 C 124.48245 68.518046 122.89366 68.423024 121.30078 68.382812 L 117.25977 68.382812 C 115.37167 68.415851 113.4833 68.468488 111.60352 68.464844 C 111.6029 68.437505 111.60217 68.410152 111.60156 68.382812 L 103.9707 68.382812 C 103.9698 72.455933 103.96972 76.528442 103.96875 80.601562 C 103.79149 83.508991 106.59957 85.483839 109.2793 85.484375 C 111.08252 85.952117 112.5007 87.522882 114.15625 88.416016 C 114.66294 89.223282 112.03909 90.025348 111.27734 90.832031 C 109.94121 92.259603 107.98219 91.471842 106.32617 91.173828 C 101.95106 90.239324 98.387559 86.472831 97.947266 81.982422 C 97.824556 77.452958 97.827035 72.917997 97.84375 68.382812 L 97.498047 68.382812 C 94.685137 68.079341 90.88535 69.10198 90.484375 72.388672 C 90.278221 78.752823 90.454553 85.138963 90.396484 91.511719 L 84.279297 91.511719 L 84.279297 91.443359 L 84.201172 91.443359 L 84.201172 89.779297 C 81.522147 91.02584 78.599316 91.33222 75.671875 91.503906 C 75.671449 91.559246 75.67036 91.614583 75.669922 91.669922 C 75.140339 91.650244 74.608448 91.627814 74.076172 91.597656 C 73.521468 91.627792 72.963597 91.654412 72.414062 91.693359 C 72.418646 91.607416 72.423165 91.521491 72.427734 91.435547 C 71.67309 91.33084 70.926704 91.1826 70.205078 90.916016 C 68.438221 90.40316 66.884619 89.391631 65.642578 88.080078 C 63.584859 90.207284 60.633707 91.363436 57.650391 91.650391 C 57.630773 91.667132 57.621285 91.694412 57.599609 91.708984 C 57.425969 91.716135 57.250642 91.704532 57.076172 91.705078 C 56.553475 91.735664 56.032072 91.746923 55.515625 91.724609 C 55.515525 91.690756 55.51573 91.6569 55.515625 91.623047 C 52.682537 91.314749 49.900477 90.16116 47.917969 88.164062 C 45.86594 90.226576 42.973284 91.469069 40.058594 91.623047 C 40.030965 91.649336 40.014524 91.687402 39.982422 91.708984 C 39.776165 91.717478 39.568717 91.715668 39.361328 91.714844 C 38.885278 91.835238 38.54487 91.811924 38.314453 91.673828 C 34.184148 91.347684 30.084337 89.197614 28.326172 85.314453 C 28.115079 84.561753 28.136163 84.658577 27.984375 84.298828 C 27.947876 87.648041 27.872988 90.999496 27.90625 94.34375 C 28.29862 96.296962 27.655866 97.754657 25.779297 98.611328 C 24.358436 100.42541 23.097809 97.522146 21.761719 96.851562 C 21.740308 91.932267 21.711712 87.013102 21.710938 82.09375 C 21.384553 78.426642 22.69303 74.108335 20.150391 70.982422 C 17.599809 68.196826 13.510119 67.403523 10.068359 68.625 C 6.1275426 70.107967 5.9229906 75.040951 6.4003906 78.53125 C 6.4290266 81.481399 8.4678219 83.974102 11.308594 84.865234 C 13.474555 86.099818 16.369383 84.48706 18.033203 86.630859 C 19.54993 87.604218 20.456575 88.597234 18.529297 89.746094 C 17.578559 91.063514 16.374324 91.848841 14.654297 91.449219 C 9.0774989 92.05394 3.7976583 88.494954 1.4902344 83.671875 C -0.04488973 78.980781 -0.38836169 73.727034 1.3164062 69.025391 C 2.8519359 64.46465 7.7770196 62.109701 12.427734 61.927734 C 12.86976 61.900615 13.310868 61.895097 13.751953 61.910156 C 19.62789 62.110771 25.280672 65.977643 27.228516 71.398438 C 27.243444 69.20336 27.253337 67.009692 27.238281 64.816406 C 27.235457 64.405 27.239822 63.993273 27.234375 63.582031 C 27.234377 63.170586 27.234377 62.759125 27.234375 62.347656 L 27.253906 62.347656 C 27.277524 57.217673 27.161962 52.082816 27.306641 46.960938 C 27.541605 40.83527 33.086329 35.553018 39.195312 35.554688 C 39.505925 35.540742 39.816311 35.585734 40.126953 35.591797 C 45.686022 35.749661 50.627312 40.151463 51.607422 45.589844 C 52.461365 49.409824 51.692368 53.946068 54.535156 57.044922 C 57.44807 60.103671 61.975374 59.622285 65.785156 59.267578 C 67.47279 59.360231 68.886411 60.773229 70.464844 61.392578 C 70.964612 61.634603 71.510027 61.878905 71.896484 62.115234 C 72.589851 61.874708 73.300921 61.688694 74.023438 61.5625 C 71.220489 58.850109 70.038094 54.912834 68.748047 51.308594 C 68.124943 50.529769 66.656451 52.786903 65.691406 53.214844 L 53.484375 53.214844 C 52.252547 51.505543 52.334554 49.355414 52.181641 47.357422 L 63.171875 47.357422 C 65.066228 46.931863 66.43685 48.390658 67.986328 49.207031 C 67.369449 47.58004 66.727733 45.950711 65.849609 44.443359 C 64.298434 40.667851 58.695549 40.608369 56.238281 43.46875 C 55.160906 43.995875 53.81617 42.400573 52.630859 42.064453 C 51.94305 41.355632 48.902274 40.993002 50.603516 39.931641 C 54.05101 35.810271 59.982339 34.421486 65.048828 35.875 C 69.060441 36.943618 71.567346 40.613118 72.853516 44.34375 C 74.779647 48.869557 75.567705 54.294171 79.451172 57.673828 C 82.141509 60.035493 87.287766 59.71894 88.564453 55.974609 C 89.55474 52.487237 89.633351 48.576981 88.322266 45.162109 C 87.07888 41.083445 81.252882 40.157723 78.4375 43.126953 C 77.444321 44.609 76.097724 42.702427 74.914062 42.345703 C 74.00787 41.686229 72.265867 41.14086 71.884766 40.404297 C 74.190489 37.625022 77.440075 35.534711 81.117188 35.332031 C 81.53767 35.300488 81.96217 35.281414 82.388672 35.275391 z M 39.765625 41.771484 C 36.525641 41.617178 33.571032 44.423314 33.523438 47.701172 C 33.14862 53.391219 33.511479 59.114095 33.419922 64.816406 L 33.416016 64.816406 L 33.416016 79.804688 C 32.905033 82.892803 35.720975 85.543114 38.714844 85.462891 C 39.226621 85.332638 39.583259 85.350138 39.841797 85.460938 C 42.131059 85.152946 44.376672 83.894069 44.748047 81.441406 C 44.928525 75.502367 44.763393 69.532777 44.820312 63.582031 C 44.820315 63.170586 44.820314 62.759125 44.820312 62.347656 L 44.851562 62.347656 L 51.001953 62.347656 L 51.033203 62.347656 L 51.033203 79.804688 C 50.528559 82.888604 53.341468 85.54358 56.333984 85.462891 C 56.84404 85.333076 57.200596 85.349248 57.458984 85.458984 C 59.57077 85.167553 61.629971 84.163491 62.238281 81.972656 C 62.785441 78.613554 62.195483 75.132977 62.648438 71.751953 C 63.422876 68.952316 65.157731 66.471852 67.417969 64.632812 C 61.904853 66.141459 55.726798 65.51095 51.023438 62.177734 C 46.786665 58.839551 46.328259 53.052207 45.705078 48.095703 C 45.614741 45.291496 43.48563 42.193836 40.416016 41.841797 C 40.198251 41.80445 39.981624 41.781771 39.765625 41.771484 z M 88.517578 64.681641 C 88.436826 64.714498 88.359188 64.75231 88.277344 64.783203 C 87.778489 64.912602 87.264483 65.019473 86.746094 65.113281 C 86.946848 65.302403 87.138696 65.499936 87.326172 65.701172 C 87.696242 65.332924 88.097543 64.995836 88.517578 64.681641 z M 76.955078 67.462891 C 75.856213 67.46617 74.747058 67.623755 73.707031 67.84375 C 71.390819 68.749955 68.709494 70.674881 68.675781 73.400391 L 79.882812 73.400391 C 81.410483 73.895528 82.778318 74.968172 84.208984 75.810547 C 84.273013 73.394171 84.413059 70.506578 82.001953 69.146484 C 80.590021 67.879373 78.786521 67.457425 76.955078 67.462891 z M 84.201172 76.666016 C 83.135586 77.531969 82.069388 78.397573 81.003906 79.263672 L 68.796875 79.263672 C 68.746527 79.190638 68.704665 79.113715 68.658203 79.039062 C 68.658216 79.068315 68.660204 79.097711 68.660156 79.126953 C 68.709041 79.455372 68.67107 79.879055 68.632812 80.314453 C 68.625125 80.498042 68.613889 80.680612 68.601562 80.863281 C 68.604655 81.18891 68.649491 81.490189 68.808594 81.710938 C 69.471812 84.116151 71.789205 85.209884 74.111328 85.443359 C 76.121866 85.413767 78.132022 85.386136 80.142578 85.357422 C 81.550501 85.761541 82.85989 86.643551 84.201172 87.353516 L 84.201172 76.666016 z "
+       transform="translate(-46.55321,504.50721)" />
+    <g
+       inkscape:label="Layer 1"
+       id="layer1-3"
+       transform="matrix(2.3320621,0,0,2.3320621,-53.514884,329.64869)">
+      <g
+         id="g1971"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         transform="matrix(1.3078354,0,0,1.2764336,50.58132,57.074084)" />
+    </g>
+  </g>
+</svg>
diff --git a/mac_osx/icons/neoqwertz-icon16.svg b/mac_osx/icons/neoqwertz-icon16.svg
new file mode 100644
index 00000000..97dcd7b8
--- /dev/null
+++ b/mac_osx/icons/neoqwertz-icon16.svg
@@ -0,0 +1,95 @@
+<?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"
+   width="134.47168"
+   height="134.47168"
+   id="svg44668"
+   sodipodi:version="0.32"
+   inkscape:version="1.0.2 (e86c8708, 2021-01-15)"
+   version="1.0"
+   sodipodi:docname="neoqwertz-icon16.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/Users/jgosmann/Documents/projects/neo-layout/mac_osx/test.iconset/icon_512x512.png"
+   inkscape:export-xdpi="365.51935"
+   inkscape:export-ydpi="365.51935">
+  <defs
+     id="defs44670">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 615.78477 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 615.78477 : 1"
+       inkscape:persp3d-origin="372.04724 : 440.39107 : 1"
+       id="perspective44676" />
+    <inkscape:path-effect
+       effect="bspline"
+       id="path-effect1275"
+       is_visible="true"
+       lpeversion="1"
+       weight="33.333333"
+       steps="2"
+       helper_size="0"
+       apply_no_weight="true"
+       apply_with_weight="true"
+       only_selected="false" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.0135942"
+     inkscape:cx="123.21627"
+     inkscape:cy="100.12569"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1323"
+     inkscape:window-x="1920"
+     inkscape:window-y="25"
+     inkscape:document-rotation="0"
+     inkscape:snap-page="true"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false" />
+  <metadata
+     id="metadata44673">
+    <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="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(46.55321,-504.50721)">
+    <path
+       id="rect896"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.00157;stroke-dasharray:2.00315, 2.00315"
+       d="M 19.513672 0 C 8.7026845 0 0 8.7026845 0 19.513672 L 0 114.95703 C 0 125.76802 8.7026845 134.47266 19.513672 134.47266 L 114.95703 134.47266 C 125.76802 134.47266 134.4707 125.76802 134.4707 114.95703 L 134.4707 19.513672 C 134.4707 8.7026845 125.76802 0 114.95703 0 L 19.513672 0 z M 81.568359 34.773438 C 84.392328 34.730124 87.289501 35.250106 89.677734 36.806641 C 95.096578 40.334234 96.787081 47.346406 96.130859 53.443359 C 96.118078 53.937384 96.06828 54.434688 96.001953 54.931641 C 96.700497 53.73791 97.960065 52.744599 98.78125 51.685547 C 99.069408 51.364708 99.356373 51.045448 99.644531 50.724609 C 101.09332 52.215355 102.54057 53.707378 103.99023 55.197266 C 103.9899 57.190082 103.98864 59.182965 103.98828 61.175781 C 109.19139 61.175037 114.39451 61.174498 119.59766 61.173828 C 120.10433 61.169045 120.6106 61.162598 121.11523 61.173828 C 121.13997 61.173825 121.16471 61.173832 121.18945 61.173828 C 121.18997 61.174573 121.19089 61.175036 121.19141 61.175781 C 123.29902 61.227164 125.38099 61.458573 127.36914 62.246094 C 131.97102 63.82843 134.15048 69.644073 132.06445 73.953125 C 129.56011 78.677114 124.32479 80.846429 120.14258 83.773438 C 122.92228 84.030107 125.71622 83.788271 128.50195 83.822266 C 130.78712 84.615909 132.41326 86.702212 134.45117 87.990234 C 132.52135 89.360026 130.7098 90.89306 128.71094 92.164062 C 125.11838 92.234743 121.50244 92.494169 117.92773 92.005859 C 116.01615 91.943912 114.32871 91.0569 113.06641 89.736328 C 112.4882 90.205342 111.76248 90.578846 111.20508 90.875 C 109.96509 92.199025 108.07392 92.657501 106.33398 92.160156 C 101.24833 91.601325 96.591307 87.667455 95.789062 82.517578 C 95.565227 78.196914 95.545284 73.867186 95.564453 69.535156 C 93.611201 69.582831 91.568403 70.031485 90.861328 72.027344 C 90.521407 78.737267 90.794668 85.478997 90.701172 92.201172 L 82.306641 92.201172 L 82.306641 92.134766 L 82.230469 92.134766 C 82.229754 91.769565 82.230906 91.404287 82.230469 91.039062 C 79.817814 91.651242 77.715456 91.361225 75.089844 91.142578 C 75.089828 91.144531 75.089859 91.146484 75.089844 91.148438 C 73.291381 91.081612 71.453189 91.04347 69.744141 90.412109 C 68.411717 90.025355 67.207509 89.343574 66.166016 88.466797 C 64.043292 90.664364 61.046299 91.902549 57.964844 92.306641 C 57.930209 92.333514 57.90206 92.36262 57.865234 92.388672 C 57.596195 92.405677 57.323915 92.400294 57.052734 92.402344 C 56.084894 92.477503 55.114768 92.475864 54.169922 92.392578 C 54.169627 92.311842 54.168272 92.231127 54.167969 92.150391 C 51.887938 91.723896 49.692668 90.781086 47.927734 89.324219 C 45.915293 90.999491 43.389918 92.071621 40.761719 92.279297 C 40.716495 92.315485 40.678007 92.353935 40.628906 92.388672 C 40.349004 92.406363 40.065427 92.396891 39.783203 92.398438 C 39.25533 92.564284 38.715964 92.532938 38.242188 92.328125 C 34.995987 92.011291 31.791265 90.66176 29.591797 88.292969 C 29.562058 90.09246 29.547583 91.89156 29.583984 93.685547 C 30.245589 96.103719 28.561394 98.28768 26.482422 99.369141 C 24.192153 100.67713 22.815992 97.769828 21.132812 96.832031 C 21.115208 94.274435 21.114556 91.71584 21.103516 89.158203 C 19.692999 90.585821 18.140976 92.541828 15.818359 92.201172 C 10.209865 92.68986 4.6226885 89.615034 1.9316406 84.8125 C -0.16931877 80.272607 -0.4848713 74.943556 0.72460938 70.115234 C 1.7958134 64.477316 7.6023954 60.940359 13.201172 60.855469 C 13.648883 60.829954 14.097908 60.82646 14.544922 60.841797 C 19.154749 60.999956 23.653802 63.285883 26.513672 66.802734 C 26.51485 66.563033 26.511181 66.32365 26.511719 66.083984 L 26.494141 66.083984 C 26.502452 65.541701 26.501256 64.999336 26.505859 64.457031 C 26.502004 63.791729 26.510966 63.125747 26.498047 62.460938 L 26.498047 61.253906 L 26.521484 61.253906 C 26.519096 57.316952 26.474605 53.379814 26.537109 49.443359 C 26.18318 44.990025 28.104746 40.44186 31.710938 37.763672 C 36.970075 33.453231 45.433903 34.430584 49.71875 39.654297 C 51.434328 37.675326 53.737716 36.221683 56.248047 35.480469 C 61.345842 33.914342 67.732397 34.968859 70.939453 39.574219 C 73.308668 37.161244 76.71138 34.937039 80.363281 34.824219 C 80.762006 34.796416 81.164935 34.779625 81.568359 34.773438 z M 81.777344 43.162109 C 80.37454 43.214084 79.104813 43.904517 78.193359 44.980469 C 76.409101 46.260517 74.700023 44.249611 73.136719 43.5625 C 74.905839 47.551163 75.602732 52.073808 78.291016 55.609375 C 79.868134 58.161252 84.016631 59.2319 86.09375 56.726562 C 87.473217 53.905186 87.448481 50.491983 86.773438 47.466797 C 86.464889 45.232633 84.757109 43.212952 82.386719 43.179688 C 82.181567 43.160342 81.977744 43.154684 81.777344 43.162109 z M 61.033203 43.242188 C 59.684132 43.162796 58.253112 43.565935 57.261719 44.511719 C 55.892872 46.231522 53.767606 44.70896 52.382812 43.847656 C 52.102799 44.164708 52.873247 45.726315 52.869141 46.587891 C 54.875259 46.587893 56.882553 46.587891 58.888672 46.587891 C 60.955431 46.794389 63.094914 46.188014 65.097656 46.816406 C 64.400164 45.058337 63.155818 43.218756 61.033203 43.242188 z M 39.613281 43.558594 C 37.600499 43.684318 35.611808 45.102465 35.1875 47.195312 C 34.599105 53.468787 35.094775 59.790322 34.964844 66.083984 L 34.960938 66.083984 L 34.960938 79.3125 C 34.417529 81.64301 36.489742 83.929673 38.824219 83.863281 C 39.26722 83.712359 39.711763 83.725013 40.123047 83.839844 C 41.618577 83.587088 43.004117 82.900212 43.546875 81.390625 C 43.685392 78.856853 43.71161 76.314816 43.712891 73.771484 C 43.714973 73.072212 43.710595 72.3733 43.716797 71.673828 C 43.700277 68.601805 43.658615 65.528509 43.703125 62.460938 L 43.703125 61.253906 L 43.734375 61.253906 L 48.302734 61.253906 C 46.591557 59.007136 45.61756 56.14444 45.230469 53.365234 C 44.48353 50.535881 45.194996 47.103792 42.929688 44.861328 C 42.037185 43.873252 40.82095 43.483159 39.613281 43.558594 z M 67.585938 53.427734 C 67.174385 53.384555 66.518038 54.362578 65.865234 54.613281 C 63.265733 54.899154 60.514567 54.650553 57.857422 54.734375 C 56.844902 54.942553 54.505556 54.307059 54.363281 55.070312 C 56.055869 58.60998 60.504195 58.73248 63.888672 58.375 C 66.607115 57.626751 68.740317 59.701755 71.046875 60.697266 C 69.826586 58.990177 69.003205 57.040871 68.261719 55.089844 C 68.165528 54.821046 68.068844 54.553954 67.972656 54.285156 C 67.909362 53.679208 67.773004 53.447361 67.585938 53.427734 z M 95.535156 57.140625 C 95.114826 58.578884 94.485972 59.96917 93.658203 61.21875 C 93.954272 61.196073 94.250208 61.177636 94.546875 61.177734 C 94.895836 61.177645 95.24479 61.177818 95.59375 61.177734 C 95.594032 59.930091 95.600763 58.682416 95.585938 57.435547 C 95.561192 57.335057 95.550187 57.238063 95.535156 57.140625 z M 52.197266 64.460938 L 52.197266 79.3125 C 51.664512 81.636119 53.729702 83.929217 56.060547 83.863281 C 56.489787 83.717047 56.921529 83.721853 57.322266 83.826172 C 58.582549 83.631456 59.750208 83.160053 60.494141 82.03125 C 61.477938 78.883848 60.664108 75.4709 61.080078 72.222656 C 61.434978 70.142345 62.323234 68.217329 63.570312 66.541016 C 59.7832 66.913432 55.919322 66.343047 52.496094 64.607422 C 52.393142 64.562898 52.296871 64.509688 52.197266 64.460938 z M 75.980469 68.658203 C 73.470731 68.709486 70.976167 69.83209 69.775391 72.068359 L 79.214844 72.068359 C 80.292328 72.350458 81.272477 72.861737 82.226562 73.439453 C 82.226343 73.377628 82.226793 73.31573 82.226562 73.253906 C 82.328886 71.395029 80.942827 70.074206 79.417969 69.296875 C 78.362803 68.849529 77.170626 68.633884 75.980469 68.658203 z M 14.710938 69.273438 C 13.874064 69.218744 13.024185 69.272645 12.208984 69.470703 C 8.3337862 70.226719 8.0782202 74.812895 8.5097656 77.890625 C 8.2630983 81.329848 11.902455 84.000204 15.005859 83.826172 C 17.483668 83.489613 19.627603 84.952617 21.080078 86.748047 C 21.087836 83.185178 21.010941 79.422942 21.105469 75.783203 C 21.426672 72.223296 18.179473 69.398769 14.710938 69.273438 z M 103.98633 69.572266 C 103.98573 72.850875 103.98493 76.129594 103.98438 79.408203 C 103.51241 81.539355 105.11188 83.562393 107.22461 83.824219 C 108.56361 83.861287 109.72941 84.447243 110.82227 85.179688 C 110.64801 84.001803 110.73772 82.788899 111.1543 81.644531 C 113.10609 77.137263 118.10824 75.393733 121.83984 72.701172 C 122.72099 71.873785 124.31985 71.343298 124.37109 69.996094 C 122.80242 69.734063 121.2156 69.620345 119.62109 69.572266 L 115.46289 69.572266 C 113.32534 69.619021 111.18584 69.695963 109.06445 69.666016 C 109.06374 69.634762 109.06321 69.603519 109.0625 69.572266 L 103.98633 69.572266 z M 82.228516 79.007812 C 81.731707 79.411473 81.235011 79.814992 80.738281 80.21875 L 69.396484 80.21875 C 69.357191 81.115243 69.272379 82.002365 69.095703 82.871094 C 69.606272 83.55387 70.301906 84.060097 71.085938 84.419922 C 71.086123 84.416398 71.085744 84.413686 71.085938 84.410156 C 73.873895 84.366808 76.188559 84.384361 78.976562 84.34375 L 79.660156 84.234375 C 80.547845 84.536065 81.393623 84.860262 82.228516 85.199219 C 82.230715 83.135125 82.22818 81.071626 82.228516 79.007812 z "
+       transform="translate(-46.55321,504.50721)" />
+    <g
+       inkscape:label="Layer 1"
+       id="layer1-3"
+       transform="matrix(2.2815029,0,0,2.2815029,-52.302983,334.90553)">
+      <g
+         id="g1971"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         transform="matrix(1.3078354,0,0,1.2764336,50.58132,57.074084)" />
+    </g>
+  </g>
+</svg>
diff --git a/mac_osx/neo-layouts.bundle/Contents/Info.plist b/mac_osx/neo-layouts.bundle/Contents/Info.plist
index c90a5034..ec420489 100644
--- a/mac_osx/neo-layouts.bundle/Contents/Info.plist
+++ b/mac_osx/neo-layouts.bundle/Contents/Info.plist
@@ -12,6 +12,8 @@
 	<dict>
 		<key>TICapsLockLanguageSwitchCapable</key>
 		<false/>
+		<key>TISIconIsTemplate</key>
+		<true/>
 		<key>TISInputSourceID</key>
 		<string>org.sil.ukelele.keyboardlayout.neo.deutsch(bone)</string>
 		<key>TISIntendedLanguage</key>
@@ -21,6 +23,8 @@
 	<dict>
 		<key>TICapsLockLanguageSwitchCapable</key>
 		<false/>
+		<key>TISIconIsTemplate</key>
+		<true/>
 		<key>TISInputSourceID</key>
 		<string>org.sil.ukelele.keyboardlayout.neo.deutsch(neo2)</string>
 		<key>TISIntendedLanguage</key>
@@ -30,6 +34,8 @@
 	<dict>
 		<key>TICapsLockLanguageSwitchCapable</key>
 		<false/>
+		<key>TISIconIsTemplate</key>
+		<true/>
 		<key>TISInputSourceID</key>
 		<string>org.sil.ukelele.keyboardlayout.neo.deutsch(neoqwertz)</string>
 		<key>TISIntendedLanguage</key>
diff --git a/mac_osx/neo-layouts.bundle/Contents/Resources/Deutsch (Bone).icns b/mac_osx/neo-layouts.bundle/Contents/Resources/Deutsch (Bone).icns
index e8c082c5..22b83ba7 100644
Binary files a/mac_osx/neo-layouts.bundle/Contents/Resources/Deutsch (Bone).icns and b/mac_osx/neo-layouts.bundle/Contents/Resources/Deutsch (Bone).icns differ
diff --git a/mac_osx/neo-layouts.bundle/Contents/Resources/Deutsch (Neo 2).icns b/mac_osx/neo-layouts.bundle/Contents/Resources/Deutsch (Neo 2).icns
index a305cf76..8eeec8ee 100644
Binary files a/mac_osx/neo-layouts.bundle/Contents/Resources/Deutsch (Neo 2).icns and b/mac_osx/neo-layouts.bundle/Contents/Resources/Deutsch (Neo 2).icns differ
diff --git a/mac_osx/neo-layouts.bundle/Contents/Resources/Deutsch (NeoQwertz).icns b/mac_osx/neo-layouts.bundle/Contents/Resources/Deutsch (NeoQwertz).icns
index 4a5df555..8558165a 100644
Binary files a/mac_osx/neo-layouts.bundle/Contents/Resources/Deutsch (NeoQwertz).icns and b/mac_osx/neo-layouts.bundle/Contents/Resources/Deutsch (NeoQwertz).icns differ