Swap HUD icons properly. Fixes #145