Added work with iconpacks
Some fixes in iconpack work and in other code
Some code fixes