Merge "Not rendering the dark icons with the shelf anymore" into qt-r1-dev