Adding (base) icon support for the base widget. Also, fixing some bugs.