diff --git a/modules/menu/tpl/css/sitemap.css b/modules/menu/tpl/css/sitemap.css
index c11ae6554..4d7e66e39 100644
--- a/modules/menu/tpl/css/sitemap.css
+++ b/modules/menu/tpl/css/sitemap.css
@@ -38,18 +38,19 @@ body>.x{max-width:none !important}
 .mapi>ul>li>a.jstree-clicked,
 .mapi>ul>li>a.jstree-hovered{text-shadow:none}
 .mapi>ul>li>ul{margin-top:3px;padding:7px 0}
+.mapi>ul>li>ul>li{margin-left:0}
 	/* li>a */
 .mapi li>a{border:0 !important;padding:0 8px !important;margin:0 60px 1px 0;border-radius:3px;position:relative;z-index:2;height:23px;line-height:23px;-webkit-transition:.3s;-moz-transition:.3s;-o-transition:.3s}
-.mapi .x_icon-home{opacity:.5;filter:alpha(opacity=50)}
-.mapi .jstree-hovered>.x_icon-home,
-.mapi .jstree-clicked>.x_icon-home{background-image:url({getUrl('')}common/img/glyphicons-halflings-white.png);opacity:1;filter:alpha(opacity=100)}
+.mapi li>a>i{opacity:.5;filter:alpha(opacity=50)}
+.mapi .jstree-hovered>i,
+.mapi .jstree-clicked>i{background-image:url(../../../../common/img/glyphicons-halflings-white.png);opacity:1;filter:alpha(opacity=100)}
 	/* li>.side */
 .mapi .side{position:absolute;z-index:2;top:0;right:0;line-height:0}
-.mapi .side>button{border:0;border-radius:3px;width:23px;height:23px;overflow:hidden;font-size:0;line-height:0;text-indent:24px;background:url({getUrl('')}common/img/glyphicons-halflings.png) no-repeat;-webkit-transition:.3s;-moz-transition:.3s;-o-transition:.3s}
+.mapi .side>button{border:0;border-radius:3px;width:23px;height:23px;overflow:hidden;font-size:0;line-height:0;text-indent:24px;background:url(../../../../common/img/glyphicons-halflings.png) no-repeat;-webkit-transition:.3s;-moz-transition:.3s;-o-transition:.3s}
 .mapi .side>button.addItem{background-position:4px -91px}
 .mapi .side>button.showProp{background-position:-428px 5px}
 .mapi .side>button:hover,
-.mapi .side>button:focus{background-color:#333;background-image:url({getUrl('')}common/img/glyphicons-halflings-white.png)}
+.mapi .side>button:focus{background-color:#333;background-image:url(../../../../common/img/glyphicons-halflings-white.png)}
 	/* Plugin style override */
 .mapi a>.jstree-icon{display:none}
 /* Nav */
@@ -66,7 +67,7 @@ body>.x{max-width:none !important}
 .col .nav li>a>i{position:absolute;top:50%;right:5px;margin:-7px 0 0 0;opacity:.5;filter:alpha(opacity=50)}
 .col .nav li>a:hover>i,
 .col .nav li>a:focus>i,
-.col .nav li.active>a>i{background-image:url({getUrl('')}common/img/glyphicons-halflings-white.png);background-repeat:no-repeat;opacity:1;filter:alpha(opacity=100)}
+.col .nav li.active>a>i{background-image:url(../../../../common/img/glyphicons-halflings-white.png);background-repeat:no-repeat;opacity:1;filter:alpha(opacity=100)}
 /* Menu Type */
 .col .typePage{display:none;border-top:1px solid #ddd;padding-top:8px;margin-top:8px}
 .col .typeUrl{display:none;margin-top:8px}
@@ -99,7 +100,7 @@ body>.x{max-width:none !important}
 .theme label{margin:0;padding:8px 0;position:relative;border-bottom:1px solid #ddd}
 .theme label>a{position:absolute;top:4px;right:0;width:24px;height:24px;border-radius:3px;background-position:-427px 5px;-webkit-transition:.3s;-moz-transition:.3s;-o-transition:.3s}
 .theme label>a:hover,
-.theme label>a:focus{background-color:#000;background-image:url({getUrl('')}common/img/glyphicons-halflings-white.png)}
+.theme label>a:focus{background-color:#000;background-image:url(../../../../common/img/glyphicons-halflings-white.png)}
 .theme h2{font-size:14px;border-bottom:1px solid #ddd;margin:0;padding:15px 0 8px 0}
 .theme ul button{background-color:transparent;border:0;padding:0;margin:0;overflow:visible}
 .theme ul{margin:0;padding:0;list-style:none}
@@ -117,7 +118,7 @@ body>.x{max-width:none !important}
 .theme ul ul>li>*:hover,
 .theme ul ul>li>*:focus{background:#666;color:#fff}
 .theme ul ul>li>a:hover>i,
-.theme ul ul>li>a:focus>i{background-image:url({getUrl('')}common/img/glyphicons-halflings-white.png)}
+.theme ul ul>li>a:focus>i{background-image:url(../../../../common/img/glyphicons-halflings-white.png)}
 .theme ul ul>li>button{width:100%}
 /* Properties */
 #properties ul{margin:8px 0 0 0;padding:0 0 8px 0;border-bottom:1px solid #ddd}
@@ -142,7 +143,7 @@ body>.x{max-width:none !important}
 #properties li>*:hover>i,
 #properties li>*:active>i,
 #properties li>*:focus>i,
-#properties li.active>*>i{background-image:url({getUrl('')}common/img/glyphicons-halflings-white.png);opacity:1;filter:alpha(opacity=100)}
+#properties li.active>*>i{background-image:url(../../../../common/img/glyphicons-halflings-white.png);opacity:1;filter:alpha(opacity=100)}
 #properties.prop-shortcut li.homepage,
 #properties.prop-shortcut li.design,
 #properties.prop-shortcut li.details{display:none}
diff --git a/modules/menu/tpl/js/jquery.jstree.js b/modules/menu/tpl/js/jquery.jstree.js
index 327453d36..60955d50f 100644
--- a/modules/menu/tpl/js/jquery.jstree.js
+++ b/modules/menu/tpl/js/jquery.jstree.js
@@ -276,7 +276,7 @@
 				'.jstree-rtl li { margin-left:0; margin-right:18px; } ' + 
 				'.jstree > ul > li { margin-left:0px; } ' + 
 				'.jstree-rtl > ul > li { margin-right:0px; } ' + 
-				'.jstree ins { display:inline-block; text-decoration:none; width:18px; height:18px; margin:0 0 0 0; padding:0; } ' + 
+				'.jstree ins { display:inline-block; text-decoration:none; width:18px; height:18px; margin:0 0 0 0; padding:0; vertical-align:top; background-color:#fff !important; border-top:3px solid #fff; } ' + 
 				'.jstree a { display:inline-block; line-height:16px; height:16px; color:black; white-space:nowrap; text-decoration:none; padding:1px 2px; margin:0; } ' + 
 				'.jstree a:focus { outline: none; } ' + 
 				'.jstree a > ins { height:16px; width:16px; } ' +