SCAL-160: better, i.e. larger and more clear toolbar.
Merge remote-tracking branch 'origin/master'