Fix some more icon issues.
(cherry picked from commit 8143091)