Get favicon switching working, reduce redundancy