am efe10b83: am 6247641d: am 1d8e7bbe: Fix the bug where the icons stop showing up.

Merge commit 'efe10b831e7e411b804d2bcc4df535110197fc63'

* commit 'efe10b831e7e411b804d2bcc4df535110197fc63':
  Fix the bug where the icons stop showing up.