Minor tweaks for icons and compatibility.