diff --git a/ts/change-notetype/NotetypeSelector.svelte b/ts/change-notetype/NotetypeSelector.svelte
index e6de9aab6..22d7733f1 100644
--- a/ts/change-notetype/NotetypeSelector.svelte
+++ b/ts/change-notetype/NotetypeSelector.svelte
@@ -5,7 +5,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 <script lang="ts">
     import type { ChangeNotetypeState } from "./lib";
 
-    import StickyBar from "components/StickyBar.svelte";
+    import StickyHeader from "components/StickyHeader.svelte";
     import ButtonToolbar from "components/ButtonToolbar.svelte";
     import Item from "components/Item.svelte";
     import ButtonGroup from "components/ButtonGroup.svelte";
@@ -25,7 +25,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
 </script>
 
-<StickyBar>
+<StickyHeader>
     <ButtonToolbar class="justify-content-between" size={2.3} wrap={false}>
         <Item>
             <ButtonGroup class="flex-grow-1">
@@ -48,4 +48,4 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             <SaveButton {state} />
         </Item>
     </ButtonToolbar>
-</StickyBar>
+</StickyHeader>
diff --git a/ts/components/StickyBottom.svelte b/ts/components/StickyFooter.svelte
similarity index 87%
rename from ts/components/StickyBottom.svelte
rename to ts/components/StickyFooter.svelte
index e67c403d1..e9778096b 100644
--- a/ts/components/StickyBottom.svelte
+++ b/ts/components/StickyFooter.svelte
@@ -10,7 +10,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     export let height: number = 0;
 </script>
 
-<footer {id} bind:offsetHeight={height} class={`container-fluid pt-1 ${className}`}>
+<footer {id} bind:offsetHeight={height} class="container-fluid pt-1 {className}">
     <slot />
 </footer>
 
diff --git a/ts/components/StickyBar.svelte b/ts/components/StickyHeader.svelte
similarity index 87%
rename from ts/components/StickyBar.svelte
rename to ts/components/StickyHeader.svelte
index fbd684d1a..173a2be0d 100644
--- a/ts/components/StickyBar.svelte
+++ b/ts/components/StickyHeader.svelte
@@ -8,12 +8,12 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     export { className as class };
 </script>
 
-<nav {id} class={`container-fluid py-1 ${className}`}>
+<header {id} class="container-fluid pb-1 {className}">
     <slot />
-</nav>
+</header>
 
 <style lang="scss">
-    nav {
+    header {
         position: sticky;
         top: 0;
         left: 0;
diff --git a/ts/deck-options/ConfigSelector.svelte b/ts/deck-options/ConfigSelector.svelte
index c80b15924..7ef2d80fc 100644
--- a/ts/deck-options/ConfigSelector.svelte
+++ b/ts/deck-options/ConfigSelector.svelte
@@ -10,7 +10,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import type Modal from "bootstrap/js/dist/modal";
 
     import TextInputModal from "./TextInputModal.svelte";
-    import StickyBar from "components/StickyBar.svelte";
+    import StickyHeader from "components/StickyHeader.svelte";
     import ButtonToolbar from "components/ButtonToolbar.svelte";
     import Item from "components/Item.svelte";
     import ButtonGroup from "components/ButtonGroup.svelte";
@@ -87,7 +87,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     bind:modalKey
 />
 
-<StickyBar class="g-1">
+<StickyHeader class="g-1">
     <ButtonToolbar class="justify-content-between" size={2.3} wrap={false}>
         <Item>
             <ButtonGroup class="flex-grow-1">
@@ -115,4 +115,4 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             />
         </Item>
     </ButtonToolbar>
-</StickyBar>
+</StickyHeader>
diff --git a/ts/editor/EditorToolbar.svelte b/ts/editor/EditorToolbar.svelte
index 5c3728fd8..8c11dd230 100644
--- a/ts/editor/EditorToolbar.svelte
+++ b/ts/editor/EditorToolbar.svelte
@@ -27,7 +27,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 <script lang="typescript">
     import { isApplePlatform } from "lib/platform";
-    import StickyBar from "components/StickyBar.svelte";
+    import StickyHeader from "components/StickyHeader.svelte";
     import ButtonToolbar from "components/ButtonToolbar.svelte";
     import Item from "components/Item.svelte";
 
@@ -51,7 +51,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     export const templateButtons = {};
 </script>
 
-<StickyBar>
+<StickyHeader>
     <ButtonToolbar {size} {wrap} api={toolbar}>
         <Item id="notetype">
             <NoteTypeButtons api={notetypeButtons} />
@@ -73,4 +73,4 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             <TemplateButtons api={templateButtons} />
         </Item>
     </ButtonToolbar>
-</StickyBar>
+</StickyHeader>
diff --git a/ts/editor/TagEditor.svelte b/ts/editor/TagEditor.svelte
index 502f8bc4a..022aafdce 100644
--- a/ts/editor/TagEditor.svelte
+++ b/ts/editor/TagEditor.svelte
@@ -6,7 +6,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { tick } from "svelte";
     import { isApplePlatform } from "lib/platform";
     import { bridgeCommand } from "lib/bridgecommand";
-    import StickyBottom from "components/StickyBottom.svelte";
+    import StickyFooter from "components/StickyFooter.svelte";
     import TagOptionsBadge from "./TagOptionsBadge.svelte";
     import TagEditMode from "./TagEditMode.svelte";
     import TagInput from "./TagInput.svelte";
@@ -390,7 +390,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     $: shortenTags = shortenTags || assumedRows > 2;
 </script>
 
-<StickyBottom bind:height class="d-flex">
+<StickyFooter bind:height class="d-flex">
     {#if !wrap}
         <TagOptionsBadge
             --buttons-size="{size}rem"
@@ -503,7 +503,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             <Tag>SPACER</Tag>
         </div>
     </ButtonToolbar>
-</StickyBottom>
+</StickyFooter>
 
 <style lang="scss">
     .tag-spacer {