Merge "Revert to basic icons in notification info." into qt-dev