diff --git a/templates/default/assets/img/favicon.ico b/templates/default/assets/img/favicon.ico
new file mode 100644
index 000000000..19f5af190
Binary files /dev/null and b/templates/default/assets/img/favicon.ico differ
diff --git a/templates/default/assets/img/favicon.png b/templates/default/assets/img/favicon.png
new file mode 100644
index 000000000..5669f3e76
Binary files /dev/null and b/templates/default/assets/img/favicon.png differ
diff --git a/templates/default/layout.tpl b/templates/default/layout.tpl
index 2c485b0a2..b638e0b18 100644
--- a/templates/default/layout.tpl
+++ b/templates/default/layout.tpl
@@ -48,6 +48,12 @@ GNU General Public License : http://www.gnu.org/licenses/
 
     {block name="stylesheet"}{/block}
 
+    {* Favicon *}
+    {images file='assets/img/favicon.ico'}<link rel="shortcut icon" type="image/x-icon" href="{$asset_url}">{/images}
+    {images file='assets/img/favicon.png'}<link rel="icon" type="image/png" href="{$asset_url}" />{/images}
+
+    <link rel="icon" href="/favicon.ico" type="image/x-icon">
+
     {* HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries *}
     <!--[if lt IE 9]>
     <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>