Flesh out icons a little more