Whitespace and icon path fixes