diff --git a/public/app/features/org/partials/orgUsers.html b/public/app/features/org/partials/orgUsers.html
index 4531f99e4e4..697879c6ac2 100644
--- a/public/app/features/org/partials/orgUsers.html
+++ b/public/app/features/org/partials/orgUsers.html
@@ -3,7 +3,7 @@
 <div class="page-container page-body">
   <div class="page-action-bar">
     <label class="gf-form gf-form--grow gf-form--has-input-icon">
-      <input type="text" class="gf-form-input width-20" ng-model="ctrl.searchQuery" ng-change="ctrl.onQueryUpdated()" give-focus="true" placeholder="Filter by username or email" />
+      <input type="text" class="gf-form-input width-20" ng-model="ctrl.searchQuery" ng-change="ctrl.onQueryUpdated()" placeholder="Filter by username or email" />
       <i class="gf-form-input-icon fa fa-search"></i>
     </label>
 
diff --git a/public/app/features/org/partials/teams.html b/public/app/features/org/partials/teams.html
index a7cef1a2128..44682ba18e9 100644
--- a/public/app/features/org/partials/teams.html
+++ b/public/app/features/org/partials/teams.html
@@ -3,7 +3,7 @@
 <div class="page-container page-body">
 	<div class="page-action-bar">
     <label class="gf-form gf-form--grow gf-form--has-input-icon">
-      <input type="text" class="gf-form-input max-width-20" placeholder="Find Team by name" tabindex="1" give-focus="true" ng-model="ctrl.query" ng-model-options="{ debounce: 500 }" spellcheck='false' ng-change="ctrl.get()" />
+      <input type="text" class="gf-form-input max-width-20" placeholder="Find Team by name" tabindex="1" ng-model="ctrl.query" ng-model-options="{ debounce: 500 }" spellcheck='false' ng-change="ctrl.get()" />
       <i class="gf-form-input-icon fa fa-search"></i>
     </label>
     <div class="page-action-bar__spacer"></div>
diff --git a/public/app/features/plugins/partials/ds_list.html b/public/app/features/plugins/partials/ds_list.html
index 936ecbc6e64..e53d5fa7ebb 100644
--- a/public/app/features/plugins/partials/ds_list.html
+++ b/public/app/features/plugins/partials/ds_list.html
@@ -4,7 +4,7 @@
 	<div ng-if="ctrl.unfiltered.length">
 		<div class="page-action-bar">
 			<label class="gf-form gf-form--grow gf-form--has-input-icon">
-				<input type="text" class="gf-form-input width-20" ng-model="ctrl.searchQuery" ng-change="ctrl.onQueryUpdated()" give-focus="true" placeholder="Filter by name or type" />
+				<input type="text" class="gf-form-input width-20" ng-model="ctrl.searchQuery" ng-change="ctrl.onQueryUpdated()" placeholder="Filter by name or type" />
 				<i class="gf-form-input-icon fa fa-search"></i>
 			</label>
 			<div class="page-action-bar__spacer"></div>
diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss
index d2895fc2d78..e1015a39c13 100644
--- a/public/sass/_variables.dark.scss
+++ b/public/sass/_variables.dark.scss
@@ -184,8 +184,8 @@ $input-bg-disabled:              $dark-3;
 $input-color:                    $gray-4;
 $input-border-color:             $dark-3;
 $input-box-shadow:               inset 1px 0px 0.3rem 0px rgba(150, 150, 150, 0.10);
-$input-border-focus:             $input-border-color !default;
-$input-box-shadow-focus:         rgba(102,175,233,.6) !default;
+$input-border-focus:             $input-border-color;
+$input-box-shadow-focus:         rgba(102, 175, 233, 0.6);
 $input-color-placeholder:        $gray-1 !default;
 $input-label-bg:				         $gray-blue;
 $input-label-border-color:       $dark-3;
diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss
index 7e134cddfa5..c8c53911af9 100644
--- a/public/sass/components/_gf-form.scss
+++ b/public/sass/components/_gf-form.scss
@@ -45,10 +45,10 @@ $input-border: 1px solid $input-border-color;
   }
 
   > input {
-    padding-left: 30px;
+    padding-left: 35px;
 
     &:focus + .gf-form-input-icon {
-      color: $gray-4;
+      color: $text-muted
     }
   }
 }
diff --git a/public/sass/mixins/_forms.scss b/public/sass/mixins/_forms.scss
index 5138cdf0a99..12b3bffaf4f 100644
--- a/public/sass/mixins/_forms.scss
+++ b/public/sass/mixins/_forms.scss
@@ -41,7 +41,7 @@
   &:focus {
     border-color: $input-border-focus;
     outline: none;
-    $shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px $input-box-shadow-focus;
+    $shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 5px $input-box-shadow-focus;
     @include box-shadow($shadow);
   }
 }