diff --git a/website/core/Footer.js b/website/core/Footer.js
index 23622cd5db8..14a67c4727a 100755
--- a/website/core/Footer.js
+++ b/website/core/Footer.js
@@ -55,7 +55,7 @@ class Footer extends React.Component {
               rel="noreferrer noopener">
               Stack Overflow
             </a>
-            <a href="https://gitter.im/OpenAPITools/openapi-generator">Project Chat</a>
+            <a href="https://gitter.im/OpenAPITools/openapi-generator">Chat Room</a>
             <a
               href="https://twitter.com/oas_generator"
               target="_blank"
@@ -79,33 +79,6 @@ class Footer extends React.Component {
             </a>
           </div>
         </section>
-
-        <section className="attribution">
-          <a
-            href="https://code.facebook.com/projects/"
-            target="_blank"
-            rel="noreferrer noopener"
-            className="fbOpenSource">
-            <img
-              src={`${this.props.config.baseUrl}img/oss_logo.png`}
-              alt="Facebook Open Source"
-              width="170"
-              height="45"
-            />
-          </a>
-          <a
-            href="https://fontawesome.com/license/free"
-            target="_blank"
-            rel="noreferrer noopener"
-            className="fbOpenSource">
-            <img
-                src={`${this.props.config.baseUrl}img/fa-logo.svg`}
-                alt="Fontawesome (Free)"
-                width="170"
-                height="45"
-            />
-          </a>
-        </section>
         <section className="copyright">{this.props.config.copyright}</section>
       </footer>
     );
diff --git a/website/pages/en/index.js b/website/pages/en/index.js
index fa4e53a3336..79dd3dea165 100755
--- a/website/pages/en/index.js
+++ b/website/pages/en/index.js
@@ -312,7 +312,7 @@ class Index extends React.Component {
       return (
         <div className="productShowcaseSection paddingBottom">
           <h2>Who is Using This?</h2>
-          <p>This project is used by all these people</p>
+          <p>Here are some users of OpenAPI Generator</p>
           <div className="logos">{showcase}</div>
           <div className="more-users">
             <a className="button" href={pageUrl('users.html')}>
diff --git a/website/pages/en/users.js b/website/pages/en/users.js
index 6376fb14652..69fc4b04354 100755
--- a/website/pages/en/users.js
+++ b/website/pages/en/users.js
@@ -22,9 +22,9 @@ class Users extends React.Component {
       return null;
     }
 
-    const editUrl = `${repoUrl}/edit/master/website/dynamic/team.yml`;
+    const editUrl = `${repoUrl}/edit/master/website/dynamic/users.yml`;
     const showcase = siteConfig.users.map(user => {
-          let imgUrl = `${baseUrl}${user.infoLink.startsWith("/") ? user.image : "/" + user.image}`;
+          let imgUrl = `${baseUrl}${user.image.startsWith("/") ? user.image : "/" + user.image}`;
           return (
               <a href={user.infoLink} key={user.infoLink}>
                 <img src={imgUrl} alt={user.caption} title={user.caption}/>
@@ -38,7 +38,7 @@ class Users extends React.Component {
         <EditThisPage title="Who is Using This?" url={editUrl} />
         <div className="showcaseSection">
           <div className="prose">
-            <p>This project is used by many folks</p>
+            <p>Here are some of the users. To add yours to the list below, please click on "Edit this page"</p>
           </div>
           <div className="logos">{showcase}</div>
         </div>
diff --git a/website/siteConfig.js b/website/siteConfig.js
index 00a265e62d3..b65a0241d1b 100755
--- a/website/siteConfig.js
+++ b/website/siteConfig.js
@@ -67,7 +67,7 @@ const siteConfig = {
   */
 
   // This copyright info is used in /core/Footer.js and blog RSS/Atom feeds.
-  copyright: `Copyright © ${new Date().getFullYear()} OpenAPI-Generator Contributors (https://openapi-generator.tech)`,
+  copyright: `Copyright © ${new Date().getFullYear()} OpenAPI-Generator Contributors (https://openapi-generator.tech). (Both "OpenAPI Tools" (https://OpenAPITools.org) and "OpenAPI Generator" are not affiliated with OpenAPI Initiative (OAI))`,
 
   highlight: {
     // Highlight.js theme to use for syntax highlighting in code blocks.
diff --git a/website/static/img/favicon.png b/website/static/img/favicon.png
index 122f0a56c5b..befd9f72b7c 100755
Binary files a/website/static/img/favicon.png and b/website/static/img/favicon.png differ