Move delete button inside tooltip - WIP