Would it be possible to move the drawing mode tools from “More/Tool Options” (freehand, line, rectangle, ellipse, polygon) to the bottom bar in Painting Mode and place an icon for each of them next to the Size and Opacity sliders? This would make them much easier to access: only 1 click instead of 4 clicks to access and switch between tools.