diff --git a/src/plugins/kibana/public/dashboard/index.js b/src/plugins/kibana/public/dashboard/index.js
index da6afb2160d28..1c145cf357c1b 100644
--- a/src/plugins/kibana/public/dashboard/index.js
+++ b/src/plugins/kibana/public/dashboard/index.js
@@ -118,6 +118,10 @@ app.directive('dashboardApp', function (Notifier, courier, AppState, timefilter,
         key: 'share',
         description: 'Share Dashboard',
         template: require('plugins/kibana/dashboard/partials/share.html')
+      }, {
+        key: 'options',
+        description: 'Options',
+        template: require('plugins/kibana/dashboard/partials/options.html')
       }];
 
       $scope.refresh = _.bindKey(courier, 'fetch');
diff --git a/src/ui/public/styles/base.less b/src/ui/public/styles/base.less
index 904fde4bf4666..e9d47e40671c8 100644
--- a/src/ui/public/styles/base.less
+++ b/src/ui/public/styles/base.less
@@ -331,7 +331,6 @@ bread-crumbs {
 saved-object-finder,
 paginated-selectable-list {
   .row {
-    background-color: @kibanaGray6;
     padding: 10px;
     display: flex;
     flex-direction: row;
diff --git a/src/ui/public/styles/dark-theme.less b/src/ui/public/styles/dark-theme.less
index 0f8fab676d0c6..93bfded83a4c8 100644
--- a/src/ui/public/styles/dark-theme.less
+++ b/src/ui/public/styles/dark-theme.less
@@ -84,6 +84,9 @@
 
 // /node_modules/bootstrap/less/buttons.less
   .btn {
+    background-color: @dark-button-bg;
+    color: @dark-button-font;
+
     &:hover,
     &:focus,
     &.focus {
@@ -106,7 +109,10 @@
 // /node_modules/bootstrap/less/list-group.less
   .list-group-item {
     background-color: @list-group-bg;
-    border-color: @list-group-border;
+    border: 0 none transparent;
+    &:nth-child(even) {
+      background-color: @gray4;
+    }
   }
 
   a.list-group-item,
@@ -188,8 +194,9 @@
 
 // /node_modules/bootstrap/less/navs.less
   .nav-tabs {
-    border-bottom: 1px solid @nav-tabs-border-color;
+    border-bottom: 1px solid @gray4;
     > li {
+      margin-bottom: -2px;
       > a {
         &:hover {
           border-color: @nav-tabs-link-hover-border-color @nav-tabs-link-hover-border-color @nav-tabs-border-color;
@@ -200,9 +207,9 @@
         &,
         &:hover,
         &:focus {
-          color: @nav-tabs-active-link-hover-color;
-          background-color: @nav-tabs-active-link-hover-bg;
-          border-color: @nav-tabs-active-link-hover-border-color;
+          color: @white;
+          background-color: @gray4;
+          border: 0 none transparent;
         }
       }
     }
@@ -214,6 +221,10 @@
     color: @navbar-default-color;
     background-color: @navbar-default-bg;
     border-color: @navbar-default-border;
+    button {
+      color: @white;
+      background-color: transparent;
+    }
   }
 
 
@@ -276,16 +287,6 @@
     .visualize-show-spy {
       border-top-color: @visualize-show-spy-border;
 
-      &-tab {
-        border-color: @visualize-show-spy-border;
-        background: @visualize-show-spy-bg;
-        color: @visualize-show-spy-color;
-
-        &:hover {
-          background-color: @visualize-show-spy-hover-bg;
-          color: @visualize-show-spy-hover-color;
-        }
-      }
     }
     .visualize-spy-container {
       pre {
@@ -322,15 +323,6 @@
 // /src/ui/public/vislib/styles/_legend.less
   .legend-col-wrapper {
 
-    .legend-toggle {
-      &:hover {
-        color: @sidebar-hover-color;
-        background-color: @sidebar-hover-bg;
-      }
-
-      background-color: @sidebar-bg;
-    }
-
     .legend-ul {
       border-left-color: @sidebar-bg;
       color: @legend-item-color;
@@ -348,7 +340,7 @@
     }
 
     &-full {
-      background-color: @sidebar-hover-bg;
+      background-color: @gray3;
     }
 
     &-details {
@@ -437,16 +429,14 @@
   }
 
   .leaflet-left {
-    .leaflet-control {
+    .leaflet-control,
+    .leaflet-draw-actions {
       a,
       a:hover {
-        color: @tilemap-leaflet-control-color;
+        color: @dark-button-font;
+        background-color: @dark-button-bg;
       }
     }
-
-    .leaflet-draw-actions a {
-      background-color: @tilemap-leaflet-control-draw-action-bg;
-    }
   }
 
 
@@ -486,7 +476,7 @@
 
 // /src/ui/public/styles/config.less
   .config {
-    border-bottom-color: @config-border;
+    border-bottom: 0 none transparent;
 
     .config-close {
       background-color: @config-close-bg;
@@ -511,7 +501,7 @@
         background-color: @list-group-menu-item-active-bg;
       }
       &:hover {
-        background-color: @list-group-menu-item-hover-bg;
+        background-color: @gray2;
       }
       li {
         color: @list-group-menu-item-color;
@@ -533,6 +523,10 @@
       .pagination-other-pages {
         &-list {
           > li {
+            a {
+              background-color: @dark-button-bg;
+              color: @white;
+            }
             &.active a {
               color: @paginate-page-link-active-color;
             }
@@ -580,4 +574,16 @@
       }
     }
   }
+
+  saved-object-finder .form-group span {
+    background-color: @input-bg;
+    color: @dark-button-font;
+  }
+  saved-object-finder .paginate-heading {
+    color: @text-color;
+  }
+  .kibana-nav-actions .active {
+    background-color: @config-bg;
+    color: @dark-button-font;
+  }
 }
diff --git a/src/ui/public/styles/dark-variables.less b/src/ui/public/styles/dark-variables.less
index e61a7c7a8898e..f10b932845f7f 100644
--- a/src/ui/public/styles/dark-variables.less
+++ b/src/ui/public/styles/dark-variables.less
@@ -44,7 +44,7 @@
 
 
 @nav-link-hover-bg:                           @gray6;
-@nav-tabs-active-link-hover-bg:               @gray3;
+@nav-tabs-active-link-hover-bg:               @navbar-default-bg;
 
 @nav-tabs-border-color:                       @gray6;
 @nav-tabs-link-hover-border-color:            @gray7;
@@ -55,15 +55,15 @@
 @paginate-page-link-active-color:             @gray9;
 
 
-@dashboard-bg:                                #1e1b1e;
-@panel-bg:                                    #343434;
-@panel-inner-border:                          @gray13;
+@dashboard-bg:                                #272727;
+@panel-bg:                                    @dashboard-bg;
+@panel-inner-border:                          @dashboard-bg;
 
 @panel-default-text:                          @brand-primary;
-@panel-default-border:                        #5c5c5c;
-@panel-default-heading-bg:                    darken(@panel-bg, 5%);
+@panel-default-border:                        @dashboard-bg;
+@panel-default-heading-bg:                    @dashboard-bg;
 
-@dashboard-panel-bg:                          @panel-bg;
+@dashboard-panel-bg:                          @dashboard-bg;
 @dashboard-panel-color:                       @text-color;
 @dashboard-panel-heading-link-color:          #a6a6a6;
 @dashboard-panel-heading-link-hover-color:    #a6a6a6;
@@ -127,7 +127,7 @@
 
 @config-border:                               @gray4;
 @config-bg:                                   @body-bg;
-@config-close-bg:                             @well-bg;
+@config-close-bg:                             @gray3;
 @config-saved-object-finder-options-bg:       @body-bg;
 
 @saved-object-finder-link-color:              @text-color;
@@ -148,7 +148,7 @@
 @component-active-bg:                         @gray9;
 
 @navbar-default-color:                        @white;
-@navbar-default-bg:                           @gray3;
+@navbar-default-bg:                           #454545;
 @navbar-default-border:                       darken(@navbar-default-bg, 10%);
 
 @spinner-bg:                                  @white;
@@ -156,3 +156,6 @@
 @sidebar-bg:                                  @btn-default-bg;
 @sidebar-hover-bg:                            darken(@btn-default-bg, 5%);
 @sidebar-hover-color:                         @text-color;
+
+@dark-button-bg:                              @gray7;
+@dark-button-font:                            @white;