fix: Resolve merge conflicts with upstream/main

- .gitignore: keep both logo.png and icon.png exceptions
- header.js: keep redesigned two-row desktop layout

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: raifdmueller