Develop fixes

- fix barcode icon
- merged master, which included
  - reduce error messages overload
  - whitespace preservation

Not included: fix for XML escaping in label text.