Always relayout when changing icon/text

Previously we would only relayout when creating/deleting the icon/text,
but not when changing it.

E.g. the layout would not change size when text changed.