Fixes #1270, Fixes #1201: Update active weapon/spell icons every frame