upgrade to 4 (and icons)