diff --git a/app/assets/images/map-icon-both.svg b/app/assets/images/map-icon-both.svg
index 4a11ea0cd7..08ffa25f6c 100644
--- a/app/assets/images/map-icon-both.svg
+++ b/app/assets/images/map-icon-both.svg
@@ -1,31 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="30.194px" height="40px" viewBox="72.098 -63.317 30.194 40" enable-background="new 72.098 -63.317 30.194 40"
-	 xml:space="preserve">
-<g id="Layer_1">
+<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 30.2 40" enable-background="new 0 0 30.2 40" xml:space="preserve">
+<g id="Layer_1_1_">
 	<g>
 		<g>
 			<g>
-				<path fill="#A84333" d="M87.195-23.817c-0.114,0-0.229-0.039-0.322-0.117c-0.582-0.49-14.274-12.143-14.274-24.259
-					c0-8.063,6.548-14.624,14.597-14.624s14.597,6.561,14.597,14.624c0,12.331-13.695,23.78-14.278,24.262
-					C87.421-23.855,87.308-23.817,87.195-23.817z"/>
-				<path fill="#E5E5E5" d="M87.195-62.317c8.012,0,14.097,6.536,14.097,14.124c0,12.237-14.097,23.876-14.097,23.876
-					S73.098-36.17,73.098-48.193C73.098-55.781,79.184-62.317,87.195-62.317 M87.195-63.317c-8.324,0-15.097,6.785-15.097,15.124
-					c0,12.346,13.863,24.145,14.453,24.641c0.186,0.156,0.415,0.235,0.644,0.235c0.226,0,0.452-0.076,0.637-0.229
-					c0.59-0.487,14.46-12.083,14.46-24.647C102.292-56.532,95.519-63.317,87.195-63.317L87.195-63.317z"/>
+				<path fill="#C1122B" d="M15.1,39.5c-0.1,0-0.2,0-0.3-0.1C14.2,38.9,0.5,27.2,0.5,15.1C0.5,7.1,7,0.5,15.1,0.5
+					s14.6,6.6,14.6,14.6c0,12.3-13.7,23.8-14.3,24.3C15.3,39.5,15.2,39.5,15.1,39.5z"/>
+				<path fill="#E5E5E5" d="M15.1,1c8,0,14.1,6.5,14.1,14.1C29.2,27.4,15.1,39,15.1,39S1,27.1,1,15.1C1,7.5,7.1,1,15.1,1 M15.1,0
+					C6.8,0,0,6.8,0,15.1c0,12.3,13.9,24.1,14.5,24.6c0.2,0.2,0.4,0.2,0.6,0.2c0.2,0,0.5-0.1,0.6-0.2c0.6-0.5,14.5-12.1,14.5-24.6
+					C30.2,6.8,23.4,0,15.1,0L15.1,0z"/>
 			</g>
 		</g>
 		<g>
 			<g>
-				<path fill="#186D5D" d="M87.195-30.817c-0.114,0-0.229-0.039-0.322-0.117c-0.37-0.312-9.081-7.726-9.081-15.462
-					c0-5.194,4.219-9.42,9.403-9.42s9.403,4.226,9.403,9.42c0,7.874-8.714,15.159-9.085,15.465
-					C87.421-30.855,87.308-30.817,87.195-30.817z"/>
-				<path fill="#E5E5E5" d="M87.195-55.317c5.06,0,8.903,4.128,8.903,8.92c0,7.729-8.903,15.08-8.903,15.08
-					s-8.903-7.487-8.903-15.08C78.292-51.189,82.135-55.317,87.195-55.317 M87.195-56.317c-5.461,0-9.903,4.45-9.903,9.92
-					c0,7.967,8.882,15.527,9.26,15.845c0.186,0.156,0.415,0.235,0.644,0.235c0.226,0,0.452-0.076,0.637-0.229
-					c0.378-0.312,9.267-7.744,9.267-15.851C97.098-51.866,92.656-56.317,87.195-56.317L87.195-56.317z"/>
+				<path fill="#0B8C61" d="M15.1,32.5c-0.1,0-0.2,0-0.3-0.1c-0.4-0.3-9.1-7.7-9.1-15.5c0-5.2,4.2-9.4,9.4-9.4s9.4,4.2,9.4,9.4
+					c0,7.9-8.7,15.2-9.1,15.5C15.3,32.5,15.2,32.5,15.1,32.5z"/>
+				<path fill="#E5E5E5" d="M15.1,8c5.1,0,8.9,4.1,8.9,8.9c0,7.7-8.9,15.1-8.9,15.1s-8.9-7.5-8.9-15.1C6.2,12.1,10,8,15.1,8 M15.1,7
+					c-5.5,0-9.9,4.5-9.9,9.9c0,8,8.9,15.5,9.3,15.8c0.2,0.2,0.4,0.2,0.6,0.2c0.2,0,0.5-0.1,0.6-0.2C16.1,32.5,25,25,25,16.9
+					C25,11.5,20.6,7,15.1,7L15.1,7z"/>
 			</g>
 		</g>
 	</g>
diff --git a/app/assets/images/map-icon-hub.svg b/app/assets/images/map-icon-hub.svg
index 34665a2870..bb0e20aec4 100644
--- a/app/assets/images/map-icon-hub.svg
+++ b/app/assets/images/map-icon-hub.svg
@@ -1,33 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="30.194px" height="40px" viewBox="-27.975 -63.317 30.194 40" enable-background="new -27.975 -63.317 30.194 40"
-	 xml:space="preserve">
-<g id="Layer_1">
+<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 30.2 40" enable-background="new 0 0 30.2 40" xml:space="preserve">
+<g id="Layer_1_1_">
 	<g>
 		<g>
 			<g>
-				<path fill="#A84333" d="M-12.878-23.817c-0.114,0-0.229-0.039-0.322-0.117c-0.583-0.49-14.275-12.143-14.275-24.259
-					c0-8.063,6.548-14.624,14.597-14.624S1.719-56.256,1.719-48.193c0,12.331-13.696,23.78-14.279,24.262
-					C-12.652-23.855-12.766-23.817-12.878-23.817z"/>
-				<path fill="#E5E5E5" d="M-12.878-62.317c8.012,0,14.097,6.536,14.097,14.124c0,12.237-14.097,23.876-14.097,23.876
-					S-26.975-36.17-26.975-48.193C-26.975-55.781-20.89-62.317-12.878-62.317 M-12.878-63.317c-8.324,0-15.097,6.785-15.097,15.124
-					c0,12.346,13.863,24.145,14.453,24.641c0.186,0.156,0.415,0.235,0.644,0.235c0.226,0,0.452-0.076,0.637-0.229
-					c0.59-0.487,14.46-12.083,14.46-24.647C2.219-56.532-4.554-63.317-12.878-63.317L-12.878-63.317z"/>
+				<path fill="#C1122B" d="M15.1,39.5c-0.1,0-0.2,0-0.3-0.1C14.2,38.9,0.5,27.2,0.5,15.1C0.5,7.1,7,0.5,15.1,0.5
+					s14.6,6.6,14.6,14.6c0,12.3-13.7,23.8-14.3,24.3C15.3,39.5,15.2,39.5,15.1,39.5z"/>
+				<path fill="#E5E5E5" d="M15.1,1c8,0,14.1,6.5,14.1,14.1C29.2,27.4,15.1,39,15.1,39S1,27.1,1,15.1C1,7.5,7.1,1,15.1,1 M15.1,0
+					C6.8,0,0,6.8,0,15.1c0,12.3,13.9,24.1,14.5,24.6c0.2,0.2,0.4,0.2,0.6,0.2c0.2,0,0.5-0.1,0.6-0.2c0.6-0.5,14.5-12.1,14.5-24.6
+					C30.2,6.8,23.4,0,15.1,0L15.1,0z"/>
 			</g>
 		</g>
-		<path fill="#FFFFFF" d="M-11.075-41.6c1.854-3.218,3.932-7.308,3.932-9.517c-0.001-3.161-2.574-5.734-5.736-5.734
-			c-3.162,0-5.735,2.573-5.735,5.735c0,2.212,2.076,6.301,3.932,9.517c-2.107,0.338-3.493,1.226-3.493,2.297
-			c-0.001,1.397,2.276,2.451,5.296,2.451s5.296-1.054,5.296-2.452C-7.583-40.375-8.969-41.262-11.075-41.6z M-15.734-51.117
-			c0-1.575,1.281-2.854,2.855-2.854c1.575,0,2.856,1.28,2.856,2.854c0,1.576-1.281,2.858-2.856,2.858
-			C-14.453-48.259-15.734-49.541-15.734-51.117z M-12.879-37.583c-2.69,0-4.565-0.905-4.565-1.72c0-0.607,1.174-1.363,3.151-1.621
-			c0.095,0.163,0.175,0.294,0.261,0.439c0.047,0.079,0.097,0.161,0.141,0.237c0.109,0.179,0.201,0.329,0.288,0.472
-			c0.028,0.044,0.057,0.094,0.083,0.134c0.094,0.155,0.167,0.272,0.223,0.363c0.006,0.007,0.014,0.022,0.02,0.031
-			c0.056,0.09,0.089,0.141,0.089,0.141l0.308,0.487l0.311-0.487c0,0,0.029-0.046,0.084-0.132c0.013-0.02,0.031-0.051,0.047-0.077
-			c0.055-0.086,0.119-0.189,0.204-0.329c0.02-0.031,0.042-0.069,0.064-0.101c0.091-0.151,0.191-0.314,0.308-0.508
-			c0.039-0.066,0.085-0.143,0.127-0.215c0.089-0.148,0.173-0.287,0.271-0.454c1.978,0.258,3.15,1.013,3.15,1.621
-			C-8.315-38.488-10.19-37.583-12.879-37.583z"/>
+		<path fill="#FFFFFF" d="M16.9,21.7c1.9-3.2,3.9-7.3,3.9-9.5c0-3.2-2.6-5.7-5.7-5.7S9.4,9,9.4,12.2c0,2.2,2.1,6.3,3.9,9.5
+			c-2.1,0.3-3.5,1.2-3.5,2.3c0,1.4,2.3,2.5,5.3,2.5s5.3-1.1,5.3-2.5C20.4,22.9,19,22.1,16.9,21.7z M12.2,12.2c0-1.6,1.3-2.9,2.9-2.9
+			c1.6,0,2.9,1.3,2.9,2.9c0,1.6-1.3,2.9-2.9,2.9C13.5,15.1,12.2,13.8,12.2,12.2z M15.1,25.7c-2.7,0-4.6-0.9-4.6-1.7
+			c0-0.6,1.2-1.4,3.2-1.6c0.1,0.2,0.2,0.3,0.3,0.4c0,0.1,0.1,0.2,0.1,0.2c0.1,0.2,0.2,0.3,0.3,0.5c0,0,0.1,0.1,0.1,0.1
+			c0.1,0.2,0.2,0.3,0.2,0.4c0,0,0,0,0,0c0.1,0.1,0.1,0.1,0.1,0.1l0.3,0.5l0.3-0.5c0,0,0,0,0.1-0.1c0,0,0-0.1,0-0.1
+			c0.1-0.1,0.1-0.2,0.2-0.3c0,0,0-0.1,0.1-0.1c0.1-0.2,0.2-0.3,0.3-0.5c0-0.1,0.1-0.1,0.1-0.2c0.1-0.1,0.2-0.3,0.3-0.5
+			c2,0.3,3.2,1,3.2,1.6C19.7,24.8,17.8,25.7,15.1,25.7z"/>
 	</g>
 </g>
 <g id="source_files" display="none">
diff --git a/app/assets/images/map-icon-producer.svg b/app/assets/images/map-icon-producer.svg
index 7af7c35bf1..1f2e4184a1 100644
--- a/app/assets/images/map-icon-producer.svg
+++ b/app/assets/images/map-icon-producer.svg
@@ -1,36 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="30.194px" height="40px" viewBox="22.265 -63.317 30.194 40" enable-background="new 22.265 -63.317 30.194 40"
-	 xml:space="preserve">
-<g id="Layer_1">
+<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 30.2 40" enable-background="new 0 0 30.2 40" xml:space="preserve">
+<g id="Layer_1_1_">
 	<g>
 		<g>
 			<g>
-				<path fill="#186D5D" d="M37.362-23.817c-0.114,0-0.229-0.039-0.322-0.117c-0.583-0.49-14.275-12.143-14.275-24.259
-					c0-8.063,6.548-14.624,14.597-14.624s14.597,6.561,14.597,14.624c0,12.331-13.695,23.78-14.278,24.262
-					C37.588-23.855,37.475-23.817,37.362-23.817z"/>
-				<path fill="#E5E5E5" d="M37.362-62.317c8.012,0,14.097,6.536,14.097,14.124c0,12.237-14.097,23.876-14.097,23.876
-					S23.265-36.17,23.265-48.193C23.265-55.781,29.351-62.317,37.362-62.317 M37.362-63.317c-8.324,0-15.097,6.785-15.097,15.124
-					c0,12.346,13.863,24.145,14.453,24.641c0.186,0.156,0.415,0.235,0.644,0.235c0.226,0,0.452-0.076,0.637-0.229
-					c0.59-0.487,14.46-12.083,14.46-24.647C52.459-56.532,45.687-63.317,37.362-63.317L37.362-63.317z"/>
+				<path fill="#0B8C61" d="M15.1,39.5c-0.1,0-0.2,0-0.3-0.1C14.2,38.9,0.5,27.2,0.5,15.1C0.5,7.1,7,0.5,15.1,0.5
+					s14.6,6.6,14.6,14.6c0,12.3-13.7,23.8-14.3,24.3C15.3,39.5,15.2,39.5,15.1,39.5z"/>
+				<path fill="#E5E5E5" d="M15.1,1c8,0,14.1,6.5,14.1,14.1C29.2,27.4,15.1,39,15.1,39S1,27.1,1,15.1C1,7.5,7.1,1,15.1,1 M15.1,0
+					C6.8,0,0,6.8,0,15.1c0,12.3,13.9,24.1,14.5,24.6c0.2,0.2,0.4,0.2,0.6,0.2c0.2,0,0.5-0.1,0.6-0.2c0.6-0.5,14.5-12.1,14.5-24.6
+					C30.2,6.8,23.4,0,15.1,0L15.1,0z"/>
 			</g>
 		</g>
 		<g>
-			<path fill="#FFFFFF" d="M30.582-48.026c2.868-0.803,5.752,1.237,6.111,4.19c0.013,0.119,0.031,0.239,0.051,0.388
-				c0.127,0.016,0.245,0.045,0.36,0.041c2.406-0.062,4.816-0.066,7.22-0.187c-1.002,0.278-1.741,1.196-1.741,2.285
-				c0,1.31,1.064,2.374,2.375,2.374c1.309,0,2.375-1.064,2.375-2.374c0-1.184-0.874-2.165-2.008-2.343
-				c1.773-0.112,1.43-0.058,1.727-1.654c0.144-0.77,0.235-1.551,0.299-2.331c0.061-0.729-0.124-0.9-0.838-0.928
-				c-1.063-0.038-2.043-0.078-3.105-0.121c-0.032-0.001-0.085-0.024-0.085-0.066c0-0.801,0.041-2.747,0.041-2.747
-				s-0.43-0.316-0.925-0.039c0,0.908,0,1.829,0,2.794c0,0-1.296-0.034-3.144-0.072c-0.082-0.002-0.31-0.141-0.418-0.433
-				c-0.278-0.767-0.885-2.262-1.681-4.562c0,0-0.412-0.982-1.455-0.982c-0.863,0-5.174,0-5.174,0v5.749c0,0-0.39,0.164-0.717,0.197
-				C29.711-48.005,29.798-47.807,30.582-48.026z M46.205-41.308c0,0.688-0.56,1.248-1.247,1.248c-0.687,0-1.247-0.56-1.247-1.248
-				c0-0.687,0.56-1.246,1.247-1.246C45.645-42.554,46.205-41.995,46.205-41.308z M31.835-52.03l0.004-1.072l4.376-0.007l1.397,4.217
-				l0.05,0.02c-1.906-0.026-4.042,0.002-5.83,0.067L31.835-52.03z"/>
-			<path fill="#FFFFFF" d="M31.661-47.507c-2.371,0-4.299,1.928-4.299,4.298c0,2.37,1.928,4.298,4.299,4.298
-				c2.369,0,4.296-1.928,4.296-4.298C35.958-45.579,34.03-47.507,31.661-47.507z M31.661-40.823c-1.317,0-2.387-1.07-2.387-2.386
-				c0-1.316,1.07-2.387,2.387-2.387c1.316,0,2.387,1.071,2.387,2.387C34.048-41.893,32.977-40.823,31.661-40.823z"/>
+			<path fill="#FFFFFF" d="M8.3,15.3c2.9-0.8,5.8,1.2,6.1,4.2c0,0.1,0,0.2,0.1,0.4c0.1,0,0.2,0,0.4,0c2.4-0.1,4.8-0.1,7.2-0.2
+				c-1,0.3-1.7,1.2-1.7,2.3c0,1.3,1.1,2.4,2.4,2.4c1.3,0,2.4-1.1,2.4-2.4c0-1.2-0.9-2.2-2-2.3c1.8-0.1,1.4-0.1,1.7-1.7
+				c0.1-0.8,0.2-1.6,0.3-2.3c0.1-0.7-0.1-0.9-0.8-0.9c-1.1,0-2-0.1-3.1-0.1c0,0-0.1,0-0.1-0.1c0-0.8,0-2.7,0-2.7s-0.4-0.3-0.9,0
+				c0,0.9,0,1.8,0,2.8c0,0-1.3,0-3.1-0.1c-0.1,0-0.3-0.1-0.4-0.4c-0.3-0.8-0.9-2.3-1.7-4.6c0,0-0.4-1-1.5-1c-0.9,0-5.2,0-5.2,0v5.7
+				c0,0-0.4,0.2-0.7,0.2C7.4,15.3,7.5,15.5,8.3,15.3z M23.9,22c0,0.7-0.6,1.2-1.2,1.2s-1.2-0.6-1.2-1.2c0-0.7,0.6-1.2,1.2-1.2
+				C23.4,20.8,23.9,21.3,23.9,22z M9.6,11.3l0-1.1l4.4,0l1.4,4.2l0,0c-1.9,0-4,0-5.8,0.1L9.6,11.3z"/>
+			<path fill="#FFFFFF" d="M9.4,15.8c-2.4,0-4.3,1.9-4.3,4.3s1.9,4.3,4.3,4.3c2.4,0,4.3-1.9,4.3-4.3C13.7,17.7,11.8,15.8,9.4,15.8z
+				 M9.4,22.5c-1.3,0-2.4-1.1-2.4-2.4c0-1.3,1.1-2.4,2.4-2.4c1.3,0,2.4,1.1,2.4,2.4S10.7,22.5,9.4,22.5z"/>
 		</g>
 	</g>
 </g>