diff --git a/html/html/themes/darkdos/include/functions.pl b/html/html/themes/darkdos/include/functions.pl
index 737e051e7..7d803b6ad 100644
--- a/html/html/themes/darkdos/include/functions.pl
+++ b/html/html/themes/darkdos/include/functions.pl
@@ -227,7 +227,7 @@ END
     if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
         print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />"; 
     } else {
-				print "<h1><span>-= IPFire =-</span></h1><br />";
+				print "<h1><span><a href='http://www.ipfire.org' style='text-decoration: none;'>-= IPFire =-</a></span></h1><br />";
 		}
 		print <<END
 			<h2>+ $h2 +</h2>
diff --git a/html/html/themes/ipfire-legacy/include/functions.pl b/html/html/themes/ipfire-legacy/include/functions.pl
index 14010306b..528825329 100644
--- a/html/html/themes/ipfire-legacy/include/functions.pl
+++ b/html/html/themes/ipfire-legacy/include/functions.pl
@@ -227,7 +227,7 @@ END
     if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
         print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />"; 
     } else {
-                                print "<h1><span>IPFire</span></h1><br />";
+                                print "<h1><span><a href='http://www.ipfire.org' style='text-decoration: none;'>IPFire</a></span></h1><br />";
                 }
                 print <<END
                         <h2>$h2</h2>
diff --git a/html/html/themes/ipfire/include/css/style.css b/html/html/themes/ipfire/include/css/style.css
index e0ac3cd11..1cc18f897 100644
--- a/html/html/themes/ipfire/include/css/style.css
+++ b/html/html/themes/ipfire/include/css/style.css
@@ -115,7 +115,6 @@ iframe {
 #logo {
 	height: 65px;
 	margin-top: 1em;
-	background: url('../../images/tux2.png') no-repeat;
 }
 
 #logo h1 {
diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl
index 63740d42d..eedf069dd 100644
--- a/html/html/themes/ipfire/include/functions.pl
+++ b/html/html/themes/ipfire/include/functions.pl
@@ -152,12 +152,14 @@ print <<END
 	<body>
 		<div id="header" class="fixed">
 			<div id="logo">
+				<a href="http://www.ipfire.org" style="text-decoration: none;">
+					<img src="/themes/ipfire/images/tux2.png" style="float:left; margin-left: -3px; margin-top: -3px;"/>
 END
 ;
 	if ($settings{'WINDOWWITHHOSTNAME'} ne 'off') {
-		print "<h1>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</h1>";
+		print "</a><h1>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</h1>";
 	} else {
-		print "<h1>IPFire</h1>";
+		print "<h1>IPFire</h1></a>";
 	}
 
 print <<END
diff --git a/html/html/themes/maniac/include/functions.pl b/html/html/themes/maniac/include/functions.pl
index e8514adfb..4866fcd0c 100644
--- a/html/html/themes/maniac/include/functions.pl
+++ b/html/html/themes/maniac/include/functions.pl
@@ -227,7 +227,7 @@ END
     if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
         print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />"; 
     } else {
-				print "<h1><span>-= IPFire =-</span></h1><br />";
+				print "<h1><span><a href='http://www.ipfire.org' style='text-decoration: none;'>-= IPFire =-</a></span></h1><br />";
 		}
 		print <<END
 			<h2>+ $h2 +</h2>
