diff --git a/lib/Monocle_Alternate.php b/lib/Monocle_Alternate.php
index 37df35b43..947a6bb41 100644
--- a/lib/Monocle_Alternate.php
+++ b/lib/Monocle_Alternate.php
@@ -165,6 +165,7 @@ public function query_stops($conds, $params)
 
         $query = "SELECT external_id AS pokestop_id,
         name AS pokestop_name,
+        url AS pokestop_url,
         lat AS latitude,
         lon AS longitude
         FROM pokestops
@@ -246,6 +247,7 @@ public function query_gyms($conds, $params)
         f.lat AS latitude,
         f.lon AS longitude,
         f.name,
+        f.url,
         f.sponsor,
         f.park,
         fs.team AS team_id,
diff --git a/static/js/map.js b/static/js/map.js
index 6514ac7ec..27862d389 100644
--- a/static/js/map.js
+++ b/static/js/map.js
@@ -608,6 +608,7 @@ function gymLabel(item) {
     var lastScanned = item['last_scanned']
     var lastModified = item['last_modified']
     var name = item['name']
+    var url = item['url']
     var members = item['pokemon']
 
     var raidSpawned = item['raid_level'] != null
@@ -697,6 +698,7 @@ function gymLabel(item) {
             '<b style="color:rgba(' + gymColor[teamId] + ')">' + i8ln(teamName) + '</b><br>' +
             '<img height="70px" style="padding: 5px;" src="static/forts/' + teamName + '_large.png">' +
             raidIcon +
+            '<img height="70px" style="padding: 5px;" src="' + url + '">' +
             '</div>' +
             nameStr +
             raidStr +
@@ -732,6 +734,7 @@ function gymLabel(item) {
             '<b style="color:rgba(' + gymColor[teamId] + ')">' + i8ln('Team') + ' ' + i8ln(teamName) + '</b><br>' +
             '<img height="70px" style="padding: 5px;" src="static/forts/' + teamName + '_large.png">' +
             raidIcon +
+            '<img height="70px" style="padding: 5px;" src="' + url + '">' +
             '</div>' +
             nameStr +
             raidStr +
@@ -760,7 +763,7 @@ function gymLabel(item) {
     return str
 }
 
-function pokestopLabel(expireTime, latitude, longitude, stopName) {
+function pokestopLabel(expireTime, latitude, longitude, stopName, stopUrl) {
     var str
     if (stopName === undefined) {
         stopName = 'Pokéstop'
@@ -770,6 +773,7 @@ function pokestopLabel(expireTime, latitude, longitude, stopName) {
             '<div>' +
             '<b>' + stopName + ' (Lured)</b>' +
             '</div>' +
+            '<img height="70px" style="padding: 5px;" align="middle" src="' + stopUrl + '">' +
             '<div>' +
             i8ln('Lure expires at') + ' ' + getTimeStr(expireTime) +
             ' <span class="label-countdown" disappears-at="' + expireTime + '">(00m00s)</span>' +
@@ -782,6 +786,7 @@ function pokestopLabel(expireTime, latitude, longitude, stopName) {
             '<div>' +
             '<b>' + stopName + '</b>' +
             '</div>' +
+            '<img height="70px" style="padding: 5px;" align="middle" src="' + stopUrl + '">' +
             '<div>' +
             'Location: <a href="javascript:void(0)" onclick="javascript:openMapDirections(' + latitude + ',' + longitude + ')" title="' + i8ln('View in Maps') + '">' + latitude.toFixed(6) + ', ' + longitude.toFixed(7) + '</a>' +
             '</div>'
@@ -1174,7 +1179,7 @@ function setupPokestopMarker(item) {
     }
 
     marker.infoWindow = new google.maps.InfoWindow({
-        content: pokestopLabel(item['lure_expiration'], item['latitude'], item['longitude'], item['pokestop_name']),
+        content: pokestopLabel(item['lure_expiration'], item['latitude'], item['longitude'], item['pokestop_name'], item['pokestop_url']),
         disableAutoPan: true
     })
 
@@ -2481,6 +2486,7 @@ function showGymDetails(id) { // eslint-disable-line no-unused-vars
             '<div>' +
             '<img height="100px" style="padding: 5px;" src="static/forts/' + gymTypes[result.team_id] + '_large.png">' +
             raidIcon +
+            '<img height="70px" style="padding: 5px;" src="' + result.url + '">' +
             '</div>' +
             raidStr +
             gymLevelStr +