Fix icons being picked up & add per command permissions.