More elusive icon fixes