cleanups to icons and buttons