insert tooltip on all buttons with icon
fix conflict on merge