diff --git a/CHANGELOG b/CHANGELOG
index dbc7447ae..85963d84f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix attachment icon issue when rare font/language is used (#1489326)
 - After message is sent refresh messages list of replied message folder (#1489249)
 - Add option force specified domain in user login - username_domain_forced (#1489264)
 - Fix expanded thread root message styling after refreshing messages list (#1489327)
diff --git a/skins/classic/mail.css b/skins/classic/mail.css
index b8cc9f351..f712069be 100644
--- a/skins/classic/mail.css
+++ b/skins/classic/mail.css
@@ -1592,6 +1592,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 d542768b7..4b238c163 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -2292,12 +2292,13 @@ ul.toolbarmenu li span.conversation {
 	display: block;
 	color: #333;
 	font-weight: bold;
-	padding: 8px 15px 3px 30px;
+	padding: 3px 15px 3px 30px;
 	text-shadow: 0px 1px 1px #fff;
 	text-decoration: none;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
+	line-height: 20px;
 }
 
 .attachmentslist li a.drop {
@@ -2326,9 +2327,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;