More unwatched icon fixes