Added new icons and button handlers.