Move favicon into icons dir.  Swap out favicon with one matching the apple-touch-icon for consistency.  Update test to reflect new path.