Switch to using CSS for icon display in panel too