Icon drawable
Some improvements and fixes.