As the vector tools being implemented and functioning, the current arrange of Toolbox becomes confusing, I suggest we regroup some of the icons, by whether Select Shapes Tool can control their stuff or not. This will educate user to use Select Shapes Tool for vector objects.

First group (Raster): 
1) Freehand Brush Tool
2) Dynamic Brush Tool
3) Multibrush Tool

Second group (Vector):
1) Select Shapes Tool
2) Text Tool
3) Edit Shapes Tool
4) Calligraphy
5) Line Tool
6) Rectangle Tool
7) Ellipse Tool
8) Polygon Tool
9) Polyline Tool
10) Bezier Curve Tool
11) Freehand Path Tool