Remove headers

Replace header images with 1x1 transparent pngs
Resolve conflicts