Fixed some naming schema problems with the new icons