Added icons
Updated to remove deprecated methods