diff --git a/_data/architecture.yml b/_data/architecture.yml
index 01f58517..2d480915 100644
--- a/_data/architecture.yml
+++ b/_data/architecture.yml
@@ -18,6 +18,9 @@
   - title: Getting Started
     url: /getting-started/
     icon: fa-cubes
+  - title: Help and Support
+    url: /support/
+    icon: fa-life-ring
   - title: OS Architecture
     url: /doc/architecture/
   - title: Security Center
@@ -115,9 +118,6 @@
     url: mailto:press@qubes-os.org
   - title: Business Inquiries
     url: mailto:business@qubes-os.org
-  - title: Mailing Lists
-    url: /mailing-lists/
-    icon: fa-envelope-o
   - title: Join the Team
     url: /join/
     icon: fa-thumbs-o-up
diff --git a/_layouts/team.html b/_layouts/team.html
index eb7ff6e9..5afd6564 100644
--- a/_layouts/team.html
+++ b/_layouts/team.html
@@ -15,7 +15,7 @@ <h1 class="add-left">
             <ul class="list-unstyled">
               <li><a href="/security/"><i class="fa fa-lock fa-fw black-icon"></i> Report a security issue</a></li>
               <li><a href="/doc/reporting-bugs/"><i class="fa fa-bug fa-fw black-icon"></i> Report a bug</a></li>
-              <li><a href="/mailing-lists/"><i class="fa fa-envelope fa-fw black-icon"></i> Join the mailing lists</a></li>
+              <li><a href="/support/"><i class="fa fa-life-ring fa-fw black-icon"></i> Get help and support</a></li>
               <li><a href="/join/"><i class="fa fa-user-plus fa-fw black-icon"></i> Join the team</a></li>
             </ul>
           </div>
@@ -23,7 +23,7 @@ <h1 class="add-left">
             <ul class="list-unstyled">
               <li><i class="fa fa-newspaper-o fa-fw"></i> Press inquiries: <a href="mailto:press@qubes-os.org">press@qubes-os.org</a></li>
               <li><i class="fa fa-briefcase fa-fw"></i> Business inquiries: <a href="mailto:business@qubes-os.org">business@qubes-os.org</a></li>
-              <li><a href="/partners/"><i class="fa fa-globe fa-fw black-icon"></i> Become a Qubes partner</a></li>
+              <li><a href="/partners/"><i class="fa fa-globe fa-fw black-icon"></i> Become a Qubes Partner</a></li>
               <li><a href="/hardware-certification/"><i class="fa fa-laptop fa-fw black-icon"></i> Request hardware certification</a></li>
             </ul>
           </div>
diff --git a/pages/downloads.md b/pages/downloads.md
index fd5aa205..91fc5c85 100644
--- a/pages/downloads.md
+++ b/pages/downloads.md
@@ -28,9 +28,9 @@ redirect_from:
     <div class="col-lg-4 col-md-4">
       <h3>Help and Support</h3>
       <ul class="list-unstyled">
+        <li><a href="/support/"><i class="fa fa-life-ring fa-fw black-icon"></i> Help and Support</a></li>
+        <li><a href="/doc/#troubleshooting"><i class="fa fa-file-text-o fa-fw black-icon"></i> Troubleshooting Guides</a></li>
         <li><a href="/doc/reporting-bugs/"><i class="fa fa-bug fa-fw black-icon"></i> Report a Bug</a></li>
-        <li><a href="/doc/#troubleshooting"><i class="fa fa-life-ring fa-fw black-icon"></i> Troubleshooting Guides</a></li>
-        <li><a href="/mailing-lists/"><i class="fa fa-envelope fa-fw black-icon"></i> Get Help on the Mailing Lists</a></li>
       </ul>
     </div>
   </div>
diff --git a/pages/home.html b/pages/home.html
index 4ef3dc9a..c91454bc 100644
--- a/pages/home.html
+++ b/pages/home.html
@@ -280,7 +280,7 @@ <h2 class="text-center"><i class="fa fa-comments"></i> Join the Community!</h2>
         <a title="Twitter" href="https://twitter.com/QubesOS" class="fa fa-twitter fa-5x fa-fw" aria-hidden="true"></a>
         <a title="Reddit" href="https://www.reddit.com/r/Qubes/" class="fa fa-reddit fa-5x fa-fw" aria-hidden="true"></a>
         <a title="Facebook" href="https://www.facebook.com/QubesOS" class="fa fa-facebook fa-5x fa-fw" aria-hidden="true"></a>
-        <a title="Mailing Lists" href="/mailing-lists/" class="fa fa-envelope-o fa-5x fa-fw black-icon" aria-hidden="true"></a>
+        <a title="Help and Support" href="/support/" class="fa fa-life-ring fa-5x fa-fw black-icon" aria-hidden="true"></a>
       </div>
     </div>
   </div>