Fix Bug 896471 - Incorporate new header ui icon sets