Add icon and dock icon controls.  General clean up.