Cleans up the buttons used in the form wizard to better conform to the framework type; add missing icon graphics