Separate toolbar items

This fixes issue #1887