Merge "Fix face icon size"