Fix display of icons.

Change-Id: I2b49a17ed7a38b3133721e9153b9c243f3710284