ICON Tracker Improvements