1.01
Import update_icons fixes from bay.
Removed one line ifs and elses. (#11389)
Replaced loc setting with forceMove. (#11490)