diff --git a/public/app/plugins/datasource/influxdb/partials/query.options.html b/public/app/plugins/datasource/influxdb/partials/query.options.html
index 0bf6faf4012..1e3a08eb556 100644
--- a/public/app/plugins/datasource/influxdb/partials/query.options.html
+++ b/public/app/plugins/datasource/influxdb/partials/query.options.html
@@ -3,7 +3,7 @@
 		<div class="gf-form-inline">
 			<div class="gf-form">
 				<span class="gf-form-label"><i class="fa fa-wrench"></i></span>
-				<span class="gf-form-label width-12">Group by time interval</span>
+				<span class="gf-form-label width-11">Group by time interval</span>
 				<input type="text" class="gf-form-input" ng-model="ctrl.panelCtrl.panel.interval" ng-blur="ctrl.panelCtrl.refresh();"
 				spellcheck='false' placeholder="example: >10s">
 				<span class="gf-form-label"><i class="fa fa-question-circle" bs-tooltip="'Set a low limit by having a greater sign: example: >60s'" data-placement="right"></i></span>
@@ -11,22 +11,25 @@
 		</div>
 		<div class="gf-form-inline">
 			<div class="gf-form">
-				<span class="gf-form-label">
+				<!--span class="gf-form-label">
 					<i class="fa fa-info-circle"></i>
-				</span>
-				<span class="gf-form-label">
+				</span-->
+				<span class="gf-form-label width-10">
 					<a ng-click="ctrl.panelCtrl.toggleEditorHelp(1);" bs-tooltip="'click to show helpful info'" data-placement="bottom">
-						alias patterns
+						<i class="fa fa-info-circle"></i>
+						&nbsp;alias patterns
 					</a>
 				</span>
-				<span class="gf-form-label">
+				<span class="gf-form-label width-10">
 					<a ng-click="ctrl.panelCtrl.toggleEditorHelp(2)" bs-tooltip="'click to show helpful info'" data-placement="bottom">
-						stacking &amp; and fill
+					<i class="fa fa-info-circle"></i>
+						&nbsp;stacking &amp; and fill
 					</a>
 				</span>
-				<span class="gf-form-label">
+				<span class="gf-form-label width-10">
 					<a ng-click="ctrl.panelCtrl.toggleEditorHelp(3)" bs-tooltip="'click to show helpful info'" data-placement="bottom">
-						group by time
+					<i class="fa fa-info-circle"></i>
+						&nbsp;group by time
 					</a>
 				</span>
 			</div>