Added icons.
Added icons, refined others