Fixes #552 Generic ascending/descending icon was overriding some other sort icons. Fixes #552