Adding support for wrapped icons, which will replace most of the iconbar
logic.