restore crosshair & redo search, add icons, etc