diff --git a/public/app/features/dashboard/dashgrid/PanelEditor.tsx b/public/app/features/dashboard/dashgrid/PanelEditor.tsx
index a1b976c6c66..087c69c9bf9 100644
--- a/public/app/features/dashboard/dashgrid/PanelEditor.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelEditor.tsx
@@ -77,7 +77,7 @@ export class PanelEditor extends PureComponent<PanelEditorProps> {
           </ul>
 
           <button className="panel-editor-tabs__close" onClick={this.onClose}>
-            <i className="fa fa-remove" />
+            <i className="fa fa-reply" />
           </button>
         </div>
 
diff --git a/public/app/features/panel/panel_directive.ts b/public/app/features/panel/panel_directive.ts
index 77ebf754b3a..561663d36d5 100644
--- a/public/app/features/panel/panel_directive.ts
+++ b/public/app/features/panel/panel_directive.ts
@@ -44,8 +44,8 @@ const panelTemplate = `
             </li>
           </ul>
 
-          <button class="tabbed-view-close-btn" ng-click="ctrl.exitFullscreen();">
-            <i class="fa fa-remove"></i>
+          <button class="panel-editor-tabs__close" ng-click="ctrl.exitFullscreen();">
+            <i class="fa fa-reply"></i>
           </button>
         </div>
 
diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss
index c72c3ba21e3..8aa01cf245d 100644
--- a/public/sass/_variables.dark.scss
+++ b/public/sass/_variables.dark.scss
@@ -267,6 +267,11 @@ $menu-dropdown-shadow: 5px 5px 20px -5px $black;
 // -------------------------
 $tab-border-color: $dark-4;
 
+// Toolbar
+$toolbar-bg: $page-header-bg;
+$toolbar-shadow: 0 0 20px black;
+$toolbar-tab-bg: $gray-blue;
+
 // Pagination
 // -------------------------
 
diff --git a/public/sass/_variables.light.scss b/public/sass/_variables.light.scss
index 26634bb9991..ec34c963344 100644
--- a/public/sass/_variables.light.scss
+++ b/public/sass/_variables.light.scss
@@ -214,6 +214,11 @@ $menu-dropdown-shadow: 5px 5px 10px -5px $gray-1;
 // -------------------------
 $tab-border-color: $gray-5;
 
+// Toolbar
+$toolbar-bg: linear-gradient(90deg, #ffffff, #e6eef9);
+$toolbar-shadow: 1px 1px 3px #c7d0d8;
+$toolbar-tab-bg: $white;
+
 // search
 $search-shadow: 0 5px 30px 0 $gray-4;
 $search-filter-box-bg: $gray-7;
diff --git a/public/sass/components/_panel_editor.scss b/public/sass/components/_panel_editor.scss
index 7a7e38a7ae5..6d4022b6d3a 100644
--- a/public/sass/components/_panel_editor.scss
+++ b/public/sass/components/_panel_editor.scss
@@ -67,13 +67,13 @@
   border-radius: 2px;
   height: 10px;
   cursor: grabbing;
-  background: $dark-4;
+  background: $input-label-bg;
   top: -8px;
 
   &:hover {
     transition: background 0.2s ease-in 0.4s;
     transition-delay: 0.2s;
-    background: $blue-dark;
+    background: linear-gradient(90deg, $orange, $red);
     .panel-editor-resizer__handle-dots {
       transition: opacity 0.2s ease-in;
       opacity: 0;
@@ -144,26 +144,15 @@
   @include clearfix();
 
   .active.gf-tabs-link {
-    background: $input-label-bg;
+    background: $toolbar-tab-bg;
   }
 }
 
 .panel-editor-tabs__close {
+  padding: 5px 9px;
+  border-radius: $border-radius;
   float: right;
-  padding: 0;
-  margin: 0;
-  background-color: transparent;
-  border: none;
-  padding: $tabs-padding;
-  color: $text-color;
-
-  i {
-    font-size: 120%;
-  }
-
-  &:hover {
-    color: $text-color-strong;
-  }
+  @include buttonBackground($btn-primary-bg, $btn-primary-bg-hl);
 }
 
 .ds-picker-list {
diff --git a/public/sass/components/_toolbar.scss b/public/sass/components/_toolbar.scss
index 9bbcaa3f736..aa1c46e0fb4 100644
--- a/public/sass/components/_toolbar.scss
+++ b/public/sass/components/_toolbar.scss
@@ -2,9 +2,9 @@
   display: flex;
   align-content: center;
   align-items: center;
-  background: $page-header-bg;
-  box-shadow: 0 0 20px black;
-  padding: 7px 30px 7px 20px;
+  background: $toolbar-bg;
+  box-shadow: $toolbar-shadow;
+  padding: 7px 20px 7px 20px;
   position: relative;
   z-index: 1;
   flex: 0 0 auto;