Merge "Bug 493944 - fix icon references"