Fixes #1070 and header icon handling