[bugfix] toolbar
[bugfix] fontsize
Merge remote-tracking branch 'origin/master'

Conflicts:
	themes/default/_css/combox.css