Make sort icon black

- WS cleanup
Merge branch 'develop'