diff --git a/skins/default/includes/header.html b/skins/default/includes/header.html
index a7e034a0b..2e47ff911 100644
--- a/skins/default/includes/header.html
+++ b/skins/default/includes/header.html
@@ -1,3 +1,3 @@
-<div id="header"><roundcube:button command="mail" image="/images/roundcube_logo.png" alt="RoundCube Webmail" width="165" height="55" /></div>
+<div id="header"><roundcube:button command="mail" image="/images/roundcube_logo.png" alt="RoundCube Webmail" /></div>
 
 <roundcube:object name="message" id="message" />
diff --git a/skins/default/templates/login.html b/skins/default/templates/login.html
index 1950be2e8..2a48f48bf 100644
--- a/skins/default/templates/login.html
+++ b/skins/default/templates/login.html
@@ -28,7 +28,7 @@
 </head>
 <body>
 
-<img src="/images/roundcube_logo.png" width="165" height="55" border="0" alt="<roundcube:object name='productname' />" hspace="12" vspace="2"/>
+<img src="/images/roundcube_logo.png" border="0" alt="<roundcube:object name='productname' />" style="margin:2px 12px" />
 
 <roundcube:object name="message" id="message" />
 
