Re-org of drawables - updated with official icons
changes to make checkin work with GameStateService