Merge "Preserve spacing for icons in menus"