rMOZILLARELEASE009db6c9c0ab

Bug 1624508 - Use the pretty icon instead of framework items when both match r=jlast

Differential Revision: https://phabricator.services.mozilla.com/D67971