diff --git a/infra-templates/dnsimple/catalogIcon-dnsimple.svg b/infra-templates/dnsimple/catalogIcon-dnsimple.svg
index 521897b..14abed2 100644
--- a/infra-templates/dnsimple/catalogIcon-dnsimple.svg
+++ b/infra-templates/dnsimple/catalogIcon-dnsimple.svg
@@ -1,105 +1,43 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.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="-106 195.9 505.9 331.1" style="enable-background:new -106 195.9 505.9 331.1;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#3D3D3D;}
-	.st1{fill:#0D5E8C;}
-	.st2{fill:#0071BC;}
-	.st3{fill:#E6E6E6;}
-	.st4{fill:#F7C94A;}
-	.st5{fill:#313131;}
-	.st6{fill:#414042;}
-	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_1_);}
-	.st8{fill:#F68B1F;}
-	.st9{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);}
-	.st10{fill-rule:evenodd;clip-rule:evenodd;fill:#F68B1F;}
-	.st11{fill:url(#SVGID_3_);}
-	.st12{fill:url(#SVGID_4_);}
-	.st13{fill:url(#SVGID_5_);}
-	.st14{fill:url(#SVGID_6_);}
-	.st15{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_7_);}
-</style>
-<g>
-	<g>
-		<path class="st0" d="M35.3,285.6l7.2-7.8c3.4-3.7,7.6-4.6,11.1-1.3c2.8,2.6,2.8,6.2,1.6,8.6c1-0.1,2,0.1,3,0.3
-			c2.3,0.7,4.6,1.8,6.1,0.1c0.4-0.4,0.6-0.9,0.6-0.9l3,3.5c0,0-0.7,1.2-1.5,2.1c-2.1,2.3-4.2,2.7-8.4,1.3c-1.9-0.7-5-2.1-5.9-1
-			l-1,1.1l7.5,7l-4.3,4.7L35.3,285.6z M43.1,284l4.7,4.3l1.6-1.7c1.2-1.4,2.3-3.3,0.3-5.2c-1.7-1.5-3.2-1-4.4,0.3L43.1,284z"/>
-		<path class="st0" d="M58.5,263l5.2-3.9l22.7,15.3l-5.2,3.9l-4.3-2.9l-6.9,5.3l1.7,4.9l-4.5,3.4L58.5,263z M68.3,275.9l4.4-3.4
-			l-4.7-3.3c-1.6-1.1-3.4-3-3.4-3l-0.1,0.1c0,0,1.3,2.3,1.9,4.1L68.3,275.9z"/>
-		<path class="st0" d="M74.9,251.2l6.1-3.1l11.9,8.4c1,0.7,2.6,2.1,3.8,3.2l0.1-0.1c-0.7-1.3-1.8-3-2.5-4.4l-5.6-11.1l4.7-2.4
-			l11.8,23.2l-6,3l-12.1-8.2c-1.1-0.7-2.5-1.9-3.6-2.9l-0.1,0.1c0.8,1.2,1.7,2.7,2.4,4l5.6,11.1l-4.7,2.4L74.9,251.2z"/>
-		<path class="st0" d="M102.8,251.8c-2.7-9,0.7-14,7.6-16.1c7.3-2.1,11.3,1,12.1,6.6l-5.6,2.2c-0.5-4.1-2.6-5.3-5.3-4.4
-			c-2.7,0.8-4.3,3.4-2.4,9.8c2,6.8,4.9,7.8,7.6,7c2.5-0.7,4.1-2.9,2.7-6.1l5.5-1c1.9,4.9-0.7,9.7-7.3,11.7
-			C111,263.5,105.5,260.8,102.8,251.8z"/>
-		<path class="st0" d="M126.1,232.2l6.4-0.7l1,9.7l7.8-0.8l-1-9.7l6.4-0.7l2.7,25.8l-6.4,0.7l-1.1-10.9l-7.8,0.8l1.1,10.9l-6.4,0.7
-			L126.1,232.2z"/>
-		<path class="st0" d="M153.7,230.1l17.1,1.1l-0.3,4.8l-10.7-0.7l-0.4,5.6l9,0.6l-0.3,4.8l-9-0.6l-0.4,6.1l11.1,0.7l-0.3,4.8
-			L152,256L153.7,230.1z"/>
-		<path class="st0" d="M176.8,232.1l10.4,2.4c4.9,1.1,7.7,4.3,6.6,8.9c-0.9,3.8-4,5.5-6.7,5.7c0.6,0.8,1,1.8,1.2,2.8
-			c0.6,2.4,0.7,4.9,2.9,5.4c0.6,0.1,1.1,0,1.1,0l-1.5,4.3c0,0-1.4,0-2.6-0.2c-3-0.7-4.4-2.3-5.3-6.7c-0.3-2-0.6-5.4-2-5.7l-1.4-0.3
-			l-2.3,10l-6.2-1.5L176.8,232.1z M182,238l-1.4,6.2l2.2,0.5c1.8,0.4,4,0.3,4.6-2.4c0.5-2.2-0.7-3.3-2.5-3.7L182,238z"/>
-		<path class="st0" d="M208.8,241.1l8.9,4.4c5.8,2.8,8.6,8.4,4.6,16.6c-3.9,8-10,9.7-16,6.7l-8.9-4.4L208.8,241.1z M207.8,264.3
-			c2.6,1.2,5.8,0.9,8.7-5.1c2.9-6,1.2-8.5-1.4-9.8l-2.6-1.3l-7.3,14.9L207.8,264.3z"/>
-		<path class="st0" d="M233.2,253.8l5.5,4.1l-2.2,14.4c-0.2,1.2-0.8,3.3-1.2,4.9l0.1,0.1c0.8-1.2,1.9-3,2.8-4.2l7.4-10l4.2,3.1
-			L234.3,287l-5.4-4l2-14.5c0.2-1.3,0.6-3.1,1-4.5l-0.1-0.1c-0.8,1.2-1.7,2.7-2.5,3.9l-7.4,10l-4.2-3.1L233.2,253.8z"/>
-		<path class="st0" d="M245.4,286.1c-1.8,1.1-3,3.3-0.2,6.3c1.8,2,3.3,1.9,4.3,0.9c1.6-1.5,0.5-3.4-0.6-5.9
-			c-1.7-3.7-3.5-8.3,0.4-12.1c3.5-3.3,8.2-2.6,12.5,2.1c5.2,5.7,3.4,10.5-0.1,12.6l-4.4-3.9c2.4-1.8,2.9-3.7,0.8-5.9
-			c-1.4-1.5-2.7-1.8-3.9-0.7c-1.6,1.5-0.6,3.4,0.5,5.9c1.7,3.7,3.8,8.2-0.1,11.9c-3.4,3.2-8.2,3-12.8-1.9c-4.3-4.6-5.2-9.8-0.6-12.9
-			L245.4,286.1z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<g>
-			<path class="st1" d="M191,321.6l-2.2-13.7c-0.7-4.3-2.2-8-3.6-8s-2.3,3.5-2.3,7.8v3.5c0,4.4-3.9,8.6-8.3,8.6h-3.5
-				c-0.3,0-0.2-0.6-0.2-0.6v9.7c0,0,0,0.9,0.2,0.9h13.2C188.8,329.9,191.7,325.9,191,321.6z"/>
-		</g>
-	</g>
-	<g>
-		<path class="st1" d="M113,321.6l2.2-13.7c0.7-4.3,2.7-8,4-8s2.7,3.5,2.7,7.8v3.5c0,4.4,3.1,8.6,7.4,8.6h3.5c0.3,0,1-0.6,1-0.6v9.7
-			c0,0-0.8,0.9-1,0.9h-13.2C115.3,329.9,112.3,325.9,113,321.6z"/>
-	</g>
-	<path class="st2" d="M171.6,362.9c0,2.8-2.2,5-5,5h-28c-2.8,0-5-2.2-5-5v-48c0-2.8,2.2-5,5-5h28c2.8,0,5,2.2,5,5V362.9z"/>
-</g>
-<g>
-	<path class="st3" d="M326.7,380.9c-1.3-95.1-79.1-172-174.5-172c-93.9,0-170.7,74.6-174.4,167.6c1.8,0.8,3.4,2.3,4.5,4.3
-		c1.5,2.7,1.5,5.5,1.5,7.4c0,0.9,0,1.8,0,2.7h315.7c0-1.4,0-2.7,0-4.1c0-2.5,0.5-4.4,1.4-5.9h-33.7c-1.3-62.3-52.4-112.5-115-112.5
-		s-113.6,50.2-115,112.5h-49.5c1.3-89.6,74.6-162,164.5-162c89,0,161.7,71.1,164.4,159.4c2.2,2.1,3.4,4.9,3.4,8.8c0,1.3,0,2.5,0,3.8
-		h67.9v-10H326.7z M152.2,278.4c57.1,0,103.6,45.8,105,102.5H47.2C48.6,324.2,95.1,278.4,152.2,278.4z"/>
-	<path class="st3" d="M-36.5,387.9c0-1.3,0.1-2.9,0.4-4.5c0.2-0.9,0.5-1.7,0.9-2.5h-48.9v10h47.6C-36.5,389.9-36.5,388.9-36.5,387.9
-		z"/>
-</g>
-<path class="st4" d="M231.4,457.7c0,3.7,0,7.4,0,11.1c0,4.4-2.3,7-6,7c-3.5,0-5.8-2.7-5.8-6.9c0-6.9,0.1-13.7,0-20.6
-	c-0.2-7.8-5.9-14.1-13.3-14.9c-7.7-0.8-14.7,4.1-16.4,11.8c-0.6,2.7-0.3,5.5-0.3,8.3c0,5.1,0,10.3,0,15.4c0,4.2-2.3,6.8-5.8,6.9
-	c-3.4,0.1-6.1-2.5-6.2-6.6c-0.1-6.8,0-13.5-0.1-20.3c-0.1-9.5-6.8-16-16-15.5c-7.3,0.4-13.6,6.6-13.8,14c-0.2,7.2,0,14.4-0.1,21.5
-	c-0.1,5.4-4.6,8.4-8.9,6.1c-1.9-1-3.1-2.7-3.1-4.7c0.1-8.8-0.9-17.7,0.5-26.4c1.7-10.5,7.9-17.7,18-21.1c10.1-3.3,19.3-1.3,27,6.1
-	c2.1,1.9,2.9,1.8,5,0c8.6-7.9,18.7-9.7,29.3-5.1c10.3,4.5,15.7,12.8,16.1,24.1C231.5,451.1,231.4,454.4,231.4,457.7L231.4,457.7z"/>
-<path class="st5" d="M-20.5,419.2c0,10,0,20.1,0,30.1c0,13.9-11.4,26.1-24.9,26.9c-14.7,0.8-27.2-9.2-28.8-23.6
-	c-1.2-10,2.2-18.5,10.3-24.6c8.4-6.3,17.8-7.5,27.6-3.2c3.6,1.6,4,1.4,4-2.6c0-11.5,0-23,0-34.4c0-1.2,0-2.5,0.3-3.7
-	c0.6-2.7,2.5-4,5-4.3c2.4-0.3,4.4,0.7,5.6,2.9c0.9,1.7,1,3.5,1,5.4C-20.5,398.5-20.5,408.9-20.5,419.2z M-62.4,449.2
-	c0,8.4,6.4,15.1,14.6,15.1c8.3,0,15.3-6.8,15.3-15c0-8.1-6.8-14.9-14.9-14.9C-55.9,434.5-62.3,440.9-62.4,449.2z"/>
-<path class="st4" d="M240.6,478.8c0-10.1,0-20.3,0-30.4c0.1-14.5,10.1-25.7,24.9-27.1c12.5-1.2,25.1,6.8,28.3,21
-	c2.4,10.7-0.9,20-9.5,26.9c-8.7,6.9-18.4,7.8-28.6,3.2c-3.3-1.5-3.3-1.6-3.3,2.2c0,12.3,0,24.6,0,36.9c0,2.6-1,4.6-3.4,5.7
-	c-2.3,1-4.4,0.7-6.3-0.8c-1.7-1.3-2.1-3.1-2.1-5.2C240.6,500.4,240.6,489.6,240.6,478.8z M267.5,463.1c8.5,0,15-6.4,15.1-14.8
-	c0-8.5-6.5-15-14.9-15c-8.3,0-15.1,6.6-15.2,14.8C252.4,456.3,259.2,463.1,267.5,463.1z"/>
-<path class="st4" d="M338.2,454.9c2,5.3,6.8,8.7,13,8.8c6,0.1,12.1,0,18.1,0c0.9,0,1.9,0,2.8,0c4.1,0.4,6.5,2.9,6.3,6.4
-	c-0.2,3.4-2.7,5.7-6.8,5.6c-8.4-0.2-16.8,0.8-25.2-0.5c-12.7-2.1-22.3-13.9-22.1-26.5c0.2-13.5,10.1-24.8,23.2-26.5
-	c16.2-2.2,30.8,10,30.8,25.8c0,4.5-2.3,6.8-6.8,6.9c-10.1,0-20.3,0-30.4,0C340.3,454.9,339.3,454.9,338.2,454.9z M351.1,443
-	L351.1,443c4,0,8,0,11.9,0.1c1.7,0,2.4-0.5,1.3-2.1c-3.1-4.6-7.2-7.1-12.8-7c-5.6,0-9.7,2.5-12.8,7.1c-1.2,1.8-0.2,2,1.3,1.9
-	C343.7,442.9,347.4,443,351.1,443z"/>
-<path class="st5" d="M42.3,458c0,3.8,0,7.6,0,11.4c0,4.1-2.2,6.7-5.5,6.8c-3.5,0.1-6.2-2.5-6.3-6.5c-0.2-6.7-0.1-13.3-0.1-20
-	c0-9.2-6.2-15.7-14.9-15.8c-8.4-0.1-15,6.7-15,15.8c-0.1,6.8,0,13.5-0.1,20.3c-0.1,3.2-2,5.5-4.7,6.1c-2.9,0.6-5-0.7-6.4-3.1
-	c-0.7-1.1-0.8-2.3-0.8-3.6c0-7.4-0.1-14.8,0-22.1c0.2-10,7.8-20,17.5-23.6c10.1-3.8,21.4-1.1,28.8,6.7c5,5.2,7.6,11.3,7.4,18.6
-	C42.2,451.9,42.3,455,42.3,458z"/>
-<path class="st4" d="M303.5,427.7c0-13.6,0-27.3,0-40.9c0-2.6,0.8-4.8,3.2-6.2c2.1-1.1,4.1-1,6.1,0.3c2.2,1.4,2.8,3.6,2.8,6.1
-	c0,10.6,0,21.1,0,31.7c0,16.6,0,33.2,0,49.8c0,3.1-0.8,5.7-3.9,6.9c-4.1,1.7-8.1-1.3-8.2-6.2c-0.1-7.6,0-15.2,0-22.7
-	C303.5,440.2,303.5,433.9,303.5,427.7z"/>
-<path class="st4" d="M58.6,475.8c-4.2,0.1-6.8-2-7-5.6c-0.2-3.7,2-6,6.2-6.5c9.6-1.2,14.5-6.5,14.8-16.3
-	c0.4-13.7,12.5-25.5,26.1-25.6c3.8,0,6.5,2.3,6.6,5.7c0.1,3.6-2.2,6.1-6,6.4c-9.3,0.8-14.7,6.4-15,15.9
-	C83.9,463.8,72.4,475.5,58.6,475.8z"/>
-<path class="st4" d="M114.5,448.9c0-6.7,0-13.3,0-20c0-4.2,2.6-7.1,6.1-7.1c3.4,0,6,2.7,6,6.8c0.1,13.4,0.1,26.9,0,40.3
-	c0,4.3-2.7,7-6.3,6.9s-5.8-2.8-5.8-7.3C114.4,462,114.5,455.4,114.5,448.9z"/>
-<path class="st4" d="M120.6,416.7c-3.2,0-6.1-2.8-6.1-6c0-3.2,2.9-6.1,6.1-6c3.2,0,6,3,6,6.2C126.5,413.9,123.6,416.7,120.6,416.7z"
-	/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, 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 736.1 224" style="enable-background:new 0 0 736.1 224;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#F7C94A;}
+	.st1{fill:#313131;}
+</style>
+<g>
+	<path class="st0" d="M497.1,126.6c0,6.3,0.1,12.7,0,19c-0.1,6.2-4.1,10.3-9.8,10.3c-5.4-0.1-9.2-4.2-9.3-10.2
+		c-0.1-11.3,0.1-22.7-0.1-34c-0.2-12.9-9.6-23.3-21.8-24.6c-12.3-1.3-23.4,6.5-26.5,18.8c-0.6,2.2-0.6,4.6-0.7,6.9
+		c-0.1,10.7,0,21.3,0,32c0,6.8-3.7,11-9.5,11.2c-5.5,0.1-9.8-4.2-9.9-10.8c-0.2-11.5,0.1-23-0.2-34.5c-0.5-17.3-17.2-28.2-33.3-21.8
+		c-9.3,3.8-14.7,10.9-15,21c-0.4,11-0.1,22-0.2,33c0,1.7,0,3.4-0.3,5c-1,5-5.2,8.4-9.9,8.1c-4.8-0.3-9.2-3.9-9.2-8.9
+		c0-14.3-1.5-28.7,0.8-42.9c2.7-17.1,12.9-28.7,29.3-34.1c16.4-5.4,31.3-1.9,43.9,9.9c3,2.8,4.3,3.4,7.7,0.2
+		c13.8-13.1,30.2-16.1,47.5-8.8c17,7.2,25.9,20.8,26.6,39.4C497.2,115.9,497.1,121.3,497.1,126.6z"/>
+	<path class="st1" d="M87.7,63.8c0,16.5,0,33,0,49.5c-0.1,22.3-18.4,42-40.3,43.4c-23.9,1.5-44.3-14.9-47-38.2
+		c-1.9-16.3,3.5-30.1,16.5-40C30.7,68,46,66,62.1,73.3c5.4,2.4,6.2,2,6.2-4.1c0-18.5,0-37,0-55.5c0-1.8,0-3.7,0.2-5.5
+		c0.6-4.8,3.7-7.4,8.2-8.1c4.7-0.7,8,1.5,9.9,5.8c1,2.4,1,4.9,1,7.4C87.7,30.1,87.7,47,87.7,63.8z M19.7,112.8
+		c0,13.6,10.5,24.4,23.8,24.4c13.5,0,24.8-11.2,24.7-24.4C68.1,99.5,57,88.6,43.8,88.7C30.3,88.7,19.8,99.2,19.7,112.8z"/>
+	<path class="st0" d="M512,161c0-16.5-0.1-33,0-49.5c0.1-23.6,16.2-41.7,40.4-44.1c20.3-2,40.6,11.1,45.9,33.5
+		c4.1,17.4-1,32.5-14.8,43.8c-14,11.5-29.7,13.1-46.3,5.9c-1.1-0.5-2.1-1-3.1-1.6c-2.2-1.4-2.9-0.6-2.9,1.8c0.1,6.7,0,13.3,0,20
+		c0,13.7,0,27.3,0,41c0,8.2-3.3,12.3-9.7,12.2c-6.2-0.1-9.4-4.2-9.4-12C512,194.9,512,177.9,512,161z M555.6,135.2
+		c13.8,0,24.4-10.4,24.5-24.1c0-13.8-10.5-24.3-24.2-24.4c-13.5,0-24.6,10.8-24.7,24.1C531.1,124.2,542.1,135.2,555.6,135.2z"/>
+	<path class="st0" d="M670.4,122.6c4.5,9,11.8,13.3,21.5,13.6c10,0.3,20,0.1,30,0.1c2,0,4,0.1,6,0.4c5.1,0.9,8.3,4.7,8.3,9.7
+		c-0.1,4.9-3.5,9.3-8.6,9.4c-15,0-30,1.8-44.9-1c-19.9-3.7-35.3-23.7-34.4-43.4c1-22.1,16.6-39.7,37.8-42.5
+		c25.9-3.5,49.4,15.9,50,41c0.2,8.2-3.4,12-11.6,12.1c-16.3,0-32.6,0-49,0C673.9,121.9,672.3,121.4,670.4,122.6z M669.8,102.6
+		c14.4,0,27.9,0,41.3,0c3.2,0,3.5-1.2,1.9-3.5c-5.5-8.1-13.1-12-22.9-11.2C680.9,88.7,674.4,93.5,669.8,102.6z"/>
+	<path class="st1" d="M189.7,125.4c0,7.6,0,13.8,0,19.9c-0.1,6.7-3.5,10.9-8.8,11.2c-5.8,0.3-10.3-4-10.4-10.9
+		c-0.3-11.5,0-23-0.1-34.5c-0.1-9.9-6.7-18.8-16.1-21.9c-16.3-5.3-31.9,5.7-32.4,22.9c-0.3,10-0.1,20-0.1,30c0,1.5,0,3-0.1,4.5
+		c-0.5,5.6-4.5,9.7-9.4,9.8c-5.2,0.1-9.6-4.1-9.8-10c-0.2-9.2-0.1-18.3-0.1-27.5c0-5.8-0.2-11.6,1.3-17.4
+		c5.3-20.4,22.9-33.8,44.2-33.4c19.3,0.4,37.4,15.5,41.4,35.1C190.7,111.1,189.4,119,189.7,125.4z"/>
+	<path class="st0" d="M614.1,78c0-21.6,0-43.3,0-64.9c0-2,0.1-4,0.6-5.9c1.2-4.5,4.5-6.9,9.1-7.1c4.4-0.2,8.3,2.8,9.5,7.3
+		c0.4,1.7,0.5,3.6,0.5,5.4c0,43.4,0,86.9,0,130.3c0,0.7,0,1.3,0,2c-0.2,6.6-4.2,10.9-10,10.8c-5.7-0.1-9.6-4.4-9.8-11
+		c-0.1-3.3,0-6.7,0-10C614.1,115.9,614.1,97,614.1,78z"/>
+	<path class="st0" d="M216.2,155.9c-6.5,0.1-10.8-3.2-11.3-8.7c-0.5-6.1,3-10,9.7-10.9c16.5-2.2,23.8-10.3,24.3-27.1
+		c0.8-21.8,20.7-41,42.6-41c6.2,0,10.5,3.8,10.7,9.5c0.2,5.8-3.6,9.8-9.9,10.2c-15,1.1-23.7,10.4-24.2,26
+		C257.4,136.5,238.5,155.5,216.2,155.9z"/>
+	<path class="st0" d="M307,111.8c0-10.7,0-21.3,0-32c0-6.8,4-11.5,9.7-11.6c5.7-0.1,9.9,4.5,9.9,11.5c0.1,21.5,0.1,43,0,64.5
+		c0,7.3-4.2,11.9-10,11.8c-6.1-0.2-9.6-4.6-9.6-12.2C307,133.1,307,122.4,307,111.8z"/>
+	<path class="st0" d="M316.6,59.9c-5.3-0.2-9.7-4.9-9.5-10.1c0.2-5.2,5.1-9.8,10.2-9.5c5.2,0.3,9.6,5.3,9.3,10.4
+		C326.3,55.7,321.6,60,316.6,59.9z"/>
+</g>
+</svg>