Add icons and option menu