Merge "Fix issue with icon being loaded by the wrong context"