Updates to icon button and to persistence code.