Improve icons and popover buttons: Bug #735202