diff --git a/content/pages/404.html b/content/pages/404.html
index ddf01cc..bca955f 100644
--- a/content/pages/404.html
+++ b/content/pages/404.html
@@ -13,7 +13,7 @@ <h2 class="title is-spaced is-size-3-mobile">
         <p class="subtitle">The page you're looking for can't be found.</p>
         <p class="button-container">
           <a class="button with-text is-white" href="{filename}index.html">
-            <span class="fas fa-solid fa-home"></span>
+            <span class="fas fa-home"></span>
             <span>Home Page</span>
           </a>
         </p>
diff --git a/content/pages/code.html b/content/pages/code.html
index b7f66df..c5a622b 100644
--- a/content/pages/code.html
+++ b/content/pages/code.html
@@ -52,7 +52,7 @@ <h1 class="title is-spaced is-size-3-mobile">
                   class="button with-text is-white"
                   href="https://openwisp.io/docs/stable/"
                 >
-                  <span class="fas fa-solid fa-book"></span>
+                  <span class="fas fa-book"></span>
                   <span>Documentation</span>
                 </a>
               </p>
@@ -85,7 +85,7 @@ <h2 class="title is-spaced is-size-3 is-size-4-mobile">
             class="button is-orange with-text"
             href="https://openwisp.io/docs/stable/user/quickstart.html"
           >
-            <span class="fas fa-solid fa-book"></span>
+            <span class="fas fa-book"></span>
             <span>Quick Start</span>
           </a>
           <a class="button with-text is-white" href="{filename}demo.html">
@@ -93,7 +93,7 @@ <h2 class="title is-spaced is-size-3 is-size-4-mobile">
             <span>Demo</span>
           </a>
           <a class="button with-text is-inverted" href="{filename}deploy.html">
-            <i class="fas fa-solid fa-cloud-arrow-up"></i>
+            <i class="fas fa-cloud-arrow-up"></i>
             <span>Deploy</span>
           </a>
         </p>
@@ -117,14 +117,14 @@ <h2 class="title is-spaced is-size-3 is-size-4-mobile">
               class="button is-orange with-text"
               href="https://openwisp.io/docs/general/help-us.html"
             >
-              <span class="fas fa-solid fa-hand-holding-hand"></span>
+              <span class="fas fa-hand-holding-hand"></span>
               <span>Help us to grow</span>
             </a>
             <a
               class="button with-text is-white"
               href="https://openwisp.io/docs/developer/contributing.html"
             >
-              <span class="fas fa-solid fa-code"></span>
+              <span class="fas fa-code"></span>
               <span>Contribute</span>
             </a>
           </p>
diff --git a/content/pages/commercial-support.html b/content/pages/commercial-support.html
index 8aa3a3d..bafb6dd 100644
--- a/content/pages/commercial-support.html
+++ b/content/pages/commercial-support.html
@@ -251,7 +251,7 @@ <h2 class="title is-spaced is-size-3 is-size-4-mobile">
             class="button is-orange with-text"
             href="https://calendly.com/openwisp/intro-call"
           >
-            <span class="fas fa-solid fa-headset"></span>
+            <span class="fas fa-headset"></span>
             <span>Book Support Call</span>
           </a>
 
diff --git a/content/pages/demo.html b/content/pages/demo.html
index 3407385..cf34554 100644
--- a/content/pages/demo.html
+++ b/content/pages/demo.html
@@ -53,7 +53,7 @@ <h1 class="title is-spaced is-size-3-mobile">
               href="https://demo.openwisp.io"
               target="_blank"
             >
-              <span class="fas fa-solid fa-play"></span>
+              <span class="fas fa-play"></span>
               <span>Access the Demo</span>
             </a>
             <a
@@ -61,7 +61,7 @@ <h1 class="title is-spaced is-size-3-mobile">
               href="https://openwisp.io/docs/stable/tutorials/demo.html"
               target="_blank"
             >
-              <span class="fas fa-solid fa-book"></span>
+              <span class="fas fa-book"></span>
               <span>Read the Tutorial</span>
             </a>
           </p>
diff --git a/content/pages/deploy.html b/content/pages/deploy.html
index adf500a..fade957 100644
--- a/content/pages/deploy.html
+++ b/content/pages/deploy.html
@@ -240,7 +240,7 @@ <h2 class="title is-size-5">
               <h2 class="title is-size-5">
                 <mark class="button is-small is-orange is-inverted">
                   <span class="icon is-small">
-                    <i class="fas fa-solid fa-network-wired"></i>
+                    <i class="fas fa-network-wired"></i>
                   </span>
                 </mark>
                 <span>Management VPN Ready</span>
@@ -255,7 +255,7 @@ <h2 class="title is-size-5">
               <h2 class="title is-size-5">
                 <mark class="button is-small is-orange is-inverted">
                   <span class="icon is-small">
-                    <i class="fas fa-solid fa-shield-halved"></i>
+                    <i class="fas fa-shield-halved"></i>
                   </span>
                 </mark>
                 <span>Hardened Security</span>
@@ -271,7 +271,7 @@ <h2 class="title is-size-5">
               <h2 class="title is-size-5">
                 <mark class="button is-small is-orange is-inverted">
                   <span class="icon is-small">
-                    <i class="fas fa-solid fa-cloud-arrow-up"></i>
+                    <i class="fas fa-cloud-arrow-up"></i>
                   </span>
                 </mark>
                 <span>Easy Upgrades &amp; Migrations</span>
@@ -288,7 +288,7 @@ <h2 class="title is-size-5">
               <h2 class="title is-size-5">
                 <mark class="button is-small is-orange is-inverted">
                   <span class="icon is-small">
-                    <i class="fas fa-solid fa-wifi"></i>
+                    <i class="fas fa-wifi"></i>
                   </span>
                 </mark>
                 <span>Turnkey Hotspot Solution</span>
@@ -305,7 +305,7 @@ <h2 class="title is-size-5">
               <h2 class="title is-size-5">
                 <mark class="button is-small is-orange is-inverted">
                   <span class="icon is-small">
-                    <i class="fas fa-solid fa-key"></i>
+                    <i class="fas fa-key"></i>
                   </span>
                 </mark>
                 <span>Simplified Single Sign-On Setup</span>
diff --git a/content/pages/faq.html b/content/pages/faq.html
index 5499e12..90ad379 100644
--- a/content/pages/faq.html
+++ b/content/pages/faq.html
@@ -219,7 +219,7 @@ <h2 class="title is-spaced is-size-3 is-size-4-mobile">
             class="button with-text is-white"
             href="{filename}commercial-support.html"
           >
-            <span class="fas fa-solid fa-headset"></span>
+            <span class="fas fa-headset"></span>
             <span>Professional Support</span>
           </a>
         </p>
diff --git a/content/pages/features.html b/content/pages/features.html
index 3109d32..ab4e04e 100644
--- a/content/pages/features.html
+++ b/content/pages/features.html
@@ -24,7 +24,7 @@ <h2>
                 <a class="open-modal" href="#templates-and-variables">
                   <span class="button is-small is-orange is-inverted">
                     <span class="icon is-small">
-                      <i class="fas fa-solid fa-copy"></i>
+                      <i class="fas fa-copy"></i>
                     </span>
                   </span>
                   <span>Configuration Templates</span>
@@ -412,7 +412,7 @@ <h2>
                 <a href="#multi-tenancy" class="open-modal">
                   <span class="button is-small is-orange is-inverted">
                     <span class="icon is-small">
-                      <i class="fas fa-solid fa-users"></i>
+                      <i class="fas fa-users"></i>
                     </span>
                   </span>
                   <span>Multi-tenancy</span>
@@ -485,7 +485,7 @@ <h2>
                 <a href="#firmware-upgrades" class="open-modal">
                   <span class="button is-small is-orange is-inverted">
                     <span class="icon is-small">
-                      <i class="fas fa-solid fa-cloud-arrow-up"></i>
+                      <i class="fas fa-cloud-arrow-up"></i>
                     </span>
                   </span>
                   <span>Firmware Upgrades</span>
@@ -1092,7 +1092,7 @@ <h2 class="title is-size-3 is-size-4-mobile is-spaced">Learn More</h2>
             <span>Get Started</span>
           </a>
           <a class="button with-text is-inverted" href="{filename}deploy.html">
-            <i class="fas fa-solid fa-cloud-arrow-up"></i>
+            <i class="fas fa-cloud-arrow-up"></i>
             <span>Deploy</span>
           </a>
           <a
diff --git a/content/pages/history.html b/content/pages/history.html
index 1b5646f..d763d03 100644
--- a/content/pages/history.html
+++ b/content/pages/history.html
@@ -213,11 +213,11 @@ <h3 class="title">Embracing the Future</h3>
         <h2 class="title is-spaced is-size-3 is-size-4-mobile">Learn more</h2>
         <p class="button-container">
           <a class="button is-orange with-text" href="{filename}faq.html">
-            <span class="fas fa-solid fa-clipboard-question"></span>
+            <span class="fas fa-clipboard-question"></span>
             <span>FAQ</span>
           </a>
           <a class="button with-text is-white" href="{filename}features.html">
-            <span class="fas fa-solid fa-plus"></span>
+            <span class="fas fa-plus"></span>
             <span>Features</span>
           </a>
         </p>
diff --git a/content/pages/index.html b/content/pages/index.html
index 19f95f7..32a00e2 100644
--- a/content/pages/index.html
+++ b/content/pages/index.html
@@ -46,7 +46,7 @@ <h1 class="title is-spaced is-size-3-mobile">
               class="button with-text is-orange"
               href="{filename}features.html"
             >
-              <span class="fas fa-solid fa-bolt"></span>
+              <span class="fas fa-bolt"></span>
               <span>Features</span>
             </a>
             <a class="button with-text is-white" href="{filename}demo.html">
@@ -54,7 +54,7 @@ <h1 class="title is-spaced is-size-3-mobile">
               <span>Try the Demo</span>
             </a>
             <a class="button with-text is-inverted" href="{filename}deploy.html">
-              <i class="fas fa-solid fa-cloud-arrow-up"></i>
+              <i class="fas fa-cloud-arrow-up"></i>
               <span>Deploy</span>
             </a>
           </p>
@@ -103,7 +103,7 @@ <h2>
               <a href="{filename}features.html#templates-and-variables">
                 <span class="button is-small is-orange is-inverted">
                   <span class="icon is-small">
-                    <i class="fas fa-solid fa-copy"></i>
+                    <i class="fas fa-copy"></i>
                   </span>
                 </span>
                 <span>Configuration Templates</span>
@@ -178,7 +178,7 @@ <h2>
               <a href="{filename}features.html#firmware-upgrades">
                 <span class="button is-small is-orange is-inverted">
                   <span class="icon is-small">
-                    <i class="fas fa-solid fa-cloud-arrow-up"></i>
+                    <i class="fas fa-cloud-arrow-up"></i>
                   </span>
                 </span>
                 <span>Firmware Upgrades</span>
@@ -212,7 +212,7 @@ <h2>
 
         <p class="has-text-centered">
           <a class="button with-text is-orange" href="{filename}features.html">
-            <span class="fas fa-solid fa-bolt"></span>
+            <span class="fas fa-bolt"></span>
             <span>More Features</span>
           </a>
         </p>
@@ -241,7 +241,7 @@ <h2 class="title is-size-3 is-size-4-mobile is-spaced">
         <div class="column">
           <div class="bullet">
             <span class="circle">
-              <span class="fas fa-solid fa-wrench"></span>
+              <span class="fas fa-wrench"></span>
             </span>
             <h3 class="mb-2">Programmable</h3>
             <p>
@@ -252,7 +252,7 @@ <h3 class="mb-2">Programmable</h3>
 
           <div class="bullet">
             <span class="circle">
-              <span class="fas fa-solid fa-gear"></span>
+              <span class="fas fa-gear"></span>
             </span>
             <h3 class="mb-2">Effortless Management</h3>
             <p>
@@ -264,7 +264,7 @@ <h3 class="mb-2">Effortless Management</h3>
 
           <div class="bullet">
             <span class="circle">
-              <span class="fas fa-solid fa-star"></span>
+              <span class="fas fa-star"></span>
             </span>
             <h3 class="mb-2">Proven Success</h3>
             <p class="content text">
@@ -276,7 +276,7 @@ <h3 class="mb-2">Proven Success</h3>
 
           <div class="bullet">
             <span class="circle">
-              <span class="fas fa-solid fa-headset"></span>
+              <span class="fas fa-headset"></span>
             </span>
             <h3 class="mb-2">Reliable Support</h3>
             <p class="content text">
@@ -340,7 +340,7 @@ <h2 class="title is-size-3 is-size-4-mobile is-spaced">
           class="button with-text is-orange is-inverted"
           href="{filename}support.html"
         >
-          <span class="fas fa-solid fa-people-group"></span>
+          <span class="fas fa-people-group"></span>
           <span>Join the Community</span>
         </a>
       </p>
@@ -444,7 +444,7 @@ <h3 class="title is-size-6 mt-4">
             class="button with-text is-orange is-inverted is-small"
             href="{filename}faq.html"
           >
-            <span class="fas fa-solid fa-clipboard-question"></span>
+            <span class="fas fa-clipboard-question"></span>
             <span>Read Full FAQ</span>
           </a>
         </p>
@@ -464,7 +464,7 @@ <h2 class="title is-size-3 is-size-4-mobile is-spaced">Try the demo</h2>
             <span>Demo</span>
           </a>
           <a class="button with-text is-white" href="{filename}features.html">
-            <span class="fas fa-solid fa-bolt"></span>
+            <span class="fas fa-bolt"></span>
             <span>Features</span>
           </a>
         </p>
diff --git a/content/pages/partners.html b/content/pages/partners.html
index 3c3e4b4..df6d520 100644
--- a/content/pages/partners.html
+++ b/content/pages/partners.html
@@ -568,7 +568,7 @@ <h2 class="title is-spaced is-size-3 is-size-4-mobile">
               class="button with-text is-orange is-inverted"
               href="{filename}sponsorship.html"
             >
-              <span class="fas fa-solid fa-hand-holding-heart"></span>
+              <span class="fas fa-hand-holding-heart"></span>
               <span>Sponsorship</span>
             </a>
           </p>
diff --git a/content/pages/sponsorship.html b/content/pages/sponsorship.html
index 0dc5f95..c1f2c00 100644
--- a/content/pages/sponsorship.html
+++ b/content/pages/sponsorship.html
@@ -219,7 +219,7 @@ <h2 class="title is-spaced is-size-3 is-size-4-mobile">
             class="button is-orange is-inverted with-text"
             href="{filename}commercial-support.html"
           >
-            <span class="fas fa-solid fa-headset"></span>
+            <span class="fas fa-headset"></span>
             <span>Commercial Support</span>
           </a>
         </p>
diff --git a/content/pages/support.html b/content/pages/support.html
index de85564..1d81966 100644
--- a/content/pages/support.html
+++ b/content/pages/support.html
@@ -68,7 +68,7 @@ <h2 class="title is-size-5 mb-3">General Chat</h2>
                   target="_blank"
                   href="https://matrix.to/#/#openwisp_general:gitter.im"
                 >
-                  <span class="fas fa-solid fa-comment-dots"></span>
+                  <span class="fas fa-comment-dots"></span>
                   <span>General Chat</span>
                 </a>
               </p>
@@ -85,7 +85,7 @@ <h2 class="title is-size-5 mb-3">Development Chat</h2>
                 target="_blank"
                 href="https://matrix.to/#/#openwisp_development:gitter.im"
               >
-                <span class="fas fa-solid fa-code"></span>
+                <span class="fas fa-code"></span>
                 <span>Dev Chat</span>
               </a>
             </div>
@@ -127,7 +127,7 @@ <h2 class="title is-size-5 mb-3">Reporting Security Issues</h2>
                   target="_blank"
                   href="mailto:&#115;&#101;&#099;&#117;&#114;&#105;&#116;&#121;&#064;&#111;&#112;&#101;&#110;&#119;&#105;&#115;&#112;&#046;&#105;&#111;"
                 >
-                  <span class="fas fa-solid fa-shield-halved"></span>
+                  <span class="fas fa-shield-halved"></span>
                   <span>Security Report</span>
                 </a>
               </p>
@@ -161,7 +161,7 @@ <h2 class="title is-spaced is-size-3 is-size-4-mobile">
             class="button is-orange with-text"
             href="{filename}commercial-support.html"
           >
-            <span class="fas fa-solid fa-headset"></span>
+            <span class="fas fa-headset"></span>
             <span>Commercial Support</span>
           </a>
         </p>
diff --git a/content/pages/team.html b/content/pages/team.html
index df7ecbf..98db0c9 100644
--- a/content/pages/team.html
+++ b/content/pages/team.html
@@ -126,7 +126,7 @@ <h2 class="title is-size-5 mb-0">Nicholas Smith</h2>
         <h2 class="title is-spaced is-size-3 is-size-4-mobile">Learn more</h2>
         <p class="button-container">
           <a class="button is-orange with-text" href="{filename}partners.html">
-            <span class="fas fa-solid fa-building"></span>
+            <span class="fas fa-building"></span>
             <span>Partners</span>
           </a>
           <a class="button with-text is-white" href="{filename}code.html">
diff --git a/theme/templates/base.html b/theme/templates/base.html
index 3e1d11d..10b3b3c 100644
--- a/theme/templates/base.html
+++ b/theme/templates/base.html
@@ -164,7 +164,7 @@
                     class="button is-inverted with-text"
                     href="{{ SITEURL }}/deploy/"
                   >
-                    <span class="fas fa-solid fa-cloud-arrow-up"></span>
+                    <span class="fas fa-cloud-arrow-up"></span>
                     <span>Deploy</span>
                   </a>
                 </p>