diff --git a/src/app/partials/submenu.html b/src/app/partials/submenu.html
index 416fb47558b..fcfb71f5d4f 100644
--- a/src/app/partials/submenu.html
+++ b/src/app/partials/submenu.html
@@ -3,9 +3,6 @@
 
 
 		<ul class="tight-form-list" ng-if="dashboard.templating.list.length > 0">
-			<li class="tight-form-item">
-				<strong>VARIABLES:</strong>
-			</li>
 			<li ng-repeat-start="variable in variables" class="tight-form-item template-param-name">
 				<span class="template-variable ">
 					${{variable.name}}:
@@ -20,11 +17,9 @@
 		</ul>
 
 		<ul class="tight-form-list" ng-if="dashboard.annotations.list.length > 0">
-			<li class="tight-form-item">
-				<strong>ANNOTATIONS:</strong>
-			</li>
 			<li ng-repeat="annotation in dashboard.annotations.list" class="tight-form-item annotation-segment" ng-class="{'annotation-disabled': !annotation.enable}">
 				<a ng-click="disableAnnotation(annotation)">
+					<i class="fa fa-bolt"></i>
 					{{annotation.name}}
 					<input class="cr1" id="hideYAxis" type="checkbox" ng-model="annotation.enable" ng-checked="annotation.enable">
 					<label for="hideYAxis" class="cr1"></label>
diff --git a/src/css/less/submenu.less b/src/css/less/submenu.less
index 74a2664d3ce..fa933ced863 100644
--- a/src/css/less/submenu.less
+++ b/src/css/less/submenu.less
@@ -3,9 +3,9 @@
     top: 88px;
   }
 }
-
 .submenu-controls {
-  margin: 10px 10px 0 10px;
+  margin: 10px 10px 0 0px;
+  font-size: 16px;
 }
 
 .annotation-disabled, .annotation-disabled a {
diff --git a/src/css/less/tightform.less b/src/css/less/tightform.less
index dd9a29246e7..dbf46a1f3e6 100644
--- a/src/css/less/tightform.less
+++ b/src/css/less/tightform.less
@@ -85,7 +85,8 @@
 
   &.template-param-name {
     border-right: none;
-    padding-right: 3px;
+    padding-right: 0;
+    padding-left: 18px;
   }
   &.annotation-segment {
     padding: 8px 10px;