Tweak icons and add more speculative GUI