Corrected some subvi icons and naming