new favicon and menu links
merge