Icons are smaller, don't overlap.

The data sources icon is hanging off on the bottom, but i'll get rid of it as soon as this PR is merged. Will take on #85 when this one is merged.

This PR deals with #75