Windsor is revealed!
Added icon assets
Merged with master