added icons
fixed merge conflicts