Brian's changes for popup icons