Merge "Add start margin to preference icon."