Update favicon and consolidate portal templates