Fix more issues in the icon-processing code
Add config options for some more stuff