Merge "Do not theme icons when the original view is not themed."