diff --git a/tabby-terminal/src/components/searchPanel.component.pug b/tabby-terminal/src/components/searchPanel.component.pug
index fb204474..93dfbf2a 100644
--- a/tabby-terminal/src/components/searchPanel.component.pug
+++ b/tabby-terminal/src/components/searchPanel.component.pug
@@ -28,24 +28,27 @@ ng-container(*ngIf='state.resultCount > 0')
 
 .me-2
 
-button.btn.btn-link(
+button.btn(
     (click)='options.caseSensitive = !options.caseSensitive; saveSearchOptions()',
+    [class.btn-link]='!options.caseSensitive',
     [class.btn-info]='options.caseSensitive',
     ngbTooltip='Case sensitivity',
     placement='bottom',
     [fastHtmlBind]='icons.case'
 )
 
-button.btn.btn-link(
+button.btn(
     (click)='options.regex = !options.regex; saveSearchOptions()',
+    [class.btn-link]='!options.regex',
     [class.btn-info]='options.regex',
     ngbTooltip='Regular expression',
     placement='bottom',
     [fastHtmlBind]='icons.regexp'
 )
 
-button.btn.btn-link(
+button.btn(
     (click)='options.wholeWord = !options.wholeWord; saveSearchOptions()',
+    [class.btn-link]='!options.wholeWord',
     [class.btn-info]='options.wholeWord',
     ngbTooltip='Whole word',
     placement='bottom',
diff --git a/tabby-terminal/src/components/searchPanel.component.scss b/tabby-terminal/src/components/searchPanel.component.scss
index 00108284..4a3742f6 100644
--- a/tabby-terminal/src/components/searchPanel.component.scss
+++ b/tabby-terminal/src/components/searchPanel.component.scss
@@ -21,3 +21,7 @@
     font-size: 0.7rem;
     opacity: .5;
 }
+
+svg {
+    height: 16px;
+}