diff --git a/main/gradebook/gradebook_add_cat.php b/main/gradebook/gradebook_add_cat.php
index 8c9dc47e82..b88af6edba 100755
--- a/main/gradebook/gradebook_add_cat.php
+++ b/main/gradebook/gradebook_add_cat.php
@@ -17,9 +17,6 @@ GradebookUtils::block_students();
 
 $edit_cat = isset($_REQUEST['editcat']) ? intval($_REQUEST['editcat']) : '';
 
-$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/tag/jquery.fcbkcomplete.js" type="text/javascript" language="javascript"></script>';
-$htmlHeadXtra[] = '<link  href="'.api_get_path(WEB_LIBRARY_PATH).'javascript/tag/style.css" rel="stylesheet" type="text/css" />';
-
 $htmlHeadXtra[] = '<script>
 $(document).ready(function () {
     $("#skills").fcbkcomplete({
diff --git a/main/gradebook/gradebook_edit_cat.php b/main/gradebook/gradebook_edit_cat.php
index 6e9bb73099..3d3a5f6be6 100755
--- a/main/gradebook/gradebook_edit_cat.php
+++ b/main/gradebook/gradebook_edit_cat.php
@@ -12,9 +12,6 @@ GradebookUtils::block_students();
 
 $edit_cat = isset($_REQUEST['editcat']) ? intval($_REQUEST['editcat']) : '';
 
-$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/tag/jquery.fcbkcomplete.js" type="text/javascript" language="javascript"></script>';
-$htmlHeadXtra[] = '<link  href="'.api_get_path(WEB_LIBRARY_PATH).'javascript/tag/style.css" rel="stylesheet" type="text/css" />';
-
 $htmlHeadXtra[] = '<script>
 $(document).ready(function() {
     $("#skills").fcbkcomplete({
diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php
index 36b8ad370d..b033ceaadd 100755
--- a/main/inc/lib/template.lib.php
+++ b/main/inc/lib/template.lib.php
@@ -494,6 +494,7 @@ class Template
         }
 
         $css[] = api_get_path(WEB_LIBRARY_PATH) . 'javascript/chosen/chosen.css';
+        $css[] = api_get_path(WEB_LIBRARY_PATH) . 'javascript/tag/style.css';
 
         if (api_is_global_chat_enabled()) {
             $css[] = api_get_path(WEB_LIBRARY_PATH) . 'javascript/chat/css/chat.css';
@@ -590,7 +591,10 @@ class Template
 
         if (api_is_global_chat_enabled()) {
             //Do not include the global chat in LP
-            if ($this->show_learnpath == false && $this->show_footer == true && $this->hide_global_chat == false) {
+            if ($this->show_learnpath == false &&
+                $this->show_footer == true &&
+                $this->hide_global_chat == false
+            ) {
                 $js_files[] = 'chat/js/chat.js';
             }
         }
@@ -603,6 +607,8 @@ class Template
             $js_files[] = 'asciimath/ASCIIMathML.js';
         }
 
+        $js_files[] = 'tag/jquery.fcbkcomplete.js';
+
         $js_file_to_string = null;
         $isoCode = api_get_language_isocode();
 
@@ -770,7 +776,7 @@ class Template
                 $clean_url = str_replace('/', '-', $clean_url);
                 $clean_url .= '/';
                 $homep           = api_get_path(REL_PATH).'home/'.$clean_url; //homep for Home Path
-                $icon_real_homep = api_get_path(SYS_PATH).'home/'.$clean_url;
+                $icon_real_homep = api_get_path(SYS_APP_PATH).'home/'.$clean_url;
 
                 //we create the new dir for the new sites
                 if (is_file($icon_real_homep.'favicon.ico')) {