So would switching back to the halberd count as withdrawing/readying another weapon using both move actions? And if not, can I move my full distance, or only the 5 foot step?

Also, I can move my icon now, you fixed it.