diff --git a/_i18n/en.yml b/_i18n/en.yml
index 4ba5b4a5..67a8fd03 100644
--- a/_i18n/en.yml
+++ b/_i18n/en.yml
@@ -443,11 +443,14 @@ contributing:
   altqrbitcoin: Bitcoin QR code
 
 faq:
+  basics: Basics
+  privacy: Privacy
+  security: Security
+  economics: Economics
+  wallets: Wallets
+  node: Node
   intro: Find answers to recurring questions and concerns about Monero.
   toc: Table Of Contents
-  general: General
-  advanced: Advanced
-  nodeandwallet: Node and Wallet
   additional: "More Info:"
   resandhelp: Resources & Help
   stackexchange: One of the most complete resources about Monero. If you have a question which is not in this FAQ, you will likely find the answer on the Monero StackExchange.
diff --git a/get-started/faq/index.md b/get-started/faq/index.md
index 36b3993b..ad6373a9 100644
--- a/get-started/faq/index.md
+++ b/get-started/faq/index.md
@@ -19,46 +19,55 @@ meta_descr: faq.intro
                     </div>
                 </div>
                 <ul>
-                    <li class="category">{% t faq.general %}</li>
+                    <li class="category">{% t faq.basics %}</li>
                     <ul class="logo">
                         <li><a href="#anchor-word">{% t faq.qword %}</a></li>
                         <li><a href="#anchor-contribute">{% t faq.qcontribute %}</a></li>
-                        <li><a href="#anchor-value">{% t faq.q1 %}</a></li>
                         <li><a href="#anchor-buy">{% t faq.q2 %}</a></li>
-                        <li><a href="#anchor-different">{% t faq.q4 %}</a></li>
                         <li><a href="#anchor-btc-difference">{% t faq.q7 %}</a></li>
-                        <li><a href="#asic-resistance">{% t faq.qasicresistance %}</a></li>
-                        <li><a href="#anchor-fungibility">{% t faq.q11 %}</a></li>
-                        <li><a href="#anchor-magic">{% t faq.q13 %}</a></li>
-                        <li><a href="#anchor-anonymous">{% t faq.q14 %}</a></li>
-                        <li><a href="#vulnerabilities">{% t faq.qvuln %}</a></li>
-                        <li><a href="#antivirus">{% t faq.qantivirus %}</a></li>
                         <li><a href="#monero-meaning">{% t faq.qmoneromeaning %}</a></li>
                         <li><a href="#hardforks">{% t faq.qhf %}</a></li>
                         <li><a href="#videos">{% t faq.qvideos %}</a></li>
-                    </ul>
-                    <li class="category">{% t faq.advanced %}</li>
-                    <ul class="logo">
-                        <li><a href="#anchor-thin-air">{% t faq.q12 %}</a></li>
-                        <li><a href="#anchor-light-normal">{% t faq.q6 %}</a></li>
                         <li><a href="#anchor-block-limit">{% t faq.q8 %}</a></li>
                         <li><a href="#anchor-mixing">{% t faq.q15 %}</a></li>
-                        <li><a href="#import-blockchain">{% t faq.qimporting %}</a></li>
+                    </ul>
+                    <li class="category">{% t faq.privacy %}</li>
+                    <ul class="logo">
+                        <li><a href="#anchor-different">{% t faq.q4 %}</a></li>
+                        <li><a href="#anchor-magic">{% t faq.q13 %}</a></li>
+                        <li><a href="#anchor-anonymous">{% t faq.q14 %}</a></li>
+                    </ul>
+                    <li class="category">{% t faq.security %}</li>
+                    <ul class="logo">
+                        <li><a href="#asic-resistance">{% t faq.qasicresistance %}</a></li>
+                        <li><a href="#vulnerabilities">{% t faq.qvuln %}</a></li>
+                        <li><a href="#antivirus">{% t faq.qantivirus %}</a></li>
+                    </ul>
+                    <li class="category">{% t faq.economics %}</li>
+                    <ul class="logo">
+                        <li><a href="#anchor-value">{% t faq.q1 %}</a></li>
+                        <li><a href="#anchor-fungibility">{% t faq.q11 %}</a></li>
+                        <li><a href="#anchor-thin-air">{% t faq.q12 %}</a></li>
                         <li><a href="#max-supply">{% t faq.qmaxsupply %}</a></li>
                         <li><a href="#tail-emission">{% t faq.qtailemission %}</a></li>
                     </ul>
-                    <li class="category">{% t faq.nodeandwallet %}</li>
+                    <li class="category">{% t faq.wallets %}</li>
                     <ul class="logo">
+                        <li><a href="#anchor-light-normal">{% t faq.q6 %}</a></li>
                         <li><a href="#anchor-wallet">{% t faq.qwallet %}</a></li>
                         <li><a href="#anchor-lost-funds">{% t faq.qnofunds %}</a></li>
                         <li><a href="#long-time-move">{% t faq.qlongtimemove %}</a></li>
-                        <li><a href="#anchor-tor-node">{% t faq.qnodetor %}</a></li>
                         <li><a href="#anchor-long-sync">{% t faq.q5 %}</a></li>
+                        <li><a href="#anchor-scanned-wallet">{% t faq.qscanned %}</a></li>
+                    </ul>
+                    <li class="category">{% t faq.node %}</li>
+                    <ul class="logo">
+                        <li><a href="#import-blockchain">{% t faq.qimporting %}</a></li>
+                        <li><a href="#anchor-tor-node">{% t faq.qnodetor %}</a></li>
                         <li><a href="#anchor-full-pruned">{% t faq.qfullpruned %}</a></li>
                         <li><a href="#anchor-block-size">{% t faq.qblocksize %}</a></li>
                         <li><a href="#anchor-block-space">{% t faq.qblockspace %}</a></li>
                         <li><a href="#anchor-avoid-bc">{% t faq.qavoidbc %}</a></li>
-                        <li><a href="#anchor-scanned-wallet">{% t faq.qscanned %}</a></li>
                         <li><a href="#anchor-danger-node">{% t faq.qdangernode %}</a></li>
                         <li><a href="#anchor-danger-rnode">{% t faq.qdangerrnode %}</a></li>
                     </ul>
@@ -95,8 +104,8 @@ meta_descr: faq.intro
         <div class="full col-lg-12 col-md-12 col-sm-12 col-xs-12">
             <div class="info-block">
                 <div class="row center-xs">
-                    <!-- 'General' section-->
-                    <div class="col"><h2>{% t faq.general %}</h2></div>
+                    <!-- 'Basics' section-->
+                    <div class="col"><h2>{% t faq.basics %}</h2></div>
                 </div>
                 <div class="tab" id="anchor-word">
                     <h3><a class="anchor" href="#anchor-word"></a>{% t faq.qword %}</h3>
@@ -116,12 +125,6 @@ meta_descr: faq.intro
                         <p>{% t faq.additional %} <a href="{{ site.baseurl }}/get-started/contributing/">{% t titles.contributing %}</a></p>
                     </div>
                 </div>
-                <div class="tab" id="anchor-value">
-                    <h3><a class="anchor" href="#anchor-value"></a>{% t faq.q1 %}</h3>
-                    <div class="tab-answer">
-                        <p>{% t faq.a1 %}</p>
-                    </div>
-                </div>
                 <div class="tab" id="anchor-buy">
                     <h3><a class="anchor" href="#anchor-buy"></a>{% t faq.q2 %}</h3>
                     <div class="tab-answer">
@@ -130,60 +133,12 @@ meta_descr: faq.intro
                         <p>{% t faq.additional %} <a href="https://www.monerooutreach.org/how-to-buy-monero.html">How to Buy Monero (Monero Outreach)</a></p>
                     </div>
                 </div>
-                <div class="tab" id="anchor-different">
-                    <h3><a class="anchor" href="#anchor-different"></a>{% t faq.q4 %}</h3>
-                    <div class="tab-answer" id="anchor-different">
-                        <p>{% t faq.a4 %}</p>
-                        <p>{% t faq.additional %} <a href="{{ site.baseurl }}/resources/about/">{% t titles.about %}</a></p>
-                    </div>
-                </div>
                 <div class="tab" id="anchor-btc-difference">
                     <h3><a class="anchor" href="#anchor-btc-difference"></a>{% t faq.q7 %}</h3>
                     <div class="tab-answer">
                         <p>{% t faq.a7 %}</p>
                     </div>
                 </div>
-                <div class="tab" id="asic-resistance">
-                    <h3><a class="anchor" href="#asic-resistance"></a>{% t faq.qasicresistance %}</h3>
-                    <div class="tab-answer">
-                        <p>{% t faq.aasicresistance %}</p>
-                        <p>{% t faq.aasicresistance1 %}</p>
-                        <p>{% t faq.aasicresistance2 %}</p>
-                    </div>
-                </div>
-                <div class="tab" id="anchor-fungibility">
-                    <h3><a class="anchor" href="#anchor-fungibility"></a>{% t faq.q11 %}</h3>
-                    <div class="tab-answer">
-                        <p>{% t faq.a11 %}</p>
-                    </div>
-                </div>
-                <div class="tab" id="anchor-magic">
-                    <h3><a class="anchor" href="#anchor-magic"></a>{% t faq.q13 %}</h3>
-                    <div class="tab-answer">
-                        <p>{% t faq.a13 %}</p>
-                    </div>
-                </div>
-                <div class="tab" id="anchor-anonymous">
-                    <h3><a class="anchor" href="#anchor-anonymous"></a>{% t faq.q14 %}</h3>
-                    <div class="tab-answer">
-                        <p>{% t faq.a14 %}</p>
-                    </div>
-                </div>
-                <div class="tab" id="vulnerabilities">
-                    <h3><a class="anchor" href="#vulnerabilities"></a>{% t faq.qvuln %}</h3>
-                    <div class="tab-answer">
-                        <p>{% t faq.avuln %}</p>
-                        <p>{% t faq.additional %} <a href="https://open.spotify.com/episode/77xsCeuy02Aztv0bgs3Drt?si=hyIGHD5TQjyV44b46fkhoQ&dl_branch=1">{% t faq.vulnspotify %}</a></p>
-                    </div>
-                </div>
-                <div class="tab" id="antivirus">
-                    <h3><a class="anchor" href="#antivirus"></a>{% t faq.qantivirus %}</h3>
-                    <div class="tab-answer">
-                        <p>{% t faq.aantivirus %}</p>
-                        <p>{% t faq.aantivirus1 %}</p>
-                        <p>{% t faq.additional %} <a href="{{ site.baseurl }}/resources/user-guides/verification-windows-beginner.html">{% t user-guides.verify-windows %}</a>, <a href="{{ site.baseurl }}/resources/user-guides/verification-allos-advanced.html">{% t user-guides.verify-allos %}</a></p>
-                    </div>
-                </div>
                 <div class="tab" id="monero-meaning">
                     <h3><a class="anchor" href="#monero-meaning"></a>{% t faq.qmoneromeaning %}</h3>
                     <div class="tab-answer">
@@ -211,25 +166,6 @@ meta_descr: faq.intro
                         </ol>
                     </div>
                 </div>
-                <div class="row center-xs">
-                    <!-- 'Advanced' section-->
-                    <div class="col"><h2>{% t faq.advanced %}</h2></div>
-                </div>
-                <div class="tab" id="anchor-thin-air">
-                    <h3><a class="anchor" href="#anchor-thin-air"></a>{% t faq.q12 %}</h3>
-                    <div class="tab-answer">
-                        <p>{% t faq.a12-1 %}</p>
-                        <p>{% t faq.a12-2 %}</p>
-                        <p>{% t faq.a12-3 %}</p>
-                        <p>{% t faq.additional %} <a href="{{ site.baseurl_root }}/2020/01/17/auditability.html">About supply auditability</a></p>
-                    </div>
-                </div>
-                <div class="tab" id="anchor-light-normal">
-                    <h3><a class="anchor" href="#anchor-light-normal"></a>{% t faq.q6 %}</h3>
-                    <div class="tab-answer">
-                        <p>{% t faq.a6 %}</p>
-                    </div>
-                </div>
                 <div class="tab" id="anchor-block-limit">
                     <h3><a class="anchor" href="#anchor-block-limit"></a>{% t faq.q8 %}</h3>
                     <div class="tab-answer">
@@ -242,11 +178,79 @@ meta_descr: faq.intro
                         <p>{% t faq.a15 %}</p>
                     </div>
                 </div>
-                <div class="tab" id="import-blockchain">
-                    <h3><a class="anchor" href="#import-blockchain"></a>{% t faq.qimporting %}</h3>
+                <div class="row center-xs">
+                    <!-- 'Privacy' section-->
+                    <div class="col"><h2>{% t faq.privacy %}</h2></div>
+                </div>
+                <div class="tab" id="anchor-different">
+                    <h3><a class="anchor" href="#anchor-different"></a>{% t faq.q4 %}</h3>
+                    <div class="tab-answer" id="anchor-different">
+                        <p>{% t faq.a4 %}</p>
+                        <p>{% t faq.additional %} <a href="{{ site.baseurl }}/resources/about/">{% t titles.about %}</a></p>
+                    </div>
+                </div>
+                <div class="tab" id="anchor-magic">
+                    <h3><a class="anchor" href="#anchor-magic"></a>{% t faq.q13 %}</h3>
                     <div class="tab-answer">
-                        <p>{% t faq.aimporting %}</p>
-                         <p>{% t faq.additional %} <a href="{{ site.baseurl }}/downloads/#blockchain">{% t downloads.blockchain %}</a></p>
+                        <p>{% t faq.a13 %}</p>
+                    </div>
+                </div>
+                <div class="tab" id="anchor-anonymous">
+                    <h3><a class="anchor" href="#anchor-anonymous"></a>{% t faq.q14 %}</h3>
+                    <div class="tab-answer">
+                        <p>{% t faq.a14 %}</p>
+                    </div>
+                </div>
+                <div class="row center-xs">
+                    <!-- 'Security' section-->
+                    <div class="col"><h2>{% t faq.security %}</h2></div>
+                </div>
+                <div class="tab" id="asic-resistance">
+                    <h3><a class="anchor" href="#asic-resistance"></a>{% t faq.qasicresistance %}</h3>
+                    <div class="tab-answer">
+                        <p>{% t faq.aasicresistance %}</p>
+                        <p>{% t faq.aasicresistance1 %}</p>
+                        <p>{% t faq.aasicresistance2 %}</p>
+                    </div>
+                </div>
+                <div class="tab" id="vulnerabilities">
+                    <h3><a class="anchor" href="#vulnerabilities"></a>{% t faq.qvuln %}</h3>
+                    <div class="tab-answer">
+                        <p>{% t faq.avuln %}</p>
+                        <p>{% t faq.additional %} <a href="https://open.spotify.com/episode/77xsCeuy02Aztv0bgs3Drt?si=hyIGHD5TQjyV44b46fkhoQ&dl_branch=1">{% t faq.vulnspotify %}</a></p>
+                    </div>
+                </div>
+                <div class="tab" id="antivirus">
+                    <h3><a class="anchor" href="#antivirus"></a>{% t faq.qantivirus %}</h3>
+                    <div class="tab-answer">
+                        <p>{% t faq.aantivirus %}</p>
+                        <p>{% t faq.aantivirus1 %}</p>
+                        <p>{% t faq.additional %} <a href="{{ site.baseurl }}/resources/user-guides/verification-windows-beginner.html">{% t user-guides.verify-windows %}</a>, <a href="{{ site.baseurl }}/resources/user-guides/verification-allos-advanced.html">{% t user-guides.verify-allos %}</a></p>
+                    </div>
+                </div>
+                <div class="row center-xs">
+                    <!-- 'Economics' section-->
+                    <div class="col"><h2>{% t faq.economics %}</h2></div>
+                </div>
+                <div class="tab" id="anchor-value">
+                    <h3><a class="anchor" href="#anchor-value"></a>{% t faq.q1 %}</h3>
+                    <div class="tab-answer">
+                        <p>{% t faq.a1 %}</p>
+                    </div>
+                </div>
+                <div class="tab" id="anchor-fungibility">
+                    <h3><a class="anchor" href="#anchor-fungibility"></a>{% t faq.q11 %}</h3>
+                    <div class="tab-answer">
+                        <p>{% t faq.a11 %}</p>
+                    </div>
+                </div>
+                <div class="tab" id="anchor-thin-air">
+                    <h3><a class="anchor" href="#anchor-thin-air"></a>{% t faq.q12 %}</h3>
+                    <div class="tab-answer">
+                        <p>{% t faq.a12-1 %}</p>
+                        <p>{% t faq.a12-2 %}</p>
+                        <p>{% t faq.a12-3 %}</p>
+                        <p>{% t faq.additional %} <a href="{{ site.baseurl_root }}/2020/01/17/auditability.html">About supply auditability</a></p>
                     </div>
                 </div>
                 <div class="tab" id="max-supply">
@@ -263,8 +267,14 @@ meta_descr: faq.intro
                     </div>
                 </div>
                 <div class="row center-xs">
-                    <!-- 'Node and Wallet' section-->
-                    <div class="col"><h2>{% t faq.nodeandwallet %}</h2></div>
+                    <!-- 'Wallets' section-->
+                    <div class="col"><h2>{% t faq.wallets %}</h2></div>
+                </div>
+                <div class="tab" id="anchor-light-normal">
+                    <h3><a class="anchor" href="#anchor-light-normal"></a>{% t faq.q6 %}</h3>
+                    <div class="tab-answer">
+                        <p>{% t faq.a6 %}</p>
+                    </div>
                 </div>
                 <div class="tab" id="anchor-wallet">
                     <h3><a class="anchor" href="#anchor-wallet"></a>{% t faq.qwallet %}</h3>
@@ -285,6 +295,29 @@ meta_descr: faq.intro
                         <p>{% t faq.alongtimemove %}</p>
                     </div>
                 </div>
+                <div class="tab" id="anchor-long-sync">
+                    <h3><a class="anchor" href="#anchor-long-sync"></a>{% t faq.q5 %}</h3>
+                    <div class="tab-answer">
+                        <p>{% t faq.a5 %}</p>
+                    </div>
+                </div>
+                <div class="tab" id="anchor-scanned-wallet">
+                    <h3><a class="anchor" href="#anchor-scanned-wallet"></a>{% t faq.qscanned %}</h3>
+                    <div class="tab-answer">
+                        <p>{% t faq.ascanned %}</p>
+                    </div>
+                </div>
+                <div class="row center-xs">
+                    <!-- 'Node' section-->
+                    <div class="col"><h2>{% t faq.node %}</h2></div>
+                </div>
+                <div class="tab" id="import-blockchain">
+                    <h3><a class="anchor" href="#import-blockchain"></a>{% t faq.qimporting %}</h3>
+                    <div class="tab-answer">
+                        <p>{% t faq.aimporting %}</p>
+                         <p>{% t faq.additional %} <a href="{{ site.baseurl }}/downloads/#blockchain">{% t downloads.blockchain %}</a></p>
+                    </div>
+                </div>
                 <div class="tab" id="anchor-tor-node">
                     <h3><a class="anchor" href="#anchor-tor-node"></a>{% t faq.qnodetor %}</h3>
                     <div class="tab-answer">
@@ -292,12 +325,6 @@ meta_descr: faq.intro
                         <p>{% t faq.additional %} <a href="{{ site.baseurl }}/resources/user-guides/tor_wallet.html">{% t user-guides.tor_wallet %}</a></p>
                     </div>
                 </div>
-                <div class="tab" id="anchor-long-sync">
-                    <h3><a class="anchor" href="#anchor-long-sync"></a>{% t faq.q5 %}</h3>
-                    <div class="tab-answer">
-                        <p>{% t faq.a5 %}</p>
-                    </div>
-                </div>
                 <div class="tab" id="anchor-full-pruned">
                     <h3><a class="anchor" href="#anchor-full-pruned"></a>{% t faq.qfullpruned %}</h3>
                     <div class="tab-answer">
@@ -323,12 +350,6 @@ meta_descr: faq.intro
                         <p>{% t faq.additional %} <a href="{{ site.baseurl }}/resources/user-guides/remote_node_gui.html">{% t user-guides.remote-node-gui %}</a></p>
                     </div>
                 </div>
-                <div class="tab" id="anchor-scanned-wallet">
-                    <h3><a class="anchor" href="#anchor-scanned-wallet"></a>{% t faq.qscanned %}</h3>
-                    <div class="tab-answer">
-                        <p>{% t faq.ascanned %}</p>
-                    </div>
-                </div>
                 <div class="tab" id="anchor-danger-node">
                     <h3><a class="anchor" href="#anchor-danger-node"></a>{% t faq.qdangernode %}</h3>
                     <div class="tab-answer">