Application - Draw: Updated toolbar and merged some tools (key modifier)