Merge Cleanup

Cleaned up some merge issues. Specifically with favicon links and an
added string to each.