13 files changed, 21 insertions, 20 deletions
diff --git a/skins/default/addresses.css b/skins/default/addresses.css
index 236bc3b5a..45dcf9bc4 100644
--- a/skins/default/addresses.css
+++ b/skins/default/addresses.css
@@ -4,7 +4,7 @@
 {
   position: absolute;
   top: 45px;
-  left: 200px;
+  left: 205px;
   height: 35px;
 }
 
@@ -95,7 +95,7 @@
   top: 85px;
   right: 20px;
   bottom: 40px;
-  left: 200px;
+  left: 205px;
 }
 
 #directorylist
@@ -104,7 +104,7 @@
   top: 85px;
   bottom: 40px;
   left: 20px;
-  width: 170px;
+  width: 175px;
   border: 1px solid #999999;
   background-color: #F9F9F9;
   overflow: hidden;
diff --git a/skins/default/common.css b/skins/default/common.css
index bf59895d7..43b3a92ab 100644
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -130,8 +130,8 @@ img
 #header
 {
   position: absolute;
-  top: 10px;
-  left: 20px;
+  top: 8px;
+  left: 19px;
   width: 170px;
   height: 40px;
   z-index: 100;
diff --git a/skins/default/iehacks.css b/skins/default/iehacks.css
index 7ba2b9632..f074d8b59 100644
--- a/skins/default/iehacks.css
+++ b/skins/default/iehacks.css
@@ -177,7 +177,7 @@ body.iframe
 
 #compose-container
 {
-  width: expression((parseInt(document.documentElement.clientWidth)-210)+'px');
+  width: expression((parseInt(document.documentElement.clientWidth)-230)+'px');
   height: expression((parseInt(document.documentElement.clientHeight)-120)+'px');
 }
 
diff --git a/skins/default/images/favicon.ico b/skins/default/images/favicon.ico
index 5a011f29e..b3bd18c12 100644
--- a/skins/default/images/favicon.ico
+++ b/skins/default/images/favicon.ico
diff --git a/skins/default/images/roundcube_logo.gif b/skins/default/images/roundcube_logo.gif
deleted file mode 100644
index b77fd3d0b..000000000
--- a/skins/default/images/roundcube_logo.gif
+++ /dev/null
diff --git a/skins/default/images/roundcube_logo.png b/skins/default/images/roundcube_logo.png
index 857d0fc72..1a4783e6e 100644
--- a/skins/default/images/roundcube_logo.png
+++ b/skins/default/images/roundcube_logo.png
diff --git a/skins/default/images/roundcube_logo_print.gif b/skins/default/images/roundcube_logo_print.gif
deleted file mode 100644
index 8fbf6a8eb..000000000
--- a/skins/default/images/roundcube_logo_print.gif
+++ /dev/null
diff --git a/skins/default/mail.css b/skins/default/mail.css
index ffd23ba5c..48e48efd8 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -5,7 +5,7 @@
 {
   position: absolute;
   top: 47px;
-  left: 200px;
+  left: 205px;
   right: 10px;
   height: 35px;
   min-width: 650px;
@@ -381,7 +381,7 @@ td.formlinks a:visited
   top: 0px;
   left: 0px;
   bottom: 0px;
-  width: 170px;
+  width: 195px;
 }
 
 #mailrightcontainer
@@ -1141,7 +1141,7 @@ div.message-htmlpart div.rcmBody
 {
   position: absolute;
   top: 90px;
-  left: 190px;
+  left: 205px;
   right: 25px;
   bottom: 30px;
   margin: 0px;
@@ -1221,7 +1221,7 @@ div.message-htmlpart div.rcmBody
   position: absolute;
   top: 100px;
   left: 20px;
-  width: 160px;
+  width: 170px;
 }
 
 #compose-attachments ul
diff --git a/skins/default/print.css b/skins/default/print.css
index e925756ac..5522a05c9 100644
--- a/skins/default/print.css
+++ b/skins/default/print.css
@@ -27,8 +27,8 @@ a, a:active, a:visited
 
 #header
 {
-  margin-left: 5mm;
-  margin-bottom: 3mm;
+  float: right;
+  margin: 0 5mm 3mm 5mm;
 }
 
 #messageframe
@@ -39,6 +39,7 @@ a, a:active, a:visited
 table.headers-table
 {
   table-layout: fixed;
+  margin-top: 14px;
 }
 
 table.headers-table tr td
diff --git a/skins/default/templates/addressbook.html b/skins/default/templates/addressbook.html
index 5b250fa9f..b0325b5af 100644
--- a/skins/default/templates/addressbook.html
+++ b/skins/default/templates/addressbook.html
@@ -7,8 +7,8 @@
 
 <style type="text/css">
 <roundcube:if condition="count(env:address_sources) &lt;= 1" />
-#abookcountbar { left: 20px;}
-#addressscreen { left:20px; 
+#abookcountbar { left: 20px; }
+#addressscreen { left: 20px; 
 <roundcube:exp expression="browser:ie ? 'width:expression((parseInt(document.documentElement.clientWidth)-40)+\\'px\\');' : ''" />
 }
 #addresslist { width: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter-5 : 245" />px; }
diff --git a/skins/default/templates/login.html b/skins/default/templates/login.html
index 8ffe9d274..a61e70c0b 100644
--- a/skins/default/templates/login.html
+++ b/skins/default/templates/login.html
@@ -7,7 +7,7 @@
 </head>
 <body>
 
-<img src="/images/roundcube_logo.png" border="0" alt="<roundcube:object name='productname' />" style="margin:2px 12px" />
+<img src="/images/roundcube_logo.png" border="0" alt="<roundcube:object name='productname' />" style="margin:0 11px" />
 
 <roundcube:object name="message" id="message" />
 
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index ebdf9f8d2..2d16f62bf 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -8,12 +8,12 @@
 <style type="text/css">
 <roundcube:if condition="config:preview_pane == true" />
 #mailcontframe { height: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter-5 : 195" />px; }
-#mailpreviewframe { top: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+5 : 225" />px;
+#mailpreviewframe { top: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+5 : 205" />px;
 <roundcube:exp expression="browser:ie ? ('height: expression((parseInt(this.parentNode.offsetHeight)-'.(!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+25 : 245).')+\\'px\\');') : ''" />
 }
 <roundcube:endif />
-#mailleftcontainer { width: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv-5 : 170" />px; }
-#mailrightcontainer { left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 180" />px;
+#mailleftcontainer { width: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv-5 : 175" />px; }
+#mailrightcontainer { left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 185" />px;
 <roundcube:exp expression="browser:ie ? ('width: expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 180).')+\\'px\\');') : ''" />
 }
 </style>
@@ -64,7 +64,7 @@
 <roundcube:if condition="config:preview_pane == true" />
 
 <script type="text/javascript">
-  var mailviewsplit = new rcube_splitter({id:'mailviewsplitter', p1: 'mailcontframe', p2: 'mailpreviewframe', orientation: 'h', relative: true, start: 200});
+  var mailviewsplit = new rcube_splitter({id:'mailviewsplitter', p1: 'mailcontframe', p2: 'mailpreviewframe', orientation: 'h', relative: true, start: 205});
   rcmail.add_onload('mailviewsplit.init()');
 </script>
 
diff --git a/skins/default/templates/printmessage.html b/skins/default/templates/printmessage.html
index 17ea7bf5a..f2775cd61 100644
--- a/skins/default/templates/printmessage.html
+++ b/skins/default/templates/printmessage.html
@@ -6,7 +6,7 @@
 </head>
 <body>
 
-<div id="header"><img src="/images/roundcube_logo_print.gif" alt="<roundcube:object name="productname" />" /></div>
+<div id="header"><img src="/images/roundcube_logo.png" alt="<roundcube:object name="productname" />" /></div>
 
 <div id="printmessageframe">
 <roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" />