diff --git a/devicon.json b/devicon.json
index 080866f27..c78668665 100644
--- a/devicon.json
+++ b/devicon.json
@@ -87,20 +87,28 @@
         ],
         "versions": {
             "svg": [
-                "original",
                 "original-wordmark",
-                "plain-wordmark"
+                "plain-wordmark",
+                "line-wordmark"
             ],
             "font": [
-                "original",
-                "plain-wordmark"
+                "plain-wordmark",
+                "line-wordmark"
             ]
         },
-        "color": "#F7A80D",
+        "color": "#f90",
         "aliases": [
             {
-                "base": "original",
+                "base": "original-wordmark",
+                "alias": "original"
+            },
+            {
+                "base": "plain-wordmark",
                 "alias": "plain"
+            },
+            {
+                "base": "line-wordmark",
+                "alias": "line"
             }
         ]
     },
diff --git a/icons/amazonwebservices/amazonwebservices-line-wordmark.svg b/icons/amazonwebservices/amazonwebservices-line-wordmark.svg
new file mode 100644
index 000000000..a7ee68ac3
--- /dev/null
+++ b/icons/amazonwebservices/amazonwebservices-line-wordmark.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#f90" d="M108.586 25.648c-1.889 0-3.708.216-5.445.737-1.733.518-3.225 1.266-4.536 2.267l-.003.002a11.33 11.33 0 0 0-3.164 3.608c-.802 1.428-1.2 3.077-1.2 4.918 0 2.296.758 4.473 2.205 6.404 1.47 2.007 3.846 3.481 6.985 4.47h.002l6.105 1.897c2.023.663 3.396 1.378 4.04 2.057.676.716 1 1.528 1 2.601 0 1.58-.649 2.73-1.964 3.58-1.31.848-3.278 1.311-5.873 1.311-1.652 0-3.258-.165-4.91-.494h-.004a22.608 22.608 0 0 1-4.53-1.444l-.007-.003-.008-.004c-.407-.163-.773-.328-1.072-.426l-.008-.002a2.862 2.862 0 0 0-.912-.154h-.002c-.428 0-.862.176-1.12.52-.26.343-.349.78-.349 1.284v2.15c.002.476.103.947.297 1.382.25.563.788 1.001 1.514 1.41 1.172.672 2.842 1.227 4.97 1.736 2.145.513 4.377.772 6.602.772 2.196 0 4.227-.304 6.17-.905 1.85-.564 3.469-1.347 4.832-2.443l.002-.002c1.364-1.057 2.42-2.379 3.207-3.867l.004-.004.002-.006c.75-1.503 1.147-3.224 1.147-5.106 0-2.284-.67-4.383-2.04-6.195-1.39-1.842-3.675-3.23-6.769-4.219l-5.98-1.894c-2.191-.7-3.7-1.5-4.442-2.203-.747-.71-1.105-1.564-1.105-2.625 0-1.597.56-2.601 1.74-3.319l.002-.002c1.181-.725 2.99-1.105 5.336-1.105 2.927 0 5.547.535 7.879 1.596l-.006-.004c.744.35 1.305.556 1.81.556.439 0 .874-.2 1.127-.55.253-.352.342-.792.342-1.297v-1.98c0-.656-.144-1.228-.474-1.677-.318-.473-.799-.844-1.418-1.197-.473-.283-1.085-.541-1.86-.8h-.002l-.004-.003a32.992 32.992 0 0 0-2.433-.685l-.012-.004-.014-.002c-.886-.168-1.78-.339-2.767-.465a21.856 21.856 0 0 0-2.883-.172zm-86.818.082c-2.35 0-4.58.257-6.688.815l-.004.002c-2.09.512-3.895 1.155-5.41 1.935-.628.317-1.074.64-1.357 1.036v.002c-.332.464-.387 1.049-.387 1.765v2.063c0 .496.071.918.307 1.263.235.346.661.541 1.076.541.253 0 .497-.056.808-.142l.002-.002.004-.002a13.5 13.5 0 0 0 1.516-.56l.015-.007a32.912 32.912 0 0 1 4.463-1.406h.004a18.675 18.675 0 0 1 4.43-.533c3.174 0 5.304.63 6.512 1.795 1.161 1.163 1.832 3.25 1.832 6.377v2.469c-1.462-.323-2.89-.63-4.278-.817-1.573-.212-3.068-.34-4.527-.34-4.424 0-7.97 1.126-10.64 3.407-2.676 2.276-4.008 5.355-4.008 9.05 0 3.472 1.102 6.325 3.263 8.444 2.17 2.12 5.141 3.174 8.772 3.174 4.856 0 8.96-1.888 12.246-5.49a34.62 34.62 0 0 0 1.004 1.911l.006.008.003.008c.46.733.985 1.42 1.573 2.055l.015.015.018.016c.477.43 1.012.719 1.6.719.461 0 .927-.17 1.369-.461v-.002l2.668-1.78.013-.01c.616-.472.996-1.037.996-1.657v-.008a2.36 2.36 0 0 0-.373-1.23l.02.032a21.97 21.97 0 0 1-1.31-2.947v-.004c-.273-.85-.442-2.071-.442-3.593v-.5h-.086V40c0-4.718-1.206-8.325-3.643-10.717v-.002l-.002-.002c-2.486-2.394-6.297-3.549-11.38-3.549Zm86.822.918h.004c.92-.005 1.84.049 2.752.164a44.14 44.14 0 0 1 2.685.452 31.7 31.7 0 0 1 2.362.664h-.006c.739.247 1.301.488 1.672.71l.004.005.006.002c.554.315.909.616 1.091.892l.008.012.01.012c.172.229.28.572.28 1.091v1.98c0 .38-.08.612-.153.714-.073.101-.122.135-.316.135-.166 0-.701-.139-1.385-.461l-.002-.002h-.004c-2.474-1.126-5.244-1.686-8.293-1.686-2.45 0-4.429.376-5.857 1.252-1.439.875-2.221 2.318-2.221 4.174 0 1.299.485 2.466 1.418 3.351.946.897 2.557 1.704 4.826 2.43l5.979 1.895c2.97.949 5.06 2.255 6.277 3.867 1.241 1.642 1.836 3.502 1.836 5.594 0 1.74-.364 3.3-1.041 4.656v.002c-.728 1.374-1.693 2.574-2.934 3.535l-.002.004-.004.002c-1.245 1.002-2.741 1.734-4.504 2.271h-.002v.002c-1.846.571-3.773.86-5.876.86a27.48 27.48 0 0 1-6.368-.744c-2.083-.499-3.692-1.048-4.709-1.631h-.002l-.002-.002c-.623-.35-1.005-.75-1.091-.946v-.002a2.42 2.42 0 0 1-.212-.976v-2.149c0-.377.078-.593.145-.681.066-.088.12-.123.322-.123.203.001.404.035.596.101l.004.002h.004c.197.065.582.233 1.006.403 0 0 .002 0 .003.002l.012.003a23.611 23.611 0 0 0 4.719 1.502h.002c1.713.342 3.39.514 5.11.514 2.71 0 4.866-.468 6.415-1.47 1.552-1.003 2.42-2.548 2.42-4.42 0-1.288-.436-2.404-1.273-3.29-.872-.92-2.365-1.636-4.461-2.322l-.004-.002-6.11-1.896c-3.005-.948-5.176-2.329-6.478-4.11l-.002-.002-.002-.004c-1.333-1.778-2.006-3.726-2.006-5.804 0-1.699.36-3.165 1.072-4.432h.002v-.002a10.326 10.326 0 0 1 2.891-3.293l.004-.002.002-.004c1.212-.927 2.585-1.616 4.219-2.105 1.627-.488 3.348-.694 5.162-.694zm-86.822.082c4.932 0 8.453 1.119 10.687 3.27 2.193 2.156 3.338 5.454 3.338 10v14.14h.148c.038 1.327.147 2.532.426 3.403l.004.01.002.008c.382 1.065.842 2.1 1.377 3.097l.01.016.01.017c.134.21.207.454.213.704-.001.214-.13.495-.602.859l-.002.002-2.625 1.75c-.315.207-.61.295-.816.295-.252 0-.558-.137-.916-.455a12.77 12.77 0 0 1-1.442-1.881 33.668 33.668 0 0 1-1.275-2.434l-.332-.7-.502.59c-3.202 3.78-7.158 5.638-11.998 5.638-3.44 0-6.11-.97-8.073-2.889-1.965-1.927-2.963-4.465-2.963-7.729 0-3.46 1.19-6.193 3.657-8.29h.002c2.462-2.104 5.734-3.167 9.99-3.167 1.4 0 2.852.124 4.395.332 1.535.208 3.12.54 4.798.918l.612.137v-3.7c0-3.27-.683-5.643-2.127-7.087l-.004-.002-.002-.004c-1.494-1.443-3.904-2.078-7.211-2.078-1.573 0-3.14.188-4.668.56-1.57.375-3.11.862-4.611 1.456l-.008.002-.008.004a12.65 12.65 0 0 1-1.414.525c-.274.075-.452.105-.533.105-.176 0-.192-.017-.25-.103-.059-.086-.133-.316-.133-.701v-2.063c0-.635.11-1.058.201-1.185.136-.19.448-.45.996-.727l.002-.002h.002c1.428-.735 3.16-1.356 5.194-1.853l.005-.002.004-.002c2.014-.535 4.162-.784 6.442-.784zm19.58.012c-.432 0-.844.134-1.123.43-.28.296-.39.702-.39 1.121 0 .442.148.975.401 1.83l9.895 32.553.002.002c.263.83.54 1.477 1.055 1.87.468.404 1.103.542 1.906.542h3.62c.814 0 1.511-.106 2.013-.547.479-.415.737-1.054.957-1.937l.002-.004 6-25.09 6.035 25.113c.181.908.498 1.56.96 1.963h.003v.002c.483.419 1.156.543 2.011.543h3.622c.79 0 1.436-.174 1.896-.522v-.002c.506-.377.8-1.01 1.066-1.894v.006l10.139-32.53c.177-.484.268-.853.316-1.138.042-.245.094-.482.094-.76 0-.446-.13-.865-.428-1.152-.297-.288-.706-.399-1.127-.399H86.36c-.83 0-1.482.173-1.945.524l-.012.007-.011.01c-.442.377-.73.993-.995 1.88l-.002.007-6.783 26.262-6.187-26.24.002.013c-.179-.86-.466-1.528-.98-1.92-.485-.419-1.15-.543-1.993-.543h-3.367c-.83 0-1.508.166-1.986.524-.52.388-.764 1.038-.983 1.92l-.002.002-6.101 25.888-6.577-25.906-.003-.014c-.253-.809-.48-1.448-.998-1.853-.464-.446-1.126-.56-1.963-.56h-3.625zm0 1h4.125c.748 0 1.161.147 1.29.278l.026.025.03.021c.13.097.418.614.66 1.383l7.068 27.856.973-.01 6.568-27.875v.006c.197-.798.46-1.248.61-1.36v-.002c.201-.15.703-.322 1.388-.322h3.367c.748 0 1.166.134 1.352.299l.017.014.016.011c.147.11.458.61.61 1.342l.001.006 6.655 28.217.97.012 7.282-28.196c.233-.786.533-1.26.68-1.388.212-.157.648-.317 1.323-.317h3.914c.256 0 .373.059.434.117.061.06.121.165.121.434 0 .142-.035.329-.08.592-.038.222-.11.527-.27.963l-.003.011-10.153 32.565v.002c-.24.795-.533 1.256-.707 1.385h-.002l-.002.002c-.211.16-.657.32-1.295.32h-3.62c-.747 0-1.165-.134-1.356-.299-.218-.19-.485-.633-.639-1.404l-.002-.01-6.53-27.17h-.972l-6.484 27.113c-.2.803-.442 1.255-.64 1.426l-.003.002-.002.002c-.173.152-.65.297-1.353.297h-3.621c-.703 0-1.066-.118-1.268-.297l-.013-.014-.018-.011c-.154-.115-.466-.63-.707-1.387l-.002-.006-9.89-32.537-.003-.004c-.245-.828-.357-1.39-.357-1.541 0-.253.06-.372.117-.434.058-.06.15-.117.395-.117zM21.64 46.996c-2.885 0-5.074.556-6.592 1.797-1.503 1.231-2.244 3.014-2.244 5.227 0 2.058.538 3.691 1.703 4.814 1.124 1.164 2.754 1.709 4.775 1.709 1.448 0 2.937-.265 4.494-.783h.002c1.605-.538 3.026-1.519 4.213-2.836l.006-.006.004-.006c.709-.844 1.261-1.798 1.533-2.895v-.002c.264-1.053.438-2.311.438-3.785v-2.158l-.381-.094a34.955 34.955 0 0 0-3.93-.728 32.304 32.304 0 0 0-4.021-.254Zm0 1c1.303 0 2.603.083 3.896.246 1.156.147 2.3.374 3.436.639v1.35c0 1.395-.165 2.572-.409 3.542v.002c-.228.922-.692 1.735-1.326 2.49l-.002.003c-1.084 1.2-2.353 2.066-3.775 2.543-1.474.49-2.852.732-4.178.732-1.85 0-3.16-.472-4.06-1.406l-.008-.006-.008-.008c-.936-.897-1.402-2.208-1.402-4.103 0-2 .608-3.413 1.879-4.454 1.264-1.032 3.202-1.57 5.957-1.57zm96.351 24.852c-4.5.064-9.82 1.056-13.9 3.923l-.002.002-.004.002c-.708.512-1.115 1.165-.996 1.834.06.335.288.641.597.805.31.164.68.207 1.09.156 2.253-.273 5.85-.703 9.082-.78 1.617-.04 3.143.012 4.342.204 1.2.193 2.04.561 2.33.934v.002l.002.002c.283.356.43 1.254.307 2.46-.124 1.208-.472 2.698-.93 4.255-.916 3.113-2.268 6.493-3.111 8.576v.002h-.002c-.154.384-.206.753-.125 1.094.08.34.319.638.627.78.615.287 1.35.058 2.011-.505l.002-.002c3.819-3.212 6.18-8.103 7.42-12.438.62-2.167.958-4.197 1.045-5.828.044-.815.024-1.53-.06-2.125-.084-.595-.213-1.073-.506-1.44l-.002-.001-.002-.002c-.29-.353-.718-.59-1.274-.817-.555-.226-1.242-.423-2.043-.59-1.6-.332-3.647-.536-5.898-.503zm.016 1c2.181-.032 4.165.167 5.678.482.756.157 1.394.343 1.87.537.475.193.783.412.874.522.086.108.227.448.298.95.072.504.092 1.166.051 1.934-.082 1.537-.406 3.505-1.008 5.606-1.202 4.202-3.515 8.93-7.105 11.95l-.002.001c-.475.405-.855.405-.943.363-.045-.02-.056-.024-.075-.103-.018-.079-.018-.246.08-.492h-.001c.844-2.087 2.208-5.487 3.144-8.668.468-1.59.831-3.125.965-4.436.134-1.31.083-2.423-.518-3.181-.595-.762-1.657-1.099-2.957-1.307-1.301-.209-2.874-.255-4.525-.215-3.303.08-6.925.514-9.18.787h-.002c-.264.033-.425-.01-.496-.047-.07-.037-.073-.048-.082-.097-.017-.099.085-.475.598-.846v-.002c3.832-2.69 8.975-3.676 13.336-3.738zM1.6 75.359l-.03.004.06-.004zm-.03.004h-.002a1.55 1.55 0 0 0-1.322 1.15c-.147.603.086 1.302.68 1.839h.002c16.597 14.982 38.57 24 62.947 24 17.41 0 37.609-5.441 51.578-15.758h.002c.645-.48 1.033-1.06 1.16-1.658a2.132 2.132 0 0 0-.336-1.659c-.643-.93-2.002-1.354-3.35-.744l.012-.006c-15.466 6.542-32.296 9.73-47.593 9.73-22.685 0-44.625-6.249-62.399-16.562-.468-.277-.945-.385-1.379-.332Zm.121.992c.185-.022.436.015.748.2l.002.002h.002c17.932 10.405 40.035 16.7 62.905 16.7 15.436 0 32.383-3.21 47.982-9.808l.006-.004.006-.002c.971-.44 1.76-.108 2.115.405.178.256.25.553.18.879-.07.324-.288.697-.777 1.062h-.002v.002c-13.733 10.142-33.784 15.56-50.983 15.56-24.13 0-45.858-8.92-62.277-23.742-.386-.348-.432-.651-.381-.859.05-.208.2-.36.474-.395Z"/>
+</svg>
diff --git a/icons/amazonwebservices/amazonwebservices-original-wordmark.svg b/icons/amazonwebservices/amazonwebservices-original-wordmark.svg
index b39341d93..39f9762a2 100644
--- a/icons/amazonwebservices/amazonwebservices-original-wordmark.svg
+++ b/icons/amazonwebservices/amazonwebservices-original-wordmark.svg
@@ -1 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><path fill="#201C1D" d="M44.634 57.361c-2.599 0-5.499 1.001-6.107 4.296-.064.351.167.517.391.567l2.663.32c.246-.014.414-.28.461-.533.228-1.134 1.16-1.669 2.201-1.669.563 0 1.193.193 1.527.71.381.576.354 1.359.354 2.024v.391c-1.582.182-3.666.292-5.147.958-1.709.76-2.912 2.307-2.912 4.58 0 2.913 1.785 4.366 4.083 4.366 1.94 0 3.013-.456 4.509-2.022.497.738.656 1.073 1.562 1.846a.55.55 0 00.64-.071v.035c.545-.497 1.535-1.401 2.094-1.881.222-.187.174-.493 0-.746-.5-.707-1.029-1.276-1.029-2.592v-4.366c0-1.85.156-3.556-1.172-4.828-1.046-1.031-2.791-1.385-4.118-1.385zm35.786 0c-2.6 0-5.498 1.001-6.106 4.296-.064.351.166.517.39.567l2.664.32c.246-.014.415-.28.461-.533.229-1.134 1.161-1.669 2.201-1.669.564 0 1.193.193 1.526.71.381.576.319 1.359.319 2.024v.391c-1.582.182-3.63.292-5.112.958-1.711.76-2.91 2.307-2.91 4.58 0 2.913 1.785 4.366 4.082 4.366 1.938 0 3.011-.456 4.509-2.022.495.738.656 1.073 1.563 1.846a.548.548 0 00.639-.071v.035c.546-.497 1.537-1.401 2.095-1.881.222-.187.171-.493 0-.746-.5-.707-1.03-1.276-1.03-2.592v-4.366c0-1.85.12-3.556-1.206-4.828-1.05-1.031-2.759-1.385-4.085-1.385zm-20.13.142c-1.68 0-2.924.848-3.585 2.663h-.036v-1.882a.534.534 0 00-.496-.497h-2.557a.54.54 0 00-.533.533v14.378a.554.554 0 00.498.497h2.733a.537.537 0 00.532-.533v-7.633c0-1.664-.08-3.94 1.882-3.94 1.937 0 1.668 2.339 1.668 3.94v7.633c0 .271.222.515.498.533h2.733c.29 0 .532-.243.532-.533v-7.633c0-.816-.033-2.006.248-2.733s.971-1.207 1.634-1.207c.789 0 1.394.275 1.598 1.242.126.575.071 2.094.071 2.698v7.633c0 .271.222.515.496.533h2.734c.29 0 .532-.243.532-.533v-9.088c0-1.545.154-3.298-.71-4.509-.765-1.088-2.015-1.563-3.16-1.563-1.605 0-3.101.848-3.763 2.663-.764-1.814-1.842-2.662-3.549-2.662zm46.472 0c-3.949 0-6.142 3.473-6.142 7.953 0 4.448 2.167 8.022 6.142 8.022 3.823 0 6.249-3.492 6.249-7.881 0-4.537-2.198-8.094-6.249-8.094zm15.585 0c-1.887 0-2.966.943-3.728 2.911h-.035v-2.201c-.049-.222-.258-.377-.497-.39h-2.521a.525.525 0 00-.533.461v14.378c0 .271.225.515.497.533h2.699a.54.54 0 00.531-.533v-7.739c0-.97.083-1.855.463-2.733.306-.697.899-1.137 1.562-1.137 1.883 0 1.703 2.295 1.703 3.87v7.811a.545.545 0 00.498.462h2.733a.537.537 0 00.532-.462v-9.053c0-1.392.003-3.324-.71-4.474-.764-1.241-1.975-1.704-3.194-1.704zm-32.803.249c-.278 0-.497.22-.498.532v2.059c.001.31.213.531.498.533h4.686l-5.361 7.916c-.326.511-.354 1.089-.354 1.421v2.095c0 .302.328.63.639.461 3.056-1.668 6.717-1.52 9.479-.035.336.183.675-.16.675-.462V70.07a.934.934 0 00-.497-.781c-1.568-.901-3.388-1.178-5.111-1.136l4.65-6.815c.43-.613.67-.981.674-1.279v-1.774c0-.306-.209-.532-.496-.532h-8.984zm17.218 2.698c.865 0 1.504.386 1.811 1.384.354 1.152.391 2.588.391 3.799 0 1.846-.086 4.899-2.201 4.899-2.139 0-2.13-3.78-2.13-5.538-.001-1.753.117-4.544 2.129-4.544zm-60.673 5.254v.604c0 1.092.04 2.01-.497 2.981-.434.79-1.116 1.279-1.881 1.279-1.045 0-1.668-.849-1.668-2.06-.001-2.387 2.074-2.804 4.046-2.804zm35.786 0v.604c0 1.092.04 2.01-.496 2.981-.435.79-1.112 1.279-1.882 1.279-1.047 0-1.669-.849-1.669-2.06 0-2.387 2.073-2.804 4.047-2.804z"/><path d="M99.59 73.656v2.06h1.386v-2.06H99.59zm-40.152.356v14.662h1.278V87.36c.272.521.582.91.958 1.171.376.262.806.391 1.277.391.939 0 1.75-.479 2.45-1.455.701-.977 1.065-2.392 1.065-4.189 0-1.178-.151-2.154-.462-2.981-.311-.826-.725-1.441-1.242-1.847-.519-.406-1.107-.639-1.739-.639-.452 0-.874.118-1.244.354-.368.236-.666.622-.958 1.101v-5.254h-1.383zm13.135 3.443c-.962 0-1.728.285-2.271.852s-.815 1.296-.815 2.202c0 .525.115.972.318 1.384.202.413.49.748.852.994.364.246 1.09.57 2.166.923.745.24 1.19.444 1.385.604.281.233.427.538.427.959 0 .486-.17.892-.498 1.207-.328.317-.786.461-1.385.461-.6 0-1.094-.168-1.455-.532-.362-.364-.557-.918-.64-1.668l-1.384.283c.313 2.278 1.449 3.41 3.408 3.408 1.045 0 1.844-.295 2.449-.923.604-.628.924-1.471.924-2.485 0-.548-.098-1.022-.284-1.419a2.251 2.251 0 00-.782-.924c-.336-.229-1.089-.536-2.236-.923-.834-.292-1.321-.506-1.49-.64-.284-.224-.427-.53-.427-.922 0-.4.133-.739.427-.995.294-.255.747-.39 1.349-.39 1.058 0 1.65.581 1.774 1.739l1.35-.213c-.094-.732-.253-1.312-.496-1.705a2.665 2.665 0 00-1.065-.958c-.465-.232-.992-.319-1.601-.319zm8.486 0c-1.109 0-2.046.457-2.77 1.42-.723.963-1.063 2.358-1.063 4.189 0 1.764.348 3.146 1.063 4.083.718.934 1.646 1.384 2.806 1.384.921 0 1.685-.276 2.307-.852.624-.575 1.077-1.423 1.313-2.557l-1.42-.248c-.407 1.451-1.16 2.163-2.2 2.165-.664 0-1.206-.281-1.669-.887-.464-.607-.726-1.507-.78-2.698h6.105v-.497c0-1.792-.357-3.137-1.065-4.083-.709-.945-1.569-1.419-2.627-1.419zm8.414 0c-.331 0-.621.112-.888.355-.267.242-.567.744-.888 1.49v-1.633h-1.243v10.615h1.385v-5.538c0-.772.074-1.516.249-2.201.1-.394.289-.703.532-.923.244-.221.523-.32.816-.32.326 0 .65.131.994.391l.462-1.668c-.482-.386-.955-.568-1.419-.568zm16.969 0c-1.096 0-1.999.462-2.699 1.385-.696.923-1.063 2.309-1.063 4.153 0 1.831.372 3.218 1.063 4.154.693.934 1.559 1.384 2.628 1.384.884 0 1.642-.328 2.272-.994.63-.665 1.014-1.646 1.172-2.911l-1.35-.213c-.101.905-.336 1.557-.71 1.988-.373.43-.823.639-1.349.639-.67 0-1.241-.313-1.67-.958-.427-.646-.638-1.68-.638-3.124 0-1.4.227-2.41.674-3.053.448-.644 1.021-.994 1.704-.994.457 0 .847.177 1.172.531.327.356.543.918.674 1.634l1.351-.283c-.162-1.119-.521-1.962-1.102-2.521-.58-.56-1.284-.817-2.129-.817zm7.917 0c-1.11 0-2.046.457-2.77 1.42-.723.963-1.065 2.358-1.065 4.189 0 1.764.349 3.146 1.065 4.083.719.934 1.646 1.384 2.805 1.384.918 0 1.685-.276 2.308-.852.622-.575 1.075-1.423 1.314-2.557l-1.42-.248c-.41 1.451-1.128 2.163-2.166 2.165-.664 0-1.241-.281-1.704-.887-.463-.607-.725-1.507-.781-2.698h6.106v-.497c0-1.792-.357-3.137-1.065-4.083-.706-.945-1.568-1.419-2.627-1.419zm8.202 0c-.966 0-1.729.285-2.272.852-.545.566-.817 1.296-.817 2.202 0 .525.082.972.284 1.384.2.413.489.748.853.994.361.246 1.09.57 2.166.923.743.24 1.226.444 1.42.604.281.233.426.538.426.959 0 .486-.168.892-.497 1.207-.326.317-.785.461-1.384.461-.602 0-1.094-.168-1.456-.532-.361-.364-.595-.918-.675-1.668l-1.384.283c.313 2.278 1.446 3.41 3.407 3.408 1.047 0 1.881-.295 2.485-.923s.922-1.471.922-2.485c0-.548-.096-1.022-.282-1.419a2.322 2.322 0 00-.817-.924c-.336-.229-1.054-.536-2.2-.923-.835-.292-1.357-.506-1.527-.64-.283-.224-.426-.53-.426-.922 0-.4.167-.739.462-.995.294-.255.75-.39 1.35-.39 1.058 0 1.649.581 1.774 1.739l1.349-.213c-.094-.732-.252-1.312-.497-1.705a2.662 2.662 0 00-1.064-.958c-.463-.232-.994-.319-1.6-.319zm-31.668.213l3.09 10.615h1.313l3.089-10.615h-1.42l-1.811 6.497c-.219.785-.413 1.464-.533 2.023-.15-.705-.296-1.446-.496-2.166l-1.775-6.354h-1.457zm8.697 0v10.615h1.386V77.668H99.59zm-45.513.143c-1.098 0-1.981.492-2.697 1.455-.717.963-1.102 2.358-1.102 4.189 0 1.765.355 3.113 1.065 4.047.709.935 1.657 1.42 2.806 1.42.911 0 1.655-.312 2.271-.888.616-.575 1.042-1.423 1.279-2.556l-1.385-.213c-.404 1.451-1.136 2.163-2.165 2.165-.659 0-1.21-.281-1.669-.888-.46-.606-.727-1.506-.781-2.697h6.035l.036-.497c0-1.792-.364-3.172-1.065-4.119-.701-.945-1.581-1.418-2.628-1.418zm-15.584.248l2.485 10.615h1.455l1.634-8.165.284 1.81 1.313 6.355h1.42l2.521-10.615h-1.313L46.906 84.2l-.462 2.06-.426-2.06-1.207-6.142h-1.42l-1.278 6.213-.426 2.201-.496-2.272-1.279-6.142h-1.419zm42.53.852c.69 0 1.258.333 1.704.994.306.452.506 1.14.567 2.059h-4.58c.044-.932.307-1.65.747-2.201.44-.55.943-.852 1.562-.852zm33.3 0c.688 0 1.258.333 1.704.994.308.452.506 1.14.569 2.059h-4.581c.044-.932.308-1.65.746-2.201.437-.55.943-.852 1.562-.852zm-60.246.39c.682 0 1.23.334 1.67.995.304.452.505 1.14.567 2.059h-4.51c.043-.932.275-1.687.711-2.236.434-.552.948-.818 1.562-.818zm8.805 0c.615 0 1.14.342 1.563.995.423.652.604 1.659.604 3.053 0 1.357-.2 2.37-.64 3.053-.439.684-.96 1.029-1.526 1.029-.416 0-.794-.14-1.136-.426-.344-.286-.595-.696-.782-1.242-.186-.546-.283-1.387-.283-2.485 0-1.294.231-2.263.674-2.947.443-.684.96-1.03 1.526-1.03z"/><path fill="#F7A80D" d="M18.594 68.048l-5.29 2.271 4.899 2.095 5.681-2.095-5.29-2.271zm-7.952 2.839l-.178 10.226 7.74 3.408V73.905l-7.562-3.018zm15.904 0l-6.994 2.663v10.012l6.994-2.84v-9.835zm8.343-31.809l-5.326 2.271 4.935 2.095 5.681-2.095-5.29-2.271zm-7.385 3.018V52.32l6.604 1.917.213-9.302-6.817-2.839zm14.769.567l-6.249 2.663v10.047l6.249-2.84v-9.87zM9.877 53.468l-5.29 2.272 4.899 2.095 5.68-2.095-5.289-2.272zm-7.951 2.841l-.178 10.224 7.739 3.408V59.326l-7.561-3.017zm15.904 0l-6.994 2.662v10.012l6.994-2.84v-9.834zm9.088-3.218l-5.29 2.271 4.899 2.094 5.68-2.094-5.289-2.271zm-7.952 2.839l-.177 10.225 7.739 3.408V58.948l-7.562-3.018zm15.905 0l-6.994 2.663v10.012l6.994-2.841V55.93zm16.662-16.852l-5.289 2.271 4.899 2.095 5.681-2.095-5.291-2.271zm-7.952 2.84l-.178 10.225 7.74 3.407V44.936l-7.562-3.018zm15.904 0l-6.994 2.663v10.011l6.994-2.84v-9.834z"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg">
+	<path fill="#252f3e" d="M36.379 53.64c0 1.56.168 2.825.465 3.75.336.926.758 1.938 1.347 3.032.207.336.293.672.293.969 0 .418-.254.84-.8 1.261l-2.653 1.77c-.379.25-.758.379-1.093.379-.422 0-.844-.211-1.266-.59a13.28 13.28 0 0 1-1.516-1.98 34.153 34.153 0 0 1-1.304-2.485c-3.282 3.875-7.41 5.813-12.38 5.813-3.535 0-6.355-1.012-8.421-3.032-2.063-2.023-3.114-4.718-3.114-8.086 0-3.578 1.262-6.484 3.833-8.671 2.566-2.192 5.976-3.286 10.316-3.286 1.43 0 2.902.125 4.46.336 1.56.211 3.161.547 4.845.926v-3.074c0-3.2-.676-5.43-1.98-6.734C26.061 32.633 23.788 32 20.546 32c-1.473 0-2.988.168-4.547.547a33.416 33.416 0 0 0-4.547 1.433c-.676.293-1.18.461-1.473.547-.296.082-.507.125-.675.125-.59 0-.883-.422-.883-1.304v-2.063c0-.676.082-1.18.293-1.476.21-.293.59-.586 1.18-.883 1.472-.758 3.242-1.39 5.304-1.895 2.063-.547 4.254-.8 6.57-.8 5.008 0 8.672 1.136 11.032 3.41 2.316 2.273 3.492 5.726 3.492 10.359v13.64Zm-17.094 6.403c1.387 0 2.82-.254 4.336-.758 1.516-.508 2.863-1.433 4-2.695.672-.8 1.18-1.684 1.43-2.695.254-1.012.422-2.23.422-3.665v-1.765a34.401 34.401 0 0 0-3.871-.719 31.816 31.816 0 0 0-3.961-.25c-2.82 0-4.883.547-6.274 1.684-1.387 1.136-2.062 2.734-2.062 4.84 0 1.98.504 3.453 1.558 4.464 1.012 1.051 2.485 1.559 4.422 1.559Zm33.809 4.547c-.758 0-1.262-.125-1.598-.422-.34-.254-.633-.84-.887-1.64L40.715 29.98c-.25-.843-.38-1.39-.38-1.687 0-.672.337-1.05 1.013-1.05h4.125c.8 0 1.347.124 1.644.421.336.25.59.84.84 1.64l7.074 27.876 6.57-27.875c.208-.84.462-1.39.797-1.64.34-.255.93-.423 1.688-.423h3.367c.8 0 1.348.125 1.684.422.336.25.633.84.8 1.64l6.653 28.212 7.285-28.211c.25-.84.547-1.39.84-1.64.336-.255.887-.423 1.644-.423h3.914c.676 0 1.055.336 1.055 1.051 0 .21-.043.422-.086.676-.043.254-.125.59-.293 1.05L80.801 62.57c-.254.84-.547 1.387-.887 1.64-.336.255-.883.423-1.598.423h-3.62c-.801 0-1.348-.13-1.684-.422-.34-.297-.633-.844-.801-1.684l-6.527-27.16-6.485 27.117c-.21.844-.46 1.391-.8 1.684-.337.297-.926.422-1.684.422Zm54.105 1.137c-2.187 0-4.379-.254-6.484-.758-2.106-.504-3.746-1.055-4.84-1.684-.676-.379-1.137-.8-1.305-1.18a2.919 2.919 0 0 1-.254-1.18v-2.148c0-.882.336-1.304.97-1.304.25 0 .503.043.757.129.25.082.629.25 1.05.418a23.102 23.102 0 0 0 4.634 1.476c1.683.336 3.324.504 5.011.504 2.653 0 4.715-.465 6.145-1.39 1.433-.926 2.191-2.274 2.191-4 0-1.18-.379-2.145-1.136-2.946-.758-.8-2.192-1.516-4.254-2.191l-6.106-1.895c-3.074-.969-5.348-2.398-6.734-4.293-1.39-1.855-2.106-3.918-2.106-6.105 0-1.77.38-3.328 1.137-4.676a10.829 10.829 0 0 1 3.031-3.453c1.262-.965 2.696-1.684 4.38-2.188 1.683-.504 3.452-.715 5.304-.715.926 0 1.894.043 2.82.168.969.125 1.852.293 2.738.461.84.211 1.641.422 2.399.676.758.254 1.348.504 1.77.758.59.336 1.011.672 1.261 1.05.254.34.379.802.379 1.391v1.98c0 .884-.336 1.348-.969 1.348-.336 0-.883-.171-1.597-.507-2.403-1.094-5.098-1.641-8.086-1.641-2.399 0-4.293.379-5.598 1.18-1.309.797-1.98 2.02-1.98 3.746 0 1.18.421 2.191 1.261 2.988.844.8 2.403 1.602 4.633 2.316l5.98 1.895c3.032.969 5.22 2.316 6.524 4.043 1.305 1.727 1.938 3.707 1.938 5.895 0 1.812-.38 3.453-1.094 4.882-.758 1.434-1.77 2.696-3.074 3.707-1.305 1.051-2.864 1.809-4.672 2.36-1.895.586-3.875.883-6.024.883Zm0 0"/>
+	<path fill="#f90" d="M118 73.348c-4.432.063-9.664 1.052-13.621 3.832-1.223.883-1.012 2.062.336 1.894 4.508-.547 14.44-1.726 16.21.547 1.77 2.23-1.976 11.62-3.663 15.79-.504 1.26.59 1.769 1.726.8 7.41-6.231 9.348-19.242 7.832-21.137-.757-.925-4.388-1.79-8.82-1.726zM1.63 75.859c-.927.116-1.347 1.236-.368 2.121 16.508 14.902 38.359 23.872 62.613 23.872 17.305 0 37.43-5.43 51.281-15.66 2.273-1.688.297-4.254-2.02-3.204-15.534 6.57-32.421 9.77-47.788 9.77-22.778 0-44.8-6.273-62.653-16.633-.39-.231-.755-.304-1.064-.266z"/>
+</svg>
\ No newline at end of file
diff --git a/icons/amazonwebservices/amazonwebservices-original.svg b/icons/amazonwebservices/amazonwebservices-original.svg
deleted file mode 100644
index 454162808..000000000
--- a/icons/amazonwebservices/amazonwebservices-original.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><path fill="#F7A80D" d="M38.089 77.466l-11.4 4.896 10.559 4.514 12.241-4.514-11.4-4.896zm-17.138 6.12l-.382 22.034 16.679 7.345V90.089l-16.297-6.503zm34.276 0l-15.073 5.739V110.9l15.073-6.121V83.586zm17.979-68.551L61.73 19.931l10.635 4.515 12.241-4.515-11.4-4.896zm-15.914 6.503v22.034l14.231 4.132.459-20.046-14.69-6.12zm31.828 1.224L75.654 28.5v21.652l13.466-6.121V22.762zM19.306 46.047L7.907 50.944l10.558 4.514 12.241-4.514-11.4-4.897zM2.168 52.168l-.382 22.034 16.679 7.345V58.671L2.168 52.168zm34.275 0l-15.071 5.738V79.48l15.071-6.12V52.168zm19.587-6.937l-11.4 4.897 10.558 4.514 12.241-4.514-11.399-4.897zm-17.137 6.121l-.383 22.035 16.679 7.345V57.855l-16.296-6.503zm34.275 0L58.096 57.09v21.576l15.072-6.121V51.352zm35.908-36.317l-11.399 4.896 10.559 4.515 12.241-4.515-11.401-4.896zm-17.137 6.121l-.382 22.034 16.679 7.344V27.658l-16.297-6.502zm34.275 0l-15.071 5.738v21.575l15.071-6.12V21.156z"/></svg>
\ No newline at end of file
diff --git a/icons/amazonwebservices/amazonwebservices-plain-wordmark.svg b/icons/amazonwebservices/amazonwebservices-plain-wordmark.svg
index cbf2acad6..abeab1355 100644
--- a/icons/amazonwebservices/amazonwebservices-plain-wordmark.svg
+++ b/icons/amazonwebservices/amazonwebservices-plain-wordmark.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><path fill="#F7A80D" d="M44.634 57.361c-2.599 0-5.499 1.001-6.107 4.296-.064.351.167.517.391.567l2.663.32c.246-.014.414-.28.461-.533.228-1.134 1.16-1.669 2.201-1.669.563 0 1.193.193 1.527.71.381.576.354 1.359.354 2.024v.391c-1.582.182-3.666.292-5.147.958-1.709.76-2.912 2.307-2.912 4.58 0 2.913 1.785 4.366 4.083 4.366 1.94 0 3.013-.456 4.509-2.022.497.738.656 1.073 1.562 1.846a.55.55 0 00.64-.071v.035c.545-.497 1.535-1.401 2.094-1.881.222-.187.174-.493 0-.746-.5-.707-1.029-1.276-1.029-2.592v-4.366c0-1.85.156-3.556-1.172-4.828-1.046-1.031-2.791-1.385-4.118-1.385zm35.786 0c-2.6 0-5.498 1.001-6.106 4.296-.064.351.166.517.39.567l2.664.32c.246-.014.415-.28.461-.533.229-1.134 1.161-1.669 2.201-1.669.564 0 1.193.193 1.526.71.381.576.319 1.359.319 2.024v.391c-1.582.182-3.63.292-5.112.958-1.711.76-2.91 2.307-2.91 4.58 0 2.913 1.785 4.366 4.082 4.366 1.938 0 3.011-.456 4.509-2.022.495.738.656 1.073 1.563 1.846a.548.548 0 00.639-.071v.035c.546-.497 1.537-1.401 2.095-1.881.222-.187.171-.493 0-.746-.5-.707-1.03-1.276-1.03-2.592v-4.366c0-1.85.12-3.556-1.206-4.828-1.05-1.031-2.759-1.385-4.085-1.385zm-20.13.142c-1.68 0-2.924.848-3.585 2.663h-.036v-1.882a.534.534 0 00-.496-.497h-2.557a.54.54 0 00-.533.533v14.378a.554.554 0 00.498.497h2.733a.537.537 0 00.532-.533v-7.633c0-1.664-.08-3.94 1.882-3.94 1.937 0 1.668 2.339 1.668 3.94v7.633c0 .271.222.515.498.533h2.733c.29 0 .532-.243.532-.533v-7.633c0-.816-.033-2.006.248-2.733s.971-1.207 1.634-1.207c.789 0 1.394.275 1.598 1.242.126.575.071 2.094.071 2.698v7.633c0 .271.222.515.496.533h2.734c.29 0 .532-.243.532-.533v-9.088c0-1.545.154-3.298-.71-4.509-.765-1.088-2.015-1.563-3.16-1.563-1.605 0-3.101.848-3.763 2.663-.764-1.814-1.842-2.662-3.549-2.662zm46.472 0c-3.949 0-6.142 3.473-6.142 7.953 0 4.448 2.167 8.022 6.142 8.022 3.823 0 6.249-3.492 6.249-7.881 0-4.537-2.198-8.094-6.249-8.094zm15.585 0c-1.887 0-2.966.943-3.728 2.911h-.035v-2.201c-.049-.222-.258-.377-.497-.39h-2.521a.525.525 0 00-.533.461v14.378c0 .271.225.515.497.533h2.699a.54.54 0 00.531-.533v-7.739c0-.97.083-1.855.463-2.733.306-.697.899-1.137 1.562-1.137 1.883 0 1.703 2.295 1.703 3.87v7.811a.545.545 0 00.498.462h2.733a.537.537 0 00.532-.462v-9.053c0-1.392.003-3.324-.71-4.474-.764-1.241-1.975-1.704-3.194-1.704zm-32.803.249c-.278 0-.497.22-.498.532v2.059c.001.31.213.531.498.533h4.686l-5.361 7.916c-.326.511-.354 1.089-.354 1.421v2.095c0 .302.328.63.639.461 3.056-1.668 6.717-1.52 9.479-.035.336.183.675-.16.675-.462V70.07a.934.934 0 00-.497-.781c-1.568-.901-3.388-1.178-5.111-1.136l4.65-6.815c.43-.613.67-.981.674-1.279v-1.774c0-.306-.209-.532-.496-.532h-8.984zm17.218 2.698c.865 0 1.504.386 1.811 1.384.354 1.152.391 2.588.391 3.799 0 1.846-.086 4.899-2.201 4.899-2.139 0-2.13-3.78-2.13-5.538-.001-1.753.117-4.544 2.129-4.544zm-60.673 5.254v.604c0 1.092.04 2.01-.497 2.981-.434.79-1.116 1.279-1.881 1.279-1.045 0-1.668-.849-1.668-2.06-.001-2.387 2.074-2.804 4.046-2.804zm35.786 0v.604c0 1.092.04 2.01-.496 2.981-.435.79-1.112 1.279-1.882 1.279-1.047 0-1.669-.849-1.669-2.06 0-2.387 2.073-2.804 4.047-2.804zm17.715 7.952v2.06h1.386v-2.06H99.59zm-40.152.356v14.662h1.278V87.36c.272.521.582.91.958 1.171.376.262.806.391 1.277.391.939 0 1.75-.479 2.45-1.455.701-.977 1.065-2.392 1.065-4.189 0-1.178-.151-2.154-.462-2.981-.311-.826-.725-1.441-1.242-1.847-.519-.406-1.107-.639-1.739-.639-.452 0-.874.118-1.244.354-.368.236-.666.622-.958 1.101v-5.254h-1.383zm13.135 3.443c-.962 0-1.728.285-2.271.852s-.815 1.296-.815 2.202c0 .525.115.972.318 1.384.202.413.49.748.852.994.364.246 1.09.57 2.166.923.745.24 1.19.444 1.385.604.281.233.427.538.427.959 0 .486-.17.892-.498 1.207-.328.317-.786.461-1.385.461-.6 0-1.094-.168-1.455-.532-.362-.364-.557-.918-.64-1.668l-1.384.283c.313 2.278 1.449 3.41 3.408 3.408 1.045 0 1.844-.295 2.449-.923.604-.628.924-1.471.924-2.485 0-.548-.098-1.022-.284-1.419a2.251 2.251 0 00-.782-.924c-.336-.229-1.089-.536-2.236-.923-.834-.292-1.321-.506-1.49-.64-.284-.224-.427-.53-.427-.922 0-.4.133-.739.427-.995.294-.255.747-.39 1.349-.39 1.058 0 1.65.581 1.774 1.739l1.35-.213c-.094-.732-.253-1.312-.496-1.705a2.665 2.665 0 00-1.065-.958c-.465-.232-.992-.319-1.601-.319zm8.486 0c-1.109 0-2.046.457-2.77 1.42-.723.963-1.063 2.358-1.063 4.189 0 1.764.348 3.146 1.063 4.083.718.934 1.646 1.384 2.806 1.384.921 0 1.685-.276 2.307-.852.624-.575 1.077-1.423 1.313-2.557l-1.42-.248c-.407 1.451-1.16 2.163-2.2 2.165-.664 0-1.206-.281-1.669-.887-.464-.607-.726-1.507-.78-2.698h6.105v-.497c0-1.792-.357-3.137-1.065-4.083-.709-.945-1.569-1.419-2.627-1.419zm8.414 0c-.331 0-.621.112-.888.355-.267.242-.567.744-.888 1.49v-1.633h-1.243v10.615h1.385v-5.538c0-.772.074-1.516.249-2.201.1-.394.289-.703.532-.923.244-.221.523-.32.816-.32.326 0 .65.131.994.391l.462-1.668c-.482-.386-.955-.568-1.419-.568zm16.969 0c-1.096 0-1.999.462-2.699 1.385-.696.923-1.063 2.309-1.063 4.153 0 1.831.372 3.218 1.063 4.154.693.934 1.559 1.384 2.628 1.384.884 0 1.642-.328 2.272-.994.63-.665 1.014-1.646 1.172-2.911l-1.35-.213c-.101.905-.336 1.557-.71 1.988-.373.43-.823.639-1.349.639-.67 0-1.241-.313-1.67-.958-.427-.646-.638-1.68-.638-3.124 0-1.4.227-2.41.674-3.053.448-.644 1.021-.994 1.704-.994.457 0 .847.177 1.172.531.327.356.543.918.674 1.634l1.351-.283c-.162-1.119-.521-1.962-1.102-2.521-.58-.56-1.284-.817-2.129-.817zm7.917 0c-1.11 0-2.046.457-2.77 1.42-.723.963-1.065 2.358-1.065 4.189 0 1.764.349 3.146 1.065 4.083.719.934 1.646 1.384 2.805 1.384.918 0 1.685-.276 2.308-.852.622-.575 1.075-1.423 1.314-2.557l-1.42-.248c-.41 1.451-1.128 2.163-2.166 2.165-.664 0-1.241-.281-1.704-.887-.463-.607-.725-1.507-.781-2.698h6.106v-.497c0-1.792-.357-3.137-1.065-4.083-.706-.945-1.568-1.419-2.627-1.419zm8.202 0c-.966 0-1.729.285-2.272.852-.545.566-.817 1.296-.817 2.202 0 .525.082.972.284 1.384.2.413.489.748.853.994.361.246 1.09.57 2.166.923.743.24 1.226.444 1.42.604.281.233.426.538.426.959 0 .486-.168.892-.497 1.207-.326.317-.785.461-1.384.461-.602 0-1.094-.168-1.456-.532-.361-.364-.595-.918-.675-1.668l-1.384.283c.313 2.278 1.446 3.41 3.407 3.408 1.047 0 1.881-.295 2.485-.923s.922-1.471.922-2.485c0-.548-.096-1.022-.282-1.419a2.322 2.322 0 00-.817-.924c-.336-.229-1.054-.536-2.2-.923-.835-.292-1.357-.506-1.527-.64-.283-.224-.426-.53-.426-.922 0-.4.167-.739.462-.995.294-.255.75-.39 1.35-.39 1.058 0 1.649.581 1.774 1.739l1.349-.213c-.094-.732-.252-1.312-.497-1.705a2.662 2.662 0 00-1.064-.958c-.463-.232-.994-.319-1.6-.319zm-31.668.213l3.09 10.615h1.313l3.089-10.615h-1.42l-1.811 6.497c-.219.785-.413 1.464-.533 2.023-.15-.705-.296-1.446-.496-2.166l-1.775-6.354h-1.457zm8.697 0v10.615h1.386V77.668H99.59zm-45.513.143c-1.098 0-1.981.492-2.697 1.455-.717.963-1.102 2.358-1.102 4.189 0 1.765.355 3.113 1.065 4.047.709.935 1.657 1.42 2.806 1.42.911 0 1.655-.312 2.271-.888.616-.575 1.042-1.423 1.279-2.556l-1.385-.213c-.404 1.451-1.136 2.163-2.165 2.165-.659 0-1.21-.281-1.669-.888-.46-.606-.727-1.506-.781-2.697h6.035l.036-.497c0-1.792-.364-3.172-1.065-4.119-.701-.945-1.581-1.418-2.628-1.418zm-15.584.248l2.485 10.615h1.455l1.634-8.165.284 1.81 1.313 6.355h1.42l2.521-10.615h-1.313L46.906 84.2l-.462 2.06-.426-2.06-1.207-6.142h-1.42l-1.278 6.213-.426 2.201-.496-2.272-1.279-6.142h-1.419zm42.53.852c.69 0 1.258.333 1.704.994.306.452.506 1.14.567 2.059h-4.58c.044-.932.307-1.65.747-2.201.44-.55.943-.852 1.562-.852zm33.3 0c.688 0 1.258.333 1.704.994.308.452.506 1.14.569 2.059h-4.581c.044-.932.308-1.65.746-2.201.437-.55.943-.852 1.562-.852zm-60.246.39c.682 0 1.23.334 1.67.995.304.452.505 1.14.567 2.059h-4.51c.043-.932.275-1.687.711-2.236.434-.552.948-.818 1.562-.818zm8.805 0c.615 0 1.14.342 1.563.995.423.652.604 1.659.604 3.053 0 1.357-.2 2.37-.64 3.053-.439.684-.96 1.029-1.526 1.029-.416 0-.794-.14-1.136-.426-.344-.286-.595-.696-.782-1.242-.186-.546-.283-1.387-.283-2.485 0-1.294.231-2.263.674-2.947.443-.684.96-1.03 1.526-1.03zM18.594 68.048l-5.29 2.271 4.899 2.095 5.681-2.095-5.29-2.271zm-7.952 2.839l-.178 10.226 7.74 3.408V73.905l-7.562-3.018zm15.904 0l-6.994 2.663v10.012l6.994-2.84v-9.835zm8.343-31.809l-5.326 2.271 4.935 2.095 5.681-2.095-5.29-2.271zm-7.385 3.018V52.32l6.604 1.917.213-9.302-6.817-2.839zm14.769.567l-6.249 2.663v10.047l6.249-2.84v-9.87zM9.877 53.468l-5.29 2.272 4.899 2.095 5.68-2.095-5.289-2.272zm-7.951 2.841l-.178 10.224 7.739 3.408V59.326l-7.561-3.017zm15.904 0l-6.994 2.662v10.012l6.994-2.84v-9.834zm9.088-3.218l-5.29 2.271 4.899 2.094 5.68-2.094-5.289-2.271zm-7.952 2.839l-.177 10.225 7.739 3.408V58.948l-7.562-3.018zm15.905 0l-6.994 2.663v10.012l6.994-2.841V55.93zm16.662-16.852l-5.289 2.271 4.899 2.095 5.681-2.095-5.291-2.271zm-7.952 2.84l-.178 10.225 7.74 3.407V44.936l-7.562-3.018zm15.904 0l-6.994 2.663v10.011l6.994-2.84v-9.834z"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#f90" d="M108.59 26.148c-1.852 0-3.622.211-5.305.715-1.684.504-3.117 1.223-4.379 2.188a10.829 10.829 0 0 0-3.031 3.453c-.757 1.348-1.137 2.906-1.137 4.676 0 2.187.716 4.25 2.106 6.105 1.386 1.895 3.66 3.324 6.734 4.293l6.106 1.895c2.062.675 3.496 1.391 4.254 2.191.757.801 1.136 1.765 1.136 2.945 0 1.726-.758 3.074-2.191 4-1.43.925-3.492 1.391-6.145 1.391-1.687 0-3.328-.168-5.011-.504a23.102 23.102 0 0 1-4.633-1.476c-.421-.168-.801-.336-1.051-.418a2.357 2.357 0 0 0-.758-.13c-.634 0-.969.423-.969 1.305v2.149a2.919 2.919 0 0 0 .254 1.18c.168.38.629.8 1.305 1.18 1.094.628 2.734 1.179 4.84 1.683 2.105.504 4.297.758 6.484.758 2.15 0 4.129-.297 6.024-.883 1.808-.551 3.367-1.309 4.672-2.36 1.304-1.01 2.316-2.273 3.074-3.707.714-1.429 1.094-3.07 1.094-4.882 0-2.188-.633-4.168-1.938-5.895-1.304-1.727-3.491-3.074-6.523-4.043l-5.98-1.895c-2.23-.713-3.79-1.516-4.634-2.316-.84-.797-1.261-1.808-1.261-2.988 0-1.726.671-2.95 1.98-3.746 1.305-.801 3.199-1.18 5.598-1.18 2.988 0 5.683.547 8.086 1.64.714.337 1.261.508 1.597.508.633 0 .969-.463.969-1.347v-1.98c0-.59-.125-1.051-.379-1.391-.25-.378-.672-.715-1.262-1.051-.422-.254-1.011-.504-1.77-.758a32.528 32.528 0 0 0-2.398-.676c-.886-.168-1.769-.336-2.738-.46a21.347 21.347 0 0 0-2.82-.169zm-86.822.082c-2.316 0-4.508.254-6.57.801-2.063.505-3.831 1.137-5.303 1.895-.59.297-.97.59-1.18.883-.211.296-.293.8-.293 1.476v2.063c0 .882.293 1.304.883 1.304.168 0 .378-.043.674-.125.293-.086.796-.254 1.472-.547a33.416 33.416 0 0 1 4.547-1.433A19.176 19.176 0 0 1 20.547 32c3.242 0 5.513.633 6.863 1.938 1.304 1.303 1.98 3.534 1.98 6.734v3.074c-1.683-.379-3.283-.715-4.843-.926-1.558-.21-3.031-.336-4.461-.336-4.34 0-7.75 1.094-10.316 3.286-2.571 2.187-3.832 5.093-3.832 8.671 0 3.368 1.05 6.063 3.113 8.086 2.066 2.02 4.887 3.032 8.422 3.032 4.97 0 9.097-1.938 12.379-5.813a34.153 34.153 0 0 0 1.304 2.484 13.28 13.28 0 0 0 1.516 1.98c.422.38.844.59 1.266.59.334 0 .714-.128 1.093-.378l2.653-1.77c.546-.42.8-.843.8-1.261a1.86 1.86 0 0 0-.293-.97 22.469 22.469 0 0 1-1.347-3.03c-.297-.925-.465-2.19-.465-3.75h-.086V40c0-4.633-1.176-8.086-3.492-10.36-2.36-2.273-6.025-3.41-11.033-3.41zm19.58 1.012c-.676 0-1.012.379-1.012 1.051 0 .297.129.844.379 1.687l9.894 32.547c.254.8.547 1.387.887 1.641.336.297.84.422 1.598.422h3.62c.759 0 1.347-.125 1.684-.422.34-.293.591-.84.801-1.684l6.485-27.117 6.527 27.16c.168.84.46 1.387.8 1.684.337.292.883.422 1.684.422h3.621c.715 0 1.262-.167 1.598-.422.34-.253.633-.8.887-1.64L90.949 30.02c.168-.46.25-.797.293-1.051.043-.254.086-.466.086-.676 0-.715-.379-1.05-1.055-1.05H86.36c-.757 0-1.308.166-1.644.421-.293.25-.59.8-.84 1.64L76.59 57.517l-6.653-28.211c-.166-.8-.464-1.39-.8-1.64-.336-.298-.884-.423-1.684-.423h-3.367c-.758 0-1.348.167-1.688.422-.335.25-.588.8-.796 1.64l-6.57 27.876-7.075-27.875c-.25-.8-.504-1.39-.84-1.64-.297-.298-.844-.423-1.644-.423h-4.125zM21.64 47.496a31.816 31.816 0 0 1 3.96.25 34.401 34.401 0 0 1 3.872.719v1.765c0 1.435-.168 2.653-.422 3.665-.25 1.01-.758 1.895-1.43 2.695-1.137 1.262-2.484 2.187-4 2.695-1.516.504-2.949.758-4.336.758-1.937 0-3.41-.508-4.422-1.559-1.054-1.01-1.558-2.484-1.558-4.464 0-2.106.675-3.704 2.062-4.84 1.391-1.137 3.454-1.684 6.274-1.684zM118 73.348c-4.432.063-9.664 1.052-13.621 3.832-1.223.883-1.012 2.062.336 1.894 4.508-.547 14.44-1.726 16.21.547 1.77 2.23-1.976 11.62-3.663 15.79-.504 1.26.59 1.769 1.726.8 7.41-6.231 9.348-19.242 7.832-21.137-.757-.925-4.388-1.79-8.82-1.726zM1.63 75.859c-.926.116-1.347 1.236-.368 2.121 16.508 14.902 38.359 23.872 62.613 23.872 17.305 0 37.43-5.43 51.281-15.66 2.273-1.689.298-4.254-2.02-3.204-15.533 6.57-32.421 9.77-47.788 9.77-22.778 0-44.8-6.273-62.653-16.633-.39-.231-.755-.304-1.064-.266z"/>
+</svg>
diff --git a/icons/amazonwebservices/amazonwebservices.eps b/icons/amazonwebservices/amazonwebservices.eps
deleted file mode 100644
index 510fb8d6b..000000000
Binary files a/icons/amazonwebservices/amazonwebservices.eps and /dev/null differ