diff --git a/CHANGELOG b/CHANGELOG
index 32df4efa9..1dd1b5195 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Better icons with distinct shapes for priority columns (#1488377)
 - Show dedicated icon for multipart/report messages (#1488524)
 - Properly hide text of icon links/buttons (#1488534)
 - Fix handling of unitless CSS size values in HTML message (#1488535)
diff --git a/skins/larry/images/listicons.png b/skins/larry/images/listicons.png
index 809358cfd..9554658b6 100644
Binary files a/skins/larry/images/listicons.png and b/skins/larry/images/listicons.png differ
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index fc924ffed..4d53d9290 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -491,25 +491,20 @@ a.iconbutton.threadmode.selected {
 	background-position: -24px -1116px;
 }
 
-#messagelist tr td.priority {
-	padding-right: 0;
-	text-align: right;
-}
-
 #messagelist tr td.priority span.prio5 {
-	background-position: right -1905px;
+	background-position: 0 -1905px;
 }
 
 #messagelist tr td.priority span.prio4 {
-	background-position: right -1885px;
+	background-position: 0 -1885px;
 }
 
 #messagelist tr td.priority span.prio2 {
-	background-position: right -1865px;
+	background-position: 0 -1865px;
 }
 
 #messagelist tr td.priority span.prio1 {
-	background-position: right -1845px;
+	background-position: 0 -1845px;
 }
 
 #messagelist tbody tr td.flag span.flagged {
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 3c061352b..49e39e361 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -1487,6 +1487,9 @@ a.dropdownselector .handle {
 	margin: -1px 0;
 	padding-top: 5px;
 	min-height: 20px;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
 
 select.decorated {
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index 675f61bc3..85aa155d6 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -184,7 +184,7 @@ function rcube_mail_ui()
         .css('position', 'absolute')
         .offset(select.position())
         .insertAfter(select)
-        .children().width(select.outerWidth() - 40);
+        .children().width(select.outerWidth() - 10);
 
       select.parent().css('position', 'relative');
     });