This fixes some of the confusion around toolbars inside .osd. The look is not perfect, but less broken than before.