Sorting icons based on size, some refactoring
Merge branch 'master' of https://github.com/mpwoz/site-tracker