Add generic icon button with tooltip component and use where appropriate

[joelvdavies]

Also remove from inside the tooltip (was orginally needed due to a warning inside tests - see #1589 (comment)).