diff --git a/skins/classic/common.css b/skins/classic/common.css
index c163240e4..746947e3e 100644
--- a/skins/classic/common.css
+++ b/skins/classic/common.css
@@ -325,7 +325,7 @@ body.extwin #closelink
 .boxtitle
 {
   height: 12px !important;
-  padding: 2px 10px 5px 5px;
+  padding: 3px 10px 4px 5px;
   border-bottom: 1px solid #999;
   color: #333;
   font-size: 11px;
@@ -571,9 +571,10 @@ body.iframe .boxtitle
 {
   display: block;
   color: #a0a0a0;
-  padding: 2px 16px 2px 10px;
+  padding: 3px 16px 3px 10px;
   text-decoration: none;
   min-height: 14px;
+  line-height: 14px;
   background: transparent;
 }
 
@@ -1233,9 +1234,10 @@ ul.toolbarmenu li a
 {
   display: block;
   color: #a0a0a0;
-  padding: 1px 12px 3px 28px;
+  padding: 3px 12px 3px 28px;
   text-decoration: none;
   min-height: 14px;
+  line-height: 14px;
 }
 
 ul.toolbarmenu li a.active,
diff --git a/skins/classic/mail.css b/skins/classic/mail.css
index 75a58a37f..d4e19a3ca 100644
--- a/skins/classic/mail.css
+++ b/skins/classic/mail.css
@@ -220,7 +220,7 @@
 
 #messagemenu li a.sourcelink
 {
-  background-position: 7px -35px;
+  background-position: 7px -34px;
 }
 
 #messagemenu li a.openlink,
@@ -236,12 +236,12 @@
 
 #messagemenu li a.movelink
 {
-  background-position: 6px -161px;
+  background-position: 6px -160px;
 }
 
 #messagemenu li a.copylink
 {
-  background-position: 6px -143px;
+  background-position: 6px -142px;
 }
 
 #markmessagemenu li a,
@@ -541,6 +541,7 @@
   right: 4px;
   white-space: nowrap;
   font-size: 11px;
+  line-height: 14px;
 }
 
 #countcontrols a.button,