diff --git a/source/Ox.UI/js/Map/MapMarkerImage.js b/source/Ox.UI/js/Map/MapMarkerImage.js
index 10dab665..51063aec 100644
--- a/source/Ox.UI/js/Map/MapMarkerImage.js
+++ b/source/Ox.UI/js/Map/MapMarkerImage.js
@@ -25,8 +25,9 @@ Ox.MapMarkerImage = (function() {
         }, options);
 
         var index = [
-            options.type, options.mode, options.size, options.color.join(',')
-        ].join(';');
+                options.type, options.mode, options.size, options.color.join(',')
+            ].join(';'),
+            themeData = Ox.Theme.getThemeData();
 
         if (!cache[index]) {
             var color = options.rectangle ? [0, 0, 0, 0]
@@ -34,9 +35,9 @@ Ox.MapMarkerImage = (function() {
                         [options.type == 'place' ? 0.75 : 0.25]
                     ),
                 border = (
-                    options.mode == 'normal' ? [0, 0, 0]
-                    : options.mode == 'selected' ? [255, 255, 255]
-                    : [128, 128, 255]
+                    options.mode == 'normal' ? themeData.mapPlaceBorder
+                    : options.mode == 'selected' ? themeData.mapPlaceSelectedBorder
+                    : themeData.mapPlaceEditingBorder
                 ).concat([options.type == 'result' ? 0.5 : 1]),
                 c = Ox.canvas(options.size, options.size),
                 image,