added caution icon
added a few icons
solved merge conflicts