Simplify sorting icons with angular for metrics only

Not for session columns (yet)