Merge "Fix themed settings icons." into qt-dev