Make sort icon black

- WS cleanup