diff --git a/Netdisco/share/public/css/netdisco.css b/Netdisco/share/public/css/netdisco.css
index 84d8da40..265e701d 100644
--- a/Netdisco/share/public/css/netdisco.css
+++ b/Netdisco/share/public/css/netdisco.css
@@ -331,7 +331,16 @@ td > form.nd_inline-form {
 
 .nd_sidebar-pin {
   float: left;
-  margin-top: 6px;
+  margin-top: 8px;
+  margin-left: -16px;
+  font-size: 15px;
+  color: #555;
+  cursor: pointer;
+}
+
+.nd_sidebar-reset {
+  float: left;
+  margin-top: 27px;
   margin-left: -16px;
   font-size: 15px;
   color: #555;
@@ -340,7 +349,7 @@ td > form.nd_inline-form {
 
 #nd_sidebar-toggle-img-in {
   float: left;
-  margin-top: -9px;
+  margin-top: -10px;
   margin-left: -16px;
   font-size: 15px;
   color: #555;
diff --git a/Netdisco/share/views/admintask.tt b/Netdisco/share/views/admintask.tt
index 2baad94e..903875d7 100644
--- a/Netdisco/share/views/admintask.tt
+++ b/Netdisco/share/views/admintask.tt
@@ -4,9 +4,9 @@
   <div class="nd_sidebar nd_sidebar-pinned">
     <div class="well">
       <i class="nd_sidebar-toggle icon-signout" id="nd_sidebar-toggle-img-in"
-        rel="tooltip" data-placement="left" data-offset="5" data-title="Hide Sidebar"></i>
+        rel="tooltip" data-placement="left" data-offset="5" data-title="Hide Sidebar" data-container="body"></i>
       <i class="nd_sidebar-pin icon-pushpin nd_sidebar-pin-clicked"
-        rel="tooltip" data-placement="left" data-offset="5" data-title="Unpin Sidebar"></i>
+        rel="tooltip" data-placement="left" data-offset="5" data-title="Unpin Sidebar" data-container="body"></i>
 
       <div class="tab-content">
         <div id="[% task.tag %]_search" class="tab-pane active">
diff --git a/Netdisco/share/views/device.tt b/Netdisco/share/views/device.tt
index bfa27799..18de3b90 100644
--- a/Netdisco/share/views/device.tt
+++ b/Netdisco/share/views/device.tt
@@ -15,9 +15,11 @@
   <div class="nd_sidebar nd_sidebar-pinned">
     <div class="well">
       <i class="nd_sidebar-toggle icon-signout" id="nd_sidebar-toggle-img-in"
-        rel="tooltip" data-placement="left" data-offset="5" data-title="Hide Sidebar"></i>
+        rel="tooltip" data-placement="left" data-offset="5" data-title="Hide Sidebar" data-container="body"></i>
       <i class="nd_sidebar-pin icon-pushpin nd_sidebar-pin-clicked"
-        rel="tooltip" data-placement="left" data-offset="5" data-title="Unpin Sidebar"></i>
+        rel="tooltip" data-placement="left" data-offset="5" data-title="Unpin Sidebar" data-container="body"></i>
+      <i class="nd_sidebar-reset icon-undo"
+        rel="tooltip" data-placement="left" data-offset="5" data-title="Reset to Defaults" data-container="body"></i>
       <div class="tab-content">
         [% FOREACH tab IN settings._device_tabs %]
         <div id="[% tab.tag %]_search" class="tab-pane [% 'active' IF params.tab == tab.tag %]">
diff --git a/Netdisco/share/views/report.tt b/Netdisco/share/views/report.tt
index b3cb963b..474c4a64 100644
--- a/Netdisco/share/views/report.tt
+++ b/Netdisco/share/views/report.tt
@@ -4,9 +4,9 @@
   <div class="nd_sidebar nd_sidebar-pinned">
     <div class="well">
       <i class="nd_sidebar-toggle icon-signout" id="nd_sidebar-toggle-img-in"
-        rel="tooltip" data-placement="left" data-offset="5" data-title="Hide Sidebar"></i>
+        rel="tooltip" data-placement="left" data-offset="5" data-title="Hide Sidebar" data-container="body"></i>
       <i class="nd_sidebar-pin icon-pushpin nd_sidebar-pin-clicked"
-        rel="tooltip" data-placement="left" data-offset="5" data-title="Unpin Sidebar"></i>
+        rel="tooltip" data-placement="left" data-offset="5" data-title="Unpin Sidebar" data-container="body"></i>
 
       <div class="tab-content">
         <div id="[% report.tag %]_search" class="tab-pane active">
diff --git a/Netdisco/share/views/search.tt b/Netdisco/share/views/search.tt
index 59d1f584..bd9f3db6 100644
--- a/Netdisco/share/views/search.tt
+++ b/Netdisco/share/views/search.tt
@@ -4,9 +4,9 @@
   <div class="nd_sidebar">
     <div class="well">
       <i class="nd_sidebar-toggle icon-signout" id="nd_sidebar-toggle-img-in"
-        rel="tooltip" data-placement="left" data-offset="5" data-title="Hide Sidebar"></i>
+        rel="tooltip" data-placement="left" data-offset="5" data-title="Hide Sidebar" data-container="body"></i>
       <i class="nd_sidebar-pin icon-pushpin"
-        rel="tooltip" data-placement="left" data-offset="5" data-title="Pin Sidebar"></i>
+        rel="tooltip" data-placement="left" data-offset="5" data-title="Pin Sidebar" data-container="body"></i>
       <div class="tab-content">
         [% FOREACH tab IN settings._search_tabs %]
         <div id="[% tab.tag %]_search" class="tab-pane [% 'active' IF params.tab == tab.tag %]">