diff --git a/icons/harvester/harvester-original-wordmark.svg b/icons/harvester/harvester-original-wordmark.svg
index aeb0805683..3175b5894f 100644
--- a/icons/harvester/harvester-original-wordmark.svg
+++ b/icons/harvester/harvester-original-wordmark.svg
@@ -1,15 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 26.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#00A580;}
-	.st1{fill:#344845;}
-</style>
-<g>
-	<g>
-		<polygon class="st0" points="66.6,45.8 70.3,45.8 72,42.9 70.2,39.7 		"/>
-		<path class="st0" d="M89.5,21.2h-51c-3.5,0-6.4,2.8-6.4,6.3v39.9c0,3.5,2.9,6.4,6.4,6.4h51c3.5,0,6.4-2.9,6.4-6.4V27.6
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128px" height="128px">
+	<g fill="#00A580">
+		<polygon points="66.6,45.8 70.3,45.8 72,42.9 70.2,39.7 		" />
+		<path d="M89.5,21.2h-51c-3.5,0-6.4,2.8-6.4,6.3v39.9c0,3.5,2.9,6.4,6.4,6.4h51c3.5,0,6.4-2.9,6.4-6.4V27.6
 			C95.9,24.1,93,21.2,89.5,21.2z M90.6,47c0,0.2,0,0.4,0,0.6c0,0.1,0,0.1,0,0.1c0,0.1-0.1,0.2-0.1,0.3s0,0.2-0.2,0.2L84,59.1
 			l-0.1,0.1c-0.1,0.1-0.1,0.1-0.2,0.2c-0.1,0-0.1,0-0.1,0c0,0.1-0.1,0.2-0.2,0.2c-0.1,0-0.1,0.1-0.2,0.1c0,0.1-0.1,0.1-0.1,0.1
 			c-0.1,0.1-0.3,0.1-0.4,0.1H70.1c-0.1,0-0.3-0.1-0.4-0.1c0-0.1-0.1-0.1-0.1-0.1c-0.1,0-0.1-0.1-0.2-0.1c-0.1-0.1-0.1-0.1-0.2-0.2
@@ -22,29 +14,30 @@
 			s-0.7,1.6-1.6,1.6h-2.1l-4.5,7.7H63l5.7-10.3l0.1-0.1c0.1-0.1,0.1-0.1,0.2-0.2c0.1,0,0.1,0,0.1,0c0-0.1,0.1-0.2,0.2-0.2
 			c0.1,0,0.2-0.1,0.3-0.1c0.1,0,0.1,0,0.1,0c0.1-0.1,0.2-0.1,0.3-0.1s0.1,0,0.2,0h12.4c0.1,0,0.1,0,0.2,0c0.1,0.1,0.2,0.1,0.3,0.1
 			c0.1,0,0.1,0,0.1,0c0.1,0,0.2,0.1,0.3,0.1c0.1,0.1,0.1,0.1,0.2,0.2c0.1,0,0.1,0,0.1,0c0.1,0.1,0.1,0.1,0.2,0.2l0.1,0.1l6.3,10.9
-			c0.1,0.1,0.1,0.1,0.1,0.2C90.6,46.7,90.6,46.8,90.6,47C90.6,47,90.6,47,90.6,47z"/>
-		<polygon class="st0" points="74.8,53.6 72.9,56.8 80,56.8 78.2,53.6 		"/>
-		<polygon class="st0" points="86.2,45.8 82.7,39.7 80.9,42.9 82.6,45.8 		"/>
-		<polygon class="st0" points="66.6,49 70.2,55.2 72,52 70.3,49 		"/>
-		<polygon class="st0" points="80.9,52 82.8,55.2 86.3,49.1 82.6,49.1 		"/>
-		<polygon class="st0" points="78.2,50.4 79.9,47.5 78.2,44.6 74.8,44.6 73.1,47.5 74.8,50.4 		"/>
-		<polygon class="st0" points="74.8,41.3 78.2,41.3 80,38.1 73,38.1 		"/>
+			c0.1,0.1,0.1,0.1,0.1,0.2C90.6,46.7,90.6,46.8,90.6,47C90.6,47,90.6,47,90.6,47z" />
+		<polygon points="74.8,53.6 72.9,56.8 80,56.8 78.2,53.6 		" />
+		<polygon points="86.2,45.8 82.7,39.7 80.9,42.9 82.6,45.8 		" />
+		<polygon points="66.6,49 70.2,55.2 72,52 70.3,49 		" />
+		<polygon points="80.9,52 82.8,55.2 86.3,49.1 82.6,49.1 		" />
+		<polygon points="78.2,50.4 79.9,47.5 78.2,44.6 74.8,44.6 73.1,47.5 74.8,50.4 		" />
+		<polygon points="74.8,41.3 78.2,41.3 80,38.1 73,38.1 		" />
 	</g>
-	<path class="st1" d="M1,90.4h4v6.1h4.9v-6.1h4v16.1h-4v-6.8H5v6.8H1V90.4z"/>
-	<path class="st1" d="M20.8,90.4h4l5.4,16.1h-4l-1-3.1h-5.4l-1,3.1h-3.5L20.8,90.4z M20.8,100.5h3.5l-1.1-3.4
-		c-0.3-0.9-0.4-1.8-0.5-2.8h-0.1c-0.1,0.9-0.3,1.8-0.6,2.7L20.8,100.5z"/>
-	<path class="st1" d="M31.8,90.4h6.6c3.2,0,5.3,1.5,5.3,4.5c0,2-1.3,3.8-3.2,4.4c0.5,0.4,0.9,0.9,1.1,1.5c0.7,1.4,1.1,2.9,2.5,2.9
+	<g fill="#344845">
+		<path d="M1,90.4h4v6.1h4.9v-6.1h4v16.1h-4v-6.8H5v6.8H1V90.4z" />
+		<path d="M20.8,90.4h4l5.4,16.1h-4l-1-3.1h-5.4l-1,3.1h-3.5L20.8,90.4z M20.8,100.5h3.5l-1.1-3.4
+		c-0.3-0.9-0.4-1.8-0.5-2.8h-0.1c-0.1,0.9-0.3,1.8-0.6,2.7L20.8,100.5z" />
+		<path d="M31.8,90.4h6.6c3.2,0,5.3,1.5,5.3,4.5c0,2-1.3,3.8-3.2,4.4c0.5,0.4,0.9,0.9,1.1,1.5c0.7,1.4,1.1,2.9,2.5,2.9
 		c0.2,0,0.4,0,0.6-0.1l-0.3,2.8c-0.5,0.1-1.1,0.2-1.6,0.2c-1.9,0-3-0.7-4.1-3.3c-0.5-1.1-1.1-3.2-2-3.2h-0.9v6.4h-4
-		C31.8,106.5,31.8,90.4,31.8,90.4z M35.8,93.3v4h1.4c1.1,0,2.5-0.4,2.5-2.1c0-1.4-0.9-1.9-2-1.9H35.8z"/>
-	<path class="st1" d="M44.4,90.4h4.1l3,9.1c0.3,1,0.4,1.9,0.5,2.9h0.1c0.1-1,0.3-1.9,0.5-2.9l3-9.1h3.6l-5.5,16.1H50L44.4,90.4z"/>
-	<path class="st1" d="M60.8,90.4h10.7v3h-6.7v3.5h5.6v3h-5.6v3.8h6.9v3H60.8V90.4z"/>
-	<path class="st1" d="M76.5,101.3c-0.3,1.3,0.2,2.8,2.7,2.8c1.7,0,2.2-0.7,2.2-1.6c0-1.3-1.3-1.7-2.9-2.2c-2.4-0.8-5.3-2-5.3-5.3
+		C31.8,106.5,31.8,90.4,31.8,90.4z M35.8,93.3v4h1.4c1.1,0,2.5-0.4,2.5-2.1c0-1.4-0.9-1.9-2-1.9H35.8z" />
+		<path d="M44.4,90.4h4.1l3,9.1c0.3,1,0.4,1.9,0.5,2.9h0.1c0.1-1,0.3-1.9,0.5-2.9l3-9.1h3.6l-5.5,16.1H50L44.4,90.4z" />
+		<path d="M60.8,90.4h10.7v3h-6.7v3.5h5.6v3h-5.6v3.8h6.9v3H60.8V90.4z" />
+		<path d="M76.5,101.3c-0.3,1.3,0.2,2.8,2.7,2.8c1.7,0,2.2-0.7,2.2-1.6c0-1.3-1.3-1.7-2.9-2.2c-2.4-0.8-5.3-2-5.3-5.3
 		c0-3,2.3-4.8,6.3-4.8c4.8,0.1,6.2,2.9,5.7,5.4l-3.7,0.3c0.2-1.9-0.4-2.9-2.3-2.9c-1.3,0-2,0.5-2,1.5c0,1.3,1.3,1.7,2.9,2.3
-		c2.4,0.8,5.3,1.8,5.3,5.1c0,2.9-2.1,5-6.4,5c-3.9,0-6.6-1.8-6.1-5.3L76.5,101.3z"/>
-	<path class="st1" d="M86.4,90.4h12.9v3h-4.5v13.2h-4V93.4h-4.4V90.4z"/>
-	<path class="st1" d="M101,90.4h10.7v3H105v3.5h5.6v3H105v3.8h6.9v3H101V90.4z"/>
-	<path class="st1" d="M114,90.4h6.6c3.2,0,5.3,1.5,5.3,4.5c0,2-1.3,3.8-3.2,4.4c0.5,0.4,0.9,0.9,1.1,1.5c0.7,1.4,1.1,2.9,2.5,2.9
+		c2.4,0.8,5.3,1.8,5.3,5.1c0,2.9-2.1,5-6.4,5c-3.9,0-6.6-1.8-6.1-5.3L76.5,101.3z" />
+		<path d="M86.4,90.4h12.9v3h-4.5v13.2h-4V93.4h-4.4V90.4z" />
+		<path d="M101,90.4h10.7v3H105v3.5h5.6v3H105v3.8h6.9v3H101V90.4z" />
+		<path d="M114,90.4h6.6c3.2,0,5.3,1.5,5.3,4.5c0,2-1.3,3.8-3.2,4.4c0.5,0.4,0.9,0.9,1.1,1.5c0.7,1.4,1.1,2.9,2.5,2.9
 		c0.2,0,0.4,0,0.6-0.1l-0.3,2.8c-0.5,0.1-1.1,0.2-1.6,0.2c-1.9,0-3-0.7-4.1-3.3c-0.5-1.1-1.1-3.2-2-3.2H118v6.4h-4V90.4z M118,93.3
-		v4h1.4c1.1,0,2.5-0.4,2.5-2.1c0-1.4-0.9-1.9-2-1.9H118z"/>
-</g>
+		v4h1.4c1.1,0,2.5-0.4,2.5-2.1c0-1.4-0.9-1.9-2-1.9H118z" />
+	</g>
 </svg>
diff --git a/icons/harvester/harvester-original.svg b/icons/harvester/harvester-original.svg
index 83195d9642..5b037a6b80 100644
--- a/icons/harvester/harvester-original.svg
+++ b/icons/harvester/harvester-original.svg
@@ -1,18 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 26.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#00A580;}
-</style>
-<g>
-	<polygon class="st0" points="76.4,60.9 79.7,55.1 76.1,48.9 69.2,60.9 	"/>
-	<polygon class="st0" points="95.1,64 91.8,58.2 85.1,58.2 81.8,64 85.1,69.8 91.8,69.8 	"/>
-	<polygon class="st0" points="76.4,67.1 69.2,67.1 76.1,79.1 79.7,72.8 	"/>
-	<polygon class="st0" points="85,51.9 91.7,51.9 95.2,45.8 81.6,45.8 	"/>
-	<polygon class="st0" points="100.5,67.1 97.1,72.9 100.7,79.2 107.7,67.1 	"/>
-	<polygon class="st0" points="91.8,76 85.2,76 81.6,82.2 95.4,82.2 	"/>
-	<path class="st0" d="M113.9,12.6H14.1C7.2,12.6,1.6,18.1,1.6,25v78c0,6.9,5.6,12.5,12.5,12.5h99.8c6.9,0,12.5-5.6,12.5-12.5V25.1
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128px" height="128px" fill="#00A580">
+	<polygon points="76.4,60.9 79.7,55.1 76.1,48.9 69.2,60.9 	" />
+	<polygon points="95.1,64 91.8,58.2 85.1,58.2 81.8,64 85.1,69.8 91.8,69.8 	" />
+	<polygon points="76.4,67.1 69.2,67.1 76.1,79.1 79.7,72.8 	" />
+	<polygon points="85,51.9 91.7,51.9 95.2,45.8 81.6,45.8 	" />
+	<polygon points="100.5,67.1 97.1,72.9 100.7,79.2 107.7,67.1 	" />
+	<polygon points="91.8,76 85.2,76 81.6,82.2 95.4,82.2 	" />
+	<path d="M113.9,12.6H14.1C7.2,12.6,1.6,18.1,1.6,25v78c0,6.9,5.6,12.5,12.5,12.5h99.8c6.9,0,12.5-5.6,12.5-12.5V25.1
 		C126.4,18.2,120.8,12.6,113.9,12.6z M115.8,65.6l-12.3,21.3c-0.3,0.5-0.7,0.9-1.2,1.2c0,0,0,0,0,0c-0.1,0-0.2,0.1-0.2,0.1
 		c-0.2,0.1-0.5,0.2-0.7,0.2c-0.2,0-0.4,0.1-0.5,0.1H76.1c-0.3,0-0.5,0-0.7-0.1c-0.1,0-0.1,0-0.2,0c-0.2-0.1-0.4-0.2-0.6-0.3
 		c0,0,0,0,0,0c-0.5-0.3-0.8-0.7-1.1-1.1c0,0,0,0,0,0L62,67.1h-9.1l8.7,15.1h4.1c1.7,0,3.1,1.4,3.1,3.1c0,1.8-1.4,3.2-3.2,3.2h-5.9
@@ -22,7 +15,6 @@
 		s-1.4,3.1-3.1,3.1h-4l-8.7,15.1h9.1l11.4-19.7c0.6-1,1.6-1.6,2.7-1.6h5.9c1.7,0,3.1,1.4,3.1,3.1s-1.4,3.1-3.1,3.1h-4.1l-8.7,15.1
 		h9.1l11.4-19.7c0.6-1,1.6-1.6,2.7-1.6h5.9c1.7,0,3.1,1.4,3.1,3.1s-1.4,3.1-3.1,3.1h-4.1l-8.7,15.1H62l11-19.1
 		c0.2-0.8,0.7-1.6,1.5-2c0.9-0.5,1.9-0.6,2.8-0.2h22.5c0.8-0.3,1.7-0.2,2.5,0.2c0.7,0.4,1.1,1,1.4,1.7l12.1,21c0,0,0,0,0,0.1
-		c0.1,0.1,0.1,0.3,0.2,0.4C116.4,63.9,116.3,64.8,115.8,65.6z"/>
-	<polygon class="st0" points="97.2,55.1 100.5,60.9 107.7,60.9 100.8,48.9 	"/>
-</g>
+		c0.1,0.1,0.1,0.3,0.2,0.4C116.4,63.9,116.3,64.8,115.8,65.6z" />
+	<polygon points="97.2,55.1 100.5,60.9 107.7,60.9 100.8,48.9 	" />
 </svg>
diff --git a/icons/k3os/k3os-original-wordmark.svg b/icons/k3os/k3os-original-wordmark.svg
index bb6054336f..cd401a89ae 100644
--- a/icons/k3os/k3os-original-wordmark.svg
+++ b/icons/k3os/k3os-original-wordmark.svg
@@ -1,24 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 26.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#384745;}
-	.st1{fill:#FD824E;}
-</style>
-<g>
-	<path class="st0" d="M16.4,97.6h7.1v8c0,0.9-0.1,2.2-0.2,3.2h0.2c0.5-0.9,1.1-1.8,1.8-2.7l7-8.5h7.6l-9.3,11.2l9.8,17.4h-8.1
-		l-6.6-12l-2.1,2.6v9.4h-7.1V97.6z"/>
-	<path class="st0" d="M47.2,117.2c-0.8,2.8,0.8,4.5,3.2,4.5c2.7,0,4-2.1,4-5.1c0-3.2-1.6-4.5-3.8-4.5c-1.3,0-2.6,0.5-3.5,1.4
-		l-3.1-3.3l8.9-7.3H42.4v-5.3H60v5.6l-6.8,5.6c4.3-0.4,8.4,2.4,8.4,7.9c0,6-4.9,10-11,10c-5.8,0-10.7-3.6-9.4-8.6L47.2,117.2z"/>
-	<path class="st0" d="M64.5,111.8c0-10.1,4.9-14.2,11.5-14.2c6.6,0,11.3,4,11.3,14.2c0,11.2-4.9,15-11.3,15
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128px" height="128px">
+	<g fill="#384745">
+		<path d="M16.4,97.6h7.1v8c0,0.9-0.1,2.2-0.2,3.2h0.2c0.5-0.9,1.1-1.8,1.8-2.7l7-8.5h7.6l-9.3,11.2l9.8,17.4h-8.1
+		l-6.6-12l-2.1,2.6v9.4h-7.1V97.6z" />
+		<path d="M47.2,117.2c-0.8,2.8,0.8,4.5,3.2,4.5c2.7,0,4-2.1,4-5.1c0-3.2-1.6-4.5-3.8-4.5c-1.3,0-2.6,0.5-3.5,1.4
+		l-3.1-3.3l8.9-7.3H42.4v-5.3H60v5.6l-6.8,5.6c4.3-0.4,8.4,2.4,8.4,7.9c0,6-4.9,10-11,10c-5.8,0-10.7-3.6-9.4-8.6L47.2,117.2z" />
+		<path d="M64.5,111.8c0-10.1,4.9-14.2,11.5-14.2c6.6,0,11.3,4,11.3,14.2c0,11.2-4.9,15-11.3,15
 		C69.4,126.7,64.5,122.7,64.5,111.8z M84.1,111.8c0-9.1-3.7-11.9-8.3-11.9c-4.5,0-8.2,2.8-8.2,11.9c0,9.9,3.7,12.6,8.2,12.6
-		C80.5,124.4,84.1,121.6,84.1,111.8z"/>
-	<path class="st0" d="M95.1,117.6c-0.2,0.5-0.3,1.1-0.3,1.6c0,3,2.5,4.9,7.1,4.9c5,0,6.6-2.4,6.6-4.8c0-2.9-2.2-4.4-6.2-5.7
+		C80.5,124.4,84.1,121.6,84.1,111.8z" />
+		<path d="M95.1,117.6c-0.2,0.5-0.3,1.1-0.3,1.6c0,3,2.5,4.9,7.1,4.9c5,0,6.6-2.4,6.6-4.8c0-2.9-2.2-4.4-6.2-5.7
 		c-3.9-1.3-9.5-2.5-9.5-8.5c0-4.5,3.5-7.5,9.5-7.5c6,0,9.2,2.9,9.2,7.7c0,0.5,0,0.9-0.1,1.4l-3.1,0.3c0.1-0.5,0.1-1.1,0.1-1.6
 		c0-3.9-2.4-5.5-6.2-5.5c-4.5,0-6.2,2.4-6.2,4.9c0,3.7,3.2,4.7,6.8,5.9c4.3,1.4,9,2.9,9,8.3c0,4.2-3.3,7.8-9.9,7.8
-		c-5.5,0-9.8-2.5-9.8-7.2c0-0.5,0.1-1,0.2-1.5L95.1,117.6z"/>
-	<path class="st1" d="M103,1.3H25c-5.8,0-10.5,4.7-10.5,10.5v60.1c0,5.8,4.7,10.5,10.5,10.5H103c5.8,0,10.5-4.7,10.5-10.5V11.8
+		c-5.5,0-9.8-2.5-9.8-7.2c0-0.5,0.1-1,0.2-1.5L95.1,117.6z" />
+	</g>
+	<path fill="#FD824E" d="M103,1.3H25c-5.8,0-10.5,4.7-10.5,10.5v60.1c0,5.8,4.7,10.5,10.5,10.5H103c5.8,0,10.5-4.7,10.5-10.5V11.8
 		C113.5,6,108.8,1.3,103,1.3z M40,72.1c-5.3,0-9.6-4.3-9.6-9.6s4.3-9.6,9.6-9.6c0,0,0,0,0,0c1.6,0,3.2,0.4,4.6,1.2l-7.1,4.1
 		c-2.4,1.4-3.2,4.4-1.8,6.8c1.4,2.4,4.4,3.2,6.8,1.8c0,0,0,0,0,0l7.1-4.1C49.5,67.9,45.3,72.1,40,72.1z M59.1,54.2L41.3,64.6
 		c-1.1,0.7-2.6,0.3-3.3-0.9c-0.7-1.1-0.3-2.6,0.9-3.3L56.7,50c1.1-0.7,2.6-0.3,3.3,0.9C60.7,52,60.3,53.5,59.1,54.2z M59,21l0,8.2
@@ -27,6 +21,5 @@
 		c0-1.3,1.1-2.4,2.4-2.4h0c1.3,0,2.4,1.1,2.4,2.4L66.3,41.7z M67.9,50.9c0.7-1.1,2.1-1.5,3.3-0.9c0,0,0,0,0,0l18,10.4
 		c1.1,0.7,1.5,2.1,0.9,3.3c-0.7,1.1-2.1,1.5-3.3,0.9l0,0l-18-10.4C67.6,53.5,67.2,52,67.9,50.9C67.9,50.9,67.9,50.9,67.9,50.9
 		L67.9,50.9z M88,72.1c-5.2,0-9.5-4.2-9.6-9.4l7.1,4.1c2.4,1.4,5.4,0.6,6.8-1.8c1.4-2.4,0.6-5.4-1.8-6.8l-7.1-4.1
-		c1.4-0.8,3-1.2,4.6-1.2c5.3,0,9.6,4.3,9.6,9.6C97.6,67.8,93.3,72.1,88,72.1C88,72.1,88,72.1,88,72.1L88,72.1z"/>
-</g>
+		c1.4-0.8,3-1.2,4.6-1.2c5.3,0,9.6,4.3,9.6,9.6C97.6,67.8,93.3,72.1,88,72.1C88,72.1,88,72.1,88,72.1L88,72.1z" />
 </svg>
diff --git a/icons/k3os/k3os-original.svg b/icons/k3os/k3os-original.svg
index 20c1117775..be5ba5ca94 100644
--- a/icons/k3os/k3os-original.svg
+++ b/icons/k3os/k3os-original.svg
@@ -1,11 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 26.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FD824E;}
-</style>
-<path class="st0" d="M113.4,12.7H14.6C7.3,12.7,1.4,18.7,1.4,26v76c0,7.3,5.9,13.2,13.3,13.3h98.7c7.3,0,13.2-5.9,13.3-13.3V26
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128px" height="128px" fill="#FD824E">
+	<path d="M113.4,12.7H14.6C7.3,12.7,1.4,18.7,1.4,26v76c0,7.3,5.9,13.2,13.3,13.3h98.7c7.3,0,13.2-5.9,13.3-13.3V26
 	C126.6,18.7,120.7,12.7,113.4,12.7z M33.7,102.3c-6.7,0-12.2-5.4-12.2-12.1C21.5,83.4,27,78,33.7,78c0,0,0,0,0,0c2,0,4,0.5,5.8,1.5
 	l-9,5.2c-3,1.7-4,5.6-2.3,8.6c1.7,3,5.6,4,8.6,2.3c0,0,0,0,0,0l9-5.2C45.7,97,40.3,102.2,33.7,102.3z M57.8,79.6L35.2,92.7
 	c-1.5,0.8-3.3,0.4-4.2-1.1c-0.8-1.5-0.4-3.3,1.1-4.2l22.6-13.1c1.5-0.8,3.3-0.4,4.2,1.1S59.3,78.8,57.8,79.6z M57.7,37.6l0,10.4
@@ -14,5 +8,5 @@
 	c0-1.7,1.4-3,3-3h0c1.7,0,3,1.4,3,3L66.9,63.8z M68.9,75.4c0.8-1.5,2.7-2,4.1-1.1c0,0,0,0,0,0l22.8,13.2c1.5,0.8,2,2.7,1.1,4.1
 	c-0.8,1.5-2.7,2-4.1,1.1c0,0,0,0,0,0L70,79.6C68.5,78.7,68,76.9,68.9,75.4C68.9,75.4,68.9,75.4,68.9,75.4z M94.3,102.3
 	c-6.6,0-12-5.3-12.1-11.9l9,5.2c3,1.7,6.9,0.7,8.6-2.3c1.7-3,0.7-6.9-2.3-8.6l0,0l-9-5.2c1.8-1,3.8-1.5,5.8-1.5
-	c6.7,0,12.2,5.4,12.2,12.1C106.5,96.8,101,102.2,94.3,102.3C94.3,102.3,94.3,102.3,94.3,102.3L94.3,102.3z"/>
+	c6.7,0,12.2,5.4,12.2,12.1C106.5,96.8,101,102.2,94.3,102.3C94.3,102.3,94.3,102.3,94.3,102.3L94.3,102.3z" />
 </svg>
diff --git a/icons/portainer/portainer-original-wordmark.svg b/icons/portainer/portainer-original-wordmark.svg
index fcfed75df8..2ba76b0361 100644
--- a/icons/portainer/portainer-original-wordmark.svg
+++ b/icons/portainer/portainer-original-wordmark.svg
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 26.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#3BBCED;}
-	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#3BBCED;}
-</style>
-<g>
-	<path class="st0" d="M12.07,51.78H11.4v3.45h0.67V51.78z M14.93,51.78h-0.67v3.45h0.67V51.78z M18.83,45.21l-0.68-1.18L6.78,50.6
-		l0.68,1.18L18.83,45.21z"/>
-	<path class="st0" d="M18.77,45.21l0.68-1.18l11.37,6.57l-0.68,1.18L18.77,45.21z"/>
-	<path class="st0" d="M32.83,51.8v-1.36H1.67v1.36H32.83z"/>
-	<path class="st1" d="M20.49,71.07V50.85h1.36v21.2C21.49,71.64,21.03,71.34,20.49,71.07z M18.17,70.72V42.2h1.36v28.69
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128px" height="128px" fill="#3BBCED">
+	<path d="M12.07,51.78H11.4v3.45h0.67V51.78z M14.93,51.78h-0.67v3.45h0.67V51.78z M18.83,45.21l-0.68-1.18L6.78,50.6
+		l0.68,1.18L18.83,45.21z" />
+	<path d="M18.77,45.21l0.68-1.18l11.37,6.57l-0.68,1.18L18.77,45.21z" />
+	<path d="M32.83,51.8v-1.36H1.67v1.36H32.83z" />
+	<path d="M58.84,58.44h-1.76v11.58h1.76v-6.41c0-2.36,1.86-3.63,3.92-3.63v-1.73c-1.6,0-2.98,0.68-3.92,1.76V58.44z
+		 M70.18,60.04v-1.6h-2.61v-4.56H65.8v4.56h-1.73v1.6h1.73v9.99h1.76v-9.99L70.18,60.04z" />
+	<path d="M88.43,56.1c0.67,0,1.23-0.55,1.23-1.27c0-0.63-0.58-1.21-1.23-1.21c-0.72,0-1.26,0.58-1.26,1.21
+		C87.17,55.55,87.72,56.1,88.43,56.1z M87.53,70.02h1.84V58.44h-1.84V70.02z M93.09,70.02h1.76v-6.16c0-2.61,1.45-3.93,3.79-3.88
+		c1.93,0,2.98,1.13,2.98,3.43v6.61h1.76v-6.61c0-3.69-1.41-5.16-4.74-5.16c-1.58,0-2.86,0.58-3.79,1.58v-1.4h-1.76V70.02z" />
+	<path d="M122.4,58.44h-1.76v11.58h1.76v-6.41c0-2.36,1.86-3.63,3.92-3.63v-1.73c-1.61,0-2.98,0.68-3.92,1.76V58.44z" />
+	<path d="M10.97,56.76H7.44v3.54h3.53V56.76z M6.99,56.76H3.47v3.54h3.53V56.76z M6.99,60.71H3.47v3.54h3.53V60.71z
+		 M10.97,60.71H7.44v3.54h3.53V60.71z M14.93,60.71H11.4v3.54h3.53V60.71z M14.93,54.86H11.4v3.54h3.53V54.86z" />
+	<path d="M20.49,71.07V50.85h1.36v21.2C21.49,71.64,21.03,71.34,20.49,71.07z M18.17,70.72V42.2h1.36v28.69
 		C19.15,70.71,18.22,70.72,18.17,70.72z M5.25,73.57c-1.66-1.23-2.76-3.19-2.76-5.42c0-1.18,0.31-2.35,0.9-3.36h11.64
 		c0.6,1.02,0.9,2.18,0.9,3.36c0,1.03-0.13,2-0.55,2.86c-0.88-0.85-2.18-1.21-3.49-1.21c-2.33,0-4.32,1.45-4.84,3.61
 		c-0.18-0.02-0.3-0.03-0.48-0.03C6.11,73.39,5.68,73.45,5.25,73.57L5.25,73.57z M34.59,58.26c3.29,0,6,2.71,6,6.01
@@ -19,24 +19,15 @@
 		 M34.64,68.58c2.34,0,4.11-2.03,4.11-4.33c0-2.35-1.76-4.26-4.11-4.26c-2.29,0-4.32,1.91-4.32,4.26
 		C30.32,66.55,32.35,68.58,34.64,68.58L34.64,68.58z M48.31,70.31c-3.29,0-6-2.81-6-6.06c0-3.29,2.71-6.01,6-6.01
 		c3.29,0,6,2.71,6,6.01C54.31,67.5,51.6,70.31,48.31,70.31z M48.31,59.99c-2.34,0-4.16,1.93-4.16,4.26c0,2.3,1.81,4.33,4.16,4.33
-		s4.16-2.03,4.16-4.33C52.47,61.9,50.66,59.99,48.31,59.99z"/>
-	<path class="st0" d="M58.84,58.44h-1.76v11.58h1.76v-6.41c0-2.36,1.86-3.63,3.92-3.63v-1.73c-1.6,0-2.98,0.68-3.92,1.76V58.44z
-		 M70.18,60.04v-1.6h-2.61v-4.56H65.8v4.56h-1.73v1.6h1.73v9.99h1.76v-9.99L70.18,60.04z"/>
-	<path class="st1" d="M77.62,70.31c-3.29,0-6-2.81-6-6.04c0-3.29,2.71-6.01,6-6.01c1.76,0,3.33,0.81,4.37,2.08v-1.9h1.76v11.63H82
+		s4.16-2.03,4.16-4.33C52.47,61.9,50.66,59.99,48.31,59.99z" />
+	<path d="M77.62,70.31c-3.29,0-6-2.81-6-6.04c0-3.29,2.71-6.01,6-6.01c1.76,0,3.33,0.81,4.37,2.08v-1.9h1.76v11.63H82
 		v-1.9C80.93,69.46,79.39,70.31,77.62,70.31z M77.56,68.58c2.29,0,4.32-2.03,4.32-4.33c0-2.35-2.03-4.26-4.32-4.26
-		c-2.34,0-4.11,1.91-4.11,4.26C73.45,66.55,75.21,68.58,77.56,68.58z"/>
-	<path class="st0" d="M88.43,56.1c0.67,0,1.23-0.55,1.23-1.27c0-0.63-0.58-1.21-1.23-1.21c-0.72,0-1.26,0.58-1.26,1.21
-		C87.17,55.55,87.72,56.1,88.43,56.1z M87.53,70.02h1.84V58.44h-1.84V70.02z M93.09,70.02h1.76v-6.16c0-2.61,1.45-3.93,3.79-3.88
-		c1.93,0,2.98,1.13,2.98,3.43v6.61h1.76v-6.61c0-3.69-1.41-5.16-4.74-5.16c-1.58,0-2.86,0.58-3.79,1.58v-1.4h-1.76V70.02z"/>
-	<path class="st1" d="M117.88,64.25v0.83H107.8c0.37,1.91,2.03,3.49,4.07,3.49c1.35,0,2.48-0.67,3.21-1.61h2.18
+		c-2.34,0-4.11,1.91-4.11,4.26C73.45,66.55,75.21,68.58,77.56,68.58z" />
+	<path d="M117.88,64.25v0.83H107.8c0.37,1.91,2.03,3.49,4.07,3.49c1.35,0,2.48-0.67,3.21-1.61h2.18
 		c-0.96,2-3.04,3.34-5.39,3.34c-3.29,0-6-2.81-6-6.06c0-3.29,2.71-6.01,6-6.01S117.88,60.96,117.88,64.25z M111.88,59.99
-		c-2.05,0-3.69,1.48-4.09,3.39h8.16C115.57,61.47,113.91,59.99,111.88,59.99z"/>
-	<path class="st0" d="M122.4,58.44h-1.76v11.58h1.76v-6.41c0-2.36,1.86-3.63,3.92-3.63v-1.73c-1.61,0-2.98,0.68-3.92,1.76V58.44z"/>
-	<path class="st0" d="M10.97,56.76H7.44v3.54h3.53V56.76z M6.99,56.76H3.47v3.54h3.53V56.76z M6.99,60.71H3.47v3.54h3.53V60.71z
-		 M10.97,60.71H7.44v3.54h3.53V60.71z M14.93,60.71H11.4v3.54h3.53V60.71z M14.93,54.86H11.4v3.54h3.53V54.86z"/>
-	<path class="st1" d="M7.63,74.1c0.48-2.05,2.33-3.58,4.52-3.58c1.41,0,2.68,0.63,3.54,1.63c0.75-0.52,1.65-0.81,2.63-0.81
+		c-2.05,0-3.69,1.48-4.09,3.39h8.16C115.57,61.47,113.91,59.99,111.88,59.99z" />
+	<path d="M7.63,74.1c0.48-2.05,2.33-3.58,4.52-3.58c1.41,0,2.68,0.63,3.54,1.63c0.75-0.52,1.65-0.81,2.63-0.81
 		c2.56,0,4.64,2.08,4.64,4.64c0,0.53-0.08,1.03-0.25,1.51c0.56,0.77,0.91,1.73,0.91,2.76c0,2.56-2.08,4.64-4.64,4.64
 		c-1.13,0-2.16-0.4-2.96-1.07c-0.85,1.18-2.23,1.96-3.79,1.96c-1.8,0-3.36-1.03-4.14-2.53c-0.31,0.07-0.63,0.1-0.96,0.1
-		c-2.56,0-4.66-2.08-4.66-4.64c0-2.56,2.08-4.64,4.66-4.64C7.29,74.07,7.46,74.07,7.63,74.1L7.63,74.1z"/>
-</g>
+		c-2.56,0-4.66-2.08-4.66-4.64c0-2.56,2.08-4.64,4.66-4.64C7.29,74.07,7.46,74.07,7.63,74.1L7.63,74.1z" />
 </svg>
diff --git a/icons/portainer/portainer-original.svg b/icons/portainer/portainer-original.svg
index b816053bcd..af7ef284df 100644
--- a/icons/portainer/portainer-original.svg
+++ b/icons/portainer/portainer-original.svg
@@ -1,25 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 26.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#3BBCED;}
-	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#3BBCED;}
-</style>
-<g>
-	<path class="st0" d="M49.32,29.44h-1.88v9.75h1.88V29.44z M57.41,29.44h-1.88v9.75h1.88V29.44z M68.47,10.84L66.54,7.5L34.36,26.1
-		l1.93,3.34L68.47,10.84z"/>
-	<path class="st0" d="M68.28,10.84l1.93-3.34l32.18,18.6l-1.93,3.34L68.28,10.84z"/>
-	<path class="st0" d="M108.08,29.49v-3.86H19.92v3.86H108.08z"/>
-	<path class="st1" d="M73.17,84.01V26.8h3.86v59.98C76,85.61,74.68,84.76,73.17,84.01z M66.59,83.02V2.32h3.86v81.17
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128px" height="128px" fill="#3BBCED">
+	<path d="M49.32,29.44h-1.88v9.75h1.88V29.44z M57.41,29.44h-1.88v9.75h1.88V29.44z M68.47,10.84L66.54,7.5L34.36,26.1
+		l1.93,3.34L68.47,10.84z" />
+	<path d="M68.28,10.84l1.93-3.34l32.18,18.6l-1.93,3.34L68.28,10.84z" />
+	<path d="M108.08,29.49v-3.86H19.92v3.86H108.08z" />
+	<path d="M73.17,84.01V26.8h3.86v59.98C76,85.61,74.68,84.76,73.17,84.01z M66.59,83.02V2.32h3.86v81.17
 		C69.36,82.97,66.73,83.02,66.59,83.02z M30.04,91.07c-4.7-3.48-7.81-9.04-7.81-15.35c0-3.34,0.89-6.64,2.54-9.51H57.7
 		c1.69,2.87,2.54,6.17,2.54,9.51c0,2.92-0.38,5.65-1.55,8.1c-2.49-2.4-6.16-3.44-9.88-3.44c-6.59,0-12.23,4.1-13.69,10.22
-		c-0.52-0.05-0.85-0.09-1.36-0.09C32.48,90.55,31.26,90.74,30.04,91.07L30.04,91.07z"/>
-	<path class="st0" d="M46.22,43.52h-9.97v10.03h9.97V43.52z M34.97,43.52H25v10.03h9.97V43.52z M34.97,54.68H25v10.03h9.97V54.68z
-		 M46.22,54.68h-9.97v10.03h9.97V54.68z M57.41,54.68h-9.97v10.03h9.97V54.68z M57.41,38.15h-9.97v10.03h9.97V38.15z"/>
-	<path class="st1" d="M36.76,92.58c1.36-5.79,6.59-10.12,12.8-10.12c4,0,7.57,1.79,10.02,4.62c2.12-1.46,4.66-2.31,7.43-2.31
+		c-0.52-0.05-0.85-0.09-1.36-0.09C32.48,90.55,31.26,90.74,30.04,91.07L30.04,91.07z" />
+	<path d="M46.22,43.52h-9.97v10.03h9.97V43.52z M34.97,43.52H25v10.03h9.97V43.52z M34.97,54.68H25v10.03h9.97V54.68z
+		 M46.22,54.68h-9.97v10.03h9.97V54.68z M57.41,54.68h-9.97v10.03h9.97V54.68z M57.41,38.15h-9.97v10.03h9.97V38.15z" />
+	<path d="M36.76,92.58c1.36-5.79,6.59-10.12,12.8-10.12c4,0,7.57,1.79,10.02,4.62c2.12-1.46,4.66-2.31,7.43-2.31
 		c7.24,0,13.12,5.88,13.12,13.14c0,1.51-0.23,2.92-0.7,4.28c1.6,2.17,2.59,4.9,2.59,7.82c0,7.25-5.88,13.14-13.13,13.14
 		c-3.2,0-6.12-1.13-8.37-3.01c-2.4,3.34-6.3,5.56-10.73,5.56c-5.08,0-9.5-2.92-11.71-7.16c-0.89,0.19-1.79,0.28-2.73,0.28
-		c-7.24,0-13.17-5.89-13.17-13.14s5.88-13.14,13.17-13.14C35.82,92.49,36.29,92.49,36.76,92.58L36.76,92.58z"/>
-</g>
+		c-7.24,0-13.17-5.89-13.17-13.14s5.88-13.14,13.17-13.14C35.82,92.49,36.29,92.49,36.76,92.58L36.76,92.58z" />
 </svg>
diff --git a/icons/rancher/rancher-original-wordmark.svg b/icons/rancher/rancher-original-wordmark.svg
index 08b8b6b1ee..fb3176983e 100644
--- a/icons/rancher/rancher-original-wordmark.svg
+++ b/icons/rancher/rancher-original-wordmark.svg
@@ -1,11 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 26.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#2453FF;}
-</style>
-<g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128px" height="128px">
 	<path d="M1.1,75H10c4.2,0,7,2,7,6c0,3.2-2.2,5.2-4.3,5.8c0.6,0.5,1.1,1.3,1.5,2c0.9,1.8,1.5,3.8,3.4,3.8c0.5,0,0.9-0.2,0.9-0.2
 		L18,96.3c0,0-1.1,0.3-2.1,0.3c-2.5,0-4-1-5.5-4.4C9.7,90.7,8.8,88,7.7,88H6.4v8.5H1.1V75z M6.4,78.9v5.3h1.9c1.5,0,3.3-0.5,3.3-2.8
 		c0-1.9-1.2-2.5-2.7-2.5H6.4z M24.2,75h5.4l7.3,21.5h-5.4l-1.3-4.1H23l-1.3,4.1H17L24.2,75z M24.2,88.5h4.6L27.4,84
@@ -16,16 +9,15 @@
 		h6.5v9.1h5.3V75h-5.3v8.1H80V75h-5.3V96.5z M94,96.5h14.6v-4h-9.2v-5h7.5v-4h-7.5V79h8.9v-4H94L94,96.5L94,96.5z M109.6,75h8.9
 		c4.2,0,7,2,7,6c0,3.2-2.2,5.2-4.3,5.8c0.6,0.5,1.1,1.3,1.5,2c0.9,1.8,1.5,3.8,3.4,3.8c0.5,0,0.9-0.2,0.9-0.2l-0.4,3.8
 		c0,0-1.1,0.3-2.1,0.3c-2.5,0-4-1-5.5-4.4c-0.6-1.5-1.5-4.2-2.7-4.2h-1.2v8.5h-5.3L109.6,75L109.6,75z M114.9,78.9v5.3h1.9
-		c1.5,0,3.3-0.5,3.3-2.8c0-1.9-1.2-2.5-2.7-2.5H114.9z"/>
-	<g>
-		<path class="st0" d="M102.6,39.1l-0.8-5c-0.3-1.6-0.9-2.9-1.4-2.9c-0.5,0-0.9,1.3-0.9,3v1.3c0,1.6-1.3,3-3,3h-1.3
-			c-0.1,0-0.2,0-0.3,0V42c0.1,0,0.2,0,0.3,0h4.9C101.7,42,102.8,40.7,102.6,39.1"/>
-		<path class="st0" d="M90.7,34.8h-8c-0.1,0-0.1,0-0.2,0h-8.2c-0.1,0-0.2,0-0.3,0v-0.8c0-1.6-0.4-3-0.9-3s-1.1,1.3-1.4,2.9l-0.8,5
+		c1.5,0,3.3-0.5,3.3-2.8c0-1.9-1.2-2.5-2.7-2.5H114.9z" />
+	<g fill="#2453FF">
+		<path d="M102.6,39.1l-0.8-5c-0.3-1.6-0.9-2.9-1.4-2.9c-0.5,0-0.9,1.3-0.9,3v1.3c0,1.6-1.3,3-3,3h-1.3
+			c-0.1,0-0.2,0-0.3,0V42c0.1,0,0.2,0,0.3,0h4.9C101.7,42,102.8,40.7,102.6,39.1" />
+		<path d="M90.7,34.8h-8c-0.1,0-0.1,0-0.2,0h-8.2c-0.1,0-0.2,0-0.3,0v-0.8c0-1.6-0.4-3-0.9-3s-1.1,1.3-1.4,2.9l-0.8,5
 			c-0.3,1.6,0.9,2.9,2.5,2.9h4.9c0.5,0,1-0.1,1.4-0.2c-0.2,0.9-0.9,1.5-1.8,1.5H71c-1.1,0-2-1-1.8-2.1l0.7-4.2
 			c0.2-1.1-0.7-2.1-1.8-2.1H33.6c-0.7,0-1.4,0.4-1.7,1.1l-6.5,9.9c-0.1,0.2-0.1,0.4,0,0.5l1.3,1.5c0.2,0.2,0.4,0.2,0.6,0.1l4.4-3.5
 			v21.1c0,1,0.8,1.8,1.8,1.8h9.8c1,0,1.8-0.8,1.8-1.8v-7.4c0-1,0.8-1.8,1.8-1.8h24.4c1,0,1.8,0.8,1.8,1.8v7.4c0,1,0.8,1.8,1.8,1.8
 			h9.8c1,0,1.8-0.8,1.8-1.8v-7.9h-5.2c-1.6,0-3-1.3-3-3v-5.1c0-1,0.5-1.8,1.2-2.4v6.1c0,1.6,1.3,3,3,3h8c1.6,0,3-1.3,3-3V37.8
-			C93.7,36.2,92.3,34.8,90.7,34.8"/>
+			C93.7,36.2,92.3,34.8,90.7,34.8" />
 	</g>
-</g>
 </svg>
diff --git a/icons/rancher/rancher-original.svg b/icons/rancher/rancher-original.svg
index 1d3f1797e1..9b700a7518 100644
--- a/icons/rancher/rancher-original.svg
+++ b/icons/rancher/rancher-original.svg
@@ -1,20 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 26.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#2453FF;}
-</style>
-<g>
-	<g>
-		<path class="st0" d="M127,47.4l-1.4-8.2c-0.4-2.6-1.5-4.8-2.3-4.8c-0.8,0-1.5,2.2-1.5,4.9v2.2c0,2.6-2.2,4.9-4.9,4.9h-2.2
-			c-0.2,0-0.3,0-0.4,0v5.9c0.2,0,0.3,0,0.4,0h8.1C125.6,52.1,127.4,50,127,47.4"/>
-		<path class="st0" d="M107.6,40.4H94.6c-0.1,0-0.2,0-0.3,0H80.8c-0.2,0-0.3,0-0.4,0.1v-1.3c0-2.6-0.7-4.9-1.5-4.9
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128px" height="128px" fill="#2453FF">
+	<path d="M127,47.4l-1.4-8.2c-0.4-2.6-1.5-4.8-2.3-4.8c-0.8,0-1.5,2.2-1.5,4.9v2.2c0,2.6-2.2,4.9-4.9,4.9h-2.2
+			c-0.2,0-0.3,0-0.4,0v5.9c0.2,0,0.3,0,0.4,0h8.1C125.6,52.1,127.4,50,127,47.4" />
+	<path d="M107.6,40.4H94.6c-0.1,0-0.2,0-0.3,0H80.8c-0.2,0-0.3,0-0.4,0.1v-1.3c0-2.6-0.7-4.9-1.5-4.9
 			c-0.8,0-1.8,2.2-2.3,4.8l-1.4,8.2c-0.4,2.6,1.4,4.8,4.1,4.8h8.1c0.8,0,1.6-0.1,2.3-0.3c-0.3,1.4-1.4,2.4-2.9,2.4H75.4
 			c-1.8,0-3.2-1.7-2.9-3.5l1.2-6.9c0.3-1.8-1.1-3.5-2.9-3.5H14.3c-1.2,0-2.2,0.7-2.7,1.8L1,58.4c-0.2,0.3-0.2,0.6,0.1,0.9l2,2.4
 			c0.3,0.3,0.7,0.3,1,0.1l7.2-5.7v34.5c0,1.7,1.3,3,3,3h16c1.7,0,3-1.3,3-3v-12c0-1.7,1.3-3,3-3h39.9c1.7,0,3,1.3,3,3v12
 			c0,1.7,1.3,3,3,3h16c1.7,0,3-1.3,3-3V77.7h-8.5c-2.6,0-4.9-2.2-4.9-4.9v-8.3c0-1.6,0.8-3,1.9-3.9v9.9c0,2.6,2.2,4.9,4.9,4.9h13.1
-			c2.6,0,4.9-2.2,4.9-4.9V45.4C112.5,42.6,110.3,40.4,107.6,40.4"/>
-	</g>
-</g>
+			c2.6,0,4.9-2.2,4.9-4.9V45.4C112.5,42.6,110.3,40.4,107.6,40.4" />
 </svg>
diff --git a/icons/rider/rider-original.svg b/icons/rider/rider-original.svg
index 7a061cdd18..009708eea3 100644
--- a/icons/rider/rider-original.svg
+++ b/icons/rider/rider-original.svg
@@ -1,46 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 26.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:url(#SVGID_1_);}
-	.st1{fill:url(#SVGID_00000065758261410781685870000017282780964733994144_);}
-	.st2{fill:url(#SVGID_00000166649020545605824040000017340986231033731215_);}
-	.st3{fill:#010101;}
-	.st4{fill:#FFFFFF;}
-</style>
-<g>
-	
-		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="118.5157" y1="57.0776" x2="22.7055" y2="112.052" gradientTransform="matrix(1 0 0 -1 0 130)">
-		<stop  offset="0" style="stop-color:#DD1866"/>
-		<stop  offset="0.48" style="stop-color:#DD1866"/>
-		<stop  offset="0.94" style="stop-color:#FDB614"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128px" height="128px">
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="118.5157" y1="57.0776" x2="22.7055" y2="112.052" gradientTransform="matrix(1 0 0 -1 0 130)">
+		<stop offset="0" style="stop-color:#DD1866" />
+		<stop offset="0.48" style="stop-color:#DD1866" />
+		<stop offset="0.94" style="stop-color:#FDB614" />
 	</linearGradient>
-	<path class="st0" d="M126.73,50.41L38.78,2.75l58.88,85.43l12.1-7.75L126.73,50.41z"/>
-	
-		<linearGradient id="SVGID_00000083773977737253104360000006885536475073373858_" gradientUnits="userSpaceOnUse" x1="61.9539" y1="116.6731" x2="99.4023" y2="13.2528" gradientTransform="matrix(1 0 0 -1 0 130)">
-		<stop  offset="0.14" style="stop-color:#4376BB"/>
-		<stop  offset="0.48" style="stop-color:#DD1866"/>
-		<stop  offset="0.96" style="stop-color:#4376BB"/>
+	<path fill="url(#SVGID_1_)" d="M126.73,50.41L38.78,2.75l58.88,85.43l12.1-7.75L126.73,50.41z" />
+	<linearGradient id="SVGID_00000083773977737253104360000006885536475073373858_" gradientUnits="userSpaceOnUse" x1="61.9539" y1="116.6731" x2="99.4023" y2="13.2528" gradientTransform="matrix(1 0 0 -1 0 130)">
+		<stop offset="0.14" style="stop-color:#4376BB" />
+		<stop offset="0.48" style="stop-color:#DD1866" />
+		<stop offset="0.96" style="stop-color:#4376BB" />
 	</linearGradient>
 	<path style="fill:url(#SVGID_00000083773977737253104360000006885536475073373858_);" d="M91.64,30.98L80.62,4.68L56.25,28.11
-		l9.97,85.01l23.61,12.13l36.89-21.04L91.64,30.98z"/>
-	
-		<linearGradient id="SVGID_00000016757303823381096490000006271083483031692932_" gradientUnits="userSpaceOnUse" x1="32.9997" y1="113.4681" x2="60.6556" y2="15.1531" gradientTransform="matrix(1 0 0 -1 0 130)">
-		<stop  offset="0.28" style="stop-color:#DD1866"/>
-		<stop  offset="0.97" style="stop-color:#FDB614"/>
+		l9.97,85.01l23.61,12.13l36.89-21.04L91.64,30.98z" />
+	<linearGradient id="SVGID_00000016757303823381096490000006271083483031692932_" gradientUnits="userSpaceOnUse" x1="32.9997" y1="113.4681" x2="60.6556" y2="15.1531" gradientTransform="matrix(1 0 0 -1 0 130)">
+		<stop offset="0.28" style="stop-color:#DD1866" />
+		<stop offset="0.97" style="stop-color:#FDB614" />
 	</linearGradient>
 	<path style="fill:url(#SVGID_00000016757303823381096490000006271083483031692932_);" d="M38.78,2.75L1.27,27.42l13.94,84.13
-		l35.96,13.5l46.48-36.86L38.78,2.75z"/>
-	<path class="st3" d="M24.8,25.87h78.41v76.56H24.8V25.87z"/>
-	<g>
-		<path class="st4" d="M34.57,87.96h29.4v4.78h-29.4V87.96z"/>
-		<path class="st4" d="M34.6,35.34h13.46c3.15-0.19,6.24,0.86,8.59,2.92c1.72,1.77,2.64,4.15,2.54,6.58v0.08
+		l35.96,13.5l46.48-36.86L38.78,2.75z" />
+	<path fill="#010101" d="M24.8,25.87h78.41v76.56H24.8V25.87z" />
+	<g fill="#FFFFFF">
+		<path d="M34.57,87.96h29.4v4.78h-29.4V87.96z" />
+		<path d="M34.6,35.34h13.46c3.15-0.19,6.24,0.86,8.59,2.92c1.72,1.77,2.64,4.15,2.54,6.58v0.08
 			c0.2,4.03-2.39,7.69-6.32,8.93l7.21,10.28h-7.59l-6.31-9.21h-5.03v9.21H34.6V35.34z M47.67,49.38c3.16,0,4.98-1.65,4.98-4.07
-			v-0.08c0-2.72-1.93-4.12-5.1-4.12h-6.42v8.27H47.67z"/>
-		<path class="st4" d="M64.56,35.34h11.5c9.27,0,15.68,6.21,15.68,14.32v0.09c0,8.1-6.4,14.39-15.68,14.39h-11.5L64.56,35.34z
+			v-0.08c0-2.72-1.93-4.12-5.1-4.12h-6.42v8.27H47.67z" />
+		<path d="M64.56,35.34h11.5c9.27,0,15.68,6.21,15.68,14.32v0.09c0,8.1-6.4,14.39-15.68,14.39h-11.5L64.56,35.34z
 			 M71.1,41.06v17.35h5.02c4.63,0.27,8.61-3.18,8.88-7.71c0.02-0.3,0.02-0.59,0-0.89v-0.08c0.24-4.57-3.36-8.46-8.04-8.69
-			c-0.28-0.01-0.56-0.01-0.84,0L71.1,41.06z"/>
+			c-0.28-0.01-0.56-0.01-0.84,0L71.1,41.06z" />
 	</g>
-</g>
 </svg>
diff --git a/icons/rider/rider-plain-wordmark.svg b/icons/rider/rider-plain-wordmark.svg
index 50ece681fc..ce24796464 100644
--- a/icons/rider/rider-plain-wordmark.svg
+++ b/icons/rider/rider-plain-wordmark.svg
@@ -1,20 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 26.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#010101;}
-</style>
-<g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128px" height="128px" fill="#010101">
 	<g>
-		<path class="st0" d="M18.6,46.1c0,0-1.6,0-1.6,0v5.8h1.6c1.5,0.1,2.8-1.1,2.9-2.6c0-0.1,0-0.2,0-0.3v0c0-0.8-0.2-1.5-0.8-2.1
-			S19.4,46,18.6,46.1z"/>
-		<path class="st0" d="M1.8,41v25.7h25.7V41H1.8z M5,44.1h4.4c1-0.1,2,0.3,2.8,1c0.6,0.6,0.9,1.4,0.8,2.2v0c0.1,1.4-0.8,2.6-2.1,3
+		<path d="M18.6,46.1c0,0-1.6,0-1.6,0v5.8h1.6c1.5,0.1,2.8-1.1,2.9-2.6c0-0.1,0-0.2,0-0.3v0c0-0.8-0.2-1.5-0.8-2.1
+			S19.4,46,18.6,46.1z" />
+		<path d="M1.8,41v25.7h25.7V41H1.8z M5,44.1h4.4c1-0.1,2,0.3,2.8,1c0.6,0.6,0.9,1.4,0.8,2.2v0c0.1,1.4-0.8,2.6-2.1,3
 			l2.4,3.5h-2.5l-2.1-3.1H7.1v3.1H5V44.1z M14.6,63.4H5v-1.6h9.6V63.4z M23.7,49c0,2.7-2.1,4.8-5.1,4.8h-3.8v-9.7h3.8
-			C21.6,44.1,23.7,46.2,23.7,49L23.7,49z"/>
-		<path class="st0" d="M10.9,47.5L10.9,47.5c0-0.9-0.6-1.4-1.7-1.4H7.1v2.8h2.2C10.3,48.8,10.9,48.3,10.9,47.5z"/>
+			C21.6,44.1,23.7,46.2,23.7,49L23.7,49z" />
+		<path d="M10.9,47.5L10.9,47.5c0-0.9-0.6-1.4-1.7-1.4H7.1v2.8h2.2C10.3,48.8,10.9,48.3,10.9,47.5z" />
 	</g>
-	<path class="st0" d="M37.2,40.9H49c3.3,0,5.8,0.9,7.5,2.6c1.4,1.4,2.2,3.5,2.2,5.9v0.1c0,4.2-2.2,6.8-5.5,8l6.3,9.2h-6.6l-5.5-8.2
+	<path d="M37.2,40.9H49c3.3,0,5.8,0.9,7.5,2.6c1.4,1.4,2.2,3.5,2.2,5.9v0.1c0,4.2-2.2,6.8-5.5,8l6.3,9.2h-6.6l-5.5-8.2
 		h-4.4v8.2h-5.7C37.2,66.6,37.2,40.9,37.2,40.9z M48.6,53.4c2.8,0,4.3-1.5,4.3-3.6v-0.1c0-2.4-1.7-3.7-4.4-3.7h-5.6v7.4L48.6,53.4
 		L48.6,53.4z M61.3,39.8h5.9v5h-5.9V39.8z M61.4,46.9H67v19.7h-5.6V46.9z M69.5,56.8L69.5,56.8c0-6.6,4.3-10.2,9-10.2
 		c2.4,0,4.7,1,6.1,2.9v-9.7h5.6v26.8h-5.6v-2.8c-1.4,1.8-3.2,3.2-6.1,3.2C73.9,67,69.5,63.4,69.5,56.8z M84.7,56.8L84.7,56.8
@@ -41,6 +34,5 @@
 		c0.5-0.8,1.4-1.4,2.3-1.3c1.7,0,2.6,1.1,2.6,2.8v4.3h-1v-4c0-1.3-0.7-2.1-1.9-2.1c-1.1,0-2,0.9-2.1,2c0,0.1,0,0.1,0,0.2V86h-1V79.2
 		z M110.5,85.2l0.5-0.7c0.7,0.5,1.5,0.8,2.4,0.9c0.8,0,1.4-0.4,1.4-1.1v0c0-0.7-0.8-1-1.7-1.2c-1.1-0.3-2.3-0.7-2.3-1.9v0
 		c0-1.2,1-2,2.3-2c0.9,0,1.7,0.3,2.5,0.8l-0.5,0.8c-0.6-0.4-1.3-0.6-2-0.7c-0.8,0-1.3,0.4-1.3,1v0c0,0.7,0.9,0.9,1.8,1.2
-		c1.1,0.3,2.2,0.7,2.2,2v0c0,1.3-1.1,2.1-2.4,2.1C112.3,86.1,111.3,85.8,110.5,85.2z"/>
-</g>
+		c1.1,0.3,2.2,0.7,2.2,2v0c0,1.3-1.1,2.1-2.4,2.1C112.3,86.1,111.3,85.8,110.5,85.2z" />
 </svg>
diff --git a/icons/rider/rider-plain.svg b/icons/rider/rider-plain.svg
index caf6c3c6c4..a12463eafd 100644
--- a/icons/rider/rider-plain.svg
+++ b/icons/rider/rider-plain.svg
@@ -1,18 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 26.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#010101;}
-</style>
-<g>
-	<g>
-		<path class="st0" d="M82.2,28.2h-7.4V55h7.4c6.9,0.5,12.9-5.1,13.4-12c0-0.5,0-0.9,0-1.4l0,0c0-3.7-0.9-6.9-3.7-9.7
-			C89.2,29.1,85.9,27.7,82.2,28.2z"/>
-		<path class="st0" d="M4.6,4.6v118.7h118.7V4.6H4.6z M19.4,19h20.3c4.6-0.5,9.2,1.4,12.9,4.6c2.8,2.8,4.2,6.5,3.7,10.2l0,0
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128px" height="128px" fill="#010101">
+	<path d="M82.2,28.2h-7.4V55h7.4c6.9,0.5,12.9-5.1,13.4-12c0-0.5,0-0.9,0-1.4l0,0c0-3.7-0.9-6.9-3.7-9.7
+			C89.2,29.1,85.9,27.7,82.2,28.2z" />
+	<path d="M4.6,4.6v118.7h118.7V4.6H4.6z M19.4,19h20.3c4.6-0.5,9.2,1.4,12.9,4.6c2.8,2.8,4.2,6.5,3.7,10.2l0,0
 			c0.5,6.5-3.7,12-9.7,13.9l11.1,16.2H46.2l-9.7-14.3h-7.4v14.3h-9.7V19z M63.8,108.1H19.4v-7.4h44.4V108.1z M105.8,41.6
-			c0,12.5-9.7,22.2-23.6,22.2H64.7V19h17.6C96.1,19,105.8,28.7,105.8,41.6L105.8,41.6z"/>
-		<path class="st0" d="M46.7,34.7L46.7,34.7c0-4.2-2.8-6.5-7.9-6.5h-9.7v12.9h10.2C43.9,40.7,46.7,38.4,46.7,34.7z"/>
-	</g>
-</g>
+			c0,12.5-9.7,22.2-23.6,22.2H64.7V19h17.6C96.1,19,105.8,28.7,105.8,41.6L105.8,41.6z" />
+	<path d="M46.7,34.7L46.7,34.7c0-4.2-2.8-6.5-7.9-6.5h-9.7v12.9h10.2C43.9,40.7,46.7,38.4,46.7,34.7z" />
 </svg>
diff --git a/icons/vsphere/vsphere-original-wordmark.svg b/icons/vsphere/vsphere-original-wordmark.svg
index 190352f93f..81e39dc047 100644
--- a/icons/vsphere/vsphere-original-wordmark.svg
+++ b/icons/vsphere/vsphere-original-wordmark.svg
@@ -1,72 +1,61 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 26.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#00C1D5;}
-	.st1{fill:#78BD20;}
-	.st2{fill:#0091DA;}
-	.st3{fill:#717074;}
-</style>
-<g>
-	<path class="st0" d="M65.8,1.2H47.7c0,0-7.1,0.4-8.1,8.1v38.9c0,0,0.5,7.8,8.6,8.6H64l2.4-2.4H48.5c0,0-5.7-0.7-6.4-6.4V9.8
-		c0,0-0.2-5.8,6.3-6.3h15.3L65.8,1.2z"/>
-	<path class="st1" d="M69.1,56.9h18.1c0,0,7.1-0.4,8.1-8.1V9.8c0,0-0.5-7.8-8.6-8.6H70.9l-2.4,2.4h17.9c0,0,5.7,0.7,6.4,6.4v38.2
-		c0,0,0.2,5.8-6.3,6.3H71.3L69.1,56.9z"/>
-	<g>
-		<path class="st2" d="M83.8,49.8C83.7,49.8,83.7,49.8,83.8,49.8l-23.7,0c-3,0-4.1-2.7-4.2-4.1l0-0.1V21.3c0-3.4,2.9-4.4,4.4-4.4
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128px" height="128px">
+	<path fill="#00C1D5" d="M65.8,1.2H47.7c0,0-7.1,0.4-8.1,8.1v38.9c0,0,0.5,7.8,8.6,8.6H64l2.4-2.4H48.5c0,0-5.7-0.7-6.4-6.4V9.8
+		c0,0-0.2-5.8,6.3-6.3h15.3L65.8,1.2z" />
+	<path fill="#78BD20" d="M69.1,56.9h18.1c0,0,7.1-0.4,8.1-8.1V9.8c0,0-0.5-7.8-8.6-8.6H70.9l-2.4,2.4h17.9c0,0,5.7,0.7,6.4,6.4v38.2
+		c0,0,0.2,5.8-6.3,6.3H71.3L69.1,56.9z" />
+	<g fill="#0091DA">
+		<path d="M83.8,49.8C83.7,49.8,83.7,49.8,83.8,49.8l-23.7,0c-3,0-4.1-2.7-4.2-4.1l0-0.1V21.3c0-3.4,2.9-4.4,4.4-4.4
 			l0,0L84.1,17c3,0,4.1,2.8,4.3,4.2l0,0.1v23.9c0,1.4-0.4,2.5-1.3,3.3C85.8,49.8,84.1,49.8,83.8,49.8z M57.9,45.5
 			c0.1,0.4,0.4,2.3,2.2,2.3h23.7c0,0,1.2,0,2-0.7c0.4-0.4,0.7-1.1,0.7-1.9V21.4C86.3,21,85.9,19,84.1,19l-23.7-0.1
-			c-0.5,0-2.5,0.3-2.5,2.4V45.5z"/>
+			c-0.5,0-2.5,0.3-2.5,2.4V45.5z" />
+		<path d="M53.6,38.7h-3.2c-1.7,0-2.1-1.8-2.1-2.2V12.2c0-2.1,2-2.4,2.4-2.4L74.4,10h0c1.8,0,2.2,1.9,2.2,2.3v2.5h2.2
+			v-2.5l0-0.1c-0.2-1.5-1.3-4.3-4.4-4.3L50.6,7.7c-1.6,0.1-4.5,1.1-4.5,4.5v24.3l0,0.1c0.2,1.4,1.2,4.2,4.3,4.2l3.2,0V38.7z" />
 	</g>
-	<path class="st2" d="M53.6,38.7h-3.2c-1.7,0-2.1-1.8-2.1-2.2V12.2c0-2.1,2-2.4,2.4-2.4L74.4,10h0c1.8,0,2.2,1.9,2.2,2.3v2.5h2.2
-		v-2.5l0-0.1c-0.2-1.5-1.3-4.3-4.4-4.3L50.6,7.7c-1.6,0.1-4.5,1.1-4.5,4.5v24.3l0,0.1c0.2,1.4,1.2,4.2,4.3,4.2l3.2,0V38.7z"/>
-	<g>
-		<path class="st3" d="M31.4,69.4L23,88.2h-2.3l-8.3-18.8h2.3l7.2,16.2L29,69.4H31.4z"/>
-		<path class="st3" d="M34.4,69.4h2.1l7,13.1l7-13.1h2.1v18.8h-2.1V74l-7,13.1l-7-13.1v14.2h-2.1V69.4z"/>
-		<path class="st3" d="M55.4,74.1h2.2l3.5,11.4L65,74.1h1.8l3.9,11.4l3.5-11.4h2.2l-4.8,14.2h-1.9l-3.8-11.3l-3.8,11.3h-1.9
-			L55.4,74.1z"/>
-		<path class="st3" d="M87.9,75.3c1,1.1,1.5,2.5,1.5,4.3v8.6h-2.1V86c-0.5,0.8-1.2,1.4-2.1,1.9s-1.9,0.7-2.9,0.7
-			c-1.5,0-2.8-0.4-3.7-1.2c-1-0.8-1.5-1.9-1.5-3.3c0-0.9,0.3-1.7,0.8-2.5c0.5-0.7,1.2-1.3,2-1.7c0.8-0.4,1.8-0.6,2.8-0.6
-			c1.4,0,3,0.3,4.6,0.8v-0.5c0-1.2-0.3-2.1-0.9-2.9s-1.6-1.2-3-1.2c-0.6,0-1.3,0.1-2,0.3c-0.7,0.2-1.4,0.5-2.2,0.9l-0.8-1.7
-			c1.8-0.9,3.5-1.4,5.1-1.4C85.5,73.7,86.9,74.3,87.9,75.3z M85.6,86c0.9-0.5,1.5-1.2,1.7-2.2v-2.2c-1.4-0.4-2.8-0.6-4.3-0.6
-			c-1.1,0-2,0.3-2.8,0.8c-0.8,0.5-1.1,1.2-1.1,2.1c0,0.9,0.3,1.5,1,2c0.7,0.5,1.5,0.8,2.5,0.8S84.7,86.5,85.6,86z"/>
-		<path class="st3" d="M97.3,74.6c1-0.6,2.1-0.8,3.4-0.8v1.8c-1.1,0-2,0.2-2.8,0.6c-0.8,0.4-1.5,1-1.9,1.7c-0.5,0.7-0.7,1.5-0.7,2.5
-			v7.9h-2.1V74.1h2.1v2.8C95.6,75.9,96.3,75.1,97.3,74.6z"/>
-		<path class="st3" d="M111.9,86.2c0.8-0.3,1.5-0.7,1.9-1.2l1.3,1.3c-0.6,0.7-1.4,1.2-2.5,1.6c-1.1,0.4-2.1,0.6-3.2,0.6
-			c-1.3,0-2.4-0.3-3.5-1s-2-1.5-2.6-2.7c-0.7-1.1-1-2.4-1-3.8c0-1.4,0.3-2.6,0.9-3.8c0.6-1.1,1.5-2,2.5-2.7c1.1-0.6,2.2-1,3.5-1
-			c2.1,0,3.8,0.7,4.9,2.2c1.2,1.5,1.8,3.5,1.8,6h-11.6c0.1,1.4,0.7,2.6,1.6,3.5s2.1,1.3,3.4,1.3C110.2,86.7,111,86.6,111.9,86.2z
-			 M105.9,76.8c-0.9,0.8-1.5,1.9-1.6,3.3h9.5c-0.1-1.4-0.6-2.4-1.4-3.3c-0.8-0.8-1.9-1.2-3.2-1.2C108,75.6,106.9,76,105.9,76.8z"/>
+	<g fill="#717074">
+		<g>
+			<path d="M31.4,69.4L23,88.2h-2.3l-8.3-18.8h2.3l7.2,16.2L29,69.4H31.4z" />
+			<path d="M34.4,69.4h2.1l7,13.1l7-13.1h2.1v18.8h-2.1V74l-7,13.1l-7-13.1v14.2h-2.1V69.4z" />
+			<path d="M55.4,74.1h2.2l3.5,11.4L65,74.1h1.8l3.9,11.4l3.5-11.4h2.2l-4.8,14.2h-1.9l-3.8-11.3l-3.8,11.3h-1.9
+				L55.4,74.1z" />
+			<path d="M87.9,75.3c1,1.1,1.5,2.5,1.5,4.3v8.6h-2.1V86c-0.5,0.8-1.2,1.4-2.1,1.9s-1.9,0.7-2.9,0.7
+				c-1.5,0-2.8-0.4-3.7-1.2c-1-0.8-1.5-1.9-1.5-3.3c0-0.9,0.3-1.7,0.8-2.5c0.5-0.7,1.2-1.3,2-1.7c0.8-0.4,1.8-0.6,2.8-0.6
+				c1.4,0,3,0.3,4.6,0.8v-0.5c0-1.2-0.3-2.1-0.9-2.9s-1.6-1.2-3-1.2c-0.6,0-1.3,0.1-2,0.3c-0.7,0.2-1.4,0.5-2.2,0.9l-0.8-1.7
+				c1.8-0.9,3.5-1.4,5.1-1.4C85.5,73.7,86.9,74.3,87.9,75.3z M85.6,86c0.9-0.5,1.5-1.2,1.7-2.2v-2.2c-1.4-0.4-2.8-0.6-4.3-0.6
+				c-1.1,0-2,0.3-2.8,0.8c-0.8,0.5-1.1,1.2-1.1,2.1c0,0.9,0.3,1.5,1,2c0.7,0.5,1.5,0.8,2.5,0.8S84.7,86.5,85.6,86z" />
+			<path d="M97.3,74.6c1-0.6,2.1-0.8,3.4-0.8v1.8c-1.1,0-2,0.2-2.8,0.6c-0.8,0.4-1.5,1-1.9,1.7c-0.5,0.7-0.7,1.5-0.7,2.5
+				v7.9h-2.1V74.1h2.1v2.8C95.6,75.9,96.3,75.1,97.3,74.6z" />
+			<path d="M111.9,86.2c0.8-0.3,1.5-0.7,1.9-1.2l1.3,1.3c-0.6,0.7-1.4,1.2-2.5,1.6c-1.1,0.4-2.1,0.6-3.2,0.6
+				c-1.3,0-2.4-0.3-3.5-1s-2-1.5-2.6-2.7c-0.7-1.1-1-2.4-1-3.8c0-1.4,0.3-2.6,0.9-3.8c0.6-1.1,1.5-2,2.5-2.7c1.1-0.6,2.2-1,3.5-1
+				c2.1,0,3.8,0.7,4.9,2.2c1.2,1.5,1.8,3.5,1.8,6h-11.6c0.1,1.4,0.7,2.6,1.6,3.5s2.1,1.3,3.4,1.3C110.2,86.7,111,86.6,111.9,86.2z
+				 M105.9,76.8c-0.9,0.8-1.5,1.9-1.6,3.3h9.5c-0.1-1.4-0.6-2.4-1.4-3.3c-0.8-0.8-1.9-1.2-3.2-1.2C108,75.6,106.9,76,105.9,76.8z" />
+		</g>
+		<g>
+			<path d="M12.6,105.1h2.3l4.7,11.8l4.6-11.8h2.3l-5.9,14.2h-2L12.6,105.1z" />
+			<path d="M27.4,116.5l1.3-1.7c0.9,0.9,1.8,1.5,2.8,2c1,0.5,2.1,0.7,3.4,0.7c0.9,0,1.7-0.2,2.4-0.5
+				c0.7-0.3,1.2-0.7,1.5-1.2c0.3-0.5,0.5-1,0.5-1.6c0-1-0.4-1.7-1.2-2.2c-0.8-0.5-2.1-1-3.9-1.4c-1.4-0.3-2.5-0.7-3.4-1.1
+				c-0.9-0.4-1.6-0.9-2.1-1.6c-0.5-0.7-0.7-1.5-0.7-2.6c0-1,0.3-1.9,0.8-2.7c0.5-0.8,1.3-1.5,2.3-1.9c1-0.5,2-0.7,3.2-0.7
+				c1.3,0,2.5,0.2,3.6,0.7c1.1,0.5,2.1,1.1,3,2l-1.3,1.7c-0.8-0.8-1.7-1.4-2.6-1.8c-0.9-0.4-1.9-0.6-2.8-0.6c-0.8,0-1.4,0.1-2.1,0.4
+				c-0.6,0.3-1.1,0.7-1.5,1.2c-0.3,0.5-0.5,1-0.5,1.6c0,0.9,0.4,1.6,1.2,2c0.8,0.5,2.1,0.9,3.9,1.4c2,0.5,3.5,1.1,4.6,1.9
+				c1.1,0.8,1.6,2,1.6,3.5c0,1-0.3,1.9-0.8,2.8c-0.5,0.8-1.3,1.5-2.3,1.9c-1,0.5-2.2,0.7-3.6,0.7C31.9,119.5,29.4,118.5,27.4,116.5z" />
+			<path d="M55.2,105.7c1,0.6,1.8,1.5,2.3,2.6c0.6,1.1,0.8,2.4,0.8,3.8c0,1.4-0.3,2.7-0.8,3.8c-0.6,1.1-1.3,2-2.3,2.6
+				c-1,0.6-2.1,0.9-3.3,0.9c-1.1,0-2.1-0.3-3-0.8c-0.9-0.5-1.6-1.3-2.2-2.2v7.4h-2.1v-18.9h2.1v2.7c0.5-1,1.3-1.7,2.2-2.2
+				c0.9-0.5,1.9-0.8,3-0.8C53.1,104.7,54.2,105,55.2,105.7z M53.9,117c0.7-0.5,1.3-1.1,1.7-2c0.4-0.8,0.6-1.8,0.6-2.9
+				c0-1.1-0.2-2-0.6-2.9c-0.4-0.8-1-1.5-1.7-2c-0.7-0.5-1.5-0.7-2.5-0.7s-1.7,0.2-2.5,0.7c-0.7,0.5-1.3,1.1-1.7,2
+				c-0.4,0.8-0.6,1.8-0.6,2.9c0,1.1,0.2,2,0.6,2.9c0.4,0.8,1,1.5,1.7,2c0.7,0.5,1.6,0.7,2.5,0.7S53.2,117.5,53.9,117z" />
+			<path d="M70.9,105.4c0.8,0.5,1.4,1.1,1.9,1.9s0.7,1.8,0.7,2.9v9h-2.1v-8.7c0-1.2-0.3-2.1-1-2.8
+				c-0.7-0.7-1.5-1.1-2.5-1.1c-0.8,0-1.5,0.2-2.2,0.5c-0.7,0.3-1.2,0.8-1.6,1.3c-0.4,0.6-0.6,1.2-0.6,1.8v9h-2.1v-19.2h2.1v7.2
+				c0.4-0.8,1.1-1.4,1.9-1.9c0.8-0.5,1.8-0.7,2.8-0.7C69.2,104.7,70.1,105,70.9,105.4z" />
+			<path d="M85.7,117.2c0.8-0.3,1.5-0.7,1.9-1.2l1.3,1.3c-0.6,0.7-1.4,1.2-2.5,1.6c-1.1,0.4-2.1,0.6-3.2,0.6
+				c-1.3,0-2.4-0.3-3.5-1s-2-1.5-2.6-2.7c-0.7-1.1-1-2.4-1-3.8c0-1.4,0.3-2.6,0.9-3.8c0.6-1.1,1.5-2,2.5-2.7c1.1-0.6,2.2-1,3.5-1
+				c2.1,0,3.8,0.7,4.9,2.2c1.2,1.5,1.8,3.5,1.8,6H78.2c0.1,1.4,0.7,2.6,1.6,3.5s2.1,1.3,3.4,1.3C84,117.7,84.9,117.6,85.7,117.2z
+				 M79.8,107.8c-0.9,0.8-1.5,1.9-1.6,3.3h9.5c-0.1-1.4-0.6-2.4-1.4-3.3c-0.8-0.8-1.9-1.2-3.2-1.2C81.8,106.6,80.7,107,79.8,107.8z" />
+			<path d="M96.7,105.6c1-0.6,2.1-0.8,3.4-0.8v1.8c-1.1,0-2,0.2-2.8,0.6c-0.8,0.4-1.5,1-1.9,1.7
+				c-0.5,0.7-0.7,1.5-0.7,2.5v7.9h-2.1v-14.2h2.1v2.8C95,106.9,95.7,106.1,96.7,105.6z" />
+			<path d="M111.3,117.2c0.8-0.3,1.5-0.7,1.9-1.2l1.3,1.3c-0.6,0.7-1.4,1.2-2.5,1.6c-1.1,0.4-2.1,0.6-3.2,0.6
+				c-1.3,0-2.4-0.3-3.5-1s-2-1.5-2.6-2.7c-0.7-1.1-1-2.4-1-3.8c0-1.4,0.3-2.6,0.9-3.8c0.6-1.1,1.5-2,2.5-2.7c1.1-0.6,2.2-1,3.5-1
+				c2.1,0,3.8,0.7,4.9,2.2c1.2,1.5,1.8,3.5,1.8,6h-11.6c0.1,1.4,0.7,2.6,1.6,3.5s2.1,1.3,3.4,1.3
+				C109.6,117.7,110.4,117.6,111.3,117.2z M105.4,107.8c-0.9,0.8-1.5,1.9-1.6,3.3h9.5c-0.1-1.4-0.6-2.4-1.4-3.3
+				c-0.8-0.8-1.9-1.2-3.2-1.2C107.4,106.6,106.3,107,105.4,107.8z" />
+		</g>
 	</g>
-	<g>
-		<path class="st3" d="M12.6,105.1h2.3l4.7,11.8l4.6-11.8h2.3l-5.9,14.2h-2L12.6,105.1z"/>
-		<path class="st3" d="M27.4,116.5l1.3-1.7c0.9,0.9,1.8,1.5,2.8,2c1,0.5,2.1,0.7,3.4,0.7c0.9,0,1.7-0.2,2.4-0.5
-			c0.7-0.3,1.2-0.7,1.5-1.2c0.3-0.5,0.5-1,0.5-1.6c0-1-0.4-1.7-1.2-2.2c-0.8-0.5-2.1-1-3.9-1.4c-1.4-0.3-2.5-0.7-3.4-1.1
-			c-0.9-0.4-1.6-0.9-2.1-1.6c-0.5-0.7-0.7-1.5-0.7-2.6c0-1,0.3-1.9,0.8-2.7c0.5-0.8,1.3-1.5,2.3-1.9c1-0.5,2-0.7,3.2-0.7
-			c1.3,0,2.5,0.2,3.6,0.7c1.1,0.5,2.1,1.1,3,2l-1.3,1.7c-0.8-0.8-1.7-1.4-2.6-1.8c-0.9-0.4-1.9-0.6-2.8-0.6c-0.8,0-1.4,0.1-2.1,0.4
-			c-0.6,0.3-1.1,0.7-1.5,1.2c-0.3,0.5-0.5,1-0.5,1.6c0,0.9,0.4,1.6,1.2,2c0.8,0.5,2.1,0.9,3.9,1.4c2,0.5,3.5,1.1,4.6,1.9
-			c1.1,0.8,1.6,2,1.6,3.5c0,1-0.3,1.9-0.8,2.8c-0.5,0.8-1.3,1.5-2.3,1.9c-1,0.5-2.2,0.7-3.6,0.7C31.9,119.5,29.4,118.5,27.4,116.5z"
-			/>
-		<path class="st3" d="M55.2,105.7c1,0.6,1.8,1.5,2.3,2.6c0.6,1.1,0.8,2.4,0.8,3.8c0,1.4-0.3,2.7-0.8,3.8c-0.6,1.1-1.3,2-2.3,2.6
-			c-1,0.6-2.1,0.9-3.3,0.9c-1.1,0-2.1-0.3-3-0.8c-0.9-0.5-1.6-1.3-2.2-2.2v7.4h-2.1v-18.9h2.1v2.7c0.5-1,1.3-1.7,2.2-2.2
-			c0.9-0.5,1.9-0.8,3-0.8C53.1,104.7,54.2,105,55.2,105.7z M53.9,117c0.7-0.5,1.3-1.1,1.7-2c0.4-0.8,0.6-1.8,0.6-2.9
-			c0-1.1-0.2-2-0.6-2.9c-0.4-0.8-1-1.5-1.7-2c-0.7-0.5-1.5-0.7-2.5-0.7s-1.7,0.2-2.5,0.7c-0.7,0.5-1.3,1.1-1.7,2
-			c-0.4,0.8-0.6,1.8-0.6,2.9c0,1.1,0.2,2,0.6,2.9c0.4,0.8,1,1.5,1.7,2c0.7,0.5,1.6,0.7,2.5,0.7S53.2,117.5,53.9,117z"/>
-		<path class="st3" d="M70.9,105.4c0.8,0.5,1.4,1.1,1.9,1.9s0.7,1.8,0.7,2.9v9h-2.1v-8.7c0-1.2-0.3-2.1-1-2.8
-			c-0.7-0.7-1.5-1.1-2.5-1.1c-0.8,0-1.5,0.2-2.2,0.5c-0.7,0.3-1.2,0.8-1.6,1.3c-0.4,0.6-0.6,1.2-0.6,1.8v9h-2.1v-19.2h2.1v7.2
-			c0.4-0.8,1.1-1.4,1.9-1.9c0.8-0.5,1.8-0.7,2.8-0.7C69.2,104.7,70.1,105,70.9,105.4z"/>
-		<path class="st3" d="M85.7,117.2c0.8-0.3,1.5-0.7,1.9-1.2l1.3,1.3c-0.6,0.7-1.4,1.2-2.5,1.6c-1.1,0.4-2.1,0.6-3.2,0.6
-			c-1.3,0-2.4-0.3-3.5-1s-2-1.5-2.6-2.7c-0.7-1.1-1-2.4-1-3.8c0-1.4,0.3-2.6,0.9-3.8c0.6-1.1,1.5-2,2.5-2.7c1.1-0.6,2.2-1,3.5-1
-			c2.1,0,3.8,0.7,4.9,2.2c1.2,1.5,1.8,3.5,1.8,6H78.2c0.1,1.4,0.7,2.6,1.6,3.5s2.1,1.3,3.4,1.3C84,117.7,84.9,117.6,85.7,117.2z
-			 M79.8,107.8c-0.9,0.8-1.5,1.9-1.6,3.3h9.5c-0.1-1.4-0.6-2.4-1.4-3.3c-0.8-0.8-1.9-1.2-3.2-1.2C81.8,106.6,80.7,107,79.8,107.8z"
-			/>
-		<path class="st3" d="M96.7,105.6c1-0.6,2.1-0.8,3.4-0.8v1.8c-1.1,0-2,0.2-2.8,0.6c-0.8,0.4-1.5,1-1.9,1.7
-			c-0.5,0.7-0.7,1.5-0.7,2.5v7.9h-2.1v-14.2h2.1v2.8C95,106.9,95.7,106.1,96.7,105.6z"/>
-		<path class="st3" d="M111.3,117.2c0.8-0.3,1.5-0.7,1.9-1.2l1.3,1.3c-0.6,0.7-1.4,1.2-2.5,1.6c-1.1,0.4-2.1,0.6-3.2,0.6
-			c-1.3,0-2.4-0.3-3.5-1s-2-1.5-2.6-2.7c-0.7-1.1-1-2.4-1-3.8c0-1.4,0.3-2.6,0.9-3.8c0.6-1.1,1.5-2,2.5-2.7c1.1-0.6,2.2-1,3.5-1
-			c2.1,0,3.8,0.7,4.9,2.2c1.2,1.5,1.8,3.5,1.8,6h-11.6c0.1,1.4,0.7,2.6,1.6,3.5s2.1,1.3,3.4,1.3
-			C109.6,117.7,110.4,117.6,111.3,117.2z M105.4,107.8c-0.9,0.8-1.5,1.9-1.6,3.3h9.5c-0.1-1.4-0.6-2.4-1.4-3.3
-			c-0.8-0.8-1.9-1.2-3.2-1.2C107.4,106.6,106.3,107,105.4,107.8z"/>
-	</g>
-</g>
 </svg>
diff --git a/icons/vsphere/vsphere-original.svg b/icons/vsphere/vsphere-original.svg
index a9d711f726..e50dd3ca83 100644
--- a/icons/vsphere/vsphere-original.svg
+++ b/icons/vsphere/vsphere-original.svg
@@ -1,24 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 26.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#00C1D5;}
-	.st1{fill:#78BD20;}
-	.st2{fill:#0091DA;}
-</style>
-<g>
-	<path class="st0" d="M60.3,2.3H20.2c0,0-15.8,0.8-18,18v86.3c0,0,1.1,17.3,19.1,19.1h35.1l5.3-5.3H21.9c0,0-12.6-1.6-14.2-14.2
-		V21.4c0,0-0.5-12.8,14-14h33.9L60.3,2.3z"/>
-	<path class="st1" d="M67.7,125.7h40.1c0,0,15.8-0.8,18-18V21.4c0,0-1.1-17.3-19.1-19.1H71.7l-5.3,5.3h39.7c0,0,12.6,1.6,14.2,14.2
-		v84.8c0,0,0.5,12.8-14,14H72.5L67.7,125.7z"/>
-	<g>
-		<path class="st2" d="M100.1,109.9C100.1,109.9,100,109.9,100.1,109.9H47.6c-6.5,0-8.8-5.8-9.1-8.9l0-0.2V46.8
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128px" height="128px">
+	<path fill="#00C1D5" d="M60.3,2.3H20.2c0,0-15.8,0.8-18,18v86.3c0,0,1.1,17.3,19.1,19.1h35.1l5.3-5.3H21.9c0,0-12.6-1.6-14.2-14.2
+		V21.4c0,0-0.5-12.8,14-14h33.9L60.3,2.3z" />
+	<path fill="#78BD20" d="M67.7,125.7h40.1c0,0,15.8-0.8,18-18V21.4c0,0-1.1-17.3-19.1-19.1H71.7l-5.3,5.3h39.7c0,0,12.6,1.6,14.2,14.2
+		v84.8c0,0,0.5,12.8-14,14H72.5L67.7,125.7z" />
+	<g fill="#0091DA">
+		<path d="M100.1,109.9C100.1,109.9,100,109.9,100.1,109.9H47.6c-6.5,0-8.8-5.8-9.1-8.9l0-0.2V46.8
 			c0-7.3,6.3-9.5,9.6-9.6l0.1,0l52.7,0.2c6.6,0,9,6,9.3,9.1l0,0.2v53c0,3-0.9,5.5-2.8,7.3C104.6,109.8,100.7,109.9,100.1,109.9z
 			 M42.5,100.6c0.1,0.8,0.9,5.3,5.1,5.3h52.5c0.1,0,2.8,0,4.6-1.7c1-1,1.5-2.5,1.5-4.4V46.9c-0.1-0.9-1-5.5-5.4-5.5l-52.6-0.2
-			c-0.7,0-5.7,0.5-5.7,5.6V100.6z"/>
+			c-0.7,0-5.7,0.5-5.7,5.6V100.6z" />
+		<path d="M33.2,85.4h-7c-3.9,0-4.6-4.1-4.8-4.9V26.7c0-4.8,4.5-5.2,5.3-5.3l52.7,0.2h0c4,0,4.8,4.3,5,5.1v5.5h4.8v-5.6
+			l0-0.3c-0.4-3.3-2.9-9.5-9.7-9.5l-52.8-0.2c-3.4,0.1-9.9,2.4-9.9,10v53.9l0,0.3c0.3,3.2,2.8,9.3,9.5,9.3l7,0V85.4z" />
 	</g>
-	<path class="st2" d="M33.2,85.4h-7c-3.9,0-4.6-4.1-4.8-4.9V26.7c0-4.8,4.5-5.2,5.3-5.3l52.7,0.2h0c4,0,4.8,4.3,5,5.1v5.5h4.8v-5.6
-		l0-0.3c-0.4-3.3-2.9-9.5-9.7-9.5l-52.8-0.2c-3.4,0.1-9.9,2.4-9.9,10v53.9l0,0.3c0.3,3.2,2.8,9.3,9.5,9.3l7,0V85.4z"/>
-</g>
 </svg>