changed icons, removed multiple brushes, added undo/redo buttons
merge