Merge "Increase contrast on edit button" into nyc-dev