Slightly-better icon mask; added new headers