Merge "Fix some attributes in themable icons" into qt-dev