Fixed errors with Hathor and Quick Icons

Update for #2592