clean up, icons corrected