The patch is attached.

Also, maybe there is a better way to find the file name of the icon to
use (without hardcoding the name).