Fix two bugs with desktop icon creation in pbi_icon