Fixed whitespace stripping for aliased images.
Merge branch 'origin/master'
Separate spacing for left and right of node icon.