diff --git a/BTCPayServer/Components/MainNav/Default.cshtml b/BTCPayServer/Components/MainNav/Default.cshtml
index 8e01bf333..ea809535f 100644
--- a/BTCPayServer/Components/MainNav/Default.cshtml
+++ b/BTCPayServer/Components/MainNav/Default.cshtml
@@ -7,6 +7,7 @@
 @using BTCPayServer.Views.Wallets
 @using BTCPayServer.Abstractions.Extensions
 @using BTCPayServer.Abstractions.Contracts
+@using BTCPayServer.Client
 @inject BTCPayServer.Services.BTCPayServerEnvironment Env
 @inject SignInManager<ApplicationUser> SignInManager
 @inject ISettingsRepository SettingsRepository
@@ -51,7 +52,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="accordion-item">
+                <div class="accordion-item" permission="@Policies.CanModifyServerSettings">
                     <header class="accordion-header" id="Nav-Plugins-Header">
                         <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#Nav-Plugins" aria-expanded="true" aria-controls="Nav-Plugins">
                             Plugins
@@ -76,7 +77,7 @@
             }
             else
             {
-                <div class="accordion-item">
+                <div class="accordion-item" permission="@Policies.CanModifyStoreSettings">
                     <div class="accordion-body">
                         <ul class="navbar-nav">
                             @foreach (var scheme in Model.DerivationSchemes.OrderBy(scheme => scheme.Collapsed))
@@ -138,7 +139,7 @@
                                     var isSetUp = !string.IsNullOrWhiteSpace(scheme.Value);
                                     if (isSetUp && scheme.WalletSupported)
                                     {
-                                        <li class="nav-item">
+                                        <li class="nav-item" permission="@Policies.CanModifyStoreSettings">
                                             <a asp-area="" asp-controller="Wallets" asp-action="WalletTransactions" asp-route-walletId="@scheme.WalletId" class="nav-link js-scroll-trigger @ViewData.IsActiveCategory(typeof(WalletsNavPages), scheme.Crypto)" id="@($"StoreNav-Wallet{scheme.Crypto}")">
                                                 <vc:icon symbol="wallet-onchain"/>
                                                 <span>@(Model.AltcoinsBuild ? $"{scheme.Crypto} " : "")Wallet</span>
@@ -146,13 +147,13 @@
                                         </li>
                                     }
                                 }
-                                <li class="nav-item">
+                                <li class="nav-item" permission="@Policies.CanModifyStoreSettings">
                                     <a asp-area="" asp-controller="Invoice" asp-action="ListInvoices" asp-route-storeId="@Model.Store.Id" class="nav-link js-scroll-trigger @ViewData.IsActiveCategory(typeof(InvoiceNavPages))" id="StoreNav-Invoices">
                                         <vc:icon symbol="invoice"/>
                                         <span>Invoices</span>
                                     </a>
                                 </li>
-                                <li class="nav-item">
+                                <li class="nav-item" permission="@Policies.CanModifyStoreSettings">
                                     <a asp-area="" asp-controller="PaymentRequest" asp-action="GetPaymentRequests" asp-route-storeId="@Model.Store.Id" class="nav-link js-scroll-trigger @ViewData.IsActiveCategory(typeof(PaymentRequestsNavPages))" id="StoreNav-PaymentRequests">
                                         <vc:icon symbol="payment-1"/>
                                         <span>Requests</span>
@@ -174,7 +175,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="accordion-item">
+                <div class="accordion-item" permission="@Policies.CanModifyStoreSettings">
                     <header class="accordion-header" id="Nav-Apps-Header">
                         <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#Nav-Apps" aria-expanded="true" aria-controls="Nav-Apps">
                             Apps
@@ -203,7 +204,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="accordion-item">
+                <div class="accordion-item" permission="@Policies.CanModifyStoreSettings">
                     <header class="accordion-header" id="Nav-Manage-Header">
                         <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#Nav-Manage" aria-expanded="true" aria-controls="Nav-Manage">
                             Manage
@@ -254,15 +255,12 @@
         }
     </div>
     <ul id="mainNavSettings" class="navbar-nav border-top p-3 px-lg-4">
-        @if (User.IsInRole(Roles.ServerAdmin))
-        {
-            <li class="nav-item">
-                <a asp-area="" asp-controller="Server" asp-action="ListUsers" class="nav-link js-scroll-trigger @ViewData.IsActiveCategory(typeof(ServerNavPages))" id="Nav-ServerSettings">
-                    <vc:icon symbol="server-settings"/>
-                    <span>Server Settings</span>
-                </a>
-            </li>
-        }
+        <li class="nav-item" permission="@Policies.CanModifyServerSettings">
+            <a asp-area="" asp-controller="Server" asp-action="ListUsers" class="nav-link js-scroll-trigger @ViewData.IsActiveCategory(typeof(ServerNavPages))" id="Nav-ServerSettings">
+                <vc:icon symbol="server-settings"/>
+                <span>Server Settings</span>
+            </a>
+        </li>
         <li class="nav-item">
             <a asp-area="" asp-controller="Manage" asp-action="Index" class="nav-link js-scroll-trigger @ViewData.IsActiveCategory(typeof(ManageNavPages))" id="Nav-Account">
                 <vc:icon symbol="account"/>
diff --git a/BTCPayServer/Views/StorePullPayments/Payouts.cshtml b/BTCPayServer/Views/StorePullPayments/Payouts.cshtml
index 8724064cd..ec1841f96 100644
--- a/BTCPayServer/Views/StorePullPayments/Payouts.cshtml
+++ b/BTCPayServer/Views/StorePullPayments/Payouts.cshtml
@@ -89,9 +89,9 @@
             </ul>
            
         </div>
-        @if (Model.Payouts.Any() && stateActions.Any() )
+        @if (Model.Payouts.Any() && stateActions.Any())
         {
-            <div class="col-12" permission="@Policies.CanModifyStoreSettings" >
+            <div class="col-12" permission="@Policies.CanModifyStoreSettings">
                 <div class="dropdown  mt-4 ms-xl-auto mt-xl-0">
                                 <button class="btn btn-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" id="@Model.PayoutState-actions">
                                     Actions
@@ -115,7 +115,7 @@
                 <table class="table table-hover table-responsive-lg">
                     <thead class="thead-inverse">
                     <tr>
-                        <th permission="@Policies.CanModifyStoreSettings" >
+                        <th permission="@Policies.CanModifyStoreSettings">
                             <input id="@Model.PayoutState-selectAllCheckbox" type="checkbox" class="form-check-input selectAll" data-payout-state="@Model.PayoutState.ToString()" />
                         </th>
                         <th style="min-width: 90px;" class="col-md-auto">
@@ -135,7 +135,7 @@
                     {
                         var pp = Model.Payouts[i];
                         <tr class="payout">
-                            <td permission="@Policies.CanModifyStoreSettings" >
+                            <td permission="@Policies.CanModifyStoreSettings">
                                 <span>
                                     <input type="checkbox" class="selection-item-@Model.PayoutState.ToString() form-check-input" asp-for="Payouts[i].Selected"/>
                                     <input type="hidden" asp-for="Payouts[i].PayoutId"/>
diff --git a/BTCPayServer/Views/StorePullPayments/PullPayments.cshtml b/BTCPayServer/Views/StorePullPayments/PullPayments.cshtml
index 5612b3022..865464352 100644
--- a/BTCPayServer/Views/StorePullPayments/PullPayments.cshtml
+++ b/BTCPayServer/Views/StorePullPayments/PullPayments.cshtml
@@ -114,13 +114,13 @@
                                asp-route-pullPaymentId="@pp.Id">
                                 View
                             </a> -
-                            <a class="pp-payout" 
-                               
+                            <a class="pp-payout"
                                asp-action="Payouts"
                                asp-route-storeId="@Context.GetRouteValue("storeId")"
                                asp-route-pullPaymentId="@pp.Id">
                                 Payouts
                             </a>
+                            <span permission="@Policies.CanModifyStoreSettings"> - </span>
                             <a asp-action="ArchivePullPayment"
                                permission="@Policies.CanModifyStoreSettings" 
                                asp-route-storeId="@Context.GetRouteValue("storeId")"