[bug 889114] [bug 885920] [bug 890111] Fix icons