Fixing some quirks and adding another icon set, just to test.