CB-2606: icon support. with major contributions by sgrebnov, vladimir-kotikov, bryanhiggins