Fix some icon issues.
(cherry picked from commit 496463e)