Now swapping HUD icons properly. Fixes #145