bugfix configuration
Merge remote-tracking branch 'github/master'
configurable icons and button labels