diff --git a/public/app/features/panel/partials/query_editor_row.html b/public/app/features/panel/partials/query_editor_row.html
index 5b70f6ad485..6acd1b5dfe2 100644
--- a/public/app/features/panel/partials/query_editor_row.html
+++ b/public/app/features/panel/partials/query_editor_row.html
@@ -1,15 +1,15 @@
 
 <div class="gf-form-query">
 	<div class="gf-form">
-		<label class="gf-form-label">
-			{{ctrl.target.refId}}
+    <label class="gf-form-label">
+      <a class="pointer query-keyword" tabindex="1" ng-click="ctrl.toggleCollapse()" ng-class="{muted: !ctrl.canCollapse}">
+				<i class="fa fa-caret-down" ng-hide="ctrl.collapsed"></i>
+				<i class="fa fa-caret-right" ng-show="ctrl.collapsed"></i>
+        {{ctrl.target.refId}}
+				<em ng-show="ctrl.target.datasource">{{ctrl.target.datasource}}&nbsp;</em>
+      </a>
 		</label>
-		<label class="gf-form-label">
-			<a ng-click="ctrl.toggleHideQuery()" role="menuitem">
-				<i class="fa fa-eye"></i>
-			</a>
-		</label>
-	</div>
+  </div>
 
 	<div class="gf-form-query-content gf-form-query-content--collapsed" ng-if="ctrl.collapsed">
 		<div class="gf-form">
@@ -23,13 +23,6 @@
 	</div>
 
 	<div class="gf-form">
-		<label class="gf-form-label">
-			<a class="pointer" tabindex="1" ng-click="ctrl.toggleCollapse()" ng-class="{muted: !ctrl.canCollapse}">
-				<em ng-show="ctrl.target.datasource">{{ctrl.target.datasource}}&nbsp;</em>
-				<i class="fa fa-fw fa-chevron-down" ng-hide="ctrl.collapsed"></i>
-				<i class="fa fa-fw fa-chevron-left" ng-show="ctrl.collapsed"></i>
-			</a>
-		</label>
 		<label class="gf-form-label dropdown">
 			<a class="pointer dropdown-toggle" data-toggle="dropdown" tabindex="1">
 				<i class="fa fa-bars"></i>
@@ -49,6 +42,11 @@
 				</li>
 			</ul>
 		</label>
+    <label class="gf-form-label">
+			<a ng-click="ctrl.toggleHideQuery()" role="menuitem">
+				<i class="fa fa-eye"></i>
+			</a>
+		</label>
 		<label class="gf-form-label">
 			<a class="pointer" tabindex="1" ng-click="ctrl.removeQuery(ctrl.target)">
 				<i class="fa fa-trash"></i>
diff --git a/public/app/plugins/datasource/grafana/partials/query.editor.html b/public/app/plugins/datasource/grafana/partials/query.editor.html
index 3131b4cc346..880402573d5 100644
--- a/public/app/plugins/datasource/grafana/partials/query.editor.html
+++ b/public/app/plugins/datasource/grafana/partials/query.editor.html
@@ -1,5 +1,7 @@
-<query-editor-row ctrl="ctrl">
-	<li class="tight-form-item">
-		Test metric (fake data source)
-	</li>
+<query-editor-row query-ctrl="ctrl" can-collapse="false">
+	<div class="gf-form-inline">
+		<div class="gf-form">
+			<label class="gf-form-label">Test metric (fake data source)</label>
+		</div>
+	</div>
 </query-editor-row>
diff --git a/public/app/plugins/datasource/opentsdb/partials/query.editor.html b/public/app/plugins/datasource/opentsdb/partials/query.editor.html
index 2260e9c885b..7ccdc60d0a2 100644
--- a/public/app/plugins/datasource/opentsdb/partials/query.editor.html
+++ b/public/app/plugins/datasource/opentsdb/partials/query.editor.html
@@ -251,5 +251,3 @@
 	</div>
 </query-editor-row>
 
-
-
diff --git a/public/sass/base/_type.scss b/public/sass/base/_type.scss
index 3f77a10c43e..7770be25a68 100644
--- a/public/sass/base/_type.scss
+++ b/public/sass/base/_type.scss
@@ -118,6 +118,10 @@ small,
   font-weight: normal;
 }
 
+.small-xs {
+  font-size: $font-size-xs;
+}
+
 mark,
 .mark {
   padding: .2em;