diff --git a/src/plugins/kibana/public/dashboard/index.html b/src/plugins/kibana/public/dashboard/index.html
index 633ed160d1c3c..9fa6ce3f0c4d2 100644
--- a/src/plugins/kibana/public/dashboard/index.html
+++ b/src/plugins/kibana/public/dashboard/index.html
@@ -45,9 +45,9 @@
         ng-click="configTemplate.toggle('options');">
         <span>Options</span>
       </button>
+      <div class="chrome-actions"kbn-chrome-append-nav-controls></div>
     </div>
   </navbar>
-
   <config config-template="configTemplate" config-object="opts"></config>
 
   <navbar ng-show="chrome.getVisible()" name="dashboard-search">
diff --git a/src/plugins/kibana/public/dashboard/index.js b/src/plugins/kibana/public/dashboard/index.js
index c4813d6499bea..50f593adef94d 100644
--- a/src/plugins/kibana/public/dashboard/index.js
+++ b/src/plugins/kibana/public/dashboard/index.js
@@ -105,7 +105,9 @@ app.directive('dashboardApp', function (Notifier, courier, AppState, timefilter,
         load: require('plugins/kibana/dashboard/partials/load_dashboard.html'),
         share: require('plugins/kibana/dashboard/partials/share.html'),
         pickVis: require('plugins/kibana/dashboard/partials/pick_visualization.html'),
-        options: require('plugins/kibana/dashboard/partials/options.html')
+        options: require('plugins/kibana/dashboard/partials/options.html'),
+        filter: require('ui/chrome/config/filter.html'),
+        interval: require('ui/chrome/config/interval.html')
       });
 
       $scope.refresh = _.bindKey(courier, 'fetch');
@@ -239,7 +241,8 @@ app.directive('dashboardApp', function (Notifier, courier, AppState, timefilter,
         ui: $state.options,
         save: $scope.save,
         addVis: $scope.addVis,
-        addSearch: $scope.addSearch
+        addSearch: $scope.addSearch,
+        timefilter: $scope.timefilter
       };
 
       init();
diff --git a/src/plugins/kibana/public/discover/controllers/discover.js b/src/plugins/kibana/public/discover/controllers/discover.js
index a7b17b5afd22c..744604ba51617 100644
--- a/src/plugins/kibana/public/discover/controllers/discover.js
+++ b/src/plugins/kibana/public/discover/controllers/discover.js
@@ -96,16 +96,17 @@ app.controller('discover', function ($scope, config, courier, $route, $window, N
   $scope.toggleInterval = function () {
     $scope.showInterval = !$scope.showInterval;
   };
-
   // config panel templates
   $scope.configTemplate = new ConfigTemplate({
     load: require('plugins/kibana/discover/partials/load_search.html'),
     save: require('plugins/kibana/discover/partials/save_search.html'),
-    share: require('plugins/kibana/discover/partials/share_search.html')
+    share: require('plugins/kibana/discover/partials/share_search.html'),
+    filter: require('ui/chrome/config/filter.html'),
+    interval: require('ui/chrome/config/interval.html')
   });
-
   $scope.timefilter = timefilter;
 
+
   // the saved savedSearch
   const savedSearch = $route.current.locals.savedSearch;
   $scope.$on('$destroy', savedSearch.destroy);
@@ -147,7 +148,8 @@ app.controller('discover', function ($scope, config, courier, $route, $window, N
     index: $scope.indexPattern.id,
     timefield: $scope.indexPattern.timeFieldName,
     savedSearch: savedSearch,
-    indexPatternList: $route.current.locals.ip.list
+    indexPatternList: $route.current.locals.ip.list,
+    timefilter: $scope.timefilter
   };
 
   const init = _.once(function () {
diff --git a/src/plugins/kibana/public/discover/index.html b/src/plugins/kibana/public/discover/index.html
index c86d43823c6a2..a2d3033b8a5d7 100644
--- a/src/plugins/kibana/public/discover/index.html
+++ b/src/plugins/kibana/public/discover/index.html
@@ -39,9 +39,14 @@
         ng-click="configTemplate.toggle('share');">
         <span>Share</span>
       </button>
+    <div class="chrome-actions" kbn-chrome-append-nav-controls></div>
     </div>
   </navbar>
-  <config config-template="configTemplate" config-object="opts" config-close="configClose"></config>
+  <config
+    config-template="configTemplate"
+    config-object="opts"
+    config-close="configClose"
+  ></config>
   <navbar name="discover-search">
     <form role="form" class="fill inline-form" ng-submit="fetch()" name="discoverSearch">
       <div class="typeahead" kbn-typeahead="discover">
diff --git a/src/plugins/kibana/public/visualize/editor/editor.html b/src/plugins/kibana/public/visualize/editor/editor.html
index eb3cb5189cf57..6c574188f46c9 100644
--- a/src/plugins/kibana/public/visualize/editor/editor.html
+++ b/src/plugins/kibana/public/visualize/editor/editor.html
@@ -39,13 +39,13 @@
         aria-label="Refresh">
         <span>Refresh</span>
       </button>
+      <div class="chrome-actions"kbn-chrome-append-nav-controls></div>
     </div>
   </navbar>
-
   <config
     ng-if="chrome.getVisible()"
     config-template="configTemplate"
-    config-object="conf">
+    config-object="opts">
   </config>
 
   <navbar ng-if="chrome.getVisible()" name="visualize-search">
diff --git a/src/plugins/kibana/public/visualize/editor/editor.js b/src/plugins/kibana/public/visualize/editor/editor.js
index 0428833db4998..2e27fa5dc464c 100644
--- a/src/plugins/kibana/public/visualize/editor/editor.js
+++ b/src/plugins/kibana/public/visualize/editor/editor.js
@@ -85,6 +85,8 @@ uiModules
     save: require('plugins/kibana/visualize/editor/panels/save.html'),
     load: require('plugins/kibana/visualize/editor/panels/load.html'),
     share: require('plugins/kibana/visualize/editor/panels/share.html'),
+    filter: require('ui/chrome/config/filter.html'),
+    interval: require('ui/chrome/config/interval.html')
   });
 
   if (savedVis.id) {
@@ -125,8 +127,8 @@ uiModules
     $scope.editableVis = editableVis;
     $scope.state = $state;
     $scope.uiState = $state.makeStateful('uiState');
-
-    $scope.conf = _.pick($scope, 'doSave', 'savedVis', 'shareData');
+    $scope.timefilter = timefilter;
+    $scope.opts = _.pick($scope, 'doSave', 'savedVis', 'shareData', 'timefilter');
     $scope.configTemplate = configTemplate;
 
     editableVis.listeners.click = vis.listeners.click = filterBarClickHandler($state);
diff --git a/src/plugins/kibana/public/visualize/editor/panels/load.html b/src/plugins/kibana/public/visualize/editor/panels/load.html
index f67fd0952ad30..14108487dc9b9 100644
--- a/src/plugins/kibana/public/visualize/editor/panels/load.html
+++ b/src/plugins/kibana/public/visualize/editor/panels/load.html
@@ -1 +1 @@
-<saved-object-finder type="visualizations"></saved-object-finder>
\ No newline at end of file
+<saved-object-finder type="visualizations"></saved-object-finder>
diff --git a/src/plugins/kibana/public/visualize/editor/panels/save.html b/src/plugins/kibana/public/visualize/editor/panels/save.html
index fe846fc2c80d9..e0c6471ee09fa 100644
--- a/src/plugins/kibana/public/visualize/editor/panels/save.html
+++ b/src/plugins/kibana/public/visualize/editor/panels/save.html
@@ -1,7 +1,7 @@
-<form role="form" ng-submit="conf.doSave()">
+<form role="form" ng-submit="opts.doSave()">
   <div class="form-group">
     <label for="visTitle">Title</label>
-    <input class="form-control" input-focus="select" type="text" name="visTitle" ng-model="conf.savedVis.title" required>
+    <input class="form-control" input-focus="select" type="text" name="visTitle" ng-model="opts.savedVis.title" required>
   </div>
   <button type="submit" class="btn btn-primary">Save</button>
-</form>
\ No newline at end of file
+</form>
diff --git a/src/plugins/kibana/public/visualize/editor/panels/share.html b/src/plugins/kibana/public/visualize/editor/panels/share.html
index 016109cfff6f5..1eeaf5afa608e 100644
--- a/src/plugins/kibana/public/visualize/editor/panels/share.html
+++ b/src/plugins/kibana/public/visualize/editor/panels/share.html
@@ -1,4 +1,4 @@
 <share
   object-type="visualization"
-  object-id="{{conf.savedVis.id}}">
+  object-id="{{opts.savedVis.id}}">
 </share>
diff --git a/src/ui/public/chrome/chrome.html b/src/ui/public/chrome/chrome.html
index a1a2364f80be1..e1a2f502a0bdd 100644
--- a/src/ui/public/chrome/chrome.html
+++ b/src/ui/public/chrome/chrome.html
@@ -45,50 +45,6 @@
   <div class="app-wrapper">
     <div class="app-wrapper-panel">
       <kbn-notifications list="notifList"></kbn-notifications>
-      <nav
-        ng-style="::{ background: chrome.getNavBackground() }"
-        ng-class="{ show: chrome.getVisible() }"
-        class="hide navbar navbar-inverse navbar-static-top">
-
-        <!-- Mobile navbar -->
-        <div class="navbar-header">
-          <button ng-click="showCollapsed = !showCollapsed" type="button" class="navbar-toggle">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <span class="visible-xs">
-            <span ng-if="chrome.getBrand('title')" class="navbar-brand">{{ chrome.getBrand('title') }}</span>
-            <span ng-if="chrome.getActiveTabTitle()" class="navbar-brand">{{ chrome.getActiveTabTitle() }}</span>
-            <span ng-show="chrome.httpActive.length" class="spinner"></span>
-          </span>
-        </div>
-        <!-- /Mobile navbar -->
-
-        <!-- Full navbar -->
-        <div collapse="!showCollapsed" class="navbar-collapse" kbn-chrome-append-nav-controls>
-          <ul class="nav navbar-nav" role="navigation">
-
-            <li ng-if="chrome.getBrand('title')" class="navbar-brand">{{ chrome.getBrand('title') }}</li>
-
-            <li ng-repeat="tab in chrome.getTabs()" ng-class="{ active: tab.active }">
-              <a ng-href="{{ tab.href() }}" ng-style="{ 'border-bottom-color': tab.activeIndicatorColor }">
-                {{ tab.title }}
-              </a>
-            </li>
-          </ul>
-        </div>
-        <!-- /Full navbar -->
-      </nav>
-
-      <config
-        ng-show="timefilter.enabled"
-        config-template="pickerTemplate"
-        config-object="timefilter"
-        config-close="pickerTemplate.close">
-      </config>
-
       <div class="application" ng-class="'tab-' + chrome.getActiveTabId('-none-') + ' ' + chrome.getApplicationClasses()" ng-view></div>
     </div>
   </div>
diff --git a/src/ui/public/chrome/config/filter.html b/src/ui/public/chrome/config/filter.html
index 71a3dd32645ef..1930ee75d01ab 100644
--- a/src/ui/public/chrome/config/filter.html
+++ b/src/ui/public/chrome/config/filter.html
@@ -1,7 +1,7 @@
 <kbn-timepicker
-  from="timefilter.time.from"
-  to="timefilter.time.to"
-  mode="timefilter.time.mode"
+  from="opts.timefilter.time.from"
+  to="opts.timefilter.time.to"
+  mode="opts.timefilter.time.mode"
   active-tab="'filter'"
-  interval="timefilter.refreshInterval">
+  interval="opts.timefilter.refreshInterval">
 </kbn-timepicker>
diff --git a/src/ui/public/chrome/config/interval.html b/src/ui/public/chrome/config/interval.html
index d41a601709709..44d86b4140925 100644
--- a/src/ui/public/chrome/config/interval.html
+++ b/src/ui/public/chrome/config/interval.html
@@ -1,7 +1,7 @@
 <kbn-timepicker
-  from="timefilter.time.from"
-  to="timefilter.time.to"
-  mode="timefilter.time.mode"
+  from="opts.timefilter.time.from"
+  to="opts.timefilter.time.to"
+  mode="opts.timefilter.time.mode"
   active-tab="'interval'"
-  interval="timefilter.refreshInterval">
+  interval="opts.timefilter.refreshInterval">
 </kbn-timepicker>
diff --git a/src/ui/public/chrome/context.js b/src/ui/public/chrome/context.js
index 72961f889701f..94ca0d5655e7f 100644
--- a/src/ui/public/chrome/context.js
+++ b/src/ui/public/chrome/context.js
@@ -21,11 +21,6 @@ uiModules
 
       // chrome is responsible for timepicker ui and state transfer...
       $scope.timefilter = timefilter;
-      $scope.pickerTemplate = new ConfigTemplate({
-        filter: require('ui/chrome/config/filter.html'),
-        interval: require('ui/chrome/config/interval.html')
-      });
-
       $scope.toggleRefresh = function () {
         timefilter.refreshInterval.pause = !timefilter.refreshInterval.pause;
       };
diff --git a/src/ui/public/styles/navbar.less b/src/ui/public/styles/navbar.less
index 5f61f1a841088..1f022cc35c6bb 100644
--- a/src/ui/public/styles/navbar.less
+++ b/src/ui/public/styles/navbar.less
@@ -46,6 +46,9 @@ navbar {
       color: @navbar-default-link-active-color;
       background-color: @navbar-default-link-active-bg;
       box-shadow: none;
+      &:focus {
+        outline: none;
+      }
     }
 
     &[disabled] {
diff --git a/src/ui/public/styles/variables/bootstrap-mods.less b/src/ui/public/styles/variables/bootstrap-mods.less
index 0bd2885595b28..771dadf6ff152 100644
--- a/src/ui/public/styles/variables/bootstrap-mods.less
+++ b/src/ui/public/styles/variables/bootstrap-mods.less
@@ -411,8 +411,8 @@
 
 
 //== Pills
-@nav-pills-active-link-hover-bg:                  @component-active-bg;
-@nav-pills-active-link-hover-color:               @component-active-color;
+@nav-pills-active-link-hover-bg:                  @kibanaYellow1;
+@nav-pills-active-link-hover-color:               @kibanaGray1;
 @nav-pills-border-radius:                   @border-radius-base;
 
 //== Pagination
diff --git a/src/ui/public/timepicker/toggle.html b/src/ui/public/timepicker/toggle.html
index 6c4b59b6f6ece..c368d78419d32 100644
--- a/src/ui/public/timepicker/toggle.html
+++ b/src/ui/public/timepicker/toggle.html
@@ -1,33 +1,33 @@
 <ul ng-show="timefilter.enabled" class="nav navbar-nav navbar-right navbar-timepicker">
   <li>
-    <a
+    <button
       ng-click="toggleRefresh()"
       ng-show="timefilter.refreshInterval.value > 0">
-
       <i class="fa" ng-class="timefilter.refreshInterval.pause ? 'fa-play' : 'fa-pause'"></i>
-    </a>
+    </button>
   </li>
 
   <li
-    ng-class="{active: pickerTemplate.is('interval') }"
-    ng-show="timefilter.refreshInterval.value > 0 || !!pickerTemplate.current"
+    ng-show="timefilter.refreshInterval.value > 0 || !!configTemplate.current"
     class="to-body">
 
-    <a ng-click="pickerTemplate.toggle('interval')" class="navbar-timepicker-auto-refresh-desc">
+    <button ng-click="configTemplate.toggle('interval')"
+    ng-class="{active: configTemplate.is('interval') }"
+    class="navbar-timepicker-auto-refresh-desc">
       <span ng-show="timefilter.refreshInterval.value === 0"><i class="fa fa-repeat"></i> Auto-refresh</span>
       <span ng-show="timefilter.refreshInterval.value > 0">{{timefilter.refreshInterval.display}}</span>
-    </a>
+    </button>
 
   </li>
 
-  <li class="to-body" ng-class="{active: pickerTemplate.is('filter')}">
-    <a
-      ng-click="pickerTemplate.toggle('filter')"
+  <li class="to-body" >
+    <button ng-class="{active: configTemplate.is('filter')}"
+      ng-click="configTemplate.toggle('filter')"
       aria-haspopup="true"
       aria-expanded="false"
       class="navbar-timepicker-time-desc">
       <i aria-hidden="true" class="fa fa-clock-o"></i>
       <pretty-duration from="timefilter.time.from" to="timefilter.time.to"></pretty-duration>
-    </a>
+    </button>
   </li>
 </ul>
diff --git a/test/functional/apps/discover/_shared_links.js b/test/functional/apps/discover/_shared_links.js
index f590cc2dd44c6..1173eaaad5d74 100644
--- a/test/functional/apps/discover/_shared_links.js
+++ b/test/functional/apps/discover/_shared_links.js
@@ -51,6 +51,11 @@ define(function (require) {
           common.debug('setAbsoluteRange');
           return headerPage.setAbsoluteRange(fromTime, toTime);
         })
+        .then(function () {
+          //After hiding the time picker, we need to wait for
+          //the refresh button to hide before clicking the share button
+          return common.sleep(1000);
+        })
         .catch(common.handleError(this));
       });
 
diff --git a/test/support/pages/discover_page.js b/test/support/pages/discover_page.js
index 79ef45ac8c5b7..ab6d8f9c679f9 100644
--- a/test/support/pages/discover_page.js
+++ b/test/support/pages/discover_page.js
@@ -28,7 +28,7 @@ define(function (require) {
 
     getTimespanText: function getTimespanText() {
       return thisTime
-      .findByCssSelector('a.navbar-timepicker-time-desc pretty-duration.ng-isolate-scope')
+      .findByCssSelector('.navbar-timepicker-time-desc pretty-duration')
       .getVisibleText();
     },
 
diff --git a/test/support/pages/header_page.js b/test/support/pages/header_page.js
index 9f92f652644d1..511e5ef6e4744 100644
--- a/test/support/pages/header_page.js
+++ b/test/support/pages/header_page.js
@@ -148,7 +148,7 @@ define(function (require) {
       var self = this;
       return this.remote
       .setFindTimeout(defaultTimeout * 10)
-      .findByCssSelector('span.spinner.ng-hide');
+      .findByCssSelector('.navbar-text.ng-hide .spinner');
     }
 
   };