Padding fix for header
Merge branch 'rr-imagefixes'