more cleanup of icons