Fix even more icon issues.
(cherry picked from commit a768639)