Fix up misaligned icons, fixes #673