Try to align macOS prefs icons to the pixel grid better.

33 files changed, 198 insertions, 184 deletions

diff --git a/graphics/osx/preferences/advanced.png b/graphics/osx/preferences/advanced.png
index e8cda650b..5816e3ffc 100644
--- a/graphics/osx/preferences/advanced.png
+++ b/graphics/osx/preferences/advanced.png
diff --git a/graphics/osx/preferences/advanced@2x.png b/graphics/osx/preferences/advanced@2x.png
index 640709093..744da9753 100644
--- a/graphics/osx/preferences/advanced@2x.png
+++ b/graphics/osx/preferences/advanced@2x.png
diff --git a/graphics/osx/preferences/cover_sheet.png b/graphics/osx/preferences/cover_sheet.png
index 0f1ca4195..df6505042 100644
--- a/graphics/osx/preferences/cover_sheet.png
+++ b/graphics/osx/preferences/cover_sheet.png
diff --git a/graphics/osx/preferences/cover_sheet@2x.png b/graphics/osx/preferences/cover_sheet@2x.png
index 08cab6bf9..cacbd72c8 100644
--- a/graphics/osx/preferences/cover_sheet@2x.png
+++ b/graphics/osx/preferences/cover_sheet@2x.png
diff --git a/graphics/osx/preferences/defaults.png b/graphics/osx/preferences/defaults.png
index 0c486db8e..baf56f341 100644
--- a/graphics/osx/preferences/defaults.png
+++ b/graphics/osx/preferences/defaults.png
diff --git a/graphics/osx/preferences/defaults@2x.png b/graphics/osx/preferences/defaults@2x.png
index 7520ebf3d..ca8912dae 100644
--- a/graphics/osx/preferences/defaults@2x.png
+++ b/graphics/osx/preferences/defaults@2x.png
diff --git a/graphics/osx/preferences/email.png b/graphics/osx/preferences/email.png
index f3fb11813..f4a67e835 100644
--- a/graphics/osx/preferences/email.png
+++ b/graphics/osx/preferences/email.png
diff --git a/graphics/osx/preferences/email@2x.png b/graphics/osx/preferences/email@2x.png
index 3495fbaeb..ea4d93ea4 100644
--- a/graphics/osx/preferences/email@2x.png
+++ b/graphics/osx/preferences/email@2x.png
diff --git a/graphics/osx/preferences/general.png b/graphics/osx/preferences/general.png
index 6f090f5a9..f0beebeb5 100644
--- a/graphics/osx/preferences/general.png
+++ b/graphics/osx/preferences/general.png
diff --git a/graphics/osx/preferences/general@2x.png b/graphics/osx/preferences/general@2x.png
index aa2d78f0f..004e8eb2b 100644
--- a/graphics/osx/preferences/general@2x.png
+++ b/graphics/osx/preferences/general@2x.png
diff --git a/graphics/osx/preferences/identifiers.png b/graphics/osx/preferences/identifiers.png
index 4642e48b5..29adb7986 100644
--- a/graphics/osx/preferences/identifiers.png
+++ b/graphics/osx/preferences/identifiers.png
diff --git a/graphics/osx/preferences/identifiers@2x.png b/graphics/osx/preferences/identifiers@2x.png
index 523f7b8fc..6ae6e5a9c 100644
--- a/graphics/osx/preferences/identifiers@2x.png
+++ b/graphics/osx/preferences/identifiers@2x.png
diff --git a/graphics/osx/preferences/kdm_email.png b/graphics/osx/preferences/kdm_email.png
index 5c695f1c0..7ade6bdfd 100644
--- a/graphics/osx/preferences/kdm_email.png
+++ b/graphics/osx/preferences/kdm_email.png
diff --git a/graphics/osx/preferences/kdm_email@2x.png b/graphics/osx/preferences/kdm_email@2x.png
index 479b04ccf..ffe89f703 100644
--- a/graphics/osx/preferences/kdm_email@2x.png
+++ b/graphics/osx/preferences/kdm_email@2x.png
diff --git a/graphics/osx/preferences/keys.png b/graphics/osx/preferences/keys.png
index b9bee0f7e..61c845175 100644
--- a/graphics/osx/preferences/keys.png
+++ b/graphics/osx/preferences/keys.png
diff --git a/graphics/osx/preferences/keys@2x.png b/graphics/osx/preferences/keys@2x.png
index ab3dae8bb..71d2b6447 100644
--- a/graphics/osx/preferences/keys@2x.png
+++ b/graphics/osx/preferences/keys@2x.png
diff --git a/graphics/osx/preferences/locations@2x.png b/graphics/osx/preferences/locations@2x.png
index d6ef5ac3b..c10b4af10 100644
--- a/graphics/osx/preferences/locations@2x.png
+++ b/graphics/osx/preferences/locations@2x.png
diff --git a/graphics/osx/preferences/notifications.png b/graphics/osx/preferences/notifications.png
index a2d13ee73..4d95aa73f 100644
--- a/graphics/osx/preferences/notifications.png
+++ b/graphics/osx/preferences/notifications.png
diff --git a/graphics/osx/preferences/notifications@2x.png b/graphics/osx/preferences/notifications@2x.png
index 64a2a4e5d..f6dcd24bb 100644
--- a/graphics/osx/preferences/notifications@2x.png
+++ b/graphics/osx/preferences/notifications@2x.png
diff --git a/graphics/osx/preferences/servers.png b/graphics/osx/preferences/servers.png
index 1a25d4e0b..bd9afaac8 100644
--- a/graphics/osx/preferences/servers.png
+++ b/graphics/osx/preferences/servers.png
diff --git a/graphics/osx/preferences/servers@2x.png b/graphics/osx/preferences/servers@2x.png
index f985f5572..e9e57d50e 100644
--- a/graphics/osx/preferences/servers@2x.png
+++ b/graphics/osx/preferences/servers@2x.png
diff --git a/graphics/osx/preferences/sound.png b/graphics/osx/preferences/sound.png
index a14ca262e..80f3a6abf 100644
--- a/graphics/osx/preferences/sound.png
+++ b/graphics/osx/preferences/sound.png
diff --git a/graphics/osx/preferences/sound@2x.png b/graphics/osx/preferences/sound@2x.png
index eef410e1e..c0dca97a2 100644
--- a/graphics/osx/preferences/sound@2x.png
+++ b/graphics/osx/preferences/sound@2x.png
diff --git a/graphics/osx/preferences/tms.png b/graphics/osx/preferences/tms.png
index 6faaad9da..f8103d6c7 100644
--- a/graphics/osx/preferences/tms.png
+++ b/graphics/osx/preferences/tms.png
diff --git a/graphics/osx/preferences/tms@2x.png b/graphics/osx/preferences/tms@2x.png
index ce8e5dc60..c8006ce5a 100644
--- a/graphics/osx/preferences/tms@2x.png
+++ b/graphics/osx/preferences/tms@2x.png
diff --git a/graphics/src/preferences.svg b/graphics/src/preferences.svg
index 3ddab1e02..b5590a0a8 100644
--- a/graphics/src/preferences.svg
+++ b/graphics/src/preferences.svg
@@ -9,7 +9,7 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    sodipodi:docname="preferences.svg"
-   inkscape:version="1.0 (4035a4f, 2020-05-01)"
+   inkscape:version="1.0.2 (e86c870, 2021-01-15)"
    id="svg8"
    version="1.1"
    viewBox="0 0 8.4666796 8.4666595"
@@ -47,18 +47,18 @@
      inkscape:guide-bbox="true"
      showguides="false"
      inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="1680"
-     inkscape:window-height="1043"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="1016"
      inkscape:window-width="1920"
      showborder="true"
-     showgrid="false"
+     showgrid="true"
      inkscape:document-rotation="0"
-     inkscape:current-layer="layer3"
+     inkscape:current-layer="layer2"
      inkscape:document-units="mm"
-     inkscape:cy="112.643"
-     inkscape:cx="-193.3016"
-     inkscape:zoom="2.0000001"
+     inkscape:cy="30.609564"
+     inkscape:cx="-195.24555"
+     inkscape:zoom="2"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
      borderopacity="1.0"
@@ -249,6 +249,9 @@
        id="guide1119"
        orientation="1,0"
        position="25.399995,-46.96181" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid1934" />
   </sodipodi:namedview>
   <metadata
      id="metadata5">
@@ -271,103 +274,103 @@
     <image
        sodipodi:absref="/home/carl/src/dcpomatic/graphics/src/no_tick.svg"
        xlink:href="no_tick.svg"
-       id="image2055"
-       height="68.000031"
-       width="68.000031"
-       inkscape:svg-dpi="96"
-       preserveAspectRatio="none"
+       y="98.565674"
        x="249.30568"
-       y="98.565674" />
+       preserveAspectRatio="none"
+       inkscape:svg-dpi="96"
+       width="68.000031"
+       height="68.000031"
+       id="image2055" />
     <image
        sodipodi:absref="/home/carl/src/dcpomatic/graphics/src/defaults.svg"
        xlink:href="defaults.svg"
-       id="image1269"
-       height="8.4666662"
-       width="8.4666662"
-       inkscape:svg-dpi="96"
-       preserveAspectRatio="none"
+       y="126.41271"
        x="120.21528"
-       y="126.41271" />
+       preserveAspectRatio="none"
+       inkscape:svg-dpi="96"
+       width="8.4666662"
+       height="8.4666662"
+       id="image1269" />
     <image
        sodipodi:absref="/home/carl/src/dcpomatic/graphics/src/email.svg"
        xlink:href="email.svg"
-       id="image1397"
-       height="8.4666662"
-       width="8.4666662"
-       inkscape:svg-dpi="96"
-       preserveAspectRatio="none"
+       y="126.41271"
        x="171.01529"
-       y="126.41271" />
+       preserveAspectRatio="none"
+       inkscape:svg-dpi="96"
+       width="8.4666662"
+       height="8.4666662"
+       id="image1397" />
     <image
        sodipodi:absref="/home/carl/src/dcpomatic/graphics/src/kdm_email.svg"
        xlink:href="kdm_email.svg"
-       id="image1684"
-       height="8.4666662"
-       width="8.4666662"
-       inkscape:svg-dpi="96"
-       preserveAspectRatio="none"
+       y="126.41271"
        x="183.71527"
-       y="126.41271" />
+       preserveAspectRatio="none"
+       inkscape:svg-dpi="96"
+       width="8.4666662"
+       height="8.4666662"
+       id="image1684" />
     <image
        sodipodi:absref="/home/carl/src/dcpomatic/graphics/src/keys.svg"
        xlink:href="keys.svg"
-       id="image1948"
-       height="8.4666662"
-       width="8.4666662"
-       inkscape:svg-dpi="96"
-       preserveAspectRatio="none"
+       y="126.41271"
        x="145.61531"
-       y="126.41271" />
+       preserveAspectRatio="none"
+       inkscape:svg-dpi="96"
+       width="8.4666662"
+       height="8.4666662"
+       id="image1948" />
     <image
        sodipodi:absref="/home/carl/src/dcpomatic/graphics/src/sound.svg"
        xlink:href="sound.svg"
-       id="image2205"
-       height="8.4666662"
-       width="8.4666662"
-       inkscape:svg-dpi="96"
-       preserveAspectRatio="none"
+       y="126.41271"
        x="107.51526"
-       y="126.41271" />
+       preserveAspectRatio="none"
+       inkscape:svg-dpi="96"
+       width="8.4666662"
+       height="8.4666662"
+       id="image2205" />
     <image
        sodipodi:absref="/home/carl/src/dcpomatic/graphics/src/cover_sheet.svg"
        xlink:href="cover_sheet.svg"
-       id="image2404"
-       height="8.4666662"
-       width="8.4666662"
-       inkscape:svg-dpi="96"
-       preserveAspectRatio="none"
+       y="126.41271"
        x="209.11526"
-       y="126.41271" />
+       preserveAspectRatio="none"
+       inkscape:svg-dpi="96"
+       width="8.4666662"
+       height="8.4666662"
+       id="image2404" />
     <image
        sodipodi:absref="/home/carl/src/dcpomatic/graphics/src/identifiers.svg"
        xlink:href="identifiers.svg"
-       id="image2657"
-       height="8.4666662"
-       width="8.4666662"
-       inkscape:svg-dpi="96"
-       preserveAspectRatio="none"
+       y="126.41271"
        x="221.81526"
-       y="126.41271" />
+       preserveAspectRatio="none"
+       inkscape:svg-dpi="96"
+       width="8.4666662"
+       height="8.4666662"
+       id="image2657" />
     <image
        sodipodi:absref="/home/carl/src/dcpomatic/graphics/src/tms.svg"
        xlink:href="tms.svg"
-       id="image2918"
-       height="8.4666662"
-       width="8.4666662"
-       inkscape:svg-dpi="96"
-       preserveAspectRatio="none"
+       y="126.41271"
        x="158.31528"
-       y="126.41271" />
+       preserveAspectRatio="none"
+       inkscape:svg-dpi="96"
+       width="8.4666662"
+       height="8.4666662"
+       id="image2918" />
     <image
        sodipodi:absref="/home/carl/src/dcpomatic/graphics/src/notifications.svg"
        xlink:href="notifications.svg"
-       id="image3199"
-       height="8.4666662"
-       width="8.4666662"
-       inkscape:svg-dpi="96"
-       preserveAspectRatio="none"
+       y="126.41271"
        x="196.41527"
-       y="126.41271" />
+       preserveAspectRatio="none"
+       inkscape:svg-dpi="96"
+       width="8.4666662"
+       height="8.4666662"
+       id="image3199" />
     <image
        id="image3559"
        xlink:href="data:image/png;base64,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 AABJRU5ErkJggg== "
@@ -401,12 +404,12 @@
      style="display:inline"
      transform="translate(-221.81526,-142.13316)">
     <rect
-       y="145.02267"
-       x="108.54684"
-       height="2.5909741"
-       width="1.6526426"
+       y="145.04358"
+       x="108.57359"
+       height="2.6458309"
+       width="1.5875002"
        id="rect4197"
-       style="vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+       style="vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     <path
        sodipodi:open="true"
        sodipodi:arc-type="arc"
@@ -418,75 +421,76 @@
        sodipodi:cx="110.9753"
        sodipodi:type="arc"
        id="path4260"
-       style="font-variation-settings:normal;vector-effect:none;fill:none;fill-opacity:1;stroke:#8e0b0b;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       style="font-variation-settings:normal;vector-effect:none;fill:none;fill-opacity:1;stroke:#8e0b0b;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
        d="m 114.16903,143.69144 a 4.0784903,4.2965121 0 0 1 0.11277,5.18751" />
     <path
        sodipodi:nodetypes="ccccc"
        id="path4276"
-       d="m 110.19948,145.02267 2.76597,-2.07645 v 6.67313 l -2.76597,-2.0057 z"
-       style="fill:#d1c9c9;fill-opacity:1;stroke:#2e3436;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       d="m 110.16109,145.04358 2.64584,-2.11667 v 6.87917 l -2.64584,-2.11667 z"
+       style="fill:#d1c9c9;fill-opacity:1;stroke:#2e3436;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
        sodipodi:nodetypes="cc"
        id="path4285"
-       d="m 123.5803,143.69143 h 3.38296"
-       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
+       d="m 123.65484,143.72066 h 3.43959"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
     <path
        sodipodi:nodetypes="ccc"
        id="path4309"
        d="m 123.0911,142.96076 -1.36064,1.74783 -0.66542,-0.57233"
-       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#8e0b0b;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#8e0b0b;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
     <path
-       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
-       d="m 123.5803,148.87895 h 3.38296"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 123.65484,149.01233 h 3.43959"
        id="path4285-2"
        sodipodi:nodetypes="cc" />
     <path
        sodipodi:nodetypes="cc"
        id="path4285-2-8"
-       d="m 123.5803,146.2852 h 3.38296"
-       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
+       d="m 123.65484,146.36649 h 3.43959"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
     <g
-       style="display:inline;fill:#ececec;fill-opacity:1;stroke-width:0.4;stroke-miterlimit:4;stroke-dasharray:none"
+       style="display:inline;fill:#ececec;fill-opacity:1;stroke-width:0.3;stroke-miterlimit:4;stroke-dasharray:none"
        transform="translate(-25.445433)"
        id="g5160">
       <path
-         style="font-variation-settings:normal;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
-         d="m 173.86125,146.3665 h 4.74727"
+         style="font-variation-settings:normal;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+         d="m 173.97111,146.36649 4.7625,0"
          id="path4562"
          sodipodi:nodetypes="cc" />
       <circle
-         style="font-variation-settings:normal;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+         style="font-variation-settings:normal;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
          id="path4580"
          cx="172.9473"
          cy="146.3665"
          r="1.0585326" />
       <rect
-         style="font-variation-settings:normal;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+         style="font-variation-settings:normal;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
          id="rect4582"
-         width="0.86545199"
-         height="0.76027274"
-         x="177.74307"
+         width="1.058332"
+         height="0.79374248"
+         x="177.67528"
          y="146.3665" />
     </g>
     <rect
-       y="143.7142"
-       x="171.66367"
-       height="5.1647463"
-       width="7.1288085"
+       y="143.72066"
+       x="171.54443"
+       height="5.2916694"
+       width="7.4083266"
        id="rect4591"
-       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
     <path
        id="path4718"
-       d="m 171.66367,143.99188 3.55582,3.12885 3.57299,-3.12885"
-       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
+       d="m 171.54443,143.72066 3.70424,3.44448 3.70409,-3.44448"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.294928;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       sodipodi:nodetypes="ccc" />
     <path
        id="path4720"
        d="m 171.66367,148.87895 2.51078,-2.86569"
-       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
        sodipodi:nodetypes="cc" />
     <path
-       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
-       d="m 176.24661,146.01457 2.54588,2.86438"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 176.30693,146.10191 2.64583,2.91042"
        id="path4720-0"
        sodipodi:nodetypes="cc" />
     <circle
@@ -494,21 +498,21 @@
        cy="146.3665"
        cx="200.67569"
        id="path4787"
-       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
     <path
        sodipodi:nodetypes="ccccc"
        id="path4877"
        d="m 200.31495,147.28816 -0.20355,-3.25948 1.10682,-8.8e-4 -0.21968,3.25753 z"
-       style="display:inline;fill:#8e0b0b;fill-opacity:1;stroke:#8e0b0b;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="display:inline;fill:#8e0b0b;fill-opacity:1;stroke:#8e0b0b;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <rect
        y="148.26013"
        x="200.42728"
        height="0.47716767"
        width="0.47716767"
        id="rect4879"
-       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#8e0b0b;fill-opacity:1;stroke:#8e0b0b;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#8e0b0b;fill-opacity:1;stroke:#8e0b0b;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
     <rect
-       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
        id="rect4416-5"
        width="6.4650216"
        height="8.4666433"
@@ -516,60 +520,65 @@
        y="142.13318" />
     <path
        id="path4911"
-       d="m 211.15914,143.7142 h 4.63676"
-       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
+       d="m 211.23193,143.72066 h 4.49791"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       sodipodi:nodetypes="cc" />
     <path
        sodipodi:nodetypes="cc"
-       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
-       d="m 211.15914,145.00539 h 1.99012"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 211.23193,145.04358 1.85208,0"
        id="path4911-6" />
     <path
        id="path4911-6-9"
-       d="m 211.15914,146.29658 h 2.98693"
-       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 211.23193,146.36649 h 2.91041"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
        sodipodi:nodetypes="cc" />
     <path
        id="path4911-6-2"
-       d="m 211.15914,147.58776 h 3.68329"
-       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 211.23193,147.68941 h 3.70416"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
        sodipodi:nodetypes="cc" />
     <path
        id="path4911-6-24"
-       d="m 211.15914,148.87895 h 1.4523"
-       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 211.23193,149.01233 h 1.5875"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
        sodipodi:nodetypes="cc" />
     <rect
-       y="142.94623"
-       x="134.55936"
-       height="6.6731153"
-       width="5.0845227"
+       y="142.92691"
+       x="134.50276"
+       height="6.8791661"
+       width="5.2916646"
        id="rect4416"
-       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#cecece;fill-opacity:1;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#cecece;fill-opacity:1;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
     <path
        id="path4422"
-       d="m 135.52506,145.35531 h 3.1472"
-       style="font-variation-settings:normal;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
+       d="m 135.56109,145.30816 h 3.175"
+       style="font-variation-settings:normal;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       sodipodi:nodetypes="cc" />
     <path
-       style="font-variation-settings:normal;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
-       d="m 135.53091,146.56144 h 3.1472"
-       id="path4422-5" />
+       style="font-variation-settings:normal;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       d="m 135.56109,146.36649 3.175,0"
+       id="path4422-5"
+       sodipodi:nodetypes="cc" />
     <path
        id="path4422-5-3"
-       d="m 135.51576,144.14918 h 3.1472"
-       style="font-variation-settings:normal;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
+       d="m 135.56109,144.24983 3.175,0"
+       style="font-variation-settings:normal;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       sodipodi:nodetypes="cc" />
     <path
        id="path4981"
-       d="m 135.51578,148.62202 h 0.54759"
-       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ef2929;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
+       d="m 135.56109,148.74774 h 0.52917"
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ef2929;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       sodipodi:nodetypes="cc" />
     <rect
        ry="0.99999976"
        rx="0.99999988"
-       y="143.71419"
-       x="222.1404"
-       height="4.979321"
-       width="7.8164029"
+       y="143.72066"
+       x="222.07985"
+       height="5.0270858"
+       width="7.9374943"
        id="rect5003"
-       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
     <path
        transform="scale(1,-1)"
        sodipodi:arc-type="slice"
@@ -600,58 +609,60 @@
     <path
        id="path5026"
        d="m 226.57294,144.75045 h 2.36493"
-       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
     <path
-       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
        d="m 226.54079,147.61365 h 2.36493"
        id="path5026-8" />
     <path
        id="path5026-8-9"
        d="m 226.56467,146.18205 h 2.36493"
-       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#d3b88b;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:none;fill-opacity:1;stroke:#d3b88b;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
     <rect
-       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
        id="rect4591-6"
-       width="7.1288085"
-       height="5.1647463"
-       x="184.3895"
-       y="145.18488" />
+       width="6.8791738"
+       height="5.0270767"
+       x="184.509"
+       y="145.30817" />
     <path
-       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
-       d="m 184.38949,145.39967 3.55582,3.40801 3.57299,-3.40801"
-       id="path4718-8" />
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.288436;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 184.50901,145.57274 3.4363,3.23494 3.44287,-3.23494"
+       id="path4718-8"
+       sodipodi:nodetypes="ccc" />
     <path
        sodipodi:nodetypes="cc"
-       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
-       d="m 184.38949,150.34962 2.50742,-2.73597"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       d="m 184.50901,150.33524 2.38125,-2.64583"
        id="path4720-02" />
     <path
        sodipodi:nodetypes="cc"
        id="path4720-0-1"
-       d="m 188.96945,147.61365 2.54886,2.73597"
-       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
+       d="m 189.00693,147.68941 2.38125,2.64583"
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
     <g
-       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
        transform="translate(12.712143,-2.8854687)"
        id="g5160-5">
       <path
          sodipodi:nodetypes="cc"
          id="path4562-1"
-         d="m 173.86125,146.3665 h 4.74727"
-         style="font-variation-settings:normal;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
+         d="m 173.86125,146.3665 4.81478,-0.0249"
+         style="font-variation-settings:normal;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
       <circle
          r="1.0585326"
          cy="146.3665"
          cx="172.9473"
          id="path4580-1"
-         style="font-variation-settings:normal;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
+         style="font-variation-settings:normal;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
       <rect
-         y="146.3665"
-         x="177.74307"
-         height="0.76027274"
-         width="0.86545199"
+         y="146.34155"
+         x="177.61771"
+         height="0.79375434"
+         width="1.0583403"
          id="rect4582-0"
-         style="font-variation-settings:normal;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
+         style="font-variation-settings:normal;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#3f3f3f;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         ry="0" />
     </g>
     <rect
        y="156.3499"
@@ -686,24 +697,26 @@
     <g
        id="g1518"
        transform="matrix(0.93404586,0,0,1,10.736549,0)"
-       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#d1c9c9;fill-opacity:1;stroke:#2e3436;stroke-width:0.413881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1">
+       style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#d1c9c9;fill-opacity:1;stroke:#2e3436;stroke-width:0.31041104;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1">
       <path
-         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#d1c9c9;fill-opacity:1;stroke:#2e3436;stroke-width:0.413881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
-         d="m 159.09865,143.7142 h 6.83783 c 0.38795,0.51491 0.50446,0.60158 0.82855,0.87216 v 3.37102 c -0.44611,0.23146 -0.54308,0.43076 -0.80964,0.92157 h -6.8815 c -0.19534,-0.47189 -0.3691,-0.61482 -0.77552,-0.84265 v -3.44727 c 0.46373,-0.26661 0.65068,-0.49799 0.80028,-0.87483 z"
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#d1c9c9;fill-opacity:1;stroke:#2e3436;stroke-width:0.31041104;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 159.41576,143.72066 6.23185,0 c 0.38795,0.51491 0.80897,0.78775 1.13306,1.05833 l 0,2.91042 c -0.44611,0.23146 -0.8665,0.56752 -1.13306,1.05833 h -6.23185 c -0.19534,-0.47189 -0.72665,-0.8305 -1.13307,-1.05833 l 0,-2.90996 c 0.46373,-0.26661 0.98347,-0.68195 1.13307,-1.05879 z"
          id="path5271"
          sodipodi:nodetypes="ccccccccc" />
       <path
-         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#d1c9c9;fill-opacity:1;stroke:#2e3436;stroke-width:0.413881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#d1c9c9;fill-opacity:1;stroke:#2e3436;stroke-width:0.31041104;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
          d="m 164.01665,143.80709 v 4.9687"
          id="path5602" />
       <path
-         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#d1c9c9;fill-opacity:1;stroke:#2e3436;stroke-width:0.413881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
-         d="M 159.4993,145.62597 H 162.45"
-         id="path5620" />
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#d1c9c9;fill-opacity:1;stroke:#2e3436;stroke-width:0.31041104;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 159.41576,145.30816 h 3.11592"
+         id="path5620"
+         sodipodi:nodetypes="cc" />
       <path
          id="path5620-3"
-         d="M 159.4993,146.96625 H 162.45"
-         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#d1c9c9;fill-opacity:1;stroke:#2e3436;stroke-width:0.413881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
+         d="m 159.41576,146.89566 h 3.11592"
+         style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#d1c9c9;fill-opacity:1;stroke:#2e3436;stroke-width:0.31041104;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         sodipodi:nodetypes="cc" />
     </g>
     <path
        style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
@@ -711,7 +724,7 @@
        id="path5243-0"
        sodipodi:nodetypes="cc" />
     <path
-       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#8e0b0b;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#8e0b0b;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
        d="m 123.0911,145.49381 -1.36064,1.74783 -0.66542,-0.57233"
        id="path4309-3"
        sodipodi:nodetypes="ccc" />
@@ -719,7 +732,7 @@
        sodipodi:nodetypes="ccc"
        id="path4309-3-6"
        d="m 123.0911,148.08756 -1.36064,1.74783 -0.66542,-0.57233"
-       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#8e0b0b;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#8e0b0b;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
     <path
        d="m 241.31866,145.98907 0.32801,-0.0482 0.19241,0.0187 0.54261,0.24564 v 0.32246 l -0.54261,0.24564 -0.19241,0.0187 -0.32801,-0.0482 -0.15562,0.58079 0.30815,0.1223 0.15727,0.11239 0.34711,0.48404 -0.16124,0.27926 -0.59274,-0.0586 -0.17597,-0.08 -0.25999,-0.20573 -0.42517,0.42517 0.20573,0.25999 0.08,0.17597 0.0586,0.59274 -0.27926,0.16124 -0.48404,-0.34711 -0.11239,-0.15727 -0.1223,-0.30815 -0.58079,0.15562 0.0482,0.32801 -0.0187,0.19241 -0.24564,0.54261 h -0.32246 l -0.24564,-0.54261 -0.0187,-0.19241 0.0482,-0.32801 -0.58079,-0.15562 -0.1223,0.30815 -0.11239,0.15727 -0.48404,0.34711 -0.27926,-0.16124 0.0586,-0.59274 0.08,-0.17597 0.20573,-0.25999 -0.42517,-0.42517 -0.25999,0.20573 -0.17597,0.08 -0.59274,0.0586 -0.16124,-0.27926 0.34711,-0.48404 0.15727,-0.11239 0.30815,-0.1223 -0.15562,-0.58079 -0.32801,0.0482 -0.19241,-0.0187 -0.54261,-0.24564 v -0.32246 l 0.54261,-0.24564 0.19241,-0.0187 0.32801,0.0482 0.15562,-0.58079 -0.30815,-0.1223 -0.15727,-0.11239 -0.34711,-0.48404 0.16124,-0.27926 0.59274,0.0586 0.17597,0.08 0.25999,0.20573 0.42517,-0.42517 -0.20573,-0.25999 -0.08,-0.17597 -0.0586,-0.59274 0.27926,-0.16124 0.48404,0.34711 0.11239,0.15727 0.1223,0.30815 0.58079,-0.15562 -0.0482,-0.32801 0.0187,-0.19241 0.24564,-0.54261 h 0.32246 l 0.24564,0.54261 0.0187,0.19241 -0.0482,0.32801 0.58079,0.15562 0.1223,-0.30815 0.11239,-0.15727 0.48404,-0.34711 0.27926,0.16124 -0.0586,0.59274 -0.08,0.17597 -0.20573,0.25999 0.42517,0.42517 0.25999,-0.20573 0.17597,-0.08 0.59274,-0.0586 0.16124,0.27926 -0.34711,0.48404 -0.15727,0.11239 -0.30815,0.1223 z"
        style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#cecece;fill-opacity:1;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
@@ -732,26 +745,27 @@
        cy="146.36647"
        r="1.4924972" />
     <rect
-       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#333333;stroke-width:0.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#333333;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
        id="rect1291"
-       width="6.3559132"
-       height="6.6731305"
-       x="95.908867"
-       y="142.94618" />
+       width="6.349997"
+       height="6.614583"
+       x="95.873596"
+       y="142.92691"
+       ry="0" />
     <rect
-       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.311683;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
        id="rect1293"
-       width="2.0167966"
-       height="3.6708899"
-       x="98.078423"
-       y="144.4473" />
+       width="2.1166694"
+       height="3.7041724"
+       x="97.990257"
+       y="144.5144" />
     <rect
        style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:url(#linearGradient1316);fill-opacity:1;stroke:none;stroke-width:0.262991;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
        id="rect1304"
-       width="1.7185111"
-       height="1.5999825"
-       x="98.224983"
-       y="144.59253" />
+       width="2.1166694"
+       height="1.852089"
+       x="97.990257"
+       y="144.5144" />
   </g>
   <g
      sodipodi:insensitive="true"
diff --git a/graphics/web/favicon-128x128.png b/graphics/web/favicon-128x128.png
index 17e68960a..20f880f07 100644
--- a/graphics/web/favicon-128x128.png
+++ b/graphics/web/favicon-128x128.png
diff --git a/graphics/web/favicon-16x16.png b/graphics/web/favicon-16x16.png
index bfef5c884..0b9882a3a 100644
--- a/graphics/web/favicon-16x16.png
+++ b/graphics/web/favicon-16x16.png
diff --git a/graphics/web/favicon-256x256.png b/graphics/web/favicon-256x256.png
index 8d34459f4..6e49bf0c1 100644
--- a/graphics/web/favicon-256x256.png
+++ b/graphics/web/favicon-256x256.png
diff --git a/graphics/web/favicon-32x32.png b/graphics/web/favicon-32x32.png
index 1a300d6d9..c921c83ed 100644
--- a/graphics/web/favicon-32x32.png
+++ b/graphics/web/favicon-32x32.png
diff --git a/graphics/web/favicon-64x64.png b/graphics/web/favicon-64x64.png
index b93b84438..00da09c45 100644
--- a/graphics/web/favicon-64x64.png
+++ b/graphics/web/favicon-64x64.png
diff --git a/graphics/web/logo.png b/graphics/web/logo.png
index 9c222972c..e49f3f91a 100644
--- a/graphics/web/logo.png
+++ b/graphics/web/logo.png
diff --git a/graphics/windows/dcpomatic2_disk.ico b/graphics/windows/dcpomatic2_disk.ico
index 3ec68e254..d17241f37 100644
--- a/graphics/windows/dcpomatic2_disk.ico
+++ b/graphics/windows/dcpomatic2_disk.ico