moved foundation icons
solved merge conflict