code cleanup- renamed header-icon to button-icon