Swap some fonts around
Better icons