Merge "Add buttons for new settings design" into main