diff --git a/piratebox/piratebox/www_content/css/page_style.css b/piratebox/piratebox/www_content/css/page_style.css
index ccdec0c..3a8f15b 100644
--- a/piratebox/piratebox/www_content/css/page_style.css
+++ b/piratebox/piratebox/www_content/css/page_style.css
@@ -136,13 +136,19 @@ header img, footer img {
 }
 
 #logo {
+  background-image: url('/content/img/piratebox-logo-horizontal-white.png');
+  width: 215px;
+  height: 36px;
   float: left;
   overflow: hidden;
 }
 
 #menu-icon {
+  background-image: url('/content/img/menu.png');
   float: right;
   width: 36px;
+  height: 36px;
+  overflow: hdden;
   -webkit-transition: all 0.5s ease-in-out;
   -moz-transition: all 0.5s ease-in-out;
   -o-transition: all 0.5s ease-in-out;
diff --git a/piratebox/piratebox/www_content/index.html b/piratebox/piratebox/www_content/index.html
index f5800fe..5166ee3 100644
--- a/piratebox/piratebox/www_content/index.html
+++ b/piratebox/piratebox/www_content/index.html
@@ -17,14 +17,10 @@
 
 <header id="header">
 	<div class="container">
-		<div id="logo">
-			<h1>
-				<a href="/">
-					<img src="/content/img/piratebox-logo-horizontal-white.png" data-l10n-id="logoIMG" alt="PirateBox" title="PirateBox - Share Freely">
-				</a>
-			</h1>
-		</div>
-		<div id="menu-icon"><img src="/content/img/menu.png" alt="Menu"></div>
+	   <a href="/">
+		<div id="logo" scrolling="no"  >&nbsp;</div>
+	   </a>
+		<div id="menu-icon"></div>
 		<nav id="top-nav">
 			<ul>
 				<li><a href="/" class="current" data-l10n-id="navbarHome">Home</a></li>
@@ -48,7 +44,7 @@
 		<div id="sidebar">
 			<div id="upload" class="card">
 				<h2 data-l10n-id="sidebarUpload">Upload</h2>
-				<iframe width="100%" height="80" src='http://piratebox.lan:8080' data-l10n-id="sidebarIframeNotSupported">
+				<iframe width="100%" height="80" src='http://piratebox.lan:8080' data-l10n-id="sidebarIframeNotSupported" scrolling="no">
 					Your browser does not support iframes.. If you want to upload something, follow this <a href='http://piratebox.lan:8080' data-l10n-id="link">Link</a>.
 				</iframe>
 				<h3><a href="/Shared" data-l10n-id="sidebarBrowseFiles">Browse Files -></a></h3>