diff --git a/public_html/css/container.css b/public_html/css/container.css
index 95d541e..aaf0292 100644
--- a/public_html/css/container.css
+++ b/public_html/css/container.css
@@ -69,6 +69,7 @@
 		}
 
 		#CONTAINER.message div span.del, /* Del btn */
+		#CONTAINER.message div span.maps, /* Maps btn */
 		#CONTAINER.message div span.upd{ /* Update btn */
 			display: block;
 			position: absolute;
@@ -83,6 +84,13 @@
 			cursor: pointer;
 		}
 
+		#CONTAINER.message div span.maps{
+			top: .3em;
+			left: calc( 100% - 1em - .2em );
+			background-image: url('/image/container/maps.svg@dddddd');
+			background-size: auto 100%;
+		}
+
 		#CONTAINER.message div span.upd{
 			left: calc( 100% - 3em );
 			background-image: url('/image/container/edit-msg.svg@777777');
@@ -96,6 +104,10 @@
 			background-image: url('/image/container/edit-msg.svg@2ab1dd')
 		}
 
+		#CONTAINER.message div span.maps:hover{
+			background-image: url('/image/container/maps.svg@29c98e');
+		}
+
 		#CONTAINER.message div span span.code{ /* Code block */
 			display: inline-block;
 			position: relative;
diff --git a/public_html/image/container/maps.svg b/public_html/image/container/maps.svg
new file mode 100644
index 0000000..3d725e3
--- /dev/null
+++ b/public_html/image/container/maps.svg
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16"
+   version="1.1"
+   viewBox="0 0 10 16"
+   width="10"
+   id="svg4174"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="maps.svg">
+  <metadata
+     id="metadata4185">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1056"
+     id="namedview4183"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="42.072853"
+     inkscape:cx="0.16900642"
+     inkscape:cy="5.1542799"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4174" />
+  <defs
+     id="defs4178" />
+  <path
+     style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1"
+     d="M 0.02038,6 C 0.00689,5.83531 0,5.66854 0,5.5 0,2.46243 2.23858,0 5,0 7.76142,0 10,2.46243 10,5.5 10,5.66854 9.993,5.83531 9.9796,6 L 10,6 C 10,9.00574 5,16 5,16 5,16 0,9.02234 0,6 Z M 5,7 C 6.10457,7 7,6.10457 7,5 7,3.89543 6.10457,3 5,3 3.89543,3 3,3.89543 3,5 3,6.10457 3.89543,7 5,7 Z m 0,0"
+     id="fill-edit"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/view/vue/container/emergency.vue b/view/vue/container/emergency.vue
index 4d422b4..2899994 100644
--- a/view/vue/container/emergency.vue
+++ b/view/vue/container/emergency.vue
@@ -8,6 +8,7 @@
 			<span class='date' v-text='local_date(id)'></span>
 			<span @click='del_message(msg.id)' class='del' v-if='msg.user == gstore.server.session.name'></span>
 			<span @click='upd_message(msg.id, msg.message)' class='upd' v-if='msg.user == gstore.server.session.name'></span>
+			<span @click='maps(msg.location)' class='maps' v-if='msg.user != gstore.server.session.name && msg.location[0] != 0 && msg.location[1] != 0'></span>
 		</div>
 
 		<div class='end-pad'></div> <!-- End Spacing -->
@@ -31,6 +32,9 @@ export default {
 		dep: "31"
 	}; },
 	methods: {
+		maps(coord){
+			window.open('https://www.google.com/maps/?q=-'+coord[0]+','+coord[1]);
+		},
 		local_date: function(id){
 			/* (1) Get current date (convert unix timestamp to javascript timestamp */
 			var cur = new Date( gstore.data.notif.emergency.data[id].timestamp * 1000);