diff --git a/core/ui/SideBarLists.tid b/core/ui/SideBarLists.tid
index ee8a462d7..bf1e53637 100644
--- a/core/ui/SideBarLists.tid
+++ b/core/ui/SideBarLists.tid
@@ -5,11 +5,21 @@ title: $:/core/ui/SideBarLists
 <div class="tc-search">
 <$edit-text tiddler="$:/temp/search" type="search" tag="input"/>
 <$reveal state="$:/temp/search" type="nomatch" text="">
-<$linkcatcher to="$:/temp/search">
-<$link to="" class="tc-btn-invisible">{{$:/core/images/close-button}}</$link>
-</$linkcatcher>&nbsp;<$button tooltip={{$:/language/Buttons/AdvancedSearch/Hint}} aria-label={{$:/language/Buttons/AdvancedSearch/Caption}} class="tc-btn-invisible"><$action-setfield $tiddler="$:/temp/advancedsearch" text={{$:/temp/search}}/><$action-setfield $tiddler="$:/temp/search" text=""/><$action-navigate $to="$:/AdvancedSearch"/>&hellip;</$button>
+<$button tooltip={{$:/language/Buttons/AdvancedSearch/Hint}} aria-label={{$:/language/Buttons/AdvancedSearch/Caption}} class="tc-btn-invisible">
+<$action-setfield $tiddler="$:/temp/advancedsearch" text={{$:/temp/search}}/>
+<$action-setfield $tiddler="$:/temp/search" text=""/>
+<$action-navigate $to="$:/AdvancedSearch"/>
+{{$:/core/images/advanced-search-button}}
+</$button>
+<$button class="tc-btn-invisible">
+<$action-setfield $tiddler="$:/temp/search" text="" />
+{{$:/core/images/close-button}}
+</$button>
 </$reveal>
-<$reveal state="$:/temp/search" type="match" text="">&nbsp;<$link to="$:/AdvancedSearch" tooltip={{$:/language/Buttons/AdvancedSearch/Hint}} aria-label={{$:/language/Buttons/AdvancedSearch/Caption}} class="tc-btn-invisible">&hellip;</$link>
+<$reveal state="$:/temp/search" type="match" text="">
+<$button to="$:/AdvancedSearch" tooltip={{$:/language/Buttons/AdvancedSearch/Hint}} aria-label={{$:/language/Buttons/AdvancedSearch/Caption}} class="tc-btn-invisible">
+{{$:/core/images/advanced-search-button}}
+</$button>
 </$reveal>
 </div>
 
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 435173b29..0434c13cd 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -438,11 +438,13 @@ button.tc-untagged-label {
 	width: 1em;
 }
 
-.tc-page-controls svg {
+.tc-page-controls svg,
+.tc-search svg {
 	fill: <<colour sidebar-controls-foreground>>;
 }
 
-.tc-page-controls button:hover svg, .tc-page-controls a:hover svg {
+.tc-page-controls button:hover svg, .tc-page-controls a:hover svg,
+.tc-search button:hover svg, .tc-search a:hover svg {
 	fill: <<colour sidebar-controls-foreground-hover>>;
 }