Merge "Unify the design of add icon in setting"