diff --git a/devicon.json b/devicon.json
index 310f696f5..bf2233f00 100644
--- a/devicon.json
+++ b/devicon.json
@@ -451,16 +451,20 @@
             "svg": [
                 "original",
                 "original-wordmark",
-                "plain",
                 "plain-wordmark"
             ],
             "font": [
-                "plain",
+                "original",
                 "plain-wordmark"
             ]
         },
-        "color": "#e25a1c",
-        "aliases": []
+        "color": "#e15919",
+        "aliases": [
+            {
+                "base": "original",
+                "alias": "plain"
+            }
+        ]
     },
     {
         "name": "apl",
diff --git a/icons/apachespark/apachespark-original-wordmark.svg b/icons/apachespark/apachespark-original-wordmark.svg
index 4f6613686..e87e7d11d 100644
--- a/icons/apachespark/apachespark-original-wordmark.svg
+++ b/icons/apachespark/apachespark-original-wordmark.svg
@@ -1,18 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128px" height="128px" viewBox="0 0 128 128" version="1.1">
-<g id="surface1">
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(88.627451%,35.294118%,10.980392%);fill-opacity:1;" d="M 115.746094 64.328125 C 115.640625 64.097656 115.589844 63.980469 115.53125 63.871094 C 113.96875 60.898438 112.410156 57.921875 110.828125 54.949219 C 110.671875 54.648438 110.691406 54.472656 110.90625 54.214844 C 113.394531 51.3125 115.851562 48.386719 118.34375 45.496094 C 118.433594 45.390625 118.511719 45.285156 118.542969 45.101562 C 117.820312 45.289062 117.097656 45.476562 116.367188 45.667969 C 113.367188 46.464844 110.339844 47.257812 107.367188 48.066406 C 107.085938 48.140625 106.960938 48.058594 106.820312 47.824219 C 105.113281 44.976562 103.398438 42.117188 101.675781 39.304688 C 101.585938 39.15625 101.488281 39.015625 101.300781 38.890625 C 101.164062 39.652344 101.023438 40.40625 100.886719 41.164062 C 100.410156 43.847656 99.929688 46.511719 99.457031 49.203125 C 99.40625 49.492188 99.335938 49.785156 99.308594 50.074219 C 99.285156 50.347656 99.144531 50.453125 98.890625 50.53125 C 95.351562 51.644531 91.816406 52.765625 88.28125 53.886719 C 88.125 53.9375 87.972656 54 87.804688 54.152344 C 90.699219 55.300781 93.59375 56.449219 96.527344 57.621094 C 96.421875 57.703125 96.351562 57.769531 96.273438 57.820312 C 94.464844 58.988281 92.652344 60.160156 90.847656 61.332031 C 90.628906 61.476562 90.457031 61.496094 90.214844 61.386719 C 88.050781 60.414062 85.875 59.457031 83.703125 58.492188 C 82.730469 58.058594 81.859375 57.480469 81.179688 56.644531 C 79.640625 54.765625 79.945312 52.625 81.996094 51.300781 C 82.667969 50.871094 83.429688 50.554688 84.191406 50.304688 C 87.660156 49.175781 91.144531 48.085938 94.601562 46.992188 C 94.890625 46.898438 95.027344 46.769531 95.082031 46.453125 C 95.546875 43.769531 96.027344 41.066406 96.511719 38.414062 C 96.773438 36.980469 96.910156 35.511719 97.605469 34.195312 C 97.875 33.6875 98.191406 33.191406 98.578125 32.769531 C 99.960938 31.234375 101.886719 31.179688 103.363281 32.640625 C 103.855469 33.132812 104.277344 33.710938 104.644531 34.3125 C 106.253906 36.9375 107.835938 39.578125 109.425781 42.230469 C 109.613281 42.542969 109.78125 42.605469 110.125 42.515625 C 114.003906 41.472656 117.882812 40.449219 121.78125 39.421875 C 122.585938 39.210938 123.394531 39.132812 124.21875 39.289062 C 126.007812 39.621094 126.789062 40.984375 126.183594 42.71875 C 125.910156 43.503906 125.433594 44.167969 124.898438 44.796875 C 122.1875 47.984375 119.472656 51.191406 116.777344 54.363281 C 116.558594 54.625 116.554688 54.8125 116.707031 55.105469 C 118.332031 58.164062 119.9375 61.214844 121.570312 64.308594 C 121.957031 65.039062 122.253906 65.804688 122.261719 66.644531 C 122.28125 68.558594 120.878906 70.125 118.976562 70.40625 C 117.914062 70.5625 116.921875 70.335938 115.921875 70.027344 C 113.492188 69.273438 111.058594 68.535156 108.605469 67.800781 C 108.382812 67.730469 108.292969 67.640625 108.253906 67.398438 C 107.972656 65.683594 107.667969 63.972656 107.371094 62.253906 C 107.363281 62.207031 107.375 62.15625 107.382812 62.050781 C 110.160156 62.820312 112.929688 63.574219 115.785156 64.367188 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(23.529412%,22.745098%,24.313725%);fill-opacity:1;" d="M 110.925781 89.449219 C 108.730469 89.445312 106.542969 89.4375 104.332031 89.445312 C 104.042969 89.445312 103.878906 89.363281 103.71875 89.117188 C 101.121094 85.160156 98.492188 81.199219 95.917969 77.257812 C 95.835938 77.132812 95.75 77.011719 95.601562 76.800781 C 95.042969 81.0625 94.492188 85.242188 93.941406 89.421875 L 88.195312 89.421875 C 88.261719 88.863281 88.320312 88.320312 88.390625 87.78125 C 88.949219 83.480469 89.515625 79.21875 90.078125 74.917969 C 90.617188 70.820312 91.152344 66.71875 91.699219 62.621094 C 91.714844 62.5 91.796875 62.34375 91.894531 62.28125 C 93.875 60.988281 95.859375 59.710938 97.84375 58.433594 C 97.871094 58.414062 97.914062 58.414062 98.015625 58.382812 C 97.417969 62.964844 96.820312 67.507812 96.222656 72.046875 C 96.246094 72.0625 96.269531 72.082031 96.292969 72.097656 C 99.410156 68.648438 102.523438 65.183594 105.699219 61.6875 C 105.789062 62.21875 105.871094 62.671875 105.949219 63.125 C 106.171875 64.425781 106.386719 65.730469 106.625 67.027344 C 106.671875 67.289062 106.601562 67.449219 106.425781 67.636719 C 104.414062 69.742188 102.410156 71.855469 100.398438 73.984375 C 100.3125 74.078125 100.226562 74.175781 100.128906 74.285156 C 100.191406 74.386719 100.246094 74.484375 100.3125 74.578125 C 103.769531 79.441406 107.222656 84.304688 110.679688 89.167969 C 110.742188 89.253906 110.835938 89.324219 110.910156 89.402344 L 110.910156 89.480469 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(23.529412%,22.745098%,24.313725%);fill-opacity:1;" d="M 42.996094 76.589844 C 42.910156 76.140625 42.847656 75.484375 42.648438 74.867188 C 41.683594 71.898438 38.640625 70.285156 35.492188 71.003906 C 32.03125 71.808594 29.542969 74.53125 29.222656 78.078125 C 28.957031 80.691406 30.363281 83.222656 32.976562 84.148438 C 35.082031 84.910156 37.117188 84.589844 39.003906 83.460938 C 41.5 81.964844 42.851562 79.742188 43.023438 76.589844 Z M 27.804688 87.640625 C 27.632812 88.917969 27.472656 90.121094 27.3125 91.328125 C 27.101562 92.925781 26.890625 94.53125 26.691406 96.152344 C 26.667969 96.335938 26.609375 96.421875 26.410156 96.417969 C 24.832031 96.414062 23.25 96.414062 21.667969 96.410156 C 21.628906 96.410156 21.59375 96.390625 21.507812 96.367188 C 21.605469 95.613281 21.699219 94.851562 21.796875 94.097656 C 22.144531 91.445312 22.492188 88.792969 22.847656 86.136719 C 23.253906 83.101562 23.570312 80.070312 24.089844 77.054688 C 25.003906 71.707031 29.554688 67.125 34.859375 65.960938 C 37.941406 65.292969 40.890625 65.601562 43.582031 67.339844 C 46.265625 69.066406 47.800781 71.601562 48.164062 74.734375 C 48.664062 79.195312 47.019531 82.894531 43.863281 85.988281 C 41.78125 88.003906 39.28125 89.28125 36.425781 89.714844 C 33.464844 90.160156 30.679688 89.667969 28.1875 87.921875 C 28.097656 87.859375 27.996094 87.800781 27.839844 87.703125 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(23.529412%,22.745098%,24.313725%);fill-opacity:1;" d="M 25.152344 62.320312 C 23.382812 63.636719 21.675781 64.90625 19.964844 66.183594 C 19.691406 65.75 19.445312 65.3125 19.15625 64.90625 C 18.410156 63.867188 17.488281 63.089844 16.144531 63 C 15.027344 62.921875 14.070312 63.289062 13.308594 64.113281 C 12.632812 64.847656 12.542969 65.898438 13.175781 66.730469 C 13.875 67.644531 14.640625 68.511719 15.421875 69.363281 C 16.722656 70.769531 18.078125 72.117188 19.363281 73.542969 C 20.53125 74.828125 21.46875 76.265625 21.757812 78.042969 C 22.101562 80.132812 21.683594 82.101562 20.695312 83.953125 C 18.867188 87.347656 15.996094 89.335938 12.175781 89.941406 C 10.496094 90.210938 8.824219 90.160156 7.191406 89.675781 C 5.015625 89.039062 3.503906 87.609375 2.53125 85.617188 C 2.1875 84.90625 1.921875 84.152344 1.613281 83.390625 C 3.515625 82.375 5.367188 81.378906 7.242188 80.378906 C 7.304688 80.535156 7.351562 80.664062 7.410156 80.789062 C 7.730469 81.429688 7.996094 82.109375 8.386719 82.699219 C 9.566406 84.445312 11.464844 84.976562 13.371094 84.113281 C 13.867188 83.890625 14.34375 83.578125 14.75 83.21875 C 15.988281 82.117188 16.222656 80.582031 15.304688 79.199219 C 14.777344 78.402344 14.121094 77.6875 13.476562 76.976562 C 11.941406 75.269531 10.339844 73.621094 8.855469 71.871094 C 7.820312 70.671875 7.117188 69.28125 6.894531 67.691406 C 6.648438 65.9375 7 64.289062 7.910156 62.828125 C 10.171875 59.164062 13.457031 57.28125 17.796875 57.402344 C 20.277344 57.492188 22.257812 58.652344 23.785156 60.582031 C 24.242188 61.152344 24.667969 61.742188 25.128906 62.359375 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(23.529412%,22.745098%,24.313725%);fill-opacity:1;" d="M 67.113281 81.8125 C 66.824219 84.019531 66.550781 86.113281 66.269531 88.203125 C 66.253906 88.3125 66.171875 88.457031 66.082031 88.496094 C 61.78125 90.480469 56.152344 90.203125 52.65625 86.210938 C 50.765625 84.0625 49.976562 81.507812 50.089844 78.691406 C 50.367188 72.140625 55.800781 66.394531 62.308594 65.589844 C 66.109375 65.125 69.425781 66.148438 71.996094 69.101562 C 73.75 71.113281 74.5625 73.523438 74.441406 76.175781 C 74.363281 77.929688 74.085938 79.667969 73.871094 81.402344 C 73.5625 83.871094 73.222656 86.347656 72.898438 88.796875 C 72.886719 88.882812 72.867188 88.972656 72.847656 89.082031 L 67.742188 89.082031 C 67.808594 88.515625 67.871094 87.960938 67.945312 87.40625 C 68.316406 84.558594 68.726562 81.699219 69.050781 78.847656 C 69.253906 77.070312 69.125 75.304688 68.3125 73.660156 C 67.445312 71.914062 66 70.984375 64.089844 70.785156 C 60.144531 70.367188 56.375 73.105469 55.570312 76.972656 C 55.015625 79.539062 55.890625 81.996094 57.933594 83.363281 C 59.921875 84.6875 62.03125 84.691406 64.203125 83.835938 C 65.304688 83.398438 66.238281 82.707031 67.128906 81.78125 "/>
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(23.529412%,22.745098%,24.313725%);fill-opacity:1;" d="M 88.816406 66.257812 C 88.582031 68.035156 88.351562 69.785156 88.117188 71.5625 C 87.03125 71.5625 85.972656 71.558594 84.910156 71.566406 C 84.050781 71.570312 83.265625 72.128906 83.003906 72.933594 C 82.90625 73.246094 82.867188 73.582031 82.824219 73.914062 C 82.285156 78.011719 81.75 82.070312 81.214844 86.132812 C 81.082031 87.160156 80.949219 88.191406 80.816406 89.234375 L 75.46875 89.234375 C 75.570312 88.449219 75.664062 87.691406 75.761719 86.929688 C 76.109375 84.285156 76.457031 81.625 76.808594 79.011719 C 77.109375 76.726562 77.382812 74.429688 77.738281 72.140625 C 78.21875 69.085938 81.257812 66.351562 84.332031 66.230469 C 85.800781 66.167969 87.277344 66.222656 88.792969 66.222656 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(23.529412%,22.745098%,24.313725%);fill-opacity:1;" d="M 117.355469 89.449219 L 117.355469 87.199219 L 117.34375 87.199219 L 116.457031 89.449219 L 116.175781 89.449219 L 115.292969 87.199219 L 115.277344 87.199219 L 115.277344 89.449219 L 114.835938 89.449219 L 114.835938 86.753906 L 115.523438 86.753906 L 116.328125 88.804688 L 117.121094 86.753906 L 117.804688 86.753906 L 117.804688 89.449219 Z M 113.441406 87.113281 L 113.441406 89.449219 L 113 89.449219 L 113 87.113281 L 112.152344 87.113281 L 112.152344 86.753906 L 114.289062 86.753906 L 114.289062 87.113281 L 113.445312 87.113281 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(23.529412%,22.745098%,24.313725%);fill-opacity:1;" d="M 32.265625 58.542969 L 33.585938 58.542969 L 33.273438 56.539062 Z M 33.796875 59.835938 L 31.597656 59.835938 L 30.898438 61.207031 L 29.339844 61.207031 L 32.777344 54.773438 L 34.277344 54.773438 L 35.449219 61.207031 L 34.007812 61.207031 L 33.796875 59.835938 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(23.529412%,22.745098%,24.313725%);fill-opacity:1;" d="M 41.671875 56.089844 L 40.886719 56.089844 L 40.625 57.574219 L 41.40625 57.574219 C 41.882812 57.574219 42.253906 57.261719 42.253906 56.675781 C 42.253906 56.289062 42.019531 56.089844 41.667969 56.089844 Z M 39.773438 54.796875 L 41.832031 54.796875 C 42.910156 54.796875 43.660156 55.4375 43.660156 56.539062 C 43.660156 57.929688 42.679688 58.863281 41.28125 58.863281 L 40.394531 58.863281 L 39.976562 61.214844 L 38.632812 61.214844 L 39.765625 54.785156 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(23.529412%,22.745098%,24.313725%);fill-opacity:1;" d="M 48.222656 58.542969 L 49.542969 58.542969 L 49.230469 56.539062 Z M 49.75 59.835938 L 47.550781 59.835938 L 46.851562 61.207031 L 45.292969 61.207031 L 48.730469 54.773438 L 50.230469 54.773438 L 51.402344 61.207031 L 49.957031 61.207031 L 49.75 59.835938 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(23.529412%,22.745098%,24.313725%);fill-opacity:1;" d="M 58.269531 60.992188 C 57.816406 61.199219 57.316406 61.324219 56.816406 61.324219 C 55.117188 61.324219 54.050781 60.050781 54.050781 58.453125 C 54.050781 56.414062 55.765625 54.695312 57.808594 54.695312 C 58.320312 54.695312 58.78125 54.820312 59.160156 55.027344 L 58.96875 56.566406 C 58.6875 56.253906 58.230469 56.035156 57.667969 56.035156 C 56.5 56.035156 55.457031 57.09375 55.457031 58.316406 C 55.457031 59.25 56.042969 59.980469 56.96875 59.980469 C 57.535156 59.980469 58.082031 59.761719 58.453125 59.464844 L 58.273438 60.992188 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(23.529412%,22.745098%,24.313725%);fill-opacity:1;" d="M 66.710938 58.621094 L 63.917969 58.621094 L 63.464844 61.207031 L 62.125 61.207031 L 63.257812 54.773438 L 64.601562 54.773438 L 64.152344 57.316406 L 66.945312 57.316406 L 67.398438 54.773438 L 68.742188 54.773438 L 67.609375 61.207031 L 66.265625 61.207031 L 66.714844 58.621094 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(23.529412%,22.745098%,24.313725%);fill-opacity:1;" d="M 71.535156 61.195312 L 72.667969 54.761719 L 76.230469 54.761719 L 76.003906 56.058594 L 73.785156 56.058594 L 73.558594 57.304688 L 75.59375 57.304688 L 75.371094 58.597656 L 73.332031 58.597656 L 73.105469 59.890625 L 75.324219 59.890625 L 75.097656 61.1875 L 71.535156 61.1875 "/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><path fill="#e15919" d="M117.085 64.337c-.109-.237-.16-.357-.22-.47-1.604-3.049-3.203-6.102-4.826-9.152-.16-.308-.14-.489.08-.753 2.553-2.978 5.074-5.98 7.63-8.944a.777.777 0 0 0 .205-.405 839.8 839.8 0 0 0-2.232.58c-3.078.818-6.184 1.632-9.233 2.461-.289.076-.417-.008-.561-.248a1047.83 1047.83 0 0 0-5.278-8.74 1.222 1.222 0 0 0-.384-.425c-.14.782-.285 1.555-.425 2.332-.49 2.753-.982 5.486-1.467 8.247-.052.297-.124.598-.152.894-.024.28-.168.389-.429.469-3.63 1.142-7.257 2.292-10.884 3.442-.16.052-.316.116-.489.273 2.97 1.178 5.94 2.356 8.949 3.558-.109.084-.18.152-.26.204-1.856 1.199-3.716 2.4-5.567 3.603-.224.148-.4.168-.65.056-2.22-.998-4.451-1.98-6.68-2.97-.997-.444-1.89-1.037-2.588-1.895-1.579-1.927-1.266-4.123.838-5.482.689-.44 1.47-.765 2.252-1.022 3.558-1.158 7.133-2.276 10.68-3.398.296-.096.436-.228.492-.553.477-2.753.97-5.526 1.467-8.247.268-1.47.408-2.977 1.122-4.328.276-.52.6-1.03.997-1.462 1.42-1.575 3.395-1.631 4.91-.132.504.504.937 1.098 1.314 1.715a976.243 976.243 0 0 1 4.905 8.122c.192.321.364.385.717.293 3.98-1.07 7.959-2.12 11.958-3.174.825-.216 1.655-.296 2.5-.136 1.836.34 2.637 1.74 2.016 3.518-.28.806-.77 1.487-1.318 2.132-2.781 3.27-5.567 6.56-8.332 9.814-.224.269-.228.46-.072.761 1.667 3.138 3.314 6.268 4.99 9.442.396.749.7 1.534.709 2.396.02 1.964-1.419 3.57-3.37 3.859-1.09.16-2.108-.072-3.134-.389a824.96 824.96 0 0 0-7.506-2.284c-.228-.072-.32-.164-.36-.413-.289-1.759-.602-3.514-.906-5.277-.008-.048.004-.1.012-.209 2.85.79 5.69 1.563 8.62 2.377"/><path fill="#3a383d" d="M57.648 54.455c-2.095 0-3.855 1.764-3.855 3.856 0 1.639 1.094 2.945 2.838 2.945a3.62 3.62 0 0 0 1.49-.342h.004l.186-1.566c-.381.305-.944.529-1.526.529-.949 0-1.549-.75-1.549-1.707 0-1.254 1.07-2.342 2.268-2.342.577 0 1.047.226 1.336.547l.195-1.58a2.891 2.891 0 0 0-1.387-.34zm15.245.068-1.16 6.59h3.652l.232-1.33h-2.275l.23-1.326h2.092l.23-1.324h-2.087l.23-1.28h2.277l.233-1.33h-3.654zm-1.16 6.59h-.003v.01l.002-.01zm-4.247-6.58-.465 2.612h-2.865l.461-2.61h-1.379l-1.162 6.6h1.375l.465-2.653h2.869l-.46 2.653h1.378l1.162-6.602h-1.379zm-35.515.002-3.528 6.6h1.6l.717-1.406h2.256l.216 1.406h1.479l-1.201-6.6h-1.54zm16.365 0-3.527 6.6h1.6l.716-1.406h2.256l.213 1.406h1.482l-1.203-6.6h-1.537zm-9.197.012-1.162 6.596h1.378l.428-2.413h.91c1.434 0 2.442-.957 2.442-2.384 0-1.13-.77-1.787-1.875-1.787h-2.114l-.007-.012zm1.15 1.338h.805l-.004.002c.36 0 .601.203.601.6 0 .601-.38.921-.869.921h-.802l.27-1.523zm-7.81.46.32 2.057h-1.354l1.034-2.056zm16.37 0 .32 2.057h-1.355l1.036-2.056zm-33.07.887c-4.048.123-7.145 2.042-9.32 5.565-.933 1.5-1.293 3.19-1.041 4.99.229 1.631.949 3.057 2.012 4.287 1.522 1.795 3.165 3.488 4.74 5.239.66.73 1.335 1.462 1.877 2.279.94 1.419.7 2.995-.57 4.125a5.678 5.678 0 0 1-1.415.916c-1.955.886-3.905.342-5.115-1.45-.4-.604-.673-1.302-1.002-1.96-.06-.128-.108-.26-.172-.42C3.85 81.829 1.951 82.85 0 83.893c.316.782.588 1.554.941 2.283.997 2.044 2.55 3.51 4.782 4.164 1.675.497 3.39.548 5.113.271 3.92-.62 6.863-2.66 8.738-6.142 1.014-1.9 1.443-3.919 1.09-6.063-.296-1.823-1.257-3.299-2.455-4.617-1.319-1.463-2.71-2.844-4.045-4.287-.8-.874-1.585-1.763-2.303-2.701-.649-.853-.558-1.932.135-2.686.782-.845 1.765-1.22 2.91-1.14 1.38.092 2.325.889 3.09 1.955.297.416.55.865.83 1.31 1.744-1.301 3.484-2.597 5.287-3.937-.469-.628-.903-1.228-1.369-1.809-1.567-1.98-3.598-3.17-6.142-3.262a14.075 14.075 0 0 0-.823 0zm8.334 5.07.01.014.025-.039c-.011.01-.023.017-.035.026zm74.782-4.064c-.104.032-.148.031-.176.051-2.036 1.31-4.072 2.62-6.104 3.947-.1.064-.185.226-.2.35-.562 4.205-1.11 8.41-1.663 12.613-.577 4.412-1.158 8.785-1.732 13.197-.072.553-.132 1.11-.2 1.682h5.897c.565-4.288 1.13-8.574 1.703-12.947.152.217.24.343.324.47 2.64 4.044 5.337 8.107 8.002 12.167.164.252.333.336.629.336 2.262-.008 4.501 0 6.748.003v-.048c-.077-.08-.172-.153-.236-.24l-10.635-14.967c-.069-.095-.124-.197-.19-.301.102-.112.19-.213.278-.309 2.063-2.184 4.117-4.352 6.181-6.512.181-.193.254-.357.206-.625-.244-1.33-.465-2.668-.694-4.003-.08-.465-.164-.929-.256-1.475-3.258 3.587-6.452 7.142-9.65 10.68l-.072-.051c.613-4.657 1.227-9.318 1.84-14.018zm13.228 31.87v.03l.018-.03h-.018zm-48.42-24.583c-.471.011-.95.046-1.437.106-6.676.825-12.25 6.72-12.536 13.44-.117 2.89.693 5.51 2.633 7.714 3.586 4.096 9.362 4.38 13.774 2.344.092-.04.175-.189.191-.3.29-2.145.568-4.292.865-6.556l.018-.033c-.914.95-1.874 1.66-3.004 2.11-2.228.878-4.39.872-6.43-.487-2.096-1.402-2.994-3.921-2.425-6.554.826-3.967 4.693-6.776 8.74-6.348 1.96.205 3.442 1.158 4.332 2.95.834 1.686.967 3.496.758 5.32-.332 2.925-.754 5.86-1.135 8.78-.076.57-.14 1.138-.207 1.72h5.236c.02-.114.04-.206.053-.293.332-2.512.682-5.053.998-7.586.221-1.78.504-3.563.584-5.362.125-2.72-.708-5.193-2.508-7.256-2.307-2.65-5.2-3.786-8.5-3.709zm-26.678.153c-.957.004-1.932.12-2.92.334-5.442 1.194-10.11 5.895-11.046 11.38-.533 3.095-.859 6.204-1.276 9.317-.364 2.725-.72 5.448-1.078 8.168-.1.774-.197 1.553-.297 2.326.088.024.124.045.164.045 1.623.004 3.246.004 4.866.008.204.005.265-.084.289-.272a553.527 553.527 0 0 1 .636-4.949c.164-1.238.328-2.473.504-3.783l.037.064c.16.1.265.16.358.223 2.556 1.792 5.414 2.299 8.45 1.842 2.93-.445 5.495-1.756 7.63-3.824 3.238-3.174 4.925-6.97 4.412-11.545-.372-3.214-1.946-5.815-4.7-7.586-1.897-1.226-3.922-1.758-6.029-1.748zm48.965.582c-.378.004-.756.011-1.133.027-3.154.124-6.27 2.932-6.763 6.065-.365 2.349-.645 4.704-.953 7.048-.361 2.681-.718 5.41-1.075 8.123-.1.781-.195 1.559-.3 2.364h5.486c.137-1.07.271-2.128.408-3.182l1.65-12.533c.045-.341.084-.688.184-1.008.27-.826 1.075-1.398 1.957-1.402 1.09-.008 2.175-.004 3.29-.004l.716-5.442-.023-.037c-1.167 0-2.31-.03-3.444-.02zm-49.736 4.752c2.655-.012 5.006 1.567 5.842 4.136.205.633.27 1.307.357 1.768h.027c-.176 3.233-1.562 5.515-4.123 7.049-1.935 1.158-4.023 1.486-6.183.705-2.681-.95-4.124-3.548-3.852-6.229.33-3.638 2.884-6.43 6.434-7.255a6.867 6.867 0 0 1 1.498-.174zm77.142 16.33v.369h.87v2.396h.453v-2.396l.004.002h.867v-.371h-2.194zm2.754.002v2.763h.454v-2.306h.015l.904 2.306h.29l.91-2.306h.011v2.306h.461v-2.763h-.7l-.813 2.103-.827-2.103h-.705z"/></svg>
diff --git a/icons/apachespark/apachespark-original.svg b/icons/apachespark/apachespark-original.svg
index 090956a88..164f81b92 100644
--- a/icons/apachespark/apachespark-original.svg
+++ b/icons/apachespark/apachespark-original.svg
@@ -1,8 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128px" height="128px" viewBox="0 0 128 128" version="1.1">
-<g id="surface1">
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(88.627451%,35.294118%,10.980392%);fill-opacity:1;" d="M 97.121094 88.242188 L 96.546875 87.027344 L 84.035156 63.304688 C 83.613281 62.511719 83.664062 62.039062 84.222656 61.363281 L 104.019531 38.117188 C 104.25 37.84375 104.460938 37.554688 104.546875 37.070312 L 98.769531 38.582031 L 74.765625 44.960938 C 74.019531 45.160156 73.683594 44.941406 73.308594 44.324219 L 59.679688 21.613281 C 59.441406 21.222656 59.1875 20.859375 58.6875 20.507812 L 57.585938 26.570312 L 53.78125 47.984375 L 53.386719 50.296875 C 53.324219 51.054688 52.945312 51.308594 52.28125 51.515625 L 24.023438 60.449219 C 23.605469 60.578125 23.207031 60.746094 22.761719 61.152344 L 46.007812 70.382812 L 45.328125 70.917969 L 30.863281 80.265625 C 30.382812 80.644531 29.722656 80.695312 29.1875 80.402344 L 11.902344 72.699219 C 9.316406 71.566406 6.984375 70.007812 5.175781 67.792969 C 1.078125 62.785156 1.886719 57.082031 7.34375 53.617188 C 9.132812 52.480469 11.160156 51.625 13.183594 50.964844 L 40.941406 42.148438 C 41.695312 41.90625 42.074219 41.558594 42.21875 40.71875 L 46 19.300781 C 46.6875 15.488281 47.054688 11.554688 48.910156 8.078125 C 49.621094 6.757812 50.480469 5.417969 51.492188 4.292969 C 55.171875 0.207031 60.300781 0.0546875 64.1875 3.941406 C 65.5 5.25 66.644531 6.800781 67.601562 8.386719 L 80.269531 29.433594 C 80.765625 30.265625 81.214844 30.4375 82.128906 30.191406 L 113.15625 21.949219 C 115.289062 21.386719 117.449219 21.179688 119.636719 21.570312 C 124.398438 22.460938 126.484375 26.105469 124.871094 30.691406 C 124.136719 32.769531 122.871094 34.5625 121.46875 36.234375 L 99.8125 61.6875 C 99.222656 62.378906 99.210938 62.878906 99.621094 63.652344 L 112.511719 88.101562 C 113.542969 90.050781 114.328125 92.074219 114.347656 94.3125 C 114.398438 99.410156 110.671875 103.578125 105.609375 104.320312 C 102.773438 104.734375 100.140625 104.132812 97.480469 103.3125 L 78.015625 97.390625 C 77.414062 97.210938 77.183594 96.972656 77.078125 96.324219 L 74.730469 82.640625 C 74.707031 82.515625 74.742188 82.378906 74.761719 82.101562 L 97.105469 88.261719 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(88.627451%,35.294118%,10.980392%);fill-opacity:1;" d="M 45.988281 70.382812 L 50.109375 72.175781 L 45.53125 108.65625 L 70.5625 80.910156 L 74.785156 82.09375 L 79.980469 97.894531 L 73.226562 95.515625 L 55.746094 114.386719 C 55.746094 114.386719 47.929688 122.476562 43.691406 121.113281 C 39.453125 119.75 35.878906 115.972656 35.480469 109.222656 C 35.085938 102.46875 33.296875 83.195312 33.296875 83.195312 L 24.753906 77.035156 Z M 45.988281 70.382812 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(88.627451%,35.294118%,10.980392%);fill-opacity:1;" d="M 33.292969 83.195312 C 33.292969 83.195312 29.523438 124.917969 36.871094 126.304688 C 44.21875 127.695312 36.078125 126.105469 36.078125 126.105469 C 36.078125 126.105469 40.246094 130.875 56.734375 113.195312 L 73.222656 95.515625 L 40.246094 114.980469 C 41.039062 113.988281 44.417969 80.214844 44.417969 80.214844 Z M 33.292969 83.195312 "/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><path fill="#e15919" d="M57.646.004c-2.269.064-4.51 1.143-6.384 3.223-1.03 1.146-1.905 2.51-2.63 3.855-1.89 3.54-2.262 7.547-2.962 11.43l-3.852 21.81c-.148.856-.532 1.21-1.3 1.455l-28.268 8.98c-2.06.673-4.125 1.543-5.947 2.7-5.558 3.53-6.38 9.338-2.207 14.438 1.842 2.256 4.216 3.843 6.85 4.996l17.603 7.843c.147.08.304.132.463.162l3.717 2.682s-3.7 40.948 3.246 43.781c-.061-.01-.41-.082-.41-.082s.704.761 2.603.537c1.454.27 1.262.226.074-.01 2.583-.334 7.337-2.497 15.578-10.784a47.396 47.396 0 0 0 1.776-1.676l17.8-19.217 4.163 1.465c.15.207.367.34.714.443l19.823 6.031c2.709.836 5.389 1.448 8.277 1.026 5.156-.755 8.951-5 8.9-10.192-.02-2.28-.82-4.339-1.87-6.324l-13.128-24.898c-.418-.787-.405-1.296.196-2l22.054-25.922c1.428-1.703 2.717-3.529 3.465-5.645 1.643-4.67-.482-8.382-5.33-9.289-2.229-.398-4.427-.188-6.6.385l-31.597 8.395c-.93.25-1.39.075-1.895-.772l-12.9-21.434c-.975-1.615-2.14-3.194-3.477-4.527C62.212.89 59.915-.059 57.646.004zm.944 19.736c.51.358.768.727 1.01 1.125l13.88 23.13c.382.628.725.85 1.485.648l24.443-6.497 5.885-1.54c-.087.493-.302.79-.537 1.068l-20.16 23.672c-.57.688-.623 1.17-.194 1.976l12.743 24.16.585 1.237-.015.02-22.727-6.264-.006-.018-4.298-1.205-25.493 28.256 4.663-37.15-4.184-1.82.008-.007-23.674-9.4c.454-.413.86-.585 1.285-.717l28.777-9.096c.676-.21 1.061-.47 1.125-1.242l.403-2.355 3.875-21.807 1.12-6.174z"/></svg>
diff --git a/icons/apachespark/apachespark-plain-wordmark.svg b/icons/apachespark/apachespark-plain-wordmark.svg
index becd21828..cd101089c 100644
--- a/icons/apachespark/apachespark-plain-wordmark.svg
+++ b/icons/apachespark/apachespark-plain-wordmark.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128px" height="128px" viewBox="0 0 128 128" version="1.1">
-<g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(22.745098%,21.960784%,23.921569%);fill-opacity:1;" d="M 71.535156 61.195312 L 72.667969 54.761719 L 76.230469 54.761719 L 76.003906 56.058594 L 73.785156 56.058594 L 73.558594 57.304688 L 75.59375 57.304688 L 75.371094 58.597656 L 73.332031 58.597656 L 73.105469 59.890625 L 75.324219 59.890625 L 75.097656 61.1875 L 71.535156 61.1875 M 66.710938 58.621094 L 63.917969 58.621094 L 63.464844 61.207031 L 62.125 61.207031 L 63.257812 54.773438 L 64.601562 54.773438 L 64.152344 57.316406 L 66.945312 57.316406 L 67.398438 54.773438 L 68.742188 54.773438 L 67.609375 61.207031 L 66.265625 61.207031 L 66.714844 58.621094 M 58.269531 60.992188 C 57.816406 61.199219 57.316406 61.324219 56.816406 61.324219 C 55.117188 61.324219 54.050781 60.050781 54.050781 58.453125 C 54.050781 56.414062 55.765625 54.695312 57.808594 54.695312 C 58.320312 54.695312 58.78125 54.820312 59.160156 55.027344 L 58.96875 56.566406 C 58.6875 56.253906 58.230469 56.035156 57.667969 56.035156 C 56.5 56.035156 55.457031 57.09375 55.457031 58.316406 C 55.457031 59.25 56.042969 59.980469 56.96875 59.980469 C 57.535156 59.980469 58.082031 59.761719 58.453125 59.464844 L 58.273438 60.992188 M 48.222656 58.542969 L 49.542969 58.542969 L 49.230469 56.539062 Z M 49.75 59.835938 L 47.550781 59.835938 L 46.851562 61.207031 L 45.292969 61.207031 L 48.730469 54.773438 L 50.230469 54.773438 L 51.402344 61.207031 L 49.957031 61.207031 L 49.75 59.835938 M 41.671875 56.089844 L 40.886719 56.089844 L 40.625 57.574219 L 41.40625 57.574219 C 41.882812 57.574219 42.253906 57.261719 42.253906 56.675781 C 42.253906 56.289062 42.019531 56.089844 41.667969 56.089844 Z M 39.773438 54.796875 L 41.832031 54.796875 C 42.910156 54.796875 43.660156 55.4375 43.660156 56.539062 C 43.660156 57.929688 42.679688 58.863281 41.28125 58.863281 L 40.394531 58.863281 L 39.976562 61.214844 L 38.632812 61.214844 L 39.765625 54.785156 M 32.265625 58.542969 L 33.585938 58.542969 L 33.273438 56.539062 Z M 33.796875 59.835938 L 31.597656 59.835938 L 30.898438 61.207031 L 29.339844 61.207031 L 32.777344 54.773438 L 34.277344 54.773438 L 35.449219 61.207031 L 34.007812 61.207031 L 33.796875 59.835938 M 117.355469 89.449219 L 117.355469 87.199219 L 117.34375 87.199219 L 116.457031 89.449219 L 116.175781 89.449219 L 115.292969 87.199219 L 115.277344 87.199219 L 115.277344 89.449219 L 114.835938 89.449219 L 114.835938 86.753906 L 115.523438 86.753906 L 116.328125 88.804688 L 117.121094 86.753906 L 117.804688 86.753906 L 117.804688 89.449219 Z M 113.441406 87.113281 L 113.441406 89.449219 L 113 89.449219 L 113 87.113281 L 112.152344 87.113281 L 112.152344 86.753906 L 114.289062 86.753906 L 114.289062 87.113281 L 113.445312 87.113281 M 88.816406 66.257812 C 88.582031 68.035156 88.351562 69.785156 88.117188 71.5625 C 87.03125 71.5625 85.972656 71.558594 84.910156 71.566406 C 84.050781 71.570312 83.265625 72.128906 83.003906 72.933594 C 82.90625 73.246094 82.867188 73.582031 82.824219 73.914062 C 82.285156 78.011719 81.75 82.070312 81.214844 86.132812 C 81.082031 87.160156 80.949219 88.191406 80.816406 89.234375 L 75.46875 89.234375 C 75.570312 88.449219 75.664062 87.691406 75.761719 86.929688 C 76.109375 84.285156 76.457031 81.625 76.808594 79.011719 C 77.109375 76.726562 77.382812 74.429688 77.738281 72.140625 C 78.21875 69.085938 81.257812 66.351562 84.332031 66.230469 C 85.800781 66.167969 87.277344 66.222656 88.792969 66.222656 M 67.113281 81.8125 C 66.824219 84.019531 66.550781 86.113281 66.269531 88.203125 C 66.253906 88.3125 66.171875 88.457031 66.082031 88.496094 C 61.78125 90.480469 56.152344 90.203125 52.65625 86.210938 C 50.765625 84.0625 49.976562 81.507812 50.089844 78.691406 C 50.367188 72.140625 55.800781 66.394531 62.308594 65.589844 C 66.109375 65.125 69.425781 66.148438 71.996094 69.101562 C 73.75 71.113281 74.5625 73.523438 74.441406 76.175781 C 74.363281 77.929688 74.085938 79.667969 73.871094 81.402344 C 73.5625 83.871094 73.222656 86.347656 72.898438 88.796875 C 72.886719 88.882812 72.867188 88.972656 72.847656 89.082031 L 67.742188 89.082031 C 67.808594 88.515625 67.871094 87.960938 67.945312 87.40625 C 68.316406 84.558594 68.726562 81.699219 69.050781 78.847656 C 69.253906 77.070312 69.125 75.304688 68.3125 73.660156 C 67.445312 71.914062 66 70.984375 64.089844 70.785156 C 60.144531 70.367188 56.375 73.105469 55.570312 76.972656 C 55.015625 79.539062 55.890625 81.996094 57.933594 83.363281 C 59.921875 84.6875 62.03125 84.691406 64.203125 83.835938 C 65.304688 83.398438 66.238281 82.707031 67.128906 81.78125 M 25.152344 62.320312 C 23.382812 63.636719 21.675781 64.90625 19.964844 66.183594 C 19.691406 65.75 19.445312 65.3125 19.15625 64.90625 C 18.410156 63.867188 17.488281 63.089844 16.144531 63 C 15.027344 62.921875 14.070312 63.289062 13.308594 64.113281 C 12.632812 64.847656 12.542969 65.898438 13.175781 66.730469 C 13.875 67.644531 14.640625 68.511719 15.421875 69.363281 C 16.722656 70.769531 18.078125 72.117188 19.363281 73.542969 C 20.53125 74.828125 21.46875 76.265625 21.757812 78.042969 C 22.101562 80.132812 21.683594 82.101562 20.695312 83.953125 C 18.867188 87.347656 15.996094 89.335938 12.175781 89.941406 C 10.496094 90.210938 8.824219 90.160156 7.191406 89.675781 C 5.015625 89.039062 3.503906 87.609375 2.53125 85.617188 C 2.1875 84.90625 1.921875 84.152344 1.613281 83.390625 C 3.515625 82.375 5.367188 81.378906 7.242188 80.378906 C 7.304688 80.535156 7.351562 80.664062 7.410156 80.789062 C 7.730469 81.429688 7.996094 82.109375 8.386719 82.699219 C 9.566406 84.445312 11.464844 84.976562 13.371094 84.113281 C 13.867188 83.890625 14.34375 83.578125 14.75 83.21875 C 15.988281 82.117188 16.222656 80.582031 15.304688 79.199219 C 14.777344 78.402344 14.121094 77.6875 13.476562 76.976562 C 11.941406 75.269531 10.339844 73.621094 8.855469 71.871094 C 7.820312 70.671875 7.117188 69.28125 6.894531 67.691406 C 6.648438 65.9375 7 64.289062 7.910156 62.828125 C 10.171875 59.164062 13.457031 57.28125 17.796875 57.402344 C 20.277344 57.492188 22.257812 58.652344 23.785156 60.582031 C 24.242188 61.152344 24.667969 61.742188 25.128906 62.359375 M 42.996094 76.589844 C 42.910156 76.140625 42.847656 75.484375 42.648438 74.867188 C 41.683594 71.898438 38.640625 70.285156 35.492188 71.003906 C 32.03125 71.808594 29.542969 74.53125 29.222656 78.078125 C 28.957031 80.691406 30.363281 83.222656 32.976562 84.148438 C 35.082031 84.910156 37.117188 84.589844 39.003906 83.460938 C 41.5 81.964844 42.851562 79.742188 43.023438 76.589844 Z M 27.804688 87.640625 C 27.632812 88.917969 27.472656 90.121094 27.3125 91.328125 C 27.101562 92.925781 26.890625 94.53125 26.691406 96.152344 C 26.667969 96.335938 26.609375 96.421875 26.410156 96.417969 C 24.832031 96.414062 23.25 96.414062 21.667969 96.410156 C 21.628906 96.410156 21.59375 96.390625 21.507812 96.367188 C 21.605469 95.613281 21.699219 94.851562 21.796875 94.097656 C 22.144531 91.445312 22.492188 88.792969 22.847656 86.136719 C 23.253906 83.101562 23.570312 80.070312 24.089844 77.054688 C 25.003906 71.707031 29.554688 67.125 34.859375 65.960938 C 37.941406 65.292969 40.890625 65.601562 43.582031 67.339844 C 46.265625 69.066406 47.800781 71.601562 48.164062 74.734375 C 48.664062 79.195312 47.019531 82.894531 43.863281 85.988281 C 41.78125 88.003906 39.28125 89.28125 36.425781 89.714844 C 33.464844 90.160156 30.679688 89.667969 28.1875 87.921875 C 28.097656 87.859375 27.996094 87.800781 27.839844 87.703125 M 110.925781 89.449219 C 108.730469 89.445312 106.542969 89.4375 104.332031 89.445312 C 104.042969 89.445312 103.878906 89.363281 103.71875 89.117188 C 101.121094 85.160156 98.492188 81.199219 95.917969 77.257812 C 95.835938 77.132812 95.75 77.011719 95.601562 76.800781 C 95.042969 81.0625 94.492188 85.242188 93.941406 89.421875 L 88.195312 89.421875 C 88.261719 88.863281 88.320312 88.320312 88.390625 87.78125 C 88.949219 83.480469 89.515625 79.21875 90.078125 74.917969 C 90.617188 70.820312 91.152344 66.71875 91.699219 62.621094 C 91.714844 62.5 91.796875 62.34375 91.894531 62.28125 C 93.875 60.988281 95.859375 59.710938 97.84375 58.433594 C 97.871094 58.414062 97.914062 58.414062 98.015625 58.382812 C 97.417969 62.964844 96.820312 67.507812 96.222656 72.046875 C 96.246094 72.0625 96.269531 72.082031 96.292969 72.097656 C 99.410156 68.648438 102.523438 65.183594 105.699219 61.6875 C 105.789062 62.21875 105.871094 62.671875 105.949219 63.125 C 106.171875 64.425781 106.386719 65.730469 106.625 67.027344 C 106.671875 67.289062 106.601562 67.449219 106.425781 67.636719 C 104.414062 69.742188 102.410156 71.855469 100.398438 73.984375 C 100.3125 74.078125 100.226562 74.175781 100.128906 74.285156 C 100.191406 74.386719 100.246094 74.484375 100.3125 74.578125 C 103.769531 79.441406 107.222656 84.304688 110.679688 89.167969 C 110.742188 89.253906 110.835938 89.324219 110.910156 89.402344 L 110.910156 89.480469 M 115.746094 64.328125 C 115.640625 64.097656 115.589844 63.980469 115.53125 63.871094 C 113.96875 60.898438 112.410156 57.921875 110.828125 54.949219 C 110.671875 54.648438 110.691406 54.472656 110.90625 54.214844 C 113.394531 51.3125 115.851562 48.386719 118.34375 45.496094 C 118.433594 45.390625 118.511719 45.285156 118.542969 45.101562 C 117.820312 45.289062 117.097656 45.476562 116.367188 45.667969 C 113.367188 46.464844 110.339844 47.257812 107.367188 48.066406 C 107.085938 48.140625 106.960938 48.058594 106.820312 47.824219 C 105.113281 44.976562 103.398438 42.117188 101.675781 39.304688 C 101.585938 39.15625 101.488281 39.015625 101.300781 38.890625 C 101.164062 39.652344 101.023438 40.40625 100.886719 41.164062 C 100.410156 43.847656 99.929688 46.511719 99.457031 49.203125 C 99.40625 49.492188 99.335938 49.785156 99.308594 50.074219 C 99.285156 50.347656 99.144531 50.453125 98.890625 50.53125 C 95.351562 51.644531 91.816406 52.765625 88.28125 53.886719 C 88.125 53.9375 87.972656 54 87.804688 54.152344 C 90.699219 55.300781 93.59375 56.449219 96.527344 57.621094 C 96.421875 57.703125 96.351562 57.769531 96.273438 57.820312 C 94.464844 58.988281 92.652344 60.160156 90.847656 61.332031 C 90.628906 61.476562 90.457031 61.496094 90.214844 61.386719 C 88.050781 60.414062 85.875 59.457031 83.703125 58.492188 C 82.730469 58.058594 81.859375 57.480469 81.179688 56.644531 C 79.640625 54.765625 79.945312 52.625 81.996094 51.300781 C 82.667969 50.871094 83.429688 50.554688 84.191406 50.304688 C 87.660156 49.175781 91.144531 48.085938 94.601562 46.992188 C 94.890625 46.898438 95.027344 46.769531 95.082031 46.453125 C 95.546875 43.769531 96.027344 41.066406 96.511719 38.414062 C 96.773438 36.980469 96.910156 35.511719 97.605469 34.195312 C 97.875 33.6875 98.191406 33.191406 98.578125 32.769531 C 99.960938 31.234375 101.886719 31.179688 103.363281 32.640625 C 103.855469 33.132812 104.277344 33.710938 104.644531 34.3125 C 106.253906 36.9375 107.835938 39.578125 109.425781 42.230469 C 109.613281 42.542969 109.78125 42.605469 110.125 42.515625 C 114.003906 41.472656 117.882812 40.449219 121.78125 39.421875 C 122.585938 39.210938 123.394531 39.132812 124.21875 39.289062 C 126.007812 39.621094 126.789062 40.984375 126.183594 42.71875 C 125.910156 43.503906 125.433594 44.167969 124.898438 44.796875 C 122.1875 47.984375 119.472656 51.191406 116.777344 54.363281 C 116.558594 54.625 116.554688 54.8125 116.707031 55.105469 C 118.332031 58.164062 119.9375 61.214844 121.570312 64.308594 C 121.957031 65.039062 122.253906 65.804688 122.261719 66.644531 C 122.28125 68.558594 120.878906 70.125 118.976562 70.40625 C 117.914062 70.5625 116.921875 70.335938 115.921875 70.027344 C 113.492188 69.273438 111.058594 68.535156 108.605469 67.800781 C 108.382812 67.730469 108.292969 67.640625 108.253906 67.398438 C 107.972656 65.683594 107.667969 63.972656 107.371094 62.253906 C 107.363281 62.207031 107.375 62.15625 107.382812 62.050781 C 110.160156 62.820312 112.929688 63.574219 115.785156 64.367188 "/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><path d="m71.73 61.123 1.163-6.6h3.654l-.232 1.33h-2.276l-.233 1.28h2.088l-.228 1.326h-2.092l-.233 1.326h2.277l-.233 1.33H71.73m-4.949-2.632h-2.865l-.465 2.653h-1.374l1.162-6.6h1.379l-.461 2.608h2.865l.465-2.608h1.378l-1.162 6.6h-1.378l.46-2.653m-8.663 2.432a3.62 3.62 0 0 1-1.491.34c-1.743 0-2.837-1.306-2.837-2.945 0-2.091 1.759-3.855 3.855-3.855.525 0 .998.129 1.386.341l-.196 1.579c-.289-.32-.757-.545-1.334-.545-1.199 0-2.269 1.086-2.269 2.34 0 .958.602 1.707 1.551 1.707.581 0 1.142-.224 1.523-.529l-.184 1.567m-10.311-2.512h1.354l-.32-2.056zm1.567 1.326h-2.256l-.718 1.407H44.81l3.527-6.6h1.539l1.202 6.6h-1.483l-.212-1.407m-8.287-3.843h-.806l-.268 1.523h.801c.49 0 .87-.32.87-.922 0-.397-.24-.601-.601-.601zm-1.948-1.326h2.112c1.106 0 1.875.657 1.875 1.787 0 1.426-1.005 2.384-2.44 2.384h-.91l-.428 2.413h-1.379l1.162-6.596m-7.694 3.855H32.8l-.32-2.056zm1.571 1.326H30.76l-.717 1.407h-1.6l3.527-6.6h1.539l1.202 6.6h-1.479l-.216-1.407m85.72 30.38V87.8h-.012l-.91 2.308h-.288l-.906-2.308h-.016v2.308h-.453v-2.765h.706l.825 2.104.814-2.104h.7v2.765zm-4.015-2.397v2.396h-.453v-2.396h-.87v-.369h2.192v.369h-.865M89.459 66.317l-.718 5.442c-1.114 0-2.2-.004-3.29.004-.881.004-1.687.577-1.955 1.402-.1.321-.14.666-.184 1.006L81.66 86.706l-.408 3.182h-5.486c.104-.806.2-1.583.3-2.365.357-2.712.714-5.441 1.074-8.122.309-2.345.59-4.7.954-7.05.493-3.133 3.61-5.938 6.764-6.062 1.507-.064 3.022-.008 4.577-.008m-22.24 15.993c-.297 2.264-.578 4.412-.866 6.556-.016.112-.1.26-.193.3-4.412 2.036-10.186 1.752-13.773-2.344-1.94-2.204-2.749-4.825-2.633-7.714.285-6.72 5.86-12.615 12.535-13.44 3.9-.477 7.302.573 9.938 3.602 1.8 2.064 2.633 4.536 2.509 7.257-.08 1.8-.365 3.583-.585 5.362-.317 2.533-.665 5.073-.998 7.586-.012.088-.032.18-.052.293h-5.238c.069-.582.133-1.15.209-1.72.38-2.92.801-5.854 1.134-8.78.208-1.823.076-3.634-.758-5.321-.89-1.792-2.372-2.745-4.331-2.95-4.048-.428-7.915 2.38-8.74 6.348-.57 2.633.328 5.153 2.424 6.556 2.04 1.358 4.204 1.362 6.432.485 1.13-.45 2.088-1.158 3.001-2.108M24.148 62.278c-1.815 1.35-3.567 2.652-5.322 3.963-.28-.445-.533-.894-.83-1.31-.765-1.067-1.71-1.864-3.089-1.956-1.146-.08-2.128.296-2.91 1.142-.692.753-.785 1.831-.135 2.685.717.938 1.502 1.827 2.304 2.7 1.334 1.443 2.725 2.826 4.043 4.289 1.198 1.318 2.16 2.793 2.457 4.616.352 2.144-.077 4.163-1.09 6.063-1.876 3.482-4.821 5.522-8.74 6.143-1.723.277-3.439.225-5.114-.272-2.232-.654-3.782-2.12-4.78-4.164-.353-.73-.625-1.503-.942-2.284 1.952-1.042 3.851-2.064 5.775-3.09.064.16.112.293.172.421.328.657.6 1.355 1.002 1.96 1.21 1.79 3.157 2.336 5.113 1.45a5.678 5.678 0 0 0 1.415-.917c1.27-1.13 1.51-2.705.569-4.124-.541-.817-1.215-1.55-1.876-2.28-1.575-1.751-3.218-3.442-4.74-5.238-1.062-1.23-1.784-2.656-2.012-4.287-.253-1.8.108-3.49 1.042-4.99 2.32-3.758 5.69-5.69 10.142-5.566 2.545.093 4.577 1.283 6.143 3.262.47.585.906 1.19 1.379 1.824m18.33 14.598c-.089-.46-.153-1.134-.357-1.767-.99-3.046-4.112-4.7-7.342-3.963-3.55.825-6.103 3.618-6.431 7.257-.273 2.68 1.17 5.278 3.85 6.227 2.16.782 4.248.453 6.184-.705 2.56-1.535 3.947-3.815 4.123-7.049zM26.868 88.253c-.176 1.31-.34 2.544-.505 3.783-.22 1.649-.432 3.298-.637 4.949-.024.188-.084.276-.289.272-1.619-.004-3.242-.004-4.865-.008-.04 0-.076-.02-.164-.044.1-.773.196-1.555.297-2.328.356-2.721.713-5.442 1.078-8.167.416-3.114.741-6.223 1.274-9.317.938-5.486 5.606-10.186 11.048-11.38 3.162-.686 6.187-.37 8.948 1.414 2.753 1.771 4.328 4.372 4.7 7.586.514 4.576-1.173 8.371-4.411 11.545-2.136 2.068-4.7 3.378-7.63 3.823-3.038.457-5.895-.048-8.451-1.84-.093-.064-.197-.124-.357-.224m85.235 1.791c-2.252-.004-4.496-.012-6.764-.004-.297 0-.465-.084-.63-.336-2.664-4.06-5.361-8.123-8.002-12.167-.084-.128-.172-.252-.325-.468-.573 4.372-1.138 8.66-1.703 12.947h-5.894c.068-.573.128-1.13.2-1.683.573-4.412 1.154-8.784 1.731-13.196.553-4.204 1.102-8.411 1.663-12.615.016-.124.1-.284.2-.348 2.032-1.327 4.068-2.637 6.104-3.948.028-.02.072-.02.176-.052-.613 4.7-1.226 9.361-1.84 14.018.025.016.049.036.073.052 3.197-3.539 6.391-7.093 9.65-10.68.091.545.175 1.01.256 1.475.228 1.335.448 2.673.693 4.003.048.269-.024.433-.204.626-2.064 2.16-4.12 4.327-6.184 6.511-.088.097-.176.197-.276.309.064.104.12.204.188.3 3.547 4.99 7.089 9.979 10.635 14.968.065.088.16.16.237.24v.08m4.96-25.803c-.107-.236-.16-.356-.22-.468-1.602-3.05-3.201-6.104-4.824-9.153-.16-.309-.14-.489.08-.754 2.552-2.977 5.073-5.978 7.63-8.944a.777.777 0 0 0 .204-.405c-.741.193-1.483.385-2.232.582-3.078.817-6.183 1.63-9.233 2.46-.288.076-.417-.008-.56-.248l-5.278-8.74-.385-.425-.425 2.332c-.489 2.753-.982 5.486-1.467 8.247-.052.297-.124.597-.152.894-.024.28-.168.388-.429.469-3.63 1.142-7.257 2.292-10.883 3.442-.16.052-.317.116-.49.272 2.97 1.178 5.94 2.357 8.949 3.559-.108.084-.18.152-.26.204l-5.567 3.603c-.224.148-.4.168-.649.056-2.22-.998-4.452-1.98-6.68-2.97-.998-.444-1.891-1.037-2.589-1.895-1.578-1.927-1.266-4.123.838-5.482.69-.44 1.47-.765 2.252-1.022 3.559-1.158 7.133-2.276 10.68-3.398.296-.096.436-.228.492-.553.477-2.753.97-5.526 1.467-8.247.269-1.47.409-2.977 1.122-4.328.277-.52.601-1.03.998-1.463 1.418-1.574 3.394-1.63 4.909-.132.505.505.937 1.098 1.314 1.715 1.651 2.693 3.274 5.402 4.905 8.123.192.32.365.385.717.293 3.98-1.07 7.959-2.12 11.958-3.174.826-.217 1.655-.297 2.5-.136 1.836.34 2.637 1.739 2.016 3.518-.28.805-.769 1.487-1.318 2.132-2.781 3.27-5.566 6.56-8.331 9.814-.225.268-.229.46-.072.761 1.667 3.138 3.314 6.268 4.989 9.441.397.75.701 1.535.71 2.397.02 1.963-1.42 3.57-3.371 3.859-1.09.16-2.108-.072-3.134-.389-2.498-.773-5-1.535-7.505-2.284-.229-.072-.321-.164-.361-.413-.289-1.76-.601-3.514-.906-5.278-.008-.048.004-.1.012-.208 2.85.79 5.69 1.563 8.62 2.376"/></svg>
diff --git a/icons/apachespark/apachespark-plain.svg b/icons/apachespark/apachespark-plain.svg
deleted file mode 100644
index cc13ad66c..000000000
--- a/icons/apachespark/apachespark-plain.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128px" height="128px" viewBox="0 0 128 128" version="1.1">
-<g id="surface1">
-<path style=" stroke:none;fill-rule:evenodd;fill:rgb(22.745098%,21.960784%,23.921569%);fill-opacity:1;" d="M 57.761719 1.125 C 55.535156 1.191406 53.332031 2.25 51.492188 4.292969 C 50.480469 5.417969 49.621094 6.757812 48.910156 8.078125 C 47.054688 11.554688 46.6875 15.488281 46 19.300781 L 42.21875 40.71875 C 42.074219 41.558594 41.695312 41.90625 40.941406 42.148438 L 13.183594 50.964844 C 11.160156 51.625 9.132812 52.480469 7.34375 53.617188 C 1.886719 57.082031 1.078125 62.785156 5.175781 67.792969 C 6.984375 70.007812 9.316406 71.566406 11.902344 72.699219 L 29.1875 80.402344 C 29.332031 80.480469 29.484375 80.53125 29.640625 80.5625 L 33.292969 83.195312 C 33.292969 83.195312 29.660156 123.402344 36.480469 126.1875 C 36.421875 126.171875 36.078125 126.105469 36.078125 126.105469 C 36.078125 126.105469 36.769531 126.851562 38.632812 126.632812 C 40.058594 126.898438 39.875 126.855469 38.707031 126.621094 C 41.238281 126.292969 45.90625 124.167969 53.980469 116.054688 C 55.03125 115.109375 55.746094 114.386719 55.746094 114.386719 L 73.226562 95.515625 L 77.316406 96.953125 C 77.460938 97.15625 77.675781 97.289062 78.015625 97.390625 L 97.480469 103.3125 C 100.140625 104.132812 102.773438 104.734375 105.609375 104.320312 C 110.671875 103.578125 114.398438 99.410156 114.347656 94.3125 C 114.328125 92.074219 113.542969 90.050781 112.511719 88.101562 L 99.621094 63.652344 C 99.210938 62.878906 99.222656 62.378906 99.8125 61.6875 L 121.46875 36.234375 C 122.871094 34.5625 124.136719 32.769531 124.871094 30.691406 C 126.484375 26.105469 124.398438 22.460938 119.636719 21.570312 C 117.449219 21.179688 115.289062 21.386719 113.15625 21.949219 L 82.128906 30.191406 C 81.214844 30.4375 80.765625 30.265625 80.269531 29.433594 L 67.601562 8.386719 C 66.644531 6.800781 65.5 5.25 64.1875 3.941406 C 62.246094 2 59.988281 1.0625 57.761719 1.125 Z M 58.6875 20.507812 C 59.1875 20.859375 59.441406 21.222656 59.679688 21.613281 L 73.308594 44.324219 C 73.683594 44.941406 74.019531 45.160156 74.765625 44.960938 L 98.769531 38.582031 L 104.546875 37.070312 C 104.460938 37.554688 104.25 37.84375 104.019531 38.117188 L 84.222656 61.363281 C 83.664062 62.039062 83.613281 62.511719 84.035156 63.304688 L 96.546875 87.027344 L 97.121094 88.242188 L 97.105469 88.261719 L 74.789062 82.109375 L 74.785156 82.09375 L 70.5625 80.910156 L 45.53125 108.65625 L 50.109375 72.175781 L 46 70.390625 L 46.007812 70.382812 L 22.761719 61.152344 C 23.207031 60.746094 23.605469 60.578125 24.023438 60.449219 L 52.28125 51.515625 C 52.945312 51.308594 53.324219 51.054688 53.386719 50.296875 L 53.78125 47.984375 L 57.585938 26.570312 Z M 58.6875 20.507812 "/>
-</g>
-</svg>