diff --git a/CHANGELOG b/CHANGELOG
index 16aa82360..da99c7ef2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix wrong column sort order icons (#1485823)
 - Updated TinyMCE to 3.2.3 version
 - Fix attachment names encoding when charset isn't specified in attachment part (#1484969)
 - Fix message normal priority problem (#1485820)
diff --git a/program/js/app.js b/program/js/app.js
index 6293392cb..6080fba31 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -599,20 +599,15 @@ function rcube_webmail()
         // get the type of sorting
         var a_sort = props.split('_');
         var sort_col = a_sort[0];
-        var sort_order = a_sort[1] ? a_sort[1].toUpperCase() : null;
-
-        // no sort order specified: toggle
-        if (sort_order==null)
-          {
-          if (this.env.sort_col==sort_col)
-            sort_order = this.env.sort_order=='ASC' ? 'DESC' : 'ASC';
-          else
-            sort_order = this.env.sort_order;
-          }
-
-        if (this.env.sort_col==sort_col && this.env.sort_order==sort_order)
-          break;
+        var sort_order = a_sort[1] ? a_sort[1].toUpperCase() : 'ASC';
 
+        if (this.env.sort_col==sort_col) {
+          sort_order = this.env.sort_order=='ASC' ? 'DESC' : 'ASC';
+          
+	  if (this.env.sort_order==sort_order)
+            break;
+	}
+	
         // set table header class
         $('#rcm'+this.env.sort_col).removeClass('sorted'+(this.env.sort_order.toUpperCase()));
         $('#rcm'+sort_col).addClass('sorted'+sort_order);
diff --git a/skins/default/images/sort_asc.gif b/skins/default/images/sort_asc.gif
index 244db104c..2427311b4 100644
Binary files a/skins/default/images/sort_asc.gif and b/skins/default/images/sort_asc.gif differ
diff --git a/skins/default/images/sort_desc.gif b/skins/default/images/sort_desc.gif
index 2427311b4..244db104c 100644
Binary files a/skins/default/images/sort_desc.gif and b/skins/default/images/sort_desc.gif differ