Merge "Fix padding for non-icon Preference" into main