Merge "Updated stat_ icons" into ics-factoryrom