diff --git a/class2.php b/class2.php
index 82238c866..9c012f128 100755
--- a/class2.php
+++ b/class2.php
@@ -1374,6 +1374,15 @@ if(!defined("THEME_LAYOUT"))
     unset($cusPageDef,$lyout,$cusPagePref,$menus_equery,$deflayout);
 }
 
+// Load library dependencies.
+if(deftrue('e_ADMIN_AREA'))
+{
+	e107::getTheme('current', true)->loadLibrary();
+}
+else
+{
+	e107::getTheme('current')->loadLibrary();
+}
 // -----------------------------------------------------------------------
 
 
diff --git a/e107_admin/header.php b/e107_admin/header.php
index 5e4eb4889..614cdf688 100644
--- a/e107_admin/header.php
+++ b/e107_admin/header.php
@@ -91,8 +91,6 @@ function loadJSAddons()
     }
 }
 
-// Load library dependencies.
-e107::getTheme('current', true)->loadLibrary();
 
 // Load other JS files.
 loadJSAddons();
@@ -497,26 +495,26 @@ echo "</head>
 echo getModal();
 echo getAlert();
 
-  function getModal($caption = '', $type='')
+function getModal()
+{
+
+	if(deftrue('BOOTSTRAP'))  // see bootstrap3/admin_template.php
     {
+		return '';
+	}
 
-        if(deftrue('BOOTSTRAP'))  // see bootstrap3/admin_template.php
-        {
-            return '';
-        }
-
-    	if(e_PAGE == 'menus.php' && vartrue($_GET['configure'])) // Menu Manager iFrame disable
-		{
+	if(e_PAGE == 'menus.php' && vartrue($_GET['configure'])) // Menu Manager iFrame disable
+	{
+		return null;
+	}
+	/*
+	if(e_PAGE == "image.php")
+	{
 			return;
-		}
+	}
+		*/
 		
-		if(e_PAGE == "image.php")
-		{
-	//		return;	
-		}
-		
-		
-        return '
+	return '
        
          <div id="uiModal" class="modal  fade" tabindex="-1" role="dialog"  aria-hidden="true">
             <div class="modal-dialog modal-lg">
@@ -537,16 +535,11 @@ echo getAlert();
 		    </div>
         </div>';        
             
-    }
+}
 
-function getAlert($caption='')
+function getAlert()
 {
-	//  style="box-shadow:0px 15px 8px #000;width:300px;position:absolute;left:40%;right:40%;top:15%;z-index:10000"
-
-
-
 	return '<div id="uiAlert" class="notifications center"><!-- empty --></div>';
-
 }
 
 
diff --git a/e107_core/templates/header_default.php b/e107_core/templates/header_default.php
index 799b09113..b943eaba6 100644
--- a/e107_core/templates/header_default.php
+++ b/e107_core/templates/header_default.php
@@ -23,8 +23,7 @@ $sql = e107::getDb();
 
 $sql->db_Mark_Time('(Header Top)');
 
-// Load library dependencies.
-e107::getTheme('current')->loadLibrary();
+
 
 //e107::js('core',	'bootstrap/js/bootstrap-tooltip.js','jquery');
 // e107::css('core',	'bootstrap/css/tooltip.css','jquery');
diff --git a/e107_handlers/db_debug_class.php b/e107_handlers/db_debug_class.php
index 9dc605d2d..8602d313e 100644
--- a/e107_handlers/db_debug_class.php
+++ b/e107_handlers/db_debug_class.php
@@ -765,7 +765,7 @@
 
 
 			$inc = array(
-				'BOOTSTRAP', 'HEADERF', 'FOOTERF', 'FILE_UPLOADS', 'FLOODPROTECT', 'FLOODTIMEOUT', 'CHARSET',
+				'BOOTSTRAP', 'HEADERF', 'FOOTERF', 'FILE_UPLOADS', 'FLOODPROTECT', 'FLOODTIMEOUT', 'FONTAWESOME', 'CHARSET',
 				'GUESTS_ONLINE', 'MEMBERS_ONLINE', 'PAGE_NAME', 'STANDARDS_MODE', 'TIMEOFFSET',
 				'TOTAL_ONLINE', 'THEME', 'THEME_ABS', 'THEME_LAYOUT', 'THEME_LEGACY', 'THEME_STYLE', 'META_OG', 'META_DESCRIPTION', 'MPREFIX', 'VIEWPORT', 'BODYTAG', 'CSSORDER'
 			);