last fixes for #340 and GUI-Toolbar