diff --git a/app/assets/images/svg/currentstate-archived.svg b/app/assets/images/svg/currentstate-archived.svg
index 28a670f8fcd..f2feae59a98 100644
--- a/app/assets/images/svg/currentstate-archived.svg
+++ b/app/assets/images/svg/currentstate-archived.svg
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 20.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 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#0099CC;}
+	.st0{fill:#31728C;}
+	.st1{fill:#FFFFFF;}
 </style>
-<g>
-	<path class="st0" d="M636.4,659.5H313.8L258.1,789c-13.8,32-20.8,56-20.8,71.8c0,12.6,6,23.6,18,33.2c12,9.6,38,15.7,77.8,18.5v23
-		H71.7v-23c34.6-6.1,57-14,67.1-23.8c20.8-19.5,43.7-59.3,69-119.1l291.9-681h22l288.4,688.9c23.2,55.2,44.2,91,63.2,107.4
-		c18.9,16.4,45.3,25.7,79,27.7v23H625.7v-23c33-1.6,55.2-7.1,66.8-16.5s17.4-20.7,17.4-34.1c0-17.9-8.1-46.1-24.4-84.7L636.4,659.5z
-		 M617.6,614.5L477.6,280L333.2,614.5H617.6z"/>
-</g>
+<rect class="st0" width="100" height="100"/>
+<path id="A" class="st1" d="M58.5,60.1H36.4L32.6,69c-0.9,2.2-1.4,3.8-1.4,4.9c0,0.9,0.4,1.6,1.2,2.3s2.6,1.1,5.3,1.3V79H19.8v-1.6
+	c2.4-0.4,3.9-1,4.6-1.6c1.4-1.3,3-4.1,4.7-8.2l20-46.6h1.5l19.7,47.2c1.6,3.8,3,6.2,4.3,7.4c1.3,1.1,3.1,1.8,5.4,1.9V79H57.8v-1.6
+	c2.3-0.1,3.8-0.5,4.6-1.1s1.2-1.4,1.2-2.3c0-1.2-0.6-3.2-1.7-5.8L58.5,60.1z M57.2,57l-9.6-22.9L37.8,57H57.2z"/>
 </svg>
diff --git a/app/assets/images/svg/currentstate-disconnected.svg b/app/assets/images/svg/currentstate-disconnected.svg
index 873b2e308bf..55aa045fb0f 100644
--- a/app/assets/images/svg/currentstate-disconnected.svg
+++ b/app/assets/images/svg/currentstate-disconnected.svg
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 20.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 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#0099CC;}
+	.st0{fill:#31728C;}
+	.st1{fill:#FFFFFF;}
 </style>
-<g>
-	<path class="st0" d="M95.5,926v-23h30.9c34.7,0,59.3-11.1,73.8-33.3c8.9-13.3,13.3-43.2,13.3-89.7V244c0-51.3-5.7-83.4-16.9-96.3
-		c-15.8-17.8-39.1-26.7-70.2-26.7H95.5V98h336.6c123.6,0,217.6,14,282,42.1S830.4,215,869.7,280.6c39.2,65.5,58.8,141.3,58.8,227.1
-		c0,115.2-35,211.5-104.9,288.8C745.1,882.9,625.6,926,465,926H95.5z M330.5,865.9c51.6,11.4,94.9,17.1,129.9,17.1
-		c94.3,0,172.6-33.2,234.8-99.5s93.3-156.4,93.3-270c0-114.4-31.1-204.6-93.3-270.6C633,177,553.1,144,455.5,144
-		c-36.6,0-78.3,5.9-125,17.7V865.9z"/>
-</g>
+<rect class="st0" width="100" height="100"/>
+<path id="D" class="st1" d="M20.8,79v-1.6H23c2.4,0,4.2-0.8,5.2-2.3c0.6-0.9,0.9-3,0.9-6.3V31.2c0-3.6-0.4-5.8-1.2-6.7
+	c-1.1-1.2-2.7-1.9-4.9-1.9h-2.2V21h23.6c8.7,0,15.2,1,19.8,2.9s8.1,5.2,10.9,9.8c2.7,4.6,4.1,9.9,4.1,15.9c0,8.1-2.5,14.8-7.3,20.2
+	C66.3,76,58,79,46.7,79H20.8z M37.3,74.8c3.6,0.8,6.6,1.2,9.1,1.2c6.6,0,12.1-2.3,16.4-7c4.4-4.6,6.5-11,6.5-18.9
+	c0-8-2.2-14.3-6.5-19c-4.4-4.6-10-6.9-16.8-6.9c-2.6,0-5.5,0.4-8.8,1.2V74.8z"/>
 </svg>
diff --git a/app/assets/images/svg/currentstate-not_responding.svg b/app/assets/images/svg/currentstate-not_responding.svg
index 15d0ebfc39d..1cfa41d8041 100644
--- a/app/assets/images/svg/currentstate-not_responding.svg
+++ b/app/assets/images/svg/currentstate-not_responding.svg
@@ -3,11 +3,13 @@
 <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 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#CC0000;}
+	.st0{fill:#31728C;}
+	.st1{fill:#FFFFFF;}
 </style>
-<path class="st0" d="M60.9,73.6v12.7c0,1-0.4,1.8-1.1,2.6c-0.7,0.7-1.6,1.1-2.6,1.1H42.7c-1,0-1.8-0.4-2.6-1.1
-	c-0.7-0.7-1.1-1.6-1.1-2.6V73.6c0-1,0.4-1.8,1.1-2.6c0.7-0.7,1.6-1.1,2.6-1.1h14.5c1,0,1.8,0.4,2.6,1.1
-	C60.5,71.8,60.9,72.7,60.9,73.6z M62.6,13.6L61,57.3c0,1-0.4,1.8-1.2,2.6c-0.7,0.7-1.6,1.1-2.6,1.1H42.7c-1,0-1.8-0.4-2.6-1.1
-	c-0.7-0.7-1.1-1.6-1.2-2.6l-1.6-43.6c0-1,0.3-1.8,1-2.6c0.7-0.7,1.5-1.1,2.5-1.1h18.2c1,0,1.8,0.4,2.5,1.1
-	C62.3,11.8,62.7,12.7,62.6,13.6z"/>
+<rect class="st0" width="100" height="100"/>
+<path id="not_x5F_responding" class="st1" d="M57.8,66.8v9c0,0.7-0.3,1.3-0.8,1.9c-0.5,0.5-1.1,0.8-1.9,0.8H44.8
+	c-0.7,0-1.3-0.3-1.9-0.8c-0.5-0.5-0.8-1.1-0.8-1.9v-9c0-0.7,0.3-1.3,0.8-1.9c0.5-0.5,1.1-0.8,1.9-0.8h10.3c0.7,0,1.3,0.3,1.9,0.8
+	C57.5,65.5,57.8,66.2,57.8,66.8z M59,24.1l-1.1,31.1c0,0.7-0.3,1.3-0.9,1.9c-0.5,0.5-1.1,0.8-1.9,0.8H44.8c-0.7,0-1.3-0.3-1.9-0.8
+	c-0.5-0.5-0.8-1.1-0.9-1.9l-1.1-31.1c0-0.7,0.2-1.3,0.7-1.9c0.5-0.5,1.1-0.8,1.8-0.8h13c0.7,0,1.3,0.3,1.8,0.8
+	C58.8,22.8,59,23.4,59,24.1z"/>
 </svg>
diff --git a/app/assets/images/svg/currentstate-orphaned.svg b/app/assets/images/svg/currentstate-orphaned.svg
index 174d774ed10..4077e056089 100644
--- a/app/assets/images/svg/currentstate-orphaned.svg
+++ b/app/assets/images/svg/currentstate-orphaned.svg
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 20.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 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#0099CC;}
+	.st0{fill:#31728C;}
+	.st1{fill:#FFFFFF;}
 </style>
-<g>
-	<path class="st0" d="M519.9,79c107.5,0,200.6,40.8,279.4,122.5c78.8,81.6,118.2,183.5,118.2,305.7c0,125.8-39.7,230.2-119.1,313.3
-		S622.9,945,510.2,945c-114,0-209.8-40.5-287.3-121.5c-77.6-81-116.3-185.9-116.3-314.5c0-131.5,44.8-238.8,134.4-321.9
-		C318.6,115,411.6,79,519.9,79z M508.3,122c-74.1,0-133.5,27.6-178.2,82.7c-55.8,68.6-83.6,169-83.6,301.2
-		c0,135.5,28.9,239.8,86.7,312.9C377.5,874.2,436.1,902,509,902c77.7,0,141.9-30.4,192.6-91.2s76-156.7,76-287.8
-		c0-142-27.9-248-83.6-317.8C649.1,149.8,587.3,122,508.3,122z"/>
-</g>
+<rect class="st0" width="100" height="100"/>
+<path id="O" class="st1" d="M50.5,20.5c7.3,0,13.7,2.8,19,8.3c5.4,5.6,8.1,12.5,8.1,20.8c0,8.6-2.7,15.7-8.1,21.3s-12,8.5-19.6,8.5
+	c-7.8,0-14.3-2.8-19.6-8.3c-5.3-5.5-7.9-12.7-7.9-21.4c0-9,3.1-16.3,9.2-21.9C36.8,23,43.2,20.5,50.5,20.5z M49.7,23.4
+	c-5,0-9.1,1.9-12.1,5.6c-3.8,4.7-5.7,11.5-5.7,20.5c0,9.2,2,16.3,5.9,21.3c3,3.8,7,5.7,12,5.7c5.3,0,9.7-2.1,13.1-6.2
+	c3.5-4.1,5.2-10.7,5.2-19.6c0-9.7-1.9-16.9-5.7-21.7C59.3,25.3,55.1,23.4,49.7,23.4z"/>
 </svg>
diff --git a/app/assets/images/svg/currentstate-preparing_for_maintenance.svg b/app/assets/images/svg/currentstate-preparing_for_maintenance.svg
index 87c130ce0f6..1cad938a26f 100644
--- a/app/assets/images/svg/currentstate-preparing_for_maintenance.svg
+++ b/app/assets/images/svg/currentstate-preparing_for_maintenance.svg
@@ -3,17 +3,21 @@
 <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 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#3F9C35;}
+	.st0{fill:#31728C;}
+	.st1{fill:#FFFFFF;}
 </style>
-<g transform="matrix(1,0,0,-1,53.152542,1217.0847)">
-	<path d="M17.6,1165.7c0.4-0.4,0.9-0.7,1.5-0.7c0.6,0,1.1,0.2,1.5,0.7c0.4,0.4,0.7,0.9,0.7,1.5c0,0.6-0.2,1.1-0.7,1.5
-		s-0.9,0.7-1.5,0.7c-0.6,0-1.1-0.2-1.5-0.7s-0.7-0.9-0.7-1.5C16.9,1166.6,17.1,1166.1,17.6,1165.7z M0.8,1185.6c1.7,1.7,3,3.7,3.9,6
-		l23.4-23.4c0.9-0.9,1.3-1.9,1.3-3.1c0-1.2-0.4-2.3-1.3-3.1l-3.6-3.7c-0.9-0.8-1.9-1.3-3.1-1.3c-1.2,0-2.2,0.4-3.1,1.3l-23.4,23.4
-		C-2.9,1182.6-1,1183.9,0.8,1185.6z M-26.7,1197.5c0.2,0.2,0.5,0.3,0.8,0.3c0.2,0,1-0.4,2.4-1.2s3-1.7,4.7-2.8s2.6-1.6,2.7-1.7
-		l6.6,3.7v7.7l-10.1,5.8c-0.4,0.3-0.5,0.6-0.5,1s0.2,0.7,0.5,1c1,0.7,2.2,1.2,3.7,1.6c1.5,0.4,2.8,0.6,4.2,0.6
-		c4.2,0,7.9-1.5,10.9-4.5c3-3,4.5-6.6,4.5-10.9c0-4.2-1.5-7.9-4.5-10.9s-6.6-4.5-10.9-4.5c-3.2,0-6.2,1-8.9,2.9
-		c-2.7,1.9-4.6,4.4-5.6,7.5c-0.5,1.5-0.8,2.7-0.8,3.6C-27,1196.9-26.9,1197.2-26.7,1197.5z"/>
+<rect class="st0" width="100" height="100"/>
+<g id="preparing_for_maint">
+	<g transform="matrix(1,0,0,-1,53.152542,1217.0847)">
+		<path class="st1" d="M9.6,1167.3c0.3-0.3,0.6-0.5,1-0.5s0.7,0.1,1,0.5c0.3,0.3,0.5,0.6,0.5,1s-0.1,0.7-0.5,1s-0.6,0.5-1,0.5
+			s-0.7-0.1-1-0.5s-0.5-0.6-0.5-1S9.2,1167.6,9.6,1167.3z M-1.3,1180.2c1.1,1.1,1.9,2.4,2.5,3.9l15.1-15.1c0.6-0.6,0.8-1.2,0.8-2
+			c0-0.8-0.3-1.5-0.8-2l-2.3-2.4c-0.6-0.5-1.2-0.8-2-0.8c-0.8,0-1.4,0.3-2,0.8l-15.1,15.1C-3.7,1178.2-2.5,1179.1-1.3,1180.2z
+			 M-19,1187.9c0.1,0.1,0.3,0.2,0.5,0.2c0.1,0,0.6-0.3,1.5-0.8c0.9-0.5,1.9-1.1,3-1.8c1.1-0.7,1.7-1,1.7-1.1l4.3,2.4v5l-6.5,3.7
+			c-0.3,0.2-0.3,0.4-0.3,0.6s0.1,0.5,0.3,0.6c0.6,0.5,1.4,0.8,2.4,1s1.8,0.4,2.7,0.4c2.7,0,5.1-1,7-2.9c1.9-1.9,2.9-4.3,2.9-7
+			c0-2.7-1-5.1-2.9-7c-1.9-1.9-4.3-2.9-7-2.9c-2.1,0-4,0.6-5.7,1.9s-3,2.8-3.6,4.8c-0.3,1-0.5,1.7-0.5,2.3
+			C-19.2,1187.5-19.2,1187.7-19,1187.9z"/>
+	</g>
+	<polygon class="st1" points="49,45.7 58.9,55.4 68.7,65.1 49,65.1 29.2,65.1 39.1,55.4 	"/>
+	<polygon class="st1" points="49,61.7 58.9,71.4 68.7,81.1 49,81.1 29.2,81.1 39.1,71.4 	"/>
 </g>
-<polygon class="st0" points="50,41.5 65.3,56.6 80.6,71.6 50,71.6 19.4,71.6 34.7,56.6 "/>
-<polygon class="st0" points="50,66.3 65.3,81.3 80.6,96.4 50,96.4 19.4,96.4 34.7,81.3 "/>
 </svg>
diff --git a/app/assets/images/svg/currentstate-retired.svg b/app/assets/images/svg/currentstate-retired.svg
index 4078b095061..4a7fd4ad627 100644
--- a/app/assets/images/svg/currentstate-retired.svg
+++ b/app/assets/images/svg/currentstate-retired.svg
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 20.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 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#0099CC;}
+	.st0{fill:#31728C;}
+	.st1{fill:#FFFFFF;}
 </style>
-<g>
-	<path class="st0" d="M923.7,926H702.5L422.1,539c-20.8,0.8-37.7,1.2-50.7,1.2c-5.3,0-11-0.1-17.1-0.3s-12.4-0.5-18.9-0.9v241
-		c0,51.7,5.6,83.8,16.9,96.3c15.3,17.8,38.3,26.7,69,26.7h32.1v23h-353v-23h30.9c34.7,0,59.5-11.3,74.4-33.9
-		c8.5-12.5,12.7-42.2,12.7-89.1V244c0-51.7-5.7-83.8-16.9-96.3c-15.8-17.8-39.1-26.7-70.2-26.7h-30.9V98h301.2
-		c87.8,0,152.5,6.4,194.2,19.2s77,36.5,106.1,70.9s43.6,75.5,43.6,123.1c0,50.9-16.6,95.1-49.7,132.6c-33.1,37.5-84.4,64-153.9,79.5
-		l171.4,236.8c39.1,54.5,72.6,90.8,100.7,108.7s64.7,29.3,109.9,34.2v23H923.7z M335.3,501c7.6,0,14.3,0.1,19.9,0.3
-		s10.3,0.3,13.9,0.3c78.1,0,137-17.1,176.7-51.4s59.5-78,59.5-131c0-51.8-16-94-48-126.4S482.9,144,430.1,144c-23.4,0-55,4-94.8,12
-		V501z"/>
-</g>
+<rect class="st0" width="100" height="100"/>
+<path id="R" class="st1" d="M78.8,79H63.3L43.7,51.9c-1.5,0.1-2.6,0.1-3.6,0.1c-0.4,0-0.8,0-1.2,0c-0.4,0-0.9,0-1.3-0.1l0,16.9
+	c0,3.6,0.4,5.9,1.2,6.7c1.1,1.2,2.7,1.9,4.8,1.9h2.2l0,1.6l-24.7,0l0-1.6h2.2c2.4,0,4.2-0.8,5.2-2.4c0.6-0.9,0.9-3,0.9-6.2l0-37.5
+	c0-3.6-0.4-5.9-1.2-6.7c-1.1-1.2-2.7-1.9-4.9-1.9h-2.2l0-1.6l21.1,0c6.2,0,10.7,0.4,13.6,1.3c2.9,0.9,5.4,2.6,7.4,5
+	c2,2.4,3.1,5.3,3.1,8.6c0,3.6-1.2,6.7-3.5,9.3c-2.3,2.6-5.9,4.5-10.8,5.6l12,16.6c2.7,3.8,5.1,6.4,7.1,7.6c2,1.3,4.5,2.1,7.7,2.4
+	L78.8,79L78.8,79L78.8,79z M37.6,49.2c0.5,0,1,0,1.4,0c0.4,0,0.7,0,1,0c5.5,0,9.6-1.2,12.4-3.6c2.8-2.4,4.2-5.5,4.2-9.2
+	c0-3.6-1.1-6.6-3.4-8.9c-2.2-2.3-5.2-3.4-8.9-3.4c-1.6,0-3.9,0.3-6.6,0.8L37.6,49.2z"/>
 </svg>
diff --git a/app/assets/images/svg/currentstate-standby.svg b/app/assets/images/svg/currentstate-standby.svg
index ffdec88aeeb..ed10df5bfdd 100644
--- a/app/assets/images/svg/currentstate-standby.svg
+++ b/app/assets/images/svg/currentstate-standby.svg
@@ -3,13 +3,20 @@
 <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 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#F5C12E;}
+	.st0{fill:#31728C;}
+	.st1{fill:#FFFFFF;}
 </style>
-<path class="st0" d="M69.9,34.3c4.8,4.3,7.8,10.5,7.8,17.4c0,13-10.5,23.5-23.5,23.5c-10.6,0-19.6-7.1-22.5-16.8
-	c-0.1,1-0.2,2-0.2,3.1c0,15.9,12.9,28.9,28.9,28.9s28.9-12.9,28.9-28.9C89.2,49,81.2,38.3,69.9,34.3z"/>
-<polygon class="st0" points="21.6,11.4 24.7,17.6 31.5,18.6 26.6,23.4 27.7,30.3 21.6,27 15.5,30.3 16.7,23.4 11.7,18.6 18.5,17.6 
-	"/>
-<polygon class="st0" points="57.2,8.4 59.4,12.9 64.4,13.6 60.8,17.1 61.6,22.1 57.2,19.7 52.7,22.1 53.6,17.1 50,13.6 55,12.9 "/>
-<polygon class="st0" points="25.1,38.8 27.3,43.3 32.3,44 28.7,47.5 29.5,52.5 25.1,50.1 20.7,52.5 21.5,47.5 17.9,44 22.9,43.3 "/>
-<polygon class="st0" points="15.5,62.3 17.7,66.8 22.7,67.5 19.1,71 19.9,75.9 15.5,73.6 11,75.9 11.9,71 8.3,67.5 13.3,66.8 "/>
+<rect class="st0" width="100" height="100"/>
+<g id="standby">
+	<path class="st1" d="M68.8,35.3c4.3,3.9,7.1,9.5,7.1,15.7c0,11.8-9.5,21.2-21.2,21.2c-9.6,0-17.7-6.4-20.3-15.2
+		c-0.1,0.9-0.2,1.8-0.2,2.8C34.1,74.3,45.7,86,60.2,86s26.1-11.7,26.1-26.1C86.3,48.6,79,38.9,68.8,35.3z"/>
+	<polygon class="st1" points="25.1,14.6 27.9,20.2 34.1,21.1 29.7,25.4 30.6,31.7 25.1,28.7 19.6,31.7 20.7,25.4 16.2,21.1 
+		22.3,20.2 	"/>
+	<polygon class="st1" points="57.3,11.9 59.3,16 63.8,16.6 60.6,19.8 61.3,24.3 57.3,22.1 53.2,24.3 54.1,19.8 50.8,16.6 55.3,16 	
+		"/>
+	<polygon class="st1" points="28.3,39.4 30.3,43.4 34.8,44.1 31.5,47.2 32.3,51.8 28.3,49.6 24.3,51.8 25,47.2 21.8,44.1 26.3,43.4 
+			"/>
+	<polygon class="st1" points="19.6,60.6 21.6,64.7 26.1,65.3 22.9,68.5 23.6,72.9 19.6,70.8 15.5,72.9 16.4,68.5 13.1,65.3 
+		17.6,64.7 	"/>
+</g>
 </svg>
diff --git a/app/assets/images/svg/currentstate-template.svg b/app/assets/images/svg/currentstate-template.svg
index 6aa00a75625..22b10e90376 100644
--- a/app/assets/images/svg/currentstate-template.svg
+++ b/app/assets/images/svg/currentstate-template.svg
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 20.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 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#0099CC;}
+	.st0{fill:#31728C;}
+	.st1{fill:#FFFFFF;}
 </style>
-<g>
-	<path class="st0" d="M850,98l9,194.2h-23.2c-4.5-34.2-10.6-58.6-18.3-73.2c-12.6-23.6-29.4-41-50.3-52.2S718.7,150,684.5,150H568
-		v633c0,50.5,5.5,82,16.5,94.5c15.5,17,39.4,25.5,71.7,25.5H685v23H333v-23h29.5c35.2,0,60.2-10.5,75-31.5
-		c9-12.9,13.5-42.4,13.5-88.5V150h-99.4c-38.6,0-66.1,2.8-82.3,8.5c-21.1,7.8-39.2,22.6-54.3,44.6c-15,22-24,51.7-26.8,89.1H165
-		L174,98H850z"/>
-</g>
+<rect class="st0" width="100" height="100"/>
+<path id="T" class="st1" d="M73.7,21l0.6,13.6h-1.6c-0.3-2.4-0.7-4.1-1.3-5.1c-0.9-1.7-2.1-2.9-3.5-3.7c-1.5-0.8-3.4-1.2-5.8-1.2
+	h-8.2V69c0,3.5,0.4,5.8,1.2,6.6c1.1,1.2,2.8,1.8,5,1.8h2V79H37.4v-1.6h2.1c2.5,0,4.2-0.7,5.3-2.2c0.6-0.9,0.9-3,0.9-6.2V24.6h-7
+	c-2.7,0-4.6,0.2-5.8,0.6c-1.5,0.5-2.7,1.6-3.8,3.1c-1.1,1.5-1.7,3.6-1.9,6.2h-1.6L26.3,21H73.7z"/>
 </svg>
diff --git a/app/assets/images/svg/currentstate-unknown.svg b/app/assets/images/svg/currentstate-unknown.svg
deleted file mode 120000
index 7e906c7a1e1..00000000000
--- a/app/assets/images/svg/currentstate-unknown.svg
+++ /dev/null
@@ -1 +0,0 @@
-os-unknown.svg
\ No newline at end of file
diff --git a/app/assets/images/svg/currentstate-unknown.svg b/app/assets/images/svg/currentstate-unknown.svg
new file mode 100644
index 00000000000..c5bba4886c8
--- /dev/null
+++ b/app/assets/images/svg/currentstate-unknown.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 20.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 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#31728C;}
+	.st1{fill:#FFFFFF;}
+</style>
+<rect class="st0" width="100" height="100"/>
+<path id="unknown" class="st1" d="M49.8,64.5h-1.6c0.2-3.4,0.6-6.2,1.2-8.4c0.7-2.2,2-5.3,4.1-9.3c1.6-3,2.7-5.4,3.2-7
+	c0.5-1.6,0.7-3.3,0.7-4.9c0-3.4-0.9-6.1-2.8-8.1c-1.8-2-4.1-3-6.8-3c-2.4,0-4.2,0.5-5.6,1.6c-1.4,1.1-2,2.3-2,3.6
+	c0,1,0.4,2.2,1.2,3.6c0.8,1.4,1.2,2.5,1.2,3.3c0,1-0.3,1.8-0.9,2.4s-1.4,1-2.3,1c-1.1,0-2.2-0.6-3.1-1.7C35.5,36.6,35,35,35,33.1
+	c0-3,1.3-5.7,4-8.1c2.6-2.3,6.2-3.5,10.7-3.5c5.6,0,9.7,1.6,12.4,4.8c2,2.4,2.9,5,2.9,7.9c0,2-0.4,4-1.3,6c-0.9,2.1-2.6,4.5-5,7.3
+	c-3.9,4.4-6.4,7.5-7.2,9.4C50.5,58.8,50,61.3,49.8,64.5z M49.2,69.5c1.3,0,2.4,0.4,3.2,1.3s1.3,1.9,1.3,3.2c0,1.2-0.4,2.3-1.3,3.2
+	c-0.9,0.9-2,1.3-3.2,1.3s-2.3-0.4-3.2-1.3c-0.9-0.9-1.3-1.9-1.3-3.2c0-1.3,0.4-2.3,1.3-3.2S48,69.5,49.2,69.5z"/>
+</svg>
diff --git a/app/assets/images/svg/os-unknown.svg b/app/assets/images/svg/os-unknown.svg
index bc7101cb426..8ea0d6abb8c 100644
--- a/app/assets/images/svg/os-unknown.svg
+++ b/app/assets/images/svg/os-unknown.svg
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 20.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 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#0099CC;}
+	.st0{fill:#07BCE5;}
 </style>
-<g>
-	<path class="st0" d="M508.5,732h-24c2.3-51.4,8.5-93.9,18.4-127.5c10-33.6,30.6-80.4,61.9-140.3c24.4-46.1,40.3-81.4,47.7-105.9
-		c7.3-24.5,11-49.4,11-74.6c0-51.5-13.8-92.5-41.2-123S521,115,481.1,115c-35.5,0-63.4,8.3-83.7,24.9
-		c-20.4,16.6-30.5,34.7-30.5,54.1c0,15,6.1,33.5,18.3,55.3c12.2,21.9,18.3,38.5,18.3,49.9c0,14.6-4.7,26.9-14,36.8
-		S368.7,351,355.3,351c-17.1,0-32.7-8.4-46.7-25.3c-14-16.9-21.1-40.4-21.1-70.5c0-46,19.8-86.7,59.2-122.1S439.8,80,507.4,80
-		c83.9,0,145.6,24.4,185.1,73.3c29.3,35.8,44,75.5,44,119.1c0,29.7-6.6,60.2-19.9,91.6s-38.4,68.2-75.4,110.6
-		c-59,66.9-95.2,114.3-108.5,142.2C519.4,644.7,511.4,683.1,508.5,732z M500.2,808c19.1,0,35.3,6.6,48.5,19.8s19.8,29.4,19.8,48.5
-		c0,18.7-6.7,34.7-20.1,47.9C535,937.4,518.9,944,500.2,944s-34.7-6.6-47.9-19.8c-13.2-13.2-19.8-29.2-19.8-47.9
-		c0-19.1,6.6-35.3,19.8-48.5S481.5,808,500.2,808z"/>
-</g>
+<path id="unknown" class="st0" d="M49.7,60.8h-1.8c0.2-3.9,0.6-7.2,1.4-9.7c0.8-2.6,2.3-6.1,4.7-10.7c1.9-3.5,3.1-6.2,3.6-8.1
+	c0.6-1.9,0.8-3.8,0.8-5.7c0-3.9-1.1-7.1-3.1-9.4s-4.7-3.5-7.7-3.5c-2.7,0-4.8,0.6-6.4,1.9c-1.6,1.3-2.3,2.7-2.3,4.1
+	c0,1.1,0.5,2.6,1.4,4.2c0.9,1.7,1.4,2.9,1.4,3.8c0,1.1-0.4,2.1-1.1,2.8c-0.7,0.8-1.6,1.1-2.6,1.1c-1.3,0-2.5-0.6-3.6-1.9
+	c-1.1-1.3-1.6-3.1-1.6-5.4c0-3.5,1.5-6.6,4.5-9.3c3-2.7,7.1-4.1,12.3-4.1c6.4,0,11.1,1.9,14.1,5.6c2.2,2.7,3.4,5.8,3.4,9.1
+	c0,2.3-0.5,4.6-1.5,7c-1,2.4-2.9,5.2-5.8,8.4c-4.5,5.1-7.3,8.7-8.3,10.9C50.6,54.1,50,57.1,49.7,60.8z M49.1,66.6
+	c1.5,0,2.7,0.5,3.7,1.5c1,1,1.5,2.2,1.5,3.7c0,1.4-0.5,2.7-1.5,3.7c-1,1-2.3,1.5-3.7,1.5s-2.7-0.5-3.7-1.5c-1-1-1.5-2.2-1.5-3.7
+	c0-1.5,0.5-2.7,1.5-3.7C46.4,67.1,47.7,66.6,49.1,66.6z"/>
 </svg>
diff --git a/app/assets/images/svg/vendor-unknown.svg b/app/assets/images/svg/vendor-unknown.svg
index 1c0fd2b3ea9..269abeab2d9 100644
--- a/app/assets/images/svg/vendor-unknown.svg
+++ b/app/assets/images/svg/vendor-unknown.svg
@@ -1,66 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.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 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
-<image overflow="visible" width="100" height="100" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ
-bWFnZVJlYWR5ccllPAAAA7FpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdp
-bj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6
-eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0
-NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJo
-dHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlw
-dGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wUmlnaHRzPSJodHRwOi8vbnMuYWRvYmUuY29tL3hh
-cC8xLjAvcmlnaHRzLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9t
-bS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3Vy
-Y2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcFJpZ2h0
-czpNYXJrZWQ9IkZhbHNlIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InV1aWQ6QkQ4NkFDRTQy
-NTY2RTExMUFGRjBEMjc3MjZDRDM5MzgiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QkQyNzFG
-NkI0M0Y3MTFFM0FCOUM4RERFNTY1RkRDQUMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QkQy
-NzFGNkE0M0Y3MTFFM0FCOUM4RERFNTY1RkRDQUMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhv
-dG9zaG9wIENTNiAoTWFjaW50b3NoKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5j
-ZUlEPSJ4bXAuaWlkOkNDQjYxODkxQTAyMDY4MTE4MjJBRTNEMkQ5RTQyREY4IiBzdFJlZjpkb2N1
-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
-gg==">
-</image>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 20.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 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#0099CC;}
+</style>
+<g>
+	<path class="st0" d="M522.6,693h-20.2c1.9-43.3,7.2-79.1,15.5-107.4c8.4-28.3,25.8-67.7,52.1-118.2c20.6-38.8,34-68.6,40.2-89.2
+		c6.1-20.6,9.3-41.6,9.3-62.8c0-43.4-11.6-77.9-34.7-103.6s-51.6-38.5-85.3-38.5c-29.9,0-53.4,7-70.5,21
+		c-17.2,14-25.7,29.2-25.7,45.6c0,12.6,5.1,28.2,15.4,46.6c10.3,18.4,15.4,32.4,15.4,42c0,12.3-4,22.7-11.8,31
+		c-7.8,8.3-17.5,12.6-28.8,12.6c-14.4,0-27.5-7.1-39.3-21.3c-11.8-14.2-17.8-34-17.8-59.4c0-38.8,16.7-73,49.9-102.9
+		s78.4-44.7,135.4-44.7c70.7,0,122.7,20.6,155.9,61.8c24.7,30.2,37.1,63.6,37.1,100.3c0,25-5.6,50.7-16.8,77.2
+		c-11.2,26.5-32.4,57.5-63.5,93.2c-49.7,56.4-80.2,96.3-91.4,119.8C531.8,619.5,525,651.9,522.6,693z M515.6,757.1
+		c16.1,0,29.7,5.6,40.9,16.7c11.1,11.1,16.7,24.8,16.7,40.9c0,15.8-5.6,29.2-16.9,40.4c-11.3,11.1-24.9,16.7-40.6,16.7
+		c-15.8,0-29.2-5.6-40.4-16.7s-16.7-24.6-16.7-40.4c0-16.1,5.6-29.7,16.7-40.9C486.4,762.6,499.9,757.1,515.6,757.1z"/>
+</g>
+</svg>
diff --git a/app/assets/stylesheets/template.scss b/app/assets/stylesheets/template.scss
index 045028a07f6..b8efa4be337 100644
--- a/app/assets/stylesheets/template.scss
+++ b/app/assets/stylesheets/template.scss
@@ -63,12 +63,6 @@ img.tiny { margin: 0; padding: 0;width:20px;height:20px; border: 0; vertical-ali
   border-top-right-radius: 15px;
 }
 
-.b72 img[src*="archived"], .b72 img[src*="template"], .b72 img[src*="disconnected"], .b72 img[src*="orphaned"], .b72 img[src*="never"], img[src*="retired"], .b72 img[src*="unknown"] {
-  width: 24px; 
-  height: 24px;
-  margin-left: 4px;
-}
-
 .flobj { position: absolute;z-index: auto;width: 72px;}
 .flobj p { margin: 5px 0 0 0;padding: 0;color: #e3e4e4;vertical-align: middle;text-align:center;text-transform: none;text-shadow: 0 0 3px #000;font: normal 16px OpenSansSemibold,Arial,Helvetica,sans-serif !important;}
 .a72 { padding: 3px  0 0 5px; width: 28px; height: 28px;font-size: 1.3em;line-height: 1.8em;}
diff --git a/app/helpers/quadicon_helper.rb b/app/helpers/quadicon_helper.rb
index 4e38094d478..284d539e4bf 100644
--- a/app/helpers/quadicon_helper.rb
+++ b/app/helpers/quadicon_helper.rb
@@ -458,25 +458,8 @@ def render_resource_pool_quadicon(item, options)
 
   def currentstate_icon(state)
     path = "svg/currentstate-#{h(state)}.svg"
-    if %w(
-      retired
-      standby
-      unknown
-      archived
-      orphaned
-      template
-      disconnected
-      install_failed
-      not_responding
-      non_operational
-      template-no-host
-      preparing_for_maintenance
-    ).include?(state)
-      flobj_img_simple(path, "b72")
-    else
-      content_tag(:div, :class => "flobj b72") do
-        content_tag(:div, '', :class => "stretch", :style => "background-image: url('#{image_path(path)}')")
-      end
+    content_tag(:div, :class => "flobj b72") do
+      content_tag(:div, '', :class => "stretch", :style => "background-image: url('#{image_path(path)}')")
     end
   end
 
diff --git a/spec/helpers/quadicon_helper_spec.rb b/spec/helpers/quadicon_helper_spec.rb
index 088db6753ab..d4df2504765 100644
--- a/spec/helpers/quadicon_helper_spec.rb
+++ b/spec/helpers/quadicon_helper_spec.rb
@@ -758,10 +758,6 @@
         expect(host_quad).to include("0")
       end
 
-      it 'renders a quadicon with a state img' do
-        expect(host_quad).to have_selector("img[src*='currentstate-archived']")
-      end
-
       include_examples :host_vendor_icon, "c"
 
       it 'renders a quadicon with an auth status img' do
@@ -1124,10 +1120,6 @@
         expect(vm_quad).to have_selector("img[src*='os-unknown']")
       end
 
-      it 'includes a state image' do
-        expect(vm_quad).to have_selector("img[src*='currentstate-archived']")
-      end
-
       context "when lastaction is policy_sim" do
         before(:each) do
           @lastaction = "policy_sim"