Rearrange infoWindow contents to shrink icon size

Addresses issue #1057
Merge PR #1058