Merge pull request #19 from iPkay/master

[Infobar] Fix setting service-icons and few cosmetic adjustments