diff --git a/infra-templates/mesos/catalogIcon-mesos.png b/infra-templates/mesos/catalogIcon-mesos.png
deleted file mode 100644
index 5b3d3da..0000000
Binary files a/infra-templates/mesos/catalogIcon-mesos.png and /dev/null differ
diff --git a/infra-templates/mesos/catalogIcon-mesos.svg b/infra-templates/mesos/catalogIcon-mesos.svg
new file mode 100644
index 0000000..e976119
--- /dev/null
+++ b/infra-templates/mesos/catalogIcon-mesos.svg
@@ -0,0 +1,76 @@
+<?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="-345 257 100 100" style="enable-background:new -345 257 100 100;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#00435A;}
+	.st1{fill:#00AEDE;}
+	.st2{fill:#394D54;}
+</style>
+<g>
+	<path class="st0" d="M-281.5,306v-13.8l-11.9,6.9L-281.5,306"/>
+	<path class="st1" d="M-282.2,290.8l-11.9-6.9v13.8L-282.2,290.8"/>
+	<path class="st1" d="M-295.7,297.7v-13.8l-12,6.9L-295.7,297.7"/>
+	<path class="st1" d="M-296.5,282.6l-11.9-6.9v13.9L-296.5,282.6"/>
+	<path class="st0" d="M-282.2,307.3l-11.9-6.9v13.8L-282.2,307.3"/>
+	<path class="st0" d="M-295.7,314.3v-13.8l-12,6.9L-295.7,314.3"/>
+	<path class="st1" d="M-267.9,299.1l-12-6.9V306L-267.9,299.1"/>
+	<path class="st1" d="M-310,289.5v-13.9l-12,6.9L-310,289.5"/>
+	<path class="st0" d="M-296.5,315.6l-11.9-6.9v13.8L-296.5,315.6"/>
+	<path class="st1" d="M-310,322.5v-13.8l-12,6.9L-310,322.5"/>
+	<path class="st0" d="M-296.5,299.1l-11.9-6.9V306L-296.5,299.1"/>
+	<path class="st1" d="M-281.5,289.5v-13.9l-11.9,6.9L-281.5,289.5"/>
+	<path class="st0" d="M-294.2,267.4v13.8l11.9-6.9L-294.2,267.4"/>
+	<path class="st0" d="M-307.7,274.3l12,6.9v-13.8L-307.7,274.3"/>
+	<path class="st0" d="M-282.2,323.8l-11.9-6.9v13.8L-282.2,323.8"/>
+	<path class="st0" d="M-295.7,330.8v-13.8l-12,6.9L-295.7,330.8"/>
+	<path class="st1" d="M-267.2,314.3v-13.8l-11.9,6.9L-267.2,314.3"/>
+	<path class="st1" d="M-310,306v-13.9l-12,6.9L-310,306"/>
+	<path class="st1" d="M-310.8,307.3l-12.1-6.9v13.8L-310.8,307.3"/>
+	<path class="st1" d="M-267.2,297.7v-13.8l-11.9,6.9L-267.2,297.7"/>
+	<path class="st1" d="M-267.9,282.6l-12-6.9v13.9L-267.9,282.6"/>
+	<path class="st1" d="M-267.9,315.6l-12-6.9v13.8L-267.9,315.6"/>
+	<path class="st0" d="M-281.5,322.5v-13.8l-11.9,6.9L-281.5,322.5"/>
+	<path class="st1" d="M-310.8,290.8l-12.1-6.9v13.8L-310.8,290.8"/>
+</g>
+<g>
+	<path class="st2" d="M-306.3,333.9v13.7h-2.3v-8.9c0-0.4,0-0.7,0.1-1.1l-4.2,7.8c-0.2,0.4-0.5,0.6-0.9,0.6h-0.4
+		c-0.4,0-0.7-0.2-0.9-0.6l-4.2-7.8c0,0.2,0,0.4,0,0.6c0,0.2,0,0.4,0,0.6v8.9h-2.3v-13.7h1.9c0.1,0,0.2,0,0.3,0c0.1,0,0.2,0,0.2,0
+		c0.1,0,0.1,0.1,0.2,0.1c0.1,0.1,0.1,0.1,0.2,0.2l4.1,7.6c0.1,0.2,0.2,0.4,0.3,0.6c0.1,0.2,0.2,0.4,0.3,0.7c0.1-0.2,0.2-0.5,0.3-0.7
+		c0.1-0.2,0.2-0.4,0.3-0.6l4.1-7.6c0.1-0.1,0.1-0.2,0.2-0.2c0.1-0.1,0.1-0.1,0.2-0.1c0.1,0,0.1,0,0.2,0c0.1,0,0.2,0,0.3,0H-306.3z"
+		/>
+	<path class="st2" d="M-302.1,343c0,0.5,0.1,0.9,0.3,1.3s0.3,0.7,0.6,0.9c0.2,0.2,0.5,0.4,0.8,0.5s0.7,0.2,1,0.2c0.4,0,0.7,0,1-0.1
+		s0.5-0.2,0.7-0.3c0.2-0.1,0.4-0.2,0.5-0.3c0.2-0.1,0.3-0.1,0.5-0.1c0.2,0,0.3,0.1,0.4,0.2l0.7,0.9c-0.3,0.3-0.6,0.6-0.9,0.8
+		c-0.3,0.2-0.7,0.4-1,0.5c-0.4,0.1-0.7,0.2-1.1,0.3c-0.4,0.1-0.7,0.1-1.1,0.1c-0.7,0-1.3-0.1-1.9-0.3c-0.6-0.2-1.1-0.6-1.5-1
+		c-0.4-0.4-0.8-1-1-1.6s-0.4-1.4-0.4-2.3c0-0.7,0.1-1.3,0.3-1.9c0.2-0.6,0.5-1.1,0.9-1.5c0.4-0.4,0.9-0.8,1.5-1
+		c0.6-0.3,1.2-0.4,2-0.4c0.6,0,1.2,0.1,1.7,0.3c0.5,0.2,1,0.5,1.3,0.9c0.4,0.4,0.7,0.8,0.9,1.4c0.2,0.5,0.3,1.2,0.3,1.9
+		c0,0.4,0,0.6-0.1,0.7c-0.1,0.1-0.2,0.2-0.4,0.2H-302.1z M-297.6,341.6c0-0.3,0-0.6-0.1-0.9c-0.1-0.3-0.2-0.5-0.4-0.7
+		c-0.2-0.2-0.4-0.4-0.7-0.5c-0.3-0.1-0.6-0.2-0.9-0.2c-0.7,0-1.2,0.2-1.6,0.6c-0.4,0.4-0.6,0.9-0.7,1.6H-297.6z"/>
+	<path class="st2" d="M-287.8,339.8c-0.1,0.1-0.1,0.2-0.2,0.2c-0.1,0-0.2,0.1-0.3,0.1c-0.1,0-0.2,0-0.4-0.1
+		c-0.1-0.1-0.3-0.1-0.5-0.2c-0.2-0.1-0.4-0.2-0.6-0.2s-0.5-0.1-0.8-0.1c-0.5,0-0.8,0.1-1.1,0.3c-0.3,0.2-0.4,0.5-0.4,0.8
+		c0,0.2,0.1,0.4,0.2,0.5c0.1,0.1,0.3,0.3,0.5,0.4c0.2,0.1,0.5,0.2,0.8,0.3c0.3,0.1,0.6,0.2,0.9,0.3c0.3,0.1,0.6,0.2,0.9,0.3
+		c0.3,0.1,0.5,0.3,0.8,0.5c0.2,0.2,0.4,0.4,0.5,0.7c0.1,0.3,0.2,0.6,0.2,1c0,0.5-0.1,0.9-0.3,1.3c-0.2,0.4-0.4,0.7-0.7,1
+		c-0.3,0.3-0.7,0.5-1.2,0.7c-0.5,0.2-1,0.2-1.7,0.2c-0.3,0-0.7,0-1-0.1c-0.3-0.1-0.6-0.1-0.9-0.3c-0.3-0.1-0.6-0.2-0.8-0.4
+		c-0.2-0.1-0.5-0.3-0.7-0.5l0.5-0.9c0.1-0.1,0.2-0.2,0.2-0.2c0.1-0.1,0.2-0.1,0.4-0.1c0.1,0,0.3,0,0.4,0.1c0.1,0.1,0.3,0.2,0.5,0.3
+		c0.2,0.1,0.4,0.2,0.6,0.3c0.2,0.1,0.5,0.1,0.9,0.1c0.3,0,0.5,0,0.7-0.1c0.2-0.1,0.4-0.2,0.5-0.3c0.1-0.1,0.2-0.2,0.3-0.4
+		s0.1-0.3,0.1-0.4c0-0.2-0.1-0.4-0.2-0.6c-0.1-0.1-0.3-0.3-0.5-0.4c-0.2-0.1-0.5-0.2-0.8-0.3c-0.3-0.1-0.6-0.2-0.9-0.3
+		c-0.3-0.1-0.6-0.2-0.9-0.4c-0.3-0.1-0.5-0.3-0.8-0.5s-0.4-0.5-0.5-0.8c-0.1-0.3-0.2-0.7-0.2-1.1c0-0.4,0.1-0.8,0.2-1.1
+		c0.2-0.4,0.4-0.7,0.7-0.9s0.7-0.5,1.2-0.6c0.5-0.2,1-0.2,1.6-0.2c0.7,0,1.3,0.1,1.8,0.3s1,0.5,1.4,0.9L-287.8,339.8z"/>
+	<path class="st2" d="M-281.1,337.7c0.7,0,1.4,0.1,2,0.4c0.6,0.2,1.1,0.6,1.5,1c0.4,0.4,0.7,1,1,1.6c0.2,0.6,0.3,1.3,0.3,2.1
+		c0,0.8-0.1,1.5-0.3,2.1c-0.2,0.6-0.6,1.1-1,1.6c-0.4,0.4-0.9,0.8-1.5,1c-0.6,0.2-1.2,0.4-2,0.4c-0.7,0-1.4-0.1-2-0.4
+		c-0.6-0.2-1.1-0.6-1.5-1c-0.4-0.4-0.7-1-1-1.6c-0.2-0.6-0.3-1.3-0.3-2.1c0-0.8,0.1-1.5,0.3-2.1c0.2-0.6,0.6-1.1,1-1.6
+		c0.4-0.4,0.9-0.8,1.5-1C-282.5,337.8-281.8,337.7-281.1,337.7z M-281.1,346c0.8,0,1.4-0.3,1.8-0.8s0.6-1.3,0.6-2.4
+		c0-1.1-0.2-1.9-0.6-2.4c-0.4-0.6-1-0.8-1.8-0.8c-0.8,0-1.4,0.3-1.8,0.8c-0.4,0.6-0.6,1.4-0.6,2.4c0,1,0.2,1.8,0.6,2.4
+		C-282.5,345.7-281.9,346-281.1,346z"/>
+	<path class="st2" d="M-268.5,339.8c-0.1,0.1-0.1,0.2-0.2,0.2c-0.1,0-0.2,0.1-0.3,0.1c-0.1,0-0.2,0-0.4-0.1
+		c-0.1-0.1-0.3-0.1-0.5-0.2s-0.4-0.2-0.6-0.2s-0.5-0.1-0.8-0.1c-0.5,0-0.8,0.1-1.1,0.3s-0.4,0.5-0.4,0.8c0,0.2,0.1,0.4,0.2,0.5
+		c0.1,0.1,0.3,0.3,0.5,0.4c0.2,0.1,0.5,0.2,0.8,0.3c0.3,0.1,0.6,0.2,0.9,0.3c0.3,0.1,0.6,0.2,0.9,0.3c0.3,0.1,0.5,0.3,0.8,0.5
+		c0.2,0.2,0.4,0.4,0.5,0.7c0.1,0.3,0.2,0.6,0.2,1c0,0.5-0.1,0.9-0.3,1.3c-0.2,0.4-0.4,0.7-0.7,1s-0.7,0.5-1.2,0.7
+		c-0.5,0.2-1,0.2-1.7,0.2c-0.3,0-0.7,0-1-0.1c-0.3-0.1-0.6-0.1-0.9-0.3c-0.3-0.1-0.6-0.2-0.8-0.4c-0.3-0.1-0.5-0.3-0.7-0.5l0.5-0.9
+		c0.1-0.1,0.2-0.2,0.2-0.2c0.1-0.1,0.2-0.1,0.4-0.1c0.1,0,0.3,0,0.4,0.1c0.1,0.1,0.3,0.2,0.5,0.3s0.4,0.2,0.6,0.3
+		c0.2,0.1,0.5,0.1,0.9,0.1c0.3,0,0.5,0,0.7-0.1c0.2-0.1,0.4-0.2,0.5-0.3s0.2-0.2,0.3-0.4c0.1-0.1,0.1-0.3,0.1-0.4
+		c0-0.2-0.1-0.4-0.2-0.6c-0.1-0.1-0.3-0.3-0.5-0.4c-0.2-0.1-0.5-0.2-0.8-0.3c-0.3-0.1-0.6-0.2-0.9-0.3c-0.3-0.1-0.6-0.2-0.9-0.4
+		c-0.3-0.1-0.5-0.3-0.8-0.5s-0.4-0.5-0.5-0.8c-0.1-0.3-0.2-0.7-0.2-1.1c0-0.4,0.1-0.8,0.2-1.1s0.4-0.7,0.7-0.9
+		c0.3-0.3,0.7-0.5,1.1-0.6c0.5-0.2,1-0.2,1.6-0.2c0.7,0,1.3,0.1,1.8,0.3s1,0.5,1.4,0.9L-268.5,339.8z"/>
+</g>
+</svg>