Add support for non-square icons. Closes #49