diff --git a/client/inflow/i/new/rd_map_icon.png b/client/inflow/i/new/rd_map_icon.png
new file mode 100644
index 00000000..6f2bd364
Binary files /dev/null and b/client/inflow/i/new/rd_map_icon.png differ
diff --git a/client/lib/rdw/ext/MessageLinkLocationAttachments.js b/client/lib/rdw/ext/MessageLinkLocationAttachments.js
index cf65354f..7e8747d6 100644
--- a/client/lib/rdw/ext/MessageLinkLocationAttachments.js
+++ b/client/lib/rdw/ext/MessageLinkLocationAttachments.js
@@ -48,11 +48,6 @@ require.modify("rdw/Message", "rdw/ext/MessageLinkLocationAttachments",
                     }
                     template = '<div class="location link hbox">' +
                                '  <div class="thumbnail boxFlex0">' +
-                               '    <a target="_blank" href="http://maps.google.com/?q=${q}&ll=${geolat},${geolong}">' +
-                               '    <img src="http://maps.google.com/maps/api/staticmap?' +
-                                      'maptype=roadmap&zoom=12&sensor=false&' +
-                                      'size=110x70&markers=||${geolat},${geolong}&key=${key}"/>' +
-                               '    </a>' +
                                '  </div>' +
                                '  <div class="information boxFlex1">' +
                                '    <div class="name">${name}</div>' +
diff --git a/client/lib/rdw/ext/css/MessageLinkLocationAttachments.css b/client/lib/rdw/ext/css/MessageLinkLocationAttachments.css
index 3352b124..677a915f 100644
--- a/client/lib/rdw/ext/css/MessageLinkLocationAttachments.css
+++ b/client/lib/rdw/ext/css/MessageLinkLocationAttachments.css
@@ -25,6 +25,8 @@
   display: inline-block;
   width: 110px;
   height: 70px;
+  background-image: url("../../../../inflow/i/new/rd_map_icon.png");
+  background-repeat: no-repeat;
 }
 
 .rdwMessage > .message > .rdwAttachments .location > .information {