Added icons. Update layout for icons.