Updating icons and cleaning up modal styles