diff --git a/ghost/admin/app/components/gh-search-input-trigger.hbs b/ghost/admin/app/components/gh-power-select/input-trigger.hbs
similarity index 85%
rename from ghost/admin/app/components/gh-search-input-trigger.hbs
rename to ghost/admin/app/components/gh-power-select/input-trigger.hbs
index 53565633e8..d429ffd20d 100644
--- a/ghost/admin/app/components/gh-search-input-trigger.hbs
+++ b/ghost/admin/app/components/gh-power-select/input-trigger.hbs
@@ -1,5 +1,7 @@
 <div class="ember-power-select-search" {{on "mousedown" this.captureMousedown}}>
-    {{svg-jar "search" class="gh-nav-search-icon"}}
+    {{#if @extra.inputIcon}}
+        {{svg-jar @extra.inputIcon class=@extra.inputIconClass}}
+    {{/if}}
     <input type="search"
         {{autofocus}}
         {{did-insert this.registerInput}}
diff --git a/ghost/admin/app/components/gh-search-input-trigger.js b/ghost/admin/app/components/gh-power-select/input-trigger.js
similarity index 100%
rename from ghost/admin/app/components/gh-search-input-trigger.js
rename to ghost/admin/app/components/gh-power-select/input-trigger.js
diff --git a/ghost/admin/app/components/gh-search-input.hbs b/ghost/admin/app/components/gh-search-input.hbs
index 9e68629d89..1b45578ec6 100644
--- a/ghost/admin/app/components/gh-search-input.hbs
+++ b/ghost/admin/app/components/gh-search-input.hbs
@@ -3,9 +3,13 @@
     @onChange={{action "openSelected"}}
     @placeholder="Search site..."
     @searchEnabled={{false}}
-    @triggerComponent="gh-search-input-trigger"
+    @triggerComponent="gh-power-select/input-trigger"
     @renderInPlace={{true}}
     @loadingMessage="Loading"
+    @extra={{hash
+        inputIcon="search"
+        inputIconClass="gh-nav-search-icon"
+    }}
     as |name select|
 >
     {{highlighted-text name.title select.searchText}}