diff --git a/templates/header.cs b/templates/header.cs
index f0814bc..a48f427 100644
--- a/templates/header.cs
+++ b/templates/header.cs
@@ -69,23 +69,26 @@ if:subcount(Data.StylesheetFiles) > 0
 <table id="pane">
 
 	<tr><td colspan="3"><div id="head">
-		<table>
+		<table> 
 		<tr><td>
-			<h1><?cs var:html_escape(Lang.Title.Top) ?></h1>
+			<a href=<a href="<?cs call:link("", "", "", "", "")
+					?>" title="CryptoBox"><img src="cryptobox-misc/cbx_logo_left.png" 
+					alt="icon: logo" /></a>
 			<h2><?cs var:html_escape(Lang.Title.Slogan) ?></h2>
-			</td>
+		</td>
 		<td>
 			<?cs if:Data.activeDisksCount > 0 ?><?cs
-				set:logoFile = "cbx-text-logo2.png" ?><?cs
+				set:logoFile = "cbx_logo_right_fire.png" ?><?cs
 			  else ?><?cs
-				set:logoFile = "cbx-text-logo1.png" ?><?cs
+				set:logoFile = "cbx_logo_right.png" ?><?cs
 			/if ?>
-			<div class="logo"><a href="<?cs call:link("", "", "", "", "")
+			<div class="logo_right"><a href="<?cs call:link("", "", "", "", "")
 					?>" title="CryptoBox"><img src="cryptobox-misc/<?cs var:logoFile
 					?>" alt="icon: logo" />
 			</a></div>
 			<?cs call:help_link() ?>
-		</td></tr></table>
+		</td></tr>
+		</table>
 	</div></td></tr>
 
 	<?cs if:subcount(Data.EnvironmentWarning) > 0
diff --git a/www-data/cbx_logo_left.png b/www-data/cbx_logo_left.png
new file mode 100644
index 0000000..4023559
Binary files /dev/null and b/www-data/cbx_logo_left.png differ
diff --git a/www-data/cbx_logo_right.png b/www-data/cbx_logo_right.png
new file mode 100644
index 0000000..e141d13
Binary files /dev/null and b/www-data/cbx_logo_right.png differ
diff --git a/www-data/cbx_logo_right_fire.png b/www-data/cbx_logo_right_fire.png
new file mode 100644
index 0000000..d94888c
Binary files /dev/null and b/www-data/cbx_logo_right_fire.png differ
diff --git a/www-data/cryptobox.css b/www-data/cryptobox.css
index c09054d..1cf9bad 100644
--- a/www-data/cryptobox.css
+++ b/www-data/cryptobox.css
@@ -68,7 +68,8 @@ legend img {
 	}
 
 #main h2 {
-	font-size: 1.5em;
+	font-size: 1.2em;
+	margin: 0;
 	}
 
 #main h3, legend {
@@ -79,9 +80,13 @@ div#head table {
 	width: 100%;
 	}
 
-div#head div.logo {
+div#head td {
+	vertical-align: top;
+	}
+
+div#head div.logo_right {
 	text-align: right;
-	margin: 0 0 20px 0;
+	margin: 0 0 5px 0;
 	}
 
 #words {