Add icons and buttons