diff --git a/public/app/features/dashboard/partials/settings.html b/public/app/features/dashboard/partials/settings.html
index deccd22305b..8cf19141e38 100644
--- a/public/app/features/dashboard/partials/settings.html
+++ b/public/app/features/dashboard/partials/settings.html
@@ -41,15 +41,9 @@
 		<h5 class="section-heading">On/Off Toggles</h5>
 		<div class="gf-form-group">
 			<div class="gf-form-inline">
-				<div class="gf-form">
-					<editor-checkbox text="Editable" model="dashboard.editable"></editor-checkbox>
-				</div>
-				<div class="gf-form">
-					<editor-checkbox text="Hide Controls (CTRL+H)" model="dashboard.hideControls"></editor-checkbox>
-				</div>
-				<div class="gf-form">
-					<editor-checkbox text="Shared Crosshair (CTRL+O)" model="dashboard.sharedCrosshair"></editor-checkbox>
-				</div>
+				<gf-form-switch class="gf-form" label="Editable" checked="dashboard.editable" switch-class="max-width-6"></gf-form-switch>
+				<gf-form-switch class="gf-form" label="Hide Controls (CTRL+H)" checked="dashboard.hideControls" switch-class="max-width-6"></gf-form-switch>
+				<gf-form-switch class="gf-form" label="Shared Crosshair (CTRL+O)" checked="dashboard.sharedCrosshair" switch-class="max-width-6"></gf-form-switch>
 			</div>
 		</div>
 	</div>
diff --git a/public/app/features/plugins/partials/ds_http_settings.html b/public/app/features/plugins/partials/ds_http_settings.html
index 65c205714bc..c49de6967c9 100644
--- a/public/app/features/plugins/partials/ds_http_settings.html
+++ b/public/app/features/plugins/partials/ds_http_settings.html
@@ -29,12 +29,18 @@
 		</div>
 	</div>
 
-	<div class="gf-form">
-		<span class="gf-form-label width-7">
-			Http Auth
-		</span>
-		<editor-checkbox text="Basic Auth" model="current.basicAuth"></editor-checkbox>
-		<editor-checkbox text="With Credentials" model="current.withCredentials"></editor-checkbox><tip>Tip for with credentials</tip>
+	<div class="gf-form-inline">
+		<div class="gf-form">
+			<label class="gf-form-label width-7">Http Auth</label>
+		</div>
+		<gf-form-switch class="gf-form"
+			label="Basic Auth"
+			checked="current.basicAuth" switch-class="max-width-6">
+		</gf-form-switch>
+		<gf-form-switch class="gf-form"
+			label="With Credentials"
+			checked="current.withCredentials" switch-class="max-width-6">
+		</gf-form-switch>
 	</div>
 
 	<div class="gf-form" ng-if="current.basicAuth">
diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss
index cecbf6e5996..f92e712eabf 100644
--- a/public/sass/components/_gf-form.scss
+++ b/public/sass/components/_gf-form.scss
@@ -48,10 +48,6 @@ $gf-form-margin: 0.25rem;
   @include border-radius($label-border-radius-sm);
 }
 
-.gf-form-switch-wrapper {
-  margin-right: $gf-form-margin;
-}
-
 .gf-form-checkbox {
   flex-shrink: 0;
   padding: $input-padding-y $input-padding-x;
@@ -150,4 +146,7 @@ $gf-form-margin: 0.25rem;
   flex-grow: 0;
 }
 
+.gf-form-switch {
+  margin-right: $gf-form-margin;
+}