36 pixels icons
Merge branch 'master' into styling