diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php
index 95676457..60765648 100644
--- a/adminer/include/design.inc.php
+++ b/adminer/include/design.inc.php
@@ -22,7 +22,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 <meta http-equiv="Content-Script-Type" content="text/javascript">
 <meta name="robots" content="noindex">
 <title><?php echo $title_page; ?></title>
-<link rel="shortcut icon" type="image/x-icon" href="../adminer/static/favicon.ico">
+<link rel="shortcut icon" type="image/x-icon" href="../adminer/static/favicon.ico" id="favicon">
 <link rel="stylesheet" type="text/css" href="../adminer/static/default.css">
 <?php if (file_exists("adminer.css")) { ?>
 <link rel="stylesheet" type="text/css" href="adminer.css">
diff --git a/adminer/static/functions.js b/adminer/static/functions.js
index 6e1008c1..aa882df9 100644
--- a/adminer/static/functions.js
+++ b/adminer/static/functions.js
@@ -270,6 +270,18 @@ function ajaxSetHtml(url) {
 	});
 }
 
+/** Replace favicon
+* @param string
+* @return string original href
+*/
+function replaceFavicon(href) {
+	var favicon = document.getElementById('favicon');
+	var orig = favicon.href;
+	favicon.href = href;
+	favicon.parentNode.appendChild(favicon); // to replace the icon in Firefox
+	return orig;
+}
+
 var ajaxState = 0;
 
 /** Safely load content to #content
@@ -280,9 +292,11 @@ var ajaxState = 0;
 */
 function ajaxSend(url, data, popState) {
 	var currentState = ++ajaxState;
+	var favicon = replaceFavicon('../adminer/static/loader.gif');
 	setHtml('loader', '<img src="../adminer/static/loader.gif" alt="">');
 	return ajax(url, function (text) {
 		if (currentState == ajaxState) {
+			replaceFavicon(favicon);
 			if (text === undefined) {
 				setHtml('loader', '');
 			} else {
diff --git a/adminer/static/loader.gif b/adminer/static/loader.gif
index f2a1bc0c..d0bce154 100644
Binary files a/adminer/static/loader.gif and b/adminer/static/loader.gif differ