Merge pull request #1 from kasperisager/master

Update head
Add a small margin to the icons on the FilterMenu to prevent ugliness
Merge pull request #28 from Tama63/master

Fix category icon merging with text