Readds icon_states removed by RKF in #4775

How was this not seen faster, I don't know.