That is total overkill. Instead, check in the icon factory if the icons we have match the current "draw_frames" state during draw Fixes #1337 (cherry picked from commit cf835363)