diff --git a/Netdisco/public/css/netdisco.css b/Netdisco/public/css/netdisco.css
index 5cec14ae..f7e527dc 100644
--- a/Netdisco/public/css/netdisco.css
+++ b/Netdisco/public/css/netdisco.css
@@ -205,9 +205,9 @@ h3.device_label {
 
 /* for placing the sidebar toggle icons */
 #sidebar_toggle_img_in {
-  float: right;
-  margin-top: -7px;
-  margin-right: -16px;
+  float: left;
+  margin-top: -6px;
+  margin-left: -18px;
   cursor: pointer;
 }
 
@@ -226,8 +226,7 @@ h3.device_label {
 
 /* make the sidebar fixed on the screen */
 .container-fluid > .sidebar {
-  position: fixed;
-  margin-top: 50px;
+  position: absolute;
   right: 20px;
   width: 200px;
   left: auto;
diff --git a/Netdisco/public/javascripts/netdisco.js b/Netdisco/public/javascripts/netdisco.js
index 7ae94887..95b2dee9 100644
--- a/Netdisco/public/javascripts/netdisco.js
+++ b/Netdisco/public/javascripts/netdisco.js
@@ -120,7 +120,7 @@ $(document).ready(function() {
       $('.sidebar').toggle(
         function() {
           $('#sidebar_toggle_img_out').toggle();
-          $('.content').animate({'margin-right': '10px !important'}, 100);
+          $('.content').animate({'margin-right': '10px !important'}, 50);
           $('.device_label_right').toggle();
         }
       );
@@ -129,10 +129,11 @@ $(document).ready(function() {
   $('#sidebar_toggle_img_out').click(
     function() {
       $('#sidebar_toggle_img_out').toggle();
-      $('.content').animate({'margin-right': '220px !important'}, 200,
+      $('.content').animate({'margin-right': '220px !important'}, 100,
         function() {
           $('.device_label_right').toggle();
           $('.sidebar').toggle(200);
+          $(window).scrollTop(0);
         }
       );
     }
diff --git a/Netdisco/views/device.tt b/Netdisco/views/device.tt
index ac78aad8..d9d276bd 100644
--- a/Netdisco/views/device.tt
+++ b/Netdisco/views/device.tt
@@ -1,12 +1,12 @@
 <img class="sidebar_toggle" id="sidebar_toggle_img_out"
-  src="[% uri_base %]/images/dusseldorf_settings.png"
+  src="[% uri_base %]/images/diagona_settings.png"
   rel="twipsy" data-placement="left" data-offset="5" title="Show Options"/>
 <div class="container-fluid">
   <div class="sidebar">
     <div class="well">
       <img class="sidebar_toggle" id="sidebar_toggle_img_in"
         src="[% uri_base %]/images/splashyfish_right.png"
-        rel="twipsy" data-placement="left" data-offset="5" title="Hide"/>
+        rel="twipsy" data-placement="left" data-offset="5" title="Hide Sidebar"/>
       <h3 class="device_label">[% d.ip %]</h3>
       [% IF d.dns %]
       <p class="device_label">[% d.dns.remove(settings.domain_suffix) %]</p>
diff --git a/Netdisco/views/search.tt b/Netdisco/views/search.tt
index 17183a31..4042d346 100644
--- a/Netdisco/views/search.tt
+++ b/Netdisco/views/search.tt
@@ -1,12 +1,12 @@
 <img class="sidebar_toggle" id="sidebar_toggle_img_out"
-  src="[% uri_base %]/images/dusseldorf_settings.png"
+  src="[% uri_base %]/images/diagona_settings.png"
   rel="twipsy" data-placement="left" data-offset="5" title="Show Search Options"/>
 <div class="container-fluid">
   <div class="sidebar">
     <div class="well">
       <img class="sidebar_toggle" id="sidebar_toggle_img_in"
         src="[% uri_base %]/images/splashyfish_right.png"
-        rel="twipsy" data-placement="left" data-offset="5" title="Hide"/>
+        rel="twipsy" data-placement="left" data-offset="5" title="Hide Sidebar"/>
       <div class="tab-content">
         [% FOREACH tab IN vars.tabs %]
         <div id="[% tab.id %]_search" class="tab-pane [% 'active' IF params.tab == tab.id %]">