Merge "Optimizing some icon generation code:" into tm-qpr-dev