diff --git a/app/components/footer.hbs b/app/components/footer.hbs
index b327213e4b9..19cce810108 100644
--- a/app/components/footer.hbs
+++ b/app/components/footer.hbs
@@ -1,17 +1,52 @@
 <footer local-class="footer">
-  <div local-class='after-main-links'>
-    <a href='https://doc.rust-lang.org/cargo/getting-started/installation.html'>Install</a>
-    <span local-class="sep">|</span>
-    <a href='https://doc.rust-lang.org/cargo/'>Getting Started</a>
-    <span local-class="sep">|</span>
-    <a href='https://doc.rust-lang.org/cargo/guide/'>Guide</a>
-    <span local-class="sep">|</span>
-    <a href='mailto:help@crates.io'>Send us an email</a>
-    <span local-class="sep">|</span>
-    <a href='https://www.rust-lang.org/policies/security'>Report a security issue</a>
-    <span local-class="sep">|</span>
-    <a href='https://www.rust-lang.org/policies/privacy'>Privacy notice</a>
-    <span local-class="sep">|</span>
-    <LinkTo @route="policies">Policies</LinkTo>
+  <div local-class="inner">
+    <div local-class="docs">
+      <h2>Documentation</h2>
+      <ul>
+        <li><a href="https://doc.rust-lang.org/cargo/getting-started/installation.html">Install Cargo</a></li>
+        <li><a href="https://doc.rust-lang.org/cargo/getting-started/">Getting Started</a></li>
+        <li><a href="https://doc.rust-lang.org/cargo/guide/">Cargo Guide</a></li>
+        <li><a href="https://doc.rust-lang.org/cargo/reference/config.html">Configuration</a></li>
+        <li><a href="https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html">Specifying Dependencies</a></li>
+        <li><a href="https://doc.rust-lang.org/cargo/faq.html">FAQ</a></li>
+        <li><a href="https://doc.rust-lang.org/cargo/reference/publishing.html">Publishing on crates.io</a></li>
+        <li><a href="https://doc.rust-lang.org/cargo/reference/build-scripts.html">Build Scripts</a></li>
+        <li><a href="https://doc.rust-lang.org/cargo/reference/manifest.html">Cargo.toml Format</a></li>
+        <li><a href="https://doc.rust-lang.org/cargo/reference/pkgid-spec.html">Package ID specs</a></li>
+        <li><a href="https://doc.rust-lang.org/cargo/reference/environment-variables.html">Environment Variables</a></li>
+        <li><a href="https://doc.rust-lang.org/cargo/reference/external-tools.html">External Tools</a></li>
+        <li><a href="https://doc.rust-lang.org/cargo/reference/source-replacement.html">Source Replacement</a></li>
+        <li><LinkTo @route="category-slugs">List of category slugs</LinkTo></li>
+      </ul>
+    </div>
+
+    <div local-class="contact-and-social">
+      <div local-class="contact">
+        <h2>Contact</h2>
+        <ul>
+          <li><a href="mailto:help@crates.io">Send us an email</a></li>
+          <li><a href="https://www.rust-lang.org/policies/security">Report a security issue</a></li>
+          <li><a href="https://status.crates.io/">Server Status</a></li>
+        </ul>
+      </div>
+
+      <div local-class="social">
+        <h2>Social</h2>
+        <ul>
+          <li><a href="https://twitter.com/cratesiostatus">{{svg-jar "twitter" role="img" aria-label="Twitter"}}</a></li>
+          <li><a href="https://discord.gg/rust-lang">{{svg-jar "discord" role="img" aria-label="Discord"}}</a></li>
+          <li><a href="https://github.com/rust-lang/crates.io/">{{svg-jar "github" role="img" aria-label="GitHub"}}</a></li>
+        </ul>
+      </div>
+    </div>
+
+    <div local-class="policies">
+      <h2>Terms and Policies</h2>
+      <ul>
+        <li><a href="https://www.rust-lang.org/policies/privacy">Privacy notice</a></li>
+        <li><LinkTo @route="policies">Policies</LinkTo></li>
+        <li><a href="https://www.rust-lang.org/policies/code-of-conduct">Code of Conduct</a></li>
+      </ul>
+    </div>
   </div>
 </footer>
\ No newline at end of file
diff --git a/app/components/footer.module.css b/app/components/footer.module.css
index 4280cc0f6d0..93db052f714 100644
--- a/app/components/footer.module.css
+++ b/app/components/footer.module.css
@@ -1,39 +1,104 @@
 .footer {
+    --heading-color: white;
+    --link-color: rgba(255, 255, 255, .75);
+    --link-hover-color: white;
+
+    :global(.new-design) & {
+        --link-color: var(--yellow);
+        --link-hover-color: #ffdea7;
+    }
+
     display: flex;
     justify-content: center;
     width: 100%;
     background: var(--footer-bg-color);
-}
 
-.sep {
-    margin: 0 10px;
-    color: var(--separator-color);
+    a {
+        transition: color 100ms;
+    }
+
+    h2 {
+        margin: 0 0 16px;
+        color: var(--heading-color);
+        font-size: 24px;
+        line-height: 40px;
+    }
+
+    svg {
+        height: 40px;
+        width: auto;
+    }
+
+    ul {
+        --item-margin: 5px;
+
+        margin: 0 0 calc(0 - var(--item-margin));
+        padding: 0;
+        list-style: none;
+        font-size: 16px;
+        line-height: 30px;
+
+        > li {
+            margin-bottom: var(--item-margin);
+        }
+    }
 }
 
-.after-main-links {
+.inner {
     composes: width-limit from '../styles/application.module.css';
+    padding: 40px;
+    display: grid;
 
-    margin: 40px;
-    text-align: center;
+    @media (min-width: 576px) {
+        grid-template-columns: 50% 50%;
+        grid-template-rows: auto auto auto;
+    }
 
-    a { color: white; }
-    a:hover { color: darken(white, 10%); }
+    @media (min-width: 768px) {
+        grid-template-columns: 40% 30% 30%;
+    }
 
-    @media only screen and (max-width: 450px) {
-        margin: 20px;
-        .sep { display: none; }
-        display: flex;
-        flex-direction: column;
-        align-items: center;
+    @media (min-width: 992px) {
+        grid-template-columns: 50% 25% 25%;
+        padding: 60px 15px;
+    }
+}
 
-        a {
-            width: 50%;
-            font-size: 110%;
-            padding: 5px;
+.docs {
+    @media (min-width: 576px) {
+        grid-row-start: span 3;
+    }
 
-            &:not(:first-child) {
-                border-top: 1px solid var(--separator-color);
-            }
+    @media (min-width: 992px) {
+        ul {
+            display: grid;
+            grid-template-columns: 50% 50%;
         }
     }
 }
+
+.contact {
+    margin-top: 35px;
+
+    @media (min-width: 576px) {
+        margin-top: 0;
+    }
+}
+
+.social {
+    margin-top: 35px;
+
+    ul > li {
+        display: inline;
+        margin-right: 20px;
+        margin-bottom: 0;
+    }
+}
+
+.policies {
+    margin-top: 35px;
+
+    @media (min-width: 768px) {
+        margin-top: 0;
+    }
+}
diff --git a/app/styles/application.module.css b/app/styles/application.module.css
index 39ce5482ffb..fd3e5d9f21f 100644
--- a/app/styles/application.module.css
+++ b/app/styles/application.module.css
@@ -113,16 +113,6 @@ noscript {
     padding: 0 15px;
 }
 
-.fork-me {
-    position: absolute;
-    top: 0;
-    right: 0;
-
-    @media only screen and (max-width: 1180px) {
-        display: none;
-    }
-}
-
 .toggle-design-button {
     position: fixed;
     bottom: 30px;
diff --git a/app/templates/application.hbs b/app/templates/application.hbs
index 22ca2962db6..cf15bb7f928 100644
--- a/app/templates/application.hbs
+++ b/app/templates/application.hbs
@@ -15,10 +15,6 @@
 
 <Footer/>
 
-<a href='https://github.com/rust-lang/crates.io' local-class='fork-me'>
-  <img src='/assets/forkme.png' alt="Fork me on GitHub">
-</a>
-
 {{#if this.design.showToggleButton}}
   <button type="button" local-class="toggle-design-button" {{on "click" this.design.toggle}}>
     Toggle Design
diff --git a/public/assets/discord.svg b/public/assets/discord.svg
new file mode 100644
index 00000000000..449bb8012e0
--- /dev/null
+++ b/public/assets/discord.svg
@@ -0,0 +1,4 @@
+<svg height="200" width="200" viewBox="0 0 512 512" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+    <path d="m209.43 222.584c-14.592 0-26.112 12.8-26.112 28.416s11.776 28.416 26.112 28.416c14.592 0 26.112-12.8 26.112-28.416.256-15.616-11.52-28.416-26.112-28.416zm93.44 0c-14.592 0-26.112 12.8-26.112 28.416s11.776 28.416 26.112 28.416c14.592 0 26.112-12.8 26.112-28.416s-11.52-28.416-26.112-28.416z"/>
+    <path d="m427.52 0h-343.04c-28.928 0-52.48 23.552-52.48 52.736v346.112c0 29.184 23.552 52.736 52.48 52.736h290.304l-13.568-47.36 32.768 30.464 30.976 28.672 55.04 48.64v-459.264c0-29.184-23.552-52.736-52.48-52.736zm-98.816 334.336s-9.216-11.008-16.896-20.736c33.536-9.472 46.336-30.464 46.336-30.464-10.496 6.912-20.48 11.776-29.44 15.104-12.8 5.376-25.088 8.96-37.12 11.008-24.576 4.608-47.104 3.328-66.304-.256-14.592-2.816-27.136-6.912-37.632-11.008-5.888-2.304-12.288-5.12-18.688-8.704-.768-.512-1.536-.768-2.304-1.28-.512-.256-.768-.512-1.024-.768-4.608-2.56-7.168-4.352-7.168-4.352s12.288 20.48 44.8 30.208c-7.68 9.728-17.152 21.248-17.152 21.248-56.576-1.792-78.08-38.912-78.08-38.912 0-82.432 36.864-149.248 36.864-149.248 36.864-27.648 71.936-26.88 71.936-26.88l2.56 3.072c-46.08 13.312-67.328 33.536-67.328 33.536s5.632-3.072 15.104-7.424c27.392-12.032 49.152-15.36 58.112-16.128 1.536-.256 2.816-.512 4.352-.512 15.616-2.048 33.28-2.56 51.712-.512 24.32 2.816 50.432 9.984 77.056 24.576 0 0-20.224-19.2-63.744-32.512l3.584-4.096s35.072-.768 71.936 26.88c0 0 36.864 66.816 36.864 149.248 0 0-21.76 37.12-78.336 38.912z"/>
+</svg>
diff --git a/public/assets/forkme.png b/public/assets/forkme.png
deleted file mode 100644
index 3f9c37ea3d2..00000000000
Binary files a/public/assets/forkme.png and /dev/null differ
diff --git a/public/assets/forkme.svg b/public/assets/forkme.svg
deleted file mode 100644
index 72dc75436c2..00000000000
--- a/public/assets/forkme.svg
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   width="149"
-   height="149"
-   viewBox="0 0 149 149"
-   id="svg2"
-   version="1.1"
-   enable-background="new">
-  <defs
-     id="defs4">
-    <filter
-       style="color-interpolation-filters:sRGB;"
-       id="filter4324">
-      <feGaussianBlur
-         stdDeviation="0.5"
-         result="blur"
-         id="feGaussianBlur4326" />
-      <feComposite
-         in="SourceGraphic"
-         in2="blur"
-         operator="atop"
-         result="composite1"
-         id="feComposite4328" />
-      <feComposite
-         in2="composite1"
-         operator="in"
-         result="composite2"
-         id="feComposite4330" />
-      <feComposite
-         in2="composite2"
-         operator="in"
-         result="composite3"
-         id="feComposite4332" />
-    </filter>
-    <filter
-       style="color-interpolation-filters:sRGB;"
-       id="filter4440">
-      <feGaussianBlur
-         result="result1"
-         in="SourceAlpha"
-         stdDeviation="2.2"
-         id="feGaussianBlur4442" />
-      <feSpecularLighting
-         result="result0"
-         specularExponent="18.1"
-         specularConstant="2"
-         surfaceScale="5"
-         id="feSpecularLighting4444">
-        <feDistantLight
-           azimuth="225"
-           elevation="24"
-           id="feDistantLight4446" />
-      </feSpecularLighting>
-      <feComposite
-         result="result6"
-         operator="in"
-         in2="SourceAlpha"
-         id="feComposite4448" />
-      <feMorphology
-         radius="5.7"
-         operator="dilate"
-         id="feMorphology4450" />
-      <feGaussianBlur
-         result="result11"
-         stdDeviation="5.7"
-         id="feGaussianBlur4452" />
-      <feDiffuseLighting
-         surfaceScale="5"
-         result="result3"
-         diffuseConstant="2"
-         in="result1"
-         id="feDiffuseLighting4454">
-        <feDistantLight
-           elevation="25"
-           azimuth="225"
-           id="feDistantLight4456" />
-      </feDiffuseLighting>
-      <feBlend
-         result="result7"
-         mode="multiply"
-         in="result3"
-         in2="SourceGraphic"
-         id="feBlend4458" />
-      <feComposite
-         in="result7"
-         operator="in"
-         in2="SourceAlpha"
-         result="result91"
-         id="feComposite4460" />
-      <feBlend
-         result="result9"
-         mode="lighten"
-         in="result6"
-         in2="result91"
-         id="feBlend4462" />
-      <feComposite
-         in="result11"
-         in2="result9"
-         id="feComposite4464" />
-    </filter>
-  </defs>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer2"
-     style="display:inline;opacity:1">
-    <rect
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1.26499534;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:7.58997219, 7.58997219;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4440)"
-       id="rect3426"
-       width="28.914181"
-       height="189.2975"
-       x="-40.551369"
-       y="-199.78255"
-       transform="matrix(-0.72328238,0.69055239,-0.70710606,-0.70710751,0,0)" />
-    <g
-       id="layer3"
-       style="display:inline">
-      <rect
-         transform="matrix(-0.72527811,0.688456,-0.70710614,-0.70710743,0,0)"
-         y="-200.08908"
-         x="-38.82024"
-         height="189.2975"
-         width="25.700886"
-         id="rect4232"
-         style="display:inline;opacity:1;fill:#1a1a2a;fill-opacity:1;stroke:none;stroke-width:1.26499534;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:7.58997219, 7.58997219;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4324)" />
-    </g>
-  </g>
-  <g
-     style="display:inline"
-     id="g4336">
-    <rect
-       transform="matrix(-0.72328238,0.69055239,-0.70710606,-0.70710751,0,0)"
-       y="-199.78255"
-       x="-40.551369"
-       height="189.2975"
-       width="28.914181"
-       id="rect4338"
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1.26499534;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:7.58997219, 7.58997219;stroke-dashoffset:0;stroke-opacity:1" />
-    <g
-       style="display:inline"
-       id="g4340">
-      <rect
-         style="display:inline;opacity:1;fill:#1a1a2a;fill-opacity:1;stroke:none;stroke-width:1.26499534;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:7.58997219, 7.58997219;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4324)"
-         id="rect4342"
-         width="25.700886"
-         height="189.2975"
-         x="-38.82024"
-         y="-200.08908"
-         transform="matrix(-0.72527811,0.688456,-0.70710614,-0.70710743,0,0)" />
-    </g>
-  </g>
-  <g
-     transform="matrix(0.79401875,0,0,0.79401875,23.021333,14.88022)"
-     id="layer4">
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:77.02822876px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;opacity:0.97000002;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="35.917938"
-       y="-19.654696"
-       id="text4486"
-       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"><tspan
-         id="tspan4488"
-         x="35.917938"
-         y="-19.654696"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20.46551168px;font-family:Collegiate;-inkscape-font-specification:Collegiate;fill:#ffffff">Fork me on GitHub</tspan></text>
-  </g>
-</svg>
diff --git a/public/assets/github.svg b/public/assets/github.svg
new file mode 100644
index 00000000000..8b0623d50fa
--- /dev/null
+++ b/public/assets/github.svg
@@ -0,0 +1,3 @@
+<svg height="512" width="512" viewBox="0 0 512 512" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+    <path d="m256 0c-141.39 0-256 114.61-256 256 0 113.1 73.345 209.05 175.07 242.91 12.81 2.35 17.48-5.56 17.48-12.35 0-6.06-.22-22.17-.35-43.53-71.21 15.46-86.23-34.32-86.23-34.32-11.645-29.58-28.429-37.45-28.429-37.45-23.244-15.88 1.76-15.56 1.76-15.56 25.699 1.8 39.209 26.38 39.209 26.38 22.84 39.12 59.92 27.82 74.51 21.27 2.32-16.54 8.93-27.82 16.25-34.22-56.84-6.45-116.611-28.43-116.611-126.52 0-27.94 9.981-50.8 26.351-68.7-2.64-6.47-11.42-32.5 2.5-67.74 0 0 21.5-6.889 70.41 26.24 20.41-5.69 42.32-8.52 64.09-8.61 21.73.1 43.64 2.92 64.09 8.61 48.87-33.129 70.32-26.24 70.32-26.24 13.97 35.24 5.19 61.27 2.55 67.74 16.41 17.9 26.32 40.76 26.32 68.7 0 98.35-59.86 119.99-116.89 126.32 9.19 7.91 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.22 0 6.85 4.6 14.82 17.6 12.32 101.65-33.92 174.93-129.8 174.93-242.88 0-141.39-114.63-256-256.02-256"/>
+</svg>
diff --git a/public/assets/twitter.svg b/public/assets/twitter.svg
new file mode 100644
index 00000000000..ce1d4813869
--- /dev/null
+++ b/public/assets/twitter.svg
@@ -0,0 +1,3 @@
+<svg height="512" width="512" viewBox="0 0 512 512" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+    <path d="m160.768 460.8c193.1264 0 298.8032-160.1536 298.8032-298.8032 0-4.5056 0-9.0112-.2048-13.5168 20.48-14.7456 38.2976-33.3824 52.4288-54.4768-18.8416 8.3968-39.1168 13.9264-60.416 16.5888 21.7088-12.9024 38.2976-33.5872 46.2848-58.1632-20.2752 12.0832-42.8032 20.6848-66.7648 25.3952-19.2512-20.48-46.4896-33.1776-76.5952-33.1776-57.9584 0-105.0624 47.104-105.0624 105.0624 0 8.192 1.024 16.1792 2.6624 23.9616-87.2448-4.3008-164.6592-46.2848-216.4736-109.7728-9.0112 15.5648-14.1312 33.5872-14.1312 52.8384 0 36.4544 18.6368 68.608 46.6944 87.4496-17.2032-.6144-33.3824-5.3248-47.5136-13.1072v1.4336c0 50.7904 36.2496 93.3888 84.1728 103.0144-8.8064 2.4576-18.0224 3.6864-27.648 3.6864-6.7584 0-13.312-.6144-19.6608-1.8432 13.312 41.7792 52.224 72.0896 98.0992 72.9088-36.0448 28.2624-81.3056 45.056-130.4576 45.056-8.3968 0-16.7936-.4096-24.9856-1.4336 46.2848 29.4912 101.5808 46.8992 160.768 46.8992" />
+</svg>