Add a bit more icon info.
(cherry picked from commit 7ca2a4a)