Added icons & space containment.
Added icons + space containment