Undid some of my last commit but still fixed the Icon constructor

I didn't realize that clients were depending on the icon to take the size
of the image.  I've undid my last commit but added a fix that fixes the
icons constructor to set the icon size as expected.

refs #751