Index: binary-improvements/webserver/js/inventory_dialog.js
===================================================================
--- binary-improvements/webserver/js/inventory_dialog.js	(revision 251)
+++ binary-improvements/webserver/js/inventory_dialog.js	(revision 253)
@@ -18,6 +18,6 @@
 		qual.removeClass ("visible");
 
-		if (itemdata !== null) {
-			cell.attr("style", "background-image: url(" + ITEMICONBASEURL + itemdata.icon + "@@" + itemdata.iconcolor + ".png);");
+		if (itemdata !== null && itemdata !== undefined) {
+			cell.attr("style", "background-image: url(" + ITEMICONBASEURL + itemdata.icon + "__" + itemdata.iconcolor + ".png);");
 			if (itemdata.quality >= 0) {
 				cell.attr("title", itemdata.name + " (quality: " + itemdata.quality + ")");
Index: binary-improvements/webserver/js/map.js
===================================================================
--- binary-improvements/webserver/js/map.js	(revision 251)
+++ binary-improvements/webserver/js/map.js	(revision 253)
@@ -124,6 +124,18 @@
 
 	var measure = L.control.measure({
-		//primaryLengthUnit: "meters",
-		//primaryAreaUnit: "sqmeters",
+		units: {
+			sdtdMeters: {
+				factor: 0.00001,
+				display: 'XMeters',
+				decimals: 0
+			},
+			sdtdSqMeters: {
+				factor: 0.000000001,
+				display: 'XSqMeters',
+				decimals: 0
+			}
+		},
+		primaryLengthUnit: "sdtdMeters",
+		primaryAreaUnit: "sdtdSqMeters",
 		//activeColor: "#ABE67E",
 		//completedColor: "#C8F2BE",