Tooltips on icons, internal cleanups