Icon and deprecation fixes.
Fix couple specs