diff --git a/PVE/HTTPServer.pm b/PVE/HTTPServer.pm
index e2c9db32..c32a0578 100755
--- a/PVE/HTTPServer.pm
+++ b/PVE/HTTPServer.pm
@@ -287,6 +287,9 @@ sub send_file_start {
 	    } elsif ($filename =~ m/\.png$/) {
 		$ct = 'image/png';
 		$nocomp = 1;
+	    } elsif ($filename =~ m/\.ico$/) {
+		$ct = 'image/x-icon';
+		$nocomp = 1;
 	    } elsif ($filename =~ m/\.gif$/) {
 		$ct = 'image/gif';
 		$nocomp = 1;
diff --git a/bin/pveproxy b/bin/pveproxy
index d8f8f82e..6cd33e3a 100755
--- a/bin/pveproxy
+++ b/bin/pveproxy
@@ -229,7 +229,7 @@ _EOJS
  
     <link rel="stylesheet" type="text/css" href="/pve2/ext4/resources/css/ext-all.css" />
     <link rel="stylesheet" type="text/css" href="/pve2/css/ext-pve.css" />
- 
+
     <script type="text/javascript">$i18nsrc</script>
     <script type="text/javascript" src="/pve2/ext4/ext-all-debug.js"></script>
     <script type="text/javascript" src="/pve2/ext4/pvemanagerlib.js"></script>
diff --git a/www/images/Makefile b/www/images/Makefile
index 2f2bbdae..714db629 100644
--- a/www/images/Makefile
+++ b/www/images/Makefile
@@ -22,6 +22,7 @@ GNOME_IMAGES = 			\
 	computer.png
 
 IMAGES = ${GNOME_IMAGES}	\
+	favicon.ico		\
 	snapshot.png		\
 	computer-on.png		\
 	memory.png		\
diff --git a/www/images/favicon.ico b/www/images/favicon.ico
new file mode 100644
index 00000000..cd6e9a1b
Binary files /dev/null and b/www/images/favicon.ico differ
diff --git a/www/images/favicon.xcf b/www/images/favicon.xcf
new file mode 100644
index 00000000..1863a575
Binary files /dev/null and b/www/images/favicon.xcf differ