Work on sorting icon state
Work on sort state