Changed icons, minor changes