diff --git a/genPOI.py b/genPOI.py
index 800c8f5..650a2d6 100755
--- a/genPOI.py
+++ b/genPOI.py
@@ -168,11 +168,17 @@ def main():
         for poi in rset._pois['TileEntities']:
             result = filter_function(poi)
             if result:
-                markerSetDict[name]['raw'].append(dict(x=poi['x'], y=poi['y'], z=poi['z'], text=result, createInfoWindow=True))
+                d = dict(x=poi['x'], y=poi['y'], z=poi['z'], text=result, createInfoWindow=True)
+                if "icon" in poi:
+                    d.update({"icon": poi['icon']})
+                markerSetDict[name]['raw'].append(d)
         for poi in rset._pois['Players']:
             result = filter_function(poi)
             if result:
-                markerSetDict[name]['raw'].append(dict(x=poi['x'], y=poi['y'], z=poi['z'], text=result, createInfoWindow=True))
+                d = dict(x=poi['x'], y=poi['y'], z=poi['z'], text=result, createInfoWindow=True)
+                if "icon" in poi:
+                    d.update({"icon": poi['icon']})
+                markerSetDict[name]['raw'].append(d)
     #print markerSetDict
 
     with open(os.path.join(destdir, "markersDB.js"), "w") as output:
diff --git a/overviewer_core/data/js_src/views.js b/overviewer_core/data/js_src/views.js
index 041d2ba..2fde73d 100644
--- a/overviewer_core/data/js_src/views.js
+++ b/overviewer_core/data/js_src/views.js
@@ -437,22 +437,17 @@ overviewer.views.SignControlView = Backbone.View.extend({
             if (!markersDB[groupName].created) {
                 for (j in markersDB[groupName].raw) {
                     var entity = markersDB[groupName].raw[j];
-                    if (entity['id'] == 'Player') {
-                        iconURL = "http://overviewer.org/avatar/"
-                            + entity['EntityId'];
-                    } else if (entity['id'] == 'PlayerSpawn') {
-                        iconURL = overviewerConfig.CONST.image.bedMarker;
-                    } else if (entity['id'] == 'Sign') {
-                        iconURL = overviewerConfig.CONST.image.signMarker;
+                    if (entity['icon']) {
+                        iconURL = entity['icon'];
                     } else {
-                        iconURL = overviewerConfig.CONST.image.defaultMarker;
+                        iconURL = dataRoot[i].icon;
                     }
                     var marker = new google.maps.Marker({
                             'position': overviewer.util.fromWorldToLatLng(entity.x,
                                 entity.y, entity.z, overviewer.mapView.options.currentTileSet),
                             'map':      overviewer.map,
                             'title':    jQuery.trim(entity.text), 
-                            'icon':     dataRoot[i].icon,
+                            'icon':     iconURL,
                             'visible':  false
                     }); 
                     if (entity.createInfoWindow) {