17 files changed, 17 insertions, 15 deletions
diff --git a/skins/default/images/favicon.ico b/skins/default/images/favicon.ico
new file mode 100644
index 000000000..5a011f29e
--- /dev/null
+++ b/skins/default/images/favicon.ico
diff --git a/skins/default/includes/links.html b/skins/default/includes/links.html
new file mode 100644
index 000000000..5d8c0e5f7
--- /dev/null
+++ b/skins/default/includes/links.html
@@ -0,0 +1,2 @@
+<link rel="shortcut icon" href="/images/favicon.ico"/>
+<link rel="stylesheet" type="text/css" href="/common.css" />
+\ No newline at end of file
diff --git a/skins/default/templates/addcontact.html b/skins/default/templates/addcontact.html
index 773e6085f..a7f4379ff 100644
--- a/skins/default/templates/addcontact.html
+++ b/skins/default/templates/addcontact.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title><roundcube:object name="pagetitle" /></title>
-<link rel="stylesheet" type="text/css" href="/common.css" />
+<roundcube:include file="/includes/links.html" />
 <link rel="stylesheet" type="text/css" href="/addresses.css" />
 </head>
 <body class="iframe">
diff --git a/skins/default/templates/addidentity.html b/skins/default/templates/addidentity.html
index 6d29cad1d..d38d80642 100644
--- a/skins/default/templates/addidentity.html
+++ b/skins/default/templates/addidentity.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title><roundcube:object name="pagetitle" /></title>
-<link rel="stylesheet" type="text/css" href="/common.css" />
+<roundcube:include file="/includes/links.html" />
 <link rel="stylesheet" type="text/css" href="/settings.css" />
 </head>
 <body>
diff --git a/skins/default/templates/addressbook.html b/skins/default/templates/addressbook.html
index 5b66b0594..27b612925 100644
--- a/skins/default/templates/addressbook.html
+++ b/skins/default/templates/addressbook.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title><roundcube:object name="pagetitle" /></title>
-<link rel="stylesheet" type="text/css" href="/common.css" />
+<roundcube:include file="/includes/links.html" />
 <link rel="stylesheet" type="text/css" href="/addresses.css" />
 </head>
 <body>
diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index 2071c0e05..dd392bdda 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>RoundCube|Mail :: <roundcube:label name="compose" /></title>
-<link rel="stylesheet" type="text/css" href="/common.css" />
+<roundcube:include file="/includes/links.html" />
 <link rel="stylesheet" type="text/css" href="/mail.css" />
 <script type="text/javascript">
 <!--
diff --git a/skins/default/templates/editcontact.html b/skins/default/templates/editcontact.html
index b71836d5b..8f8ce0930 100644
--- a/skins/default/templates/editcontact.html
+++ b/skins/default/templates/editcontact.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title><roundcube:object name="pagetitle" /></title>
-<link rel="stylesheet" type="text/css" href="/common.css" />
+<roundcube:include file="/includes/links.html" />
 <link rel="stylesheet" type="text/css" href="/addresses.css" />
 </head>
 <body class="iframe">
diff --git a/skins/default/templates/editidentity.html b/skins/default/templates/editidentity.html
index 53d878d1f..4fb087d40 100644
--- a/skins/default/templates/editidentity.html
+++ b/skins/default/templates/editidentity.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title><roundcube:object name="pagetitle" /></title>
-<link rel="stylesheet" type="text/css" href="/common.css" />
+<roundcube:include file="/includes/links.html" />
 <link rel="stylesheet" type="text/css" href="/settings.css" />
 </head>
 <body>
diff --git a/skins/default/templates/error.html b/skins/default/templates/error.html
index 0b2d9b8b9..273013bc2 100644
--- a/skins/default/templates/error.html
+++ b/skins/default/templates/error.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>RoundCube|Mail :: ERROR</title>
-<link rel="stylesheet" type="text/css" href="/common.css" />
+<roundcube:include file="/includes/links.html" />
 </head>
 <body>
 
diff --git a/skins/default/templates/identities.html b/skins/default/templates/identities.html
index c96e154fb..7e311cc7f 100644
--- a/skins/default/templates/identities.html
+++ b/skins/default/templates/identities.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title><roundcube:object name="pagetitle" /></title>
-<link rel="stylesheet" type="text/css" href="/common.css" />
+<roundcube:include file="/includes/links.html" />
 <link rel="stylesheet" type="text/css" href="/settings.css" />
 </head>
 <body>
diff --git a/skins/default/templates/login.html b/skins/default/templates/login.html
index 0fc6dad6d..c66bb6b42 100644
--- a/skins/default/templates/login.html
+++ b/skins/default/templates/login.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>Welcome to RoundCube|Mail</title>
-<link rel="stylesheet" type="text/css" href="/common.css" />
+<roundcube:include file="/includes/links.html" />
 <style type="text/css">
 
 #login-form
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index 783808ded..3eafad581 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title><roundcube:object name="pagetitle" /></title>
-<link rel="stylesheet" type="text/css" href="/common.css" />
+<roundcube:include file="/includes/links.html" />
 <link rel="stylesheet" type="text/css" href="/mail.css" />
 </head>
 <body>
diff --git a/skins/default/templates/managefolders.html b/skins/default/templates/managefolders.html
index 0a9918356..e3d6be0e1 100644
--- a/skins/default/templates/managefolders.html
+++ b/skins/default/templates/managefolders.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title><roundcube:object name="pagetitle" /></title>
-<link rel="stylesheet" type="text/css" href="/common.css" />
+<roundcube:include file="/includes/links.html" />
 <link rel="stylesheet" type="text/css" href="/settings.css" />
 </head>
 <body>
diff --git a/skins/default/templates/message.html b/skins/default/templates/message.html
index 7d4ff5527..4a4702afd 100644
--- a/skins/default/templates/message.html
+++ b/skins/default/templates/message.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title><roundcube:object name="pagetitle" /></title>
-<link rel="stylesheet" type="text/css" href="/common.css" />
+<roundcube:include file="/includes/links.html" />
 <link rel="stylesheet" type="text/css" href="/mail.css" />
 </head>
 <body>
diff --git a/skins/default/templates/messagepart.html b/skins/default/templates/messagepart.html
index 924342f3f..cf5803db0 100644
--- a/skins/default/templates/messagepart.html
+++ b/skins/default/templates/messagepart.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title><roundcube:object name="pagetitle" /></title>
-<link rel="stylesheet" type="text/css" href="/common.css" />
+<roundcube:include file="/includes/links.html" />
 <link rel="stylesheet" type="text/css" href="/mail.css" />
 </head>
 <body class="extwin">
diff --git a/skins/default/templates/settings.html b/skins/default/templates/settings.html
index 879b9cebc..bb0139917 100644
--- a/skins/default/templates/settings.html
+++ b/skins/default/templates/settings.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title><roundcube:object name="pagetitle" /></title>
-<link rel="stylesheet" type="text/css" href="/common.css" />
+<roundcube:include file="/includes/links.html" />
 <link rel="stylesheet" type="text/css" href="/settings.css" />
 </head>
 <body>
diff --git a/skins/default/templates/showcontact.html b/skins/default/templates/showcontact.html
index 1e24688dc..8a8434312 100644
--- a/skins/default/templates/showcontact.html
+++ b/skins/default/templates/showcontact.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title><roundcube:object name="pagetitle" /></title>
-<link rel="stylesheet" type="text/css" href="/common.css" />
+<roundcube:include file="/includes/links.html" />
 <link rel="stylesheet" type="text/css" href="/addresses.css" />
 </head>
 <body class="iframe">