diff --git a/tpl/bootstrap-compact.html b/tpl/bootstrap-compact.html
index add548bf..3f9079b9 100644
--- a/tpl/bootstrap-compact.html
+++ b/tpl/bootstrap-compact.html
@@ -28,6 +28,8 @@
 		<link rel="icon" type="image/png" href="favicon-16x16.png?{$VERSION|rawurlencode}" sizes="16x16" />
 		<link rel="manifest" href="manifest.json?{$VERSION|rawurlencode}" />
 		<link rel="mask-icon" href="safari-pinned-tab.svg?{$VERSION|rawurlencode}" color="#ffcc00" />
+		<link rel="shortcut icon" href="favicon.ico">
+		<meta name="msapplication-config" content="browserconfig.xml">
 		<meta name="theme-color" content="#ffe57e" />
 	</head>
 	<body role="document" class="navbar-spacing">
@@ -164,9 +166,9 @@
 			<noscript><div id="noscript" role="alert" class="nonworking alert alert-warning"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> {function="i18n::_('Javascript is required for PrivateBin to work.<br />Sorry for the inconvenience.')"}</div></noscript>
 			<div id="oldienotice" role="alert" class="hidden nonworking alert alert-danger"><span class="glyphicon glyphicon-alert" aria-hidden="true"></span> {function="i18n::_('PrivateBin requires a modern browser to work.')"}</div>
 			<div id="ienotice" role="alert" class="hidden alert alert-warning"><span class="glyphicon glyphicon-question-sign" aria-hidden="true"></span> {function="i18n::_('Still using Internet Explorer? Do yourself a favor, switch to a modern browser:')"}
-				<a href="http://www.mozilla.org/firefox/">Firefox</a>, 
-				<a href="http://www.opera.com/">Opera</a>, 
-				<a href="http://www.google.com/chrome">Chrome</a>, 
+				<a href="http://www.mozilla.org/firefox/">Firefox</a>,
+				<a href="http://www.opera.com/">Opera</a>,
+				<a href="http://www.google.com/chrome">Chrome</a>,
 				<a href="http://www.apple.com/safari">Safari</a>...
 			</div>
 			<div id="pasteresult" role="alert" class="hidden alert alert-success">
diff --git a/tpl/bootstrap-dark-page.html b/tpl/bootstrap-dark-page.html
index 9def54a2..c61fd069 100644
--- a/tpl/bootstrap-dark-page.html
+++ b/tpl/bootstrap-dark-page.html
@@ -28,6 +28,8 @@
 		<link rel="icon" type="image/png" href="favicon-16x16.png?{$VERSION|rawurlencode}" sizes="16x16" />
 		<link rel="manifest" href="manifest.json?{$VERSION|rawurlencode}" />
 		<link rel="mask-icon" href="safari-pinned-tab.svg?{$VERSION|rawurlencode}" color="#ffcc00" />
+		<link rel="shortcut icon" href="favicon.ico">
+		<meta name="msapplication-config" content="browserconfig.xml">
 		<meta name="theme-color" content="#ffe57e" />
 	</head>
 	<body role="document">
@@ -160,9 +162,9 @@
 			<noscript><div id="noscript" role="alert" class="nonworking alert alert-error"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> {function="i18n::_('Javascript is required for PrivateBin to work.<br />Sorry for the inconvenience.')"}</div></noscript>
 			<div id="oldienotice" role="alert" class="hidden nonworking alert alert-danger"><span class="glyphicon glyphicon-alert" aria-hidden="true"></span> {function="i18n::_('PrivateBin requires a modern browser to work.')"}</div>
 			<div id="ienotice" role="alert" class="hidden alert alert-error"><span class="glyphicon glyphicon-question-sign" aria-hidden="true"></span> {function="i18n::_('Still using Internet Explorer? Do yourself a favor, switch to a modern browser:')"}
-				<a href="http://www.mozilla.org/firefox/">Firefox</a>, 
-				<a href="http://www.opera.com/">Opera</a>, 
-				<a href="http://www.google.com/chrome">Chrome</a>, 
+				<a href="http://www.mozilla.org/firefox/">Firefox</a>,
+				<a href="http://www.opera.com/">Opera</a>,
+				<a href="http://www.google.com/chrome">Chrome</a>,
 				<a href="http://www.apple.com/safari">Safari</a>...
 			</div>
 			<div id="pasteresult" role="alert" class="hidden alert alert-success">
diff --git a/tpl/bootstrap-dark.html b/tpl/bootstrap-dark.html
index bf6e9a38..b750e5d4 100644
--- a/tpl/bootstrap-dark.html
+++ b/tpl/bootstrap-dark.html
@@ -28,6 +28,8 @@
 		<link rel="icon" type="image/png" href="favicon-16x16.png?{$VERSION|rawurlencode}" sizes="16x16" />
 		<link rel="manifest" href="manifest.json?{$VERSION|rawurlencode}" />
 		<link rel="mask-icon" href="safari-pinned-tab.svg?{$VERSION|rawurlencode}" color="#ffcc00" />
+		<link rel="shortcut icon" href="favicon.ico">
+		<meta name="msapplication-config" content="browserconfig.xml">
 		<meta name="theme-color" content="#ffe57e" />
 	</head>
 	<body role="document">
@@ -160,9 +162,9 @@
 			<noscript><div id="noscript" role="alert" class="nonworking alert alert-error"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> {function="i18n::_('Javascript is required for PrivateBin to work.<br />Sorry for the inconvenience.')"}</div></noscript>
 			<div id="oldienotice" role="alert" class="hidden nonworking alert alert-danger"><span class="glyphicon glyphicon-alert" aria-hidden="true"></span> {function="i18n::_('PrivateBin requires a modern browser to work.')"}</div>
 			<div id="ienotice" role="alert" class="hidden alert alert-error"><span class="glyphicon glyphicon-question-sign" aria-hidden="true"></span> {function="i18n::_('Still using Internet Explorer? Do yourself a favor, switch to a modern browser:')"}
-				<a href="http://www.mozilla.org/firefox/">Firefox</a>, 
-				<a href="http://www.opera.com/">Opera</a>, 
-				<a href="http://www.google.com/chrome">Chrome</a>, 
+				<a href="http://www.mozilla.org/firefox/">Firefox</a>,
+				<a href="http://www.opera.com/">Opera</a>,
+				<a href="http://www.google.com/chrome">Chrome</a>,
 				<a href="http://www.apple.com/safari">Safari</a>...
 			</div>
 			<div id="pasteresult" role="alert" class="hidden alert alert-success">
diff --git a/tpl/bootstrap-page.html b/tpl/bootstrap-page.html
index 34e3ccb9..adcc2079 100644
--- a/tpl/bootstrap-page.html
+++ b/tpl/bootstrap-page.html
@@ -28,6 +28,8 @@
 		<link rel="icon" type="image/png" href="favicon-16x16.png?{$VERSION|rawurlencode}" sizes="16x16" />
 		<link rel="manifest" href="manifest.json?{$VERSION|rawurlencode}" />
 		<link rel="mask-icon" href="safari-pinned-tab.svg?{$VERSION|rawurlencode}" color="#ffcc00" />
+		<link rel="shortcut icon" href="favicon.ico">
+		<meta name="msapplication-config" content="browserconfig.xml">
 		<meta name="theme-color" content="#ffe57e" />
 	</head>
 	<body role="document">
@@ -160,9 +162,9 @@
 			<noscript><div id="noscript" role="alert" class="nonworking alert alert-warning"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> {function="i18n::_('Javascript is required for PrivateBin to work.<br />Sorry for the inconvenience.')"}</div></noscript>
 			<div id="oldienotice" role="alert" class="hidden nonworking alert alert-danger"><span class="glyphicon glyphicon-alert" aria-hidden="true"></span> {function="i18n::_('PrivateBin requires a modern browser to work.')"}</div>
 			<div id="ienotice" role="alert" class="hidden alert alert-warning"><span class="glyphicon glyphicon-question-sign" aria-hidden="true"></span> {function="i18n::_('Still using Internet Explorer? Do yourself a favor, switch to a modern browser:')"}
-				<a href="http://www.mozilla.org/firefox/">Firefox</a>, 
-				<a href="http://www.opera.com/">Opera</a>, 
-				<a href="http://www.google.com/chrome">Chrome</a>, 
+				<a href="http://www.mozilla.org/firefox/">Firefox</a>,
+				<a href="http://www.opera.com/">Opera</a>,
+				<a href="http://www.google.com/chrome">Chrome</a>,
 				<a href="http://www.apple.com/safari">Safari</a>...
 			</div>
 			<div id="pasteresult" role="alert" class="hidden alert alert-success">
diff --git a/tpl/bootstrap.html b/tpl/bootstrap.html
index a22d83ff..111a3714 100644
--- a/tpl/bootstrap.html
+++ b/tpl/bootstrap.html
@@ -28,6 +28,8 @@
 		<link rel="icon" type="image/png" href="favicon-16x16.png?{$VERSION|rawurlencode}" sizes="16x16" />
 		<link rel="manifest" href="manifest.json?{$VERSION|rawurlencode}" />
 		<link rel="mask-icon" href="safari-pinned-tab.svg?{$VERSION|rawurlencode}" color="#ffcc00" />
+		<link rel="shortcut icon" href="favicon.ico">
+		<meta name="msapplication-config" content="browserconfig.xml">
 		<meta name="theme-color" content="#ffe57e" />
 	</head>
 	<body role="document">
@@ -160,9 +162,9 @@
 			<noscript><div id="noscript" role="alert" class="nonworking alert alert-warning"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> {function="i18n::_('Javascript is required for PrivateBin to work.<br />Sorry for the inconvenience.')"}</div></noscript>
 			<div id="oldienotice" role="alert" class="hidden nonworking alert alert-danger"><span class="glyphicon glyphicon-alert" aria-hidden="true"></span> {function="i18n::_('PrivateBin requires a modern browser to work.')"}</div>
 			<div id="ienotice" role="alert" class="hidden alert alert-warning"><span class="glyphicon glyphicon-question-sign" aria-hidden="true"></span> {function="i18n::_('Still using Internet Explorer? Do yourself a favor, switch to a modern browser:')"}
-				<a href="http://www.mozilla.org/firefox/">Firefox</a>, 
-				<a href="http://www.opera.com/">Opera</a>, 
-				<a href="http://www.google.com/chrome">Chrome</a>, 
+				<a href="http://www.mozilla.org/firefox/">Firefox</a>,
+				<a href="http://www.opera.com/">Opera</a>,
+				<a href="http://www.google.com/chrome">Chrome</a>,
 				<a href="http://www.apple.com/safari">Safari</a>...
 			</div>
 			<div id="pasteresult" role="alert" class="hidden alert alert-success">
diff --git a/tpl/page.html b/tpl/page.html
index d31caeac..aedda773 100644
--- a/tpl/page.html
+++ b/tpl/page.html
@@ -23,6 +23,8 @@
 		<link rel="icon" type="image/png" href="favicon-16x16.png?{$VERSION|rawurlencode}" sizes="16x16" />
 		<link rel="manifest" href="manifest.json?{$VERSION|rawurlencode}" />
 		<link rel="mask-icon" href="safari-pinned-tab.svg?{$VERSION|rawurlencode}" color="#ffcc00" />
+		<link rel="shortcut icon" href="favicon.ico">
+		<meta name="msapplication-config" content="browserconfig.xml">
 		<meta name="theme-color" content="#ffe57e" />
 	</head>
 	<body>
@@ -37,9 +39,9 @@
 			<noscript><div id="noscript" class="nonworking">{function="i18n::_('Javascript is required for PrivateBin to work.<br />Sorry for the inconvenience.')"}</div></noscript>
 			<div id="oldienotice" class="nonworking">{function="i18n::_('PrivateBin requires a modern browser to work.')"}</div>
 			<div id="ienotice">{function="i18n::_('Still using Internet Explorer? Do yourself a favor, switch to a modern browser:')"}
-				<a href="http://www.mozilla.org/firefox/">Firefox</a>, 
-				<a href="http://www.opera.com/">Opera</a>, 
-				<a href="http://www.google.com/chrome">Chrome</a>, 
+				<a href="http://www.mozilla.org/firefox/">Firefox</a>,
+				<a href="http://www.opera.com/">Opera</a>,
+				<a href="http://www.google.com/chrome">Chrome</a>,
 				<a href="http://www.apple.com/safari">Safari</a>...
 			</div>
 		</header>
