diff --git a/docs/sources/reference/playlist.md b/docs/sources/reference/playlist.md
index 7375bd01cb6..755e3c5a3ff 100644
--- a/docs/sources/reference/playlist.md
+++ b/docs/sources/reference/playlist.md
@@ -61,7 +61,7 @@ You can edit playlists while creating them or after saving them.
 
 ### Search for a dashboard to add
 
-1. Click the **Find dashboards by name** text box. 
+1. Click the **Search dashboards by name** text box. 
 1. Search for the playlist by name or regular expression. 
 1. If needed, filter your results by starred status or tags.  
    By default, your starred dashboards will appear as options to add to the Playlist.
diff --git a/public/app/core/components/OrgActionBar/OrgActionBar.tsx b/public/app/core/components/OrgActionBar/OrgActionBar.tsx
index 016c4777668..b563fe9098b 100644
--- a/public/app/core/components/OrgActionBar/OrgActionBar.tsx
+++ b/public/app/core/components/OrgActionBar/OrgActionBar.tsx
@@ -28,7 +28,7 @@ export default class OrgActionBar extends PureComponent<Props> {
             inputClassName="gf-form-input width-20"
             value={searchQuery}
             onChange={setSearchQuery}
-            placeholder={'Filter by name or type'}
+            placeholder={'Search by name or type'}
           />
           <LayoutSelector mode={layoutMode} onLayoutModeChanged={(mode: LayoutMode) => onSetLayoutMode(mode)} />
         </div>
diff --git a/public/app/core/components/OrgActionBar/__snapshots__/OrgActionBar.test.tsx.snap b/public/app/core/components/OrgActionBar/__snapshots__/OrgActionBar.test.tsx.snap
index 3a75f9192b2..81de13f18fe 100644
--- a/public/app/core/components/OrgActionBar/__snapshots__/OrgActionBar.test.tsx.snap
+++ b/public/app/core/components/OrgActionBar/__snapshots__/OrgActionBar.test.tsx.snap
@@ -11,7 +11,7 @@ exports[`Render should render component 1`] = `
       inputClassName="gf-form-input width-20"
       labelClassName="gf-form--has-input-icon"
       onChange={[MockFunction]}
-      placeholder="Filter by name or type"
+      placeholder="Search by name or type"
       value=""
     />
     <LayoutSelector
diff --git a/public/app/core/components/manage_dashboards/manage_dashboards.html b/public/app/core/components/manage_dashboards/manage_dashboards.html
index ba5f28ed203..9c21324e3ae 100644
--- a/public/app/core/components/manage_dashboards/manage_dashboards.html
+++ b/public/app/core/components/manage_dashboards/manage_dashboards.html
@@ -1,17 +1,17 @@
 <div class="dashboard-list">
   <div class="page-action-bar page-action-bar--narrow" ng-hide="ctrl.folderId && !ctrl.hasFilters && ctrl.sections.length === 0">
     <label class="gf-form gf-form--grow gf-form--has-input-icon">
-      <input type="text" class="gf-form-input max-width-30" placeholder="Find Dashboard by name" tabindex="1" give-focus="true" ng-model="ctrl.query.query" ng-model-options="{ debounce: 500 }" spellcheck='false' ng-change="ctrl.onQueryChange()" />
+      <input type="text" class="gf-form-input max-width-30" placeholder="Search dashboards by name" tabindex="1" give-focus="true" ng-model="ctrl.query.query" ng-model-options="{ debounce: 500 }" spellcheck='false' ng-change="ctrl.onQueryChange()" />
       <i class="gf-form-input-icon fa fa-search"></i>
     </label>
     <div class="page-action-bar__spacer"></div>
     <a class="btn btn-primary" ng-href="{{ctrl.createDashboardUrl()}}" ng-if="ctrl.hasEditPermissionInFolders || ctrl.canSave">
       New Dashboard
     </a>
-    <a class="btn btn-inverse" href="dashboards/folder/new" ng-if="!ctrl.folderId && ctrl.isEditor">
+    <a class="btn btn-primary" href="dashboards/folder/new" ng-if="!ctrl.folderId && ctrl.isEditor">
       New Folder
     </a>
-    <a class="btn btn-inverse" href="{{ctrl.importDashboardUrl()}}" ng-if="ctrl.hasEditPermissionInFolders || ctrl.canSave">
+    <a class="btn btn-primary" href="{{ctrl.importDashboardUrl()}}" ng-if="ctrl.hasEditPermissionInFolders || ctrl.canSave">
       Import
     </a>
   </div>
@@ -49,7 +49,7 @@
 
   <div class="search-results" ng-show="ctrl.hasFilters && ctrl.sections.length === 0">
     <em class="muted">
-      No dashboards matching your query were found.
+      No dashboards matching your search were found.
     </em>
   </div>
 
diff --git a/public/app/features/admin/UserListAdminPage.tsx b/public/app/features/admin/UserListAdminPage.tsx
index ec25aa6aa70..18e64e591df 100644
--- a/public/app/features/admin/UserListAdminPage.tsx
+++ b/public/app/features/admin/UserListAdminPage.tsx
@@ -45,7 +45,7 @@ const UserListAdminPageUnConnected: React.FC<Props> = props => {
               <Forms.Input
                 size="md"
                 type="text"
-                placeholder="Find user by name/login/email"
+                placeholder="Search user by login,email or name"
                 tabIndex={1}
                 autoFocus={true}
                 value={props.query}
diff --git a/public/app/features/playlist/partials/playlist_search.html b/public/app/features/playlist/partials/playlist_search.html
index 12b3d563820..ae4fea46e80 100644
--- a/public/app/features/playlist/partials/playlist_search.html
+++ b/public/app/features/playlist/partials/playlist_search.html
@@ -1,6 +1,6 @@
 <div class="playlist-search-field-wrapper">
   <span style="position: relative;">
-    <input  type="text" placeholder="Find dashboards by name" tabindex="1"
+    <input  type="text" placeholder="Search dashboards by name" tabindex="1"
     ng-keydown="ctrl.keyDown($event)" ng-model="ctrl.query.query" ng-model-options="{ debounce: 500 }" spellcheck='false' ng-change="ctrl.searchDashboards()" />
 		<div class="playlist-search-switches">
 			<i class="fa fa-filter"></i>
diff --git a/public/app/features/search/components/SearchField.tsx b/public/app/features/search/components/SearchField.tsx
index 5e513ffa97d..46f8575468c 100644
--- a/public/app/features/search/components/SearchField.tsx
+++ b/public/app/features/search/components/SearchField.tsx
@@ -61,7 +61,7 @@ export const SearchField: React.FunctionComponent<SearchFieldProps> = ({ query,
 
         <input
           type="text"
-          placeholder="Find dashboards by name"
+          placeholder="Search dashboards by name"
           value={query.query}
           onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
             onChange(event.currentTarget.value);
diff --git a/public/app/features/users/UsersActionBar.tsx b/public/app/features/users/UsersActionBar.tsx
index 6e7d56294c6..1ba48201431 100644
--- a/public/app/features/users/UsersActionBar.tsx
+++ b/public/app/features/users/UsersActionBar.tsx
@@ -49,7 +49,7 @@ export class UsersActionBar extends PureComponent<Props> {
             inputClassName="gf-form-input width-20"
             value={searchQuery}
             onChange={setUsersSearchQuery}
-            placeholder="Filter by email, login or name"
+            placeholder="Search user by login,email or name"
           />
           {pendingInvitesCount > 0 && (
             <div style={{ marginLeft: '1rem' }}>
diff --git a/public/app/features/users/__snapshots__/UsersActionBar.test.tsx.snap b/public/app/features/users/__snapshots__/UsersActionBar.test.tsx.snap
index f94225348f4..c4e18b78f36 100644
--- a/public/app/features/users/__snapshots__/UsersActionBar.test.tsx.snap
+++ b/public/app/features/users/__snapshots__/UsersActionBar.test.tsx.snap
@@ -11,7 +11,7 @@ exports[`Render should render component 1`] = `
       inputClassName="gf-form-input width-20"
       labelClassName="gf-form--has-input-icon"
       onChange={[MockFunction]}
-      placeholder="Filter by email, login or name"
+      placeholder="Search user by login,email or name"
       value=""
     />
     <div
@@ -32,7 +32,7 @@ exports[`Render should render pending invites button 1`] = `
       inputClassName="gf-form-input width-20"
       labelClassName="gf-form--has-input-icon"
       onChange={[MockFunction]}
-      placeholder="Filter by email, login or name"
+      placeholder="Search user by login,email or name"
       value=""
     />
     <div
@@ -77,7 +77,7 @@ exports[`Render should show external user management button 1`] = `
       inputClassName="gf-form-input width-20"
       labelClassName="gf-form--has-input-icon"
       onChange={[MockFunction]}
-      placeholder="Filter by email, login or name"
+      placeholder="Search user by login,email or name"
       value=""
     />
     <div
@@ -104,7 +104,7 @@ exports[`Render should show invite button 1`] = `
       inputClassName="gf-form-input width-20"
       labelClassName="gf-form--has-input-icon"
       onChange={[MockFunction]}
-      placeholder="Filter by email, login or name"
+      placeholder="Search user by login,email or name"
       value=""
     />
     <div