Readding missing icon classes lost due to wrong merge

Please review.