diff --git a/_includes/actions.html b/_includes/actions.html
index 7a4535b6..d0e29a78 100644
--- a/_includes/actions.html
+++ b/_includes/actions.html
@@ -30,24 +30,22 @@
 #}
 {% set actionsSocialSites = ["https://scangov.com", "https://scangov.org", "https://docs.scangov.org", "https://standards.scangov.org", "https://data.scangov.org"] %}
 {% set actionsEmailSites = ["https://scangov.com", "https://scangov.org", "https://standards.scangov.org", "https://docs.scangov.org", "https://data.scangov.org"] %}
-<ul class="actions list-group list-group-horizontal-sm gap-2 mt-3 mb-3 pb-3 border-bottom">
-    <li id="rescan-action" class="list-group-item d-none">
-        <a href="https://scangov.com" aria-label="Rescan" title="Rescan">
-            <i class="fa-solid fa-arrows-rotate"></i>
-        </a>
-    </li>
+<div class="actions d-flex flex-wrap gap-2 mt-3 mb-3 pb-3 border-bottom">
+    <a href="https://scangov.com" id="rescan-action" class="btn btn-outline-primary btn-sm d-none" aria-label="Rescan" title="Rescan">
+        <i class="fa-solid fa-arrows-rotate" aria-hidden="true"></i>
+    </a>
     {% if profile and not mapPage and not orgPage %}
-    <li class="list-group-item dropdown">
-        <a
-            href="#"
+    <div class="dropdown">
+        <button
+            type="button"
             id="download-menu"
-            role="button"
+            class="btn btn-outline-primary btn-sm"
             data-bs-toggle="dropdown"
             aria-expanded="false"
             aria-label="Download"
             title="Download">
-            <i class="fa-solid fa-download"></i>
-        </a>
+            <i class="fa-solid fa-download" aria-hidden="true"></i>
+        </button>
         <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="download-menu">
             <li class="small">
                 <a href="/profile/{{ domain.urlkey | slugify }}/report/" class="dropdown-item">
@@ -56,19 +54,19 @@
                 </a>
             </li>
         </ul>
-    </li>
+    </div>
     {% endif %}
-    <li class="list-group-item dropdown">
-        <a
-            href="#"
+    <div class="dropdown">
+        <button
+            type="button"
             id="share-menu"
-            role="button"
+            class="btn btn-outline-primary btn-sm"
             data-bs-toggle="dropdown"
             aria-expanded="false"
             aria-label="Share"
             title="Share">
-            <i class="fa-solid fa-share-from-square"></i>
-        </a>
+            <i class="fa-solid fa-share-from-square" aria-hidden="true"></i>
+        </button>
         <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="share-menu">
             {% if profile and not mapPage and not orgPage %}
             <li class="small">
@@ -143,8 +141,8 @@
             </li>
             {% endif %}
         </ul>
-    </li>
-</ul>
+    </div>
+</div>
 <div class="alert alert-success d-none mt-2" role="alert" id="copy-alert">
     Link copied!
 </div>
diff --git a/_includes/cta.html b/_includes/cta.html
index 3d0e20f3..69f2d088 100644
--- a/_includes/cta.html
+++ b/_includes/cta.html
@@ -23,36 +23,17 @@
     margin-top: 0;
     margin-bottom: 0;
   }
-
-  /* The crown has its own icon color rules (gold in dark mode, body color in
-     light mode); inside the primary button it should match the button text,
-     like the rocket in the hero */
-  .cta-band .btn.btn-primary svg.fa-crown,
-  .cta-band .btn.btn-primary i.fa-crown {
-    color: inherit !important;
-    fill: currentColor !important;
-  }
-
-  /* Some icons (the link icon, for one) keep a fixed color on hover in light
-     mode; inside the outline buttons they should follow the button text */
-  .cta-band .btn.btn-outline-primary:hover svg,
-  .cta-band .btn.btn-outline-primary:focus svg,
-  .cta-band .btn.btn-outline-primary:hover i,
-  .cta-band .btn.btn-outline-primary:focus i {
-    color: inherit !important;
-    fill: currentColor !important;
-  }
 </style>
 <div id="cta-band" class="cta-band border-top" role="region" aria-label="Get ScanGov, see the demo, and share this page">
   <div class="container d-flex align-items-center justify-content-center gap-2">
     <a href="https://scangov.com/plans/" class="btn btn-primary" aria-label="Plans">
-      <i class="fa-solid fa-crown" aria-hidden="true"></i><span class="d-none d-md-inline ms-2">Plans</span></a>
+      <i class="fa-solid fa-crown" aria-hidden="true"></i><span class="d-none d-md-inline">Plans</span></a>
     <a href="https://scangov.com/demo/" class="btn btn-outline-primary" aria-label="Demo">
-      <i class="fa-solid fa-wand-magic-sparkles" aria-hidden="true"></i><span class="d-none d-md-inline ms-2">Demo</span></a>
+      <i class="fa-solid fa-wand-magic-sparkles" aria-hidden="true"></i><span class="d-none d-md-inline">Demo</span></a>
     <button type="button" class="btn btn-outline-primary" id="cta-copy-link" aria-label="Copy link">
-      <i class="fa-solid fa-link" aria-hidden="true"></i><i class="fa-solid fa-check d-none" aria-hidden="true"></i><span class="d-none d-md-inline ms-2">Link</span></button>
+      <i class="fa-solid fa-link" aria-hidden="true"></i><i class="fa-solid fa-check d-none" aria-hidden="true"></i><span class="d-none d-md-inline">Link</span></button>
     <button type="button" class="btn btn-outline-primary" id="cta-copy-text" aria-label="Copy text">
-      <i class="fa-solid fa-copy" aria-hidden="true"></i><i class="fa-solid fa-check d-none" aria-hidden="true"></i><span class="d-none d-md-inline ms-2">Text</span></button>
+      <i class="fa-solid fa-copy" aria-hidden="true"></i><i class="fa-solid fa-check d-none" aria-hidden="true"></i><span class="d-none d-md-inline">Text</span></button>
     <span class="visually-hidden" role="status" aria-live="polite" id="cta-copy-status"></span>
   </div>
 </div>
diff --git a/_includes/feedback.html b/_includes/feedback.html
index 99574aab..0e73e718 100644
--- a/_includes/feedback.html
+++ b/_includes/feedback.html
@@ -1,7 +1,7 @@
 <a
   href="https://scangov.com/plans"
   id="feedback-button"
-  class="feedback btn btn-sm"
+  class="feedback btn btn-outline-primary btn-sm"
   aria-hidden="true"
   tabindex="-1">
   <i class="fa-solid fa-rocket"></i> Get ScanGov
diff --git a/public/css/scangov.css b/public/css/scangov.css
index f8692680..33c0fc97 100644
--- a/public/css/scangov.css
+++ b/public/css/scangov.css
@@ -714,67 +714,76 @@ a:hover {
     color: var(--bs-link-hover-color);
 }
 
-.btn-primary,
-.btn-primary:visited {
-    background-color: var(--bs-primary) !important;
-    color: var(--bs-primary-text) !important;
-    border-radius: var(--bs-border-radius);
-    border: 1px solid var(--bs-primary) !important;
+/* Buttons: two styles (see the buttons skill in ScanGov/skills and
+   public/templates/buttons.html).
+     Primary   .btn.btn-primary          the one main action on a view
+     Secondary .btn.btn-outline-primary  everything else
+   Size is default; .btn-sm only inside a table row or a toolbar.
+   Colors come from Bootstrap's --bs-btn-* variables, so the border, the label
+   and the icon change together in every state (rest, hover, focus, active,
+   disabled) and in both themes. */
+
+.btn {
+    --bs-btn-padding-x: 0.875rem;
+    --bs-btn-padding-y: 0.5rem;
+    --bs-btn-border-width: 1px;
+    --bs-btn-border-radius: var(--bs-border-radius);
+    --bs-btn-font-family: var(--bs-font-sans-serif);
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    gap: 0.5rem;
+    border-style: solid;
+    border-width: 1px;
     box-shadow: var(--bs-shadow);
     cursor: pointer;
-    font-family: var(--bs-font-bold);
-    padding: 0.5rem 0.875rem;
-    transition: filter 0.25s ease, box-shadow 0.25s ease;
-}
-
-.btn-primary.btn-lg {
-    padding: 0.625rem 1.25rem;
+    text-decoration: none;
+    transition: filter 0.25s ease, box-shadow 0.25s ease, background-color 0.25s ease, color 0.25s ease, border-color 0.25s ease;
 }
 
-.btn-primary.btn-sm {
-    padding: 0.3rem 0.6rem;
+.btn-sm {
+    --bs-btn-padding-x: 0.6rem;
+    --bs-btn-padding-y: 0.3rem;
 }
 
-a.btn-primary-outline,
-button.btn-primary-outline {
-    background-color: var(--bs-body-bg);
-    color: var(--bs-body-color);
-    border-radius: var(--bs-border-radius-sm);
-    border: 1px solid var(--bs-border-color);
-    box-shadow: var(--bs-shadow);
-    cursor: pointer;
-    font-family: var(--bs-font-sans-serif);
-    padding: 0.5rem 0.875rem;
-    transition: filter 0.25s ease, box-shadow 0.25s ease;
+.btn:hover,
+.btn:focus-visible,
+.btn:active {
+    box-shadow: var(--bs-box-shadow-md);
 }
 
-a.btn-secondary-outline,
-button.btn-secondary-outline {
-    background-color: var(--bs-body-bg);
-    color: var(--bs-body-color);
-    border-radius: var(--bs-border-radius-sm);
-    border: 1px solid var(--bs-border-color);
-    box-shadow: var(--bs-shadow);
-    cursor: pointer;
-    font-family: var(--bs-font-sans-serif);
-    padding: 0.5rem 0.875rem;
-    transition: filter 0.25s ease, box-shadow 0.25s ease, background-color 0.25s ease, color 0.25s ease;
+.btn:focus-visible {
+    outline: 2px solid var(--bs-link-color);
+    outline-offset: 2px;
 }
 
-.btn-secondary-outline.btn-sm {
-    padding: 0.3rem 0.6rem;
+/* Primary: brand fill and border; hover brightens and lifts, the fill stays */
+.btn-primary {
+    --bs-btn-color: var(--bs-primary-text);
+    --bs-btn-bg: var(--bs-primary);
+    --bs-btn-border-color: var(--bs-primary);
+    --bs-btn-hover-color: var(--bs-primary-text);
+    --bs-btn-hover-bg: var(--bs-primary);
+    --bs-btn-hover-border-color: var(--bs-primary);
+    --bs-btn-active-color: var(--bs-primary-text);
+    --bs-btn-active-bg: var(--bs-primary);
+    --bs-btn-active-border-color: var(--bs-primary);
+    --bs-btn-disabled-color: var(--bs-primary-text);
+    --bs-btn-disabled-bg: var(--bs-primary);
+    --bs-btn-disabled-border-color: var(--bs-primary);
 }
 
-.btn-secondary-outline:hover,
-.btn-secondary-outline:focus,
-.btn-secondary-outline:active {
-    background-color: var(--bs-secondary) !important;
-    color: var(--bs-body-bg) !important;
-    border-color: var(--bs-secondary) !important;
+.btn-primary:hover,
+.btn-primary:focus-visible,
+.btn-primary:active {
+    filter: brightness(1.3);
 }
 
-.btn.btn-outline-primary {
+/* Secondary: page fill and a quiet border; hover, focus and active invert the
+   fill and the border together */
+.btn-outline-primary {
     --bs-btn-color: var(--bs-body-color);
+    --bs-btn-bg: var(--bs-body-bg);
     --bs-btn-border-color: var(--bs-border-color);
     --bs-btn-hover-color: var(--bs-body-bg);
     --bs-btn-hover-bg: var(--bs-body-color);
@@ -782,68 +791,17 @@ button.btn-secondary-outline {
     --bs-btn-active-color: var(--bs-body-bg);
     --bs-btn-active-bg: var(--bs-body-color);
     --bs-btn-active-border-color: var(--bs-body-color);
-    box-shadow: var(--bs-shadow);
-    padding: 0.5rem 0.875rem;
-    transition: filter 0.25s ease, box-shadow 0.25s ease;
+    --bs-btn-disabled-color: var(--bs-body-color);
+    --bs-btn-disabled-bg: var(--bs-body-bg);
+    --bs-btn-disabled-border-color: var(--bs-border-color);
 }
 
-.btn.btn-outline-primary.btn-lg {
-    padding: 0.625rem 1.25rem;
-}
-
-.btn.btn-outline-primary.btn-sm {
-    padding: 0.3rem 0.6rem;
-}
-
-.btn.btn-outline-primary i,
-.btn.btn-outline-primary svg {
-    color: inherit !important;
-}
-
-.btn.btn-outline-primary .fa-sitemap {
-    color: #ffbc78 !important;
-}
-
-.btn.btn-outline-primary:hover .fa-sitemap,
-.btn.btn-outline-primary:focus .fa-sitemap {
-    color: inherit !important;
-}
-
-.btn.btn-outline-primary .fa-wand-sparkles {
-    color: #ffe396 !important;
-}
-
-.btn.btn-outline-primary:hover .fa-wand-sparkles,
-.btn.btn-outline-primary:focus .fa-wand-sparkles {
-    color: inherit !important;
-}
-
-.btn.btn-outline-primary .fa-file-lines {
-    color: #a8f2ff !important;
-}
-
-.btn.btn-outline-primary:hover .fa-file-lines,
-.btn.btn-outline-primary:focus .fa-file-lines {
-    color: inherit !important;
-}
-
-.btn.btn-outline-primary .fa-rocket {
-    color: #d0c3e9 !important;
-}
-
-.btn.btn-outline-primary:hover .fa-rocket,
-.btn.btn-outline-primary:focus .fa-rocket {
-    color: inherit !important;
-}
-
-/* fa-download shares a class name with the light-mode reset list further
-   down (for the <svg><use> sprite pattern), which has higher specificity
-   than the generic '.btn.btn-outline-primary i { color: inherit }' rule
-   above and so wins even inside a button, pinning the icon to
-   var(--bs-body-color) regardless of hover state. Scope this override to
-   light mode explicitly so it beats that rule's specificity. */
-[data-bs-theme=light] .btn.btn-outline-primary .fa-download {
+/* Icons always match the label in every state and theme. The selector is built
+   to out-rank the per-icon colors and the light-mode icon reset further down, so
+   no icon needs its own exception inside a button. */
+[data-bs-theme] .btn.btn :is(i, svg) {
     color: inherit !important;
+    fill: currentColor !important;
 }
 
 .btn[download] {
@@ -851,20 +809,17 @@ button.btn-secondary-outline {
     margin-bottom: 0.5rem;
 }
 
+/* Floating "Get ScanGov" button: position and visibility only; the look is the
+   secondary button (.btn.btn-outline-primary) */
 .feedback {
     opacity: 0;
     pointer-events: none;
     visibility: hidden;
-    background-color: var(--bs-body-bg) !important;
-    border: 1px solid var(--bs-border-color);
-    box-shadow: var(--bs-shadow);
-    cursor: pointer;
     position: fixed;
     bottom: 1rem;
     left: 50%;
     transform: translateX(-50%);
     z-index: 1000;
-    text-decoration: none;
     transition: opacity 0.25s ease, visibility 0.25s ease, filter 0.25s ease, box-shadow 0.25s ease;
 }
 
@@ -880,58 +835,6 @@ button.btn-secondary-outline {
     visibility: visible;
 }
 
-.btn-primary i, .btn-primary svg {
-    color: inherit !important;
-    transition: filter 0.25s ease;
-}
-
-.btn.feedback i, .btn.feedback svg {
-    color: var(--bs-primary) !important;
-    transition: filter 0.25s ease;
-}
-
-.btn-primary:hover, .btn-primary:focus, .btn-primary:active {
-    filter: brightness(1.3);
-    box-shadow: var(--bs-box-shadow-md);
-    background-color: var(--bs-primary) !important;
-    color: var(--bs-primary-text) !important;
-    border-color: var(--bs-primary) !important;
-}
-
-.feedback:hover, .feedback:focus, .feedback:active {
-    background-color: var(--bs-body-color) !important;
-    box-shadow: var(--bs-box-shadow-md);
-}
-
-[data-bs-theme="light"] .feedback {
-    background-color: var(--bs-body-color) !important;
-    color: var(--bs-body-bg) !important;
-}
-
-[data-bs-theme="light"] .feedback:hover,
-[data-bs-theme="light"] .feedback:focus,
-[data-bs-theme="light"] .feedback:active {
-    background-color: var(--bs-body-bg) !important;
-    color: var(--bs-body-color) !important;
-}
-
-.btn.feedback:hover i, .btn.feedback:hover svg,
-.btn.feedback:focus i, .btn.feedback:focus svg,
-.btn.feedback:active i, .btn.feedback:active svg {
-    color: var(--bs-btn-hover-color) !important;
-}
-
-.btn-primary-outline:not(.active):hover,
-.btn-primary-outline:not(.active):focus,
-.btn-primary-outline:not(.active):active,
-.btn-primary-outline.active {
-    filter: brightness(1.3);
-    box-shadow: var(--bs-box-shadow-md);
-    border: 1px solid var(--bs-border-color);
-    background-color: var(--bs-body-bg) !important;
-    color: var(--bs-body-color) !important;
-}
-
 @media (max-width: 767.98px) {
     .feedback {
         font-size: 0.875rem;
@@ -981,9 +884,7 @@ button.btn-secondary-outline {
     width: auto;
     flex-shrink: 0;
 }
-
-.nav-pills .nav-link:not(.active):hover,
-.nav-pills a.btn-primary-outline:not(.active):hover {
+.nav-pills .nav-link:not(.active):hover {
     background-color: var(--bs-primary) !important;
     color: var(--bs-primary-text) !important;
     border-color: var(--bs-primary) !important;
@@ -1009,22 +910,15 @@ button.btn-secondary-outline {
 /* Nav pills active — var(--bs-primary-text) on var(--bs-primary) (both themes) */
 .nav-pills .nav-link.active,
 .nav-pills .nav-link.active:focus,
-.nav-pills a.btn-primary-outline.active,
-.nav-pills a.btn-primary-outline.active:focus,
 [data-bs-theme=light] .nav-pills .nav-link.active,
-[data-bs-theme=light] .nav-pills .nav-link.active:focus,
-[data-bs-theme=light] .nav-pills a.btn-primary-outline.active,
-[data-bs-theme=light] .nav-pills a.btn-primary-outline.active:focus {
+[data-bs-theme=light] .nav-pills .nav-link.active:focus {
     background-color: var(--bs-primary) !important;
     color: var(--bs-primary-text) !important;
     border-color: var(--bs-primary) !important;
     box-shadow: var(--bs-shadow);
 }
-
 .nav-pills .nav-link.active:hover,
-.nav-pills a.btn-primary-outline.active:hover,
-[data-bs-theme=light] .nav-pills .nav-link.active:hover,
-[data-bs-theme=light] .nav-pills a.btn-primary-outline.active:hover {
+[data-bs-theme=light] .nav-pills .nav-link.active:hover {
     background-color: var(--bs-primary) !important;
     color: var(--bs-primary-text) !important;
     border-color: var(--bs-primary) !important;
@@ -1051,15 +945,10 @@ button.btn-secondary-outline {
 .nav-pills .fa-database {
     color: #a8f5d5 !important;
 }
-
 .nav-pills .nav-link.active i,
 .nav-pills .nav-link.active svg,
-.nav-pills a.btn-primary-outline.active i,
-.nav-pills a.btn-primary-outline.active svg,
 [data-bs-theme=light] .nav-pills .nav-link.active i,
-[data-bs-theme=light] .nav-pills .nav-link.active svg,
-[data-bs-theme=light] .nav-pills a.btn-primary-outline.active i,
-[data-bs-theme=light] .nav-pills a.btn-primary-outline.active svg {
+[data-bs-theme=light] .nav-pills .nav-link.active svg {
     color: var(--bs-primary-text) !important;
 }
 
@@ -1192,10 +1081,7 @@ button.btn-secondary-outline {
    (white in light mode), which still contrasts fine against black. */
 [data-bs-theme=light] .nav-pills .nav-link.active,
 [data-bs-theme=light] .nav-pills .nav-link.active:focus,
-[data-bs-theme=light] .nav-pills .nav-link.active:hover,
-[data-bs-theme=light] .nav-pills a.btn-primary-outline.active,
-[data-bs-theme=light] .nav-pills a.btn-primary-outline.active:focus,
-[data-bs-theme=light] .nav-pills a.btn-primary-outline.active:hover {
+[data-bs-theme=light] .nav-pills .nav-link.active:hover {
     background-color: var(--bs-body-color) !important;
     border-color: var(--bs-body-color) !important;
 }
@@ -1219,20 +1105,6 @@ button.btn-secondary-outline {
     border-color: var(--bs-body-color) !important;
 }
 
-/* Form submit buttons and the modal copy button - other .btn-primary uses (links
-   styled as buttons, feedback CTA, etc.) keep the brand blue. */
-[data-bs-theme=light] button[type="submit"].btn-primary,
-[data-bs-theme=light] button[type="submit"].btn-primary:hover,
-[data-bs-theme=light] button[type="submit"].btn-primary:focus,
-[data-bs-theme=light] button[type="submit"].btn-primary:active,
-[data-bs-theme=light] .btn-primary.js-copy,
-[data-bs-theme=light] .btn-primary.js-copy:hover,
-[data-bs-theme=light] .btn-primary.js-copy:focus,
-[data-bs-theme=light] .btn-primary.js-copy:active {
-    background-color: var(--bs-body-color) !important;
-    border-color: var(--bs-body-color) !important;
-}
-
 /* Per-icon colors (dark mode only) - explicitly theme-gated so light mode isn't
    beaten by this rule's specificity and falls through to the general
    .fa-solid:not([class*="text-"]) inherit rule instead. */
@@ -1372,41 +1244,7 @@ code.language-plaintext {
     padding: 0.1em 0.35em;
 }
 
-/* Page actions (Rescan / Download / Share) */
-
-.actions>li>a,
-.actions>li>button {
-    display: inline-flex;
-    align-items: center;
-    gap: 0.5rem;
-    padding: 0.65rem 0.9rem;
-    color: var(--bs-body-color);
-    text-decoration: none;
-    background: none;
-    border: none;
-    cursor: pointer;
-}
-
-.actions>li>a small,
-.actions>li>button small {
-    border-left: 1px solid var(--bs-border-color);
-    padding-left: 0.5rem;
-    align-self: stretch;
-    display: inline-flex;
-    align-items: center;
-}
-
-.actions>li>a:hover,
-.actions>li>a:focus,
-.actions>li>button:hover,
-.actions>li>button:focus {
-    color: var(--bs-link-color);
-}
-
-.actions .list-group-item:hover {
-    background-color: var(--bs-body-secondary-bg);
-}
-
+/* Page actions menus (Download / Share): the buttons are .btn.btn-outline-primary.btn-sm */
 .actions .dropdown-item {
     border-bottom: 1px solid var(--bs-border-color);
     padding-top: 0.5rem;
@@ -2885,16 +2723,6 @@ a .fa-up-right-from-square {
     fill: var(--bs-body-color) !important;
 }
 
-/* Icons inside a button follow the button's own text color when its background
-   changes (hover, focus, press). Without this the blanket light-mode icon rule above
-   keeps them body-colored, so they turn dark on a dark hover background. */
-[data-bs-theme=light] .btn:hover .fa-solid:not([class*="text-"]),
-[data-bs-theme=light] .btn:focus-visible .fa-solid:not([class*="text-"]),
-[data-bs-theme=light] .btn:active .fa-solid:not([class*="text-"]) {
-    color: var(--bs-btn-hover-color) !important;
-    fill: var(--bs-btn-hover-color) !important;
-}
-
 /* Status cards keep their own text color for icons in light mode too: the blanket
    light-mode icon rule above would otherwise turn an info icon black on a red card.
    The anchor selectors out-rank the "a:not(.btn):not(.active) .fa-solid" light-mode rule. */
@@ -3170,16 +2998,6 @@ th[aria-sort="descending"] .sort-desc {
     top: 1rem;
 }
 
-/* Actions list: separate boxes — restore left border + full radius on every item */
-.actions.list-group .list-group-item {
-    padding: 0;
-    border-radius: var(--bs-list-group-border-radius) !important;
-}
-
-.actions .list-group-item+.list-group-item {
-    border-left-width: var(--bs-list-group-border-width);
-}
-
 /* Card links: underline on hover only */
 .card a:not(.btn):not(.stretched-link) {
     text-decoration: none;
@@ -3385,11 +3203,6 @@ dialog.popoverstyling .modal-header .modal-title {
     margin-bottom: 0;
 }
 
-dialog.popoverstyling .modal-footer .btn {
-    padding: 0.375rem 0.75rem;
-    font-family: var(--bs-font-sans-serif);
-}
-
 dialog.popoverstyling .modal-body h3,
 dialog.popoverstyling .modal-body h4 {
     margin-top: 1.75rem;
@@ -3454,10 +3267,6 @@ dialog::backdrop { }
   background-color: #2672de !important;
 }
 
-[data-bs-theme=dark] button[type="submit"] {
-  min-width: 80px;
-}
-
 input[type="radio"],
 .form-check-input {
   border-color: #9ca3ab;
@@ -3496,24 +3305,6 @@ a.cardlink {
   max-width: 600px;
 }
 
-button.btn.btn-primary[disabled] {
-  background: none;
-}
-
-.nav-pills .nav-item a.btn-primary-outline:focus-visible {
-  color: var(--bs-btn-hover-color) !important;
-  background-color: var(--bs-nav-pills-link-active-bg);
-}
-
-.nav-pills .nav-item a.btn-primary-outline.active:focus-visible {
-  border-color: white;
-}
-
-.btn {
-  box-shadow: var(--bs-shadow);
-  text-wrap: nowrap;
-}
-
 td.padded-cell {
   padding: 1rem;
 }
diff --git a/scripts/bundle.css b/scripts/bundle.css
index 8e719634..b9eed517 100644
--- a/scripts/bundle.css
+++ b/scripts/bundle.css
@@ -929,67 +929,76 @@ a:hover {
     color: var(--bs-link-hover-color);
 }
 
-.btn-primary,
-.btn-primary:visited {
-    background-color: var(--bs-primary) !important;
-    color: var(--bs-primary-text) !important;
-    border-radius: var(--bs-border-radius);
-    border: 1px solid var(--bs-primary) !important;
+/* Buttons: two styles (see the buttons skill in ScanGov/skills and
+   public/templates/buttons.html).
+     Primary   .btn.btn-primary          the one main action on a view
+     Secondary .btn.btn-outline-primary  everything else
+   Size is default; .btn-sm only inside a table row or a toolbar.
+   Colors come from Bootstrap's --bs-btn-* variables, so the border, the label
+   and the icon change together in every state (rest, hover, focus, active,
+   disabled) and in both themes. */
+
+.btn {
+    --bs-btn-padding-x: 0.875rem;
+    --bs-btn-padding-y: 0.5rem;
+    --bs-btn-border-width: 1px;
+    --bs-btn-border-radius: var(--bs-border-radius);
+    --bs-btn-font-family: var(--bs-font-sans-serif);
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    gap: 0.5rem;
+    border-style: solid;
+    border-width: 1px;
     box-shadow: var(--bs-shadow);
     cursor: pointer;
-    font-family: var(--bs-font-bold);
-    padding: 0.5rem 0.875rem;
-    transition: filter 0.25s ease, box-shadow 0.25s ease;
-}
-
-.btn-primary.btn-lg {
-    padding: 0.625rem 1.25rem;
+    text-decoration: none;
+    transition: filter 0.25s ease, box-shadow 0.25s ease, background-color 0.25s ease, color 0.25s ease, border-color 0.25s ease;
 }
 
-.btn-primary.btn-sm {
-    padding: 0.3rem 0.6rem;
+.btn-sm {
+    --bs-btn-padding-x: 0.6rem;
+    --bs-btn-padding-y: 0.3rem;
 }
 
-a.btn-primary-outline,
-button.btn-primary-outline {
-    background-color: var(--bs-body-bg);
-    color: var(--bs-body-color);
-    border-radius: var(--bs-border-radius-sm);
-    border: 1px solid var(--bs-border-color);
-    box-shadow: var(--bs-shadow);
-    cursor: pointer;
-    font-family: var(--bs-font-sans-serif);
-    padding: 0.5rem 0.875rem;
-    transition: filter 0.25s ease, box-shadow 0.25s ease;
+.btn:hover,
+.btn:focus-visible,
+.btn:active {
+    box-shadow: var(--bs-box-shadow-md);
 }
 
-a.btn-secondary-outline,
-button.btn-secondary-outline {
-    background-color: var(--bs-body-bg);
-    color: var(--bs-body-color);
-    border-radius: var(--bs-border-radius-sm);
-    border: 1px solid var(--bs-border-color);
-    box-shadow: var(--bs-shadow);
-    cursor: pointer;
-    font-family: var(--bs-font-sans-serif);
-    padding: 0.5rem 0.875rem;
-    transition: filter 0.25s ease, box-shadow 0.25s ease, background-color 0.25s ease, color 0.25s ease;
+.btn:focus-visible {
+    outline: 2px solid var(--bs-link-color);
+    outline-offset: 2px;
 }
 
-.btn-secondary-outline.btn-sm {
-    padding: 0.3rem 0.6rem;
+/* Primary: brand fill and border; hover brightens and lifts, the fill stays */
+.btn-primary {
+    --bs-btn-color: var(--bs-primary-text);
+    --bs-btn-bg: var(--bs-primary);
+    --bs-btn-border-color: var(--bs-primary);
+    --bs-btn-hover-color: var(--bs-primary-text);
+    --bs-btn-hover-bg: var(--bs-primary);
+    --bs-btn-hover-border-color: var(--bs-primary);
+    --bs-btn-active-color: var(--bs-primary-text);
+    --bs-btn-active-bg: var(--bs-primary);
+    --bs-btn-active-border-color: var(--bs-primary);
+    --bs-btn-disabled-color: var(--bs-primary-text);
+    --bs-btn-disabled-bg: var(--bs-primary);
+    --bs-btn-disabled-border-color: var(--bs-primary);
 }
 
-.btn-secondary-outline:hover,
-.btn-secondary-outline:focus,
-.btn-secondary-outline:active {
-    background-color: var(--bs-secondary) !important;
-    color: var(--bs-body-bg) !important;
-    border-color: var(--bs-secondary) !important;
+.btn-primary:hover,
+.btn-primary:focus-visible,
+.btn-primary:active {
+    filter: brightness(1.3);
 }
 
-.btn.btn-outline-primary {
+/* Secondary: page fill and a quiet border; hover, focus and active invert the
+   fill and the border together */
+.btn-outline-primary {
     --bs-btn-color: var(--bs-body-color);
+    --bs-btn-bg: var(--bs-body-bg);
     --bs-btn-border-color: var(--bs-border-color);
     --bs-btn-hover-color: var(--bs-body-bg);
     --bs-btn-hover-bg: var(--bs-body-color);
@@ -997,68 +1006,17 @@ button.btn-secondary-outline {
     --bs-btn-active-color: var(--bs-body-bg);
     --bs-btn-active-bg: var(--bs-body-color);
     --bs-btn-active-border-color: var(--bs-body-color);
-    box-shadow: var(--bs-shadow);
-    padding: 0.5rem 0.875rem;
-    transition: filter 0.25s ease, box-shadow 0.25s ease;
-}
-
-.btn.btn-outline-primary.btn-lg {
-    padding: 0.625rem 1.25rem;
-}
-
-.btn.btn-outline-primary.btn-sm {
-    padding: 0.3rem 0.6rem;
-}
-
-.btn.btn-outline-primary i,
-.btn.btn-outline-primary svg {
-    color: inherit !important;
-}
-
-.btn.btn-outline-primary .fa-sitemap {
-    color: #ffbc78 !important;
-}
-
-.btn.btn-outline-primary:hover .fa-sitemap,
-.btn.btn-outline-primary:focus .fa-sitemap {
-    color: inherit !important;
-}
-
-.btn.btn-outline-primary .fa-wand-sparkles {
-    color: #ffe396 !important;
-}
-
-.btn.btn-outline-primary:hover .fa-wand-sparkles,
-.btn.btn-outline-primary:focus .fa-wand-sparkles {
-    color: inherit !important;
-}
-
-.btn.btn-outline-primary .fa-file-lines {
-    color: #a8f2ff !important;
+    --bs-btn-disabled-color: var(--bs-body-color);
+    --bs-btn-disabled-bg: var(--bs-body-bg);
+    --bs-btn-disabled-border-color: var(--bs-border-color);
 }
 
-.btn.btn-outline-primary:hover .fa-file-lines,
-.btn.btn-outline-primary:focus .fa-file-lines {
-    color: inherit !important;
-}
-
-.btn.btn-outline-primary .fa-rocket {
-    color: #d0c3e9 !important;
-}
-
-.btn.btn-outline-primary:hover .fa-rocket,
-.btn.btn-outline-primary:focus .fa-rocket {
-    color: inherit !important;
-}
-
-/* fa-download shares a class name with the light-mode reset list further
-   down (for the <svg><use> sprite pattern), which has higher specificity
-   than the generic '.btn.btn-outline-primary i { color: inherit }' rule
-   above and so wins even inside a button, pinning the icon to
-   var(--bs-body-color) regardless of hover state. Scope this override to
-   light mode explicitly so it beats that rule's specificity. */
-[data-bs-theme=light] .btn.btn-outline-primary .fa-download {
+/* Icons always match the label in every state and theme. The selector is built
+   to out-rank the per-icon colors and the light-mode icon reset further down, so
+   no icon needs its own exception inside a button. */
+[data-bs-theme] .btn.btn :is(i, svg) {
     color: inherit !important;
+    fill: currentColor !important;
 }
 
 .btn[download] {
@@ -1066,20 +1024,17 @@ button.btn-secondary-outline {
     margin-bottom: 0.5rem;
 }
 
+/* Floating "Get ScanGov" button: position and visibility only; the look is the
+   secondary button (.btn.btn-outline-primary) */
 .feedback {
     opacity: 0;
     pointer-events: none;
     visibility: hidden;
-    background-color: var(--bs-body-bg) !important;
-    border: 1px solid var(--bs-border-color);
-    box-shadow: var(--bs-shadow);
-    cursor: pointer;
     position: fixed;
     bottom: 1rem;
     left: 50%;
     transform: translateX(-50%);
     z-index: 1000;
-    text-decoration: none;
     transition: opacity 0.25s ease, visibility 0.25s ease, filter 0.25s ease, box-shadow 0.25s ease;
 }
 
@@ -1095,58 +1050,6 @@ button.btn-secondary-outline {
     visibility: visible;
 }
 
-.btn-primary i, .btn-primary svg {
-    color: inherit !important;
-    transition: filter 0.25s ease;
-}
-
-.btn.feedback i, .btn.feedback svg {
-    color: var(--bs-primary) !important;
-    transition: filter 0.25s ease;
-}
-
-.btn-primary:hover, .btn-primary:focus, .btn-primary:active {
-    filter: brightness(1.3);
-    box-shadow: var(--bs-box-shadow-md);
-    background-color: var(--bs-primary) !important;
-    color: var(--bs-primary-text) !important;
-    border-color: var(--bs-primary) !important;
-}
-
-.feedback:hover, .feedback:focus, .feedback:active {
-    background-color: var(--bs-body-color) !important;
-    box-shadow: var(--bs-box-shadow-md);
-}
-
-[data-bs-theme="light"] .feedback {
-    background-color: var(--bs-body-color) !important;
-    color: var(--bs-body-bg) !important;
-}
-
-[data-bs-theme="light"] .feedback:hover,
-[data-bs-theme="light"] .feedback:focus,
-[data-bs-theme="light"] .feedback:active {
-    background-color: var(--bs-body-bg) !important;
-    color: var(--bs-body-color) !important;
-}
-
-.btn.feedback:hover i, .btn.feedback:hover svg,
-.btn.feedback:focus i, .btn.feedback:focus svg,
-.btn.feedback:active i, .btn.feedback:active svg {
-    color: var(--bs-btn-hover-color) !important;
-}
-
-.btn-primary-outline:not(.active):hover,
-.btn-primary-outline:not(.active):focus,
-.btn-primary-outline:not(.active):active,
-.btn-primary-outline.active {
-    filter: brightness(1.3);
-    box-shadow: var(--bs-box-shadow-md);
-    border: 1px solid var(--bs-border-color);
-    background-color: var(--bs-body-bg) !important;
-    color: var(--bs-body-color) !important;
-}
-
 @media (max-width: 767.98px) {
     .feedback {
         font-size: 0.875rem;
@@ -1196,9 +1099,7 @@ button.btn-secondary-outline {
     width: auto;
     flex-shrink: 0;
 }
-
-.nav-pills .nav-link:not(.active):hover,
-.nav-pills a.btn-primary-outline:not(.active):hover {
+.nav-pills .nav-link:not(.active):hover {
     background-color: var(--bs-primary) !important;
     color: var(--bs-primary-text) !important;
     border-color: var(--bs-primary) !important;
@@ -1224,22 +1125,15 @@ button.btn-secondary-outline {
 /* Nav pills active — var(--bs-primary-text) on var(--bs-primary) (both themes) */
 .nav-pills .nav-link.active,
 .nav-pills .nav-link.active:focus,
-.nav-pills a.btn-primary-outline.active,
-.nav-pills a.btn-primary-outline.active:focus,
 [data-bs-theme=light] .nav-pills .nav-link.active,
-[data-bs-theme=light] .nav-pills .nav-link.active:focus,
-[data-bs-theme=light] .nav-pills a.btn-primary-outline.active,
-[data-bs-theme=light] .nav-pills a.btn-primary-outline.active:focus {
+[data-bs-theme=light] .nav-pills .nav-link.active:focus {
     background-color: var(--bs-primary) !important;
     color: var(--bs-primary-text) !important;
     border-color: var(--bs-primary) !important;
     box-shadow: var(--bs-shadow);
 }
-
 .nav-pills .nav-link.active:hover,
-.nav-pills a.btn-primary-outline.active:hover,
-[data-bs-theme=light] .nav-pills .nav-link.active:hover,
-[data-bs-theme=light] .nav-pills a.btn-primary-outline.active:hover {
+[data-bs-theme=light] .nav-pills .nav-link.active:hover {
     background-color: var(--bs-primary) !important;
     color: var(--bs-primary-text) !important;
     border-color: var(--bs-primary) !important;
@@ -1266,15 +1160,10 @@ button.btn-secondary-outline {
 .nav-pills .fa-database {
     color: #a8f5d5 !important;
 }
-
 .nav-pills .nav-link.active i,
 .nav-pills .nav-link.active svg,
-.nav-pills a.btn-primary-outline.active i,
-.nav-pills a.btn-primary-outline.active svg,
 [data-bs-theme=light] .nav-pills .nav-link.active i,
-[data-bs-theme=light] .nav-pills .nav-link.active svg,
-[data-bs-theme=light] .nav-pills a.btn-primary-outline.active i,
-[data-bs-theme=light] .nav-pills a.btn-primary-outline.active svg {
+[data-bs-theme=light] .nav-pills .nav-link.active svg {
     color: var(--bs-primary-text) !important;
 }
 
@@ -1407,10 +1296,7 @@ button.btn-secondary-outline {
    (white in light mode), which still contrasts fine against black. */
 [data-bs-theme=light] .nav-pills .nav-link.active,
 [data-bs-theme=light] .nav-pills .nav-link.active:focus,
-[data-bs-theme=light] .nav-pills .nav-link.active:hover,
-[data-bs-theme=light] .nav-pills a.btn-primary-outline.active,
-[data-bs-theme=light] .nav-pills a.btn-primary-outline.active:focus,
-[data-bs-theme=light] .nav-pills a.btn-primary-outline.active:hover {
+[data-bs-theme=light] .nav-pills .nav-link.active:hover {
     background-color: var(--bs-body-color) !important;
     border-color: var(--bs-body-color) !important;
 }
@@ -1434,20 +1320,6 @@ button.btn-secondary-outline {
     border-color: var(--bs-body-color) !important;
 }
 
-/* Form submit buttons and the modal copy button - other .btn-primary uses (links
-   styled as buttons, feedback CTA, etc.) keep the brand blue. */
-[data-bs-theme=light] button[type="submit"].btn-primary,
-[data-bs-theme=light] button[type="submit"].btn-primary:hover,
-[data-bs-theme=light] button[type="submit"].btn-primary:focus,
-[data-bs-theme=light] button[type="submit"].btn-primary:active,
-[data-bs-theme=light] .btn-primary.js-copy,
-[data-bs-theme=light] .btn-primary.js-copy:hover,
-[data-bs-theme=light] .btn-primary.js-copy:focus,
-[data-bs-theme=light] .btn-primary.js-copy:active {
-    background-color: var(--bs-body-color) !important;
-    border-color: var(--bs-body-color) !important;
-}
-
 /* Per-icon colors (dark mode only) - explicitly theme-gated so light mode isn't
    beaten by this rule's specificity and falls through to the general
    .fa-solid:not([class*="text-"]) inherit rule instead. */
@@ -1587,41 +1459,7 @@ code.language-plaintext {
     padding: 0.1em 0.35em;
 }
 
-/* Page actions (Rescan / Download / Share) */
-
-.actions>li>a,
-.actions>li>button {
-    display: inline-flex;
-    align-items: center;
-    gap: 0.5rem;
-    padding: 0.65rem 0.9rem;
-    color: var(--bs-body-color);
-    text-decoration: none;
-    background: none;
-    border: none;
-    cursor: pointer;
-}
-
-.actions>li>a small,
-.actions>li>button small {
-    border-left: 1px solid var(--bs-border-color);
-    padding-left: 0.5rem;
-    align-self: stretch;
-    display: inline-flex;
-    align-items: center;
-}
-
-.actions>li>a:hover,
-.actions>li>a:focus,
-.actions>li>button:hover,
-.actions>li>button:focus {
-    color: var(--bs-link-color);
-}
-
-.actions .list-group-item:hover {
-    background-color: var(--bs-body-secondary-bg);
-}
-
+/* Page actions menus (Download / Share): the buttons are .btn.btn-outline-primary.btn-sm */
 .actions .dropdown-item {
     border-bottom: 1px solid var(--bs-border-color);
     padding-top: 0.5rem;
@@ -3100,16 +2938,6 @@ a .fa-up-right-from-square {
     fill: var(--bs-body-color) !important;
 }
 
-/* Icons inside a button follow the button's own text color when its background
-   changes (hover, focus, press). Without this the blanket light-mode icon rule above
-   keeps them body-colored, so they turn dark on a dark hover background. */
-[data-bs-theme=light] .btn:hover .fa-solid:not([class*="text-"]),
-[data-bs-theme=light] .btn:focus-visible .fa-solid:not([class*="text-"]),
-[data-bs-theme=light] .btn:active .fa-solid:not([class*="text-"]) {
-    color: var(--bs-btn-hover-color) !important;
-    fill: var(--bs-btn-hover-color) !important;
-}
-
 /* Status cards keep their own text color for icons in light mode too: the blanket
    light-mode icon rule above would otherwise turn an info icon black on a red card.
    The anchor selectors out-rank the "a:not(.btn):not(.active) .fa-solid" light-mode rule. */
@@ -3385,16 +3213,6 @@ th[aria-sort="descending"] .sort-desc {
     top: 1rem;
 }
 
-/* Actions list: separate boxes — restore left border + full radius on every item */
-.actions.list-group .list-group-item {
-    padding: 0;
-    border-radius: var(--bs-list-group-border-radius) !important;
-}
-
-.actions .list-group-item+.list-group-item {
-    border-left-width: var(--bs-list-group-border-width);
-}
-
 /* Card links: underline on hover only */
 .card a:not(.btn):not(.stretched-link) {
     text-decoration: none;
@@ -3600,11 +3418,6 @@ dialog.popoverstyling .modal-header .modal-title {
     margin-bottom: 0;
 }
 
-dialog.popoverstyling .modal-footer .btn {
-    padding: 0.375rem 0.75rem;
-    font-family: var(--bs-font-sans-serif);
-}
-
 dialog.popoverstyling .modal-body h3,
 dialog.popoverstyling .modal-body h4 {
     margin-top: 1.75rem;
@@ -3669,10 +3482,6 @@ dialog::backdrop { }
   background-color: #2672de !important;
 }
 
-[data-bs-theme=dark] button[type="submit"] {
-  min-width: 80px;
-}
-
 input[type="radio"],
 .form-check-input {
   border-color: #9ca3ab;
@@ -3711,24 +3520,6 @@ a.cardlink {
   max-width: 600px;
 }
 
-button.btn.btn-primary[disabled] {
-  background: none;
-}
-
-.nav-pills .nav-item a.btn-primary-outline:focus-visible {
-  color: var(--bs-btn-hover-color) !important;
-  background-color: var(--bs-nav-pills-link-active-bg);
-}
-
-.nav-pills .nav-item a.btn-primary-outline.active:focus-visible {
-  border-color: white;
-}
-
-.btn {
-  box-shadow: var(--bs-shadow);
-  text-wrap: nowrap;
-}
-
 td.padded-cell {
   padding: 1rem;
 }