Fix displayed org profile types and add the building icon back in.
Actually add the icon.
Merge remote-tracking branch 'origin/WEBCLIENT_FixOrgProfileTypes' into R6_Kickass