Replacing icons and adding our own imageset, in addition to a few other tweaks