Index: resources/data/defaultpresets.xml
===================================================================
--- resources/data/defaultpresets.xml	(revision 18270)
+++ resources/data/defaultpresets.xml	(working copy)
@@ -6211,8 +6211,7 @@
     </group> <!-- Military -->
     <group name="Power" icon="presets/power/power.svg">
         <group name="Power Plant" icon="presets/power/plant.svg">
-            <item name="Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
-              <!-- FIXME, following does not work: match_expression="power=plant !(plant:source=biofuel|plant:source=biogas|plant:source=biomass|plant:source=coal|plant:source=diesel|plant:source=gas|plant:source=gasoline|plant:source=geothermal|plant:source=hydro|plant:source=nuclear|plant:source=oil|plant:source=osmotic|plant:source=solar|plant:source=tidal|plant:source=waste|plant:source=wave|plant:source=wind)" -->
+            <item name="Power Plant" icon="presets/power/plant_plain.svg" type="closedway,multipolygon,relation" preset_name_label="true" match_expression="power=plant -(&quot;plant:source&quot;=biofuel|&quot;plant:source&quot;=biogas|&quot;plant:source&quot;=biomass|&quot;plant:source&quot;=coal|&quot;plant:source&quot;=diesel|&quot;plant:source&quot;=gas|&quot;plant:source&quot;=gasoline|&quot;plant:source&quot;=geothermal|&quot;plant:source&quot;=hydro|&quot;plant:source&quot;=nuclear|&quot;plant:source&quot;=oil|&quot;plant:source&quot;=osmotic|&quot;plant:source&quot;=solar|&quot;plant:source&quot;=tidal|&quot;plant:source&quot;=waste|&quot;plant:source&quot;=wave|&quot;plant:source&quot;=wind)">
                 <link wiki="Tag:power=plant" />
                 <space />
                 <reference ref="power_plant" />
@@ -6237,21 +6236,21 @@
                 </multiselect>
             </item> <!-- Power Plant -->
             <separator/>
-            <item name="Biofuel Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+            <item name="Biofuel Power Plant" icon="presets/power/plant_biofuel.svg" type="closedway,multipolygon,relation" preset_name_label="true">
                 <link wiki="Tag:power=plant" />
                 <key key="plant:source" value="biofuel" />
                 <key key="plant:method" value="combustion" match="none" />
                 <space />
                 <reference ref="power_plant" />
             </item> <!-- Biofuel Power Plant -->
-            <item name="Biogas Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+            <item name="Biogas Power Plant" icon="presets/power/plant_biofuel.svg" type="closedway,multipolygon,relation" preset_name_label="true">
                 <link wiki="Tag:power=plant" />
                 <key key="plant:source" value="biogas" />
                 <key key="plant:method" value="combustion" match="none" />
                 <space />
                 <reference ref="power_plant" />
             </item> <!-- Biogas Power Plant -->
-            <item name="Biomass Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+            <item name="Biomass Power Plant" icon="presets/power/plant_biofuel.svg" type="closedway,multipolygon,relation" preset_name_label="true">
                 <link wiki="Tag:plant:source=biomass" />
                 <key key="plant:source" value="biomass" />
                 <space />
@@ -6259,42 +6258,42 @@
                 <space />
                 <combo key="plant:method" text="Method" values_context="generator method" values="anaerobic_digestion,combustion,gasification" />
             </item> <!-- Biomass Power Plant -->
-            <item name="Coal Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+            <item name="Coal Power Plant" icon="presets/power/plant_coal.svg" type="closedway,multipolygon,relation" preset_name_label="true">
                 <link wiki="Tag:plant:source=coal" />
                 <key key="plant:source" value="coal" />
                 <key key="plant:method" value="combustion" match="none" />
                 <space />
                 <reference ref="power_plant" />
             </item> <!-- Coal Power Plant -->
-            <item name="Gas Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+            <item name="Gas Power Plant" icon="presets/power/plant_gas.svg" type="closedway,multipolygon,relation" preset_name_label="true">
                 <link wiki="Tag:plant:source=gas" />
                 <key key="plant:source" value="gas" />
                 <key key="plant:method" value="combustion" match="none" />
                 <space />
                 <reference ref="power_plant" />
             </item> <!-- Gas Power Plant -->
-            <item name="Oil Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+            <item name="Oil Power Plant" icon="presets/power/plant_oil.svg" type="closedway,multipolygon,relation" preset_name_label="true">
                 <link wiki="Tag:plant:source=oil" />
                 <key key="plant:source" value="oil" />
                 <key key="plant:method" value="combustion" match="none" />
                 <space />
                 <reference ref="power_plant" />
             </item> <!-- Oil Power Plant -->
-            <item name="Diesel Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+            <item name="Diesel Power Plant" icon="presets/power/plant_oil.svg" type="closedway,multipolygon,relation" preset_name_label="true">
                 <link wiki="Tag:power=plant" />
                 <key key="plant:source" value="diesel" />
                 <key key="plant:method" value="combustion" match="none" />
                 <space />
                 <reference ref="power_plant" />
             </item> <!-- Diesel Power Plant -->
-            <item name="Gasoline Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+            <item name="Gasoline Power Plant" icon="presets/power/plant_oil.svg" type="closedway,multipolygon,relation" preset_name_label="true">
                 <link wiki="Tag:power=plant" />
                 <key key="plant:source" value="gasoline" />
                 <key key="plant:method" value="combustion" match="none" />
                 <space />
                 <reference ref="power_plant" />
             </item> <!-- Gasoline Power Plant -->
-            <item name="Nuclear Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+            <item name="Nuclear Power Plant" icon="presets/power/plant_nuclear.svg" type="closedway,multipolygon,relation" preset_name_label="true">
                 <link wiki="Tag:plant:source=nuclear" />
                 <key key="plant:source" value="nuclear" />
                 <space />
@@ -6302,15 +6301,7 @@
                 <space />
                 <combo key="plant:method" text="Method" values_context="generator method" values="fission,fusion" />
             </item> <!-- Nuclear Power Plant -->
-            <item name="Solar Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
-                <link wiki="Tag:plant:source=solar" />
-                <key key="plant:source" value="solar" />
-                <space />
-                <reference ref="power_plant" />
-                <space />
-                <combo key="plant:method" text="Method" values_context="generator method" values="photovoltaic,thermal" />
-            </item> <!-- Solar Power Plant -->
-            <item name="Waste Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+            <item name="Waste Power Plant" icon="presets/power/plant_waste.svg" type="closedway,multipolygon,relation" preset_name_label="true">
                 <link wiki="Tag:plant:source=waste" />
                 <key key="plant:source" value="waste" />
                 <space />
@@ -6318,7 +6309,13 @@
                 <space />
                 <combo key="plant:method" text="Method" values_context="generator method" values="combustion,gasification,pyrolysis" />
             </item> <!-- Waste Power Plant -->
-            <item name="Hydro Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+            <item name="Geothermal Power Plant" icon="presets/power/plant_geothermal.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+                <link wiki="Tag:plant:source=geothermal" />
+                <key key="plant:source" value="geothermal" />
+                <space />
+                <reference ref="power_plant" />
+            </item> <!-- Geothermal Power Plant -->
+            <item name="Hydro Power Plant" icon="presets/power/plant_water.svg" type="closedway,multipolygon,relation" preset_name_label="true">
                 <link wiki="Tag:plant:source=hydro" />
                 <key key="plant:source" value="hydro" />
                 <space />
@@ -6326,7 +6323,7 @@
                 <space />
                 <combo key="plant:method" text="Method" values_context="generator method" values="run-of-the-river,water-pumped-storage,water-storage" />
             </item> <!-- Hydro Power Plant -->
-            <item name="Tidal Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+            <item name="Tidal Power Plant" icon="presets/power/plant_water.svg" type="closedway,multipolygon,relation" preset_name_label="true">
                 <link wiki="Tag:power=plant" />
                 <key key="plant:source" value="tidal" />
                 <space />
@@ -6334,25 +6331,27 @@
                 <space />
                 <combo key="plant:method" text="Method" values_context="generator method" values="barrage,stream" />
             </item> <!-- Tidal Power Plant -->
-            <item name="Wave Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+            <item name="Wave Power Plant" icon="presets/power/plant_water.svg" type="closedway,multipolygon,relation" preset_name_label="true">
                 <link wiki="Tag:power=plant" />
                 <key key="plant:source" value="wave" />
                 <space />
                 <reference ref="power_plant" />
             </item> <!-- Wave Power Plant -->
-            <item name="Osmotic Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+            <item name="Osmotic Power Plant" icon="presets/power/plant_water.svg" type="closedway,multipolygon,relation" preset_name_label="true">
                 <link wiki="Tag:power=plant" />
                 <key key="plant:source" value="osmotic" />
                 <space />
                 <reference ref="power_plant" />
             </item> <!-- Osmotic Power Plant -->
-            <item name="Geothermal Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
-                <link wiki="Tag:plant:source=geothermal" />
-                <key key="plant:source" value="geothermal" />
+            <item name="Solar Power Plant" icon="presets/power/plant_gas.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+                <link wiki="Tag:plant:source=solar" />
+                <key key="plant:source" value="solar" />
                 <space />
                 <reference ref="power_plant" />
-            </item> <!-- Geothermal Power Plant -->
-            <item name="Wind Power Plant" icon="presets/power/plant.svg" type="closedway,multipolygon,relation" preset_name_label="true">
+                <space />
+                <combo key="plant:method" text="Method" values_context="generator method" values="photovoltaic,thermal" />
+            </item> <!-- Solar Power Plant -->
+            <item name="Wind Power Plant" icon="presets/power/plant_wind.svg" type="closedway,multipolygon,relation" preset_name_label="true">
                 <link wiki="Tag:plant:source=wind" />
                 <key key="plant:source" value="wind" />
                 <key key="plant:method" value="wind_turbine" match="none" />
Index: resources/images/presets/power/plant.svg
===================================================================
--- trunk/resources/images/presets/power/plant.svg	2021-10-13 00:13:59.842603550 +0200
+++ new/resources/images/presets/power/plant.svg	2021-10-13 20:42:40.125224436 +0200
@@ -1,183 +1,19 @@
 <?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="16"
    viewBox="0 0 16 16"
-   id="svg4264"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="power__plant5.svg">
+   id="svg2860">
   <defs
-     id="defs4266">
-    <marker
-       inkscape:stockid="EmptyTriangleInL"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="EmptyTriangleInL"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path4298"
-         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
-         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker4778"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path4780"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
-         transform="matrix(0.8,0,0,0.8,10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker4657"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path4659"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
-         transform="matrix(0.8,0,0,0.8,10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       inkscape:stockid="InfiniteLineStart"
-       id="InfiniteLineStart"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:isstock="true">
-      <g
-         id="g4391"
-         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
-         transform="translate(-13,0)">
-        <circle
-           id="circle4393"
-           r="0.80000001"
-           cy="0"
-           cx="3"
-           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-        <circle
-           id="circle4395"
-           r="0.80000001"
-           cy="0"
-           cx="6.5"
-           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-        <circle
-           id="circle4397"
-           r="0.80000001"
-           cy="0"
-           cx="10"
-           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
-      </g>
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Lstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path4165"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(1.1,0,0,1.1,1.1,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path4153"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Lstart"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path4147"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
-         transform="matrix(0.8,0,0,0.8,10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="3.4252009"
-     inkscape:cy="6.6588019"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     units="px"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-global="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="false"
-     inkscape:snap-smooth-nodes="false"
-     inkscape:snap-midpoints="false"
-     inkscape:snap-object-midpoints="false"
-     inkscape:snap-center="false"
-     inkscape:snap-nodes="true"
-     inkscape:snap-others="true"
-     inkscape:snap-page="true"
-     inkscape:snap-grids="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4137" />
-  </sodipodi:namedview>
+     id="defs2854" />
   <metadata
-     id="metadata4269">
+     id="metadata2857">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -199,34 +35,19 @@
       </cc:License>
     </rdf:RDF>
   </metadata>
-  <g
-     inkscape:label="Camada 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3621)">
-    <rect
-       style="opacity:1;fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4288"
-       width="16"
-       height="16"
-       x="0"
-       y="1036.3621" />
-    <rect
-       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4231"
-       width="4.8506665"
-       height="4.9962158"
-       x="9.6493359"
-       y="1045.866" />
-    <g
-       id="g3382-9"
-       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
-       style="fill:#000000;fill-opacity:1" />
-    <path
-       style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 1.0000001,1050.8621 c 0,0 3.5000004,-5 2.5000003,-12 l 6.0000007,0 c -0.9999999,7 2.4999999,12 2.4999999,12 z"
-       id="path4229"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-  </g>
+  <path
+     id="rect1001"
+     style="opacity:1;fill:#ffcc00;stroke:#ffcc00;stroke-width:2;stroke-linejoin:round;stop-color:#000000;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+     d="M 1,1 H 15 V 15 H 1 Z" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect4231"
+     width="4.85"
+     height="5"
+     x="10"
+     y="9" />
+  <path
+     style="fill:#cccccc;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 1.35,14 c 0,0 3.5,-5 2.5,-12 H 9.85 C 8.85,9 12.35,14 12.35,14 Z"
+     id="path4229" />
 </svg>
Index: resources/images/presets/power/power_source-biofuel.svg
===================================================================
--- trunk/resources/images/presets/power/power_source-biofuel.svg	2021-10-13 01:17:42.763818938 +0200
+++ new/resources/images/presets/power/power_source-biofuel.svg	2021-10-13 02:28:50.748936144 +0200
@@ -5,98 +5,83 @@
    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"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.0">
+   width="16.0px"
+   height="16.0px"
+   viewBox="0 0 16.0 16.0"
+   version="1.1"
+   id="SVGRoot">
   <defs
-     id="defs183" />
+     id="defs1801" />
   <metadata
-     id="metadata10">
+     id="metadata1804">
     <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://web.resource.org/cc/PublicDomain" />
         <dc:title></dc:title>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://web.resource.org/cc/PublicDomain">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <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" />
         <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
       <cc:License
-         rdf:about="http://web.resource.org/cc/PublicDomain">
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
       </cc:License>
     </rdf:RDF>
   </metadata>
-  <ellipse
-     style="fill:#00EE76;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-opacity:1"
-     id="background"
-     cx="8"
-     cy="8"
-     rx="7.6000004"
-     ry="7.5999999" />
-  <rect
-     style="fill:#000000"
-     x="5"
-     y="7"
-     width="2"
-     height="6"
-     id="rect2939" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:0.80864745;stroke-opacity:1"
-     d="m 5.9796932,4.5406871 c 0,0 0,-1.6020611 1.6326736,-1.6020611 1.6326736,0 1.6326736,-1.6020611 1.6326736,-1.6020611"
-     id="path2941" />
-  <rect
-     style="fill:#000000"
-     x="8"
-     y="8"
-     width="2"
-     height="5"
-     id="rect2943" />
-  <rect
-     style="fill:#000000"
-     x="5"
-     y="5"
-     width="1.9999994"
-     height="0.99999976"
-     id="rect2947" />
-  <rect
-     style="fill:#000000"
-     x="8"
-     y="6"
-     width="2.0000012"
-     height="0.99999595"
-     id="rect2949" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:0.69512463;stroke-opacity:1"
-     d="m 9.06003,5.2659558 c 0,0 0,-1.3571756 1.424129,-1.3571756 1.424129,0 1.424129,-1.3571757 1.424129,-1.3571757"
-     id="path2941-2" />
+  <g
+     id="g2965">
+    <circle
+       style="fill:#00ee76;fill-opacity:1;stroke:#000000;stroke-width:0.8;stroke-opacity:1"
+       id="background"
+       cx="8"
+       cy="8"
+       r="7.6" />
+    <g
+       id="g1855"
+       transform="translate(0,0.39702381)">
+      <rect
+         style="fill:#000000"
+         x="5"
+         y="7"
+         width="2"
+         height="6"
+         id="rect2939" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.808647;stroke-opacity:1"
+         d="m 5.9796932,4.5406871 c 0,0 0,-1.6020611 1.6326736,-1.6020611 1.6326736,0 1.6326736,-1.6020611 1.6326736,-1.6020611"
+         id="path2941" />
+      <rect
+         style="fill:#000000"
+         x="8"
+         y="8"
+         width="2"
+         height="5"
+         id="rect2943" />
+      <rect
+         style="fill:#000000"
+         x="5"
+         y="5"
+         width="2"
+         height="1"
+         id="rect2947" />
+      <rect
+         style="fill:#000000"
+         x="8"
+         y="6"
+         width="2"
+         height="1"
+         id="rect2949" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.695125;stroke-opacity:1"
+         d="m 9.06003,5.2659558 c 0,0 0,-1.3571756 1.424129,-1.3571756 1.424129,0 1.424129,-1.3571757 1.424129,-1.3571757"
+         id="path2941-2" />
+    </g>
+  </g>
 </svg>
Index: resources/images/presets/power/power_source-coal.svg
===================================================================
--- trunk/resources/images/presets/power/power_source-coal.svg	2021-10-13 01:17:53.936209286 +0200
+++ new/resources/images/presets/power/power_source-coal.svg	2021-10-13 02:27:38.346406501 +0200
@@ -5,98 +5,83 @@
    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"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.0">
+   width="16.0px"
+   height="16.0px"
+   viewBox="0 0 16.0 16.0"
+   version="1.1"
+   id="SVGRoot">
   <defs
-     id="defs280" />
+     id="defs1801" />
   <metadata
-     id="metadata10">
+     id="metadata1804">
     <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://web.resource.org/cc/PublicDomain" />
         <dc:title></dc:title>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://web.resource.org/cc/PublicDomain">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <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" />
         <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
       <cc:License
-         rdf:about="http://web.resource.org/cc/PublicDomain">
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
       </cc:License>
     </rdf:RDF>
   </metadata>
-  <ellipse
-     style="fill:#8B4513;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-opacity:1"
-     id="background"
-     cx="8"
-     cy="8"
-     rx="7.6000004"
-     ry="7.5999999" />
-  <rect
-     style="fill:#000000"
-     x="5"
-     y="7"
-     width="2"
-     height="6"
-     id="rect2939" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:0.80864745;stroke-opacity:1"
-     d="m 5.9796932,4.5406871 c 0,0 0,-1.6020611 1.6326736,-1.6020611 1.6326736,0 1.6326736,-1.6020611 1.6326736,-1.6020611"
-     id="path2941" />
-  <rect
-     style="fill:#000000"
-     x="8"
-     y="8"
-     width="2"
-     height="5"
-     id="rect2943" />
-  <rect
-     style="fill:#000000"
-     x="5"
-     y="5"
-     width="1.9999994"
-     height="0.99999976"
-     id="rect2947" />
-  <rect
-     style="fill:#000000"
-     x="8"
-     y="6"
-     width="2.0000012"
-     height="0.99999595"
-     id="rect2949" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:0.69512463;stroke-opacity:1"
-     d="m 9.06003,5.2659558 c 0,0 0,-1.3571756 1.424129,-1.3571756 1.424129,0 1.424129,-1.3571757 1.424129,-1.3571757"
-     id="path2941-2" />
+  <g
+     id="g2965">
+    <circle
+       style="fill:#8b4513;fill-opacity:1;stroke:#000000;stroke-width:0.8;stroke-opacity:1"
+       id="background"
+       cx="8"
+       cy="8"
+       r="7.6" />
+    <g
+       id="g1855"
+       transform="translate(0,0.39702381)">
+      <rect
+         style="fill:#000000"
+         x="5"
+         y="7"
+         width="2"
+         height="6"
+         id="rect2939" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.808647;stroke-opacity:1"
+         d="m 5.9796932,4.5406871 c 0,0 0,-1.6020611 1.6326736,-1.6020611 1.6326736,0 1.6326736,-1.6020611 1.6326736,-1.6020611"
+         id="path2941" />
+      <rect
+         style="fill:#000000"
+         x="8"
+         y="8"
+         width="2"
+         height="5"
+         id="rect2943" />
+      <rect
+         style="fill:#000000"
+         x="5"
+         y="5"
+         width="2"
+         height="1"
+         id="rect2947" />
+      <rect
+         style="fill:#000000"
+         x="8"
+         y="6"
+         width="2"
+         height="1"
+         id="rect2949" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.695125;stroke-opacity:1"
+         d="m 9.06003,5.2659558 c 0,0 0,-1.3571756 1.424129,-1.3571756 1.424129,0 1.424129,-1.3571757 1.424129,-1.3571757"
+         id="path2941-2" />
+    </g>
+  </g>
 </svg>
Index: resources/images/presets/power/power_source-gas.svg
===================================================================
--- trunk/resources/images/presets/power/power_source-gas.svg	2021-10-13 01:18:05.540614727 +0200
+++ new/resources/images/presets/power/power_source-gas.svg	2021-10-13 02:20:44.851959610 +0200
@@ -5,98 +5,83 @@
    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"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.0">
+   width="16.0px"
+   height="16.0px"
+   viewBox="0 0 16.0 16.0"
+   version="1.1"
+   id="SVGRoot">
   <defs
-     id="defs212" />
+     id="defs1801" />
   <metadata
-     id="metadata10">
+     id="metadata1804">
     <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://web.resource.org/cc/PublicDomain" />
         <dc:title></dc:title>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://web.resource.org/cc/PublicDomain">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <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" />
         <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
       <cc:License
-         rdf:about="http://web.resource.org/cc/PublicDomain">
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
       </cc:License>
     </rdf:RDF>
   </metadata>
-  <ellipse
-     style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-opacity:1"
-     id="background"
-     cx="8"
-     cy="8"
-     rx="7.6000004"
-     ry="7.5999999" />
-  <rect
-     style="fill:#000000"
-     x="5"
-     y="7"
-     width="2"
-     height="6"
-     id="rect2939" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:0.80864745;stroke-opacity:1"
-     d="m 5.9796932,4.5406871 c 0,0 0,-1.6020611 1.6326736,-1.6020611 1.6326736,0 1.6326736,-1.6020611 1.6326736,-1.6020611"
-     id="path2941" />
-  <rect
-     style="fill:#000000"
-     x="8"
-     y="8"
-     width="2"
-     height="5"
-     id="rect2943" />
-  <rect
-     style="fill:#000000"
-     x="5"
-     y="5"
-     width="1.9999994"
-     height="0.99999976"
-     id="rect2947" />
-  <rect
-     style="fill:#000000"
-     x="8"
-     y="6"
-     width="2.0000012"
-     height="0.99999595"
-     id="rect2949" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:0.69512463;stroke-opacity:1"
-     d="m 9.06003,5.2659558 c 0,0 0,-1.3571756 1.424129,-1.3571756 1.424129,0 1.424129,-1.3571757 1.424129,-1.3571757"
-     id="path2941-2" />
+  <g
+     id="g2965">
+    <circle
+       style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:0.8;stroke-opacity:1"
+       id="background"
+       cx="8"
+       cy="8"
+       r="7.6" />
+    <g
+       id="g1855"
+       transform="translate(0,0.39702381)">
+      <rect
+         style="fill:#000000"
+         x="5"
+         y="7"
+         width="2"
+         height="6"
+         id="rect2939" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.808647;stroke-opacity:1"
+         d="m 5.9796932,4.5406871 c 0,0 0,-1.6020611 1.6326736,-1.6020611 1.6326736,0 1.6326736,-1.6020611 1.6326736,-1.6020611"
+         id="path2941" />
+      <rect
+         style="fill:#000000"
+         x="8"
+         y="8"
+         width="2"
+         height="5"
+         id="rect2943" />
+      <rect
+         style="fill:#000000"
+         x="5"
+         y="5"
+         width="2"
+         height="1"
+         id="rect2947" />
+      <rect
+         style="fill:#000000"
+         x="8"
+         y="6"
+         width="2"
+         height="1"
+         id="rect2949" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.695125;stroke-opacity:1"
+         d="m 9.06003,5.2659558 c 0,0 0,-1.3571756 1.424129,-1.3571756 1.424129,0 1.424129,-1.3571757 1.424129,-1.3571757"
+         id="path2941-2" />
+    </g>
+  </g>
 </svg>
Index: resources/images/presets/power/power_source-geothermal.svg
===================================================================
--- trunk/resources/images/presets/power/power_source-geothermal.svg	2021-10-13 01:18:18.321061256 +0200
+++ new/resources/images/presets/power/power_source-geothermal.svg	2021-10-13 02:59:27.166085756 +0200
@@ -5,79 +5,57 @@
    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"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.0">
+   width="16.0px"
+   height="16.0px"
+   viewBox="0 0 16.0 16.0"
+   version="1.1"
+   id="SVGRoot">
   <defs
-     id="defs14" />
+     id="defs869" />
   <metadata
-     id="metadata10">
+     id="metadata872">
     <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://web.resource.org/cc/PublicDomain" />
         <dc:title></dc:title>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://web.resource.org/cc/PublicDomain">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <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" />
         <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
       <cc:License
-         rdf:about="http://web.resource.org/cc/PublicDomain">
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
       </cc:License>
     </rdf:RDF>
   </metadata>
-  <ellipse
-     style="fill:#ff4b00;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+  <circle
+     style="fill:#ff4b00;fill-opacity:1;stroke:#000000;stroke-width:0.8;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="background"
      cx="8"
      cy="8"
-     rx="7.6000004"
-     ry="7.5999999" />
+     r="7.6" />
   <g
      id="g2973"
-     transform="matrix(0.70956312,0,0,0.80502669,2.8413415,4.4945337)"
-     style="stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+     transform="matrix(0.70956312,0,0,0.80502669,2.8413415,4.4945338)"
+     style="stroke:#000000;stroke-width:1.32312;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
     <path
        id="path2959"
-       d="m 0.354,3.355 c 1,1 3.999,2.999 6.998,1 3,-2 6,0 6.999,1"
-       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       d="m 0.354,3.355 c 1,1 4,3 7,1 3,-2 6,0 7,1"
+       style="fill:none;stroke-dasharray:none;stroke-opacity:1" />
     <path
        id="path2961"
-       d="m 0.354,0.355 c 1,1.001 3.999,3 6.998,1.001 3,-2 6,0 6.999,0.999"
-       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       d="m 0.354,0.355 c 1,1 4,3 7,1 3,-2 6,0 7,1"
+       style="fill:none;stroke-dasharray:none;stroke-opacity:1" />
     <path
        id="path2963"
-       d="m 0.354,6.354 c 1,1.001 3.999,2.999 6.998,1.001 3,-2 6,0 6.999,0.999"
-       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       d="m 0.354,6.355 c 1,1 4,3 7,1 3,-2 6,0 7,1"
+       style="fill:none;stroke:#000000;stroke-width:1.32312;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
Index: resources/images/presets/power/power_source-nuclear.svg
===================================================================
--- trunk/resources/images/presets/power/power_source-nuclear.svg	2021-10-13 01:18:30.301479836 +0200
+++ new/resources/images/presets/power/power_source-nuclear.svg	2021-10-13 20:37:23.269496410 +0200
@@ -5,85 +5,66 @@
    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"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.0">
+   width="16.0px"
+   height="16.0px"
+   viewBox="0 0 16.0 16.0"
+   version="1.1"
+   id="SVGRoot">
   <defs
-     id="defs15" />
+     id="defs709" />
   <metadata
-     id="metadata10">
+     id="metadata712">
     <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://web.resource.org/cc/PublicDomain" />
         <dc:title></dc:title>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://web.resource.org/cc/PublicDomain">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <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" />
         <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
       <cc:License
-         rdf:about="http://web.resource.org/cc/PublicDomain">
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
       </cc:License>
     </rdf:RDF>
   </metadata>
-  <ellipse
-     style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-opacity:1"
-     id="background"
-     cx="8"
-     cy="8"
-     rx="7.6000004"
-     ry="7.5999999" />
   <g
-     id="g2397"
-     style="fill:#000000"
-     transform="scale(0.8,0.80000003)">
-    <path
-       id="path4369"
-       d="m 14,3.074 -2.5,4.33 C 12.396,7.922 13.001,8.889 13.001,10 L 18,10 C 18,7.041 16.39,4.457 14,3.074 Z"
-       style="fill:#000000" />
-    <path
-       id="path4371"
-       d="m 2.006,10 4.999,0 C 7.005,8.964 7.54,7.957 8.501,7.402 L 6.002,3.072 C 3.441,4.552 2.008,7.238 2.006,10 Z"
-       style="fill:#000000" />
-    <path
-       id="path4373"
-       d="m 14,16.925 -2.5,-4.329 c -0.897,0.516 -2.037,0.556 -2.998,10e-4 l -2.499,4.328 c 2.562,1.481 5.604,1.377 7.997,0 z"
-       style="fill:#000000" />
+     id="layer1">
     <circle
-       id="path4395"
-       style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
-       cx="10"
-       cy="10"
-       r="2" />
+       style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:0.8;stroke-opacity:1"
+       id="background"
+       cx="8"
+       cy="8"
+       r="7.6" />
+    <g
+       id="g2397"
+       style="fill:#000000"
+       transform="scale(0.8)">
+      <path
+         id="path4369"
+         d="m 14,3.074 -2.5,4.33 C 12.396,7.922 13.001,8.889 13.001,10 H 18 C 18,7.041 16.39,4.457 14,3.074 Z"
+         style="fill:#000000" />
+      <path
+         id="path4371"
+         d="M 2.006,10 H 7.005 C 7.005,8.964 7.54,7.957 8.501,7.402 L 6.002,3.072 C 3.441,4.552 2.008,7.238 2.006,10 Z"
+         style="fill:#000000" />
+      <path
+         id="path4373"
+         d="m 14,16.925 -2.5,-4.329 c -0.897,0.516 -2.037,0.556 -2.998,10e-4 l -2.499,4.328 c 2.562,1.481 5.604,1.377 7.997,0 z"
+         style="fill:#000000" />
+      <circle
+         id="path4395"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
+         cx="10"
+         cy="10"
+         r="2" />
+    </g>
   </g>
 </svg>
Index: resources/images/presets/power/power_source-oil.svg
===================================================================
--- trunk/resources/images/presets/power/power_source-oil.svg	2021-10-13 01:18:39.417798345 +0200
+++ new/resources/images/presets/power/power_source-oil.svg	2021-10-13 02:30:01.467406946 +0200
@@ -5,98 +5,83 @@
    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"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.0">
+   width="16.0px"
+   height="16.0px"
+   viewBox="0 0 16.0 16.0"
+   version="1.1"
+   id="SVGRoot">
   <defs
-     id="defs115" />
+     id="defs1801" />
   <metadata
-     id="metadata10">
+     id="metadata1804">
     <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://web.resource.org/cc/PublicDomain" />
         <dc:title></dc:title>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://web.resource.org/cc/PublicDomain">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <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" />
         <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
       <cc:License
-         rdf:about="http://web.resource.org/cc/PublicDomain">
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
       </cc:License>
     </rdf:RDF>
   </metadata>
-  <ellipse
-     style="fill:#708090;fill-opacity:1;stroke:#000000;stroke-width:0.8;stroke-opacity:1"
-     id="background"
-     cx="8"
-     cy="8"
-     rx="7.6000004"
-     ry="7.5999999" />
-  <rect
-     style="fill:#000000"
-     x="5"
-     y="7"
-     width="2"
-     height="6"
-     id="rect2939" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:0.80864745;stroke-opacity:1"
-     d="m 5.9796932,4.5406871 c 0,0 0,-1.6020611 1.6326736,-1.6020611 1.6326736,0 1.6326736,-1.6020611 1.6326736,-1.6020611"
-     id="path2941" />
-  <rect
-     style="fill:#000000"
-     x="8"
-     y="8"
-     width="2"
-     height="5"
-     id="rect2943" />
-  <rect
-     style="fill:#000000"
-     x="5"
-     y="5"
-     width="1.9999994"
-     height="0.99999976"
-     id="rect2947" />
-  <rect
-     style="fill:#000000"
-     x="8"
-     y="6"
-     width="2.0000012"
-     height="0.99999595"
-     id="rect2949" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:0.69512463;stroke-opacity:1"
-     d="m 9.06003,5.2659558 c 0,0 0,-1.3571756 1.424129,-1.3571756 1.424129,0 1.424129,-1.3571757 1.424129,-1.3571757"
-     id="path2941-2" />
+  <g
+     id="g2965">
+    <circle
+       style="fill:#708090;fill-opacity:1;stroke:#000000;stroke-width:0.8;stroke-opacity:1"
+       id="background"
+       cx="8"
+       cy="8"
+       r="7.6" />
+    <g
+       id="g1855"
+       transform="translate(0,0.39702381)">
+      <rect
+         style="fill:#000000"
+         x="5"
+         y="7"
+         width="2"
+         height="6"
+         id="rect2939" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.808647;stroke-opacity:1"
+         d="m 5.9796932,4.5406871 c 0,0 0,-1.6020611 1.6326736,-1.6020611 1.6326736,0 1.6326736,-1.6020611 1.6326736,-1.6020611"
+         id="path2941" />
+      <rect
+         style="fill:#000000"
+         x="8"
+         y="8"
+         width="2"
+         height="5"
+         id="rect2943" />
+      <rect
+         style="fill:#000000"
+         x="5"
+         y="5"
+         width="2"
+         height="1"
+         id="rect2947" />
+      <rect
+         style="fill:#000000"
+         x="8"
+         y="6"
+         width="2"
+         height="1"
+         id="rect2949" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.695125;stroke-opacity:1"
+         d="m 9.06003,5.2659558 c 0,0 0,-1.3571756 1.424129,-1.3571756 1.424129,0 1.424129,-1.3571757 1.424129,-1.3571757"
+         id="path2941-2" />
+    </g>
+  </g>
 </svg>
Index: resources/images/presets/power/power_source-sun.svg
===================================================================
--- trunk/resources/images/presets/power/power_source-sun.svg	2021-10-13 01:19:44.344066780 +0200
+++ new/resources/images/presets/power/power_source-sun.svg	2021-10-13 20:38:55.163737690 +0200
@@ -5,112 +5,93 @@
    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"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.0">
+   width="16.0px"
+   height="16.0px"
+   viewBox="0 0 16.0 16.0"
+   version="1.1"
+   id="SVGRoot">
   <defs
-     id="defs18" />
+     id="defs94" />
   <metadata
-     id="metadata10">
+     id="metadata97">
     <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://web.resource.org/cc/PublicDomain" />
         <dc:title></dc:title>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://web.resource.org/cc/PublicDomain">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <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" />
         <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
       <cc:License
-         rdf:about="http://web.resource.org/cc/PublicDomain">
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
       </cc:License>
     </rdf:RDF>
   </metadata>
-  <ellipse
-     style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:0.8;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="background-6"
-     cx="8"
-     cy="8"
-     rx="7.6000004"
-     ry="7.5999999" />
   <g
-     id="g983"
-     transform="translate(0.5,-0.50000143)">
-    <circle
-       id="circle4170"
-       cy="8.5"
-       cx="7.5"
-       style="fill:#000000;stroke:none;stroke-width:0.9998"
-       r="2.5" />
-    <rect
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8;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="1"
-       height="11"
-       x="-1.2071068"
-       y="5.8137083"
-       transform="rotate(-45)"
-       ry="0.5" />
-    <rect
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8;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="rect4148"
-       width="11"
-       height="1"
-       x="-6.2071066"
-       y="10.813708"
-       transform="rotate(-45)"
-       ry="0.5" />
-    <rect
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8;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="rect4154"
-       width="11"
-       height="1"
-       x="2"
-       y="8"
-       ry="0.5" />
-    <rect
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8;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="rect4156"
-       width="1"
-       height="11"
-       x="7"
-       y="3"
-       ry="0.5" />
+     id="layer1">
     <circle
-       cy="8.5"
-       cx="7.5"
-       style="fill:#ffff00;fill-opacity:1;stroke:none;stroke-opacity:1"
-       id="circle4172"
-       r="1.5" />
+       style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:0.8;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="background-6"
+       cx="8"
+       cy="8"
+       r="7.6" />
+    <g
+       id="g983"
+       transform="translate(0.5,-0.50000133)">
+      <circle
+         id="circle4170"
+         cy="8.5"
+         cx="7.5"
+         style="fill:#000000;stroke:none;stroke-width:0.9998"
+         r="2.5" />
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8;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="1"
+         height="11"
+         x="-1.2071068"
+         y="5.8137083"
+         transform="rotate(-45)"
+         ry="0.5" />
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8;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="rect4148"
+         width="11"
+         height="1"
+         x="-6.2071066"
+         y="10.813708"
+         transform="rotate(-45)"
+         ry="0.5" />
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8;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="rect4154"
+         width="11"
+         height="1"
+         x="2"
+         y="8"
+         ry="0.5" />
+      <rect
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8;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="rect4156"
+         width="1"
+         height="11"
+         x="7"
+         y="3"
+         ry="0.5" />
+      <circle
+         cy="8.5"
+         cx="7.5"
+         style="fill:#ffff00;fill-opacity:1;stroke:none;stroke-opacity:1"
+         id="circle4172"
+         r="1.5" />
+    </g>
   </g>
 </svg>
Index: resources/images/presets/power/power_source-waste.svg
===================================================================
--- trunk/resources/images/presets/power/power_source-waste.svg	2021-10-13 01:18:55.722368006 +0200
+++ new/resources/images/presets/power/power_source-waste.svg	2021-10-13 02:31:17.690070054 +0200
@@ -1,168 +1,87 @@
 <?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="16"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   version="1.0"
-   sodipodi:docname="power_source-gas.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   width="16.0px"
+   height="16.0px"
+   viewBox="0 0 16.0 16.0"
+   version="1.1"
+   id="SVGRoot">
+  <defs
+     id="defs1801" />
   <metadata
-     id="metadata10">
+     id="metadata1804">
     <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://web.resource.org/cc/PublicDomain" />
         <dc:title></dc:title>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://web.resource.org/cc/PublicDomain">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     inkscape:window-height="1018"
-     inkscape:window-width="1920"
-     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"
-     showgrid="true"
-     inkscape:zoom="32"
-     inkscape:cx="6.9004192"
-     inkscape:cy="10.644037"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:current-layer="svg2"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2383"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <sodipodi:namedview
-     id="namedview10"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="26.052568"
-     inkscape:cx="9.9125234"
-     inkscape:cy="9.2770693"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     gridtolerance="30"
-     inkscape:window-width="1172"
-     inkscape:window-height="805"
-     inkscape:window-x="122"
-     inkscape:window-y="11">
-    <inkscape:grid
-       type="xygrid"
-       id="grid12"
-       visible="true"
-       enabled="true"
-       spacingx="0.5px"
-       spacingy="0.5px"
-       empspacing="2" />
-  </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" />
         <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
       <cc:License
-         rdf:about="http://web.resource.org/cc/PublicDomain">
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
       </cc:License>
     </rdf:RDF>
   </metadata>
-  <ellipse
-     style="fill:#EE82EE;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-opacity:1"
-     id="background"
-     cx="8"
-     cy="8"
-     rx="7.6000004"
-     ry="7.5999999" />
-  <rect
-     style="fill:#000000"
-     x="5"
-     y="7"
-     width="2"
-     height="6"
-     id="rect2939" />
-  <path
-     inkscape:connector-curvature="0"
-     style="fill:none;stroke:#000000;stroke-width:0.80864745;stroke-opacity:1"
-     d="m 5.9796932,4.5406871 c 0,0 0,-1.6020611 1.6326736,-1.6020611 1.6326736,0 1.6326736,-1.6020611 1.6326736,-1.6020611"
-     id="path2941" />
-  <rect
-     style="fill:#000000"
-     x="8"
-     y="8"
-     width="2"
-     height="5"
-     id="rect2943" />
-  <rect
-     style="fill:#000000"
-     x="5"
-     y="5"
-     width="1.9999994"
-     height="0.99999976"
-     id="rect2947" />
-  <rect
-     style="fill:#000000"
-     x="8"
-     y="6"
-     width="2.0000012"
-     height="0.99999595"
-     id="rect2949" />
-  <path
-     inkscape:connector-curvature="0"
-     style="fill:none;stroke:#000000;stroke-width:0.69512463;stroke-opacity:1"
-     d="m 9.06003,5.2659558 c 0,0 0,-1.3571756 1.424129,-1.3571756 1.424129,0 1.424129,-1.3571757 1.424129,-1.3571757"
-     id="path2941-2" />
+  <g
+     id="g2965">
+    <circle
+       style="fill:#ee82ee;fill-opacity:1;stroke:#000000;stroke-width:0.8;stroke-opacity:1"
+       id="background"
+       cx="8"
+       cy="8"
+       r="7.6" />
+    <g
+       id="g1855"
+       transform="translate(0,0.39702381)">
+      <rect
+         style="fill:#000000"
+         x="5"
+         y="7"
+         width="2"
+         height="6"
+         id="rect2939" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.808647;stroke-opacity:1"
+         d="m 5.9796932,4.5406871 c 0,0 0,-1.6020611 1.6326736,-1.6020611 1.6326736,0 1.6326736,-1.6020611 1.6326736,-1.6020611"
+         id="path2941" />
+      <rect
+         style="fill:#000000"
+         x="8"
+         y="8"
+         width="2"
+         height="5"
+         id="rect2943" />
+      <rect
+         style="fill:#000000"
+         x="5"
+         y="5"
+         width="2"
+         height="1"
+         id="rect2947" />
+      <rect
+         style="fill:#000000"
+         x="8"
+         y="6"
+         width="2"
+         height="1"
+         id="rect2949" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.695125;stroke-opacity:1"
+         d="m 9.06003,5.2659558 c 0,0 0,-1.3571756 1.424129,-1.3571756 1.424129,0 1.424129,-1.3571757 1.424129,-1.3571757"
+         id="path2941-2" />
+    </g>
+  </g>
 </svg>
Index: resources/images/presets/power/power_source-water.svg
===================================================================
--- trunk/resources/images/presets/power/power_source-water.svg	2021-10-13 01:19:09.346844026 +0200
+++ new/resources/images/presets/power/power_source-water.svg	2021-10-13 20:41:02.198836046 +0200
@@ -5,79 +5,57 @@
    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"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.0">
+   width="16.0px"
+   height="16.0px"
+   viewBox="0 0 16.0 16.0"
+   version="1.1"
+   id="SVGRoot">
   <defs
-     id="defs14" />
+     id="defs869" />
   <metadata
-     id="metadata10">
+     id="metadata872">
     <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://web.resource.org/cc/PublicDomain" />
         <dc:title></dc:title>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://web.resource.org/cc/PublicDomain">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <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" />
         <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
       <cc:License
-         rdf:about="http://web.resource.org/cc/PublicDomain">
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
       </cc:License>
     </rdf:RDF>
   </metadata>
-  <ellipse
-     style="fill:#2090cf;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+  <circle
+     style="fill:#2090cf;fill-opacity:1;stroke:#000000;stroke-width:0.8;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="background"
      cx="8"
      cy="8"
-     rx="7.6000004"
-     ry="7.5999999" />
+     r="7.6" />
   <g
      id="g2973"
-     transform="matrix(0.70956312,0,0,0.80502669,2.8413415,4.4945337)"
-     style="stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+     transform="matrix(0.70956312,0,0,0.80502669,2.8413415,4.4945338)"
+     style="stroke:#000000;stroke-width:1.32312;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
     <path
        id="path2959"
-       d="m 0.354,3.355 c 1,1 3.999,2.999 6.998,1 3,-2 6,0 6.999,1"
-       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       d="m 0.354,3.355 c 1,1 4,3 7,1 3,-2 6,0 7,1"
+       style="fill:none;stroke-dasharray:none;stroke-opacity:1" />
     <path
        id="path2961"
-       d="m 0.354,0.355 c 1,1.001 3.999,3 6.998,1.001 3,-2 6,0 6.999,0.999"
-       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       d="m 0.354,0.355 c 1,1 4,3 7,1 3,-2 6,0 7,1"
+       style="fill:none;stroke-dasharray:none;stroke-opacity:1" />
     <path
        id="path2963"
-       d="m 0.354,6.354 c 1,1.001 3.999,2.999 6.998,1.001 3,-2 6,0 6.999,0.999"
-       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       d="m 0.354,6.355 c 1,1 4,3 7,1 3,-2 6,0 7,1"
+       style="fill:none;stroke:#000000;stroke-width:1.32312;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
Index: resources/images/presets/power/power_source-wind.svg
===================================================================
--- trunk/resources/images/presets/power/power_source-wind.svg	2021-10-13 01:19:21.463267359 +0200
+++ new/resources/images/presets/power/power_source-wind.svg	2021-10-13 20:41:59.040222387 +0200
@@ -5,97 +5,78 @@
    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"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.0">
+   width="16.0px"
+   height="16.0px"
+   viewBox="0 0 16.0 16.0"
+   version="1.1"
+   id="SVGRoot">
   <defs
-     id="defs15" />
+     id="defs331" />
   <metadata
-     id="metadata10">
+     id="metadata334">
     <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://web.resource.org/cc/PublicDomain" />
         <dc:title></dc:title>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://web.resource.org/cc/PublicDomain">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <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" />
         <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
       <cc:License
-         rdf:about="http://web.resource.org/cc/PublicDomain">
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
       </cc:License>
     </rdf:RDF>
   </metadata>
-  <ellipse
-     style="fill:#94d2ff;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-opacity:1"
-     id="background"
-     cx="8"
-     cy="8"
-     rx="7.6000004"
-     ry="7.5999999" />
   <g
-     id="g2391"
-     style="fill:#000000"
-     transform="scale(0.8,0.80000003)">
-    <rect
-       y="2"
-       x="9"
-       height="7"
-       width="2"
-       id="rect3840"
-       style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
-       ry="1" />
-    <rect
-       transform="matrix(-0.5,0.8660254,-0.8660254,-0.5,0,0)"
-       style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
-       id="rect3842"
-       width="2"
-       height="7"
-       x="2.2942286"
-       y="-21.026279"
-       ry="1" />
-    <rect
-       y="-3.7057714"
-       x="-14.294229"
-       height="7"
-       width="2"
-       id="rect3844"
-       style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
-       transform="matrix(-0.5,-0.8660254,0.8660254,-0.5,0,0)"
-       ry="1" />
-    <path
-       id="path3846"
-       d="m 9,18 2,0 0,-6 -1,-0.5 -1,0.5 0,6 z"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+     id="layer1">
+    <circle
+       style="fill:#94d2ff;fill-opacity:1;stroke:#000000;stroke-width:0.8;stroke-opacity:1"
+       id="background"
+       cx="8"
+       cy="8"
+       r="7.6" />
+    <g
+       id="g2391"
+       style="fill:#000000"
+       transform="scale(0.8)">
+      <rect
+         y="2"
+         x="9"
+         height="7"
+         width="2"
+         id="rect3840"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
+         ry="1" />
+      <rect
+         transform="rotate(120)"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
+         id="rect3842"
+         width="2"
+         height="7"
+         x="2.2942286"
+         y="-21.026279"
+         ry="1" />
+      <rect
+         y="-3.7057714"
+         x="-14.294229"
+         height="7"
+         width="2"
+         id="rect3844"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
+         transform="rotate(-120)"
+         ry="1" />
+      <path
+         id="path3846"
+         d="m 9,18 h 2 V 12 L 10,11.5 9,12 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
   </g>
 </svg>