diff --git a/oni-gui.el b/oni-gui.el
index 8acd706..28f6dd8 100644
--- a/oni-gui.el
+++ b/oni-gui.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2020.0408.103604
+;; Version: 2020.0408.234044
 ;; Package-Requires: (oni-ui oni-hydra yoshi-theme diminish)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -30,7 +30,9 @@
 (add-to-list 'default-frame-alist '(internal-border-width . 15))
 (set-face-font 'variable-pitch "Comic Neue-14")
 
-(set-fontset-font t ? "Font Awesome 5 Free Solid")
+(defconst oni-gui-isearch-icon ?)
+
+(set-fontset-font t oni-gui-isearch-icon "Font Awesome 5 Free Solid")
 (set-fontset-font t ? "Font Awesome 5 Free Solid")
 (set-fontset-font t ? "Font Awesome 5 Free Solid")
 (set-fontset-font t ? "Font Awesome 5 Free Solid")
@@ -49,7 +51,7 @@
 (set-fontset-font t ?✸ "DejaVu Sans Mono")
 (set-fontset-font t ?✿ "DejaVu Sans Mono")
 
-(diminish 'isearch-mode " ")
+(diminish 'isearch-mode (string ?\s oni-gui-isearch-icon))
 
 (defhydra oni-gui-hydra (:color teal :hint nil)
   "
diff --git a/test/integration/oni-gui.bats b/test/integration/oni-gui.bats
index 1731faa..40a14f0 100644
--- a/test/integration/oni-gui.bats
+++ b/test/integration/oni-gui.bats
@@ -11,7 +11,8 @@
 
 @test "Opening emacs diminishes isearch-mode" {
     run emacs -batch -l package -f package-initialize \
-        -eval "(prin1 (string= \" \" (car (alist-get 'isearch-mode minor-mode-alist))))"
+        -eval "(prin1 (string= (string ?\s oni-gui-isearch-icon)
+                      (car (alist-get 'isearch-mode minor-mode-alist))))"
 
     echo "$output"
 
@@ -21,7 +22,8 @@
 @test "Reloading isearch diminishes isearch-mode" {
     run emacs -batch -l package -f package-initialize \
         -eval "(load-library \"isearch\")" \
-        -eval "(prin1 (string= \" \" (car (alist-get 'isearch-mode minor-mode-alist))))"
+        -eval "(prin1 (string= (string ?\s oni-gui-isearch-icon)
+                               (car (alist-get 'isearch-mode minor-mode-alist))))"
 
     echo "$output"