Modified the methods that return which icon to use.