Use theme icons instead of the old clunky ones