Merge pull request #26 from micheleolivo/feature-icons