HHCOC-62: Replaced finalised icons; Modified headers/spacing