Merge "Fix icon resources"