Sorting - Make indicator less ambiguous

Current green badge indicator that selection is made is amiguous. Would be nice to have this more specific, similar to how fields will display selections directly in button.
The ascending/descending button also does not appear related at first try.

@El Note this may require design