diff --git a/code/boot.js b/code/boot.js
index 7cfd6d23..f14e7015 100644
--- a/code/boot.js
+++ b/code/boot.js
@@ -237,12 +237,12 @@ window.setupDialogs = function() {
 function boot() {
   window.debug.console.overwriteNativeIfRequired();
 
-  console.log('loading done, booting. Built: ' + window.iitcBuildDate);
+  console.log('loading done, booting. Built: @@BUILDDATE@@');
   if(window.deviceID) console.log('Your device ID: ' + window.deviceID);
   window.runOnSmartphonesBeforeBoot();
 
   // overwrite default Leaflet Marker icon to be a neutral color
-  var base = 'http://breunigs.github.com/ingress-intel-total-conversion/dist/images/';
+  var base = 'https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/dist/images/';
   L.Icon.Default.imagePath = base;
 
   window.iconEnl = L.Icon.Default.extend({options: { iconUrl: base + 'marker-green.png' } });
diff --git a/dist/images/layers.png b/dist/images/layers.png
new file mode 100644
index 00000000..ef90a080
Binary files /dev/null and b/dist/images/layers.png differ
diff --git a/external/leaflet.css b/external/leaflet.css
index ea3da390..04f229a4 100644
--- a/external/leaflet.css
+++ b/external/leaflet.css
@@ -285,7 +285,7 @@
 	        border-radius: 8px;
 	}
 .leaflet-control-layers-toggle {
-	background-image: url(images/layers.png);
+	background-image: url(https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/dist/images/layers.png);
 	width: 36px;
 	height: 36px;
 	}
diff --git a/images/layers.png b/images/layers.png
new file mode 100644
index 00000000..ef90a080
Binary files /dev/null and b/images/layers.png differ
diff --git a/plugins/draw-tools.user.js b/plugins/draw-tools.user.js
index 88fbd21c..b12e30af 100644
--- a/plugins/draw-tools.user.js
+++ b/plugins/draw-tools.user.js
@@ -31,10 +31,15 @@ window.plugin.drawTools = function() {};
 window.plugin.drawTools.loadExternals = function() {
   var base = 'https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/external';
   //~ var base = 'http://0.0.0.0:8000/dist';
-  $('head').append('<link rel="stylesheet" href="'+base+'/leaflet.draw.0.1.6.css" />');
   load(base+'/leaflet.draw.0.1.6.js').thenRun(window.plugin.drawTools.boot);
   // overwrite default Leaflet Marker icon.
   L.Icon.Default.imagePath = base + '/images';
+
+  // FIXME: this is currently manually included from
+  // external/leaflet.draw.0.1.6.css. It should either be loaded remotely
+  // automatically or the buildscript should include it here, similar to
+  // how it works for the main script.
+  $('head').append('<style>.leaflet-container .leaflet-control-draw {margin-left: 13px;margin-top: 12px;}.leaflet-control-draw a {background-position: 50% 50%;background-repeat: no-repeat;display: block;width: 22px;height: 22px;}.leaflet-control-draw a:hover {background-color: #fff;}.leaflet-touch .leaflet-control-draw a {width: 27px;height: 27px;}.leaflet-control-draw-polyline {background-image: url(https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/dist/images/draw-polyline.png);}.leaflet-control-draw-polygon {background-image: url(https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/dist/images/draw-polygon.png);}.leaflet-control-draw-rectangle {background-image: url(https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/dist/images/draw-rectangle.png);}.leaflet-control-draw-circle {background-image: url(https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/dist/images/draw-circle.png);}.leaflet-control-draw-marker {background-image: url(https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/dist/images/draw-marker-icon.png);}.leaflet-mouse-marker {background-color: #fff;cursor: crosshair;}.leaflet-draw-label {background-color: #fff;border: 1px solid #ccc;color: #222;font: 12px/18px "Helvetica Neue", Arial, Helvetica, sans-serif;margin-left: 20px;margin-top: -21px;padding: 2px 4px;position: absolute;white-space: nowrap;z-index: 6;}.leaflet-error-draw-label {background-color: #F2DEDE;border-color: #E6B6BD;color: #B94A48;}.leaflet-draw-label-single {margin-top: -12px}.leaflet-draw-label-subtext {color: #999;}.leaflet-draw-guide-dash {font-size: 1%;opacity: 0.6;position: absolute;width: 5px;height: 5px;}.leaflet-flash-anim {-webkit-animation-duration: 0.66s; -moz-animation-duration: 0.66s; -o-animation-duration: 0.66s; animation-duration: 0.66s;-webkit-animation-fill-mode: both; -moz-animation-fill-mode: both; -o-animation-fill-mode: both; animation-fill-mode: both;-webkit-animation-name: leaflet-flash; -moz-animation-name: leaflet-flash; -o-animation-name: leaflet-flash; animation-name: leaflet-flash;}@-webkit-keyframes leaflet-flash {0%, 50%, 100% { opacity: 1; }25%, 75% { opacity: 0.3; }}@-moz-keyframes leaflet-flash {0%, 50%, 100% { opacity: 1; }25%, 75% { opacity: 0.3; }}@-o-keyframes leaflet-flash {0%, 50%, 100% { opacity: 1; }25%, 75% { opacity: 0.3; }}@keyframes leaflet-flash {0%, 50%, 100% { opacity: 1; }25%, 75% { opacity: 0; }}</style>');
 }