Hud Icons replaced and WaterpistolHud behaviour changed