diff --git a/public/app/features/admin/partials/edit_user.html b/public/app/features/admin/partials/edit_user.html
index b907f794e76..384601affb7 100644
--- a/public/app/features/admin/partials/edit_user.html
+++ b/public/app/features/admin/partials/edit_user.html
@@ -41,7 +41,7 @@
 
 	<form name="passwordForm" class="gf-form-group">
 		<div class="gf-form" >
-			<editor-checkbox text="Grafana Admin" model="permissions.isGrafanaAdmin" style="line-height: 1.5rem;"></editor-checkbox>
+			<gf-form-switch class="gf-form" label="Grafana Admin" checked="permissions.isGrafanaAdmin" switch-class="max-width-6"></gf-form-switch>
 		</div>
 
 		<div class="gf-form-button-row">
diff --git a/public/app/features/org/partials/invite.html b/public/app/features/org/partials/invite.html
index 3bdf51d15a5..e1be0b5648e 100644
--- a/public/app/features/org/partials/invite.html
+++ b/public/app/features/org/partials/invite.html
@@ -41,15 +41,13 @@
 			</div>
 
 			<div class="gf-form-inline gf-form-group">
-				<div class="gf-form">
-					<a class="btn btn-inverse btn-small" ng-click="addInvite()">
+				<div class="gf-form" style="margin-right:.25rem">
+					<a class="btn btn-inverse gf-form-button" ng-click="addInvite()">
 						<i class="fa fa-plus"></i>
 						Invite another
 					</a>
 				</div>
-				<div class="gf-form">
-					<editor-checkbox text="Skip sending invite email" model="options.skipEmails" change="targetBlur()"></editor-checkbox>
-				</div>
+				<gf-form-switch class="gf-form" label="Skip sending invite email" checked="options.skipEmails" switch-class="max-width-6"></gf-form-switch>
 			</div>
 
 			<div class="gf-form-button-row">
diff --git a/public/app/partials/roweditor.html b/public/app/partials/roweditor.html
deleted file mode 100644
index d414cb151f3..00000000000
--- a/public/app/partials/roweditor.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<div class="tabbed-view-header">
-	<h2 class="tabbed-view-title">
-		Row settings
-	</h2>
-
-	<button class="tabbed-view-close-btn" ng-click="dismiss();">
-		<i class="fa fa-remove"></i>
-	</button>
-</div>
-
-<div class="tabbed-view-body">
-	<div class="row">
-		<div class="col-md-8">
-			<div class="page-heading">
-				<h5>Row details</h5>
-			</div>
-			<div class="gf-form-group">
-				<div class="gf-form-inline">
-
-					<div class="gf-form">
-						<span class="gf-form-label width-6">Title</span>
-						<input type="text" class="gf-form-input max-width-14" ng-model='row.title'></input>
-					</div>
-					<div class="gf-form">
-						<span class="gf-form-label width-6">Height</span>
-						<input type="text" class="gf-form-input max-width-8" ng-model='row.height'></input>
-						<editor-checkbox text="Show Title" model="row.showTitle"></editor-checkbox>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div class="col-md-4">
-			<div class="page-heading">
-				<h5>Templating options</h5>
-			</div>
-			<div class="gf-form-group">
-				<div class="gf-form">
-					<span class="gf-form-label">Repeat Row</span>
-					<div class="gf-form-select-wrapper max-width-10">
-						<select class="gf-form-input" ng-model="row.repeat" ng-options="f.name as f.name for f in dashboard.templating.list">
-							<option value=""></option>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
diff --git a/public/app/plugins/datasource/cloudwatch/partials/annotations.editor.html b/public/app/plugins/datasource/cloudwatch/partials/annotations.editor.html
index 8e172b0763d..189aa9226fa 100644
--- a/public/app/plugins/datasource/cloudwatch/partials/annotations.editor.html
+++ b/public/app/plugins/datasource/cloudwatch/partials/annotations.editor.html
@@ -3,18 +3,16 @@
 <div class="editor-row" style="padding: 2rem 0">
 	<div class="section">
 		<h5>Prefix matching</h5>
-		<div class="editor-option">
-			<editor-checkbox text="Enable" model="ctrl.annotation.prefixMatching"></editor-checkbox>
-		</div>
-
-		<div class="editor-option" ng-if="ctrl.annotation.prefixMatching">
-			<label class="small">Action</label>
-			<input type="text" class="input-small" ng-model='ctrl.annotation.actionPrefix'></input>
-		</div>
-
-		<div class="editor-option" ng-if="ctrl.annotation.prefixMatching">
-			<label class="small">Alarm Name</label>
-			<input type="text" class="input-small" ng-model='ctrl.annotation.alarmNamePrefix'></input>
+		<div class="gf-form-inline">
+			<gf-form-switch class="gf-form" label="Enable" checked="ctrl.annotation.prefixMatching" switch-class="max-width-6"></gf-form-switch>
+			<div class="gf-form" ng-if="ctrl.annotation.prefixMatching">
+				<span class="gf-form-label">Action</span>
+				<input type="text" class="gf-form-input" ng-model='ctrl.annotation.actionPrefix'></input>
+			</div>
+			<div class="gf-form" ng-if="ctrl.annotation.prefixMatching">
+				<span class="gf-form-label">Alarm Name</span>
+				<input type="text" class="gf-form-input" ng-model='ctrl.annotation.alarmNamePrefix'></input>
+			</div>
 		</div>
 	</div>
 </div>
diff --git a/public/app/plugins/datasource/opentsdb/partials/annotations.editor.html b/public/app/plugins/datasource/opentsdb/partials/annotations.editor.html
index 6c5cc5450bf..914672053ae 100644
--- a/public/app/plugins/datasource/opentsdb/partials/annotations.editor.html
+++ b/public/app/plugins/datasource/opentsdb/partials/annotations.editor.html
@@ -3,8 +3,5 @@
     <span class="gf-form-label width-13">OpenTSDB metrics query</span>
     <input type="text" class="gf-form-input" ng-model='ctrl.annotation.target' placeholder="events.eventname"></input>
   </div>
-  <div class="gf-form">
-    <span class="gf-form-label width-13">Show Global Annotations?</span>
-    <editor-checkbox text="" model="ctrl.annotation.isGlobal"></editor-checkbox>
-  </div>
+  <gf-form-switch class="gf-form" label="Show Global Annotations?" checked="ctrl.annotation.isGlobal" switch-class="max-width-6" label-class="width-13"></gf-form-switch>
 </div>