Merge "Fix homepage icon margin"