diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
index a6e2062f22..df0c8e3cef 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
@@ -19,15 +19,15 @@
 
                         <div class="umb-mediapicker-upload">
                             <div class="form-search">
-                                <i class="icon-search" aria-hidden="true"></i>
-                                <input type="text"
-                                    class="umb-search-field search-query -full-width-input"
-                                       ng-model="vm.searchOptions.filter"
-                                       localize="placeholder"
-                                       placeholder="@placeholders_search"
-                                       ng-change="vm.changeSearch()"
-                                       umb-auto-focus
-                                    no-dirty-check />
+                                <umb-search-filter
+                                    input-id="datatype-search"
+                                    model="vm.searchOptions.filter"
+                                    label-key="placeholders_search"
+                                    text="Type to search"
+                                    on-change="vm.changeSearch()"
+                                    css-class="w-100"
+                                    auto-focus="true">
+                                </umb-search-filter>
 
                                 <div class="form-search__toggle">
                                     <umb-checkbox model="filterOptions.excludeSubFolders"
@@ -65,7 +65,7 @@
                                                  on-layout-select="vm.selectLayout(layout)">
                             </umb-layout-selector>
                         </div>
-                       
+
                         <ul class="umb-breadcrumbs">
                             <li ng-hide="startNodeId != -1" class="umb-breadcrumbs__ancestor">
                                 <button type="button" class="umb-breadcrumbs__action umb-outline umb-outline--surronding" ng-click="vm.gotoFolder()" ng-class="{'--current':path.length === 0}">