Merge "Replace lock icon" into qt-dev