Fix information passing about icon, and fiddle with debug info a bit
Authored by: dannybackx 2019-04-16
Parent: [r207]
Child: [r209]