diff --git a/public/app/partials/valueSelectDropdown.html b/public/app/partials/valueSelectDropdown.html
index a64f872cd2d..486b0ab1d6e 100644
--- a/public/app/partials/valueSelectDropdown.html
+++ b/public/app/partials/valueSelectDropdown.html
@@ -1,5 +1,5 @@
 <div class="variable-link-wrapper">
-	<a ng-click="vm.show()" class="gf-form-label variable-value-link">
+	<a ng-click="vm.show()" class="variable-value-link">
 		{{vm.linkText}}
 		<span ng-repeat="tag in vm.selectedTags" bs-tooltip='tag.valuesText' data-placement="bottom">
 			<span class="label-tag"tag-color-from-name="tag.text">
@@ -7,7 +7,7 @@
 				{{tag.text}}
 			</span>
 		</span>
-		<i class="fa fa-caret-down"></i>
+		<i class="fa fa-caret-down" style="font-size:12px"></i>
 	</a>
 
 	<input type="text" class="gf-form-input" style="display: none" ng-keydown="vm.keyDown($event)" ng-model="vm.search.query" ng-change="vm.queryChanged()" ></input>
diff --git a/public/sass/components/_submenu.scss b/public/sass/components/_submenu.scss
index 8cf5c02a649..6d69cfe26b6 100644
--- a/public/sass/components/_submenu.scss
+++ b/public/sass/components/_submenu.scss
@@ -38,7 +38,11 @@
 
 .variable-value-link {
   padding-right: 10px;
-  padding: 8px 7px;
+  padding: $input-padding-y $input-padding-x;
+  background-color: $input-bg;
+  border: 1px solid $input-border-color;
+  border-radius: $input-border-radius;
+  color: $input-color;
   box-sizing: content-box;
   display: inline-block;
   color: $text-color;