* Fixed some icon labels. Still much to do.