diff --git a/toys/mug2/Makefile.am b/toys/mug2/Makefile.am
index 230deaaa..6f2168c1 100644
--- a/toys/mug2/Makefile.am
+++ b/toys/mug2/Makefile.am
@@ -20,7 +20,7 @@ include $(top_srcdir)/gtest.mk
 SUBDIRS= .
 
 INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(GTK_CFLAGS) $(WEBKIT_CFLAGS) -DICONDIR='"$(icondir)"' \
-         -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE
+	 -DMUG2DIR='"$(abs_srcdir)"' -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE
 
 # don't use -Werror, as it might break on other compilers
 # use -Wno-unused-parameters, because some callbacks may not
@@ -49,5 +49,6 @@ mug2_LDADD=					\
 	${top_builddir}/widgets/libmuwidgets.la	\
 	${GTK_LIBS}
 
-
+EXTRA_DIST=					\
+	mug.svg
 
diff --git a/toys/mug2/mug.cc b/toys/mug2/mug.cc
index 5b16fea6..3263721e 100644
--- a/toys/mug2/mug.cc
+++ b/toys/mug2/mug.cc
@@ -379,11 +379,13 @@ mug_shell (MugData * mugdata)
 	gtk_window_set_default_size (GTK_WINDOW (mugdata->win), 700, 500);
 	gtk_window_set_resizable (GTK_WINDOW (mugdata->win), TRUE);
 
-	// {
-	// 	gchar *icon;
-	// 	icon = g_strdup_printf ("%s%cmug.svg", ICONDIR, G_DIR_SEPARATOR);
-	// 	gtk_window_set_icon_from_file (GTK_WINDOW (mugdata->win), icon, NULL);
-	// 	g_free (icon);
+	{
+		gchar *icon;
+		icon = g_strdup_printf ("%s%cmug.svg",
+					MUG2DIR, G_DIR_SEPARATOR);
+		gtk_window_set_icon_from_file (GTK_WINDOW (mugdata->win), icon, NULL);
+		g_free (icon);
+	}
 	
 	return mugdata->win;
 }
diff --git a/toys/mug2/mug.svg b/toys/mug2/mug.svg
new file mode 100644
index 00000000..b2ddb5c0
--- /dev/null
+++ b/toys/mug2/mug.svg
@@ -0,0 +1,443 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg3060"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="mug.svg">
+  <defs
+     id="defs3062">
+    <radialGradient
+       cx="488.89267"
+       cy="588.70575"
+       r="219.20311"
+       fx="488.89267"
+       fy="588.70575"
+       id="radialGradient4633"
+       xlink:href="#linearGradient4931"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.00800352,1.2096377,-1.5872404,-0.01050209,1429.2231,7.1996709)" />
+    <linearGradient
+       id="linearGradient4931">
+      <stop
+         id="stop4933"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4935"
+         style="stop-color:#cccccc;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="459.32651"
+       cy="604.53241"
+       r="218.49857"
+       fx="459.32651"
+       fy="604.53241"
+       id="radialGradient4635"
+       xlink:href="#linearGradient4909"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.4717924e-8,0.4792097,-0.761379,-2.2833566e-8,965.49485,426.4337)" />
+    <linearGradient
+       id="linearGradient4909">
+      <stop
+         id="stop4911"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4913"
+         style="stop-color:#cccccc;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="507.53687"
+       y1="695.01477"
+       x2="505.21655"
+       y2="435.03162"
+       id="linearGradient4637"
+       xlink:href="#linearGradient4893"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,-1,0,1171.1728)" />
+    <linearGradient
+       id="linearGradient4893">
+      <stop
+         id="stop4895"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4897"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="518.93054"
+       cy="498.96671"
+       r="218.49857"
+       fx="518.93054"
+       fy="498.96671"
+       id="radialGradient4639"
+       xlink:href="#linearGradient4917"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.00681824,0.7964116,-0.908528,0.00777809,968.71756,124.33984)" />
+    <linearGradient
+       id="linearGradient4917">
+      <stop
+         id="stop4919"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4921"
+         style="stop-color:#f2f2f2;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="507.53687"
+       y1="695.01477"
+       x2="505.21655"
+       y2="435.03162"
+       id="linearGradient4641"
+       xlink:href="#linearGradient4893"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,6)" />
+    <linearGradient
+       id="linearGradient3095">
+      <stop
+         id="stop3097"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3099"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="507.53687"
+       y1="695.01477"
+       x2="505.21655"
+       y2="435.03162"
+       id="linearGradient4643"
+       xlink:href="#linearGradient4893"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,-1,0,1175.1728)" />
+    <linearGradient
+       id="linearGradient3102">
+      <stop
+         id="stop3104"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3106"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="507.53687"
+       y1="695.01477"
+       x2="505.21655"
+       y2="435.03162"
+       id="linearGradient4645"
+       xlink:href="#linearGradient4893"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,4)" />
+    <linearGradient
+       id="linearGradient3109">
+      <stop
+         id="stop3111"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3113"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4145"
+       id="linearGradient4216"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-15.844294,-42.822415)"
+       x1="427.79593"
+       y1="418.59042"
+       x2="308.88391"
+       y2="339.36896" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4145">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4147" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4149" />
+    </linearGradient>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter4141">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.0889941"
+         id="feGaussianBlur4143" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1439"
+       id="radialGradient4218"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1767241,-0.06570592,0.06229194,1.0081481,242.27164,193.29801)"
+       cx="61.56411"
+       cy="105.93911"
+       fx="69.98687"
+       fy="90.41909"
+       r="27.959114" />
+    <linearGradient
+       id="linearGradient1439">
+      <stop
+         id="stop1440"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.5704698;" />
+      <stop
+         id="stop1441"
+         offset="1"
+         style="stop-color:#96b0c6;stop-opacity:0.89932889;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1045"
+       id="linearGradient4220"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1481635,-0.03408387,0.03066403,0.9334827,252.4323,191.06145)"
+       x1="57.667629"
+       y1="84.017433"
+       x2="60.490723"
+       y2="111.23763" />
+    <linearGradient
+       id="linearGradient1045">
+      <stop
+         id="stop1046"
+         offset="0.00000000"
+         style="stop-color:#ffffff;stop-opacity:0.74901962;" />
+      <stop
+         id="stop1047"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.00000000;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1045"
+       id="linearGradient4222"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1879329,-0.03526444,0.02518942,0.7668232,265.95849,191.03645)"
+       x1="42.497837"
+       y1="103.57257"
+       x2="54.32185"
+       y2="167.94406" />
+    <linearGradient
+       id="linearGradient3225">
+      <stop
+         id="stop3227"
+         offset="0.00000000"
+         style="stop-color:#ffffff;stop-opacity:0.74901962;" />
+      <stop
+         id="stop3229"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.00000000;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1045"
+       id="linearGradient4224"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0181639,-0.03179448,0.0306403,0.9812034,248.50031,191.28893)"
+       x1="110.05048"
+       y1="138.23856"
+       x2="103.6906"
+       y2="145.33636" />
+    <linearGradient
+       id="linearGradient3232">
+      <stop
+         id="stop3234"
+         offset="0.00000000"
+         style="stop-color:#ffffff;stop-opacity:0.74901962;" />
+      <stop
+         id="stop3236"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.00000000;" />
+    </linearGradient>
+    <linearGradient
+       y2="327.80692"
+       x2="358.85184"
+       y1="336.3714"
+       x1="350.71558"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3164"
+       xlink:href="#linearGradient4191"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4191">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4193" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4195" />
+    </linearGradient>
+    <linearGradient
+       y2="327.80692"
+       x2="358.85184"
+       y1="336.3714"
+       x1="350.71558"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3251"
+       xlink:href="#linearGradient4191"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.3797387"
+     inkscape:cx="23.090914"
+     inkscape:cy="36.54545"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1426"
+     inkscape:window-height="943"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3065">
+    <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
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       transform="matrix(0.13627872,0,0,0.13834282,-32.522534,-32.527783)"
+       id="layer1-0">
+      <g
+         transform="matrix(0.9262457,-0.1633221,0.1633221,0.9262457,-94.266784,-20.740432)"
+         id="g4939">
+        <rect
+           width="438.40622"
+           height="252.53813"
+           rx="12"
+           ry="12"
+           x="291.87317"
+           y="468.43307"
+           id="rect4929"
+           style="fill:url(#radialGradient4633);fill-opacity:1;stroke:none" />
+        <rect
+           width="438.40622"
+           height="252.53813"
+           rx="12"
+           ry="12"
+           x="285.87317"
+           y="462.43307"
+           id="rect4886"
+           style="fill:#f4eed7;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 287.46875,708.86033 c -1.4331,-5.96063 0.14236,-12.48611 4.8125,-17.15625 L 492.3125,491.67283 c 7.14709,-7.14709 18.66539,-7.14711 25.8125,0 l 200,200.03125 c 4.67014,4.67014 6.27685,11.19562 4.84375,17.15625 l -435.5,0 z"
+           id="path4901"
+           style="fill:url(#radialGradient4635);fill-opacity:1;stroke:url(#linearGradient4637);stroke-width:0.47990575;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 287.46875,468.3125 c -1.4331,5.96063 0.14236,12.48611 4.8125,17.15625 L 492.3125,685.5 c 7.14709,7.14709 18.66539,7.14711 25.8125,0 l 200,-200.03125 c 4.67014,-4.67014 6.27685,-11.19562 4.84375,-17.15625 l -435.5,0 z"
+           id="rect4888"
+           style="fill:url(#radialGradient4639);fill-opacity:1;stroke:url(#linearGradient4641);stroke-width:0.47990575;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 287.46875,712.86033 c -1.4331,-5.96063 0.14236,-12.48611 4.8125,-17.15625 L 492.3125,495.67283 c 7.14709,-7.14709 18.66539,-7.14711 25.8125,0 l 200,200.03125 c 4.67014,4.67014 6.27685,11.19562 4.84375,17.15625 l -435.5,0 z"
+           id="path4905"
+           style="fill:#f4eed7;fill-opacity:1;stroke:url(#linearGradient4643);stroke-width:0.47990575;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 287.46875,466.3125 c -1.4331,5.96063 0.14236,12.48611 4.8125,17.15625 L 492.3125,683.5 c 7.14709,7.14709 18.66539,7.14711 25.8125,0 l 200,-200.03125 c 4.67014,-4.67014 6.27685,-11.19562 4.84375,-17.15625 l -435.5,0 z"
+           id="path4925"
+           style="fill:#f4eed7;fill-opacity:1;stroke:url(#linearGradient4645);stroke-width:0.47990575;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      </g>
+    </g>
+    <g
+       id="g4206"
+       transform="matrix(0.66491655,0,0,0.77814599,-189.90991,-208.191)">
+      <path
+         sodipodi:nodetypes="cssscccccsccssssc"
+         id="path4039"
+         d="m 316.07229,281.98202 c -0.43848,0.0486 -0.86293,0.0963 -1.30329,0.16735 -14.09135,2.2736 -23.67275,15.31462 -21.39425,29.11832 2.2785,13.8037 15.55266,23.18673 29.64399,20.91314 5.32396,-0.85901 9.9974,-3.24509 13.63696,-6.64407 l 29.69403,21.53613 c 3.12107,-0.43375 5.32521,-2.54648 6.63691,-6.36414 l -31.28016,-21.37742 -0.60163,0.70667 c 2.99888,-4.94941 4.31388,-10.8985 3.30565,-17.00664 -2.20729,-13.37234 -14.74564,-22.55444 -28.33821,-21.04934 z m 0.11619,1.0566 c 13.01836,-1.44152 25.05638,7.3638 27.17043,20.17124 2.18223,13.22057 -8.30725,25.74182 -21.80333,27.91939 -13.49606,2.17754 -24.91335,-6.79082 -27.0956,-20.0114 -2.18223,-13.22055 6.99145,-25.73934 20.48752,-27.91689 0.42175,-0.0681 0.82103,-0.11586 1.24098,-0.16234 z"
+         style="fill:url(#linearGradient4216);fill-opacity:1;fill-rule:evenodd;stroke-width:0.5;filter:url(#filter4141)"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#807d74;fill-opacity:1;fill-rule:evenodd;stroke-width:0.5"
+         d="m 344.17328,310.53057 29.61718,27.04843 c -1.89242,3.87599 -4.50058,5.8091 -7.81004,5.83855 l -28.02027,-27.09828 6.21313,-5.7887 z"
+         id="path852"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccc"
+         id="path4204"
+         d="m 344.98664,308.53682 c -25.57774,26.69357 -58.35719,-3.9253 -41.04008,-28.54056 -22.47432,26.70691 17.05217,59.23993 41.04008,28.54056 z"
+         style="fill:#273f57;fill-opacity:0.99607843;fill-rule:nonzero;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:url(#radialGradient4218);fill-opacity:1;fill-rule:evenodd;stroke:#314e6c;stroke-width:1.13486826;stroke-miterlimit:4;stroke-opacity:0.99523806;stroke-dasharray:none"
+         d="m 349.29738,294.36408 c 0.43574,13.26512 -10.53563,24.36721 -24.48967,24.78145 -13.95405,0.41424 -25.63272,-10.01548 -26.06847,-23.2806 -0.43574,-13.26512 10.53563,-24.3672 24.48968,-24.78143 13.95404,-0.41424 25.6327,10.01546 26.06846,23.28058 z"
+         id="path853"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:url(#linearGradient4220);fill-opacity:0.09090905;fill-rule:evenodd;stroke-width:1pt"
+         d="m 334.58464,277.67286 c 3.57111,4.2824 -0.18987,12.77638 -8.39505,18.9598 -8.2052,6.18342 -17.76278,7.72625 -21.33391,3.44384 -3.57111,-4.28239 0.18987,-12.77639 8.39506,-18.95979 8.20519,-6.18343 17.76278,-7.72627 21.3339,-3.44385 z"
+         id="path863"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:url(#linearGradient4222);fill-opacity:0.55208333;fill-rule:evenodd;stroke-width:1pt"
+         d="m 310.11078,312.32383 c 14.49429,4.30904 31.85616,-4.46732 36.42449,-18.21714 4.41474,12.57528 -23.28046,39.53212 -36.42449,18.21714 z"
+         id="path885"
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path1766"
+         d="m 339.59269,316.18967 4.6224,-4.38252 27.97152,25.69252 c 1.23309,3.32848 -0.44562,5.68159 -6.10065,4.88028 l -26.49327,-26.19028 z"
+         style="fill:url(#linearGradient4224);fill-opacity:0.75;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path4187"
+         d="m 338.93805,316.8243 4.6224,-4.38252 27.97152,25.69252 c 1.23309,3.32848 -0.44562,5.68159 -6.10065,4.88028 L 338.93805,316.8243 z"
+         style="fill:url(#linearGradient3251);fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>