Update Preferences dialog layout and icons

Also, re-attach manifest file.  Oops!