Adjust appearance of saving window
Merge remote-tracking branch 'upstream/pr/11760' into pr/11760

* upstream/pr/11760:
  Adjust appearance of saving window