diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
index 4457cb942..6cf3ddbe5 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
@@ -1176,16 +1176,8 @@
                       href="{foundry:gen-path('styles/debug-mode.css', 'internal')}"/>
             </xsl:if>
             
-            <!-- Not implemented yet <xsl:call-template name="bebop:double-click-protection"/> -->
-      
-            <!-- 
-                Set favicon if exists. This three different variants for including the favicon
-                are necessary to satisfy all browsers.
-            -->
-            <link href="{$theme-prefix}/images/favicon.ico" 
-                  type="image/x-icon" 
-                  rel="shortcut icon"/>
-            
+            <!-- Not implemented yet <xsl:call-template name="bebop:double-click-protection"/> -->      
+           
             <xsl:apply-templates select="$data-tree//script"/>
         </head>
     </xsl:template>
@@ -2958,4 +2950,4 @@
     
 
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/loaders.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/loaders.xsl
index e2aea5d17..c9450b1c6 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/loaders.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/loaders.xsl
@@ -456,9 +456,32 @@
         </foundry:doc-attributes>
     </foundry:doc>
     <xsl:template match="load-favicon">
-        <link rel="shortcut icon" 
-              type="image/x-icon" 
-              href="{foundry:gen-path(./@file)}" />
+        <xsl:if test="./@file">
+            <link rel="shortcut icon" 
+                  type="image/x-icon" 
+                  href="{foundry:gen-path(./@file)}" />
+        </xsl:if>
+        <xsl:if test="./icon">
+            <link rel="shortcut icon"
+                  type="image/x-icon"
+                  href="{foundry:gen-path(./icon)}" />
+        </xsl:if>
+        <xsl:if test="./png">
+            <link rel="icon"
+                  type="image/png"
+                  href="{foundry:gen-path(./png)}" />
+        </xsl:if>
+        <xsl:if test="./apple-touch-icon">
+            <link rel="apple-touch-icon" 
+                  sizes="180x180"
+                  href="{foundry:gen-path(./apple-touch-icon)}" />                  
+        </xsl:if>
+        <xsl:if test="./mstile/@color">
+            <meta name="msapplication-TileColor" content="#ffffff" />
+        </xsl:if>
+        <xsl:if test="./mstile">
+            <meta name="msapplication-TileImage" content="{foundry:gen-path(./mstile)}" />
+        </xsl:if>
     </xsl:template>
     
     <foundry:doc section="user" type="template-tag">