Contextual updates.
Added icons; fixed contexts