diff --git a/Netdisco/public/css/style.css b/Netdisco/public/css/style.css
index f3c2e4da..8bd0e22a 100644
--- a/Netdisco/public/css/style.css
+++ b/Netdisco/public/css/style.css
@@ -171,9 +171,8 @@ form .clearfix.success input {
 
 /* for placing the sidebar toggle icons */
 #sidebar_toggle_img_in {
-  position: fixed;
-  top: 60px;
-  left: 205px;
+  margin-top: -10px;
+  margin-left: 164px;
 }
 
 /* for placing the sidebar toggle icons */
@@ -185,3 +184,14 @@ form .clearfix.success input {
   display: none;
 }
 
+/* pull the device label closer to the top of the sidebar
+to reduce the useless gap */
+h3.device_label {
+  margin-top: -12px;
+}
+
+/* make the sidebar fixed on the screen */
+.sidebar {
+  position: fixed !important;
+  margin-top: 50px;
+}
diff --git a/Netdisco/views/device.tt b/Netdisco/views/device.tt
index 59eb3f03..73942253 100644
--- a/Netdisco/views/device.tt
+++ b/Netdisco/views/device.tt
@@ -1,6 +1,5 @@
 <img class="sidebar_toggle" id="sidebar_toggle_img_out"
-  src="[% uri_base %]/images/application_side_expand.png"
-  rel="twipsy" data-placement="right" data-offset="5" title="Show Sidebar"/>
+  src="[% uri_base %]/images/application_side_expand.png"/>
 <div class="container-fluid">
   <div class="sidebar">
     <div class="well">
diff --git a/Netdisco/views/js/sidebar.js b/Netdisco/views/js/sidebar.js
index 775960ab..eb3c80a9 100644
--- a/Netdisco/views/js/sidebar.js
+++ b/Netdisco/views/js/sidebar.js
@@ -1,7 +1,6 @@
     // sidebar toggle
     $('#sidebar_toggle_img_in').click(
       function() {
-        $('#sidebar_toggle_img_in').toggle();
         $('.sidebar').toggle(
           function() {
             $('#sidebar_toggle_img_out').toggle();
@@ -16,7 +15,6 @@
         $('.nd_content').animate({'margin-left': '225px !important'}, 200,
           function() {
             $('.sidebar').toggle(200);
-            $('#sidebar_toggle_img_in').toggle();
           }
         );
       }
diff --git a/Netdisco/views/search.tt b/Netdisco/views/search.tt
index 532abe35..11219aa3 100644
--- a/Netdisco/views/search.tt
+++ b/Netdisco/views/search.tt
@@ -1,6 +1,5 @@
 <img class="sidebar_toggle" id="sidebar_toggle_img_out"
-  src="[% uri_base %]/images/application_side_expand.png"
-  rel="twipsy" data-placement="right" data-offset="5" title="Show Sidebar"/>
+  src="[% uri_base %]/images/application_side_expand.png"/>
 <div class="container-fluid">
   <div class="sidebar">
     <div class="well">