Fix NPE introduced with change to Icon.

Previously, the layer was set during construction, but now is null until the first layout.