Refactored Coffee implementations. Added test-html page
added new icon design