diff --git a/deluge/ui/webui/static/images/deluge-icon.png b/deluge/ui/webui/static/images/deluge-icon.png
new file mode 100644
index 000000000..e39cd0c7e
Binary files /dev/null and b/deluge/ui/webui/static/images/deluge-icon.png differ
diff --git a/deluge/ui/webui/templates/ajax/index.html b/deluge/ui/webui/templates/ajax/index.html
index de94b2580..c0da053fb 100644
--- a/deluge/ui/webui/templates/ajax/index.html
+++ b/deluge/ui/webui/templates/ajax/index.html
@@ -2,8 +2,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<title>Deluge: AJAX UI (alpha) $version</title>
-		<link rel="icon" href="$base/static/images/deluge_icon.gif" type="image/gif" />
-		<link rel="shortcut icon" href="$base/static/images/deluge_icon.gif" type="image/gif" />
+		<link rel="icon" href="$base/static/images/deluge-icon.png" type="image/png" />
+		<link rel="shortcut icon" href="$base/static/images/deluge-icon.png" type="image/png" />
 		<link rel="stylesheet" type="text/css" href="$base/template/static/css/mooui.css" />
 		<link rel="stylesheet" type="text/css" href="$base/template_style.css" />
 		<script src="$base/template/static/js/mootools-1.2-core.js" type="text/javascript"></script>
diff --git a/deluge/ui/webui/templates/classic/header.html b/deluge/ui/webui/templates/classic/header.html
index eff4c8dd5..f11ecc861 100644
--- a/deluge/ui/webui/templates/classic/header.html
+++ b/deluge/ui/webui/templates/classic/header.html
@@ -1,23 +1,19 @@
 $def with (title, active_tab="NONE")
 <html>
-<head>
-    <title>Deluge:$title</title>
-    <link rel="icon" href="$base/static/images/deluge_icon.gif" type="image/gif" />
-    <link rel="shortcut icon" href="$base/static/images/deluge_icon.gif" type="image/gif" />
-<link rel="stylesheet" type="text/css" href="$base/static/simple_site_style.css" />
-
-</head>
-
-<body>
-<div id="page">
-
-<a href='$base/home'>
-    <div id="simple_logo">
-    <div class="title">Deluge</div>
-    <div class="info">$title</div>
-    </div>
-</a>
-<div id="main_content">
-
-<div id="main">
-<center>
+    <head>
+        <title>Deluge:$title</title>
+        <link rel="icon" href="$base/static/images/deluge-icon.png" type="image/png" />
+	    <link rel="shortcut icon" href="$base/static/images/deluge-icon.png" type="image/png" />
+        <link rel="stylesheet" type="text/css" href="$base/static/simple_site_style.css" />
+    </head>
+    <body>
+        <div id="page">
+            <a href='$base/home'>
+                <div id="simple_logo">
+                    <div class="title">Deluge</div>
+                    <div class="info">$title</div>
+                </div>
+            </a>
+            <div id="main_content">
+                <div id="main">
+                    <center>
diff --git a/deluge/ui/webui/templates/white/header.html b/deluge/ui/webui/templates/white/header.html
index af89526e0..5f8fac0eb 100644
--- a/deluge/ui/webui/templates/white/header.html
+++ b/deluge/ui/webui/templates/white/header.html
@@ -4,8 +4,8 @@ $def with (title, active_tab="NONE")
 <html>
 <head>
     <title>Deluge:$title</title>
-    <link rel="icon" href="$base/static/images/deluge_icon.gif" type="image/gif" />
-    <link rel="shortcut icon" href="$base/static/images/deluge_icon.gif" type="image/gif" />
+    <link rel="icon" href="$base/static/images/deluge-icon.png" type="image/png" />
+    <link rel="shortcut icon" href="$base/static/images/deluge-icon.png" type="image/png" />
     <link rel="stylesheet" type="text/css" href="$base/template_style.css" />
     <script language="javascript" src="$base/static/deluge.js"></script>
 </head>
