Updating icon button to use span