Frame Icons

Icons are not displayed in OSX as far as I can tell.  Testing is needed
on other environments also.

* Had a first merge conflict in the import section that I hopefully was
able to resolve.
conflict resolution attempt