Fix attachment icon issue when rare font/language is used (#1489326)

Conflicts:

	CHANGELOG
	skins/larry/styles.css

2 files changed, 5 insertions, 3 deletions

diff --git a/skins/classic/mail.css b/skins/classic/mail.css
index 54673fe64..c2d3d3546 100644
--- a/skins/classic/mail.css
+++ b/skins/classic/mail.css
@@ -1568,6 +1568,7 @@ input.from_address
 #compose-attachments ul li
 {
   height: 18px;
+  line-height: 16px;
   font-size: 11px;
   padding-left: 2px;
   padding-top: 2px;
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 8bbd1d119..3ffded680 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -2199,12 +2199,13 @@ ul.toolbarmenu li span.conversation {
 	display: block;
 	color: #333;
 	font-weight: bold;
-	padding: 8px 4px 3px 30px;
+	padding: 3px 4px 3px 30px;
 	text-shadow: 0px 1px 1px #fff;
 	text-decoration: none;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
+	line-height: 20px;
 }
 
 #compose-attachments ul li {
@@ -2222,9 +2223,9 @@ ul.toolbarmenu li span.conversation {
 .attachmentslist li a.delete,
 .attachmentslist li a.cancelupload {
 	position: absolute;
-	top: 6px;
+	top: 4px;
 	right: 0;
-	width: 24px;
+	width: 20px;
 	height: 18px;
 	padding: 0;
 	text-decoration: none;