diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index 673c10db0..eaec734fa 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -2159,7 +2159,9 @@ class e107
 
 				$tp = self::getParser();
 
-				$libraryPath = $tp->replaceConstants($info['library_path'].'/'.$info['path'], 'abs').'/';
+				$libraryPath = $info['library_path'].'/'.$info['path'].'/';
+
+
 
 				foreach($info['preload'] as $pre)
 				{
diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index 985ef4476..03e443a03 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -2713,13 +2713,11 @@ class e_parse extends e_parser
 
 	/**
 	 * @todo Move to e107_class ?
-	 * @param string $path - absolute path
-	 * @return string - static path.
+	 * @param string $path - absolute path or e107 path {e_PLUGIN} etc. 
+	 * @return string - full path or static path.
 	 */
 	public function staticUrl($path=null, $opts=array())
 	{
-		$path = $this->replaceConstants($path,'abs');
-
 		if(!defined('e_HTTP_STATIC') || deftrue('e_ADMIN_AREA'))
 		{
 			// e107::getDebug()->log("e_HTTP_STATIC not defined");
@@ -2729,11 +2727,10 @@ class e_parse extends e_parser
 			}
 			else
 			{
-				return $path;
+				return self::replaceConstants($path, 'full');
 			}
 		}
 
-
 		$staticArray = e_HTTP_STATIC;
 
 		if(is_array($staticArray))
@@ -2763,8 +2760,9 @@ class e_parse extends e_parser
 
 		$base = '';
 
+		$path = self::replaceConstants($path, 'abs'); // replace any {THEME} etc.
+
 		$srch = array(
-		//
 			e_PLUGIN_ABS,
 			e_THEME_ABS,
 			e_WEB_ABS,
@@ -2773,7 +2771,6 @@ class e_parse extends e_parser
 
 
 		$repl = array(
-
 			$http.$base.e107::getFolder('plugins'),
 			$http.$base.e107::getFolder('themes'),
 			$http.$base.e107::getFolder('web'),
diff --git a/e107_plugins/social/e_module.php b/e107_plugins/social/e_module.php
index b7b8490c7..20e56165a 100644
--- a/e107_plugins/social/e_module.php
+++ b/e107_plugins/social/e_module.php
@@ -4,7 +4,7 @@ if(e_ADMIN_AREA !==true)
 {
 
 	e107::css('social', 'css/fontello.css');
-	e107::link(array('rel'=>'preload', 'href'=> e_PLUGIN_ABS."social/font/fontello.woff2?21917124", 'as' => "font", 'type'=>"font/woff2", 'crossorigin'   => true));
+	e107::link(array('rel'=>'preload', 'href'=> "{e_PLUGIN}social/font/fontello.woff2?21917124", 'as' => "font", 'type'=>"font/woff2", 'crossorigin'   => true));
 	e107::css('social' ,'css/social.css');
 
 	$appID = false;