symbolic: avoid ellipse primitive

- only paths and rectangle get recolored. convert ellipse to
  a path before export.

2 files changed, 72 insertions, 29 deletions

diff --git a/Adwaita/scalable/apps/goa-panel-symbolic.svg b/Adwaita/scalable/apps/goa-panel-symbolic.svg
index 946e640fd..46c7e6202 100644
--- a/Adwaita/scalable/apps/goa-panel-symbolic.svg
+++ b/Adwaita/scalable/apps/goa-panel-symbolic.svg
@@ -1,8 +1,57 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <g fill="#474747">
-        <path d="M5 11.5A2.5 2.5 0 0 1 2.5 14 2.5 2.5 0 0 1 0 11.5 2.5 2.5 0 0 1 2.5 9 2.5 2.5 0 0 1 5 11.5z" style="marker:none" color="#bebebe" overflow="visible"/>
-        <path d="M11.5 7.5A4.5 4.5 0 0 1 7 12a4.5 4.5 0 0 1-4.5-4.5A4.5 4.5 0 0 1 7 3a4.5 4.5 0 0 1 4.5 4.5z" style="marker:none" color="#bebebe" overflow="visible"/>
-        <path d="M16 10.5a3.5 3.5 0 0 1-3.5 3.5A3.5 3.5 0 0 1 9 10.5 3.5 3.5 0 0 1 12.5 7a3.5 3.5 0 0 1 3.5 3.5z" style="marker:none" color="#bebebe" overflow="visible"/>
-        <path d="M2.313 10H12.5v4H2.313z" style="marker:none" color="#000" overflow="visible"/>
-    </g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   version="1.1"
+   id="svg12"
+   sodipodi:docname="goa-panel-symbolic.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs16" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="772"
+     inkscape:window-height="480"
+     id="namedview14"
+     showgrid="false"
+     inkscape:zoom="10.429825"
+     inkscape:cx="6.7114977"
+     inkscape:cy="3.4605083"
+     inkscape:window-x="1438"
+     inkscape:window-y="402"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg12" />
+  <g
+     fill="#474747"
+     id="g10">
+    <path
+       style="marker:none"
+       d="M 7 3 A 4.5 4.5 0 0 0 2.5 7.5 A 4.5 4.5 0 0 0 2.7675781 9.0136719 A 2.5 2.5 0 0 0 2.5 9 A 2.5 2.5 0 0 0 0 11.5 A 2.5 2.5 0 0 0 2.3125 13.992188 L 2.3125 14 L 2.5 14 L 12.5 14 A 3.5 3.5 0 0 0 16 10.5 A 3.5 3.5 0 0 0 12.5 7 A 3.5 3.5 0 0 0 11.484375 7.1542969 A 4.5 4.5 0 0 0 7 3 z "
+       id="path2" />
+  </g>
 </svg>
diff --git a/src/symbolic/gnome-stencils.svg b/src/symbolic/gnome-stencils.svg
index 0a694961c..1068d49a2 100644
--- a/src/symbolic/gnome-stencils.svg
+++ b/src/symbolic/gnome-stencils.svg
@@ -29,17 +29,17 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
+     inkscape:window-width="3440"
+     inkscape:window-height="1376"
      id="namedview88"
      showgrid="false"
-     inkscape:zoom="2"
-     inkscape:cx="430.45316"
-     inkscape:cy="603.54749"
+     inkscape:zoom="1"
+     inkscape:cx="211.30506"
+     inkscape:cy="487.64902"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:current-layer="layer8"
+     inkscape:current-layer="layer3"
      showborder="false"
      inkscape:snap-nodes="true"
      inkscape:snap-bbox="true"
@@ -12823,24 +12823,18 @@
        id="g3680"
        inkscape:label="goa-panel"
        transform="translate(0,-20)">
-      <circle
+      <path
          style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.00011992;marker:none;enable-background:accumulate"
-         id="circle3296"
-         cx="214.49994"
-         cy="499.49982"
-         r="2.50015" />
-      <circle
-         r="4.5000348"
-         cy="495.49963"
-         cx="219.00006"
-         id="circle3298"
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.60002828;marker:none;enable-background:accumulate" />
-      <circle
+         d="m 217.00009,499.49982 a 2.50015,2.50015 0 0 1 -2.50015,2.50015 2.50015,2.50015 0 0 1 -2.50015,-2.50015 2.50015,2.50015 0 0 1 2.50015,-2.50015 2.50015,2.50015 0 0 1 2.50015,2.50015 z"
+         id="circle3296" />
+      <path
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.60002828;marker:none;enable-background:accumulate"
+         d="m 223.5001,495.49963 a 4.5000348,4.5000348 0 0 1 -4.50004,4.50004 4.5000348,4.5000348 0 0 1 -4.50003,-4.50004 4.5000348,4.5000348 0 0 1 4.50003,-4.50003 4.5000348,4.5000348 0 0 1 4.50004,4.50003 z"
+         id="circle3298" />
+      <path
          style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.80015779;marker:none;enable-background:accumulate"
-         id="circle3300"
-         cx="224.49962"
-         cy="498.49982"
-         r="3.5001965" />
+         d="m 227.99981,498.49982 a 3.5001965,3.5001965 0 0 1 -3.50019,3.50019 3.5001965,3.5001965 0 0 1 -3.5002,-3.50019 3.5001965,3.5001965 0 0 1 3.5002,-3.5002 3.5001965,3.5001965 0 0 1 3.50019,3.5002 z"
+         id="circle3300" />
       <rect
          style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.68546605;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          id="rect3302"