I think the recent improvements made to the drawings toolbar could go further. Below my suggestions:
For now I have made some minor changes in the drawing menu, to keep the seperation of cave signatures (lines, symbols, patterns, ...) and generell drawing feature (straight, circles, rectangles, ...).