Clean up some leftover "x" and "o" references

[MicahWW]

Everything should use the Player icon variables so changes can be made in one spot and the rest of the code doesn't have to be changed.