diff --git a/public/app/features/dashboard/settings/settings.html b/public/app/features/dashboard/settings/settings.html
index e78dcb74127..7de5e2dbcd1 100644
--- a/public/app/features/dashboard/settings/settings.html
+++ b/public/app/features/dashboard/settings/settings.html
@@ -23,7 +23,7 @@
 </aside>
 
 <div class="dashboard-settings__content" ng-if="ctrl.viewId === 'settings'">
-	<h3 class="dashboard-settings__header m-b-1">
+	<h3 class="dashboard-settings__header">
 		General
 	</h3>
 
diff --git a/public/sass/components/_dashboard_settings.scss b/public/sass/components/_dashboard_settings.scss
index 762e1202bc5..af09ca3658a 100644
--- a/public/sass/components/_dashboard_settings.scss
+++ b/public/sass/components/_dashboard_settings.scss
@@ -49,6 +49,7 @@
 
 .dashboard-settings__header {
   font-size: $font-size-h3;
+  margin-bottom: $spacer*2;
 }
 
 .dashboard-settings__nav-item {
diff --git a/public/sass/components/_search.scss b/public/sass/components/_search.scss
index 6c1048c5cd4..764ae61a0db 100644
--- a/public/sass/components/_search.scss
+++ b/public/sass/components/_search.scss
@@ -116,14 +116,14 @@
 .search-section {
   background: $panel-bg;
   border: $panel-border;
-  padding: $panel-padding;
+  padding: 0px 10px 2px 10px;
   margin-bottom: 3px;
   border-radius: 5px;
 }
 
 .search-section__header {
   font-size: $font-size-h6;
-  padding: 8px 0 2px 0;
+  padding: 6px 0 4px 0;
   color: $text-color-weak;
   display: flex;
   flex-grow: 1;
@@ -139,7 +139,7 @@
 }
 
 .search-section__header__icon {
-  padding: 2px 10px;
+  padding: 5px 10px;
   width: 35px;
 }
 
@@ -149,11 +149,11 @@
 
 .search-section__header__text {
   flex-grow: 1;
+  line-height: 24px;
 }
 
 .search-item {
   @include list-item();
-  @include left-brand-border();
 
   display: flex;
   flex-grow: 1;
@@ -162,7 +162,6 @@
   padding: 0px;
 
   &:hover, &.selected {
-    @include left-brand-border-gradient();
     background: $list-item-hover-bg;
   }
 }
diff --git a/public/sass/components/_switch.scss b/public/sass/components/_switch.scss
index 6b81f144457..3d0da7e4579 100644
--- a/public/sass/components/_switch.scss
+++ b/public/sass/components/_switch.scss
@@ -104,10 +104,12 @@
 .gf-form-switch--transparent {
   input + label {
     background: transparent;
+    border: none;
   }
 
   input + label::before, input + label::after {
     background: transparent;
+    border: none;
   }
 
   &:hover {