diff --git a/app/Resources/public/css/themes/chamilo/images/favicon.ico b/app/Resources/public/css/themes/chamilo/images/favicon.ico
new file mode 100644
index 0000000000..2d384c7a42
Binary files /dev/null and b/app/Resources/public/css/themes/chamilo/images/favicon.ico differ
diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php
index 93cd23884b..eb118421e3 100755
--- a/main/inc/lib/template.lib.php
+++ b/main/inc/lib/template.lib.php
@@ -805,7 +805,17 @@ class Template
         $this->assign('text_direction', api_get_text_direction());
         $this->assign('section_name', 'section-'.$this_section);
 
-        $favico = '<link rel="shortcut icon" href="'.api_get_path(WEB_PATH).'favicon.ico" type="image/x-icon" />';
+        //Defaul root chamilo favicon
+        $favico = '<link rel="shortcut icon" href="' . api_get_path(WEB_PATH) . 'favicon.ico" type="image/x-icon" />';
+
+        //Added to verify if in the current Chamilo Theme exist a favicon
+        $favicoThemeUrl = api_get_path(SYS_CSS_PATH) . 'themes/' . $this->theme . '/images/';
+
+        //If exist pick the current chamilo theme favicon
+        if (is_file($favicoThemeUrl . 'favicon.ico')) {
+            $favico = '<link rel="shortcut icon" href="' . api_get_path(WEB_CSS_PATH)
+                . 'themes/' . $this->theme . '/images/favicon.ico" type="image/x-icon" />';  
+        }
 
         if (api_is_multiple_url_enabled()) {
             $access_url_id = api_get_current_access_url_id();