Merge "Reset support for themed icons (2/3)." into tm-qpr-dev