Fix for disappearing icons bug.

Change-Id: I5c23a70e4202f07082b63eabe7afe67edd0d78b3