dep11: Fix lots of issues in icon processing