From d81704ba871e048eca2f6a5428d22570ac9c24da Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 25 May 2017 09:13:28 +0100
Subject: [PATCH] New OS X menu bar icon for server.

---
 graphics/linux/128/dcpomatic2.png             | Bin 24154 -> 24154 bytes
 graphics/linux/16/dcpomatic2.png              | Bin 1946 -> 1946 bytes
 graphics/linux/22/dcpomatic2.png              | Bin 2366 -> 2366 bytes
 graphics/linux/256/dcpomatic2.png             | Bin 70188 -> 70188 bytes
 graphics/linux/32/dcpomatic2.png              | Bin 3704 -> 3704 bytes
 graphics/linux/48/dcpomatic2.png              | Bin 6369 -> 6369 bytes
 graphics/linux/512/dcpomatic2.png             | Bin 232409 -> 232409 bytes
 graphics/linux/64/dcpomatic2.png              | Bin 9349 -> 9349 bytes
 .../osx/dcpomatic2.iconset/icon_128x128.png   | Bin 24154 -> 24154 bytes
 .../dcpomatic2.iconset/icon_128x128@2x.png    | Bin 24154 -> 24154 bytes
 .../osx/dcpomatic2.iconset/icon_16x16.png     | Bin 1946 -> 1946 bytes
 .../osx/dcpomatic2.iconset/icon_16x16@2x.png  | Bin 1946 -> 1946 bytes
 .../osx/dcpomatic2.iconset/icon_256x256.png   | Bin 70188 -> 70188 bytes
 .../dcpomatic2.iconset/icon_256x256@2x.png    | Bin 70188 -> 70188 bytes
 .../osx/dcpomatic2.iconset/icon_32x32.png     | Bin 3704 -> 3704 bytes
 .../osx/dcpomatic2.iconset/icon_32x32@2x.png  | Bin 3704 -> 3704 bytes
 .../osx/dcpomatic2.iconset/icon_512x512.png   | Bin 232409 -> 232409 bytes
 .../dcpomatic2.iconset/icon_512x512@2x.png    | Bin 232409 -> 232409 bytes
 graphics/osx/dcpomatic_small.png              | Bin 0 -> 978 bytes
 graphics/src/dcpomatic_small.svg              |  91 ++++++++++++++++++
 graphics/update                               |   4 +-
 graphics/web/favicon-128x128.png              | Bin 25046 -> 25046 bytes
 graphics/web/favicon-16x16.png                | Bin 1976 -> 1976 bytes
 graphics/web/favicon-256x256.png              | Bin 70281 -> 70281 bytes
 graphics/web/favicon-32x32.png                | Bin 3747 -> 3747 bytes
 graphics/web/favicon-64x64.png                | Bin 9587 -> 9587 bytes
 graphics/web/logo.png                         | Bin 22492 -> 22492 bytes
 platform/osx/make_dmg.sh                      |   2 +-
 src/tools/dcpomatic_server.cc                 |   5 +
 29 files changed, 100 insertions(+), 2 deletions(-)
 create mode 100644 graphics/osx/dcpomatic_small.png
 create mode 100644 graphics/src/dcpomatic_small.svg

diff --git a/graphics/linux/128/dcpomatic2.png b/graphics/linux/128/dcpomatic2.png
index c18c4ea127b7958b33eaa18f408985d1749aa888..79cbbef4f7e2d770a13f94278684b9264dd16934 100644
GIT binary patch
delta 23
fcmcb$hw;`P#tlyxIV3rFw0aek8aBUS%!>g4bAbrl

delta 23
fcmcb$hw;`P#tlyxIV8k|w7xB$SHAfTV_pmZe}M{9

diff --git a/graphics/linux/16/dcpomatic2.png b/graphics/linux/16/dcpomatic2.png
index ebcb845f12be881067e8fd41a0831efba8a6c657..a11b8576ec7c5d9ffbd96d83857ef2a0bfb525f1 100644
GIT binary patch
delta 21
dcmbQmKZ}2ZCo6{}2aiJT*VFSh2eNuH0RTwn2E_mX

delta 21
ccmbQmKZ}2ZCo6}9xR8QaQF-R(KvqvC06!lEb^rhX

diff --git a/graphics/linux/22/dcpomatic2.png b/graphics/linux/22/dcpomatic2.png
index 2bca6e89ff1004fe618bb233a286ed281150e023..7f2730f230b7c0f8f81e576f8294e1474d96e97e 100644
GIT binary patch
delta 21
dcmdldv`=Wm6Gje64jx6RPro@fzhMkw2LM&K2b2H+

delta 21
dcmdldv`=Wm6GjdRaUsRTQuqIx-!KNT0{~VP2ekkI

diff --git a/graphics/linux/256/dcpomatic2.png b/graphics/linux/256/dcpomatic2.png
index fa767b8294deea38c9602c7f90f77d0e21a99c16..b517b9da289643a5dba7f86a289c1cdff8849dda 100644
GIT binary patch
delta 27
jcmZ3pgk{YVmJLrBIV3rFbW)t#w>H0F-2R4<(Ln$JlRXLN

delta 27
jcmZ3pgk{YVmJLrBIV8k|bmWg%J2k&y-2R4<(Ln$Jk3R``

diff --git a/graphics/linux/32/dcpomatic2.png b/graphics/linux/32/dcpomatic2.png
index 3dea8b696ff63004618c0896f6f9ac3597cb27ae..794c01b58c6df5e1369e86d57b75a86b0d8b23ad 100644
GIT binary patch
delta 21
dcmew%^FwCC6Gje64j$z%e`cv{e#6+q0{~{r2>bv5

delta 21
dcmew%^FwCC6GjdRaUm5!`OO8J-!S&@003K32etqJ

diff --git a/graphics/linux/48/dcpomatic2.png b/graphics/linux/48/dcpomatic2.png
index 886c4a22dd3b16c223cb484ee4907625cb002c21..5edc416db2a090c2e3a25cc0b5bd2965063dbf28 100644
GIT binary patch
delta 21
dcmaE8_|R~}6Gje64jxt6`SyaF-!Og^0{~gu2g?8e

delta 21
dcmaE8_|R~}6GjdRaUs<-iRNdU-!Og^0{~z52)Y0O

diff --git a/graphics/linux/512/dcpomatic2.png b/graphics/linux/512/dcpomatic2.png
index 489650a0e37e1ee010952735033a4c36c427f083..08c274dd82210c33d766123647f527211f51d228 100644
GIT binary patch
delta 35
pcmcaPo$uy!z70<pIV3rF^tybX&1`<d*#3qQgqgO#VPt;W2>=P{4#NNd

delta 35
pcmcaPo$uy!z70<pIV8k|^gf=7%4>eZ*#3qQgqgO#VPt;W2>=j}4+H=J

diff --git a/graphics/linux/64/dcpomatic2.png b/graphics/linux/64/dcpomatic2.png
index 524143c9cde2b718c2035038f8f37cb84bb58f1c..139a70f153ba47aa11bd63556cb425aaed7532fc 100644
GIT binary patch
delta 21
ccmZqmZ1vpmgpos%gGVD-&w0(}H;glt08uFiY5)KL

delta 21
dcmZqmZ1vpmgpor+Tu4J=<^Sl-Zy0AP0RUEo2pIqX

diff --git a/graphics/osx/dcpomatic2.iconset/icon_128x128.png b/graphics/osx/dcpomatic2.iconset/icon_128x128.png
index f3aaaaf6967aa283db3f84090b92a6e5c5763c62..0c2db5ef45a9f0e4f78f14078cf3de70537c9e49 100644
GIT binary patch
delta 23
fcmcb$hw;`P#tlyxIV3rFgqAAJlH2@-F)s!Hbae>y

delta 23
fcmcb$hw;`P#tlyxIV8k|1l`w^2XB7Em=^;8cAp7F

diff --git a/graphics/osx/dcpomatic2.iconset/icon_128x128@2x.png b/graphics/osx/dcpomatic2.iconset/icon_128x128@2x.png
index f3aaaaf6967aa283db3f84090b92a6e5c5763c62..0c2db5ef45a9f0e4f78f14078cf3de70537c9e49 100644
GIT binary patch
delta 23
fcmcb$hw;`P#tlyxIV3rFgqAAJlH2@-F)s!Hbae>y

delta 23
fcmcb$hw;`P#tlyxIV8k|1l`w^2XB7Em=^;8cAp7F

diff --git a/graphics/osx/dcpomatic2.iconset/icon_16x16.png b/graphics/osx/dcpomatic2.iconset/icon_16x16.png
index 84c538de00d6c6a2ad8d3e2c79ee364265ec94d4..c27bef447967ddafb2ccce5c15a2597b63268d37 100644
GIT binary patch
delta 21
ccmbQmKZ}2ZCo6{}2M^aaKPHdOfvlcP06pOaG5`Po

delta 21
dcmbQmKZ}2ZCo6}9xDbc(@%xiE2eNuH0RTlH22ub3

diff --git a/graphics/osx/dcpomatic2.iconset/icon_16x16@2x.png b/graphics/osx/dcpomatic2.iconset/icon_16x16@2x.png
index 84c538de00d6c6a2ad8d3e2c79ee364265ec94d4..c27bef447967ddafb2ccce5c15a2597b63268d37 100644
GIT binary patch
delta 21
ccmbQmKZ}2ZCo6{}2M^aaKPHdOfvlcP06pOaG5`Po

delta 21
dcmbQmKZ}2ZCo6}9xDbc(@%xiE2eNuH0RTlH22ub3

diff --git a/graphics/osx/dcpomatic2.iconset/icon_256x256.png b/graphics/osx/dcpomatic2.iconset/icon_256x256.png
index 9cd6b599c1b730171b85b4fcb7e524f76430e47a..66face3b8f04bf3a01bf8ea6eb7b3bf1175e3252 100644
GIT binary patch
delta 27
jcmZ3pgk{YVmJLrBIV3rF#1{F-u{XbA-2R4<(Ln$JjW7vB

delta 27
jcmZ3pgk{YVmJLrBIV8k|L>&%p_G*5^xcv<yqk{kdl>Q0-

diff --git a/graphics/osx/dcpomatic2.iconset/icon_256x256@2x.png b/graphics/osx/dcpomatic2.iconset/icon_256x256@2x.png
index 9cd6b599c1b730171b85b4fcb7e524f76430e47a..66face3b8f04bf3a01bf8ea6eb7b3bf1175e3252 100644
GIT binary patch
delta 27
jcmZ3pgk{YVmJLrBIV3rF#1{F-u{XbA-2R4<(Ln$JjW7vB

delta 27
jcmZ3pgk{YVmJLrBIV8k|L>&%p_G*5^xcv<yqk{kdl>Q0-

diff --git a/graphics/osx/dcpomatic2.iconset/icon_32x32.png b/graphics/osx/dcpomatic2.iconset/icon_32x32.png
index d58ddb6e2b11c3e505e163a6303150f51f6a63af..c738d48a76ad96476020e2059177fe7d8b391b88 100644
GIT binary patch
delta 21
dcmew%^FwCC6Gje64j#UZ%EtmXzhUg*0RUeZ2qXXi

delta 21
dcmew%^FwCC6GjdRaUtH|wc0Y9-!S&@003Kl2a^B*

diff --git a/graphics/osx/dcpomatic2.iconset/icon_32x32@2x.png b/graphics/osx/dcpomatic2.iconset/icon_32x32@2x.png
index d58ddb6e2b11c3e505e163a6303150f51f6a63af..c738d48a76ad96476020e2059177fe7d8b391b88 100644
GIT binary patch
delta 21
dcmew%^FwCC6Gje64j#UZ%EtmXzhUg*0RUeZ2qXXi

delta 21
dcmew%^FwCC6GjdRaUtH|wc0Y9-!S&@003Kl2a^B*

diff --git a/graphics/osx/dcpomatic2.iconset/icon_512x512.png b/graphics/osx/dcpomatic2.iconset/icon_512x512.png
index 19be4b7acff2b1c228294914c8291ae9939430e1..52b2059269a45d2ccf52d4b11addcfbafd429fd1 100644
GIT binary patch
delta 35
pcmcaPo$uy!z70<pIV3rFq*nhF(rJFf*#3qQgqgO#VPt;W2><}_4m$t<

delta 35
pcmcaPo$uy!z70<pIV8k|q%PF0yWRYTvHcAr2s3Se!^r%$695z#4@3X}

diff --git a/graphics/osx/dcpomatic2.iconset/icon_512x512@2x.png b/graphics/osx/dcpomatic2.iconset/icon_512x512@2x.png
index 19be4b7acff2b1c228294914c8291ae9939430e1..a9ea27e933e9a4a5f6f174f3f09f61b4deeadcb3 100644
GIT binary patch
delta 35
pcmcaPo$uy!z70<pIV3rFr0@Jw+SUAqvHcAr2s3Se!^r%$695pK4-fzV

delta 35
pcmcaPo$uy!z70<pIV8k|q%PF0yWRYTvHcAr2s3Se!^r%$695z#4@3X}

diff --git a/graphics/osx/dcpomatic_small.png b/graphics/osx/dcpomatic_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d1a850075dc40f76bedbc32cba8a51215d66954
GIT binary patch
literal 978
zcmV;@11<cCP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00009a7bBm0003p
z0003p0qGKj@Bjb+8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H117Ar*
zK~y-6jg`GmTW1u;f7fQfT!b2iv;tI2kUxUdR#nxZH$#Y!SU?>klp!SPUl3U|3F*qr
zl+1v`!azw|g@_>x34&N{8sUK=TY*-=Rx55}$BAVN+fRpUn~P1LM>@kj_q@;fc+dMB
z_<#sH1ve`2un4cpkS{~N2(K#eP;f(V=0oR?1M~@gD8V~{PSO(O1d{?^BaYDk+EapG
zTHuSC?M-_-bCyN2s|$cYD#g{cH9mU(zJ9I*FI!;LfW6}~?I}UJmd$#9zk>7gGHhEs
zdL-`Mb98xGhHWeO;DKU&eeUejg6^jB58!3Z>H8~JWTaB!=1t-A$#HRMTbqbP<VmG;
zdu*%@egH27t#07EZcq{l5ePH`Hfk^^Bbht`F1Q0=2s+E~mlw>9{(h{dPtnDTkVr5!
zHANs00H9DPkjZ3-$Kxz6E@IoZlT|2$XLXg03m5o$XNNMp^TMYHzN<wG&d)pLS2Nn!
z*wAs3&1N++GIE%CB%<)#oIC65RNyCp{%vn}E~>4q33z&XT3uaT8Xg|5+w%FmdV728
zJvVGy8Pk+N6<G2dz-Ita%R<keLq6X$F@-{bR4T>F$_k^SqvUcqd_EuJ<KvD)K96EC
zqLu}~0etT9!p8uA^z^{aP7`RO?C<XrkH-NB27`w`c6S{Nzzd&vYIctVhQa@lj*gCc
zC3P_j45{{2@s#0jfZ*O9`2DAX4h{}7FfahX`uh6e55J%A>(>C3;UB7mqBo`~V}JkH
z%UfMt)#T))W@ctoEEXk6o12?zZEbaYO|$Xxex%A$5-1dnib&+daVwQdT3A@n*|TR4
z$8BOl=Vxc#<94m~K>qYXd+gjfzIpbH%B4%Nz0J_j5S^W!0A#aSa=9E^TU%r@nZp)@
z!+4%NA!b>8wYy6ha$e{KC+uV`+U>D18Ht1lg-(Cc;joNkQg<(3c4vF59<)kAzq`Rb
z>9o@pSI_Henqp!?o^<*M=mGq8goLW#M`$zF*QZc4>b%C~WpV$$qmLiUux*{6oz<^?
zzZ>)jZ8j2pcL{!OfiG*etZ5RpEVjFyGoigbuCA@o;d-GZc+mpi9!vD@wg~Q2*Uo9H
z>8;>aQ~4)};EdpU1(u4CbS=|l1(pQYPFkk_0c-SnZWAxfdH?_b07*qoM6N<$f<T|h
A;s5{u

literal 0
HcmV?d00001

diff --git a/graphics/src/dcpomatic_small.svg b/graphics/src/dcpomatic_small.svg
new file mode 100644
index 000000000..e6b355c35
--- /dev/null
+++ b/graphics/src/dcpomatic_small.svg
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="71.686127mm"
+   height="71.686119mm"
+   viewBox="0 0 71.686127 71.686119"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92+devel 15537"
+   sodipodi:docname="dcpomatic_small.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="117.53117"
+     inkscape:cy="33.622077"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     inkscape:window-width="786"
+     inkscape:window-height="613"
+     inkscape:window-x="25"
+     inkscape:window-y="117"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata5">
+    <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="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-47.183062,-92.736803)">
+    <circle
+       style="color:#000000;overflow:visible;vector-effect:none;fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path4807"
+       cx="83.026123"
+       cy="128.57986"
+       r="29.482143" />
+    <circle
+       style="color:#000000;overflow:visible;vector-effect:none;fill:none;fill-rule:evenodd;stroke:#ff0000;stroke-width:8.56410217;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path4807-3"
+       cx="83.026123"
+       cy="128.57986"
+       r="31.56101" />
+    <text
+       xml:space="preserve"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40.17214203px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold';text-decoration:none;text-decoration-line:none;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;shape-padding:0;overflow:visible;vector-effect:none;fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
+       x="67.004135"
+       y="142.65572"
+       id="text4826"><tspan
+         sodipodi:role="line"
+         id="tspan4824"
+         x="67.004135"
+         y="142.65572"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold';fill:#ffffff;stroke-width:0">D</tspan></text>
+    <circle
+       style="color:#000000;overflow:visible;vector-effect:none;fill:none;fill-rule:evenodd;stroke:#00ffff;stroke-width:3.1615386;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path4828"
+       cx="83.026123"
+       cy="128.57986"
+       r="25.891365" />
+  </g>
+</svg>
diff --git a/graphics/update b/graphics/update
index 73436cb6a..fbd522597 100755
--- a/graphics/update
+++ b/graphics/update
@@ -22,7 +22,6 @@ else
 
     # OS X application icons
     mkdir -p osx
-    convert src/dcpomatic.png -resize 32x32 osx/dcpomatic2.png
     for r in 16 32 128 256 512; do
 	for p in dcpomatic2; do
 	    mkdir -p osx/$p.iconset
@@ -60,6 +59,9 @@ else
 	$INKSCAPE osx/preferences/$i.png src/$i.svg -w 32 -h 32
     done
 
+    # OS X menu bar icon for the server
+    $INKSCAPE osx/dcpomatic_small.png -w 22 -h 22 src/dcpomatic_small.svg
+
     # Splash screen (all platforms)
     $INKSCAPE splash.png src/splash.svg -w 400 -h 300
 
diff --git a/graphics/web/favicon-128x128.png b/graphics/web/favicon-128x128.png
index e50bee0090808f00c38aaeeb6f2463ba8550f3d5..26cf949276f7c7d6d8202a5e4f1638ded29c404d 100644
GIT binary patch
delta 67
zcmcb1nDN?S#tlyxIV3rF%w{Uqo!|V1@kN}VrIn$Pm8prgfuWUw!O2Z8A5VUopnxj6
M<9%TKWU<5p0B9Q+;s5{u

delta 67
zcmcb1nDN?S#tlyxIV8k|Osm&VZrc2Y@kN}Vft8_!m8r3|fuWUw!JI|DK9ip&D4>eI
M{r~mDWU<5p09T(GF8}}l

diff --git a/graphics/web/favicon-16x16.png b/graphics/web/favicon-16x16.png
index eaa28899d100196be27baedc3fc283cc1398f5c2..173ea64cda4ae5ba92f9ded74206e43e838175be 100644
GIT binary patch
delta 65
zcmdnNzk`26IxB}H2anlI#k%vG^I6>)1ud-%jjT*fv<(cc3=B?gdii+raW(~1(H-vt
K<0t=MI{*NYUlm&b

delta 65
zcmdnNzk`26IxB~SxR7b}`pHe3^I6>)1r4kWEv!t9wG9ld3=HNh^7WZ~oJ|2$^zHwz
KA141`I{*NH;}xg?

diff --git a/graphics/web/favicon-256x256.png b/graphics/web/favicon-256x256.png
index a923ba464d8ed60b8ec22d2c9a0af94d1be5331e..08b6cadd4004b62bd129af4e49a1ec19109035a9 100644
GIT binary patch
delta 27
jcmeBN%F?-%Wy2Fj4oMCkQw9zF(&jge+utxU&J_Rvfei@q

delta 27
jcmeBN%F?-%Wy2Fj4heA~)9Uq;o0{J+ZhynbI9C7wlcx%K

diff --git a/graphics/web/favicon-32x32.png b/graphics/web/favicon-32x32.png
index 6b677b636c49e5a707126fb2f7fa64b03926307f..09e59cc9b39d346c8ce0ac1ec0622ccdb97bde7e 100644
GIT binary patch
delta 92
zcmZ21yI6L^6Gje64j!|aigo8VzhT_U?PO_XXk=w-qHSPkWnge})62&U3=FCzt`Q|E
mi6yC4x%nxXX_X8{28QOk2Bx}3rXdC>8g{%7jGz3N_W%HM+#SaN

delta 92
zcmZ21yI6L^6GjdRaUs*{^^==6zhT_U?POqOXkle)tZiUuWneI8k*^N}1A}UbYeY#(
mVo9o1ZhlH;S|x*#fuXssfvK*MX@~)ehPVH}ewh52_W%Gy4IUH#

diff --git a/graphics/web/favicon-64x64.png b/graphics/web/favicon-64x64.png
index 23d02aeb1ca90a253250cda31f38037b440c0da5..f6cabed990c8ea2ebdc47a32cf065fb8eb78457c 100644
GIT binary patch
delta 92
zcmezD_1SB~6Gje64j!|aigo8VzhP`ua<a5CG_o=^(Kax&GB7x~>E&Yv1_sp<*NBpo
m#FA92-29Zxv`Pje14DCN15;fi(+~p`4LjZk#!ud?asU9t#vYFV

delta 92
zcmezD_1SB~6GjdRaUs*{^^==6zhP`uax$<ow6HQY);2J-GBB94$k&H~fkCyzHKHUX
mu_V<hH$Npat&+jWz|dURz*N`BG{gW!!`uH~KTO`NasU97_a58;

diff --git a/graphics/web/logo.png b/graphics/web/logo.png
index cfc8c163d0291ba96cce4d2c8538e3e8d0980d94..352fce11c7fa3fe2a22233cb3f79f615093504f8 100644
GIT binary patch
delta 23
fcmcb!p7G9l#tlyxIV3rF%w{Uqo!|V1@k1y8cnJyx

delta 23
fcmcb!p7G9l#tlyxIV8k|%pNT}WU=`T<A+cHef<iQ

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 6a413f287..bccecfebc 100644
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -113,7 +113,7 @@ function copy_libs {
 # @param #1 directory to copy to
 function copy_resources {
     local dest="$1"
-    cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2.png "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic_small.png "$dest"
     cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2.icns "$dest"
     cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2_kdm.icns "$dest"
     cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2_server.icns "$dest"
diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 8e9ce7537..9214d8385 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -208,7 +208,12 @@ public:
 		wxIcon icon (std_to_wx ("id"));
 #else
 		wxInitAllImageHandlers();
+#ifdef DCPOMATIC_LINUX
 		wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
+#endif
+#ifdef DCPOMATIC_OSX
+		wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
+#endif
 		wxIcon icon;
 		icon.CopyFromBitmap (bitmap);
 #endif
-- 
2.30.2