Merge "Remove shadow on Add button" into main