diff --git a/src/app/partials/graphite/editor.html b/src/app/partials/graphite/editor.html
index a3805c7fd9a..b25478dba37 100755
--- a/src/app/partials/graphite/editor.html
+++ b/src/app/partials/graphite/editor.html
@@ -11,19 +11,19 @@
       <ul class="grafana-target-controls">
         <li ng-show="parserError">
           <a bs-tooltip="parserError" style="color: rgb(229, 189, 28)" role="menuitem">
-            <i class="icon-warning-sign"></i>
+            <i class="icon icon-warning-sign"></i>
           </a>
         </li>
         <li>
           <a class="pointer" tabindex="1" ng-click="showTextEditor = !showTextEditor">
-            <i class="icon-pencil"></i>
+            <i class="icon icon-pencil"></i>
           </a>
         </li>
         <li class="dropdown">
           <a  class="pointer dropdown-toggle"
               data-toggle="dropdown"
               tabindex="1">
-            <i class="icon-cog"></i>
+            <i class="icon icon-cog"></i>
           </a>
           <ul class="dropdown-menu pull-right" role="menu">
             <li role="menuitem">
@@ -42,7 +42,7 @@
         </li>
         <li>
           <a class="pointer" tabindex="1" ng-click="removeDataQuery(target)">
-            <i class="icon-remove"></i>
+            <i class="icon icon-remove"></i>
           </a>
         </li>
       </ul>
diff --git a/src/css/less/bootswatch.dark.less b/src/css/less/bootswatch.dark.less
index f75df4dc03d..bed409c87d6 100644
--- a/src/css/less/bootswatch.dark.less
+++ b/src/css/less/bootswatch.dark.less
@@ -212,7 +212,8 @@ div.subnav {
 
 .nav-tabs {
 
-	border-bottom: 1px solid @grayDark;
+	border-bottom: 1px solid @fullEditBorder;
+
 
 	& > li > a {
 		.border-radius(0);
diff --git a/src/css/less/console.less b/src/css/less/console.less
index 166314d19df..de413b301a6 100644
--- a/src/css/less/console.less
+++ b/src/css/less/console.less
@@ -8,8 +8,6 @@
 }
 
 .grafana-console-header {
-  background: @fullEditTabsBackground;
-  border-top: @fullEditTabsBorder;
   padding: 2px 5px;
 }
 
diff --git a/src/css/less/grafana.less b/src/css/less/grafana.less
index 396db243b76..569aa9f7169 100644
--- a/src/css/less/grafana.less
+++ b/src/css/less/grafana.less
@@ -190,46 +190,6 @@
   position:relative;
 }
 
-.panel-full-edit-tabs {
-  margin-top: 30px;
-  min-height: 250px;
-  margin-left: -10px;
-  margin-right: -10px;
-  background-color: @fullEditBackground;
-  border-top: 1px solid @fullEditBorder;
-
-  .tabs {
-    .nav-tabs {
-      margin: 0;
-      background: @fullEditTabsBackground;
-      border-top: 1px solid @fullEditTabsBorder;
-      border-bottom: 1px solid @fullEditTabsBorder
-    }
-
-    .tab-content {
-      display: none;
-    }
-  }
-
-  .tab-content {
-    overflow: visible;
-    padding: 15px;
-    background-color: @grafanaPanelBackground;
-    border-top: 1px solid @fullEditBorder;
-  }
-
-  .nav-tabs > li {
-    margin-bottom: 0;
-  }
-
-  .nav-tabs > li > a {
-    line-height: 15px;
-    padding-top: 6px;
-    padding-bottom: 6px;
-    font-size: 0.8rem;
-  }
-}
-
 .grafana-target:last-child {
   border-bottom: 1px solid @grafanaTargetBorder;
 }
@@ -344,10 +304,13 @@ input[type=text].grafana-function-param-input {
     white-space: nowrap;
   }
 
-  a {
-    padding: 8px 7px;
+  .icon {
     position: relative;
     top: 8px;
+  }
+
+  a {
+    padding: 8px 7px;
     color: @grafanaTargetColor;
     font-size: 16px;
 
@@ -572,17 +535,8 @@ select.grafana-target-segment-input {
   }
 }
 
-// .panel-fullscreen {
-//   .dashboard-editor-header {
-//     margin-left: -20px;
-//     margin-right: -20px;
-//     background: @grayDark;
-//     padding-left: 20px;
-//   }
-// }
-
 .dashboard-editor-title {
-  border-bottom: 1px solid @grayDark;
+  border-bottom: 1px solid @fullEditBorder;
   padding-right: 20px;
   float: left;
   color: @linkColor;
diff --git a/src/css/less/variables.dark.less b/src/css/less/variables.dark.less
index 429fecb27b2..46368362908 100644
--- a/src/css/less/variables.dark.less
+++ b/src/css/less/variables.dark.less
@@ -34,10 +34,7 @@
 @submenuBorder: #202020;
 
 // Tabs
-@fullEditTabsBackground:  @grayDark;
 @fullEditBorder:          #555;
-@fullEditBackground:      transparent;
-@fullEditTabsBorder:      @black;
 
 // Graphite Target Editor
 @grafanaTargetBorder:         @black;
diff --git a/src/css/less/variables.light.less b/src/css/less/variables.light.less
index 1e0b38413fb..54f217e125b 100644
--- a/src/css/less/variables.light.less
+++ b/src/css/less/variables.light.less
@@ -38,10 +38,7 @@
 @submenuBorder:         @white;
 
 // Tabs
-@fullEditTabsBackground:  @white;
 @fullEditBorder:          @white;
-@fullEditBackground:      @navbarBackground;
-@fullEditTabsBorder:      @white;
 
 // Graphite Target Editor
 @grafanaTargetBorder:         @submenuBackground;