4 files changed, 29 insertions, 14 deletions
diff --git a/skins/default/ie6hacks.css b/skins/default/ie6hacks.css
index 53c287166..1b7b2a889 100644
--- a/skins/default/ie6hacks.css
+++ b/skins/default/ie6hacks.css
@@ -16,7 +16,8 @@ img
 
 ul.toolbarmenu li
 {
-  width: 130px;
+  width: auto;
+  border: 1px solid #f6f6f6;
 }
 
 #messagemenu li a
diff --git a/skins/default/iehacks.css b/skins/default/iehacks.css
index 40f60018f..b93d3dc19 100644
--- a/skins/default/iehacks.css
+++ b/skins/default/iehacks.css
@@ -182,3 +182,13 @@ body.iframe
 {
   filter: progid:DXImageTransform.Microsoft.Alpha(opacity=70);
 }
+
+ul.toolbarmenu li
+{
+  min-width: auto;
+}
+
+ul.toolbarmenu li a
+{
+  min-height: auto;
+}
+\ No newline at end of file
diff --git a/skins/default/includes/messagemenu.html b/skins/default/includes/messagemenu.html
index 5b0fadfdc..4112bfab4 100644
--- a/skins/default/includes/messagemenu.html
+++ b/skins/default/includes/messagemenu.html
@@ -2,8 +2,7 @@
   <ul class="toolbarmenu">
     <li><roundcube:button class="printlink" command="print" label="printmessage" classAct="printlink active" /></li>
     <li><roundcube:button class="downloadlink" command="download" label="emlsave" classAct="downloadlink active" /></li>
-    <li><roundcube:button class="sourcelink" command="viewsource" label="viewsource" classAct="sourcelink active" /></li>
-    <li class="separator">&nbsp;</li>
+    <li class="separator_below"><roundcube:button class="sourcelink" command="viewsource" label="viewsource" classAct="sourcelink active" /></li>
     <li><roundcube:button class="openlink" command="open" label="openinextwin" target="_blank" classAct="openlink active" /></li>
     <roundcube:container name="messagemenu" id="messagemenu" />
   </ul>
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 9d50b4b72..84d43954b 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -112,13 +112,18 @@ ul.toolbarmenu li img
   margin: 0 2px;
 }
 
-ul.toolbarmenu li.separator
+ul.toolbarmenu li.separator_below
 {
-  height: 1px;
-  font-size: 1pt;
   border-bottom: 1px solid #ccc;
-  margin: 1px 1px 2px 1px;
-  padding: 0;
+  margin-bottom: 2px;
+  padding-bottom: 2px;
+}
+
+ul.toolbarmenu li.separator_above
+{
+  border-top: 1px solid #ccc;
+  margin-top: 2px;
+  padding-top: 2px;
 }
 
 #messagemenu li a.active:hover,
@@ -377,7 +382,7 @@ td.formlinks a:visited
   display: block;
   position: relative;
   font-size: 11px;
-  background: url('images/icons/folders.png') 5px 2px no-repeat;
+  background: url('images/icons/folders.png') 5px 1px no-repeat;
   border-bottom: 1px solid #EBEBEB;
 }
 
@@ -409,27 +414,27 @@ td.formlinks a:visited
 
 #mailboxlist li.inbox
 {
-  background-position: 5px -18px;
+  background-position: 5px -19px;
 }
 
 #mailboxlist li.drafts
 {
-  background-position: 5px -38px;
+  background-position: 5px -40px;
 }
 
 #mailboxlist li.sent
 {
-  background-position: 5px -58px;
+  background-position: 5px -60px;
 }
 
 #mailboxlist li.junk
 {
-  background-position: 5px -79px;
+  background-position: 5px -80px;
 }
 
 #mailboxlist li.trash
 {
-  background-position: 5px -99px;
+  background-position: 5px -100px;
 }
 
 #mailboxlist li a