Code cleanup, better logging
More performant icon loading, more performant database query