updated icon files
upated styling
updated html
resolved conflicts