diff --git a/src/app/directives/tip.js b/src/app/directives/tip.js
index 975a4c02228..974ed98a637 100644
--- a/src/app/directives/tip.js
+++ b/src/app/directives/tip.js
@@ -11,10 +11,10 @@ function (angular, kbn) {
       return {
         restrict: 'E',
         link: function(scope, elem, attrs) {
-          var _t = '<i class="icon-'+(attrs.icon||'question-sign')+'" bs-tooltip="\''+
+          var _t = '<i class="grafana-tip icon-'+(attrs.icon||'question-sign')+'" bs-tooltip="\''+
             kbn.addslashes(elem.text())+'\'"></i>';
           elem.replaceWith($compile(angular.element(_t))(scope));
         }
       };
     });
-});
\ No newline at end of file
+});
diff --git a/src/app/panels/graph/styleEditor.html b/src/app/panels/graph/styleEditor.html
index b8c80473ebd..cd83f23f197 100644
--- a/src/app/panels/graph/styleEditor.html
+++ b/src/app/panels/graph/styleEditor.html
@@ -27,7 +27,7 @@
       <select class="input-mini" ng-model="panel.pointradius" ng-options="f for f in [1,2,3,4,5,6,7,8,9,10]" ng-change="render()"></select>
     </div>
     <div class="editor-option">
-      <label class="small">Null point mode <tip>Define how null values should be drawn</tip></label>
+      <label class="small">Null point mode<tip>Define how null values should be drawn</tip></label>
       <select class="input-medium" ng-model="panel.nullPointMode" ng-options="f for f in ['connected', 'null', 'null as zero']" ng-change="render()"></select>
     </div>
     <div class="editor-option">
diff --git a/src/css/less/grafana.less b/src/css/less/grafana.less
index 7c17e6967db..3e52b7fc94c 100644
--- a/src/css/less/grafana.less
+++ b/src/css/less/grafana.less
@@ -504,3 +504,7 @@ select.grafana-target-segment-input {
     margin-top: 5px;
   }
 }
+
+.grafana-tip {
+  padding-left: 5px;
+}
diff --git a/src/css/less/variables.dark.less b/src/css/less/variables.dark.less
index 608dfb609b0..f3817ef454d 100644
--- a/src/css/less/variables.dark.less
+++ b/src/css/less/variables.dark.less
@@ -35,7 +35,7 @@
 
 // Graphite Target Editor
 @grafanaTargetBorder:         @black;
-@grafanaTargetBackground:     @grayDark;
+@grafana-info-box grafanaTargetBackground:     @grayDark;
 @grafanaTargetColor:          #c8c8c8;
 @grafanaTargetColorHide:      darken(#c8c8c8, 25%);
 @grafanaTargetSegmentBorder:  #050505;