diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php
index edc7cff1c..6cd597dbc 100644
--- a/classes/display/HTMLDisplayHandler.php
+++ b/classes/display/HTMLDisplayHandler.php
@@ -8,6 +8,13 @@ class HTMLDisplayHandler
 	 */
 	public static $reservedCSS = '@\bcommon/css/(?:xe|mobile)\.(?:min\.)?css$@';
 	public static $reservedJS = '@\bcommon/js/(?:jquery(?:-[123]\.x)?|xe?|common|js_app|xml_handler|xml_js_filter)\.(?:min\.)?js$@';
+	
+	/**
+	 * Replacement table for XE compatibility
+	 */
+	public static $replacements = array(
+		'@\bcommon/xeicon/@' => 'common/css/xeicon/',
+	);
 
 	/**
 	 * Produce HTML compliant content given a module object.\n
diff --git a/classes/frontendfile/FrontEndFileHandler.class.php b/classes/frontendfile/FrontEndFileHandler.class.php
index fe8417b1e..8c36ab1a5 100644
--- a/classes/frontendfile/FrontEndFileHandler.class.php
+++ b/classes/frontendfile/FrontEndFileHandler.class.php
@@ -93,7 +93,7 @@ class FrontEndFileHandler extends Handler
 		{
 			$args = array($args);
 		}
-		
+		$args[0] = preg_replace(array_keys(HTMLDisplayHandler::$replacements), array_values(HTMLDisplayHandler::$replacements), $args[0]);
 		$isCommon = preg_match(HTMLDisplayHandler::$reservedCSS, $args[0]) || preg_match(HTMLDisplayHandler::$reservedJS, $args[0]);
 		if($args[3] > -1500000 && $isCommon)
 		{
diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php
index 6d55dc388..86776375c 100644
--- a/classes/template/TemplateHandler.class.php
+++ b/classes/template/TemplateHandler.class.php
@@ -11,7 +11,6 @@
  */
 class TemplateHandler
 {
-
 	private $compiled_path = 'files/cache/template_compiled/'; ///< path of compiled caches files
 	private $path = NULL; ///< target directory
 	private $filename = NULL; ///< target filename
@@ -689,6 +688,8 @@ class TemplateHandler
 				case 'load':
 				case 'unload':
 					$metafile = '';
+					$replacements = HTMLDisplayHandler::$replacements;
+					$attr['target'] = preg_replace(array_keys($replacements), array_values($replacements), $attr['target']);
 					$pathinfo = pathinfo($attr['target']);
 					$doUnload = ($m[3] === 'unload');
 					$isRemote = !!preg_match('@^(https?:)?//@i', $attr['target']);