diff --git a/Netdisco/public/css/style.css b/Netdisco/public/css/style.css
index 29526c38..b0e5d1a3 100644
--- a/Netdisco/public/css/style.css
+++ b/Netdisco/public/css/style.css
@@ -53,7 +53,7 @@ form .clearfix.success input {
 /* right hand side device label */
 .device_label_right {
   float: right !important;
-  margin-top: -3px !important;
+  margin-bottom: -7px !important;
   display: none;
 }
 
@@ -65,6 +65,8 @@ form .clearfix.success input {
 /* nudge content in the sidebar closer to the left */
 .nd_sidesearchform {
   padding-left: 0px;
+  margin-bottom: 0px;
+  /* margin-top: 8px; */
 }
 
 /* fixups for prepended checkbox in sidebar */
@@ -185,6 +187,7 @@ form .clearfix.success input {
 #sidebar_toggle_img_in {
   margin-top: -10px;
   margin-left: 164px;
+  cursor: pointer;
 }
 
 /* for placing the sidebar toggle icons */
@@ -193,6 +196,7 @@ form .clearfix.success input {
   top: 60px;
   left: 4px;
   z-index: 1;
+  cursor: pointer;
   display: none;
 }
 
@@ -220,4 +224,3 @@ so that its tooltip takes prescedence over the field tooltip */
 .field_clear_icon > img {
   padding: 6px;
 }
-
diff --git a/Netdisco/public/images/application_side_contract.png b/Netdisco/public/images/application_side_contract.png
deleted file mode 100644
index 3585f94d..00000000
Binary files a/Netdisco/public/images/application_side_contract.png and /dev/null differ
diff --git a/Netdisco/public/images/application_side_expand.png b/Netdisco/public/images/application_side_expand.png
deleted file mode 100644
index 030cf7c3..00000000
Binary files a/Netdisco/public/images/application_side_expand.png and /dev/null differ
diff --git a/Netdisco/public/images/splashyfish_left.png b/Netdisco/public/images/splashyfish_left.png
new file mode 100644
index 00000000..8ee5c881
Binary files /dev/null and b/Netdisco/public/images/splashyfish_left.png differ
diff --git a/Netdisco/public/images/splashyfish_right.png b/Netdisco/public/images/splashyfish_right.png
new file mode 100644
index 00000000..000cbec5
Binary files /dev/null and b/Netdisco/public/images/splashyfish_right.png differ
diff --git a/Netdisco/public/images/sweep.png b/Netdisco/public/images/tango_sweep.png
similarity index 100%
rename from Netdisco/public/images/sweep.png
rename to Netdisco/public/images/tango_sweep.png
diff --git a/Netdisco/views/device.tt b/Netdisco/views/device.tt
index f771ea85..5789413b 100644
--- a/Netdisco/views/device.tt
+++ b/Netdisco/views/device.tt
@@ -1,10 +1,10 @@
 <img class="sidebar_toggle" id="sidebar_toggle_img_out"
-  src="[% uri_base %]/images/application_side_expand.png"/>
+  src="[% uri_base %]/images/splashyfish_right.png"/>
 <div class="container-fluid">
   <div class="sidebar">
     <div class="well">
       <img class="sidebar_toggle" id="sidebar_toggle_img_in"
-        src="[% uri_base %]/images/application_side_contract.png"
+        src="[% uri_base %]/images/splashyfish_left.png"
         rel="twipsy" data-placement="below" data-offset="5" title="Hide Sidebar"/>
       <h3 class="device_label">[% d.ip %]</h3>
       [% IF d.dns %]
diff --git a/Netdisco/views/search.tt b/Netdisco/views/search.tt
index 11219aa3..957e1025 100644
--- a/Netdisco/views/search.tt
+++ b/Netdisco/views/search.tt
@@ -1,10 +1,10 @@
 <img class="sidebar_toggle" id="sidebar_toggle_img_out"
-  src="[% uri_base %]/images/application_side_expand.png"/>
+  src="[% uri_base %]/images/splashyfish_right.png"/>
 <div class="container-fluid">
   <div class="sidebar">
     <div class="well">
       <img class="sidebar_toggle" id="sidebar_toggle_img_in"
-        src="[% uri_base %]/images/application_side_contract.png"
+        src="[% uri_base %]/images/splashyfish_left.png"
         rel="twipsy" data-placement="below" data-offset="5" title="Hide Sidebar"/>
       <div class="tab-content">
         [% FOREACH tab IN vars.tabs %]
diff --git a/Netdisco/views/sidebar/device/ports.tt b/Netdisco/views/sidebar/device/ports.tt
index e7a21220..650a037b 100644
--- a/Netdisco/views/sidebar/device/ports.tt
+++ b/Netdisco/views/sidebar/device/ports.tt
@@ -5,7 +5,7 @@
             <div class="clearfix">
               <a class="field_clear_icon" href="#"
                 rel="twipsy" data-placement="right" data-offset="3" title="Show all Ports">
-                <img src="[% uri_base %]/images/sweep.png"/></a>
+                <img src="[% uri_base %]/images/tango_sweep.png"/></a>
               <input class="nd_port_query span3" placeholder="Port, Name or VLAN"
                 name="q" value="[% params.q %]" type="text"
                 rel="twipsy" data-placement="right" data-offset="5" title="Filter by Port, Name or VLAN"/>