Index: trunk/images/presets/food/diet.svg
===================================================================
--- trunk/images/presets/food/diet.svg	(revision 15166)
+++ trunk/images/presets/food/diet.svg	(revision 15166)
@@ -0,0 +1,109 @@
+<?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"
+   version="1.0"
+   width="13"
+   height="16"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="diet5.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs11" />
+  <metadata
+     id="metadata2975">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:language>en</dc:language>
+        <dc:title></dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="987"
+     inkscape:window-width="1680"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="41.710345"
+     inkscape:cx="4.2616463"
+     inkscape:cy="6.683436"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:current-layer="svg2"
+     showgrid="true"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4201" />
+  </sodipodi:namedview>
+  <g
+     id="g3338"
+     transform="matrix(0.04943944,-0.00832652,0.00862545,0.04772602,-10.248274,-3.92511)" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path6571"
+     d="m 13,1.24301 c 0,0 -1.011454,5.34442 -4.9404715,3.33284 C 8.0588448,4.57885 8.1535883,0.21412005 13,1.24301 Z"
+     style="fill:#009100;fill-opacity:1;stroke-width:1.01779234"
+     sodipodi:nodetypes="ccc" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path6573"
+     d="M 6.3869625,7.04786 C 7.0659232,6.39948 8.0202471,5.61528 9.0496324,5.61528 c 2.0770436,0 3.7671476,1.62448 3.7671476,3.63305 0,0.074 0,0.13743 -0.0041,0.21496 h -0.0073 c -0.06568,0.78581 -0.324879,1.76191 -0.938143,2.9741 0,0 -1.054941,1.94867 -1.9018212,2.84372 l -0.076657,0.0705 C 9.4799354,15.74981 8.9031767,16 8.2789738,16 7.5124069,16 6.8334462,15.64057 6.4209607,15.0838 H 6.4099802 C 5.9974947,15.64057 5.318534,16 4.5519568,16 3.9204508,16 3.3510055,15.75333 2.9385201,15.35161 l -0.076657,-0.0705 C 2.0222862,14.38606 0.96004211,12.43739 0.96004211,12.43739 0.34678863,11.2252 0.08761652,10.24205 0.02921241,9.46329 H 0.01098055 C 0,9.38929 0,9.32586 0,9.24833 0,7.23976 1.6901038,5.61528 3.7744405,5.61528 c 1.0257389,0 1.8986411,0.75799 2.5848945,1.40638"
+     style="fill:#008000;fill-opacity:1;stroke-width:1.01779234"
+     sodipodi:nodetypes="csscccccsccscccccssc" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:#009100;fill-opacity:1;stroke-width:1.01779234"
+     d="m 0.58491232,0.04697604 c 0,0 0.77487488,5.01014976 4.44036818,3.29890476 3.794e-4,0.0022 0.00434,-3.80803669 -4.44036818,-3.29890476 z"
+     id="path10957"
+     sodipodi:nodetypes="ccc" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:#722a00;fill-opacity:1;stroke:none;stroke-width:4.92204332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 5.9179686,6.09502 c 0,0 0.2752493,-3.9979 -0.5786648,-5.11601995 -0.853914,-1.11812 2.6279569,0 2.6279569,0 C 7.3597151,2.90508 7.4930045,7.02891 5.9179686,6.09502 Z"
+     id="path10959"
+     sodipodi:nodetypes="cscc" />
+  <path
+     style="fill:none;stroke:#beff4a;stroke-width:1.42490923;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 3.5643003,10.83047 2.1242641,2.321888 4.0911428,-5.3218857 v 0"
+     id="path818"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+</svg>
Index: trunk/images/presets/shop/groceries/farm.svg
===================================================================
--- trunk/images/presets/shop/groceries/farm.svg	(revision 15156)
+++ trunk/images/presets/shop/groceries/farm.svg	(revision 15166)
@@ -8,15 +8,16 @@
    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"
    version="1.0"
-   width="12.54946"
+   width="13"
    height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="apple.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="farm2.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs11" />
   <metadata
      id="metadata2975">
@@ -44,5 +45,5 @@
   </metadata>
   <sodipodi:namedview
-     inkscape:window-height="988"
+     inkscape:window-height="987"
      inkscape:window-width="1680"
      inkscape:pageshadow="2"
@@ -55,7 +56,7 @@
      pagecolor="#ffffff"
      id="base"
-     inkscape:zoom="41.710345"
-     inkscape:cx="0.97905447"
-     inkscape:cy="8.4831399"
+     inkscape:zoom="29.493668"
+     inkscape:cx="3.8652687"
+     inkscape:cy="7.2150856"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
@@ -79,23 +80,23 @@
      inkscape:connector-curvature="0"
      id="path6571"
-     d="m 12.54946,1.24301 c 0,0 -0.9764,5.34442 -4.76925,3.33284 -6.6e-4,0.003 0.0908,-4.36172995 4.76925,-3.33284 z"
-     style="fill:#009100;fill-opacity:1"
+     d="m 13,1.24301 c 0,0 -1.011454,5.34442 -4.9404715,3.33284 C 8.0588448,4.57885 8.1535883,0.21412005 13,1.24301 Z"
+     style="fill:#009100;fill-opacity:1;stroke-width:1.01779234"
      sodipodi:nodetypes="ccc" />
   <path
      inkscape:connector-curvature="0"
      id="path6573"
-     d="M 6.16561,7.04786 C 6.82104,6.39948 7.74229,5.61528 8.736,5.61528 c 2.00506,0 3.63659,1.62448 3.63659,3.63305 0,0.074 0,0.13743 -0.004,0.21496 l -0.007,0 c -0.0634,0.78581 -0.31362,1.76191 -0.90563,2.9741 0,0 -1.01838,1.94867 -1.83591,2.84372 l -0.074,0.0705 C 9.15139,15.74981 8.59462,16 7.99205,16 7.25205,16 6.59662,15.64057 6.19843,15.0838 l -0.0106,0 C 5.78964,15.64057 5.13421,16 4.3942,16 3.78458,16 3.23487,15.75333 2.83668,15.35161 l -0.074,-0.0705 C 1.9522,14.38606 0.92677,12.43739 0.92677,12.43739 0.33477,11.2252 0.08458,10.24205 0.0282,9.46329 l -0.0176,0 C 0,9.38929 0,9.32586 0,9.24833 0,7.23976 1.63153,5.61528 3.64363,5.61528 c 0.99019,0 1.83284,0.75799 2.49531,1.40638"
-     style="fill:#ff0000;fill-opacity:1"
+     d="M 6.3869625,7.04786 C 7.0659232,6.39948 8.0202471,5.61528 9.0496324,5.61528 c 2.0770436,0 3.7671476,1.62448 3.7671476,3.63305 0,0.074 0,0.13743 -0.0041,0.21496 h -0.0073 c -0.06568,0.78581 -0.324879,1.76191 -0.938143,2.9741 0,0 -1.054941,1.94867 -1.9018212,2.84372 l -0.076657,0.0705 C 9.4799354,15.74981 8.9031767,16 8.2789738,16 7.5124069,16 6.8334462,15.64057 6.4209607,15.0838 H 6.4099802 C 5.9974947,15.64057 5.318534,16 4.5519568,16 3.9204508,16 3.3510055,15.75333 2.9385201,15.35161 l -0.076657,-0.0705 C 2.0222862,14.38606 0.96004211,12.43739 0.96004211,12.43739 0.34678863,11.2252 0.08761652,10.24205 0.02921241,9.46329 H 0.01098055 C 0,9.38929 0,9.32586 0,9.24833 0,7.23976 1.6901038,5.61528 3.7744405,5.61528 c 1.0257389,0 1.8986411,0.75799 2.5848945,1.40638"
+     style="fill:#ff0000;fill-opacity:1;stroke-width:1.01779234"
      sodipodi:nodetypes="csscccccsccscccccssc" />
   <path
      inkscape:connector-curvature="0"
-     style="fill:#009100;fill-opacity:1"
-     d="m 0.56464106,0.04697604 c 0,0 0.74802014,5.01014976 4.28647864,3.29890476 3.663e-4,0.0022 0.00419,-3.80803669 -4.28647864,-3.29890476 z"
+     style="fill:#009100;fill-opacity:1;stroke-width:1.01779234"
+     d="m 0.58491232,0.04697604 c 0,0 0.77487488,5.01014976 4.44036818,3.29890476 3.794e-4,0.0022 0.00434,-3.80803669 -4.44036818,-3.29890476 z"
      id="path10957"
      sodipodi:nodetypes="ccc" />
   <path
      inkscape:connector-curvature="0"
-     style="fill:#722a00;fill-opacity:1;stroke:none;stroke-width:4.83599997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 5.71287,6.09502 c 0,0 0.26571,-3.9979 -0.55861,-5.11601995 -0.82432,-1.11812 2.53688,0 2.53688,0 C 7.10465,2.90508 7.23332,7.02891 5.71287,6.09502 Z"
+     style="fill:#722a00;fill-opacity:1;stroke:none;stroke-width:4.92204332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 5.9179686,6.09502 c 0,0 0.2752493,-3.9979 -0.5786648,-5.11601995 -0.853914,-1.11812 2.6279569,0 2.6279569,0 C 7.3597151,2.90508 7.4930045,7.02891 5.9179686,6.09502 Z"
      id="path10959"
      sodipodi:nodetypes="cscc" />