Remove use of deprecated APIs

I was trying to minimize theme breakage since the selectors needed to target these icons would change if the class was moved.