Simplify icon selector function