Fix icon and form dynamics