Add standard Leaflet.draw toolbar and enable a popup toolbar when vector layers are clicked.
Use L.Marker with an L.DivIcon instead of L.Popup for L.Toolbar.Popup (aesthetic reasons). Add L.Toolbar#getHTMLString to accomodate L.DivIcon, which takes an html string, not a DOM element.