More icons clean-up.

6 files changed, 104 insertions, 180 deletions

diff --git a/share/icons/paint-order-fms.svg b/share/icons/paint-order-fms.svg
index b026b392b..034957e68 100644
--- a/share/icons/paint-order-fms.svg
+++ b/share/icons/paint-order-fms.svg
@@ -1,41 +1,31 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
    width="24"
    height="24"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
 
-  </defs>
-<g id="paint-order-fms" inkscape:label="#paint-order-fsm" transform="translate(64)">
-  <rect height="24" style="fill:none" width="24" x="944" y="420"/>
-  <rect height="14" style="fill:#4776a7" width="14" x="954" y="430"/>
-  <circle cx="954" cy="430" r="9.5" style="stroke:#000000;fill:#cddbeb"/>
-  <path d="m949.5 444v-18.5h18.5v9h-9.5v9.5z" style="fill:#99b6d4"/>
-  <path d="m949.5 444v-18.5h18.5m0 9h-9.5v9.5" style="stroke:#000000;fill:none"/>
-  <rect height="2" style="fill:#ffffff" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,0)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,0)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,0)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,4)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,8)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,12)" width="2" x="953" y="429"/>
-</g>
+  <g id="paint-order-fms" inkscape:label="#paint-order-fsm">
+
+    <!-- Fill -->
+    <rect x="10" y="10" width="14" height="14" style="fill:#4776a7"/>
+
+    <!-- Marker -->
+    <circle cx="10" cy="10" r="9.5" style="fill:#cddbeb;stroke:black"/>
+
+    <!-- Stroke -->
+    <path d="m 5.5,24 v -18.5 h 18.5 v 9   h -9.5 v 9.5 z" style="fill:#99b6d4"/>
+    <path d="m 5.5,24 v -18.5 h 18.5 m 0,9 h -9.5 v 9.5" style="fill:none;stroke:black"/>
+    <rect x="9"  y="21" width="2" height="2" style="fill:white"/>
+    <rect x="9"  y="17" width="2" height="2" style="fill:white"/>
+    <rect x="9"  y="13" width="2" height="2" style="fill:white"/>
+    <rect x="9"  y="9"  width="2" height="2" style="fill:white"/>
+    <rect x="13" y="9"  width="2" height="2" style="fill:white"/>
+    <rect x="17" y="9"  width="2" height="2" style="fill:white"/>
+    <rect x="21" y="9"  width="2" height="2" style="fill:white"/>
+
+  </g>
 
 </svg>
diff --git a/share/icons/paint-order-fsm.svg b/share/icons/paint-order-fsm.svg
index c25b2807d..ffc52fa47 100644
--- a/share/icons/paint-order-fsm.svg
+++ b/share/icons/paint-order-fsm.svg
@@ -1,41 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
    width="24"
    height="24"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
 
-  </defs>
-<g id="paint-order-fsm" inkscape:label="#paint-order-fsm" transform="translate(-944,-420)">
-  <rect height="24" style="fill:none" width="24" x="944" y="420"/>
-  <rect height="14" style="fill:#4776a7" width="14" x="954" y="430"/>
-  <path d="m949.5 444v-18.5h18.5v9h-9.5v9.5z" style="fill:#99b6d4"/>
-  <path d="m949.5 444v-18.5h18.5m0 9h-9.5v9.5" style="stroke:#000000;fill:none"/>
-  <rect height="2" id="rect7708" style="fill:#ffffff" width="2" x="953" y="429"/>
-  <rect height="2" id="use7710" style="fill:#ffffff" transform="matrix(1,0,0,1,0,0)" width="2" x="953" y="429"/>
-  <rect height="2" id="use7712" style="fill:#ffffff" transform="matrix(1,0,0,1,0,0)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,0)" width="2" x="953" y="429"/>
-  <rect height="2" id="use7716" style="fill:#ffffff" transform="matrix(1,0,0,1,0,4)" width="2" x="953" y="429"/>
-  <rect height="2" id="use7718" style="fill:#ffffff" transform="matrix(1,0,0,1,0,8)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,12)" width="2" x="953" y="429"/>
-  <circle cx="954" cy="430" r="9.5" style="stroke:#000000;fill:#cddbeb"/>
-</g>
+  <g id="paint-order-fsm" inkscape:label="#paint-order-fsm">
+
+    <!-- Fill -->
+    <rect x="10" y="10" width="14" height="14" style="fill:#4776a7"/>
+
+    <!-- Stroke -->
+    <path d="m 5.5,24 v -18.5 h 18.5 v 9   h -9.5 v 9.5 z" style="fill:#99b6d4"/>
+    <path d="m 5.5,24 v -18.5 h 18.5 m 0,9 h -9.5 v 9.5" style="fill:none;stroke:black"/>
+    <rect x="9" y="21" width="2" height="2" style="fill:white"/>
+    <rect x="21" y="9" width="2" height="2" style="fill:white"/>
+
+    <!-- Marker -->
+    <circle cx="10" cy="10" r="9.5" style="fill:#cddbeb;stroke:black"/>
+  </g>
 
 </svg>
diff --git a/share/icons/paint-order-mfs.svg b/share/icons/paint-order-mfs.svg
index e475aa29d..e2e75ee6a 100644
--- a/share/icons/paint-order-mfs.svg
+++ b/share/icons/paint-order-mfs.svg
@@ -1,41 +1,31 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
    width="24"
    height="24"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
 
-  </defs>
-<g id="paint-order-mfs" inkscape:label="#paint-order-mfs" transform="translate(-944,-420)">
-  <circle cx="954" cy="430" r="9.5" style="stroke:#000000;fill:#cddbeb"/>
-  <rect height="24" style="fill:none" width="24" x="944" y="420"/>
-  <rect height="14" style="fill:#4776a7" width="14" x="954" y="430"/>
-  <path d="m949.5 444v-18.5h18.5v9h-9.5v9.5z" style="fill:#99b6d4"/>
-  <path d="m949.5 444v-18.5h18.5m0 9h-9.5v9.5" style="stroke:#000000;fill:none"/>
-  <rect height="2" style="fill:#ffffff" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,0)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,0)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,0)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,4)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,8)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,12)" width="2" x="953" y="429"/>
-</g>
+  <g id="paint-order-mfs" inkscape:label="#paint-order-mfs">
+
+    <!-- Marker -->
+    <circle cx="10" cy="10" r="9.5" style="fill:#cddbeb;stroke:black"/>
+
+    <!-- Fill -->
+    <rect x="10" y="10" width="14" height="14" style="fill:#4776a7"/>
+
+    <!-- Stroke -->
+    <path d="m 5.5,24 v -18.5 h 18.5 v 9   h -9.5 v 9.5 z" style="fill:#99b6d4"/>
+    <path d="m 5.5,24 v -18.5 h 18.5 m 0,9 h -9.5 v 9.5" style="fill:none;stroke:black"/>
+    <rect x="9"  y="21" width="2" height="2" style="fill:white"/>
+    <rect x="9"  y="17" width="2" height="2" style="fill:white"/>
+    <rect x="9"  y="13" width="2" height="2" style="fill:white"/>
+    <rect x="9"  y="9"  width="2" height="2" style="fill:white"/>
+    <rect x="13" y="9"  width="2" height="2" style="fill:white"/>
+    <rect x="17" y="9"  width="2" height="2" style="fill:white"/>
+    <rect x="21" y="9"  width="2" height="2" style="fill:white"/>
+
+  </g>
 
 </svg>
diff --git a/share/icons/paint-order-msf.svg b/share/icons/paint-order-msf.svg
index 2adb29638..e29b067fc 100644
--- a/share/icons/paint-order-msf.svg
+++ b/share/icons/paint-order-msf.svg
@@ -1,41 +1,31 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
    width="24"
    height="24"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
 
-  </defs>
-<g id="paint-order-msf" inkscape:label="#paint-order-msf" transform="translate(-944,-420)">
-  <circle cx="954" cy="430" r="9.5" style="stroke:#000000;fill:#cddbeb"/>
-  <rect height="24" style="fill:none" width="24" x="944" y="420"/>
-  <path d="m949.5 444v-18.5h18.5v9h-9.5v9.5z" style="fill:#99b6d4"/>
-  <path d="m949.5 444v-18.5h18.5m0 9h-9.5v9.5" style="stroke:#000000;fill:none"/>
-  <rect height="2" style="fill:#ffffff" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,0)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,0)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,0)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,4)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,8)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,12)" width="2" x="953" y="429"/>
-  <rect height="14" style="fill:#4776a7" width="14" x="954" y="430"/>
-</g>
+  <g id="paint-order-msf" inkscape:label="#paint-order-msf">
+
+    <!-- Marker -->
+    <circle cx="10" cy="10" r="9.5" style="fill:#cddbeb;stroke:black"/>
+
+    <!-- Stroke -->
+    <path d="m 5.5,24 v -18.5 h 18.5 v 9   h -9.5 v 9.5 z" style="fill:#99b6d4"/>
+    <path d="m 5.5,24 v -18.5 h 18.5 m 0,9 h -9.5 v 9.5" style="fill:none;stroke:black"/>
+    <rect x="9"  y="21" width="2" height="2" style="fill:white"/>
+    <rect x="9"  y="17" width="2" height="2" style="fill:white"/>
+    <rect x="9"  y="13" width="2" height="2" style="fill:white"/>
+    <rect x="9"  y="9"  width="2" height="2" style="fill:white"/>
+    <rect x="13" y="9"  width="2" height="2" style="fill:white"/>
+    <rect x="17" y="9"  width="2" height="2" style="fill:white"/>
+    <rect x="21" y="9"  width="2" height="2" style="fill:white"/>
+
+    <!-- Fill -->
+    <rect x="10" y="10" width="14" height="14" style="fill:#4776a7"/>
+
+  </g>
 
 </svg>
diff --git a/share/icons/paint-order-sfm.svg b/share/icons/paint-order-sfm.svg
index 31b35ec5e..3f67a01e8 100644
--- a/share/icons/paint-order-sfm.svg
+++ b/share/icons/paint-order-sfm.svg
@@ -1,41 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
    width="24"
    height="24"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
 
-  </defs>
-<g id="paint-order-sfm" inkscape:label="#paint-order-sfm" transform="translate(32)">
-  <rect height="24" style="fill:none" width="24" x="944" y="420"/>
-  <path d="m949.5 444v-18.5h18.5v9h-9.5v9.5z" style="fill:#99b6d4"/>
-  <path d="m949.5 444v-18.5h18.5m0 9h-9.5v9.5" style="stroke:#000000;fill:none"/>
-  <rect height="2" style="fill:#ffffff" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,0)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,0)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,0)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,4)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,8)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,12)" width="2" x="953" y="429"/>
-  <rect height="14" style="fill:#4776a7" width="14" x="954" y="430"/>
-  <circle cx="954" cy="430" r="9.5" style="stroke:#000000;fill:#cddbeb"/>
-</g>
+  <g id="paint-order-sfm" inkscape:label="#paint-order-sfm">
+
+    <!-- Stroke -->
+    <path d="m 5.5,24 v -18.5 h 18.5 v 9   h -9.5 v 9.5 z" style="fill:#99b6d4"/>
+    <path d="m 5.5,24 v -18.5 h 18.5 m 0,9 h -9.5 v 9.5" style="fill:none;stroke:black"/>
+    <rect x="9"  y="21" width="2" height="2" style="fill:white"/>
+    <rect x="21" y="9"  width="2" height="2" style="fill:white"/>
+
+    <!-- Fill -->
+    <rect x="10" y="10" width="14" height="14" style="fill:#4776a7"/>
+
+    <!-- Marker -->
+    <circle cx="10" cy="10" r="9.5" style="fill:#cddbeb;stroke:black"/>
+
+  </g>
 
 </svg>
diff --git a/share/icons/paint-order-smf.svg b/share/icons/paint-order-smf.svg
index 235a56f35..007d36fe2 100644
--- a/share/icons/paint-order-smf.svg
+++ b/share/icons/paint-order-smf.svg
@@ -1,41 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
    width="24"
    height="24"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
 
-  </defs>
-<g id="paint-order-smf" inkscape:label="#paint-order-smf" transform="translate(-944,-420)">
-  <rect height="24" style="fill:none" width="24" x="944" y="420"/>
-  <path d="m949.5 444v-18.5h18.5v9h-9.5v9.5z" style="fill:#99b6d4"/>
-  <path d="m949.5 444v-18.5h18.5m0 9h-9.5v9.5" style="stroke:#000000;fill:none"/>
-  <rect height="2" style="fill:#ffffff" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,0)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,0)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,0)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,4)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,8)" width="2" x="953" y="429"/>
-  <rect height="2" id="" style="fill:#ffffff" transform="matrix(1,0,0,1,0,12)" width="2" x="953" y="429"/>
-  <circle cx="954" cy="430" r="9.5" style="stroke:#000000;fill:#cddbeb"/>
-  <rect height="14" style="fill:#4776a7" width="14" x="954" y="430"/>
-</g>
+  <g id="paint-order-smf" inkscape:label="#paint-order-smf">
+
+    <!-- Stroke -->
+    <path d="m 5.5,24 v -18.5 h 18.5 v 9   h -9.5 v 9.5 z" style="fill:#99b6d4"/>
+    <path d="m 5.5,24 v -18.5 h 18.5 m 0,9 h -9.5 v 9.5" style="fill:none;stroke:black"/>
+    <rect x="9"  y="21" width="2" height="2" style="fill:white"/>
+    <rect x="21" y="9"  width="2" height="2" style="fill:white"/>
+
+    <!-- Marker -->
+    <circle cx="10" cy="10" r="9.5" style="fill:#cddbeb;stroke:black"/>
+
+    <!-- Fill -->
+    <rect x="10" y="10" width="14" height="14" style="fill:#4776a7"/>
+
+  </g>
 
 </svg>