Update to 2.2 by removing iconMask calls.