Fix icon assignment problems.

Change-Id: I76c0de2962ab2b8fd224e68377eca9069eaa9ed6