diff --git a/core/wiki/macros/toc.tid b/core/wiki/macros/toc.tid
index bfe9b6cb3b7..7f149eab109 100644
--- a/core/wiki/macros/toc.tid
+++ b/core/wiki/macros/toc.tid
@@ -75,19 +75,21 @@ tags: $:/tags/Macro
 <$qualify name="toc-state" title={{{ [[$:/state/toc]addsuffix<__path__>addsuffix[-]addsuffix<currentTiddler>] }}}>
   <$set name="toc-item-class" filter=<<__itemClassFilter__>> emptyValue="toc-item-selected" value="toc-item">
     <li class=<<toc-item-class>>>
-    <$link to={{{ [<currentTiddler>get[target]else<currentTiddler>] }}}>
+      <div class="tc-toc-item-row">
       <$reveal type="nomatch" stateTitle=<<toc-state>> text="open">
-        <$button setTitle=<<toc-state>> setTo="open" class="tc-btn-invisible tc-popup-keep">
+        <$button setTitle=<<toc-state>> setTo="open" class="tc-btn-invisible tc-popup-keep" aria-label={{{ [<currentTiddler>addprefix[expand ]] }}}>
           <$transclude tiddler=<<toc-closed-icon>> />
         </$button>
       </$reveal>
       <$reveal type="match" stateTitle=<<toc-state>> text="open">
-        <$button setTitle=<<toc-state>> setTo="close" class="tc-btn-invisible tc-popup-keep">
+        <$button setTitle=<<toc-state>> setTo="close" class="tc-btn-invisible tc-popup-keep" aria-label={{{ [<currentTiddler>addprefix[collapse ]] }}}>
           <$transclude tiddler=<<toc-open-icon>> />
         </$button>
       </$reveal>
-      <<toc-caption>>
-    </$link>
+      <$link to={{{ [<currentTiddler>get[target]else<currentTiddler>] }}}>
+        <<toc-caption>>
+      </$link>
+      </div>
     <$reveal type="match" stateTitle=<<toc-state>> text="open">
       <$macrocall $name="toc-expandable" tag=<<currentTiddler>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> exclude=<<__exclude__>> path=<<__path__>>/>
     </$reveal>
@@ -103,13 +105,13 @@ tags: $:/tags/Macro
   <$set name="toc-item-class" filter=<<__itemClassFilter__>> emptyValue="toc-item-selected" value="toc-item">
     <li class=<<toc-item-class>>>
       <$reveal type="nomatch" stateTitle=<<toc-state>> text="open">
-        <$button setTitle=<<toc-state>> setTo="open" class="tc-btn-invisible tc-popup-keep">
+        <$button setTitle=<<toc-state>> setTo="open" class="tc-btn-invisible tc-popup-keep" aria-label={{{ [<currentTiddler>addprefix[expand ]] }}}>
         <$transclude tiddler=<<toc-closed-icon>> />
           <<toc-caption>>
         </$button>
       </$reveal>
       <$reveal type="match" stateTitle=<<toc-state>> text="open">
-        <$button setTitle=<<toc-state>> setTo="close" class="tc-btn-invisible tc-popup-keep">
+        <$button setTitle=<<toc-state>> setTo="close" class="tc-btn-invisible tc-popup-keep" aria-label={{{ [<currentTiddler>addprefix[collapse ]] }}}>
           <$transclude tiddler=<<toc-open-icon>> />
           <<toc-caption>>
         </$button>
@@ -146,21 +148,23 @@ tags: $:/tags/Macro
 <$qualify name="toc-state" title={{{ [[$:/state/toc]addsuffix<__path__>addsuffix[-]addsuffix<currentTiddler>] }}}>
   <$set name="toc-item-class" filter=<<__itemClassFilter__>> emptyValue="toc-item-selected" value="toc-item" >
     <li class=<<toc-item-class>>>
-      <$link to={{{ [<currentTiddler>get[target]else<currentTiddler>] }}}>
-          <$list filter="[all[current]tagging[]$sort$]  -[subfilter<__exclude__>] +[limit[1]]" variable="ignore" emptyMessage="<$button class='tc-btn-invisible'>{{$:/core/images/blank}}</$button>">
+      <div class="tc-toc-item-row">
+        <$list filter="[all[current]tagging[]$sort$]  -[subfilter<__exclude__>] +[limit[1]]" variable="ignore" emptyMessage="<$button class='tc-btn-invisible' tabindex='-1'>{{$:/core/images/blank}}</$button>">
           <$reveal type="nomatch" stateTitle=<<toc-state>> text="open">
-            <$button setTitle=<<toc-state>> setTo="open" class="tc-btn-invisible tc-popup-keep">
+            <$button setTitle=<<toc-state>> setTo="open" class="tc-btn-invisible tc-popup-keep" aria-label={{{ [<currentTiddler>addprefix[expand ]] }}}>
             <$transclude tiddler=<<toc-closed-icon>> />
             </$button>
           </$reveal>
           <$reveal type="match" stateTitle=<<toc-state>> text="open">
-            <$button setTitle=<<toc-state>> setTo="close" class="tc-btn-invisible tc-popup-keep">
+            <$button setTitle=<<toc-state>> setTo="close" class="tc-btn-invisible tc-popup-keep" aria-label={{{ [<currentTiddler>addprefix[collapse ]] }}}>
               <$transclude tiddler=<<toc-open-icon>> />
             </$button>
           </$reveal>
         </$list>
-        <<toc-caption>>
-      </$link>
+        <$link to={{{ [<currentTiddler>get[target]else<currentTiddler>] }}}>
+          <<toc-caption>>
+        </$link>
+      </div>
       <$reveal type="match" stateTitle=<<toc-state>> text="open">
         <$macrocall $name="toc-selective-expandable" tag=<<currentTiddler>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> exclude=<<__exclude__>> path=<<__path__>>/>
       </$reveal>
@@ -174,15 +178,15 @@ tags: $:/tags/Macro
 <$qualify name="toc-state" title={{{ [[$:/state/toc]addsuffix<__path__>addsuffix[-]addsuffix<currentTiddler>] }}}>
   <$set name="toc-item-class" filter=<<__itemClassFilter__>> emptyValue="toc-item-selected" value="toc-item">
     <li class=<<toc-item-class>>>
-      <$list filter="[all[current]tagging[]$sort$] -[subfilter<__exclude__>] +[limit[1]]" variable="ignore" emptyMessage="""<$button class="tc-btn-invisible">{{$:/core/images/blank}}</$button><span class="toc-item-muted"><<toc-caption>></span>""">
+      <$list filter="[all[current]tagging[]$sort$] -[subfilter<__exclude__>] +[limit[1]]" variable="ignore" emptyMessage="""<$button class="tc-btn-invisible" tabindex="-1">{{$:/core/images/blank}}</$button><span class="toc-item-muted"><<toc-caption>></span>""">
         <$reveal type="nomatch" stateTitle=<<toc-state>> text="open">
-          <$button setTitle=<<toc-state>> setTo="open" class="tc-btn-invisible tc-popup-keep">
+          <$button setTitle=<<toc-state>> setTo="open" class="tc-btn-invisible tc-popup-keep" aria-label={{{ [<currentTiddler>addprefix[expand ]] }}}>
             <$transclude tiddler=<<toc-closed-icon>> />
             <<toc-caption>>
           </$button>
         </$reveal>
         <$reveal type="match" stateTitle=<<toc-state>> text="open">
-          <$button setTitle=<<toc-state>> setTo="close" class="tc-btn-invisible tc-popup-keep">
+          <$button setTitle=<<toc-state>> setTo="close" class="tc-btn-invisible tc-popup-keep" aria-label={{{ [<currentTiddler>addprefix[collapse ]] }}}>
             <$transclude tiddler=<<toc-open-icon>> />
             <<toc-caption>>
           </$button>
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index b1d591fcdfe..47fb9de5580 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -3005,27 +3005,32 @@ input.tc-palette-manager-colour-input {
 	border-bottom: 1px solid <<colour tab-border>>;
 }
 
-.tc-tabbed-table-of-contents .tc-table-of-contents .toc-item > a,
-.tc-tabbed-table-of-contents .tc-table-of-contents .toc-item-selected > a {
-	display: block;
+.tc-tabbed-table-of-contents .tc-table-of-contents .toc-item > .tc-toc-item-row,
+.tc-tabbed-table-of-contents .tc-table-of-contents .toc-item-selected > .tc-toc-item-row {
+	display: flex;
+	align-items: center;
 	padding: 0.12em 1em 0.12em 0.25em;
 }
 
-.tc-tabbed-table-of-contents .tc-table-of-contents .toc-item > a {
+.tc-tabbed-table-of-contents .tc-table-of-contents .toc-item > .tc-toc-item-row {
 	border-top: 1px solid <<colour tab-background>>;
 	border-left: 1px solid <<colour tab-background>>;
 	border-bottom: 1px solid <<colour tab-background>>;
 }
 
-.tc-tabbed-table-of-contents .tc-table-of-contents .toc-item > a:hover {
-	text-decoration: none;
+.tc-tabbed-table-of-contents .tc-table-of-contents .toc-item > .tc-toc-item-row:hover {
 	border-top: 1px solid <<colour tab-border>>;
 	border-left: 1px solid <<colour tab-border>>;
 	border-bottom: 1px solid <<colour tab-border>>;
 	background: <<colour tab-border>>;
 }
 
-.tc-tabbed-table-of-contents .tc-table-of-contents .toc-item-selected > a {
+.tc-tabbed-table-of-contents .tc-table-of-contents .toc-item a:hover,
+.tc-tabbed-table-of-contents .tc-table-of-contents .toc-item-selected a:hover {
+	text-decoration: none;
+}
+
+.tc-tabbed-table-of-contents .tc-table-of-contents .toc-item-selected > .tc-toc-item-row {
 	border-top: 1px solid <<colour tab-border>>;
 	border-left: 1px solid <<colour tab-border>>;
 	border-bottom: 1px solid <<colour tab-border>>;
@@ -3033,10 +3038,6 @@ input.tc-palette-manager-colour-input {
 	margin-right: -1px;
 }
 
-.tc-tabbed-table-of-contents .tc-table-of-contents .toc-item-selected > a:hover {
-	text-decoration: none;
-}
-
 .tc-tabbed-table-of-contents .tc-tabbed-table-of-contents-content {
 	display: inline-block;
 	vertical-align: top;