Make register_icons sequential to reduce number of queries

review7281002