Improving OB icon logic.