Separate shading from line drawing (fixes drawing order) Cleanup of draw code Fix icon-shading CSS override