Slight re-arrangement of icons and cleaned up tooltips.