diff --git a/build.py b/build.py
index 07a126bd..f044e027 100755
--- a/build.py
+++ b/build.py
@@ -4,6 +4,7 @@ import glob
 import time
 import re
 import io
+import base64
 import sys
 import os
 import shutil
@@ -65,6 +66,10 @@ def loaderRaw(var):
     fn = var.group(1)
     return readfile(fn)
 
+def loaderImage(var):
+    fn = var.group(1)
+    return 'data:image/png;base64,{0}'.format(str(base64.encodestring(open(fn, 'rb').read())).replace('\n', ''))
+
 def loadCode(ignore):
     return '\n\n'.join(map(readfile, glob.glob('code/*')))
 
@@ -81,6 +86,7 @@ def doReplacements(script,updateUrl,downloadUrl):
 
     script = re.sub('@@INCLUDERAW:([0-9a-zA-Z_./-]+)@@', loaderRaw, script)
     script = re.sub('@@INCLUDESTRING:([0-9a-zA-Z_./-]+)@@', loaderString, script)
+    script = re.sub('@@INCLUDEIMAGE:([0-9a-zA-Z_./-]+)@@', loaderImage, script)
 
     script = script.replace('@@BUILDDATE@@', buildDate)
     script = script.replace('@@DATETIMEVERSION@@', dateTimeVersion)
diff --git a/code/boot.js b/code/boot.js
index 135d52b5..60462b2a 100644
--- a/code/boot.js
+++ b/code/boot.js
@@ -324,8 +324,32 @@ function boot() {
   var base = '@@RESOURCEURLBASE@@/images';
   L.Icon.Default.imagePath = base;
 
-  window.iconEnl = L.Icon.Default.extend({options: { iconUrl: base + '/marker-green.png' } });
-  window.iconRes = L.Icon.Default.extend({options: { iconUrl: base + '/marker-blue.png' } });
+  var iconEnlImage = '@@INCLUDEIMAGE:images/marker-green.png@@';
+  var iconEnlRetImage = '@@INCLUDEIMAGE:images/marker-green_2x.png@@';
+  var iconResImage = '@@INCLUDEIMAGE:images/marker-blue.png@@';
+  var iconResRetImage = '@@INCLUDEIMAGE:images/marker-blue_2x.png@@';
+  var iconShadowImage = '@@INCLUDEIMAGE:images/marker-shadow.png@@';
+
+  window.iconEnl = L.Icon.extend({options: {
+    iconUrl: iconEnlImage,
+    iconRetinaUrl: iconEnlRetImage,
+    shadowUrl: iconShadowImage,
+    shadowRetinaUrl: iconShadowImage,
+    iconSize: new L.Point(25, 41),
+    iconAnchor: new L.Point(12, 41),
+    popupAnchor: new L.Point(1, -34),
+    shadowSize: new L.Point(41, 41)
+  }});
+  window.iconRes = L.Icon.extend({options: {
+    iconUrl: iconResImage,
+    iconRetinaUrl: iconResRetImage,
+    shadowUrl: iconShadowImage,
+    shadowRetinaUrl: iconShadowImage,
+    iconSize: new L.Point(25, 41),
+    iconAnchor: new L.Point(12, 41),
+    popupAnchor: new L.Point(1, -34),
+    shadowSize: new L.Point(41, 41)
+  }});
 
   window.setupTaphold();
   window.setupStyles();
diff --git a/external/leaflet.css b/external/leaflet.css
index 13287729..ecc8fd37 100644
--- a/external/leaflet.css
+++ b/external/leaflet.css
@@ -285,7 +285,7 @@
 	        border-radius: 8px;
 	}
 .leaflet-control-layers-toggle {
-	background-image: url(@@RESOURCEURLBASE@@/images/layers.png);
+	background-image: url(@@INCLUDEIMAGE:images/layers.png@@);
 	width: 36px;
 	height: 36px;
 	}