Merge "Input Settings: Change the 'add' icon." into nyc-dev