icons
(cherry picked from commit 37e4674)
1.6
(cherry picked from commit ee2eb32)