Allow square icons and constrain porportions with size specifier like "e100x100"
Merge branch 'master' of gelbman:blop