Integrated a few last minute icon updates from Grace