diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb
index b2c374e94..e08dd3003 100644
--- a/app/helpers/queries_helper.rb
+++ b/app/helpers/queries_helper.rb
@@ -171,10 +171,10 @@ module QueriesHelper
       css, order = nil, column.default_order
       if column.name.to_s == query.sort_criteria.first_key
         if query.sort_criteria.first_asc?
-          css = 'sort asc'
+          css = 'sort asc icon icon-sorted-desc'
           order = 'desc'
         else
-          css = 'sort desc'
+          css = 'sort desc icon icon-sorted-asc'
           order = 'asc'
         end
       end
diff --git a/app/helpers/sort_helper.rb b/app/helpers/sort_helper.rb
index e2afb1c22..ab0065993 100644
--- a/app/helpers/sort_helper.rb
+++ b/app/helpers/sort_helper.rb
@@ -160,4 +160,3 @@ module SortHelper
     end
   end
 end
-
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 1ebab7f0a..9c7ebfb7a 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -365,8 +365,6 @@ table.list:not(.odd-even) tbody tr:nth-child(even):hover, .even:hover, #issue-ch
 tr.builtin td.name {font-style:italic;}
 
 a.sort { padding-right: 16px; background-position: 100% 50%; background-repeat: no-repeat; }
-a.sort.asc  { background-image: url(../images/arrow_up.png); }
-a.sort.desc { background-image: url(../images/arrow_down.png); }
 
 table.boards a.board { background: url(../images/comment.png) no-repeat 0% 50%; padding-left: 20px; }
 table.boards td.last-message {text-align:left;font-size:80%;}
@@ -1502,6 +1500,8 @@ td.gantt_selected_column .gantt_hdr,.gantt_selected_column_container {
 .icon-collapsed { background-image: url(../images/arrow_right.png); }
 .icon-bookmark { background-image: url(../images/tag_blue_delete.png); }
 .icon-bookmark-off { background-image: url(../images/tag_blue_add.png); }
+.icon-sorted-asc { background-image: url(../images/arrow_down.png); }
+.icon-sorted-desc { background-image: url(../images/arrow_up.png); }
 
 .icon-file { background-image: url(../images/files/default.png); }
 .icon-file.text-plain { background-image: url(../images/files/text.png); }