added icons
resolved merge conflict