Improved rendering of titles with both a stock icon and a class set