Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 10824)
+++ /trunk/data/defaultpresets.xml	(revision 10825)
@@ -1695,5 +1695,5 @@
             </optional>
         </item> <!-- Fence -->
-        <item name="Guard Rail" type="way,closedway" preset_name_label="true">
+        <item name="Guard Rail" icon="presets/barrier/guard_rail.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=guard_rail"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:barrier=guard_rail"
@@ -1738,5 +1738,5 @@
             <reference ref="optional_height" />
         </item> <!-- Retaining Wall -->
-        <item name="Jersey Barrier" type="node,way,closedway" preset_name_label="true">
+        <item name="Jersey Barrier" icon="presets/barrier/jersey_barrier.svg"  type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=jersey_barrier" />
             <key key="barrier" value="jersey_barrier" />
@@ -5376,5 +5376,5 @@
                 <list_entry value="lean_to" icon="presets/accommodation/shelter_lean_to.svg" />
                 <list_entry value="picnic_shelter" icon="presets/accommodation/shelter_picnic.svg" />
-                <list_entry value="public_transport" icon="prespresets/accommodation/shelter_public_transport.svg" />
+                <list_entry value="public_transport" icon="presets/accommodation/shelter_public_transport.svg" />
                 <list_entry value="weather_shelter" icon="presets/accommodation/shelter.svg" />
                 <list_entry value="wildlife_hide" icon="presets/accommodation/shelter.svg" />
@@ -6311,5 +6311,5 @@
         </item> <!-- Embankment -->
         <separator/>
-        <item name="Pipeline" icon="presets/misc/route.svg" type="way" preset_name_label="true">
+        <item name="Pipeline" icon="presets/landmark/pipeline.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=pipeline"
@@ -8598,5 +8598,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Roofer -->
-    <item name="Beekeeper" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Beekeeper" icon="presets/craft/beekeeper.svg" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=beekeeper" />
         <space />
Index: /trunk/images/presets/barrier/guard_rail.svg
===================================================================
--- /trunk/images/presets/barrier/guard_rail.svg	(revision 10825)
+++ /trunk/images/presets/barrier/guard_rail.svg	(revision 10825)
@@ -0,0 +1,118 @@
+<?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="16"
+   height="11"
+   viewBox="0 0 16 11"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="guard_rail.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.678384"
+     inkscape:cx="5.1089108"
+     inkscape:cy="6.9384634"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1041.3622)">
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4134"
+       width="16"
+       height="5.0000172"
+       x="0"
+       y="1043.3622" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4138"
+       width="1"
+       height="11.000017"
+       x="1"
+       y="1042.3622"
+       ry="0.50000024" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4140"
+       width="1"
+       height="11.000017"
+       x="13"
+       y="1042.3622"
+       ry="0.49999624" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4142"
+       width="1"
+       height="11.000017"
+       x="7"
+       y="1042.3622"
+       ry="0.50000155" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4146"
+       width="16"
+       height="1.0000174"
+       x="0"
+       y="1044.3622" />
+    <rect
+       y="1046.3622"
+       x="0"
+       height="0.99984324"
+       width="16"
+       id="rect4148"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  </g>
+</svg>
Index: /trunk/images/presets/barrier/jersey_barrier.svg
===================================================================
--- /trunk/images/presets/barrier/jersey_barrier.svg	(revision 10825)
+++ /trunk/images/presets/barrier/jersey_barrier.svg	(revision 10825)
@@ -0,0 +1,111 @@
+<?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="16"
+   height="14"
+   viewBox="0 0 16 14"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="jersey_barrier3.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.678384"
+     inkscape:cx="11.081569"
+     inkscape:cy="11.149976"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1038.3622)">
+    <path
+       style="fill:#666666;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 0,1052.3622 8,0 0,-1 -1,0 -2,-2 0,-9 -2,0 0,9 -2,2 -1,0 z"
+       id="path4140"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccc" />
+    <path
+       style="fill:#333333;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 3,1040.3622 8,-2 2,0 -8,2 z"
+       id="path4144"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#b3b3b3;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5,1049.3622 8,-2 0,-9 -8,2 z"
+       id="path4146"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#808080;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 7,1051.3622 8,-2 -2,-2 -8,2 z"
+       id="path4148"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#1a1a1a;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 7,1051.3622 8,-2 1,0 -8,2 z"
+       id="path4150"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#666666;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 8,1052.3622 8,-2 0,-1 -8,2 z"
+       id="path4152"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#1a1a1a;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 0,1051.3622 1.4084821,1050.976 1,1051.3622 Z"
+       id="path4154"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/craft/beekeeper.svg
===================================================================
--- /trunk/images/presets/craft/beekeeper.svg	(revision 10825)
+++ /trunk/images/presets/craft/beekeeper.svg	(revision 10825)
@@ -0,0 +1,211 @@
+<?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"
+   id="svg4260"
+   sodipodi:modified="true"
+   sodipodi:docname="beekeeper.svg"
+   viewBox="0 0 245.05 243.85"
+   sodipodi:version="0.32"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.91 r13725">
+  <defs
+     id="defs27" />
+  <sodipodi:namedview
+     id="base"
+     bordercolor="#666666"
+     inkscape:pageshadow="2"
+     inkscape:window-y="-8"
+     pagecolor="#ffffff"
+     inkscape:window-height="988"
+     inkscape:zoom="1.4"
+     inkscape:window-x="-8"
+     borderopacity="1.0"
+     inkscape:current-layer="layer1"
+     inkscape:cx="-121.68437"
+     inkscape:cy="197.21283"
+     inkscape:window-width="1680"
+     inkscape:pageopacity="0.0"
+     inkscape:document-units="px"
+     showgrid="false"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4155" />
+  </sodipodi:namedview>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(-46.226 -53.076)">
+    <path
+       inkscape:connector-curvature="0"
+       d="m 62.974818,221.03826 c -11.11578,-4.2753 -17.984762,30.49714 -11.11578,40.18782 25.153015,29.07204 81.729482,32.34977 81.729482,32.34977 l 62.37663,0.57004 c 0,0 64.84205,-0.99757 88.49871,-33.91738 5.41538,-6.69797 7.69554,-44.74814 -8.69311,-39.61778 -31.92224,24.65423 -51.87364,23.51415 -104.45983,24.65423 -52.58619,1.14008 -92.20397,-6.69797 -108.336102,-24.2267 z"
+       style="fill:#d59d07;fill-rule:evenodd;stroke:#000000;stroke-width:5.70039988;fill-opacity:1"
+       sodipodi:nodetypes="cccccczc"
+       id="path5505" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 60.979678,250.1103 c -9.932947,-3.70526 -13.068167,5.98542 -7.011492,11.54331 23.898927,26.22184 78.537264,31.06718 78.537264,31.06718 l 64.02974,0.14251 c 0,0 67.69225,-2.13765 87.07361,-33.91738 3.99028,-4.98785 3.27773,-14.39351 -5.55789,-10.83076 -24.36921,22.51658 -53.29874,31.06718 -107.31003,31.3522 -53.99704,0.28502 -94.697895,-12.54088 -109.761202,-29.35706 z"
+       style="fill:#af7c05;fill-rule:evenodd;fill-opacity:1"
+       sodipodi:nodetypes="cccccczc"
+       id="path5507" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 75.430192,186.26582 c -9.932947,-3.70526 -16.716423,28.92953 -10.574242,37.48013 24.397712,21.3765 74.47573,22.37407 74.47573,22.37407 l 55.20837,0.42753 c 0,0 50.16352,4.98785 82.51329,-25.6518 4.84534,-5.84291 2.56518,-40.18782 -12.11335,-35.6275 -28.502,21.3765 -45.46069,21.3765 -92.34648,22.37407 -47.0283,0.99757 -82.755557,-6.12793 -97.163318,-21.3765 z"
+       style="fill:#d59d07;fill-rule:evenodd;stroke:#000000;stroke-width:5.70039988;fill-opacity:1"
+       sodipodi:nodetypes="cccccczc"
+       id="path5509" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 85.106621,155.05613 c -8.849871,-3.27773 -13.552701,25.79431 -8.080317,33.34734 21.747026,19.09634 66.366906,19.9514 66.366906,19.9514 l 49.29421,0.42753 c 0,0 44.60563,4.41781 73.39265,-22.8016 4.2753,-5.27287 2.70769,-36.62507 -10.26072,-32.49228 -25.50929,19.09634 -41.47041,19.23885 -83.36835,19.9514 -41.81243,0.85506 -74.504228,-4.84534 -87.344379,-18.38379 z"
+       style="fill:#d59d07;fill-rule:evenodd;stroke:#000000;stroke-width:5.70039988;fill-opacity:1"
+       sodipodi:nodetypes="cccccczc"
+       id="path5511" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 95.951632,126.98166 c -8.009062,-3.13522 -14.621526,22.37407 -9.676429,29.07204 19.652127,17.24371 59.996707,18.09877 59.996707,18.09877 l 44.56288,0.28502 c 0,0 40.33033,3.99028 66.40966,-20.52144 3.84777,-4.84534 0.42753,-30.92467 -11.25829,-27.21941 -23.08662,17.24371 -35.6275,15.96112 -73.39265,16.81618 -37.90766,0.71255 -65.04156,-4.41781 -76.641878,-16.53116 z"
+       style="fill:#d59d07;fill-rule:evenodd;stroke:#000000;stroke-width:5.70039988;fill-opacity:1"
+       sodipodi:nodetypes="cccccczc"
+       id="path5513" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 104.97251,101.47237 c -7.025738,-2.70769 -12.597879,20.66395 -8.251324,26.50686 17.272214,14.96355 52.714444,15.6761 52.714444,15.6761 l 39.119,0.28502 c 0,0 35.48499,3.42024 58.28659,-17.81375 3.42024,-4.13279 2.13765,-26.79188 -8.12307,-23.65666 -20.23642,14.96355 -32.06475,13.82347 -65.26958,14.53602 -33.27608,0.71255 -58.27234,-4.98785 -68.47605,-15.53359 z"
+       style="fill:#d59d07;fill-rule:evenodd;stroke:#000000;stroke-width:5.70039988;fill-opacity:1"
+       sodipodi:nodetypes="cccccczc"
+       id="path5515" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 114.0789,85.79627 c -6.19918,-1.99514 -11.75707,14.53602 -7.92355,18.95383 15.22007,10.97327 49.35121,11.97084 49.35121,11.97084 l 31.62297,0.28502 c 0,0 31.20969,2.13765 51.3036,-13.82347 2.99271,-2.99271 0,-20.23642 -9.12064,-17.95626 -17.81375,11.11578 -26.64937,11.11578 -56.00643,11.68582 -29.28581,0.42753 -50.23478,-3.27773 -59.22716,-11.11578 z"
+       style="fill:#d59d07;fill-rule:evenodd;stroke:#000000;stroke-width:5.70039988;fill-opacity:1"
+       sodipodi:nodetypes="cccccczc"
+       id="path5517" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 121.16165,71.83029 c -5.32987,-1.4251 -8.92113,12.68339 -5.62914,15.96112 13.05391,8.26558 39.86004,8.69311 39.86004,8.69311 l 29.59933,0.14251 c 0,0 26.79188,1.85263 44.1781,-9.9757 2.56518,-2.28016 0.57004,-16.67367 -7.26801,-14.96355 -15.24857,8.26558 -23.51415,9.83319 -48.73842,10.26072 -25.13876,0.28502 -44.29211,-4.2753 -52.0019,-10.11821 z"
+       style="fill:#d59d07;fill-rule:evenodd;stroke:#000000;stroke-width:5.70039988;fill-opacity:1"
+       sodipodi:nodetypes="cccccczc"
+       id="path5519" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 126.60553,62.28212 c -4.68858,-1.28259 -7.42477,9.40566 -4.53182,12.11335 11.50056,6.98299 35.10022,7.41052 35.10022,7.41052 l 25.96532,0.14251 c 0,0 23.65666,1.56761 38.90523,-8.40809 2.28016,-1.99514 1.4251,-12.54088 -5.41538,-11.11578 -13.53845,7.1255 -21.23399,-6.69797 -43.32304,-6.41295 -22.14605,0.28502 -39.91705,11.11578 -46.70053,6.27044 z"
+       style="fill:#d59d07;fill-rule:evenodd;stroke:#000000;stroke-width:5.70039988;fill-opacity:1"
+       sodipodi:nodetypes="cccccczc"
+       id="path5521" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 145.20309,69.69264 c 4.83109,3.42024 43.06652,5.27287 50.33453,-0.42753"
+       style="fill:none;stroke:#000000;stroke-width:5.70039988"
+       sodipodi:nodetypes="cc"
+       id="path5523" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 145.16033,293.71836 c 0.45604,-27.64694 11.24404,-34.34491 22.58784,-34.48742 11.4008,-0.14251 23.37164,7.41052 22.94411,33.91738 l -45.53195,0.57004 z"
+       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.70039988"
+       sodipodi:nodetypes="czcc"
+       id="path5525" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 73.078777,216.62045 c -8.992381,-2.56518 -11.82833,4.13279 -6.341695,7.83805 21.633018,17.95626 71.112488,21.23399 71.112488,21.23399 l 57.97307,0.14251 c 0,0 49.59348,2.42267 78.80803,-23.08662 3.56275,-3.42024 2.99271,-9.9757 -4.98785,-7.55303 -22.08905,15.39108 -48.31089,21.23399 -97.19182,21.51901 -48.88093,0.14251 -85.719765,-8.5506 -99.372223,-20.09391 z"
+       style="fill:#af7c05;fill-rule:evenodd;fill-opacity:1"
+       sodipodi:nodetypes="cccccczc"
+       id="path5527" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 87.272773,184.69821 c -7.724042,-1.99514 -10.175214,3.27773 -5.458133,6.27044 18.59755,13.96598 61.09404,16.53116 61.09404,16.53116 l 49.77874,0.14251 c 0,0 42.61049,1.85263 67.69225,-18.09877 3.13522,-2.70769 2.70769,-7.69554 -4.2753,-5.84291 -18.95383,11.97084 -41.47041,16.53116 -83.51086,16.67367 -41.95494,0.28502 -73.592164,-6.55546 -85.320737,-15.6761 z"
+       style="fill:#af7c05;fill-rule:evenodd;fill-opacity:1"
+       sodipodi:nodetypes="cccccczc"
+       id="path5529" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 94.341269,151.7784 c -7.068496,-1.85263 -9.305903,3.13522 -4.98785,5.98542 17.015691,13.39594 55.920921,15.96112 55.920921,15.96112 l 45.56045,0 c 0,0 39.04774,1.85263 61.99185,-17.38622 2.8502,-2.56518 2.42267,-7.41052 -3.99028,-5.55789 -17.24371,11.54331 -37.90766,15.96112 -76.38536,16.10363 -38.40644,0.14251 -67.37873,-6.41295 -78.109731,-15.10606 z"
+       style="fill:#af7c05;fill-rule:evenodd;fill-opacity:1"
+       sodipodi:nodetypes="cccccczc"
+       id="path5531" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 104.31697,123.98895 c -6.184935,-1.56761 -8.123071,2.70769 -4.360807,5.13036 14.849537,11.54331 48.809677,13.68096 48.809677,13.68096 l 39.78879,0 c 0,0 34.05989,1.56761 54.01129,-14.82104 2.56518,-2.28016 2.13765,-6.41295 -3.42024,-4.84534 -15.10606,9.83319 -33.06232,13.68096 -66.55217,13.82347 -33.63236,0.14251 -58.91363,-5.55789 -68.27654,-12.96841 z"
+       style="fill:#af7c05;fill-rule:evenodd;fill-opacity:1"
+       sodipodi:nodetypes="cccccczc"
+       id="path5533" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 111.91275,99.76225 c -5.55789,-1.56761 -7.32501,2.42267 -3.91902,4.56032 13.36743,10.40323 43.95008,12.25586 43.95008,12.25586 l 35.89827,0.14251 c 0,0 30.63965,1.4251 48.59591,-13.39594 2.28016,-1.99514 1.99514,-5.84291 -2.99271,-4.41781 -13.68096,8.97813 -29.78459,12.39837 -60.13922,12.39837 -30.18362,0.14251 -52.95672,-4.84534 -61.39331,-11.54331 z"
+       style="fill:#af7c05;fill-rule:evenodd;fill-opacity:1"
+       sodipodi:nodetypes="cccccczc"
+       id="path5535" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 120.30659,84.37117 c -4.78834,-0.99757 -5.32987,1.71012 -2.40842,3.27773 11.51481,7.41052 37.82216,7.69554 37.82216,7.69554 l 30.83916,0.14251 c 0,0 26.36435,0.85506 41.89794,-9.54817 1.99514,-1.4251 1.56761,-3.99028 -2.70769,-2.99271 -11.68582,6.27044 -25.6518,8.69311 -51.58862,8.69311 -26.03658,0.14251 -46.60077,-2.56518 -53.85453,-7.26801 z"
+       style="fill:#af7c05;fill-rule:evenodd;fill-opacity:1"
+       sodipodi:nodetypes="cccccczc"
+       id="path5537" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 125.99274,71.9728 c -4.20405,-0.85506 -4.67433,1.4251 -2.10915,2.70769 10.07546,5.84291 33.13358,6.27044 33.13358,6.27044 l 27.11965,0 c 0,0 23.08662,0.71255 36.62507,-7.69554 1.71012,-1.14008 1.4251,-3.27773 -2.28016,-2.56518 -10.26072,5.13036 -22.51658,7.1255 -45.31818,7.1255 -22.8016,0.14251 -40.81486,-1.99514 -47.17081,-5.84291 z"
+       style="fill:#af7c05;fill-rule:evenodd;fill-opacity:1"
+       sodipodi:nodetypes="cccccczc"
+       id="path5539" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 147.469,67.98252 c -2.02365,0.28502 -1.78138,1.14008 -0.51304,1.71012 4.90234,1.85263 16.08938,2.28016 16.08938,2.28016 l 13.53845,0 c 0,0 11.11578,1.14008 17.81375,-2.99271 0.85506,-0.57004 0.28502,-1.14008 -0.71255,-1.56761 -6.55546,-0.57004 -10.83076,-2.70769 -22.23156,-2.70769 -11.4008,0.14251 -20.89197,3.27773 -23.98443,3.27773 z"
+       style="fill:#af7c05;fill-rule:evenodd;fill-opacity:1"
+       sodipodi:nodetypes="cccccczc"
+       id="path5541" />
+  </g>
+  <metadata
+     id="metadata25">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title></dc:title>
+        <dc:date>2007-04-10T15:46:42</dc:date>
+        <dc:description>A simple apiary of the old classical design.</dc:description>
+        <dc:source>https://openclipart.org/detail/3866/apiary-by-doctormo</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>doctormo</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>apiary</rdf:li>
+            <rdf:li>bee</rdf:li>
+            <rdf:li>beehive</rdf:li>
+            <rdf:li>comb</rdf:li>
+            <rdf:li>hive</rdf:li>
+            <rdf:li>honey</rdf:li>
+            <rdf:li>remix problem</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <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>
+</svg>
Index: /trunk/images/presets/landmark/pipeline.svg
===================================================================
--- /trunk/images/presets/landmark/pipeline.svg	(revision 10825)
+++ /trunk/images/presets/landmark/pipeline.svg	(revision 10825)
@@ -0,0 +1,93 @@
+<?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="16"
+   height="14"
+   viewBox="0 0 16 14"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="pipeline5.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="2.2487881"
+     inkscape:cy="5.0705796"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1038.3622)">
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4144"
+       width="16"
+       height="14"
+       x="0"
+       y="1038.3622"
+       ry="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#700000;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 0,1049.9888 c 1,0 3.0357587,0.051 4.0575035,0 3.0714285,-0.1566 -0.3341419,-6 3.0915065,-6 l 1.6954144,0 c 3.4664896,0.045 0.048835,6.0248 3.1415936,6.0007 0.975145,-0.01 1.586699,-7e-4 4.013982,-7e-4"
+       id="path4136"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccscsc" />
+    <path
+       sodipodi:nodetypes="ccscsc"
+       inkscape:connector-curvature="0"
+       id="path4142"
+       d="m 0,1046.001 c 1,0 1.102723,0.051 2.1244678,0 2.5580357,0.067 -0.1555704,-5.0609 2.9575779,-5.0609 l 5.8293423,0 c 3.131669,0 0.205082,5.1304 3.163915,5.0616 0.974912,-0.023 -0.502586,-7e-4 1.924697,-7e-4"
+       style="fill:none;fill-rule:evenodd;stroke:#700000;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
Index: /trunk/images/presets/misc/entrance_emergency.svg
===================================================================
--- /trunk/images/presets/misc/entrance_emergency.svg	(revision 10824)
+++ /trunk/images/presets/misc/entrance_emergency.svg	(revision 10825)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
@@ -10,75 +10,92 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg4672"
-   sodipodi:docname="entrance_emergency2.svg"
-   inkscape:version="0.91 r13725"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:version="0.32"
-   x="0px"
-   y="0px"
-   viewBox="229 -258 15.999999 16"
-   enable-background="new 229 -258 599.9 600"
-   xml:space="preserve"
-   width="16"
-   height="16"><metadata
-   id="metadata11"><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><defs
-   id="defs9" />
-<sodipodi:namedview
-   inkscape:pageopacity="0.0"
-   inkscape:document-units="px"
-   inkscape:window-y="-8"
-   inkscape:current-layer="layer1"
-   inkscape:window-height="988"
-   inkscape:window-x="-8"
-   inkscape:window-width="1680"
-   inkscape:pageshadow="2"
-   id="base"
-   guidetolerance="10"
-   objecttolerance="10"
-   inkscape:zoom="22.627417"
-   inkscape:cx="10.18188"
-   inkscape:cy="14.909997"
-   bordercolor="#666666"
-   pagecolor="#ffffff"
-   gridtolerance="10000"
-   borderopacity="1.0"
-   showgrid="false"
-   inkscape:window-maximized="1">
-	</sodipodi:namedview>
-<g
-   id="layer1"
-   transform="translate(-310.97085,-580.39787)"
-   inkscape:groupmode="layer"
-   inkscape:label="Layer 1">
-	<rect
-   style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-   id="rect4138"
    width="16"
    height="16"
-   x="539.97083"
-   y="322.39789"
-   ry="0" /><g
-   id="g5653"
-   transform="matrix(0.12490242,0,0,0.12490242,495.01847,270.77569)"
-   style="fill:#009900;fill-opacity:1">
-		<path
-   id="path3495"
-   d="m 471.9,510.8 -3.2,-8.5 c -1.4,-3.5 -4.6,-5.9 -8.6,-5.9 l -1.4,0 0,-73.2 -69.5,0 0,40.5 9.1,0 10.4,-13 c 2.1,-2.4 5.3,-4 8.8,-4 l 22.2,0 c 3.5,0 6.6,1.9 8.2,5 l 6.6,12.5 c 0.3,0.5 0.5,1.1 0.5,1.9 0,2.2 -1.9,4.2 -4.2,4.2 -1.8,0 -3,-0.8 -3.8,-2.2 l -5.9,-11.4 -9.6,0 7.4,18.4 2.2,23.5 19,0 c 3,0 5.4,1.9 6.6,4.5 l 2.1,5.4 -32.8,0 c -2.4,0 -4.5,-1.8 -4.6,-4.2 l -2.2,-20.6 -17.6,36.5 c -1,2.1 -3.2,3.5 -5.8,3.5 l -8.5,0 21.6,-44.7 -6.7,-16.8 -6.4,7.8 c -1.6,2.1 -4.3,3.5 -7.2,3.5 l -9.4,0 0,52.8 15,14.9 -44.3,0 0,-127.9 128.1,0 0,128.1 -14.4,0 -14.9,-14.9 0,-15.7 13.2,0"
-   style="fill:#009900;fill-opacity:1"
-   inkscape:connector-curvature="0" />
-		<path
-   id="path3497"
-   d="m 412,428 0.5,0 0.5,0 0.5,0.1 0.4,0.1 0.4,0.1 0.4,0.1 0.4,0.2 0.4,0.2 0.4,0.2 0.4,0.2 0.4,0.2 0.4,0.2 0.3,0.3 0.3,0.3 0.3,0.3 0.3,0.3 0.3,0.3 0.3,0.3 0.3,0.3 0.3,0.4 0.2,0.4 0.2,0.4 0.2,0.4 0.2,0.4 0.2,0.4 0.1,0.4 0.1,0.4 0.1,0.4 0.1,0.4 0.1,0.5 0,0.5 0,0.5 c 0,5 -4.2,9 -9.1,9 -5,0 -9,-4 -9,-9 0,-5 4.2,-9.2 9.1,-9.2 z"
-   style="fill:#009900;fill-opacity:1"
-   inkscape:connector-curvature="0" />
-		<path
-   id="path3499"
-   d="m 416,529.8 11.5,11.5 -13.9,0 -15,-14.9 9,0 c 3.1,0 6.2,1.3 8.4,3.4 z"
-   style="fill:#009900;fill-opacity:1"
-   inkscape:connector-curvature="0" />
-	</g>
-</g>
+   viewBox="0 0 16 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ee.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="5.4866866"
+     inkscape:cy="6.1960397"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4138"
+       width="16"
+       height="16"
+       x="0"
+       y="1036.3622"
+       ry="0" />
+    <g
+       id="g5653"
+       transform="matrix(0.12490242,0,0,0.12490242,-44.952356,984.74003)"
+       style="fill:#009900;fill-opacity:1">
+      <path
+         id="path3495"
+         d="m 471.9,510.8 -3.2,-8.5 c -1.4,-3.5 -4.6,-5.9 -8.6,-5.9 l -1.4,0 0,-73.2 -69.5,0 0,40.5 9.1,0 10.4,-13 c 2.1,-2.4 5.3,-4 8.8,-4 l 22.2,0 c 3.5,0 6.6,1.9 8.2,5 l 6.6,12.5 c 0.3,0.5 0.5,1.1 0.5,1.9 0,2.2 -1.9,4.2 -4.2,4.2 -1.8,0 -3,-0.8 -3.8,-2.2 l -5.9,-11.4 -9.6,0 7.4,18.4 2.2,23.5 19,0 c 3,0 5.4,1.9 6.6,4.5 l 2.1,5.4 -32.8,0 c -2.4,0 -4.5,-1.8 -4.6,-4.2 l -2.2,-20.6 -17.6,36.5 c -1,2.1 -3.2,3.5 -5.8,3.5 l -8.5,0 21.6,-44.7 -6.7,-16.8 -6.4,7.8 c -1.6,2.1 -4.3,3.5 -7.2,3.5 l -9.4,0 0,52.8 15,14.9 -44.3,0 0,-127.9 128.1,0 0,128.1 -14.4,0 -14.9,-14.9 0,-15.7 13.2,0"
+         style="fill:#009900;fill-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3497"
+         d="m 412,428 0.5,0 0.5,0 0.5,0.1 0.4,0.1 0.4,0.1 0.4,0.1 0.4,0.2 0.4,0.2 0.4,0.2 0.4,0.2 0.4,0.2 0.4,0.2 0.3,0.3 0.3,0.3 0.3,0.3 0.3,0.3 0.3,0.3 0.3,0.3 0.3,0.3 0.3,0.4 0.2,0.4 0.2,0.4 0.2,0.4 0.2,0.4 0.2,0.4 0.1,0.4 0.1,0.4 0.1,0.4 0.1,0.4 0.1,0.5 0,0.5 0,0.5 c 0,5 -4.2,9 -9.1,9 -5,0 -9,-4 -9,-9 0,-5 4.2,-9.2 9.1,-9.2 z"
+         style="fill:#009900;fill-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3499"
+         d="m 416,529.8 11.5,11.5 -13.9,0 -15,-14.9 9,0 c 3.1,0 6.2,1.3 8.4,3.4 z"
+         style="fill:#009900;fill-opacity:1"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
 </svg>
Index: /trunk/images/presets/shop/curtain.svg
===================================================================
--- /trunk/images/presets/shop/curtain.svg	(revision 10824)
+++ /trunk/images/presets/shop/curtain.svg	(revision 10825)
@@ -1,3 +1,5 @@
 <?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/"
@@ -8,63 +10,85 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="13"
+   viewBox="0 0 16 13"
+   id="svg2"
    version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="167.3757 219.3921 16 13"
-   enable-background="new 167.3757 219.3921 1071.1848 789.925"
-   xml:space="preserve"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="curtain.svg"
-   width="16"
-   height="13"><metadata
-   id="metadata17"><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 /></cc:Work></rdf:RDF></metadata><defs
-   id="defs15" /><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1680"
-   inkscape:window-height="988"
-   id="namedview13"
-   showgrid="true"
-   inkscape:zoom="38.241606"
-   inkscape:cx="4.7707729"
-   inkscape:cy="8.8639244"
-   inkscape:window-x="-8"
-   inkscape:window-y="-8"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1"
-   fit-margin-top="0"
-   fit-margin-left="0"
-   fit-margin-right="0"
-   fit-margin-bottom="0"><inkscape:grid
-     type="xygrid"
-     id="grid4145"
-     originx="2.2615247e-006"
-     originy="-4.4019261e-006" /></sodipodi:namedview>
-<path
-   sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
-   inkscape:connector-curvature="0"
-   id="path5"
-   d="m 167.40552,219.42132 c 0.0254,-0.0117 0.0498,-0.0295 0.0784,-0.0291 5.26171,0 10.52342,-1.7e-4 15.78513,0 0.0283,-3.5e-4 0.0527,0.0178 0.0781,0.0295 0.0109,0.0275 0.0289,0.054 0.0286,0.0855 0,0.90721 -1.6e-4,2.23565 0,3.14288 6.5e-4,0.0317 -0.0174,0.0586 -0.0284,0.0865 -0.0252,0.0115 -0.0495,0.0298 -0.0775,0.0296 -0.14017,8.7e-4 -0.28017,-7e-4 -0.42017,3.5e-4 0.002,1.05979 -1.6e-4,1.89911 0.001,2.95891 0.004,0.038 -0.0138,0.0717 -0.0294,0.10424 -0.0244,0.0112 -0.049,0.0227 -0.073,0.0345 0.024,0.0115 0.0487,0.0232 0.0733,0.0345 0.0112,0.0279 0.0286,0.0549 0.0291,0.0867 -0.001,1.69169 6.5e-4,3.38338 -6.4e-4,5.07506 -0.002,0.0819 0.0167,0.17176 -0.0284,0.24464 -0.0273,0.0123 -0.0539,0.0299 -0.0842,0.0286 -0.36407,-3.5e-4 -0.72814,1.7e-4 -1.09221,-3.5e-4 -0.10689,-0.001 -0.21249,0.0465 -0.28418,0.13287 -0.11332,0.13025 -0.19562,0.28769 -0.30299,0.42336 -0.17038,0.24044 -0.44283,0.42562 -0.73087,0.38813 -0.0993,0.003 -0.19465,-0.0316 -0.28659,-0.0683 -0.15158,-0.0624 -0.28676,-0.16146 -0.41631,-0.26538 -0.13663,-0.11787 -0.26377,-0.24864 -0.40747,-0.35675 -0.0683,-0.0495 -0.15945,-0.0781 -0.23644,-0.0344 -0.11975,0.0657 -0.22214,0.16443 -0.3144,0.26905 -0.19691,0.19476 -0.38818,0.40208 -0.61997,0.54907 -0.0593,0.0393 -0.13003,0.0132 -0.19368,0.007 -0.1826,-0.0305 -0.37966,-0.0562 -0.5285,-0.18588 -0.0775,-0.0645 -0.11782,-0.16512 -0.13792,-0.26607 -0.0246,-0.1735 0.0436,-0.33932 0.10657,-0.49415 0.14177,-0.31281 0.29334,-0.62074 0.41936,-0.94175 0.16251,-0.40488 0.25766,-0.83939 0.30588,-1.27687 0.0553,-0.40314 0.0829,-0.81202 0.18035,-1.20695 0.0846,-0.40384 0.21989,-0.79842 0.42418,-1.14942 0.10513,-0.17733 0.23725,-0.3414 0.40667,-0.44829 0.18935,-0.12711 0.41389,-0.18308 0.59183,-0.33147 0.042,-0.0354 0.0754,-0.0819 0.0918,-0.13722 -0.0683,-0.14647 -0.18999,-0.24934 -0.27952,-0.37872 -0.13213,-0.181 -0.22262,-0.39163 -0.31713,-0.59702 -0.0926,-0.17612 -0.17971,-0.35589 -0.25541,-0.54141 -0.21861,-0.521 -0.34607,-1.08001 -0.43271,-1.64286 -0.008,-0.0775 -0.0262,0.0674 -0.0272,-0.0109 -2.03075,-0.005 -4.06166,5.2e-4 -6.09256,-0.003 -0.0696,0.43173 -0.13904,0.64664 -0.27261,1.06216 -0.0905,0.30828 -0.21169,0.60522 -0.35185,0.89065 -0.13647,0.2497 -0.2313,0.52606 -0.39574,0.75762 -0.0807,0.11526 -0.18115,0.21238 -0.25862,0.33025 -0.0267,0.038 -0.0714,0.05 -0.11252,0.0584 0.0307,0.0127 0.0688,0.0166 0.0908,0.0464 0.0919,0.14193 0.24785,0.20575 0.38721,0.27724 0.16026,0.0715 0.32132,0.15275 0.45055,0.2809 0.16523,0.16495 0.28772,0.37471 0.38368,0.59354 0.12408,0.26364 0.21136,0.54628 0.27357,0.83399 0.13614,0.54611 0.15029,1.11575 0.25091,1.66919 0.053,0.25929 0.11364,0.51839 0.20976,0.76319 0.087,0.23156 0.1871,0.45684 0.29158,0.67968 0.0879,0.19633 0.18918,0.38709 0.25026,0.59615 0.0264,0.1163 0.0389,0.24516 -0.0124,0.35606 -0.0371,0.1203 -0.13984,0.19895 -0.24223,0.24899 -0.15769,0.0677 -0.32758,0.0876 -0.49411,0.11211 -0.0595,0.01 -0.1093,-0.0299 -0.15639,-0.062 -0.13711,-0.0987 -0.26201,-0.21569 -0.38497,-0.33373 -0.0781,-0.0901 -0.1699,-0.16408 -0.24657,-0.25562 -0.0964,-0.0847 -0.1924,-0.1925 -0.32115,-0.21012 -0.13759,0.007 -0.23419,0.12799 -0.33819,0.21064 -0.235,0.22371 -0.49057,0.4462 -0.80224,0.52344 -0.14241,0.0264 -0.29286,0.0295 -0.43013,-0.0265 -0.17922,-0.068 -0.32645,-0.20854 -0.44122,-0.3693 -0.0952,-0.12589 -0.17488,-0.26487 -0.27341,-0.38779 -0.0718,-0.0891 -0.17601,-0.14507 -0.28579,-0.14682 -0.33257,-3.5e-4 -0.66513,0 -0.99785,-1.7e-4 -0.0645,-0.001 -0.13374,0.012 -0.1908,-0.0293 -0.0112,-0.0278 -0.0292,-0.0542 -0.0286,-0.0855 0,-1.72134 0,-3.44267 -1.6e-4,-5.16382 -4.8e-4,-0.0316 0.0174,-0.0582 0.0283,-0.0859 0.0283,-0.0129 0.0566,-0.0256 0.0857,-0.0364 -0.0291,-0.009 -0.0574,-0.0206 -0.0854,-0.0328 -0.0111,-0.0286 -0.0294,-0.0558 -0.0286,-0.0879 3.2e-4,-1.06554 -1.6e-4,-1.91027 3.2e-4,-2.97563 -0.12489,-8.8e-4 -0.24978,3.4e-4 -0.37468,-3.5e-4 -0.0286,3.5e-4 -0.0532,-0.0173 -0.0788,-0.0288 -0.0114,-0.0282 -0.0302,-0.0553 -0.0291,-0.0875 1.6e-4,-0.86606 0,-2.15318 1.6e-4,-3.01925 9.7e-4,-0.0709 -0.0119,-0.14734 0.0286,-0.20924 m 0.19481,0.21464 c 0.001,0.82161 0.001,2.06462 -1.6e-4,2.8864 0.12216,0.001 0.24432,1.7e-4 0.36648,3.4e-4 0.0326,-0.003 0.0619,0.0138 0.0902,0.0291 0.0137,0.0307 0.0301,0.062 0.027,0.0978 -0.002,1.06188 8.1e-4,1.90312 -0.001,2.96518 0.92391,0.002 1.84783,-0.002 2.77174,0.002 0.0449,-0.0626 0.0961,-0.11875 0.14273,-0.17925 0.18855,-0.20627 0.30203,-0.47357 0.42017,-0.73007 0.16508,-0.30444 0.29511,-0.63033 0.39477,-0.96633 0.11702,-0.36425 0.18372,-0.52355 0.24673,-0.90227 0.0164,-0.0964 0.0108,-0.20122 0.0611,-0.28683 0.0281,-0.0158 0.0572,-0.0324 0.0902,-0.0293 2.10099,7e-4 4.20198,-3.4e-4 6.30297,5.2e-4 0.027,-0.001 0.0503,0.0158 0.0749,0.0262 0.0288,0.0445 0.0338,0.0976 0.0355,0.15048 0.0354,0.28089 0.0839,0.33942 0.14499,0.61491 0.0427,0.2258 0.11267,0.44411 0.18083,0.66207 0.0854,0.24655 0.17938,0.49083 0.30154,0.71889 0.0804,0.14926 0.13984,0.31056 0.2223,0.45859 0.086,0.17244 0.20622,0.32066 0.32999,0.46154 0.94079,-0.001 1.88174,-8.7e-4 2.82253,-1.7e-4 0,-1.06258 1.6e-4,-1.90469 0,-2.96727 -0.005,-0.0606 0.0365,-0.12258 0.0952,-0.1245 0.14386,-0.003 0.28772,5.2e-4 0.43174,-10e-4 -0.001,-0.82179 -0.001,-2.06479 -1.6e-4,-2.88657 -5.18392,-6.9e-4 -10.368,-6.9e-4 -15.55191,1.7e-4 m 0.48221,6.47754 c 10e-4,1.63554 10e-4,3.27109 0,4.90645 0.30411,10e-4 0.60823,1.8e-4 0.91234,5.3e-4 0.0828,8.7e-4 0.16636,-0.005 0.24818,0.0115 0.0577,0.0227 0.11605,0.0451 0.16732,0.0827 0.11975,0.0769 0.19723,0.20593 0.27952,0.32363 0.1032,0.15763 0.20977,0.31926 0.35925,0.42945 0.1183,0.0801 0.26827,0.12381 0.40457,0.0758 0.0987,-0.0295 0.19819,-0.0632 0.2829,-0.1271 0.19112,-0.12345 0.35009,-0.29346 0.52432,-0.44098 0.12232,-0.10197 0.27245,-0.18692 0.43126,-0.16965 0.16331,0.0284 0.30026,0.13861 0.42274,0.25283 0.2067,0.21604 0.41438,0.43399 0.65259,0.61027 0.0808,-0.0223 0.16524,-0.0255 0.24592,-0.0494 0.0894,-0.0235 0.18807,-0.0502 0.24609,-0.13478 0.0416,-0.0477 0.0359,-0.11858 0.026,-0.17804 -0.0564,-0.20766 -0.15623,-0.3965 -0.24335,-0.58987 -0.18598,-0.40104 -0.37098,-0.80818 -0.46517,-1.24775 -0.13615,-0.55658 -0.14177,-1.13878 -0.25702,-1.69989 -0.0619,-0.29468 -0.131,-0.59004 -0.24705,-0.86624 -0.0833,-0.21482 -0.19755,-0.41673 -0.3427,-0.58883 -0.10592,-0.11805 -0.2366,-0.20941 -0.37853,-0.26748 -0.18003,-0.0901 -0.37645,-0.16791 -0.51034,-0.33408 -0.91957,0.001 -1.83931,-5.2e-4 -2.75888,8.7e-4 m 11.80112,0.0391 c -0.0873,0.14211 -0.23468,0.21691 -0.37162,0.2891 -0.13004,0.0685 -0.27101,0.11508 -0.3885,0.20941 -0.16685,0.12311 -0.28242,0.30793 -0.38449,0.49293 -0.19867,0.39354 -0.3017,0.83189 -0.38255,1.26868 -0.0222,0.1062 -0.0249,0.21551 -0.0474,0.32152 -0.0201,0.2265 -0.0551,0.45074 -0.0791,0.67671 -0.0542,0.38919 -0.13968,0.7761 -0.28531,1.13756 -0.12778,0.33408 -0.28723,0.6523 -0.43286,0.97749 -0.0358,0.0976 -0.0818,0.19389 -0.0943,0.29921 -0.0146,0.0899 0.0482,0.16791 0.11733,0.20645 0.1249,0.0666 0.26699,0.0724 0.40008,0.10772 0.1797,-0.12345 0.33867,-0.27933 0.49153,-0.43852 0.0726,-0.0598 0.12811,-0.1395 0.19915,-0.20105 0.11525,-0.105 0.24673,-0.20087 0.39863,-0.22545 0.13566,-0.0117 0.26538,0.0511 0.37564,0.13164 0.15463,0.12066 0.29029,0.2673 0.44508,0.38779 0.089,0.0631 0.17424,0.1374 0.27695,0.17332 0.10818,0.0431 0.22471,0.0861 0.34108,0.0565 0.18067,-0.0361 0.32324,-0.17889 0.43078,-0.33268 0.12007,-0.15396 0.20912,-0.33775 0.35362,-0.46817 0.0958,-0.0784 0.21217,-0.13653 0.33433,-0.13287 0.34799,0.001 0.69583,-5.2e-4 1.04382,8.7e-4 l 0,-4.97811 c -0.89964,0.001 -1.79928,0 -2.69893,5.2e-4 -0.0238,-0.005 -0.031,0.0246 -0.0429,0.0394 z" /><path
-   sodipodi:nodetypes="ccccccccccccccccccccccccccc"
-   style="fill:#ff003c"
-   inkscape:connector-curvature="0"
-   id="path7"
-   d="m 167.60033,219.6159 c 5.18391,-8.7e-4 10.36799,-8.7e-4 15.55191,-1.7e-4 -0.001,0.82178 -0.001,2.09559 1.6e-4,2.91737 -0.14402,0.002 -0.28788,-10e-4 -0.43174,0.001 -0.0587,0.002 -0.1,0.0638 -0.0952,0.12449 1.6e-4,1.06258 0,1.89395 0,2.95653 -0.94079,-7e-4 -1.88174,-10e-4 -2.82253,1.7e-4 -0.12377,-0.14088 -0.244,-0.28909 -0.32999,-0.46154 -0.0825,-0.14803 -0.14193,-0.30932 -0.2223,-0.45857 -0.12216,-0.22808 -0.21619,-0.47236 -0.30154,-0.71891 -0.0682,-0.21796 -0.13808,-0.43626 -0.18083,-0.66207 -0.0611,-0.27549 -0.10962,-0.32326 -0.14499,-0.60417 -0.002,-0.0528 -0.007,-0.10598 -0.0355,-0.15048 -0.0246,-0.01 -0.0479,-0.0272 -0.0749,-0.0261 -2.10099,-8.7e-4 -4.20198,1.7e-4 -6.30297,-5.2e-4 -0.033,-0.003 -0.062,0.0135 -0.0902,0.0293 -0.0503,0.0856 -0.0447,0.19041 -0.0611,0.28683 -0.063,0.37872 -0.12971,0.52727 -0.24673,0.89152 -0.0997,0.336 -0.22969,0.6619 -0.39477,0.96634 -0.11814,0.25649 -0.23162,0.52379 -0.42016,0.73006 -0.0466,0.0605 -0.0979,0.11665 -0.14274,0.17925 -0.92391,-0.004 -1.84783,1.7e-4 -2.77174,-0.002 0.002,-1.06206 -3.2e-4,-1.89255 0.001,-2.95443 0.003,-0.0357 -0.0134,-0.0671 -0.027,-0.0978 -0.0283,-0.0154 -0.0575,-0.0322 -0.0902,-0.0291 -0.12216,-1.8e-4 -0.24432,8.8e-4 -0.36648,-3.5e-4 10e-4,-0.82178 10e-4,-2.09559 1.6e-4,-2.9172 z" /><path
-   style="fill:#ff003c"
-   inkscape:connector-curvature="0"
-   id="path9"
-   d="m 168.08254,226.1135 c 0.91957,-10e-4 1.83931,7e-4 2.75888,-8.7e-4 0.13389,0.16617 0.33031,0.24393 0.51034,0.33408 0.14193,0.058 0.27261,0.14943 0.37853,0.26747 0.14515,0.17211 0.25943,0.37402 0.3427,0.58884 0.11605,0.27619 0.18516,0.57156 0.24705,0.86624 0.11525,0.56111 0.12087,1.14331 0.25702,1.69988 0.0942,0.43958 0.27919,0.84672 0.46517,1.24776 0.0871,0.19337 0.18693,0.38221 0.24335,0.58987 0.01,0.0594 0.0156,0.13025 -0.026,0.17803 -0.058,0.0845 -0.15672,0.11125 -0.24609,0.13479 -0.0807,0.0239 -0.16507,0.027 -0.24592,0.0494 -0.23821,-0.17628 -0.44589,-0.39424 -0.65259,-0.61027 -0.12248,-0.11422 -0.25943,-0.22441 -0.42274,-0.25283 -0.15881,-0.0172 -0.30894,0.0677 -0.43126,0.16965 -0.17423,0.14752 -0.3332,0.31753 -0.52432,0.44097 -0.0847,0.0638 -0.1842,0.0976 -0.2829,0.12711 -0.1363,0.048 -0.28627,0.004 -0.40457,-0.0758 -0.14948,-0.11019 -0.25605,-0.27182 -0.35925,-0.42945 -0.0823,-0.1177 -0.15977,-0.24673 -0.27952,-0.32363 -0.0513,-0.0375 -0.10962,-0.06 -0.16732,-0.0827 -0.0818,-0.0171 -0.1654,-0.0109 -0.24818,-0.0115 -0.30411,-3.4e-4 -0.60823,7.1e-4 -0.91234,-5.2e-4 0.001,-1.63537 0.001,-3.27091 0,-4.90645 z" /><path
-   style="fill:#ff003c"
-   inkscape:connector-curvature="0"
-   id="path11"
-   d="m 179.88366,226.15256 c 0.0119,-0.0149 0.0191,-0.0448 0.0429,-0.0394 0.89964,-5.3e-4 1.79928,7e-4 2.69892,-5.3e-4 0,1.65943 0,3.31868 0,4.97811 -0.34799,-0.001 -0.69583,1.8e-4 -1.04382,-8.6e-4 -0.12216,-0.003 -0.23853,0.0543 -0.33433,0.13286 -0.1445,0.13042 -0.23355,0.31421 -0.35362,0.46817 -0.10754,0.15379 -0.25011,0.29659 -0.43077,0.33268 -0.11638,0.0296 -0.23291,-0.0134 -0.34109,-0.0565 -0.10271,-0.0359 -0.1879,-0.1102 -0.27695,-0.17332 -0.15479,-0.12049 -0.29045,-0.26713 -0.44508,-0.38779 -0.11026,-0.0806 -0.23998,-0.14332 -0.37564,-0.13164 -0.15189,0.0246 -0.28338,0.12049 -0.39863,0.22545 -0.071,0.0615 -0.12649,0.14124 -0.19915,0.20105 -0.15286,0.15919 -0.31183,0.31507 -0.49153,0.43852 -0.13309,-0.0354 -0.27518,-0.0411 -0.40007,-0.10772 -0.0691,-0.0385 -0.13197,-0.11647 -0.11734,-0.20644 0.0125,-0.10534 0.0585,-0.20158 0.0943,-0.29922 0.14563,-0.32519 0.30508,-0.64341 0.43286,-0.97749 0.14563,-0.36145 0.23114,-0.74837 0.28531,-1.13756 0.024,-0.22597 0.059,-0.45021 0.0791,-0.6767 0.0225,-0.10598 0.0252,-0.21534 0.0474,-0.32153 0.0808,-0.43679 0.18388,-0.87514 0.38255,-1.26868 0.10207,-0.185 0.21764,-0.36982 0.38449,-0.49293 0.1175,-0.0944 0.25846,-0.14089 0.3885,-0.20941 0.13694,-0.0721 0.28434,-0.14699 0.37162,-0.2891 z" />
+   sodipodi:docname="curtain9.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="4.2797934"
+     inkscape:cy="11.241084"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1039.3622)">
+    <path
+       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path5"
+       d="m 0.03003334,1039.3908 c 0.0254,-0.012 0.0498,-0.029 0.0784,-0.029 5.26170996,0 10.52341966,-2e-4 15.78512966,0 0.0283,-4e-4 0.0527,0.018 0.0781,0.03 0.0109,0.027 0.0289,0.054 0.0286,0.085 0,0.9072 -1.6e-4,2.2356 0,3.1429 6.5e-4,0.032 -0.0174,0.059 -0.0284,0.086 -0.0252,0.012 -0.0495,0.03 -0.0775,0.03 -0.14017,8e-4 -0.28017,-7e-4 -0.42017,3e-4 0.002,1.0598 -1.6e-4,1.8991 0.001,2.9589 0.004,0.038 -0.0138,0.072 -0.0294,0.1043 -0.0244,0.011 -0.049,0.023 -0.073,0.034 0.024,0.012 0.0487,0.023 0.0733,0.034 0.0112,0.028 0.0286,0.055 0.0291,0.087 -0.001,1.6916 6.5e-4,3.3833 -6.4e-4,5.075 -0.002,0.082 0.0167,0.1718 -0.0284,0.2447 -0.0273,0.012 -0.0539,0.03 -0.0842,0.029 -0.36407,-4e-4 -0.72814,1e-4 -1.09221,-4e-4 -0.10689,0 -0.21249,0.046 -0.28418,0.1329 -0.11332,0.1302 -0.19562,0.2877 -0.30299,0.4233 -0.17038,0.2405 -0.44283,0.4257 -0.73087,0.3882 -0.0993,0 -0.19465,-0.032 -0.28659,-0.068 -0.15158,-0.062 -0.28676,-0.1615 -0.41631,-0.2654 -0.13663,-0.1179 -0.26377,-0.2487 -0.40747,-0.3568 -0.0683,-0.049 -0.15945,-0.078 -0.23644,-0.034 -0.11975,0.066 -0.22214,0.1645 -0.3144,0.2691 -0.19691,0.1947 -0.38818,0.4021 -0.61997,0.5491 -0.0593,0.039 -0.13003,0.013 -0.19368,0.01 -0.1826,-0.03 -0.37966,-0.056 -0.5284997,-0.1859 -0.0775,-0.064 -0.11782,-0.1651 -0.13792,-0.2661 -0.0246,-0.1735 0.0436,-0.3393 0.10657,-0.4941 0.1417697,-0.3129 0.2933397,-0.6208 0.4193597,-0.9418 0.16251,-0.4049 0.25766,-0.8394 0.30588,-1.2769 0.0553,-0.4031 0.0829,-0.812 0.18035,-1.2069 0.0846,-0.4039 0.21989,-0.7984 0.42418,-1.1494 0.10513,-0.1774 0.23725,-0.3414 0.40667,-0.4483 0.18935,-0.1271 0.41389,-0.1831 0.59183,-0.3315 0.042,-0.035 0.0754,-0.082 0.0918,-0.1372 -0.0683,-0.1465 -0.18999,-0.2494 -0.27952,-0.3787 -0.13213,-0.181 -0.22262,-0.3917 -0.31713,-0.5971 -0.0926,-0.1761 -0.17971,-0.3558 -0.25541,-0.5414 -0.21861,-0.521 -0.34607,-1.08 -0.43271,-1.6428 -0.008,-0.078 -0.0262,0.067 -0.0272,-0.011 -2.0307497,-0.01 -4.0616597,5e-4 -6.0925597,0 -0.0696,0.4317 -0.13904,0.6466 -0.27261,1.0621 -0.0905,0.3083 -0.21169,0.6053 -0.35185,0.8907 -0.13647,0.2497 -0.2313,0.526 -0.39574,0.7576 -0.0807,0.1153 -0.18115,0.2124 -0.25862,0.3303 -0.0267,0.038 -0.0714,0.05 -0.11252,0.058 0.0307,0.013 0.0688,0.017 0.0908,0.046 0.0919,0.1419 0.24785,0.2057 0.38721,0.2772 0.16026,0.072 0.32132,0.1527 0.45055,0.2809 0.16523,0.1649 0.28772,0.3747 0.38368,0.5935 0.12408,0.2637 0.21136,0.5463 0.27357,0.834 0.13614,0.5461 0.15029,1.1158 0.25091,1.6692 0.053,0.2593 0.11364,0.5184 0.20976,0.7632 0.087,0.2316 0.1871,0.4568 0.29158,0.6797 0.0879,0.1963 0.18918,0.3871 0.25026,0.5961 0.0264,0.1163 0.0389,0.2452 -0.0124,0.3561 -0.0371,0.1203 -0.13984,0.1989 -0.24223,0.249 -0.15769,0.068 -0.32758,0.088 -0.49411,0.1121 -0.0595,0.01 -0.1093,-0.03 -0.15639,-0.062 -0.13711,-0.099 -0.26201,-0.2157 -0.38497,-0.3337 -0.0781,-0.09 -0.1699,-0.1641 -0.24657,-0.2557 -0.0964,-0.085 -0.1924,-0.1925 -0.32115,-0.2101 -0.13759,0.01 -0.23419,0.128 -0.33819,0.2107 -0.235,0.2237 -0.49057,0.4462 -0.80224,0.5234 -0.14241,0.026 -0.29286,0.03 -0.43013,-0.026 -0.17922,-0.068 -0.32645,-0.2085 -0.44122,-0.3693 -0.0952,-0.1259 -0.17488,-0.2649 -0.27341,-0.3878 -0.0718,-0.089 -0.17601,-0.1451 -0.28579,-0.1468 -0.33257,-4e-4 -0.66513,0 -0.99784996,-2e-4 -0.0645,0 -0.13374,0.012 -0.1908,-0.029 -0.0112,-0.028 -0.0292,-0.054 -0.0286,-0.086 0,-1.7213 0,-3.4426 -1.6e-4,-5.1638 -4.8e-4,-0.032 0.0174,-0.058 0.0283,-0.086 0.0283,-0.013 0.0566,-0.026 0.0857,-0.036 -0.0291,-0.01 -0.0574,-0.021 -0.0854,-0.033 -0.0111,-0.029 -0.0294,-0.056 -0.0286,-0.088 3.2e-4,-1.0655 -1.6e-4,-1.9103 3.2e-4,-2.9756 -0.12489,-9e-4 -0.24978,3e-4 -0.37468,-4e-4 -0.0286,4e-4 -0.0532,-0.017 -0.0788,-0.029 -0.0114,-0.028 -0.03020000378,-0.055 -0.0291,-0.088 1.6e-4,-0.866 0,-2.1532 1.6e-4,-3.0192 9.7e-4,-0.071 -0.0119,-0.1474 0.0286,-0.2093 m 0.19481,0.2147 c 0.001,0.8216 0.001,2.0646 -1.6e-4,2.8864 0.12216,10e-4 0.24432,10e-5 0.36648,3e-4 0.0326,0 0.0619,0.014 0.0902,0.029 0.0137,0.031 0.0301,0.062 0.027,0.098 -0.002,1.0619 8.1e-4,1.9031 -10e-4,2.9652 0.92390996,0 1.84782996,0 2.77173996,0 0.0449,-0.063 0.0961,-0.1188 0.14273,-0.1793 0.18855,-0.2062 0.30203,-0.4735 0.42017,-0.73 0.16508,-0.3045 0.29511,-0.6304 0.39477,-0.9664 0.11702,-0.3642 0.18372,-0.5235 0.24673,-0.9022 0.0164,-0.096 0.0108,-0.2012 0.0611,-0.2869 0.0281,-0.016 0.0572,-0.032 0.0902,-0.029 2.10099,7e-4 4.20198,-3e-4 6.3029697,6e-4 0.027,0 0.0503,0.016 0.0749,0.026 0.0288,0.044 0.0338,0.098 0.0355,0.1504 0.0354,0.2809 0.0839,0.3395 0.14499,0.615 0.0427,0.2258 0.11267,0.4441 0.18083,0.662 0.0854,0.2466 0.17938,0.4909 0.30154,0.7189 0.0804,0.1493 0.13984,0.3106 0.2223,0.4586 0.086,0.1724 0.20622,0.3207 0.32999,0.4615 0.94079,-10e-4 1.88174,-8e-4 2.82253,-10e-5 0,-1.0626 1.6e-4,-1.9047 0,-2.9673 -0.005,-0.061 0.0365,-0.1226 0.0952,-0.1245 0.14386,0 0.28772,5e-4 0.43174,-10e-4 -10e-4,-0.8218 -10e-4,-2.0648 -1.6e-4,-2.8866 -5.18392,-7e-4 -10.3679997,-7e-4 -15.55190966,2e-4 m 0.48221,6.4775 c 0.001,1.6356 0.001,3.2711 0,4.9065 0.30410996,10e-4 0.60822996,2e-4 0.91233996,5e-4 0.0828,9e-4 0.16636,0 0.24818,0.012 0.0577,0.023 0.11605,0.045 0.16732,0.083 0.11975,0.077 0.19723,0.206 0.27952,0.3237 0.1032,0.1576 0.20977,0.3192 0.35925,0.4294 0.1183,0.08 0.26827,0.1238 0.40457,0.076 0.0987,-0.029 0.19819,-0.063 0.2829,-0.1271 0.19112,-0.1234 0.35009,-0.2935 0.52432,-0.441 0.12232,-0.1019 0.27245,-0.1869 0.43126,-0.1696 0.16331,0.028 0.30026,0.1386 0.42274,0.2528 0.2067,0.216 0.41438,0.434 0.65259,0.6103 0.0808,-0.022 0.16524,-0.025 0.24592,-0.049 0.0894,-0.024 0.18807,-0.05 0.24609,-0.1348 0.0416,-0.048 0.0359,-0.1186 0.026,-0.178 -0.0564,-0.2077 -0.15623,-0.3965 -0.24335,-0.5899 -0.18598,-0.4011 -0.37098,-0.8082 -0.46517,-1.2478 -0.13615,-0.5565 -0.14177,-1.1387 -0.25702,-1.6999 -0.0619,-0.2946 -0.131,-0.59 -0.24705,-0.8662 -0.0833,-0.2148 -0.19755,-0.4167 -0.3427,-0.5888 -0.10592,-0.1181 -0.2366,-0.2094 -0.37853,-0.2675 -0.18003,-0.09 -0.37645,-0.1679 -0.51034,-0.3341 -0.91957,10e-4 -1.83931,-5e-4 -2.75887996,9e-4 m 11.80111966,0.039 c -0.0873,0.1421 -0.23468,0.2169 -0.37162,0.2891 -0.13004,0.069 -0.27101,0.1151 -0.3885,0.2094 -0.16685,0.1231 -0.28242,0.3079 -0.38449,0.4929 -0.19867,0.3936 -0.3017,0.8319 -0.38255,1.2687 -0.0222,0.1062 -0.0249,0.2155 -0.0474,0.3215 -0.0201,0.2265 -0.0551,0.4508 -0.0791,0.6767 -0.0542,0.3892 -0.13968,0.7761 -0.28531,1.1376 -0.12778,0.3341 -0.28723,0.6523 -0.43286,0.9775 -0.0358,0.098 -0.0818,0.1939 -0.0943,0.2992 -0.0146,0.09 0.0482,0.1679 0.11733,0.2064 0.1249,0.067 0.26699,0.072 0.40008,0.1078 0.1797,-0.1235 0.33867,-0.2794 0.49153,-0.4386 0.0726,-0.06 0.12811,-0.1395 0.19915,-0.201 0.11525,-0.105 0.24673,-0.2009 0.39863,-0.2255 0.13566,-0.012 0.26538,0.051 0.37564,0.1317 0.15463,0.1206 0.29029,0.2673 0.44508,0.3878 0.089,0.063 0.17424,0.1374 0.27695,0.1733 0.10818,0.043 0.22471,0.086 0.34108,0.057 0.18067,-0.036 0.32324,-0.1789 0.43078,-0.3327 0.12007,-0.1539 0.20912,-0.3377 0.35362,-0.4682 0.0958,-0.078 0.21217,-0.1365 0.33433,-0.1328 0.34799,10e-4 0.69583,-5e-4 1.04382,8e-4 l 0,-4.9781 c -0.89964,10e-4 -1.79928,0 -2.69893,6e-4 -0.0238,-0.01 -0.031,0.025 -0.0429,0.039 z" />
+    <path
+       sodipodi:nodetypes="ccccccccccccccccccccccccccc"
+       style="fill:#ff003c"
+       inkscape:connector-curvature="0"
+       id="path7"
+       d="m 0.22484334,1039.5854 c 5.18390996,-9e-4 10.36798966,-9e-4 15.55190966,-2e-4 -10e-4,0.8218 -10e-4,2.0956 1.6e-4,2.9174 -0.14402,0 -0.28788,0 -0.43174,0 -0.0587,0 -0.1,0.064 -0.0952,0.1244 1.6e-4,1.0626 0,1.894 0,2.9566 -0.94079,-7e-4 -1.88174,-10e-4 -2.82253,10e-5 -0.12377,-0.1408 -0.244,-0.289 -0.32999,-0.4615 -0.0825,-0.148 -0.14193,-0.3093 -0.2223,-0.4586 -0.12216,-0.228 -0.21619,-0.4723 -0.30154,-0.7189 -0.0682,-0.2179 -0.13808,-0.4362 -0.18083,-0.662 -0.0611,-0.2755 -0.10962,-0.3233 -0.14499,-0.6042 -0.002,-0.053 -0.007,-0.106 -0.0355,-0.1505 -0.0246,-0.01 -0.0479,-0.027 -0.0749,-0.026 -2.1009897,-9e-4 -4.2019797,2e-4 -6.3029697,-5e-4 -0.033,0 -0.062,0.014 -0.0902,0.029 -0.0503,0.086 -0.0447,0.1904 -0.0611,0.2868 -0.063,0.3787 -0.12971,0.5273 -0.24673,0.8915 -0.0997,0.336 -0.22969,0.6619 -0.39477,0.9664 -0.11814,0.2565 -0.23162,0.5238 -0.42016,0.73 -0.0466,0.061 -0.0979,0.1167 -0.14274,0.1793 -0.92391,0 -1.84783,2e-4 -2.77173996,0 0.002,-1.0621 -3.2e-4,-1.8926 0.001,-2.9544 0.003,-0.036 -0.0134,-0.067 -0.027,-0.098 -0.0283,-0.015 -0.0575,-0.032 -0.0902,-0.029 -0.12216,-2e-4 -0.24432,8e-4 -0.36648,-4e-4 0.001,-0.8218 0.001,-2.0956 1.6e-4,-2.9172 z" />
+    <path
+       style="fill:#ff003c"
+       inkscape:connector-curvature="0"
+       id="path9"
+       d="m 0.70705334,1046.083 c 0.91956996,-10e-4 1.83930996,7e-4 2.75887996,-9e-4 0.13389,0.1662 0.33031,0.2439 0.51034,0.3341 0.14193,0.058 0.27261,0.1494 0.37853,0.2674 0.14515,0.1721 0.25943,0.3741 0.3427,0.5889 0.11605,0.2762 0.18516,0.5715 0.24705,0.8662 0.11525,0.5611 0.12087,1.1433 0.25702,1.6999 0.0942,0.4396 0.27919,0.8467 0.46517,1.2478 0.0871,0.1933 0.18693,0.3822 0.24335,0.5898 0.01,0.059 0.0156,0.1303 -0.026,0.1781 -0.058,0.084 -0.15672,0.1112 -0.24609,0.1347 -0.0807,0.024 -0.16507,0.027 -0.24592,0.049 -0.23821,-0.1762 -0.44589,-0.3942 -0.65259,-0.6102 -0.12248,-0.1142 -0.25943,-0.2244 -0.42274,-0.2529 -0.15881,-0.017 -0.30894,0.068 -0.43126,0.1697 -0.17423,0.1475 -0.3332,0.3175 -0.52432,0.441 -0.0847,0.064 -0.1842,0.098 -0.2829,0.1271 -0.1363,0.048 -0.28627,0 -0.40457,-0.076 -0.14948,-0.1102 -0.25605,-0.2718 -0.35925,-0.4295 -0.0823,-0.1177 -0.15977,-0.2467 -0.27952,-0.3236 -0.0513,-0.038 -0.10962,-0.06 -0.16732,-0.083 -0.0818,-0.017 -0.1654,-0.011 -0.24818,-0.011 -0.30411,-3e-4 -0.60823,7e-4 -0.91233996,-5e-4 0.001,-1.6354 0.001,-3.2709 0,-4.9065 z" />
+    <path
+       style="fill:#ff003c"
+       inkscape:connector-curvature="0"
+       id="path11"
+       d="m 12.508173,1046.122 c 0.0119,-0.015 0.0191,-0.045 0.0429,-0.039 0.89964,-5e-4 1.79928,7e-4 2.69892,-5e-4 0,1.6594 0,3.3187 0,4.9781 -0.34799,-10e-4 -0.69583,2e-4 -1.04382,-9e-4 -0.12216,0 -0.23853,0.054 -0.33433,0.1329 -0.1445,0.1304 -0.23355,0.3142 -0.35362,0.4682 -0.10754,0.1538 -0.25011,0.2966 -0.43077,0.3326 -0.11638,0.03 -0.23291,-0.013 -0.34109,-0.056 -0.10271,-0.036 -0.1879,-0.1102 -0.27695,-0.1733 -0.15479,-0.1205 -0.29045,-0.2671 -0.44508,-0.3878 -0.11026,-0.081 -0.23998,-0.1433 -0.37564,-0.1316 -0.15189,0.025 -0.28338,0.1205 -0.39863,0.2254 -0.071,0.062 -0.12649,0.1413 -0.19915,0.2011 -0.15286,0.1592 -0.31183,0.3151 -0.49153,0.4385 -0.13309,-0.035 -0.27518,-0.041 -0.40007,-0.1077 -0.0691,-0.039 -0.13197,-0.1165 -0.11734,-0.2064 0.0125,-0.1054 0.0585,-0.2016 0.0943,-0.2993 0.14563,-0.3252 0.30508,-0.6434 0.43286,-0.9775 0.14563,-0.3614 0.23114,-0.7483 0.28531,-1.1375 0.024,-0.226 0.059,-0.4502 0.0791,-0.6767 0.0225,-0.106 0.0252,-0.2154 0.0474,-0.3215 0.0808,-0.4368 0.18388,-0.8752 0.38255,-1.2687 0.10207,-0.185 0.21764,-0.3698 0.38449,-0.493 0.1175,-0.094 0.25846,-0.1408 0.3885,-0.2094 0.13694,-0.072 0.28434,-0.147 0.37162,-0.2891 z" />
+  </g>
 </svg>
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 10824)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 10825)
@@ -451,8 +451,11 @@
     set icon_z17;
 }
+node[barrier=jersey_barrier] {
+    icon-image: "presets/barrier/jersey_barrier.svg";
+    set icon_z17;
+}
 node[barrier=kissing_gate][!is_prop_set(icon-image)],
 node[barrier=bump_gate][!is_prop_set(icon-image)],
 node[barrier=bus_trap][!is_prop_set(icon-image)],
-node[barrier=jersey_barrier][!is_prop_set(icon-image)],
 node[barrier=hampshire_gate][!is_prop_set(icon-image)] {
     icon-image: "presets/misc/no_icon.svg";
@@ -2937,6 +2940,6 @@
     set icon_z17;
 }
-node[craft=beekeeper][!is_prop_set(icon-image)] {
-    icon-image: "presets/misc/no_icon.svg";
+node[craft=beekeeper] {
+    icon-image: "presets/craft/beekeeper.svg";
     set icon_z17;
 }