diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index 12d9065323..6879e1fcb6 100755
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -1,9 +1,12 @@
 <footer>
             <div class="row">
                 <div class="col-lg-12 footer">
-               &copy;{{ site.time | date: "%Y"  }} {{site.company_name}}. All rights reserved. <br />
-{% if page.last_updated %}<span>Page last updated:</span> {{page.last_updated}}<br/>{% endif %} Site last generated: {{ site.time | date: "%b %-d, %Y"  }} <br />
-<p><img src="{{ "images/pmd-logo-small.png" }}" alt="Company logo"/></p>
+                    <p class="float-right"><img src="{{ "images/logo/pmd-logo-70px.png" }}" alt="PMD logo"/></p>
+                    <p>
+                        &copy;{{ site.time | date: "%Y"  }} {{site.company_name}}. All rights reserved. <br />
+                        {% if page.last_updated %}<span>Page last updated:</span> {{page.last_updated}}<br/>{% endif %}
+                        Site last generated: {{ site.time | date: "%b %-d, %Y"  }}
+                    </p>
                 </div>
             </div>
 </footer>
diff --git a/docs/css/pmd-customstyles.css b/docs/css/pmd-customstyles.css
index 7683ae54d8..973df559b6 100644
--- a/docs/css/pmd-customstyles.css
+++ b/docs/css/pmd-customstyles.css
@@ -84,3 +84,15 @@ details[open] summary {
 .xpath-fun-doc .code-examples dt {
     font-weight: normal;
 }
+
+.float-right {
+    float: right;
+}
+
+.float-left {
+    float: left;
+}
+
+.footer p img {
+    margin-left: 1em;
+}
diff --git a/docs/images/favicon.ico b/docs/images/favicon.ico
deleted file mode 100644
index 6580a70d75..0000000000
Binary files a/docs/images/favicon.ico and /dev/null differ
diff --git a/docs/images/logo/pmd-logo-70px.png b/docs/images/logo/pmd-logo-70px.png
new file mode 100644
index 0000000000..60da90c0e8
Binary files /dev/null and b/docs/images/logo/pmd-logo-70px.png differ
diff --git a/docs/images/logo/pmd_logo.jpg b/docs/images/logo/pmd_logo.jpg
deleted file mode 100644
index b94df4507f..0000000000
Binary files a/docs/images/logo/pmd_logo.jpg and /dev/null differ
diff --git a/docs/images/logo/pmd_logo.png b/docs/images/logo/pmd_logo.png
deleted file mode 100644
index bdff9acc56..0000000000
Binary files a/docs/images/logo/pmd_logo.png and /dev/null differ
diff --git a/docs/images/logo/pmd_logo.svgz b/docs/images/logo/pmd_logo.svgz
deleted file mode 100644
index 3250b51a59..0000000000
Binary files a/docs/images/logo/pmd_logo.svgz and /dev/null differ
diff --git a/docs/images/logo/pmd_logo_small.jpg b/docs/images/logo/pmd_logo_small.jpg
deleted file mode 100644
index a3a65423ea..0000000000
Binary files a/docs/images/logo/pmd_logo_small.jpg and /dev/null differ
diff --git a/docs/images/logo/pmd_logo_small.png b/docs/images/logo/pmd_logo_small.png
deleted file mode 100644
index fd0bfb0ad9..0000000000
Binary files a/docs/images/logo/pmd_logo_small.png and /dev/null differ
diff --git a/docs/images/logo/pmd_logo_tiny.png b/docs/images/logo/pmd_logo_tiny.png
deleted file mode 100644
index d7267fc392..0000000000
Binary files a/docs/images/logo/pmd_logo_tiny.png and /dev/null differ
diff --git a/docs/images/pmd-logo-big.png b/docs/images/pmd-logo-big.png
deleted file mode 100644
index bdff9acc56..0000000000
Binary files a/docs/images/pmd-logo-big.png and /dev/null differ
diff --git a/docs/images/pmd-logo-small.png b/docs/images/pmd-logo-small.png
deleted file mode 100644
index 3428347426..0000000000
Binary files a/docs/images/pmd-logo-small.png and /dev/null differ
diff --git a/docs/images/pmd-logo.png b/docs/images/pmd-logo.png
deleted file mode 100644
index 2428b3317e..0000000000
Binary files a/docs/images/pmd-logo.png and /dev/null differ
diff --git a/docs/index.md b/docs/index.md
index aa76696556..78d6975ff7 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -12,6 +12,7 @@ author: Jeff Jensen <jjensen@apache.org>, Andreas Dangel <andreas.dangel@adangel
         Clément Fournier <clement.fournier76@gmail.com>
 ---
 
+<!-- {% include image.html file="logo/pmd-logo-300px.png" alt="PMD Logo" %} -->
 
 
 {% unless site.output == "pdf" %}
@@ -144,8 +145,6 @@ you may also use the search bar in the top right, or the sidebar on the left.
 </div>
 </div>
 
-<!-- {% include image.html file="pmd-logo-big.png" alt="PMD Logo" %} -->
-
 {% unless site.output == "pdf" %}
 
 {% include initialize_shuffle.html %}
diff --git a/docs/pages/next_major_development.md b/docs/pages/next_major_development.md
index 54fbea29b0..37cbd97218 100644
--- a/docs/pages/next_major_development.md
+++ b/docs/pages/next_major_development.md
@@ -18,6 +18,8 @@ the logo in anywhere without offense.
 
 The current tasks are listed here: [Integrate new PMD logo #1931](https://github.com/pmd/pmd/issues/1931)
 
+The new logo is available from the [Logo Project Page](pmd_projectdocs_logo.html).
+
 ### API
 
 The API of PMD has been growing over the years and needs to be cleaned up. The goal is, to