Use header bar close button for the prefs
Use new prompt style

https://bugzilla.gnome.org/show_bug.cgi?id=722119
Rework the prefs dialog a little