Revert "merge and favicon"

This reverts commit ec008e0e456de260b723fcdd9cd8c06b3b8da6b1.