Merge "Use theme attributes for dual tone icons" into qt-dev