fix wrong url() paths to toolbar.png in css
Merge remote-tracking branch 'upstream/master'