diff --git a/source/Ox.UI/js/Core/Ox.URL.js b/source/Ox.UI/js/Core/Ox.URL.js
index c4575104..20f89a4d 100644
--- a/source/Ox.UI/js/Core/Ox.URL.js
+++ b/source/Ox.UI/js/Core/Ox.URL.js
@@ -416,7 +416,9 @@ Ox.URL = function(options) {
 
     function parseURL(str, callback) {
         Ox.print('pU', str)
-        var parts = str.substr(1).split('/'),
+         // fixme: removing trailing slash makes it impossible to search for '/'
+        str = str.replace(/(^\/|\/$)/g, '');
+        var parts = str.split('/'),
             state = {};
         if (parts[0] == '') {
             // empty URL
diff --git a/source/Ox.UI/js/Map/Ox.Map.js b/source/Ox.UI/js/Map/Ox.Map.js
index 080ad820..552ded21 100644
--- a/source/Ox.UI/js/Map/Ox.Map.js
+++ b/source/Ox.UI/js/Map/Ox.Map.js
@@ -466,6 +466,7 @@ Ox.Map = function(options, self) {
     }
 
     function clickMap(event) {
+        var place = getSelectedPlace();
 		if (self.options.clickable/* && !editing()*/) {
 	        getPlaceByLatLng(event.latLng, self.map.getBounds(), function(place) {
                 if (place) {
@@ -475,6 +476,8 @@ Ox.Map = function(options, self) {
                     selectPlace(null);
                 }
             });
+		} else {
+		    pressEscape();
 		}
     }
 
diff --git a/source/Ox.UI/themes/classic/css/classic.css b/source/Ox.UI/themes/classic/css/classic.css
index c6cb1020..1ac0ee58 100644
--- a/source/Ox.UI/themes/classic/css/classic.css
+++ b/source/Ox.UI/themes/classic/css/classic.css
@@ -328,10 +328,10 @@ Lists
 }
 .OxThemeClassic .OxIconList .OxItem.OxSelected > .OxIcon > img,
 .OxThemeClassic .OxIconList .OxItem.OxSelected > .OxIcon > .OxVideoPlayer {
-    border-color: rgb(160, 160, 160);
-    -moz-box-shadow: 0 0 4px rgba(160, 160, 160, 1);
-    -o-box-shadow: 0 0 4px rgba(160, 160, 160, 1);
-    -webkit-box-shadow: 0 0 4px rgba(160, 160, 160, 1);
+    border-color: rgb(192, 192, 192);
+    -moz-box-shadow: 0 0 4px rgba(192, 192, 192, 1);
+    -o-box-shadow: 0 0 4px rgba(192, 192, 192, 1);
+    -webkit-box-shadow: 0 0 4px rgba(192, 192, 192, 1);
 }
 .OxThemeClassic .OxIconList.OxFocus .OxItem.OxSelected > .OxIcon > img,
 .OxThemeClassic .OxIconList.OxFocus .OxItem.OxSelected > .OxIcon > .OxVideoPlayer {
@@ -347,11 +347,11 @@ Lists
         rgb(255, 255, 255) 1px 1px 0;
 }
 .OxThemeClassic .OxIconList .OxItem.OxSelected > .OxText > div {
-    border-color: rgb(160, 160, 160);
-    background: rgba(160, 160, 160, 0.5);
-    -moz-box-shadow: 0 0 4px rgba(160, 160, 160, 1);
-    -o-box-shadow: 0 0 4px rgba(160, 160, 160, 1);
-    -webkit-box-shadow: 0 0 4px rgba(160, 160, 160, 1);
+    border-color: rgb(192, 192, 192);
+    background: rgba(192, 192, 192, 0.5);
+    -moz-box-shadow: 0 0 4px rgba(192, 192, 192, 1);
+    -o-box-shadow: 0 0 4px rgba(192, 192, 192, 1);
+    -webkit-box-shadow: 0 0 4px rgba(192, 192, 192, 1);
 }
 .OxThemeClassic .OxIconList.OxFocus .OxItem.OxSelected > .OxText > div {
     border-color: rgb(128, 128, 128);
diff --git a/source/Ox.UI/themes/modern/css/modern.css b/source/Ox.UI/themes/modern/css/modern.css
index 15c57cd5..91d5bd91 100644
--- a/source/Ox.UI/themes/modern/css/modern.css
+++ b/source/Ox.UI/themes/modern/css/modern.css
@@ -312,10 +312,10 @@ Lists
 }
 .OxThemeModern .OxIconList .OxItem.OxSelected > .OxIcon > img,
 .OxThemeModern .OxIconList .OxItem.OxSelected > .OxIcon > .OxVideoPlayer {
-    border-color: rgb(96, 96, 96);
-    -moz-box-shadow: 0 0 4px rgba(96, 96, 96, 1);
-    -o-box-shadow: 0 0 4px rgba(96, 96, 96, 1);
-    -webkit-box-shadow: 0 0 4px rgba(96, 96, 96, 1);
+    border-color: rgb(64, 64, 64);
+    -moz-box-shadow: 0 0 4px rgba(64, 64, 64, 1);
+    -o-box-shadow: 0 0 4px rgba(64, 64, 64, 1);
+    -webkit-box-shadow: 0 0 4px rgba(64, 64, 64, 1);
 }
 .OxThemeModern .OxIconList.OxFocus .OxItem.OxSelected > .OxIcon > img,
 .OxThemeModern .OxIconList.OxFocus .OxItem.OxSelected > .OxIcon .OxVideoPlayer {
@@ -331,11 +331,11 @@ Lists
         rgb(0, 0, 0) 1px 1px 0;
 }
 .OxThemeModern .OxIconList .OxItem.OxSelected > .OxText > div {
-    border-color: rgb(96, 96, 96);
-    background: rgba(96, 96, 96, 0.5);
-    -moz-box-shadow: 0 0 4px rgba(96, 96, 96, 1);
-    -o-box-shadow: 0 0 4px rgba(96, 96, 96, 1);
-    -webkit-box-shadow: 0 0 4px rgba(96, 96, 96, 1);
+    border-color: rgb(64, 64, 64);
+    background: rgba(64, 64, 64, 0.5);
+    -moz-box-shadow: 0 0 4px rgba(64, 64, 64, 1);
+    -o-box-shadow: 0 0 4px rgba(64, 64, 64, 1);
+    -webkit-box-shadow: 0 0 4px rgba(64, 64, 64, 1);
 }
 .OxThemeModern .OxIconList.OxFocus .OxItem.OxSelected > .OxText > div {
     border-color: rgb(128, 128, 128);